From ccc3bca78bb319d130daa3aae2f2af964ca79f4f Mon Sep 17 00:00:00 2001 From: cash Date: Tue, 8 Feb 2011 03:14:16 +0000 Subject: updates for the admin css based on the reworking I did to the html git-svn-id: http://code.elgg.org/elgg/trunk@8067 36083f99-b078-4883-b0ff-0f9b5a30f544 --- js/lib/ui.js | 2 +- views/default/admin/components/plugin_settings.php | 2 +- views/default/admin/statistics/overview.php | 4 +- views/default/admin/users/newest.php | 2 +- views/default/admin/users/online.php | 2 +- views/default/css/admin.php | 142 ++++++++++++--------- views/default/forms/admin/menu/save.php | 4 +- views/default/forms/useradd.php | 2 +- views/default/layout/shells/admin.php | 4 +- views/default/layout/shells/admin/menu.php | 2 +- 10 files changed, 96 insertions(+), 70 deletions(-) diff --git a/js/lib/ui.js b/js/lib/ui.js index 72a087aa0..6fc3dd3bf 100644 --- a/js/lib/ui.js +++ b/js/lib/ui.js @@ -14,7 +14,7 @@ elgg.ui.init = function () { $('.elgg-toggle').live('click', elgg.ui.toggle); - $('.elgg-page-menu .elgg-menu-parent').live('click', elgg.ui.toggleMenu); + $('.elgg-menu-page .elgg-menu-parent').live('click', elgg.ui.toggleMenu); $('.elgg-like-toggle').live('click', elgg.ui.toggleLikes); diff --git a/views/default/admin/components/plugin_settings.php b/views/default/admin/components/plugin_settings.php index 0a4891145..d5e25b4c1 100644 --- a/views/default/admin/components/plugin_settings.php +++ b/views/default/admin/components/plugin_settings.php @@ -15,7 +15,7 @@ $form_body .= elgg_view('input/submit', array('value' => elgg_echo('save'))); //$form_body .= elgg_view('input/reset', array('value' => elgg_echo('reset'))); ?> -
+

diff --git a/views/default/admin/statistics/overview.php b/views/default/admin/statistics/overview.php index 52bd4ddb2..5b366c564 100644 --- a/views/default/admin/statistics/overview.php +++ b/views/default/admin/statistics/overview.php @@ -17,7 +17,7 @@ $release = get_version(true); echo elgg_view('admin/statistics/extend'); ?> -
+

@@ -41,7 +41,7 @@ echo elgg_view('admin/statistics/extend'); $entity_stats = get_entity_statistics(); $even_odd = ""; ?> -
+

diff --git a/views/default/admin/users/newest.php b/views/default/admin/users/newest.php index 25bd55cbc..91a6fa338 100644 --- a/views/default/admin/users/newest.php +++ b/views/default/admin/users/newest.php @@ -8,7 +8,7 @@ $users = elgg_list_entities(array( ?> -
+

diff --git a/views/default/admin/users/online.php b/views/default/admin/users/online.php index 328132a4c..dbda06066 100644 --- a/views/default/admin/users/online.php +++ b/views/default/admin/users/online.php @@ -3,7 +3,7 @@ $users_online = get_online_users(); ?> -
+

diff --git a/views/default/css/admin.php b/views/default/css/admin.php index 12bd9420a..15e7f09ff 100644 --- a/views/default/css/admin.php +++ b/views/default/css/admin.php @@ -2,26 +2,13 @@ /** * Elgg Admin CSS * + * This is a distinct theme from the theme of the site. There are dependencies + * on the HTML created by the views in Elgg core. + * * @package Elgg.Core * @subpackage UI */ - -//echo elgg_view('css/elements/reset', $vars); -//echo elgg_view('css/elements/grid', $vars); -//echo elgg_view('css/elements/spacing', $vars); -//echo elgg_view('css/elements/base', $vars); - -// remove these as we finish the admin theme -//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/core', $vars); -//echo elgg_view('css/elements/icons', $vars); -//echo elgg_view('css/elements/layout', $vars); -//echo elgg_view('css/elements/misc', $vars); - ?> /* *************************************** @@ -176,42 +163,42 @@ table.mceLayout { border: 1px solid #999999; padding: 20px 20px; } -.elgg-site-title { +.elgg-heading-site { font-size: 1.8em; float: left; } -.elgg-site-title a { - color: #dddddd; +.elgg-heading-site a { + color: #ffffff; text-decoration: none; } -.elgg-site-title a:hover { +.elgg-heading-site a:hover { color: white; text-decoration: none; } -.elgg-user-menu { +.elgg-menu-user { float: right; margin-top: 5px; } -.elgg-user-menu, .elgg-user-menu a { +.elgg-menu-user, .elgg-menu-user a { color: #999999; } -.elgg-user-menu a { +.elgg-menu-user a { text-decoration: underline; } -.elgg-user-menu a:hover { +.elgg-menu-user a:hover { color: white; } -.elgg-user-menu li { +.elgg-menu-user li { display: inline; } -.elgg-user-menu li:after{ +.elgg-menu-user li:after{ content: "|"; display: inline-block; font-weight: normal; margin-left: 8px; margin-right: 4px; } -.elgg-user-menu li:last-child:after { +.elgg-menu-user li:last-child:after { content: ""; } @@ -246,32 +233,32 @@ table.mceLayout { /* *************************************** SIDEBAR MENU *************************************** */ -.elgg-page-menu a { +.elgg-menu-page a { display: block; padding: 5px; color: #333333; cursor: pointer; text-decoration: none; } -.elgg-page-menu .elgg-menu-closed:before { +.elgg-menu-page .elgg-menu-closed:before { content: "\25B8"; padding-right: 4px; } -.elgg-page-menu .elgg-menu-opened:before { +.elgg-menu-page .elgg-menu-opened:before { content: "\25BE"; padding-right: 4px; } -.elgg-page-menu a:hover { +.elgg-menu-page a:hover { color: black; text-decoration: none; } -.elgg-page-menu li.elgg-state-selected > ul { +.elgg-menu-page li.elgg-state-selected > ul { display: block; } -.elgg-page-menu .elgg-child-menu { +.elgg-menu-page .elgg-child-menu { display: none; } -.elgg-page-menu .elgg-child-menu a { +.elgg-menu-page .elgg-child-menu a { padding-left: 20px; } @@ -279,18 +266,18 @@ table.mceLayout { MODULES *************************************** */ -.elgg-main-module { +.elgg-module-main { background-color: #ffffff; border: 1px solid #cccccc; padding: 10px; } -.elgg-main-module > .elgg-head { +.elgg-module-main > .elgg-head { margin-bottom: 5px; } -.elgg-inline-module { +.elgg-module-inline { margin: 20px 0; } -.elgg-inline-module > .elgg-head { +.elgg-module-inline > .elgg-head { background-color: #999999; color: white; padding: 5px; @@ -298,7 +285,7 @@ table.mceLayout { -webkit-border-radius: 3px; -moz-border-radius: 3px; } -.elgg-inline-module > .elgg-head h3 { +.elgg-module-inline > .elgg-head h3 { color: white; } @@ -570,26 +557,28 @@ a.elgg-widget-edit-button:hover, a.elgg-widget-delete-button:hover { } -.elgg-user-icon { - position:relative; +.elgg-avatar { + position: relative; } -.elgg-hover-menu { - display: none; +.elgg-avatar > a > img { + display: block; } -.elgg-user-icon.tiny, -img.tiny { - width:25px; - height:25px; +.elgg-avatar-tiny > a > img { + width: 25px; + height: 25px; + /* remove the border-radius if you don't want rounded avatars in supported browsers */ + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + -moz-background-clip: border; -o-background-size: 25px; -webkit-background-size: 25px; -khtml-background-size: 25px; -moz-background-size: 25px; } -.elgg-user-icon.small, -img.small { - width:40px; - height:40px; +.elgg-avatar-small > a > img { + width: 40px; + height: 40px; /* remove the border-radius if you don't want rounded avatars in supported browsers */ -webkit-border-radius: 5px; -moz-border-radius: 5px; @@ -600,17 +589,54 @@ img.small { -khtml-background-size: 40px; -moz-background-size: 40px; } -img.large { - width:200px; - height:200px; +.elgg-avatar-medium > a > img { + width: 100px; + height: 100px; } -img.medium { - width:100px; - height:100px; +.elgg-avatar-large > a > img { + width: 200px; + height: 200px; } +.elgg-menu-hover { + display: none; + position: absolute; + z-index: 10000; - + width: 165px; + border-top: solid 1px #E5E5E5; + border-left: solid 1px #E5E5E5; + border-right: solid 1px #999999; + border-bottom: solid 1px #999999; + background-color: #FFFFFF; + -webkit-box-shadow: 2px 2px 6px rgba(0, 0, 0, 0.50); + -moz-box-shadow: 2px 2px 6px rgba(0, 0, 0, 0.50); +} +.elgg-menu-hover > li { + border-bottom: 1px solid #dddddd; +} +.elgg-menu-hover > li:last-child { + border-bottom: none; +} +.elgg-menu-hover .elgg-heading-basic { + display: block; +} +.elgg-menu-hover a { + display: block; + padding: 2px 8px; + font-size: 92%; +} +.elgg-menu-hover a:hover { + background: #cccccc; + text-decoration: none; +} +.elgg-hover-admin a { + color: red; +} +.elgg-hover-admin a:hover { + color: white; + background-color: red; +} /* diff --git a/views/default/forms/admin/menu/save.php b/views/default/forms/admin/menu/save.php index e5f66f53e..4025117f8 100644 --- a/views/default/forms/admin/menu/save.php +++ b/views/default/forms/admin/menu/save.php @@ -19,7 +19,7 @@ foreach ($menu_items as $item) { $dropdown_values[''] = elgg_echo('none'); ?> -
+

@@ -47,7 +47,7 @@ for ($i=0; $i<6; $i++) {
-
+

diff --git a/views/default/forms/useradd.php b/views/default/forms/useradd.php index 8ed0fc2cc..efb691551 100644 --- a/views/default/forms/useradd.php +++ b/views/default/forms/useradd.php @@ -26,7 +26,7 @@ if ($admin_option) { $form_body .= elgg_view('input/submit', array('internalname' => 'submit', 'value' => elgg_echo('register'))) . "

"; ?> -
+

diff --git a/views/default/layout/shells/admin.php b/views/default/layout/shells/admin.php index fe4477158..64144830f 100644 --- a/views/default/layout/shells/admin.php +++ b/views/default/layout/shells/admin.php @@ -24,12 +24,12 @@ $logout = elgg_view('output/url', array(
-

+

-
    +
    • name)); ?>
      • diff --git a/views/default/layout/shells/admin/menu.php b/views/default/layout/shells/admin/menu.php index 2f1a6bebb..db5564978 100644 --- a/views/default/layout/shells/admin/menu.php +++ b/views/default/layout/shells/admin/menu.php @@ -8,5 +8,5 @@ $content = elgg_view_menu('page', array('sort_by' => 'name')); echo elgg_view('layout/objects/module', array( 'title' => elgg_echo('admin:menu'), 'body' => $content, - 'class' => 'elgg-main-module', + 'class' => 'elgg-module-main', )); -- cgit v1.2.3