mirrors/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2025-04-28 04:09:56 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixes #1179 use standard structure for icons to remove a tag in a combined tags search

Browse source 
use standard structure for icons to remove a tag in a combined tags search
The icon displays with 2 tags combined instead of 3
To avoid breaking all themes, we keep the old style by default, but the new style is available. The upgrade to 2.11 documentation will mention it.
This commit is contained in:
Hannah 2020-04-27 10:00:12 +02:00
parent 10962c9208
commit 5bf85c982b
2 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
include/functions_html.inc.php
View file

@ -418,7 +418,7 @@ function get_tags_content_title()
.trigger_change('render_tag_name', $page['tags'][$i]['name'], $page['tags'][$i]) .trigger_change('render_tag_name', $page['tags'][$i]['name'], $page['tags'][$i])
.'</a>'; .'</a>';
if (count($page['tags']) > 2) if (count($page['tags']) > 1)
{ {
$other_tags = $page['tags']; $other_tags = $page['tags'];
unset($other_tags[$i]); unset($other_tags[$i]);
@ -429,11 +429,12 @@ function get_tags_content_title()
); );
$title.= $title.=
'<a href="'.$remove_url.'" style="border:none;" title="' '<a id="TagsGroupRemoveTag" href="'.$remove_url.'" style="border:none;" title="'
.l10n('remove this tag from the list') .l10n('remove this tag from the list')
.'"><img src="' .'"><img src="'
.get_root_url().get_themeconf('icon_dir').'/remove_s.png' .get_root_url().get_themeconf('icon_dir').'/remove_s.png'
.'" alt="x" style="vertical-align:bottom;">' .'" alt="x" style="vertical-align:bottom;" >'
.'<span class="pwg-icon pwg-icon-close" ></span>'
.'</a>'; .'</a>';
} }
} }

5
themes/default/theme.css
View file

@ -792,3 +792,8 @@ LEGEND {
.selectize-dropdown [data-selectable], .selectize-dropdown .optgroup-header { .selectize-dropdown [data-selectable], .selectize-dropdown .optgroup-header {
padding: 0px 5px !important; padding: 0px 5px !important;
} }
#TagsGroupRemoveTag span{
display:none;
}