Changeset 5703

Timestamp:

Apr 8, 2010, 10:26:34 AM (14 years ago)

Author:

plg

Message:

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.

Location:

trunk

Files:

• include/menubar.inc.php (modified) (1 diff)
• themes/Sylvia/icon/add_tag.png (deleted)
• themes/default/icon/add_tag.png (deleted)
• themes/default/template/menubar_tags.tpl (modified) (1 diff)

trunk/include/menubar.inc.php

@@ -113 +113 @@
   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)
-                      )
-                    )
-                  ),
-            )
+              )
+            ),
+          )
         );
     }

trunk/themes/default/template/menubar_tags.tpl

@@ -3 +3 @@
         <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>