3 files changed, 54 insertions, 6 deletions
diff --git a/views/default/canvas/layouts/one_column.php b/views/default/canvas/layouts/one_column.php
index d92969221..14b8ebae1 100644
--- a/views/default/canvas/layouts/one_column.php
+++ b/views/default/canvas/layouts/one_column.php
@@ -1,6 +1,9 @@
-<div style="float:right;width:240px;">
-<?php echo $vars['area2']; ?>
-</div>
-<div style="width:540px;">
-<?php echo $vars['area1']; ?>
-</div>
-\ No newline at end of file
+<!-- main content -->
+<div id="layout_maincontent">
+<div id="wrapper_maincontent">
+
+<?php echo $vars['area1']; ?>
+
+</div><!-- /#wrapper_maincontent -->
+<p></p><!-- necessary to avoid an ie7 bug? -->
+</div><!-- /#layout_maincontent -->	
+\ No newline at end of file
diff --git a/views/default/canvas/layouts/two_column.php b/views/default/canvas/layouts/two_column.php
new file mode 100644
index 000000000..83a690469
--- /dev/null
+++ b/views/default/canvas/layouts/two_column.php
@@ -0,0 +1,45 @@
+<!-- right sidebar -->
+<div id="layout_sidebar_right">
+<div id="wrapper_sidebar_right">
+
+	<!-- temp right sidebar box + dummy content -->
+	<div class="collapsable_box">
+	<div class="collapsable_box_header">
+	<a href="javascript:void(0);" class="toggle_box_contents">-</a><a href="javascript:void(0);" class="toggle_box_edit_panel">edit</a>
+	<h1>Goals</h1></div>
+	<div class="collapsable_box_editpanel"><p>Here's all the edit controls for this widget</p></div><!-- /collapsable_box_editpanel -->
+	<div class="collapsable_box_content">
+	   <?php echo $vars['area2']; ?>
+	</div><!-- /.collapsable_box_content -->
+	</div><!-- /.collapsable_box -->
+	
+	
+	<!-- temp right sidebar box + dummy content -->
+	<div class="collapsable_box">
+	<div class="collapsable_box_header">
+	<a href="javascript:void(0);" class="toggle_box_contents">-</a><a href="javascript:void(0);" class="toggle_box_edit_panel">edit</a>
+	<h1>Tag cloud</h1></div>
+	<div class="collapsable_box_editpanel"><p>Here's all the edit controls for this widget</p></div><!-- /collapsable_box_editpanel -->
+	<div class="collapsable_box_content">
+	   <?php echo $vars['area3']; ?>
+	</div><!-- /.collapsable_box_content -->
+	</div><!-- /.collapsable_box -->
+
+
+</div><!-- /#wrapper_sidebar_right -->
+<p></p><!-- necessary to avoid an ie7 bug? -->
+</div><!-- /#layout_sidebar_right -->
+
+    
+<!-- main content -->
+<div id="layout_maincontent" class="has_sidebar_right">
+<div id="wrapper_maincontent">
+
+    <?php echo $vars['area1']; ?>
+	
+</div><!-- /#wrapper_maincontent -->
+<p></p><!-- necessary to avoid an ie7 bug? -->
+</div><!-- /#layout_maincontent -->	
+	
+<!-- 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
diff --git a/views/default/canvas/layouts/widgets.php b/views/default/canvas/layouts/widgets.php
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/views/default/canvas/layouts/widgets.php