diff options
Diffstat (limited to 'views/default/canvas')
| -rw-r--r-- | views/default/canvas/default.php | 6 | ||||
| -rw-r--r-- | views/default/canvas/layouts/administration.php | 9 | ||||
| -rw-r--r-- | views/default/canvas/layouts/one_column.php | 3 | ||||
| -rw-r--r-- | views/default/canvas/layouts/one_column_with_sidebar.php | 11 |
4 files changed, 25 insertions, 4 deletions
diff --git a/views/default/canvas/default.php b/views/default/canvas/default.php index cfcee9484..60dc90b0d 100644 --- a/views/default/canvas/default.php +++ b/views/default/canvas/default.php @@ -4,9 +4,15 @@ * * @package Elgg * @subpackage Core + * + * @uses $vars['content'] Content string */ +// @todo deprecated so remove in Elgg 2.0 if (isset($vars['area1'])) { echo $vars['area1']; } +if (isset($vars['content'])) { + echo $vars['content']; +} diff --git a/views/default/canvas/layouts/administration.php b/views/default/canvas/layouts/administration.php index 9b0144ade..0e18eb7e8 100644 --- a/views/default/canvas/layouts/administration.php +++ b/views/default/canvas/layouts/administration.php @@ -4,6 +4,9 @@ * * @package Elgg * @subpackage Core + * + * @uses $vars['content'] Content string + * @uses $vars['sidebar'] Optional sidebar content */ ?> <style type="text/css"> @@ -885,8 +888,10 @@ ul.admin_plugins { <div id="elgg_content" class="clearfix admin_area"> <div id="elgg_page_contents" class="clearfix"> - <?php - if (isset($vars['area1'])) echo $vars['area1']; + <?php + if (isset($vars['content'])) { + echo $vars['content']; + } ?> </div> <div id="elgg_sidebar" class="clearfix"> diff --git a/views/default/canvas/layouts/one_column.php b/views/default/canvas/layouts/one_column.php index 67366efc6..e4a7845f5 100644 --- a/views/default/canvas/layouts/one_column.php +++ b/views/default/canvas/layouts/one_column.php @@ -4,10 +4,13 @@ * * @package Elgg * @subpackage Core + * + * @uses $vars['content'] Content string */ ?> <div id="elgg_content" class="clearfix"> <div id="elgg_page_contents" class="clearfix one_column"> + <?php echo $vars['content']; ?> <?php echo $vars['area1']; ?> </div> </div>
\ No newline at end of file diff --git a/views/default/canvas/layouts/one_column_with_sidebar.php b/views/default/canvas/layouts/one_column_with_sidebar.php index dff45a452..046c49997 100644 --- a/views/default/canvas/layouts/one_column_with_sidebar.php +++ b/views/default/canvas/layouts/one_column_with_sidebar.php @@ -1,9 +1,12 @@ <?php /** - * Elgg 1 column with sidebar canvas layout + * Elgg 1 column with sidebar layout * * @package Elgg * @subpackage Core + * + * @uses $vars['content'] The content string for the main column + * @uses $vars['sidebar'] Optional content that is displayed in the sidebar */ ?> <div id="elgg_content" class="clearfix sidebar"> @@ -14,10 +17,14 @@ </div> <div id="elgg_page_contents" class="clearfix"> - <?php + <?php + // @todo deprecated so remove in Elgg 2.0 if (isset($vars['area1'])) { echo $vars['area1']; } + if (isset($vars['content'])) { + echo $vars['content']; + } ?> </div> </div> |