From ec1e46e01818b8226d651dd589f373d75f9f8411 Mon Sep 17 00:00:00 2001 From: cash Date: Wed, 8 Dec 2010 00:48:36 +0000 Subject: moved content views into layout/shells/content git-svn-id: http://code.elgg.org/elgg/trunk@7555 36083f99-b078-4883-b0ff-0f9b5a30f544 --- views/default/layout/shells/content.php | 8 ++--- views/default/layout/shells/content/filter.php | 43 ++++++++++++++++++++++++ views/default/layout/shells/content/footer.php | 8 +++++ views/default/layout/shells/content/header.php | 44 +++++++++++++++++++++++++ views/default/layout/shells/content/sidebar.php | 8 +++++ 5 files changed, 107 insertions(+), 4 deletions(-) create mode 100644 views/default/layout/shells/content/filter.php create mode 100644 views/default/layout/shells/content/footer.php create mode 100644 views/default/layout/shells/content/header.php create mode 100644 views/default/layout/shells/content/sidebar.php (limited to 'views/default/layout/shells') diff --git a/views/default/layout/shells/content.php b/views/default/layout/shells/content.php index 908197a39..b46f09ac1 100644 --- a/views/default/layout/shells/content.php +++ b/views/default/layout/shells/content.php @@ -18,7 +18,7 @@ $sidebar_content = elgg_get_array_value('sidebar', $vars, ''); $params = $vars; $params['content'] = $sidebar_content; -$sidebar = elgg_view('content/sidebar', $params); +$sidebar = elgg_view('layout/shells/content/sidebar', $params); // navigation defaults to breadcrumbs $nav = elgg_get_array_value('nav', $vars, elgg_view('navigation/breadcrumbs')); @@ -27,13 +27,13 @@ $nav = elgg_get_array_value('nav', $vars, elgg_view('navigation/breadcrumbs')); if (isset($vars['header'])) { $vars['header_override'] = $vars['header']; } -$header = elgg_view('content/header', $vars); +$header = elgg_view('layout/shells/content/header', $vars); // allow page handlers to override the default filter if (isset($vars['filter'])) { $vars['filter_override'] = $vars['filter']; } -$filter = elgg_view('content/filter', $vars); +$filter = elgg_view('layout/shells/content/filter', $vars); // the all important content $content = elgg_get_array_value('content', $vars, ''); @@ -42,7 +42,7 @@ $content = elgg_get_array_value('content', $vars, ''); $footer_content = elgg_get_array_value('footer', $vars, ''); $params = $vars; $params['content'] = $footer_content; -$footer = elgg_view('content/footer', $params); +$footer = elgg_view('layout/shells/content/footer', $params); $body = $nav . $header . $filter . $content . $footer; diff --git a/views/default/layout/shells/content/filter.php b/views/default/layout/shells/content/filter.php new file mode 100644 index 000000000..0b2562450 --- /dev/null +++ b/views/default/layout/shells/content/filter.php @@ -0,0 +1,43 @@ +username; + $filter_context = elgg_get_array_value('filter_context', $vars, 'everyone'); + + // generate a list of default tabs + $tabs = array( + 'all' => array( + 'title' => elgg_echo('all'), + 'url' => (isset($vars['all_link'])) ? $vars['all_link'] : "pg/$context/all/", + 'selected' => ($filter_context == 'everyone'), + ), + 'mine' => array( + 'title' => elgg_echo('mine'), + 'url' => (isset($vars['mine_link'])) ? $vars['mine_link'] : "pg/$context/owner/$username/", + 'selected' => ($filter_context == 'mine'), + ), + 'friend' => array( + 'title' => elgg_echo('friends'), + 'url' => (isset($vars['friend_link'])) ? $vars['friend_link'] : "pg/$context/friends/$username/", + 'selected' => ($filter_context == 'friends'), + ), + ); + + echo elgg_view('navigation/tabs', array('tabs' => $tabs)); +} diff --git a/views/default/layout/shells/content/footer.php b/views/default/layout/shells/content/footer.php new file mode 100644 index 000000000..66f5d3ff8 --- /dev/null +++ b/views/default/layout/shells/content/footer.php @@ -0,0 +1,8 @@ +username; + $new_link = elgg_get_array_value('new_link', $vars, "pg/$context/new/$username/"); + $params = array( + 'href' => $new_link = elgg_normalize_url($new_link), + 'text' => elgg_echo("$context:new"), + 'class' => 'action-button right', + ); + $buttons = elgg_view('output/url', $params); + } + } + echo << +

$title

$buttons + +HTML; +} diff --git a/views/default/layout/shells/content/sidebar.php b/views/default/layout/shells/content/sidebar.php new file mode 100644 index 000000000..86ca8435f --- /dev/null +++ b/views/default/layout/shells/content/sidebar.php @@ -0,0 +1,8 @@ +