makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 12:28:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4412 from Senky/ticket/14573

Browse source 
[ticket/14573] Extend breadcrumb to support more pages

* Senky/ticket/14573:
  [ticket/14573] Add Whoisonline breadcrumbs
  [ticket/14573] Add Memberlist breadcrumbs
  [ticket/14573] Add MCP breadcrumbs
  [ticket/14573] Add UCP breadcrumbs
  [ticket/14573] Add Search breadcrumbs
  [ticket/14573] Add FAQ breadcrumbs
This commit is contained in:
Tristan Darricau 2016-09-01 14:50:15 +02:00
commit 0c91160856
No known key found for this signature in database
GPG key ID: 817043C2E29DB881
8 changed files with 102 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
phpBB/includes/functions_module.php
View file

@ -933,6 +933,14 @@ class p_master
'U_TITLE' => $u_title 'U_TITLE' => $u_title
); );
if (isset($this->module_cache['parents'][$item_ary['id']]) || $item_ary['id'] == $this->p_id)
{
$template->assign_block_vars('navlinks', array(
'FORUM_NAME' => $item_ary['lang'],
'U_VIEW_FORUM' => $u_title,
));
}
$template->assign_block_vars($use_tabular_offset, array_merge($tpl_ary, array_change_key_case($item_ary, CASE_UPPER))); $template->assign_block_vars($use_tabular_offset, array_merge($tpl_ary, array_change_key_case($item_ary, CASE_UPPER)));
} }

5
phpBB/mcp.php
View file

@ -306,6 +306,11 @@ $vars = array(
); );
extract($phpbb_dispatcher->trigger_event('core.modify_mcp_modules_display_option', compact($vars))); extract($phpbb_dispatcher->trigger_event('core.modify_mcp_modules_display_option', compact($vars)));
$template->assign_block_vars('navlinks', array(
'FORUM_NAME' => $user->lang('MCP'),
'U_VIEW_FORUM' => append_sid("{$phpbb_root_path}mcp.$phpEx"),
));
// Load and execute the relevant module // Load and execute the relevant module
$module->load_active(); $module->load_active();

64
phpBB/memberlist.php
View file

@ -360,6 +360,11 @@ switch ($mode)
} }
} }
$template->assign_block_vars('navlinks', array(
'FORUM_NAME' => $page_title,
'U_VIEW_FORUM' => append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=team"),
));
$template->assign_vars(array( $template->assign_vars(array(
'PM_IMG' => $user->img('icon_contact_pm', $user->lang['SEND_PRIVATE_MESSAGE'])) 'PM_IMG' => $user->img('icon_contact_pm', $user->lang['SEND_PRIVATE_MESSAGE']))
); );
@ -456,6 +461,11 @@ switch ($mode)
break; break;
} }
$template->assign_block_vars('navlinks', array(
'FORUM_NAME' => $page_title,
'U_VIEW_FORUM' => append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=contact&action=$action&u=$user_id"),
));
// Send vars to the template // Send vars to the template
$template->assign_vars(array( $template->assign_vars(array(
'IM_CONTACT' => $row[$sql_field], 'IM_CONTACT' => $row[$sql_field],
@ -783,6 +793,15 @@ switch ($mode)
$page_title = sprintf($user->lang['VIEWING_PROFILE'], $member['username']); $page_title = sprintf($user->lang['VIEWING_PROFILE'], $member['username']);
$template_html = 'memberlist_view.html'; $template_html = 'memberlist_view.html';
$template->assign_block_vars('navlinks', array(
'FORUM_NAME' => $user->lang('MEMBERLIST'),
'U_VIEW_FORUM' => append_sid("{$phpbb_root_path}memberlist.$phpEx"),
));
$template->assign_block_vars('navlinks', array(
'FORUM_NAME' => $member['username'],
'U_VIEW_FORUM' => append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=viewprofile&u=$user_id"),
));
break; break;
case 'contactadmin': case 'contactadmin':
@ -832,6 +851,41 @@ switch ($mode)
$template_html = $form->get_template_file(); $template_html = $form->get_template_file();
$form->render($template); $form->render($template);
if ($user_id)
{
$navlink_name = $user->lang('SEND_EMAIL');
$navlink_url = append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=email&u=$user_id");
}
else if ($topic_id)
{
$sql = 'SELECT f.parent_id, f.forum_parents, f.left_id, f.right_id, f.forum_type, f.forum_name, f.forum_id, f.forum_desc, f.forum_desc_uid, f.forum_desc_bitfield, f.forum_desc_options, f.forum_options, t.topic_title
FROM ' . FORUMS_TABLE . ' as f,
' . TOPICS_TABLE . ' as t
WHERE t.forum_id = f.forum_id';
$result = $db->sql_query($sql);
$topic_data = $db->sql_fetchrow($result);
$db->sql_freeresult($result);
generate_forum_nav($topic_data);
$template->assign_block_vars('navlinks', array(
'FORUM_NAME' => $topic_data['topic_title'],
'U_VIEW_FORUM' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", "t=$topic_id"),
));
$navlink_name = $user->lang('EMAIL_TOPIC');
$navlink_url = append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=email&t=$topic_id");
}
else if ($mode === 'contactadmin')
{
$navlink_name = $user->lang('CONTACT_ADMIN');
$navlink_url = append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=contactadmin");
}
$template->assign_block_vars('navlinks', array(
'FORUM_NAME' => $navlink_name,
'U_VIEW_FORUM' => $navlink_url,
));
break; break;
case 'livesearch': case 'livesearch':
@ -869,6 +923,11 @@ switch ($mode)
$page_title = $user->lang['MEMBERLIST']; $page_title = $user->lang['MEMBERLIST'];
$template_html = 'memberlist_body.html'; $template_html = 'memberlist_body.html';
$template->assign_block_vars('navlinks', array(
'FORUM_NAME' => $page_title,
'U_VIEW_FORUM' => append_sid("{$phpbb_root_path}memberlist.$phpEx"),
));
/* @var $pagination \phpbb\pagination */ /* @var $pagination \phpbb\pagination */
$pagination = $phpbb_container->get('pagination'); $pagination = $phpbb_container->get('pagination');
@ -1174,6 +1233,11 @@ switch ($mode)
unset($module); unset($module);
} }
$template->assign_block_vars('navlinks', array(
'FORUM_NAME' => $group_helper->get_name($group_row['group_name']),
'U_VIEW_FORUM' => append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=group&g=$group_id"),
));
$template->assign_vars(array( $template->assign_vars(array(
'GROUP_DESC' => generate_text_for_display($group_row['group_desc'], $group_row['group_desc_uid'], $group_row['group_desc_bitfield'], $group_row['group_desc_options']), 'GROUP_DESC' => generate_text_for_display($group_row['group_desc'], $group_row['group_desc_uid'], $group_row['group_desc_bitfield'], $group_row['group_desc_options']),
'GROUP_NAME' => $group_helper->get_name($group_row['group_name']), 'GROUP_NAME' => $group_helper->get_name($group_row['group_name']),

5
phpBB/phpbb/help/controller/bbcode.php
View file

@ -25,6 +25,11 @@ class bbcode extends controller
{ {
$this->language->add_lang('help/bbcode'); $this->language->add_lang('help/bbcode');
$this->template->assign_block_vars('navlinks', array(
'FORUM_NAME' => $this->language->lang('BBCODE_GUIDE'),
'U_VIEW_FORUM' => $this->helper->route('phpbb_help_bbcode_controller'),
));
$this->manager->add_block( $this->manager->add_block(
'HELP_BBCODE_BLOCK_INTRO', 'HELP_BBCODE_BLOCK_INTRO',
false, false,

5
phpBB/phpbb/help/controller/faq.php
View file

@ -25,6 +25,11 @@ class faq extends controller
{ {
$this->language->add_lang('help/faq'); $this->language->add_lang('help/faq');
$this->template->assign_block_vars('navlinks', array(
'FORUM_NAME' => $this->language->lang('FAQ_EXPLAIN'),
'U_VIEW_FORUM' => $this->helper->route('phpbb_help_faq_controller'),
));
$this->manager->add_block( $this->manager->add_block(
'HELP_FAQ_BLOCK_LOGIN', 'HELP_FAQ_BLOCK_LOGIN',
false, false,

5
phpBB/search.php
View file

@ -129,6 +129,11 @@ $phpbb_content_visibility = $phpbb_container->get('content.visibility');
/* @var $pagination \phpbb\pagination */ /* @var $pagination \phpbb\pagination */
$pagination = $phpbb_container->get('pagination'); $pagination = $phpbb_container->get('pagination');
$template->assign_block_vars('navlinks', array(
'FORUM_NAME' => $user->lang('SEARCH'),
'U_VIEW_FORUM' => append_sid("{$phpbb_root_path}search.$phpEx"),
));
if ($keywords || $author || $author_id || $search_id || $submit) if ($keywords || $author || $author_id || $search_id || $submit)
{ {
// clear arrays // clear arrays

5
phpBB/ucp.php
View file

@ -362,6 +362,11 @@ if (!$config['allow_topic_notify'] && !$config['allow_forum_notify'])
$vars = array('module', 'id', 'mode'); $vars = array('module', 'id', 'mode');
extract($phpbb_dispatcher->trigger_event('core.ucp_display_module_before', compact($vars))); extract($phpbb_dispatcher->trigger_event('core.ucp_display_module_before', compact($vars)));
$template->assign_block_vars('navlinks', array(
'FORUM_NAME' => $user->lang('UCP'),
'U_VIEW_FORUM' => append_sid("{$phpbb_root_path}ucp.$phpEx"),
));
// Select the active module // Select the active module
$module->set_active($id, $mode); $module->set_active($id, $mode);

5
phpBB/viewonline.php
View file

@ -484,6 +484,11 @@ $start = $pagination->validate_start($start, $config['topics_per_page'], $counte
$base_url = append_sid("{$phpbb_root_path}viewonline.$phpEx", "sg=$show_guests&sk=$sort_key&sd=$sort_dir"); $base_url = append_sid("{$phpbb_root_path}viewonline.$phpEx", "sg=$show_guests&sk=$sort_key&sd=$sort_dir");
$pagination->generate_template_pagination($base_url, 'pagination', 'start', $counter, $config['topics_per_page'], $start); $pagination->generate_template_pagination($base_url, 'pagination', 'start', $counter, $config['topics_per_page'], $start);
$template->assign_block_vars('navlinks', array(
'FORUM_NAME' => $user->lang('WHO_IS_ONLINE'),
'U_VIEW_FORUM' => append_sid("{$phpbb_root_path}viewonline.$phpEx"),
));
// Send data to template // Send data to template
$template->assign_vars(array( $template->assign_vars(array(
'TOTAL_REGISTERED_USERS_ONLINE' => $user->lang('REG_USERS_ONLINE', (int) $logged_visible_online, $user->lang('HIDDEN_USERS_ONLINE', (int) $logged_hidden_online)), 'TOTAL_REGISTERED_USERS_ONLINE' => $user->lang('REG_USERS_ONLINE', (int) $logged_visible_online, $user->lang('HIDDEN_USERS_ONLINE', (int) $logged_hidden_online)),