mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-31 05:53:14 +02:00
Code Issues Releases Wiki Activity

Merge pull request #5263 from senky/ticket/12591-2

Browse Source 
[ticket/12591] Improve breadcrumb naming and extend it's usage

* github.com:/phpbb/phpbb:
  [ticket/12591] Introduce a BC fallback
  [ticket/12591] Improve breadcrumb naming and extend it's usage
This commit is contained in:
Tristan Darricau 2018-07-08 18:33:35 +02:00
commit 52f77f113a
10 changed files with 52 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
phpBB/includes/functions_display.php
View File

@ -783,25 +783,25 @@ function generate_forum_nav(&$forum_data_ary)
}
$navlinks_parents[] = array(
'S_IS_CAT' => ($parent_type == FORUM_CAT) ? true : false,
'S_IS_LINK' => ($parent_type == FORUM_LINK) ? true : false,
'S_IS_POST' => ($parent_type == FORUM_POST) ? true : false,
'FORUM_NAME' => $parent_name,
'FORUM_ID' => $parent_forum_id,
'MICRODATA' => $microdata_attr . '="' . $parent_forum_id . '"',
'U_VIEW_FORUM' => append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $parent_forum_id),
'S_IS_CAT' => ($parent_type == FORUM_CAT) ? true : false,
'S_IS_LINK' => ($parent_type == FORUM_LINK) ? true : false,
'S_IS_POST' => ($parent_type == FORUM_POST) ? true : false,
'BREADCRUMB_NAME' => $parent_name,
'FORUM_ID' => $parent_forum_id,
'MICRODATA' => $microdata_attr . '="' . $parent_forum_id . '"',
'U_BREADCRUMB' => append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $parent_forum_id),
);
}
}
$navlinks = array(
'S_IS_CAT' => ($forum_data_ary['forum_type'] == FORUM_CAT) ? true : false,
'S_IS_LINK' => ($forum_data_ary['forum_type'] == FORUM_LINK) ? true : false,
'S_IS_POST' => ($forum_data_ary['forum_type'] == FORUM_POST) ? true : false,
'FORUM_NAME' => $forum_data_ary['forum_name'],
'FORUM_ID' => $forum_data_ary['forum_id'],
'MICRODATA' => $microdata_attr . '="' . $forum_data_ary['forum_id'] . '"',
'U_VIEW_FORUM' => append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $forum_data_ary['forum_id']),
'S_IS_CAT' => ($forum_data_ary['forum_type'] == FORUM_CAT) ? true : false,
'S_IS_LINK' => ($forum_data_ary['forum_type'] == FORUM_LINK) ? true : false,
'S_IS_POST' => ($forum_data_ary['forum_type'] == FORUM_POST) ? true : false,
'BREADCRUMB_NAME' => $forum_data_ary['forum_name'],
'FORUM_ID' => $forum_data_ary['forum_id'],
'MICRODATA' => $microdata_attr . '="' . $forum_data_ary['forum_id'] . '"',
'U_BREADCRUMB' => append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $forum_data_ary['forum_id']),
);
$forum_template_data = array(

4
phpBB/includes/functions_module.php
View File

@ -936,8 +936,8 @@ class p_master
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,
'BREADCRUMB_NAME' => $item_ary['lang'],
'U_BREADCRUMB' => $u_title,
));
}

4
phpBB/mcp.php
View File

@ -309,8 +309,8 @@ $vars = array(
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"),
'BREADCRUMB_NAME' => $user->lang('MCP'),
'U_BREADCRUMB' => append_sid("{$phpbb_root_path}mcp.$phpEx"),
));
// Load and execute the relevant module

32
phpBB/memberlist.php
View File

@ -365,8 +365,8 @@ switch ($mode)
}
$template->assign_block_vars('navlinks', array(
'FORUM_NAME' => $page_title,
'U_VIEW_FORUM' => append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=team"),
'BREADCRUMB_NAME' => $page_title,
'U_BREADCRUMB' => append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=team"),
));
$template->assign_vars(array(
@ -467,8 +467,8 @@ switch ($mode)
}
$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"),
'BREADCRUMB_NAME' => $page_title,
'U_BREADCRUMB' => append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=contact&action=$action&u=$user_id"),
));
// Send vars to the template
@ -799,12 +799,12 @@ switch ($mode)
$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"),
'BREADCRUMB_NAME' => $user->lang('MEMBERLIST'),
'U_BREADCRUMB' => 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"),
'BREADCRUMB_NAME' => $member['username'],
'U_BREADCRUMB' => append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=viewprofile&u=$user_id"),
));
break;
@ -873,8 +873,8 @@ switch ($mode)
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"),
'BREADCRUMB_NAME' => $topic_data['topic_title'],
'U_BREADCRUMB' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", "t=$topic_id"),
));
$navlink_name = $user->lang('EMAIL_TOPIC');
@ -887,8 +887,8 @@ switch ($mode)
}
$template->assign_block_vars('navlinks', array(
'FORUM_NAME' => $navlink_name,
'U_VIEW_FORUM' => $navlink_url,
'BREADCRUMB_NAME' => $navlink_name,
'U_BREADCRUMB' => $navlink_url,
));
break;
@ -929,8 +929,8 @@ switch ($mode)
$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"),
'BREADCRUMB_NAME' => $page_title,
'U_BREADCRUMB' => append_sid("{$phpbb_root_path}memberlist.$phpEx"),
));
/* @var $pagination \phpbb\pagination */
@ -1239,8 +1239,8 @@ switch ($mode)
}
$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"),
'BREADCRUMB_NAME' => $group_helper->get_name($group_row['group_name']),
'U_BREADCRUMB' => append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=group&g=$group_id"),
));
$template->assign_vars(array(

4
phpBB/phpbb/help/controller/bbcode.php
View File

@ -26,8 +26,8 @@ class bbcode extends controller
$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'),
'BREADCRUMB_NAME' => $this->language->lang('BBCODE_GUIDE'),
'U_BREADCRUMB' => $this->helper->route('phpbb_help_bbcode_controller'),
));
$this->manager->add_block(

4
phpBB/phpbb/help/controller/faq.php
View File

@ -26,8 +26,8 @@ class faq extends controller
$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'),
'BREADCRUMB_NAME' => $this->language->lang('FAQ_EXPLAIN'),
'U_BREADCRUMB' => $this->helper->route('phpbb_help_faq_controller'),
));
$this->manager->add_block(

9
phpBB/search.php
View File

@ -130,8 +130,8 @@ $phpbb_content_visibility = $phpbb_container->get('content.visibility');
$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"),
'BREADCRUMB_NAME' => $user->lang('SEARCH'),
'U_BREADCRUMB' => append_sid("{$phpbb_root_path}search.$phpEx"),
));
/**
@ -516,6 +516,11 @@ if ($keywords || $author || $author_id || $search_id || $submit)
$l_search_title = $user->lang['SEARCH_SELF'];
break;
}
$template->assign_block_vars('navlinks', array(
'BREADCRUMB_NAME' => $l_search_title,
'U_BREADCRUMB' => append_sid("{$phpbb_root_path}search.$phpEx", "search_id=$search_id"),
));
}
/**

4
phpBB/styles/prosilver/template/navbar_header.html
View File

@ -186,8 +186,10 @@
<span class="crumb" {$MICRODATA}><a href="{U_INDEX}" itemprop="url" accesskey="h" data-navbar-reference="index"><!-- IF not U_SITE_HOME --><i class="icon fa-home fa-fw"></i><!-- ENDIF --><span itemprop="title">{L_INDEX}</span></a></span>
<!-- BEGIN navlinks -->
{% set NAVLINK_NAME = navlinks.BREADCRUMB_NAME | default(navlinks.FORUM_NAME) %}
{% set NAVLINK_LINK = navlinks.U_BREADCRUMB | default(navlinks.U_VIEW_FORUM) %}
<!-- EVENT overall_header_navlink_prepend -->
<span class="crumb" {$MICRODATA}<!-- IF navlinks.MICRODATA --> {navlinks.MICRODATA}<!-- ENDIF -->><a href="{navlinks.U_VIEW_FORUM}" itemprop="url"><span itemprop="title">{navlinks.FORUM_NAME}</span></a></span>
<span class="crumb" {$MICRODATA}<!-- IF navlinks.MICRODATA --> {navlinks.MICRODATA}<!-- ENDIF -->><a href="{{ NAVLINK_LINK }}" itemprop="url"><span itemprop="title">{{ NAVLINK_NAME }}</span></a></span>
<!-- EVENT overall_header_navlink_append -->
<!-- END navlinks -->
<!-- EVENT overall_header_breadcrumb_append -->

4
phpBB/ucp.php
View File

@ -388,8 +388,8 @@ $vars = array('module', 'id', 'mode');
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"),
'BREADCRUMB_NAME' => $user->lang('UCP'),
'U_BREADCRUMB' => append_sid("{$phpbb_root_path}ucp.$phpEx"),
));
// Select the active module

4
phpBB/viewonline.php
View File

@ -488,8 +488,8 @@ $base_url = append_sid("{$phpbb_root_path}viewonline.$phpEx", "sg=$show_guests&a
$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"),
'BREADCRUMB_NAME' => $user->lang('WHO_IS_ONLINE'),
'U_BREADCRUMB' => append_sid("{$phpbb_root_path}viewonline.$phpEx"),
));
// Send data to template