From 58e7394e2dabe3bcf92b5efdc1c3917973cdf943 Mon Sep 17 00:00:00 2001 From: cash Date: Sat, 4 Dec 2010 15:52:14 +0000 Subject: refs #1402 first cut of the new sidebar layout code (plus some other stuff - very non-atomic commit). blog plugin uses the one sidebar layout and bookmarks uses the two sidebar layout (for testing purposes) git-svn-id: http://code.elgg.org/elgg/trunk@7528 36083f99-b078-4883-b0ff-0f9b5a30f544 --- _graphics/two_sidebar_background.gif | Bin 0 -> 85 bytes mod/bookmarks/start.php | 2 +- views/default/content/header.php | 2 +- views/default/css/screen.php | 219 ++++++++++------------ views/default/layouts/one_column.php | 8 +- views/default/layouts/one_column_with_sidebar.php | 34 ++-- views/default/layouts/two_sidebar.php | 42 +++++ views/default/page_elements/content.php | 6 +- views/default/page_elements/footer.php | 4 +- views/default/page_elements/header.php | 4 +- views/default/page_elements/header_logo.php | 10 +- views/default/page_elements/main_header.php | 27 --- views/default/page_elements/main_module.php | 5 - views/default/page_elements/main_nav.php | 32 ---- views/default/page_elements/topbar.php | 4 +- 15 files changed, 180 insertions(+), 219 deletions(-) create mode 100644 _graphics/two_sidebar_background.gif create mode 100644 views/default/layouts/two_sidebar.php delete mode 100644 views/default/page_elements/main_header.php delete mode 100644 views/default/page_elements/main_module.php delete mode 100644 views/default/page_elements/main_nav.php diff --git a/_graphics/two_sidebar_background.gif b/_graphics/two_sidebar_background.gif new file mode 100644 index 000000000..947f5cf46 Binary files /dev/null and b/_graphics/two_sidebar_background.gif differ diff --git a/mod/bookmarks/start.php b/mod/bookmarks/start.php index 0528eb3b5..cc34d6e76 100644 --- a/mod/bookmarks/start.php +++ b/mod/bookmarks/start.php @@ -247,7 +247,7 @@ function bookmarks_page_handler($page) { 'content' => $content, 'sidebar' => $sidebar, ); - $body = elgg_view_layout('one_column_with_sidebar', $params); + $body = elgg_view_layout('two_sidebar', $params); echo elgg_view_page(elgg_echo("bookmarks:user", array(elgg_get_page_owner()->name)), $body); return TRUE; diff --git a/views/default/content/header.php b/views/default/content/header.php index 396e9adc9..469d79269 100644 --- a/views/default/content/header.php +++ b/views/default/content/header.php @@ -37,7 +37,7 @@ if ($context) { } } echo << +

$title

$buttons
HTML; diff --git a/views/default/css/screen.php b/views/default/css/screen.php index a5e5d19f7..00d4d8f5d 100644 --- a/views/default/css/screen.php +++ b/views/default/css/screen.php @@ -240,7 +240,7 @@ h2 { /* *************************************** PAGE LAYOUT - MAIN BLOCKS POSITIONING *************************************** */ -#elgg-topbar { +#elgg-page-topbar { background: #333333 url(_graphics/toptoolbar_background.gif) repeat-x top left; color: #eeeeee; border-bottom: 1px solid #000000; @@ -257,124 +257,100 @@ h2 { 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; +#elgg-page-footer { position: relative; - min-height: 360px; + z-index: 999; } -#elgg-main { - float: left; - width: 729px; +.elgg-layout-one_column { + padding: 10px 0; +} +.elgg-layout-sidebar { + background-image:url(_graphics/sidebar_background.gif); + background-repeat:repeat-y; + background-position: right top; +} +.elgg-layout-two-sidebar { + background-image:url(_graphics/two_sidebar_background.gif); + background-repeat:repeat-y; + background-position: right top; +} +.elgg-main { position: relative; min-height: 360px; - margin: 10px 20px 20px 10px; + padding: 10px; +} +.elgg-aside { + padding: 20px 10px; + position: relative; + min-height: 360px; +} +.elgg-sidebar { + float: right; + width: 210px; + margin-left: 10px; +} +.elgg-sidebar-alt { + float: left; + width: 160px; + margin-right: 10px; } -/* move this to one of the components */ +/* move elgg-body to one of the css components */ +/** + * elgg-body fills the space available to it. + * It uses hidden text to expand itself. The combination of auto width, overflow + * hidden, and the hidden text creates this effect. + * + * This allows us to float fixed width divs to either side of an .elgg-body div + * without having to specify the body div's width. + * + * @todo check what happens with long 
 tags or large images
+ */
+.elgg-body {
+	width: auto;
+	word-wrap: break-word;
+	overflow: hidden;
+}
 .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-main-header {
-    border-bottom: 1px solid #CCCCCC;
-    padding-bottom: 3px;
-}
 
-#elgg-header-contents {
-	width:990px;
-	position: relative;
-	margin:0 auto;
-	height:90px;
-}
-#elgg-search {
-	bottom:5px;
-	height:23px;
-	position:absolute;
-	right:0;
-}
-#elgg-main-nav {
-	z-index: 7000;
-	position: absolute;
-	height:23px;
-	bottom:0;
-	left:0;
-	width:auto;
-}
-#elgg-content { /* wraps sidebar and page contents */
-	width:990px;
-	position: relative;
-	overflow:hidden;
-	word-wrap:break-word;
-	margin:0 auto;
-	min-height:400px;
-}
-#elgg-content.sidebar { /* class on #elgg-content div to give a full-height sidebar background */
-	background-image:url(_graphics/sidebar_background.gif);
-	background-repeat:repeat-y;
-	background-position: right top;
-}
-.elgg-layout > .elgg-body {
-	float:left;
-	position: relative;
-	min-height: 360px;
-	margin:10px 20px 20px 10px;
+.elgg-module {
 }
 
-#elgg-page-contents { /* main page contents */
-	float:left;
-	position: relative;
-	min-height: 360px;
-	margin:10px 20px 20px 10px;
+.elgg_inner {
 }
-#elgg-page-contents.one-column { /* class on #elgg-page-contents when no sidebar */
-	width:970px;
-	margin-right:10px;
-}
-.elgg-aside { /* elgg sidebar */
 
+.elgg-header {
+	border-bottom: 1px solid #CCCCCC;
+	margin-bottom: 5px;
+	margin-top: 20px;
+	padding-bottom: 5px;
 }
-.elgg-footer {
 
+.elgg-footer {
 }
-.elgg-footer > .elgg-inner {
 
-	padding:3px 0 10px 0;
-}
-#elgg-footer-contents {
-	border-top:1px solid #DEDEDE;
-	margin:0 auto;
-	width:990px;
-	padding:3px 0 10px 0;
-	text-align: right;
+.elgg-main-header {
+    border-bottom: 1px solid #CCCCCC;
+    padding-bottom: 3px;
 }
 
-.elgg-aside h3 {
-	border-bottom:1px solid #CCCCCC;
-	margin-bottom:5px;
-	margin-top:20px;
-	padding-bottom:5px;
+.elgg-main-heading {
+	float: left;
+	max-width: 530px;
+	margin-right: 10px;
 }
 
+
 .elgg-center {
 	margin: 0 auto;
 }
@@ -383,28 +359,27 @@ h2 {
 	width: 990px;
 }
 
-.elgg-width-content {
-	width: 730px;
-}
 
-.elgg-module {
+#elgg-search {
+	bottom:5px;
+	height:23px;
+	position:absolute;
+	right:0;
 }
-
-.elgg-main-heading {
-	float: left;
-	max-width: 530px;
-	margin-right: 10px;
+#elgg-main-nav {
+	z-index: 7000;
+	position: absolute;
+	height:23px;
+	bottom:0;
+	left:0;
+	width:auto;
 }
 
-.elgg-maincontent-header {
-	border-bottom: 1px solid #CCCCCC;
-	padding-bottom: 3px;
-}
 
 /* ***************************************
 	ELGG TOPBAR
 *************************************** */
-#elgg-topbar a {
+#elgg-page-topbar a {
 	margin-right:30px;
 	padding-top:2px;
 	display:inline;
@@ -412,54 +387,54 @@ h2 {
 	text-align: left;
 	color:#eeeeee;
 }
-#elgg-topbar a:hover {
+#elgg-page-topbar a:hover {
 	color:#71cbff;
 	text-decoration: none;
 }
-#elgg-topbar a img.user-mini-avatar {
+#elgg-page-topbar a img.user-mini-avatar {
 	border:1px solid #eeeeee;
 	margin:1px 0 0 10px;
 	display: block;
 }
-#elgg-topbar a img.site-logo {
+#elgg-page-topbar a img.site-logo {
 	display: block;
 	margin-left:5px;
 	margin-top: -1px;
 }
-#elgg-topbar .log-out {
+#elgg-page-topbar .log-out {
 	float:right;
 }
-#elgg-topbar .log-out a {
+#elgg-page-topbar .log-out a {
 	display: inline;
 	text-align: right;
 	margin-right:10px;
 	color:#999999;
 }
-#elgg-topbar .log-out a:hover {
+#elgg-page-topbar .log-out a:hover {
 	color:#71cbff;
 }
-#elgg-topbar a.myfriends {
+#elgg-page-topbar a.myfriends {
 	background:transparent url(_graphics/elgg_sprites.png) no-repeat left -297px;
 	margin-right:30px;
 	text-indent: -900em;
 	width:36px;
 }
-#elgg-topbar a.myfriends:hover {
+#elgg-page-topbar a.myfriends:hover {
 	background-position: left -337px;
 }
-#elgg-topbar a.settings {
+#elgg-page-topbar a.settings {
 	background:transparent url(_graphics/elgg_sprites.png) no-repeat -300px -41px;
 	padding-left:20px !important;
 	float:right;
 	margin-right:30px;
 }
-#elgg-topbar a.admin {
+#elgg-page-topbar a.admin {
 	background:transparent url(_graphics/elgg_sprites.png) no-repeat -300px -41px;
 	padding-left:20px !important;
 	float:right;
 	margin-right:30px;
 }
-#elgg-topbar a.help {
+#elgg-page-topbar a.help {
 	background:transparent url(_graphics/elgg_sprites.png) no-repeat -300px -133px;
 	padding-left:18px !important;
 	float:right;
@@ -475,7 +450,7 @@ h2 {
 	height: 90px;
 }
 
-.elgg-header h1 a span.network-title {
+#elgg-page-header h1 a span.network-title {
 	font-size: 2em;
 	line-height:1.4em;
 	color: white;
@@ -485,7 +460,7 @@ h2 {
 	text-decoration: none;
 	text-shadow:1px 2px 4px #333333;
 }
-.elgg-header #elgg-search input.search-input {
+#elgg-page-header #elgg-search input.search-input {
 	-webkit-border-radius: 10px;
 	-moz-border-radius: 10px;
 	background-color:transparent;
@@ -500,19 +475,19 @@ h2 {
 	background-position: 2px -220px;
 	background-repeat: no-repeat;
 }
-.elgg-header #elgg-search input.search-input:focus {
+#elgg-page-header #elgg-search input.search-input:focus {
 	background-color:white;
 	color:#0054A7;
 	border:1px solid white;
 	background-position: 2px -257px;
 }
-.elgg-header #elgg-search input.search-input:active {
+#elgg-page-header #elgg-search input.search-input:active {
 	background-color:white;
 	color:#0054A7;
 	border:1px solid white;
 	background-position: 2px -257px;
 }
-.elgg-header #elgg-search input.search-submit-button {
+#elgg-page-header #elgg-search input.search-submit-button {
 	display:none;
 }
 
@@ -649,6 +624,12 @@ li.navigation-more ul li {
 /* ***************************************
 	FOOTER CONTENTS
 *************************************** */
+
+#elgg-page-footer-inner {
+	padding: 5px 0;
+	border-top:1px solid #DEDEDE;
+}
+
 #elgg-footer-contents,
 #elgg-footer-contents a,
 #elgg-footer-contents p {
diff --git a/views/default/layouts/one_column.php b/views/default/layouts/one_column.php
index e3189a309..84a304e14 100644
--- a/views/default/layouts/one_column.php
+++ b/views/default/layouts/one_column.php
@@ -8,9 +8,9 @@
  * @uses $vars['content'] Content string
  */
 ?>
-

-	

-		
-		
+

+	

+	
+	
 	

 

\ No newline at end of file
diff --git a/views/default/layouts/one_column_with_sidebar.php b/views/default/layouts/one_column_with_sidebar.php
index daeb26cac..e408c6c1c 100644
--- a/views/default/layouts/one_column_with_sidebar.php
+++ b/views/default/layouts/one_column_with_sidebar.php
@@ -10,20 +10,22 @@
  */
 ?>
 
-

-	
-

-	
-

-	
+

+	

+		
+	

+
+	

+		
+	

 

diff --git a/views/default/layouts/two_sidebar.php b/views/default/layouts/two_sidebar.php
new file mode 100644
index 000000000..26fb64920
--- /dev/null
+++ b/views/default/layouts/two_sidebar.php
@@ -0,0 +1,42 @@
+
+
+

+	

+		
+	

+	

+		 elgg_view('layout_elements/module', array('title' => 'Testing', 'body' => 'Hello, world!'))
+			);
+			echo elgg_view('page_elements/sidebar', $params);
+		?>
+	

+
+	

+		
+	

+

diff --git a/views/default/page_elements/content.php b/views/default/page_elements/content.php
index 946237828..14292ce59 100644
--- a/views/default/page_elements/content.php
+++ b/views/default/page_elements/content.php
@@ -7,9 +7,7 @@
 $body = elgg_get_array_value('body', $vars, '');
 
 echo <<
-	

-		$body
-	

+

+	$body
 

 HTML;
diff --git a/views/default/page_elements/footer.php b/views/default/page_elements/footer.php
index 0e417e030..42cb6a2fc 100644
--- a/views/default/page_elements/footer.php
+++ b/views/default/page_elements/footer.php
@@ -9,8 +9,8 @@
  */
 
 ?>
-

-	

+

+	

 		
 		
 			Powered by Elgg
diff --git a/views/default/page_elements/header.php b/views/default/page_elements/header.php
index f6d158f06..476919591 100644
--- a/views/default/page_elements/header.php
+++ b/views/default/page_elements/header.php
@@ -5,8 +5,8 @@
  **/
 
 ?>
-

-	

+

+	

 		
 
-

-sitename; ?>
-

+

+	
+		sitename; ?>
+	
+

diff --git a/views/default/page_elements/main_header.php b/views/default/page_elements/main_header.php
deleted file mode 100644
index 438a6c432..000000000
--- a/views/default/page_elements/main_header.php
+++ /dev/null
@@ -1,27 +0,0 @@
-username;
-
-$title = elgg_echo($type);
-
-$new_button = '';
-if (isloggedin()) {
-	$new_link = elgg_get_array_value('new_link', $vars, "pg/$type/$username/new");
-	$params = array(
-		'href' => $new_link = elgg_normalize_url($new_link),
-		'text' => elgg_echo("$type:new"),
-		'class' => 'action-button right',
-	);
-	$new_button = elgg_view('output/url', $params);
-}
-
-echo <<$title
-$new_button
-HTML;
diff --git a/views/default/page_elements/main_module.php b/views/default/page_elements/main_module.php
deleted file mode 100644
index 388a500fe..000000000
--- a/views/default/page_elements/main_module.php
+++ /dev/null
@@ -1,5 +0,0 @@
-username;
-
-// so we know if the user is looking at their own, everyone's or all friends
-$filter_context = $vars['context'];
-
-// generate a list of default tabs
-$default_tabs = array(
-	'all' => array(
-		'title' => elgg_echo('all'),
-		'url' => (isset($vars['all_link'])) ? $vars['all_link'] : "pg/$type/",
-		'selected' => ($filter_context == 'everyone'),
-	),
-	'mine' => array(
-		'title' => elgg_echo('mine'),
-		'url' => (isset($vars['mine_link'])) ? $vars['mine_link'] : "pg/$type/$username",
-		'selected' => ($filter_context == 'mine'),
-	),
-	'friend' => array(
-		'title' => elgg_echo('friends'),
-		'url' => (isset($vars['friend_link'])) ? $vars['friend_link'] : "pg/$type/$username/friends",
-		'selected' => ($filter_context == 'friends'),
-	),
-);
-
-// determine if using default or overwritten tabs
-$tabs = elgg_get_array_value('tabs', $vars, $default_tabs);
-echo elgg_view('navigation/tabs', array('tabs' => $tabs));
\ No newline at end of file
diff --git a/views/default/page_elements/topbar.php b/views/default/page_elements/topbar.php
index 0ccfc15c6..0f7b8f467 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 '
';
-	echo '
';
+	echo '
';
+	echo '
';
 	
 	// Elgg logo
 	echo '';
-- 
cgit v1.2.3