aboutsummaryrefslogtreecommitdiff
path: root/views
diff options
context:
space:
mode:
Diffstat (limited to 'views')
-rw-r--r--views/default/canvas/layouts/one_column.php15
-rw-r--r--views/default/canvas/layouts/two_column.php45
-rw-r--r--views/default/canvas/layouts/widgets.php0
-rw-r--r--views/default/css.php28
-rw-r--r--views/default/pageshells/pageshell.php177
5 files changed, 133 insertions, 132 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
diff --git a/views/default/css.php b/views/default/css.php
index b1b0f5ba6..d1d09599b 100644
--- a/views/default/css.php
+++ b/views/default/css.php
@@ -167,26 +167,30 @@ h6 { font-size: 0.8em; }
margin:0;
}
+#layout_canvas {
+ margin:20px 20px 20px 160px;
+ min-height: 360px;
+}
+
#layout_sidebar_right {
- width:233px; /* 260-27*/
+ width:250px; /* 260-10*/
min-height: 260px;
float:right;
- padding:20px 20px 14px 7px;
+ padding:0px 0px 20px 10px;
}
-
#wrapper_sidebar_right {
margin:0;
}
#layout_maincontent {
- margin:0 260px 0 160px;
- min-height: 360px;
- padding:20px 13px 20px 20px;
+ padding:0px 10px 20px 20px;
+}
+#wrapper_maincontent {
+ margin:0;
}
-/* subclass for maincontent when hiding sidebar */
-.wide {
- margin:0 0 0 160px !important;
- padding:20px 20px 20px 20px !important;
+/* subclass for layout_maincontent when showing rhs sidebar */
+.has_sidebar_right {
+ margin:0 260px 0 0 !important;
}
/* IE6 fix */
* html #layout_maincontent {
@@ -207,10 +211,6 @@ h6 { font-size: 0.8em; }
padding:0;
}
-#wrapper_maincontent {
- margin:0;
-}
-
#layout_spotlight {
padding:0;
}
diff --git a/views/default/pageshells/pageshell.php b/views/default/pageshells/pageshell.php
index 1bc09444d..e82e47aac 100644
--- a/views/default/pageshells/pageshell.php
+++ b/views/default/pageshells/pageshell.php
@@ -1,112 +1,65 @@
-<?php
-
- /**
- * Elgg pageshell
- * The standard HTML page shell that everything else fits into
- *
- * @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['config'] The site configuration settings, imported
- * @uses $vars['title'] The page title
- * @uses $vars['body'] The main content of the page
- * @uses $vars['messages'] A 2d array of various message registers, passed from system_messages()
- */
-
- // Set title
- if (empty($vars['title'])) {
- $title = $vars['config']->sitename;
- } else if (empty($vars['config']->sitename)) {
- $title = $vars['title'];
- } else {
- $title = $vars['config']->sitename . ": " . $vars['title'];
- }
-
-?>
-
-<?php echo elgg_view('page_elements/header', $vars); ?>
-
-<!-- main contents -->
-
-<!-- display any system messages -->
-<?php echo elgg_view('messages/list', array('object' => $vars['sysmessages'])); ?>
-
-
-<!-- left sidebar -->
-<div id="layout_sidebar_left">
-<div id="wrapper_sidebar_left">
-
-<?php echo elgg_view("navigation/toolbox", $vars); ?>
-
-<?php echo $vars['sidebar']; ?>
-
-</div><!-- /#wrapper_sidebar_left -->
-</div><!-- /#layout_sidebar_left -->
-
-
-<!-- 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>Right sidebar</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">
- <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
- Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
- Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.
- Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum</p>
- </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">
-<div id="wrapper_maincontent">
-
- <h1><?php echo $title; ?></h1>
- <?php echo $vars['body']; ?>
-
-</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>
-
-
-<div id="layout_spotlight">
-<div id="wrapper_spotlight">
-
-<div class="collapsable_box no_space_after">
- <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>Spotlight</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">
- <p><img src="<?php echo $vars['url']; ?>_graphics/spacer.gif" border="0" width=100% height=184px /></p>
- </div><!-- /.collapsable_box_content -->
-</div><!-- /.collapsable_box -->
-
-</div><!-- /#wrapper_spotlight -->
-</div><!-- /#layout_spotlight -->
-
-
-
-
-<!-- footer -->
-<?php echo elgg_view('page_elements/footer', $vars); ?>
+<?php
+
+ /**
+ * Elgg pageshell
+ * The standard HTML page shell that everything else fits into
+ *
+ * @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['config'] The site configuration settings, imported
+ * @uses $vars['title'] The page title
+ * @uses $vars['body'] The main content of the page
+ * @uses $vars['messages'] A 2d array of various message registers, passed from system_messages()
+ */
+
+ // Set title
+ if (empty($vars['title'])) {
+ $title = $vars['config']->sitename;
+ } else if (empty($vars['config']->sitename)) {
+ $title = $vars['title'];
+ } else {
+ $title = $vars['config']->sitename . ": " . $vars['title'];
+ }
+
+?>
+
+<?php echo elgg_view('page_elements/header', $vars); ?>
+
+<!-- main contents -->
+
+<!-- display any system messages -->
+<?php echo elgg_view('messages/list', array('object' => $vars['sysmessages'])); ?>
+
+
+
+<!-- left sidebar -->
+<div id="layout_sidebar_left">
+<div id="wrapper_sidebar_left">
+
+<?php echo elgg_view("navigation/toolbox", $vars); ?>
+
+<?php echo $vars['sidebar']; ?>
+
+</div><!-- /#wrapper_sidebar_left -->
+</div><!-- /#layout_sidebar_left -->
+
+
+<!-- canvas -->
+<div id="layout_canvas">
+<?php echo $vars['body']; ?>
+<div class="clearfloat"></div>
+</div><!-- /#layout_canvas -->
+
+
+
+<!-- spotlight -->
+<?php echo elgg_view('page_elements/spotlight', $vars); ?>
+
+
+<!-- footer -->
+<?php echo elgg_view('page_elements/footer', $vars); ?>