diff options
| author | plegall <plg@piwigo.org> | 2010-04-08 08:26:34 +0000 |
|---|---|---|
| committer | plegall <plg@piwigo.org> | 2010-04-08 08:26:34 +0000 |
| commit | 44d3601933552613e9a060a868c38679d6ec69f0 (patch) | |
| tree | 5ba954b407fe03edc0410637b482bfe5eddf033d | |
| parent | c10a261817cc3fd687f6f4de1f263b1fad337eca (diff) | |
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
| -rw-r--r-- | include/menubar.inc.php | 34 | ||||
| -rw-r--r-- | themes/Sylvia/icon/add_tag.png | bin | 193 -> 0 bytes | |||
| -rw-r--r-- | themes/default/icon/add_tag.png | bin | 59 -> 0 bytes | |||
| -rw-r--r-- | themes/default/template/menubar_tags.tpl | 10 |
4 files changed, 20 insertions, 24 deletions
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 Binary files differdeleted file mode 100644 index 66042aadf..000000000 --- a/themes/Sylvia/icon/add_tag.png +++ /dev/null diff --git a/themes/default/icon/add_tag.png b/themes/default/icon/add_tag.png Binary files differdeleted file mode 100644 index 9051a1d26..000000000 --- a/themes/default/icon/add_tag.png +++ /dev/null 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> |
