diff options
Diffstat (limited to 'views')
| -rw-r--r-- | views/default/canvas/layouts/narrow_right_sidebar.php | 40 | ||||
| -rw-r--r-- | views/default/canvas/layouts/one_column.php | 16 | ||||
| -rw-r--r-- | views/default/canvas/layouts/two_column.php | 26 | ||||
| -rw-r--r-- | views/default/canvas/layouts/widgets.php | 8 |
4 files changed, 55 insertions, 35 deletions
diff --git a/views/default/canvas/layouts/narrow_right_sidebar.php b/views/default/canvas/layouts/narrow_right_sidebar.php new file mode 100644 index 000000000..bc6c54725 --- /dev/null +++ b/views/default/canvas/layouts/narrow_right_sidebar.php @@ -0,0 +1,40 @@ +<?php
+
+ /**
+ * Elgg two-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/
+ */
+
+?>
+
+<!-- right sidebar -->
+<div id="layout_sidebar_right" style="width:160px;">
+<div id="wrapper_sidebar_right">
+
+ <div style="border:1px solid silver;">
+ <?php echo $vars['area2']; ?>
+ </div>
+
+</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" style="width:600px;">
+<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/one_column.php b/views/default/canvas/layouts/one_column.php index 12b31aa4e..207b57929 100644 --- a/views/default/canvas/layouts/one_column.php +++ b/views/default/canvas/layouts/one_column.php @@ -13,12 +13,12 @@ ?>
-<!-- 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? --> +<!-- 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 index 9b1cfd17c..ccc2fee6a 100644 --- a/views/default/canvas/layouts/two_column.php +++ b/views/default/canvas/layouts/two_column.php @@ -17,29 +17,7 @@ <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 --> - + <?php echo $vars['area2']; ?> </div><!-- /#wrapper_sidebar_right --> <p></p><!-- necessary to avoid an ie7 bug? --> @@ -49,7 +27,7 @@ <!-- main content --> <div id="layout_maincontent" class="has_sidebar_right"> <div id="wrapper_maincontent"> - + <h2><?php echo $vars['title']; ?></h2> <?php echo $vars['area1']; ?> </div><!-- /#wrapper_maincontent --> diff --git a/views/default/canvas/layouts/widgets.php b/views/default/canvas/layouts/widgets.php index b9227c64a..a649e34de 100644 --- a/views/default/canvas/layouts/widgets.php +++ b/views/default/canvas/layouts/widgets.php @@ -50,9 +50,9 @@ <tr> <td width="300px"> -<h2>Main content area widgets</h2> -<div id="main_widgets"> +<div id="main_widgets"> +<h2>Main content area widgets</h2> <table class="draggable_widget" cellspacing="0"><tr><td width="149px"><h3>Widget 1 Title</h3></td> <td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/icon_customise_remove.gif" class="remove_me" /></a></td> <td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/icon_customise_info.gif" class="more_info" /></a></td> @@ -107,6 +107,9 @@ </div><!-- /#customise_page_view --> +<textarea type="textarea" value="Main widgets" style="width:400px;height:60px;" id="debugField1" /></textarea> +<textarea type="textarea" value="Right widgets" style="width:400px;height:40px;" id="debugField2" /></textarea> + <input type="submit" value="Save changes" class="submit_button" /> </div><!-- /customise_editpanel --> @@ -164,7 +167,6 @@ <div id="layout_maincontent" class="has_sidebar_right"> <div id="wrapper_maincontent"> - <?php echo $vars['area1']; ?> <?php |