aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2010-04-10 09:47:19 +0000
committerrvelices <rv-github@modusoptimus.com>2010-04-10 09:47:19 +0000
commitb7e2107181e78c29ee9829d5d6b346ec1dc49d67 (patch)
tree8c0532ffaf54606a69e09eef1a292711c41f328c /include
parentaaccf93392bf3a9e0712d8bcbd51ef9cc8a5fbba (diff)
feqture 1583 : show related tags block also when browsing non tag sections
git-svn-id: http://piwigo.org/svn/trunk@5752 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'include')
-rw-r--r--include/menubar.inc.php62
1 files changed, 42 insertions, 20 deletions
diff --git a/include/menubar.inc.php b/include/menubar.inc.php
index 052f3d830..a5cc2ffed 100644
--- a/include/menubar.inc.php
+++ b/include/menubar.inc.php
@@ -110,32 +110,54 @@ function initialize_menu()
//------------------------------------------------------------------------ tags
$block = $menu->get_block('mbTags');
- if ( $block!=null and 'tags'==@$page['section'] and !empty($page['items']) )
+ if ( $block!=null and !empty($page['items']) )
{
- $tags = get_common_tags(
- $page['items'],
- $conf['menubar_tag_cloud_items_number'],
- $page['tag_ids']
- );
- $tags = add_level_to_tags($tags);
-
- foreach ($tags as $tag)
+ if ('tags'==@$page['section'])
{
- $block->data[] = array_merge(
- $tag,
- array(
- 'U_ADD' => make_index_url(
- array(
- 'tags' => array_merge(
- $page['tags'],
- array($tag)
+ $tags = get_common_tags(
+ $page['items'],
+ $conf['menubar_tag_cloud_items_number'],
+ $page['tag_ids']
+ );
+ $tags = add_level_to_tags($tags);
+
+ foreach ($tags as $tag)
+ {
+ $block->data[] = array_merge(
+ $tag,
+ array(
+ 'U_ADD' => make_index_url(
+ array(
+ 'tags' => array_merge(
+ $page['tags'],
+ array($tag)
+ )
)
- )
- ),
+ ),
+ 'URL' => make_index_url( array( 'tags' => array($tag) )
+ ),
+ )
+ );
+ }
+ }
+ else
+ {
+ $selection = array_slice( $page['items'], $page['start'], $page['nb_image_page'] );
+ $tags = add_level_to_tags( get_common_tags($selection, 12) );
+ foreach ($tags as $tag)
+ {
+ $block->data[] =
+ array_merge( $tag,
+ array(
+ 'URL' => make_index_url( array( 'tags' => array($tag) ) ),
)
);
+ }
+ }
+ if ( !empty($block->data) )
+ {
+ $block->template = 'menubar_tags.tpl';
}
- $block->template = 'menubar_tags.tpl';
}
//----------------------------------------------------------- special categories