From df33cae986557cc521fd5d0a7d4c956d256171cf Mon Sep 17 00:00:00 2001 From: pete Date: Thu, 12 Jun 2008 13:14:15 +0000 Subject: new layout using canvas view git-svn-id: https://code.elgg.org/elgg/trunk@886 36083f99-b078-4883-b0ff-0f9b5a30f544 --- views/default/canvas/layouts/one_column.php | 15 ++- views/default/canvas/layouts/two_column.php | 45 +++++++ views/default/canvas/layouts/widgets.php | 0 views/default/css.php | 28 ++--- views/default/pageshells/pageshell.php | 177 ++++++++++------------------ 5 files changed, 133 insertions(+), 132 deletions(-) create mode 100644 views/default/canvas/layouts/two_column.php create mode 100644 views/default/canvas/layouts/widgets.php (limited to 'views/default') 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 @@ -
- -
-
- -
\ No newline at end of file + +
+
+ + + +
+

+
\ 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 @@ + +
+
+ + +
+
+ -edit +

Goals

+

Here's all the edit controls for this widget

+
+ +
+
+ + + +
+
+ -edit +

Tag cloud

+

Here's all the edit controls for this widget

+
+ +
+
+ + +
+

+
+ + + +
+
+ + + +
+

+
+ + +
\ 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 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 @@ -sitename; - } else if (empty($vars['config']->sitename)) { - $title = $vars['title']; - } else { - $title = $vars['config']->sitename . ": " . $vars['title']; - } - -?> - - - - - - - $vars['sysmessages'])); ?> - - - -
-
- - - - - -
-
- - - -
-
- - -
-
- -edit -

Right sidebar

-

Here's all the edit controls for this widget

-
-

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

-
-
- -
-

-
- - - -
-
- -

- - -
-

-
- - -
- - -
-
- -
-
- -edit -

Spotlight

-
-
-

Here's all the edit controls for this widget

-
-
-

-
-
- -
-
- - - - - - +sitename; + } else if (empty($vars['config']->sitename)) { + $title = $vars['title']; + } else { + $title = $vars['config']->sitename . ": " . $vars['title']; + } + +?> + + + + + + + $vars['sysmessages'])); ?> + + + + +
+
+ + + + + +
+
+ + + +
+ +
+
+ + + + + + + + + -- cgit v1.2.3