From 44d3601933552613e9a060a868c38679d6ec69f0 Mon Sep 17 00:00:00 2001
From: plegall <plg@piwigo.org>
Date: Thu, 8 Apr 2010 08:26:34 +0000
Subject: [PATCH] feature 1583: replace add_tag.png icon by a simple "+"
 character in the "related tags" block. Only keep one link for each tag in the
 "related tags" block.

git-svn-id: http://piwigo.org/svn/trunk@5703 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 include/menubar.inc.php                  |  34 +++++++++++------------
 themes/Sylvia/icon/add_tag.png           | Bin 193 -> 0 bytes
 themes/default/icon/add_tag.png          | Bin 59 -> 0 bytes
 themes/default/template/menubar_tags.tpl |  10 +++----
 4 files changed, 20 insertions(+), 24 deletions(-)
 delete mode 100644 themes/Sylvia/icon/add_tag.png
 delete mode 100644 themes/default/icon/add_tag.png

diff --git a/include/menubar.inc.php b/include/menubar.inc.php
index 27de0d5ef..052f3d830 100644
--- a/include/menubar.inc.php
+++ b/include/menubar.inc.php
@@ -112,29 +112,27 @@ function initialize_menu()
   $block = $menu->get_block('mbTags');
   if ( $block!=null and 'tags'==@$page['section'] and !empty($page['items']) )
   {
-    $tags = get_common_tags($page['items'],
-          $conf['menubar_tag_cloud_items_number'], $page['tag_ids']);
+    $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(
-            'URL' => make_index_url(
-              array(
-                'tags' => array($tag)
+      $block->data[] = array_merge(
+        $tag,
+        array(
+          'U_ADD' => make_index_url(
+            array(
+              'tags' => array_merge(
+                $page['tags'],
+                array($tag)
                 )
-              ),
-            'U_ADD' => make_index_url(
-                  array(
-                    'tags' => array_merge(
-                      $page['tags'],
-                      array($tag)
-                      )
-                    )
-                  ),
-            )
+              )
+            ),
+          )
         );
     }
     $block->template = 'menubar_tags.tpl';
diff --git a/themes/Sylvia/icon/add_tag.png b/themes/Sylvia/icon/add_tag.png
deleted file mode 100644
index 66042aadf0743c436d5407da12410d8e996783c7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 193
zcmeAS@N?(olHy`uVBq!ia0vp^oFL4>1|%O$WD@{VEa{HEjtmUzPnffIy#(?lOI#yL
zg7ec#$`gxH85~pclTsBta}(23gHjVyDhp4h+5i;=d%8G=RNP8RaA5l1JNdEW3`SlC
z76ERl_(n!<1`Y)^HYElJ2EnBq3JnsCc`Mu>Sv$OB_DJGqVCvAA3?vxOmVeDqYi0zh
eNfm-9JiuTW&ST=C-NXwtp25@A&t;ucLK6Vtk1^f=

diff --git a/themes/default/icon/add_tag.png b/themes/default/icon/add_tag.png
deleted file mode 100644
index 9051a1d263ee3efc192781f61bd9c491a9a3ee16..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 59
zcmZ?wbhEHb<YeGvXkcLY|NnnlTAJcd76uT|0TCb>1|}hwzQhB$rygW~vN2I!d;8*S
I237`Z0Mo`12mk;8

diff --git a/themes/default/template/menubar_tags.tpl b/themes/default/template/menubar_tags.tpl
index ad7177347..d56980c2d 100644
--- a/themes/default/template/menubar_tags.tpl
+++ b/themes/default/template/menubar_tags.tpl
@@ -2,15 +2,13 @@
 <dd>
 	<div id="menuTagCloud">
 		{foreach from=$block->data item=tag}
-		<span>
-			{if !empty($tag.U_ADD) }
-			<a href="{$tag.U_ADD}"
+		<span style="margin-right:5px;">
+			<a class="tagLevel{$tag.level}" href="{$tag.U_ADD}"
 				title="{$pwg->l10n_dec('%d image is also linked to current tags', '%d images are also linked to current tags', $tag.counter)}"
 				rel="nofollow">
-				<img src="{$ROOT_URL}{$themeconf.icon_dir}/add_tag.png" alt="+">
+				+{$tag.name}
 			</a>
-			{/if}
-			<a href="{$tag.URL}" class="tagLevel{$tag.level}" title="{'See images linked to this tag only'|@translate}">{$tag.name}</a>{* there should be no space between end of a and span elements to avoid IE8 bug https://connect.microsoft.com/IE/feedback/ViewFeedback.aspx?FeedbackID=366567 *}</span>
+                </span>
 		{/foreach}
 	</div>
 </dd>