archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge -r18667 from trunk - improved page title when viewing tags, fix canonical url on index page if the webmaster changes the default number of thumbnails per page

Browse source 
git-svn-id: http://piwigo.org/svn/branches/2.4@18668 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices 2012-10-16 19:59:08 +00:00
parent 7ed296715e
commit afb83c772d
2 changed files with 18 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
include/functions_html.inc.php
View file

@ -434,8 +434,9 @@ $btrace_msg
function get_tags_content_title() function get_tags_content_title()
{ {
global $page; global $page;
$title = count($page['tags']) > 1 ? l10n('Tag') : l10n('Tag'); $title = '<a href="'.get_root_url().'tags.php" title="'.l10n('display available tags').'">'
$title.= ' '; . l10n( count($page['tags']) > 1 ? 'Tags' : 'Tag' )
. '</a> ';
for ($i=0; $i<count($page['tags']); $i++) for ($i=0; $i<count($page['tags']); $i++)
{ {
@ -454,12 +455,7 @@ function get_tags_content_title()
.trigger_event('render_tag_name', $page['tags'][$i]['name']) .trigger_event('render_tag_name', $page['tags'][$i]['name'])
.'</a>'; .'</a>';
$remove_url = null; if (count($page['tags']) > 2)
if (count($page['tags']) == 1)
{
$remove_url = get_root_url().'tags.php';
}
else
{ {
$other_tags = $page['tags']; $other_tags = $page['tags'];
unset($other_tags[$i]); unset($other_tags[$i]);
@ -468,15 +464,15 @@ function get_tags_content_title()
'tags' => $other_tags 'tags' => $other_tags
) )
); );
}
$title.= $title.=
'<a href="'.$remove_url.'" style="border:none;" title="' '<a 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;">'
.'</a>'; .'</a>';
}
} }
return $title; return $title;
} }

7
index.php
View file

@ -99,7 +99,12 @@ if (isset($page['is_homepage']) and $page['is_homepage'])
} }
else else
{ {
$canonical_url = duplicate_index_url(); $start = $page['nb_image_page'] * round($page['start'] / $page['nb_image_page']);
if ($start>0 && $start >= count($page['items']) )
{
$start -= $page['nb_image_page'];
}
$canonical_url = duplicate_index_url(array('start' => $start));
} }
$template->assign('U_CANONICAL', $canonical_url); $template->assign('U_CANONICAL', $canonical_url);