From b36b1a1a51cf8bdc2a4665b23c4a62c26e2bfca8 Mon Sep 17 00:00:00 2001 From: brettp Date: Mon, 26 Apr 2010 17:38:11 +0000 Subject: Removed unnecessary content_header_member. Updated content_header to support custom new links. Added logic to display filter tabs correctly. THIS COMMIT WILL BREAK TOOLS UNTIL THEY ARE UPDATED. I didn't want to make a single huge commit, so fixes to tools will follow. git-svn-id: http://code.elgg.org/elgg/trunk@5879 36083f99-b078-4883-b0ff-0f9b5a30f544 --- views/default/page_elements/content_header.php | 126 ++++++++++----------- .../page_elements/content_header_member.php | 15 --- 2 files changed, 57 insertions(+), 84 deletions(-) delete mode 100644 views/default/page_elements/content_header_member.php (limited to 'views/default/page_elements') diff --git a/views/default/page_elements/content_header.php b/views/default/page_elements/content_header.php index cb547cd96..483d85c4b 100644 --- a/views/default/page_elements/content_header.php +++ b/views/default/page_elements/content_header.php @@ -1,6 +1,8 @@ username; + if (!$page_owner) { - $page_owner = get_loggedin_user(); + $page_owner = $logged_in_user; } -$filter_context = $vars['context']; // so we know if the user is looking at their own, everyone's or all friends -$type = $vars['type']; // get the object type -$mine_selected = ''; -$all_selected = ''; -$friend_selected = ''; -$action_buttons = ''; + +// so we know if the user is looking at their own, everyone's or all friends +$filter_context = $vars['context']; + +// get the object type +$type = $vars['type']; + +// tons of empty strings. +$mine_selected = $all_selected = $friend_selected = +$new_button = $action_buttons = $filter_content = ''; $all_title = elgg_echo('all'); $mine_title = elgg_echo('mine'); @@ -37,75 +43,57 @@ if (!($page_owner instanceof ElggGroup)){ if($filter_context == 'friends') { $friend_selected = "class = 'selected'"; } - if($filter_context == 'action') { - // if this is an action page - } } - // allow plugins to override default page handlers -if (isset($vars['all_link'])) { - $all_link = $vars['all_link']; -} else { - // @todo switch this over to proper page handling style - $all_link = "{$vars['url']}mod/$type/all.php"; -} +// @todo switch this over to proper page handling style +$all_link = (isset($vars['all_link'])) ? $vars['all_link'] : "{$vars['url']}mod/$type/all.php"; +$mine_link = (isset($vars['mine_link'])) ? $vars['mine_link'] : "{$vars['url']}pg/$type/$username"; +$friend_link = (isset($vars['friend_link'])) ? $vars['friend_link'] : "{$vars['url']}pg/$type/$username/friends"; +$new_link = (isset($vars['new_link'])) ? $vars['new_link'] : "{$CONFIG->wwwroot}pg/$type/$username/new"; -if (isset($vars['mine_link'])) { - $mine_link = $vars['mine_link']; -} else { - $mine_link = "{$vars['url']}pg/$type/{$_SESSION['user']->username}"; -} - -if (isset($vars['friend_link'])) { - $friend_link = $vars['friend_link']; -} else { - $friend_link = "{$vars['url']}pg/$type/{$_SESSION['user']->username}/friends"; -} +$title = elgg_echo($type); +$title = '
' . elgg_view_title($title) . '
'; +$tabs = << + + +EOT; // must be logged in to see the filter menu and any action buttons -if ( isloggedin() ) { - // if we're not on an action page (add a bookmark, create a blog, upload a file etc), or a group page - if ( ($filter_context != 'action') && (get_context() != 'groups') ) { - $title = elgg_echo($type); - $title = "
".elgg_view_title($title)."
"; - $page_filter = << - - -EOT; - // action buttons - if(get_context() != 'bookmarks'){ - $url = "{$CONFIG->wwwroot}pg/$type/{$page_owner->username}/new"; - } else { - $url = "{$CONFIG->wwwroot}pg/$type/{$page_owner->username}/add"; - } - $action_buttons = "" . elgg_echo($type . ':new') . ""; - $action_buttons = "
".$action_buttons."
"; +if (isloggedin()) { + // only show the new button when not on the add form. + // hide the tabs when on the add form. + if ($filter_context == 'action') { + $tabs = ''; + } else { + $new_button = "" . elgg_echo($type . ':new') . ''; + $new_button = "
$new_button
"; + } - } elseif(get_context() == 'groups'){ - $title = elgg_echo($type); - $title = "
".elgg_view_title( $title )."
"; - $page_filter = ''; - $url = "{$CONFIG->wwwroot}pg/groups/new/"; - $action_buttons = "" . elgg_echo($type . ':new') . ""; - $action_buttons = "
".$action_buttons."
"; - - } else { // we're on an action page - we'll just have a simple page title, and no filter menu - $title = elgg_echo($type); - $title = "
".elgg_view_title( $title )."
"; - $page_filter = ''; + // also hide the tabs if in a group context (ie, listing groups) or + // when viewing tools belonging to a group + if (get_context() == 'groups' || $page_owner instanceof ElggGroup) { + $tabs = ''; } +} else { + // only show logged out users the all tab + $page_filter = << + + +EOT; } ?> -
- +
- + diff --git a/views/default/page_elements/content_header_member.php b/views/default/page_elements/content_header_member.php deleted file mode 100644 index f90c87384..000000000 --- a/views/default/page_elements/content_header_member.php +++ /dev/null @@ -1,15 +0,0 @@ -name . "'s " . elgg_echo($type)); -?> -
-
- -
-
\ No newline at end of file -- cgit v1.2.3