From 2aae26964b28be8281a75cf97034c90b8c8d736e Mon Sep 17 00:00:00 2001 From: ewinslow Date: Mon, 21 Feb 2011 20:29:17 +0000 Subject: Refs #2950: Move page/shells/ directly under /page/ since nowhere else in views do we use a shells directory. git-svn-id: http://code.elgg.org/elgg/trunk@8387 36083f99-b078-4883-b0ff-0f9b5a30f544 --- engine/lib/views.php | 2 +- views/default/page/admin.php | 28 +++++++++++ views/default/page/default.php | 65 ++++++++++++++++++++++++ views/default/page/shells/admin.php | 28 ----------- views/default/page/shells/default.php | 65 ------------------------ views/default/page/shells/upgrade.php | 22 -------- views/default/page/shells/walled_garden.php | 78 ----------------------------- views/default/page/upgrade.php | 22 ++++++++ views/default/page/walled_garden.php | 78 +++++++++++++++++++++++++++++ 9 files changed, 194 insertions(+), 194 deletions(-) create mode 100644 views/default/page/admin.php create mode 100644 views/default/page/default.php delete mode 100644 views/default/page/shells/admin.php delete mode 100644 views/default/page/shells/default.php delete mode 100644 views/default/page/shells/upgrade.php delete mode 100644 views/default/page/shells/walled_garden.php create mode 100644 views/default/page/upgrade.php create mode 100644 views/default/page/walled_garden.php diff --git a/engine/lib/views.php b/engine/lib/views.php index f019fee5f..bed9ee874 100644 --- a/engine/lib/views.php +++ b/engine/lib/views.php @@ -602,7 +602,7 @@ function elgg_view_page($title, $body, $page_shell = 'default', $vars = array()) $vars['sysmessages'] = $messages; // Draw the page - $output = elgg_view("page/shells/$page_shell", $vars); + $output = elgg_view("page/$page_shell", $vars); $vars['page_shell'] = $page_shell; diff --git a/views/default/page/admin.php b/views/default/page/admin.php new file mode 100644 index 000000000..211bd4037 --- /dev/null +++ b/views/default/page/admin.php @@ -0,0 +1,28 @@ + + + + + + + +

+ +

+ + + + \ No newline at end of file diff --git a/views/default/page/default.php b/views/default/page/default.php new file mode 100644 index 000000000..ba11fd69b --- /dev/null +++ b/views/default/page/default.php @@ -0,0 +1,65 @@ + + + + + + + +

+ $vars['sysmessages'])); ?> +

+ + + + + + +

+ +

+ + + \ No newline at end of file diff --git a/views/default/page/shells/admin.php b/views/default/page/shells/admin.php deleted file mode 100644 index 211bd4037..000000000 --- a/views/default/page/shells/admin.php +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - -

- -

- - - - \ No newline at end of file diff --git a/views/default/page/shells/default.php b/views/default/page/shells/default.php deleted file mode 100644 index ba11fd69b..000000000 --- a/views/default/page/shells/default.php +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - -

- $vars['sysmessages'])); ?> -

- - - - - - -

- -

- - - \ No newline at end of file diff --git a/views/default/page/shells/upgrade.php b/views/default/page/shells/upgrade.php deleted file mode 100644 index b598c3c6a..000000000 --- a/views/default/page/shells/upgrade.php +++ /dev/null @@ -1,22 +0,0 @@ - - - - <?php echo elgg_echo('upgrading'); ?> - - - - - - - -

- - \ No newline at end of file diff --git a/views/default/page/shells/walled_garden.php b/views/default/page/shells/walled_garden.php deleted file mode 100644 index 74b4f3029..000000000 --- a/views/default/page/shells/walled_garden.php +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - - -

- $vars['sysmessages'])); ?> -

Welcome to:

- -

- - - \ No newline at end of file diff --git a/views/default/page/upgrade.php b/views/default/page/upgrade.php new file mode 100644 index 000000000..b598c3c6a --- /dev/null +++ b/views/default/page/upgrade.php @@ -0,0 +1,22 @@ + + + + <?php echo elgg_echo('upgrading'); ?> + + + + + + + +

+ + \ No newline at end of file diff --git a/views/default/page/walled_garden.php b/views/default/page/walled_garden.php new file mode 100644 index 000000000..74b4f3029 --- /dev/null +++ b/views/default/page/walled_garden.php @@ -0,0 +1,78 @@ + + + + + + + +

+ $vars['sysmessages'])); ?> +

Welcome to:

+ +

+ + + \ No newline at end of file -- cgit v1.2.3