take two of the admin header and sidebar menu - sidebar menu still needs plenty of...

git-svn-id: http://code.elgg.org/elgg/trunk@7918 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/views/default/css/admin.php b/views/default/css/admin.php
index d600d41fd1c606c6ab4bf7ff5d18f3697d6ded82..4294e46feacc05506d9b90c60a5578b03c072fc7 100644 (file)
--- a/views/default/css/admin.php
+++ b/views/default/css/admin.php
@@ -32,24 +32,14 @@ body {
        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;
-*/
+       margin: 0 auto;
+       padding: 20px 40px 0;
+       min-width: 800px;
+       max-width: 1600px;
 }
 .elgg-page-header > .elgg-inner {
+       background-color: #111111;
+       border: 1px solid #999999;
        padding: 20px 20px;
 }
 .elgg-site-title {
@@ -57,14 +47,23 @@ body {
        float: left;
 }
 .elgg-site-title a {
+       color: #dddddd;
+}
+.elgg-site-title a:hover {
        color: white;
+       text-decoration: none;
 }
 .elgg-user-menu {
        float: right;
-       color: white;
        margin-top: 5px;
 }
-.elgg-user-menu a, .elgg-user-menu a:hover {
+.elgg-user-menu, .elgg-user-menu a {
+       color: #999999;
+}
+.elgg-user-menu a {
+       text-decoration: underline;
+}
+.elgg-user-menu a:hover {
        color: white;
 }
 .elgg-user-menu li {
@@ -87,20 +86,15 @@ body {
 .elgg-page-body {
        margin: 0 auto;
        padding: 20px 40px;
+       min-width: 800px;
+       max-width: 1600px;
 }
-.elgg-page-body > .elgg-inner {
+.elgg-main  {
        background-color: #ffffff;
        border: 1px solid #cccccc;
        padding: 20px;
-       min-height: 400px;
        position: relative;
-       max-width: 1600px;
-}
-.elgg-admin .elgg-main  {
-       padding: 14px;
-       background-color: white;
-       -webkit-border-radius: 6px;
-       -moz-border-radius: 6px;
+       min-height: 400px;
 }
 .elgg-admin .elgg-sidebar {
        width: 210px;
@@ -116,22 +110,20 @@ body {
 *************************************** */
 .elgg-page-menu a {
        display: block;
-       background-color: #eeeeee;
-       border-bottom: 1px solid #dddddd;
-       border-left: 10px solid #eeeeee;
-       padding: 10px;
+       padding: 5px;
        color: #333333;
 }
+.elgg-page-menu .elgg-menu-closed:before {
+       content: "\25B8";
+       padding-right: 4px;
+}
+.elgg-page-menu .elgg-menu-opened:before {
+       content: "\25BE";
+       padding-right: 4px;
+}
 .elgg-page-menu a:hover {
-       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;
 }
@@ -139,11 +131,20 @@ body {
        display: none;
 }
 .elgg-page-menu .elgg-child-menu a {
+       padding-left: 20px;
+}
+
+/* ***************************************
+       MODULES
+*************************************** */
+
+.elgg-main-module {
        background-color: #ffffff;
-       border-left: 10px solid #ffffff;
+       border: 1px solid #cccccc;
+       padding: 10px;
 }
-.elgg-page-menu .elgg-child-menu a:hover {
-       border-left: 10px solid #333333;
+.elgg-main-module > .elgg-head {
+       margin-bottom: 5px;
 }
 
 /* ***************************************

diff --git a/views/default/layout/shells/admin.php b/views/default/layout/shells/admin.php
index ce9d2d503a71e03ad4ca093bbfb1d7d4547b1a9f..efbe547d1536501a2131170da4761c373d58ee84 100644 (file)
--- a/views/default/layout/shells/admin.php
+++ b/views/default/layout/shells/admin.php
@@ -10,6 +10,8 @@
  * @uses $vars['title']   Title string
  */
 
+$admin_title = elgg_get_site_entity()->name . ' ' . elgg_echo('admin');
+
 $view_site = elgg_view('output/url', array(
        'href' => elgg_get_site_url(),
        'text' => elgg_echo('admin:view_site'),
@@ -23,8 +25,8 @@ $logout = elgg_view('output/url', array(
 <div class="elgg-page-header">
        <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 href="<?php echo elgg_get_site_url(); ?>pg/admin/">
+                               <?php echo $admin_title; ?>
                        </a>
                </h1>
                <ul class="elgg-user-menu">
@@ -36,23 +38,23 @@ $logout = elgg_view('output/url', array(
 </div>
 
 <div class="elgg-page-body">
-       <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']);
-                               }
+       <div class="elgg-sidebar clearfix">
+               <?php
+                       echo elgg_view('admin/sidebar/top', $vars);
+                       echo elgg_view('layout/shells/admin/menu', $vars);
+                       echo elgg_view('admin/sidebar/bottom', $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>
+                       if (isset($vars['content'])) {
+                               echo $vars['content'];
+                       }
+               ?>
        </div>
 </div>
 <div class="elgg-page-footer"></div>
\ No newline at end of file

diff --git a/views/default/layout/shells/admin/menu.php b/views/default/layout/shells/admin/menu.php
new file mode 100644 (file)
index 0000000..82dd90a
--- /dev/null
+++ b/views/default/layout/shells/admin/menu.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Admin sidebar menu
+ */
+
+$content = elgg_view_menu('page', array('sort_by' => 'name'));
+
+echo elgg_view('layout/objects/module', array(
+       'title' => elgg_echo('menu'),
+       'body' => $content,
+       'class' => 'elgg-main-module',
+));