striking balance between all classes and giving ids on major layout elements for easy css-only theming

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

7 files changed, 93 insertions, 76 deletions

diff --git a/views/default/css/screen.php b/views/default/css/screen.php
index a8c825fdd..97303822c 100644
--- a/views/default/css/screen.php
+++ b/views/default/css/screen.php
@@ -240,26 +240,60 @@ h2 {
 /* ***************************************
 	PAGE LAYOUT - MAIN BLOCKS POSITIONING
 *************************************** */
-.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;
-	min-width:998px;
-	position:relative;
-	width:100%;
-	height:24px;
+#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;
+	min-width: 998px;
+	position: relative;
+	height: 24px;
 	z-index: 9000;
 }
-.elgg-page > .elgg-header {
+#elgg-page-header {
 	x-overflow: hidden;
 	position: relative;
-	width: 100%;
-	height:90px;
 	background-color: #4690D6;
 	background-image: url(<?php echo elgg_get_site_url(); ?>_graphics/header_shadow.png);
 	background-repeat: repeat-x;
 	background-position: bottom left;
 }
+#elgg-sidebar {
+	background-color: #eeeeee;
+	border-left: 1px solid #DEDEDE;
+	float: right;
+	width: 210px;
+	padding: 20px 10px;
+	position: relative;
+	min-height: 360px;
+}
+
+#elgg-main {
+	float: left;
+	width: 729px;
+	position: relative;
+	min-height: 360px;
+	margin: 10px 20px 20px 10px;
+}
+
+/* move this to one of the components */
+.elgg-body:after {
+	display: block;
+	visibility: hidden;
+	overflow: hidden;
+	height: 0 !important;
+	line-height: 0;
+	font-size: xx-large;
+	content: " x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x ";
+}
+#elgg-page-footer {
+	position: relative;
+	z-index: 999;
+}
+#elgg-page-footer-inner {
+	padding: 5px 0;
+	border-top:1px solid #DEDEDE;
+}
+
 #elgg-header-contents {
 	width:990px;
 	position: relative;
@@ -299,15 +333,7 @@ h2 {
 	min-height: 360px;
 	margin:10px 20px 20px 10px;
 }
-.elgg-layout > .elgg-aside {
-	background-color:#eeeeee;
-	border-left:1px solid #DEDEDE;
-	float:right;
-	width:209px;
-	padding:20px 10px;
-	position: relative;
-	min-height:360px;
-}
+
 #elgg-page-contents { /* main page contents */
 	float:left;
 	position: relative;
@@ -322,11 +348,10 @@ h2 {
 
 }
 .elgg-footer {
-	position: relative;
-	z-index: 999;
+
 }
 .elgg-footer > .elgg-inner {
-	border-top:1px solid #DEDEDE;
+
 	padding:3px 0 10px 0;
 }
 #elgg-footer-contents {
@@ -373,16 +398,7 @@ h2 {
 /* ***************************************
 	ELGG TOPBAR
 *************************************** */
-#elgg-topbar-contents {
-	float:left;
-	height:24px;
-	left:0px;
-	top:0px;
-	position:absolute;
-	text-align:left;
-	width:100%;
-}
-.elgg-topbar a {
+#elgg-topbar a {
 	margin-right:30px;
 	padding-top:2px;
 	display:inline;
@@ -390,54 +406,54 @@ h2 {
 	text-align: left;
 	color:#eeeeee;
 }
-.elgg-topbar a:hover {
+#elgg-topbar a:hover {
 	color:#71cbff;
 	text-decoration: none;
 }
-.elgg-topbar a img.user-mini-avatar {
+#elgg-topbar a img.user-mini-avatar {
 	border:1px solid #eeeeee;
 	margin:1px 0 0 10px;
 	display: block;
 }
-.elgg-topbar a img.site-logo {
+#elgg-topbar a img.site-logo {
 	display: block;
 	margin-left:5px;
 	margin-top: -1px;
 }
-.elgg-topbar .log-out {
+#elgg-topbar .log-out {
 	float:right;
 }
-.elgg-topbar .log-out a {
+#elgg-topbar .log-out a {
 	display: inline;
 	text-align: right;
 	margin-right:10px;
 	color:#999999;
 }
-.elgg-topbar .log-out a:hover {
+#elgg-topbar .log-out a:hover {
 	color:#71cbff;
 }
-.elgg-topbar a.myfriends {
+#elgg-topbar a.myfriends {
 	background:transparent url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png) no-repeat left -297px;
 	margin-right:30px;
 	text-indent: -900em;
 	width:36px;
 }
-.elgg-topbar a.myfriends:hover {
+#elgg-topbar a.myfriends:hover {
 	background-position: left -337px;
 }
-.elgg-topbar a.settings {
+#elgg-topbar a.settings {
 	background:transparent url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png) no-repeat -300px -41px;
 	padding-left:20px !important;
 	float:right;
 	margin-right:30px;
 }
-.elgg-topbar a.admin {
+#elgg-topbar a.admin {
 	background:transparent url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png) no-repeat -300px -41px;
 	padding-left:20px !important;
 	float:right;
 	margin-right:30px;
 }
-.elgg-topbar a.help {
+#elgg-topbar a.help {
 	background:transparent url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png) no-repeat -300px -133px;
 	padding-left:18px !important;
 	float:right;
@@ -448,7 +464,7 @@ h2 {
 /* ***************************************
 	HEADER CONTENTS
 *************************************** */
-.elgg-header > .elgg-inner {
+#elgg-page-header-inner {
 	position: relative;
 	height: 90px;
 }
diff --git a/views/default/layouts/one_column_with_sidebar.php b/views/default/layouts/one_column_with_sidebar.php
index 827fe19f4..daeb26cac 100644
--- a/views/default/layouts/one_column_with_sidebar.php
+++ b/views/default/layouts/one_column_with_sidebar.php
@@ -9,22 +9,21 @@
  * @uses $vars['sidebar'] Optional content that is displayed in the 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-sidebar" class="elgg-aside">
+	<?php
+		echo elgg_view('page_elements/sidebar', $vars);
+	?>
+</div>
 	
-	<div class="elgg-body elgg-width-content">
-		<?php
-			// @todo deprecated so remove in Elgg 2.0
-			if (isset($vars['area1'])) {
-				echo $vars['area1'];
-			}
-			if (isset($vars['content'])) {
-				echo $vars['content'];
-			}
-		?>
-	</div>
+<div id="elgg-main" class="elgg-body">
+	<?php
+		// @todo deprecated so remove in Elgg 2.0
+		if (isset($vars['area1'])) {
+			echo $vars['area1'];
+		}
+		if (isset($vars['content'])) {
+			echo $vars['content'];
+		}
+	?>
 </div>
diff --git a/views/default/page_elements/content.php b/views/default/page_elements/content.php
index ec0c3ec33..946237828 100644
--- a/views/default/page_elements/content.php
+++ b/views/default/page_elements/content.php
@@ -2,10 +2,14 @@
 /**
  * Elgg content wrapper
  * This file holds the main content
- **/
+ */
 
-$content = isset($vars['body']) ? $vars['body'] : '';
+$body = elgg_get_array_value('body', $vars, '');
 
-echo '<div class="elgg-body">';
-echo $content;
-echo '</div>';
+echo <<<HTML
+<div id="elgg-page-body" class="elgg-body">
+	<div id="elgg_page-body-inner" class="elgg-inner elgg-center elgg-width-classic clearfix">
+		$body
+	</div>
+</div>
+HTML;
diff --git a/views/default/page_elements/footer.php b/views/default/page_elements/footer.php
index d3bb0e89a..0e417e030 100644
--- a/views/default/page_elements/footer.php
+++ b/views/default/page_elements/footer.php
@@ -9,8 +9,8 @@
  */
 
 ?>
-<div class="elgg-footer">
-	<div class="elgg-inner elgg-center elgg-width-classic">
+<div id="elgg-page-footer" class="elgg-footer">
+	<div id="elgg-page-footer-inner" class="elgg-inner elgg-center elgg-width-classic clearfix">
 		<?php echo elgg_view('footer/links'); ?>
 		<a href="http://www.elgg.org" class="right">
 			<img src="<?php echo elgg_get_site_url(); ?>_graphics/powered_by_elgg_badge_drk_bckgnd.gif" alt="Powered by Elgg" />
diff --git a/views/default/page_elements/header.php b/views/default/page_elements/header.php
index eef6fb2ad..f6d158f06 100644
--- a/views/default/page_elements/header.php
+++ b/views/default/page_elements/header.php
@@ -5,8 +5,8 @@
  **/
 
 ?>
-<div class="elgg-header">
-	<div class="elgg-inner elgg-center elgg-width-classic">
+<div id="elgg-page-header" class="elgg-header">
+	<div id="elgg-page-header-inner" class="elgg-inner elgg-center elgg-width-classic">
 		<?php
 			// link back to main site.
 			echo elgg_view('page_elements/header_logo', $vars);
diff --git a/views/default/page_elements/topbar.php b/views/default/page_elements/topbar.php
index 19f15ccb4..0ccfc15c6 100644
--- a/views/default/page_elements/topbar.php
+++ b/views/default/page_elements/topbar.php
@@ -6,8 +6,8 @@
 
 $user = get_loggedin_user();
 if (($user instanceof ElggUser) && ($user->guid > 0)) {
-	echo '<div class="elgg-topbar">';
-	echo '<div class="elgg-inner">';
+	echo '<div id="elgg-topbar">';
+	echo '<div id="elgg-topbar-inner" class="elgg-inner">';
 	
 	// Elgg logo
 	echo '<a href="http://www.elgg.org">';
diff --git a/views/default/page_shells/default.php b/views/default/page_shells/default.php
index 0c7f56a60..0de41bff1 100644
--- a/views/default/page_shells/default.php
+++ b/views/default/page_shells/default.php
@@ -25,13 +25,11 @@ if (empty($vars['title'])) {
 }
 
 echo elgg_view('page_elements/html_begin', $vars);
-echo elgg_view('messages/list', array('object' => $vars['sysmessages']));
 
-echo '<div class="elgg-page">';
+echo elgg_view('messages/list', array('object' => $vars['sysmessages']));
 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);