From 984138d1a523409f8b2fc84487ce21f69998de78 Mon Sep 17 00:00:00 2001 From: cash Date: Thu, 2 Dec 2010 13:01:30 +0000 Subject: rough implementation of Evan's page layout git-svn-id: http://code.elgg.org/elgg/trunk@7496 36083f99-b078-4883-b0ff-0f9b5a30f544 --- js/lib/ui.js | 2 +- views/default/css/components/reset.php | 4 +- views/default/css/screen.php | 62 ++++++++++++++--------- views/default/layouts/one_column_with_sidebar.php | 6 +-- views/default/messages/errors/list.php | 6 +-- views/default/messages/list.php | 14 ++--- views/default/messages/messages/list.php | 4 +- views/default/page_elements/content.php | 2 + views/default/page_elements/footer.php | 2 +- views/default/page_elements/header.php | 2 +- views/default/page_elements/topbar.php | 2 +- views/default/page_shells/default.php | 7 ++- 12 files changed, 66 insertions(+), 47 deletions(-) diff --git a/js/lib/ui.js b/js/lib/ui.js index 01e6b6589..a9315883f 100644 --- a/js/lib/ui.js +++ b/js/lib/ui.js @@ -2,7 +2,7 @@ elgg.provide('elgg.ui'); elgg.ui.init = function () { //if the user clicks a system message, make it disappear - $('.elgg-system-message').live('click', function() { + $('.elgg-system-messages li').live('click', function() { $(this).stop().fadeOut('fast'); }); diff --git a/views/default/css/components/reset.php b/views/default/css/components/reset.php index 8abe8119e..13f750de8 100644 --- a/views/default/css/components/reset.php +++ b/views/default/css/components/reset.php @@ -36,9 +36,7 @@ img { -moz-outline-style: none; } ol, ul { - /* list-style:none outside none; */ - margin: 0 0 10px 0; - padding-left: 20px; + list-style: none; } em, i { font-style:italic; diff --git a/views/default/css/screen.php b/views/default/css/screen.php index 492e600ff..fe2bfbe4b 100644 --- a/views/default/css/screen.php +++ b/views/default/css/screen.php @@ -228,17 +228,29 @@ h2 { .ajax-loader.left { background-position: left center; } -#elgg-sidebar h3 { +.elgg-aside h3 { border-bottom:1px solid #CCCCCC; margin-bottom:5px; margin-top:20px; padding-bottom:5px; } +.elgg-center { + margin: 0 auto; +} + +.elgg-width-classic { + width: 990px; + /* temp until layout css is sorted */ + background-image:url(_graphics/sidebar_background.gif); + background-repeat:repeat-y; + background-position: right top; +} + /* *************************************** PAGE LAYOUT - MAIN BLOCKS POSITIONING *************************************** */ -#elgg-topbar { +.elgg-topbar { background:#333333 url(_graphics/toptoolbar_background.gif) repeat-x top left; color:#eeeeee; border-bottom:1px solid #000000; @@ -248,7 +260,7 @@ h2 { height:24px; z-index: 9000; } -#elgg-header { +.elgg-header { x-overflow: hidden; position: relative; width: 100%; @@ -302,14 +314,14 @@ h2 { width:970px; margin-right:10px; } -#elgg-sidebar { /* elgg sidebar */ +.elgg-aside { /* elgg sidebar */ float:right; width:210px; margin:20px 10px; position: relative; min-height:360px; } -#elgg-footer { +.elgg-footer { position: relative; z-index: 999; } @@ -593,29 +605,31 @@ li.navigation-more ul li { /* *************************************** SYSTEM MESSAGES *************************************** */ -#elgg-system-messages { +.elgg-system-messages { position:fixed; + top:24px; right:20px; - max-width: 500px; - z-index: 9600; + max-width:500px; + z-index:9600; } - -.elgg-system-message { - background-color:black; +.elgg-system-messages li { color:white; - font-weight: bold; + font-weight:bold; display:block; padding:3px 10px; margin-top:10px; - cursor: pointer; + cursor:pointer; opacity:0.9; - -webkit-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.45); - -moz-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.45); - z-index: 9600; + -webkit-box-shadow:0 2px 5px rgba(0, 0, 0, 0.45); + -moz-box-shadow:0 2px 5px rgba(0, 0, 0, 0.45); +} +.elgg-state-success { + background-color:black; } -.elgg-system-message.error { +.elgg-state-error { background-color:red; } + .elgg-system-message p { margin:0; } @@ -939,13 +953,13 @@ a.widget-edit-button:hover, a.widget-delete-button:hover { LOGIN / REGISTER *************************************** */ /* login in sidebar */ -#elgg-sidebar #login { +.elgg-aside #login { width:auto; } -#elgg-sidebar #login form { +.elgg-aside #login form { width:auto; } -#elgg-sidebar #login .login-textarea { +.elgg-aside #login .login-textarea { width:196px; } /* default login and register forms */ @@ -1141,19 +1155,19 @@ a.widget-edit-button:hover, a.widget-delete-button:hover { margin-bottom: 10px; } /* latest comments in sidebar */ -#elgg-sidebar .generic_comment.latest { +.elgg-aside .generic_comment.latest { padding:2px 0; } -#elgg-sidebar .generic_comment.latest .generic-comment-icon { +.elgg-aside .generic_comment.latest .generic-comment-icon { margin-left:1px; margin-top:5px; } -#elgg-sidebar .generic_comment.latest .generic-comment-details { +.elgg-aside .generic_comment.latest .generic-comment-details { width:177px; line-height:1.1em; overflow:hidden; } -#elgg-sidebar .generic_comment.latest .entity-title { +.elgg-aside .generic_comment.latest .entity-title { font-size: inherit; line-height: inherit; } diff --git a/views/default/layouts/one_column_with_sidebar.php b/views/default/layouts/one_column_with_sidebar.php index f3ca08f06..f2c70a02a 100644 --- a/views/default/layouts/one_column_with_sidebar.php +++ b/views/default/layouts/one_column_with_sidebar.php @@ -9,14 +9,14 @@ * @uses $vars['sidebar'] Optional content that is displayed in the sidebar */ ?> -
-
+
+
-
+
- +
  • + $error)); ?> +
    • 0) { ?> -
    +
      0) { - foreach($vars['object'] as $register => $list ) { - echo elgg_view("messages/{$register}/list", array('object' => $list)); - } + foreach ($vars['object'] as $register => $list ) { + echo elgg_view("messages/{$register}/list", array('object' => $list)); } ?> -
    \ No newline at end of file + + - + '; echo $content; +echo '
    '; diff --git a/views/default/page_elements/footer.php b/views/default/page_elements/footer.php index 2f976c8ab..6f7042965 100644 --- a/views/default/page_elements/footer.php +++ b/views/default/page_elements/footer.php @@ -9,7 +9,7 @@ */ ?> -