canvas layout updates, ie6&7 layout fixes, new 3-column widget view

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

1 files changed, 32 insertions, 32 deletions

diff --git a/views/default/canvas/layouts/widgets.php b/views/default/canvas/layouts/widgets.php
index 55d3a1b70..785ebabee 100644
--- a/views/default/canvas/layouts/widgets.php
+++ b/views/default/canvas/layouts/widgets.php
@@ -187,54 +187,54 @@ Choose the features you want to add to your page by dragging them from the <b>Wi
 		
 ?>
 
-<!-- right sidebar -->
-<div id="layout_sidebar_right">
-<div id="wrapper_sidebar_right">
-
-<?php 
-   if($_SESSION['user']->guid == page_owner()){
-?>
-	<!-- customise page button -->
-	<a href="javascript:void(0);" class="toggle_customise_edit_panel">Customise Layout</a>
-	<div style="clear:both;"></div>
-<?php
- }
-?>
+<!-- profile box -->
+<?php echo $vars['area1']; ?>
 
 
-	<?php if (isset($vars['area2'])) echo $vars['area2']; ?>
+<!-- right sidebar -->
+<div id="widgets_left">
+	
 	<?php
 
-		if (is_array($area2widgets) && sizeof($area2widgets) > 0)
-		foreach($area2widgets as $widget) {
+		if (is_array($area1widgets) && sizeof($area1widgets) > 0)
+		foreach($area1widgets as $widget) {
 			echo elgg_view_entity($widget);
 		}
 	
 	?>
-
-
-</div><!-- /#wrapper_sidebar_right -->
-<p></p><!-- necessary to avoid an ie7 bug? -->
-</div><!-- /#layout_sidebar_right -->
+	
+</div><!-- /#widgets_left -->
 
     
 <!-- main content -->
-<div id="layout_maincontent" class="has_sidebar_right">
-<div id="wrapper_maincontent">
-
-	<?php echo $vars['area1']; ?>
+<div id="widgets_middle">
+	
+	<?php if (isset($vars['area2'])) echo $vars['area2']; ?>
 	<?php
 
-		if (is_array($area1widgets) && sizeof($area1widgets) > 0)
-		foreach($area1widgets as $widget) {
+		if (is_array($area2widgets) && sizeof($area2widgets) > 0)
+		foreach($area2widgets as $widget) {
 			echo elgg_view_entity($widget);
 		}
 	
 	?>
 	
-</div><!-- /#wrapper_maincontent -->
-<p></p><!-- necessary to avoid an ie7 bug? -->
-</div><!-- /#layout_maincontent .has_sidebar_right -->	
+</div><!-- /#widgets_middle -->
+
+<?php 
+   if($_SESSION['user']->guid == page_owner()){
+?>
+	<!-- customise page button -->
+	<a href="javascript:void(0);" class="toggle_customise_edit_panel">Edit widgets</a>
+	<!-- <div style="clear:both;"></div> -->
+<?php
+ }
+?>
+
+<div id="widgets_right">
+<!-- this is where we need another widget column adding -->
+
+</div><!-- /#widgets_right -->	
+
 
-<!-- This clearing element should immediately follow the #layout_maincontent to force the #container to contain all child floats -->
-<div class="clearfloat"></div>
\ No newline at end of file
+<!-- <div class="clearfloat"></div> -->