aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--js/lib/ui.js2
-rw-r--r--views/default/css/components/reset.php4
-rw-r--r--views/default/css/screen.php62
-rw-r--r--views/default/layouts/one_column_with_sidebar.php6
-rw-r--r--views/default/messages/errors/list.php6
-rw-r--r--views/default/messages/list.php14
-rw-r--r--views/default/messages/messages/list.php4
-rw-r--r--views/default/page_elements/content.php2
-rw-r--r--views/default/page_elements/footer.php2
-rw-r--r--views/default/page_elements/header.php2
-rw-r--r--views/default/page_elements/topbar.php2
-rw-r--r--views/default/page_shells/default.php7
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(<?php echo elgg_get_site_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(<?php echo elgg_get_site_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
*/
?>
-<div id="elgg-content" class="clearfix sidebar">
- <div id="elgg-sidebar">
+<div class="elgg-layout elgg-center elgg-width-classic clearfix">
+ <div class="elgg-aside">
<?php
echo elgg_view('page_elements/sidebar', $vars);
?>
</div>
- <div id="elgg-page-contents" class="clearfix">
+ <div id="elgg-page-contents" class="elgg-body clearfix">
<?php
// @todo deprecated so remove in Elgg 2.0
if (isset($vars['area1'])) {
diff --git a/views/default/messages/errors/list.php b/views/default/messages/errors/list.php
index 6e1c5a888..88c3c6c2a 100644
--- a/views/default/messages/errors/list.php
+++ b/views/default/messages/errors/list.php
@@ -13,9 +13,9 @@ if (!empty($vars['object']) && is_array($vars['object'])) {
foreach($vars['object'] as $error) {
?>
- <div class="elgg-system-message hidden radius8 error">
- <?php echo elgg_view('messages/errors/error',array('object' => $error)); ?>
- </div>
+ <li class="elgg-state-error radius8">
+ <?php echo elgg_view('messages/errors/error', array('object' => $error)); ?>
+ </li>
<?php
}
diff --git a/views/default/messages/list.php b/views/default/messages/list.php
index 84cec1b34..dad1c23ab 100644
--- a/views/default/messages/list.php
+++ b/views/default/messages/list.php
@@ -8,14 +8,16 @@
*
* @uses $vars['object'] The array of message registers
*/
+
+if (!empty($vars['object']) && is_array($vars['object']) && sizeof($vars['object']) > 0) {
?>
-<div id="elgg-system-messages">
+<ul class="elgg-system-messages">
<?php
- if (!empty($vars['object']) && is_array($vars['object']) && sizeof($vars['object']) > 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));
}
?>
-</div> \ No newline at end of file
+</ul>
+<?php
+}
diff --git a/views/default/messages/messages/list.php b/views/default/messages/messages/list.php
index 6af17b929..924ebbd66 100644
--- a/views/default/messages/messages/list.php
+++ b/views/default/messages/messages/list.php
@@ -13,9 +13,9 @@ if (!empty($vars['object']) && is_array($vars['object'])) {
foreach($vars['object'] as $message) {
?>
- <div class="elgg-system-message hidden radius8">
+ <li class="elgg-state-success radius8">
<?php echo elgg_view('messages/messages/message',array('object' => $message)); ?>
- </div>
+ </li>
<?php
}
diff --git a/views/default/page_elements/content.php b/views/default/page_elements/content.php
index 35e67232c..ec0c3ec33 100644
--- a/views/default/page_elements/content.php
+++ b/views/default/page_elements/content.php
@@ -6,4 +6,6 @@
$content = isset($vars['body']) ? $vars['body'] : '';
+echo '<div class="elgg-body">';
echo $content;
+echo '</div>';
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 @@
*/
?>
-<div id="elgg-footer">
+<div class="elgg-footer">
<div id="elgg-footer-contents" class="clearfix">
<?php echo elgg_view('footer/links'); ?>
<a href="http://www.elgg.org" class="powered-by-elgg-badge">
diff --git a/views/default/page_elements/header.php b/views/default/page_elements/header.php
index 54a166b2d..81e14ec02 100644
--- a/views/default/page_elements/header.php
+++ b/views/default/page_elements/header.php
@@ -5,7 +5,7 @@
**/
?>
-<div id="elgg-header">
+<div class="elgg-header">
<div id="elgg-header-contents">
<?php
// link back to main site.
diff --git a/views/default/page_elements/topbar.php b/views/default/page_elements/topbar.php
index 8c19c6409..71fa1dc92 100644
--- a/views/default/page_elements/topbar.php
+++ b/views/default/page_elements/topbar.php
@@ -6,7 +6,7 @@
$user = get_loggedin_user();
if (($user instanceof ElggUser) && ($user->guid > 0)) {
- echo '<div id="elgg-topbar" class="clearfix">';
+ echo '<div class="elgg-topbar" class="clearfix">';
echo '<div id="elgg-topbar-contents">';
// Elgg logo
diff --git a/views/default/page_shells/default.php b/views/default/page_shells/default.php
index 0fd407a3d..0c7f56a60 100644
--- a/views/default/page_shells/default.php
+++ b/views/default/page_shells/default.php
@@ -25,10 +25,13 @@ if (empty($vars['title'])) {
}
echo elgg_view('page_elements/html_begin', $vars);
-echo elgg_view('page_elements/topbar', $vars);
-// @todo this probably should be somewhere else
echo elgg_view('messages/list', array('object' => $vars['sysmessages']));
+
+echo '<div class="elgg-page">';
+echo elgg_view('page_elements/topbar', $vars);
echo elgg_view('page_elements/header', $vars);
echo elgg_view('page_elements/content', $vars);
echo elgg_view('page_elements/footer', $vars);
+echo '</div>';
+
echo elgg_view('page_elements/html_end', $vars);
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-28 13:48:00 +0000