aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--views/default/css/admin.php191
-rw-r--r--views/default/layout/shells/admin.php52
2 files changed, 155 insertions, 88 deletions
diff --git a/views/default/css/admin.php b/views/default/css/admin.php
index be2bbd319..d600d41fd 100644
--- a/views/default/css/admin.php
+++ b/views/default/css/admin.php
@@ -16,77 +16,81 @@ echo elgg_view('css/elements/base', $vars);
echo elgg_view('css/elements/typography', $vars);
echo elgg_view('css/elements/chrome', $vars);
echo elgg_view('css/elements/forms', $vars);
-echo elgg_view('css/elements/navigation', $vars);
+//echo elgg_view('css/elements/navigation', $vars);
echo elgg_view('css/elements/core', $vars);
echo elgg_view('css/elements/icons', $vars);
-echo elgg_view('css/elements/layout', $vars);
+//echo elgg_view('css/elements/layout', $vars);
echo elgg_view('css/elements/misc', $vars);
?>
-
-
-/* ***************************************
- BASICS
-*************************************** */
body {
- background-color: #444444;
-}
-a:hover,
-a.selected {
- color: black;
- text-decoration: underline;
-}
-pre, code {
- background:#EBF5FF;
+ background-color: #eeeeee;
}
-blockquote {
- background:#EBF5FF;
-}
-table.mceLayout {
- width:100% !important;
-}
-
-
-
-
-
-
-.elgg-admin .elgg-page-header {
- background-color: #333333;
- border-bottom: 1px solid #555555;
-}
-.elgg-admin .elgg-page-header > .elgg-inner {
- padding: 10px 20px;
-}
-.elgg-admin .elgg-page-footer {
- background: #333333;
- border-top: 1px solid #222222;
- height: 30px;
- width: 100%;
+/* ***************************************
+ HEADER
+*************************************** */
+.elgg-page-header {
+ background-color: #000000;
+/*
+ background-image: -webkit-gradient(
+ linear,
+ left bottom,
+ left top,
+ color-stop(0.42, rgb(51,51,51)),
+ color-stop(1, rgb(204,204,204))
+ );
+ background-image: -moz-linear-gradient(
+ center bottom,
+ rgb(51,51,51) 42%,
+ rgb(204,204,204) 100%
+ );
+ border-bottom: 1px solid #000000;
+*/
+}
+.elgg-page-header > .elgg-inner {
+ padding: 20px 20px;
+}
+.elgg-site-title {
+ font-size: 1.8em;
+ float: left;
}
-.elgg-admin .elgg-page-header h1 {
- height: 45px;
- line-height: 45px;
+.elgg-site-title a {
+ color: white;
}
-.elgg-admin .elgg-page-header h1 a {
+.elgg-user-menu {
+ float: right;
color: white;
+ margin-top: 5px;
}
-.elgg-admin .elgg-page-header h1 a:hover {
+.elgg-user-menu a, .elgg-user-menu a:hover {
color: white;
- text-decoration: underline;
}
-.elgg-admin .elgg-page-header a.return_to_network {
- font-size: 12px;
+.elgg-user-menu li {
+ display: inline;
+}
+.elgg-user-menu li:after{
+ content: "|";
+ display: inline-block;
font-weight: normal;
- color: #666666;
- position: absolute;
- top: 20px;
- right: 40px;
+ margin-left: 8px;
+ margin-right: 4px;
+}
+.elgg-user-menu li:last-child:after {
+ content: "";
}
-.elgg-admin .elgg-page-body {
+
+/* ***************************************
+ BODY
+*************************************** */
+.elgg-page-body {
margin: 0 auto;
+ padding: 20px 40px;
+}
+.elgg-page-body > .elgg-inner {
+ background-color: #ffffff;
+ border: 1px solid #cccccc;
padding: 20px;
min-height: 400px;
position: relative;
@@ -103,37 +107,86 @@ table.mceLayout {
float: right;
margin-left: 30px;
}
-
-.elgg-admin h1,
-.elgg-admin h2,
-.elgg-admin h3,
-.elgg-admin h4,
-.elgg-admin h5,
-.elgg-admin h6 {
- color:#666666;
+.elgg-main h2 {
+ color: #333333;
}
+/* ***************************************
+ SIDEBAR MENU
+*************************************** */
.elgg-page-menu a {
display: block;
- -webkit-border-radius: 8px;
- -moz-border-radius: 8px;
- background-color: white;
- margin: 0 0 3px 0;
- padding: 2px 4px 2px 8px;
+ background-color: #eeeeee;
+ border-bottom: 1px solid #dddddd;
+ border-left: 10px solid #eeeeee;
+ padding: 10px;
color: #333333;
}
.elgg-page-menu a:hover {
- background-color: black;
- color: white;
+ border-left: 10px solid #333333;
text-decoration: none;
}
+/*
.elgg-page-menu li.selected > a {
background-color: black;
color: white;
}
+*/
.elgg-page-menu li.selected > ul {
display: block;
}
+.elgg-page-menu .elgg-child-menu {
+ display: none;
+}
+.elgg-page-menu .elgg-child-menu a {
+ background-color: #ffffff;
+ border-left: 10px solid #ffffff;
+}
+.elgg-page-menu .elgg-child-menu a:hover {
+ border-left: 10px solid #333333;
+}
+
+/* ***************************************
+ BASICS
+*************************************** */
+
+a:hover,
+a.selected {
+ color: black;
+ text-decoration: underline;
+}
+pre, code {
+ background:#EBF5FF;
+}
+blockquote {
+ background:#EBF5FF;
+}
+table.mceLayout {
+ width:100% !important;
+}
+
+
+
+
+
+
+/*
+
+.elgg-admin .elgg-page-footer {
+ background: #333333;
+ border-top: 1px solid #222222;
+ height: 30px;
+ width: 100%;
+}
+
+
+*/
+
+ h1, h2, h3, h4, h5, h6 {
+ color:#666666;
+}
+
+
<?php //@todo convert to new style ?>
.admin_settings h3 {
background:#999999;
@@ -655,4 +708,4 @@ ul.admin_plugins {
}
.add-user form {
width:300px;
-} \ No newline at end of file
+}
diff --git a/views/default/layout/shells/admin.php b/views/default/layout/shells/admin.php
index e33c1c62f..ce9d2d503 100644
--- a/views/default/layout/shells/admin.php
+++ b/views/default/layout/shells/admin.php
@@ -9,36 +9,50 @@
* @uses $vars['sidebar'] Optional sidebar content
* @uses $vars['title'] Title string
*/
+
+$view_site = elgg_view('output/url', array(
+ 'href' => elgg_get_site_url(),
+ 'text' => elgg_echo('admin:view_site'),
+));
+$logout = elgg_view('output/url', array(
+ 'href' => 'action/logout',
+ 'text' => elgg_echo('logout'),
+));
?>
<div class="elgg-page-header">
- <div class="elgg-inner">
- <h1>
+ <div class="elgg-inner clearfix">
+ <h1 class="elgg-site-title">
<a href="<?php echo elgg_get_site_url(); ?>">
<?php echo $vars['config']->sitename; echo " " . elgg_echo('admin'); ?>
</a>
</h1>
- <a class="return_to_network" href="<?php echo elgg_get_site_url(); ?>">&lt;&lt; Return to network</a>
+ <ul class="elgg-user-menu">
+ <li><?php echo elgg_echo('admin:loggedin', array(get_loggedin_user()->name)); ?></li>
+ <li><?php echo $view_site; ?></li>
+ <li><?php echo $logout; ?></li>
+ </ul>
</div>
</div>
<div class="elgg-page-body">
-
- <div class="elgg-sidebar clearfix">
- <?php
- echo elgg_view('layout/elements/sidebar', $vars);
- ?>
- </div>
- <div class="elgg-main elgg-body">
- <?php
- if (isset($vars['title'])) {
- echo elgg_view_title($vars['title']);
- }
-
- if (isset($vars['content'])) {
- echo $vars['content'];
- }
- ?>
+ <div class="elgg-inner clearfix">
+ <div class="elgg-sidebar clearfix">
+ <?php
+ echo elgg_view('layout/elements/sidebar', $vars);
+ ?>
+ </div>
+ <div class="elgg-main elgg-body">
+ <?php
+ if (isset($vars['title'])) {
+ echo elgg_view_title($vars['title']);
+ }
+
+ if (isset($vars['content'])) {
+ echo $vars['content'];
+ }
+ ?>
+ </div>
</div>
</div>
<div class="elgg-page-footer"></div> \ No newline at end of file