more canvas layout additions, and page owner block added to sidebar

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

3 files changed, 103 insertions, 96 deletions

diff --git a/views/default/canvas/layouts/one_column.php b/views/default/canvas/layouts/one_column.php
index c818bc439..661df772a 100644
--- a/views/default/canvas/layouts/one_column.php
+++ b/views/default/canvas/layouts/one_column.php
@@ -1,24 +1,21 @@
-<?php

-

-	/**

-	 * Elgg one-column layout

-	 * 

-	 * @package Elgg

-	 * @subpackage Core

-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2

-	 * @author Curverider Ltd

-	 * @copyright Curverider Ltd 2008

-	 * @link http://elgg.org/

-	 */

-

-?>

-

-<!-- main content -->

-<div id="layout_maincontent" class="no_sidebar">

-<div id="wrapper_maincontent" class="single_column">

-

-<?php echo $vars['area1']; ?>

-

-</div><!-- /#wrapper_maincontent -->

-<p></p><!-- necessary to avoid an ie7 bug? -->

-</div><!-- /#layout_maincontent -->	
\ No newline at end of file
+<?php
+
+	/**
+	 * Elgg one-column layout
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008
+	 * @link http://elgg.org/
+	 */
+
+?>
+
+<!-- main content -->
+<div id="one_column">
+
+<?php echo $vars['area1']; ?>
+
+</div><!-- /one_column -->	
\ No newline at end of file
diff --git a/views/default/css.php b/views/default/css.php
index e65970493..eb53d1fa8 100644
--- a/views/default/css.php
+++ b/views/default/css.php
@@ -166,6 +166,17 @@ h6 { font-size: 0.8em; }
 	min-height: 360px;
 }
 
+/* canvas layout: 1 column, no sidebar */
+#one_column {
+	width:918px;
+	margin:0;
+	min-height: 360px;
+	background: white;
+	padding:20px;
+	border-right: 1px solid #cccccc;
+	border-bottom: 1px solid #cccccc;
+}
+
 /* canvas layout: 2 column left sidebar */
 #two_column_left_sidebar {
 	width:170px;
@@ -212,12 +223,19 @@ h6 { font-size: 0.8em; }
 	border-right:1px solid #cccccc;
 }
 
+
+
+
+
+
+
 #owner_block {
 	background:#FDFFC3;
 }
 
 
 
+/*
 
 
 #layout_sidebar_left {
@@ -236,7 +254,7 @@ h6 { font-size: 0.8em; }
 
 
 #layout_sidebar_right {
-	width:250px; /* 260-10*/
+	width:250px; 
 	min-height: 260px;
 	float:right;
 	padding:0px 0px 20px 10px;
@@ -257,7 +275,6 @@ h6 { font-size: 0.8em; }
 	width:160px;
 	min-height: 260px;
 	float:right;
-	/* padding:0px 0px 20px 10px;*/
 	background: white;
 	padding:10px;
 	border-bottom:1px solid #cccccc;
@@ -271,14 +288,20 @@ h6 { font-size: 0.8em; }
 	margin:0;
 	
 }
+
+*/
 /* subclass for layout_maincontent when showing rhs sidebar */
+
+/*
 .has_sidebar_right {
     margin:0 260px 0 0 !important;
 }
 .has_narrow_sidebar_right {
     margin:0 190px 0 0 !important;
 }
+*/
 /* IE6 fix */
+/*
 * html #layout_maincontent { 
 	height:360px;
 }
@@ -286,6 +309,7 @@ h6 { font-size: 0.8em; }
 #layout_maincontent.no_sidebar {
     padding:0px 0px 20px 20px !important;
 }
+*/
 
 /*
 
@@ -297,6 +321,7 @@ h6 { font-size: 0.8em; }
 }
 
 */
+/*
 
 #wrapper_maincontent.content_area {
 	background: white;
@@ -305,6 +330,7 @@ h6 { font-size: 0.8em; }
 	border-right:1px solid #cccccc;
 }
 
+*/
 
 
 /* 
@@ -317,11 +343,15 @@ h6 { font-size: 0.8em; }
 	border: 1px solid #cccccc;
 }
 */
+/*
 #wrapper_maincontent .collapsable_box_content  {
 	margin:0;
-	/* padding:0; */
 }
 
+
+*/
+
+
 #layout_spotlight {
 	padding:0;
 }
@@ -1426,36 +1456,18 @@ table.search_gallery {
 }	
 	
 /* ***************************************
-	page titles and submenu
+	owner block
 *************************************** */
-/* page titles 
-#canvas_header {
-	margin:0 0 20px 0;
-	padding:0 0 5px 0;
-	border-bottom:1px solid #4690d6;
-}
-*/
-#canvas_header_icon {
+#owner_block_icon {
 	float:left;
 	margin:0 10px 0 0;
-}
-	
-#canvas_header #canvas_header_content h2 {
-
-
 }	
-#canvas_header_content {
+#owner_block_content {
 	margin:0 0 10px 0;
 	padding:0 0 5px 0;
 	border-bottom:1px solid #4690d6;
 }
-/*
-#wrapper_maincontent.single_column {
-	margin:0;
-	padding:10px 20px;
-}
-*/
-#canvas_header_submenu {
+#owner_block_submenu {
 	margin:10px 0 10px 0;
 	padding: 0;
 	border-bottom: 1px solid #cccccc;
@@ -1463,11 +1475,12 @@ table.search_gallery {
 	width:100%;
 }
 
-#canvas_header_submenu ul {
+#owner_block ul {
 	list-style: none;
 	padding: 0;
 	margin: 0;
 }
+/*
 
 #canvas_header_submenu li {
 	float: left;
@@ -1499,7 +1512,8 @@ table.search_gallery {
 	color: #4690d6;
 }
 	
-	
+
+*/	
 /* ***************************************
 	friends collections accordian
 *************************************** */	
diff --git a/views/default/page_elements/title.php b/views/default/page_elements/title.php
index 04dc8eea7..87e36e06a 100644
--- a/views/default/page_elements/title.php
+++ b/views/default/page_elements/title.php
@@ -1,46 +1,42 @@
-<?php

-

-	/**

-	 * Elgg title element

-	 * 

-	 * @package Elgg

-	 * @subpackage Core

-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2

-	 * @author Curverider Ltd

-	 * @copyright Curverider Ltd 2008

-	 * @link http://elgg.org/

-	 * 

-	 * @uses $vars['title'] The page title

-	 */

-

-	$page_owner = page_owner();

-	$page_owner_user = get_entity($page_owner);

-

-	$submenu = get_submenu(); // elgg_view('canvas_header/submenu');

-	if (!empty($submenu)) $submenu = "<ul>" . $submenu . "</ul>";

-	

-	if($page_owner && $page_owner_user->guid != $_SESSION['user']->getGUID()) {

-		$info = "<h2>" . $vars['title'] . "</h2>";

-		$icon = elgg_view("profile/icon",array('entity' => $page_owner_user, 'size' => 'tiny'));

-		$display = "<div id=\"canvas_header\">";

-		$display .= "<div id=\"canvas_header_icon\">" . $icon . "</div>";

-		$display .= "<div id=\"canvas_header_content\">" . $info . "</div>";

-		if (!empty($submenu) && $vars['submenu'] == true)

-			$display .= "<div id=\"canvas_header_submenu\">" . $submenu . "</div>"; // plugins can extend this to add menu options

-		$display .= "</div>";

-	} else {

-		$info = "<h2>" . $vars['title'] . "</h2>";

-		$display = "<div id=\"canvas_header\">";

-		$display .= "<div id=\"canvas_header_content\">" . $info . "</div>";

-		if (!empty($submenu)  && $vars['submenu'] == true)

-			$display .= "<div id=\"canvas_header_submenu\">" . $submenu . "</div>"; // plugins can extend this to add menu options

-		$display .= "</div>";

-	}

-

-

-	//print to screen

-		echo $display;

-

-

-

+<?php
+
+	/**
+	 * Elgg title element
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008
+	 * @link http://elgg.org/
+	 * 
+	 * @uses $vars['title'] The page title
+	 */
+
+	$page_owner = page_owner();
+	$page_owner_user = get_entity($page_owner);
+
+	$submenu = get_submenu(); // elgg_view('canvas_header/submenu');
+	if (!empty($submenu)) $submenu = "<ul>" . $submenu . "</ul>";
+	
+	if($page_owner && $page_owner_user->guid != $_SESSION['user']->getGUID()) {
+		$info = "<h2>" . $vars['title'] . "</h2>";
+		$icon = elgg_view("profile/icon",array('entity' => $page_owner_user, 'size' => 'tiny'));
+		$display = "<div id=\"owner_block_icon\">" . $icon . "</div>";
+		$display .= "<div id=\"owner_block_content\">" . $info . "</div>";
+		if (!empty($submenu) && $vars['submenu'] == true)
+			$display .= "<div id=\"owner_block_submenu\">" . $submenu . "</div>"; // plugins can extend this to add menu options
+	} else {
+		$info = "<h2>" . $vars['title'] . "</h2>";
+		$display .= "<div id=\"owner_block_content\">" . $info . "</div>";
+		if (!empty($submenu)  && $vars['submenu'] == true)
+			$display .= "<div id=\"owner_block_submenu\">" . $submenu . "</div>"; // plugins can extend this to add menu options
+	}
+
+
+	//print to screen
+		echo $display;
+
+
+
 ?>
\ No newline at end of file