diff options
Diffstat (limited to 'mod/pages')
| -rw-r--r-- | mod/pages/edit.php | 2 | ||||
| -rw-r--r-- | mod/pages/history.php | 6 | ||||
| -rw-r--r-- | mod/pages/index.php | 2 | ||||
| -rw-r--r-- | mod/pages/new.php | 6 | ||||
| -rw-r--r-- | mod/pages/view.php | 7 | ||||
| -rw-r--r-- | mod/pages/welcome.php | 6 | ||||
| -rw-r--r-- | mod/pages/world.php | 2 |
7 files changed, 23 insertions, 8 deletions
diff --git a/mod/pages/edit.php b/mod/pages/edit.php index d404e0433..dc290ea7d 100644 --- a/mod/pages/edit.php +++ b/mod/pages/edit.php @@ -31,6 +31,6 @@ if ($pages && ($pages->canEdit())) { $body .= elgg_echo("pages:noaccess"); } -$body = elgg_view_layout('one_column_with_sidebar', $body); +$body = elgg_view_layout('one_column_with_sidebar', array('content' => $body)); echo elgg_view_page($title, $body);
\ No newline at end of file diff --git a/mod/pages/history.php b/mod/pages/history.php index d39bf7ae0..d40dfaeb8 100644 --- a/mod/pages/history.php +++ b/mod/pages/history.php @@ -35,6 +35,10 @@ $content.= list_annotations($page_guid, 'page', $limit, false); pages_set_navigation_parent($pages); $sidebar = elgg_view('pages/sidebar/tree'); -$body = elgg_view_layout('one_column_with_sidebar', $content, $sidebar); +$params = array( + 'content' => $content, + 'sidebar' => $sidebar +); +$body = elgg_view_layout('one_column_with_sidebar', $params); echo elgg_view_page($title, $body); diff --git a/mod/pages/index.php b/mod/pages/index.php index 31f76f625..1d84587d5 100644 --- a/mod/pages/index.php +++ b/mod/pages/index.php @@ -44,7 +44,7 @@ $welcome_message = elgg_get_entities(array('types' => 'object', 'subtypes' => 'p $body = elgg_view_title($title); $body .= elgg_view("pages/welcome", array('entity' => $welcome_message)); $body .= $objects; -$body = elgg_view_layout('one_column_with_sidebar', $body); +$body = elgg_view_layout('one_column_with_sidebar', array('content' => $body)); // Finally draw the page echo elgg_view_page($title, $body); diff --git a/mod/pages/new.php b/mod/pages/new.php index af1443d0a..2175572b2 100644 --- a/mod/pages/new.php +++ b/mod/pages/new.php @@ -34,6 +34,10 @@ $title = elgg_echo("pages:new"); $area2 .= elgg_view_title($title); $area2 .= elgg_view("forms/pages/edit"); -$body = elgg_view_layout('one_column_with_sidebar', $area2, $area1); +$params = array( + 'content' => $area2, + 'sidebar' => $area1 +); +$body = elgg_view_layout('one_column_with_sidebar', $params); echo elgg_view_page($title, $body);
\ No newline at end of file diff --git a/mod/pages/view.php b/mod/pages/view.php index 83b8d69c1..6996c44e0 100644 --- a/mod/pages/view.php +++ b/mod/pages/view.php @@ -54,7 +54,10 @@ $body .= elgg_view_comments($pages); pages_set_navigation_parent($pages); $sidebar = elgg_view('pages/sidebar/tree'); -$body = elgg_view_layout('one_column_with_sidebar', $body, $sidebar); +$params = array( + 'content' => $body, + 'sidebar' => $sidebar +); +$body = elgg_view_layout('one_column_with_sidebar', $params); -// Finally draw the page echo elgg_view_page($title, $body);
\ No newline at end of file diff --git a/mod/pages/welcome.php b/mod/pages/welcome.php index 7a2a43abd..7db649253 100644 --- a/mod/pages/welcome.php +++ b/mod/pages/welcome.php @@ -30,6 +30,10 @@ $title = elgg_echo("pages:welcome"); $area2 .= elgg_view_title($title); $area2 .= elgg_view("forms/pages/editwelcome", array('entity' => $welcome_message, 'owner' => $page_owner)); -$body = elgg_view_layout('one_column_with_sidebar', $area2, $area1); +$params = array( + 'content' => $area2, + 'sidebar' => $area1 +); +$body = elgg_view_layout('one_column_with_sidebar', $params); echo elgg_view_page($title, $body);
\ No newline at end of file diff --git a/mod/pages/world.php b/mod/pages/world.php index 35a17b1e6..d258ba157 100644 --- a/mod/pages/world.php +++ b/mod/pages/world.php @@ -38,7 +38,7 @@ elgg_pop_context(); $body = elgg_view_title($title); $body .= $objects; -$body = elgg_view_layout('one_column_with_sidebar', $body); +$body = elgg_view_layout('one_column_with_sidebar', array('content' => $body)); // Finally draw the page echo elgg_view_page($title, $body);
\ No newline at end of file |