From 4f108879b15e2b25583f56e3fa4a0db2922f0c60 Mon Sep 17 00:00:00 2001 From: dave Date: Mon, 16 Jun 2008 16:57:03 +0000 Subject: new canvas area added git-svn-id: https://code.elgg.org/elgg/trunk@933 36083f99-b078-4883-b0ff-0f9b5a30f544 --- .../canvas/layouts/narrow_right_sidebar.php | 40 ++++++++++++++++++++++ views/default/canvas/layouts/one_column.php | 16 ++++----- views/default/canvas/layouts/two_column.php | 26 ++------------ views/default/canvas/layouts/widgets.php | 8 +++-- 4 files changed, 55 insertions(+), 35 deletions(-) create mode 100644 views/default/canvas/layouts/narrow_right_sidebar.php (limited to 'views/default') 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 @@ + + + +
+
+ +
+ +
+ +
+

+
+ + + +
+
+ + + +
+

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

+ +
+
+ + + +
+

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

Goals

-

Here's all the edit controls for this widget

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

Tag cloud

-

Here's all the edit controls for this widget

-
- -
-
- +

@@ -49,7 +27,7 @@
- +

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 @@ -

Main content area widgets

-
+
+

Main content area widgets

@@ -107,6 +107,9 @@ + + + @@ -164,7 +167,6 @@
-

Widget 1 Title