aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorflop25 <flop25@piwigo.org>2013-06-28 19:39:31 +0000
committerflop25 <flop25@piwigo.org>2013-06-28 19:39:31 +0000
commitcc8835bb1f1666491d3719b39fd19a97c623d142 (patch)
treea32f32b44400b09b34c549fde98c193a41b7317c
parent512bf7ce8660d028596ab22e25d90de2d65735f7 (diff)
bug:2918
Display a link for the fist and last page on picture.tpl, to go to the album 3 lang keys added git-svn-id: http://piwigo.org/svn/trunk@23642 68402e56-0260-453c-a942-63ccdbb3a9ee
-rw-r--r--language/en_UK/common.lang.php3
-rw-r--r--language/fr_FR/common.lang.php3
-rw-r--r--themes/default/template/picture.tpl8
-rw-r--r--themes/default/theme.css19
-rw-r--r--themes/elegant/theme.css6
5 files changed, 34 insertions, 5 deletions
diff --git a/language/en_UK/common.lang.php b/language/en_UK/common.lang.php
index 05ebc8626..79b01987a 100644
--- a/language/en_UK/common.lang.php
+++ b/language/en_UK/common.lang.php
@@ -184,9 +184,11 @@ $lang['Filesize'] = "Filesize";
$lang['Filter and display'] = "Filter and display";
$lang['Filter'] = "Filter";
$lang['First'] = "First";
+$lang['First Page'] = 'First page';
$lang['Forbidden'] = 'Forbidden';
$lang['Forgot your password?'] = 'Forgot your password?';
$lang['from %s to %s'] = "from %s to %s";
+$lang['Go back to the album'] = "Go back to the album";
$lang['Go through the gallery as a visitor'] = "Navigate the gallery as a visitor";
$lang['group by letters'] = "group by letters";
$lang['guest'] = "guest";
@@ -217,6 +219,7 @@ $lang['Language'] = "Language";
$lang['large'] = 'L - large';
$lang['last %d days'] = "last %d days";
$lang['Last'] = "Last";
+$lang['Last Page'] = "Last page";
$lang['letters'] = "letters";
$lang['Links'] = "Links";
$lang['login mustn\'t end with a space character'] = "login must not end with a space character";
diff --git a/language/fr_FR/common.lang.php b/language/fr_FR/common.lang.php
index d324fed58..242c09c13 100644
--- a/language/fr_FR/common.lang.php
+++ b/language/fr_FR/common.lang.php
@@ -173,8 +173,10 @@ $lang['Filesize'] = 'Poids';
$lang['Filter and display'] = 'Filtrer et afficher';
$lang['Filter'] = 'Filtre';
$lang['First'] = 'Première';
+$lang['First Page'] = 'Première page';
$lang['Forgot your password?'] = 'Mot de passe oublié ?';
$lang['from %s to %s'] = 'du %s au %s';
+$lang['Go back to the album'] = "Retourner à l'album";
$lang['Go through the gallery as a visitor'] = 'Parcourir la galerie en tant que visiteur';
$lang['group by letters'] = 'regrouper par lettres';
$lang['guest'] = 'visiteur';
@@ -202,6 +204,7 @@ $lang['Kind of date'] = 'Type de date';
$lang['Language'] = 'Langue';
$lang['last %d days'] = '%d derniers jours';
$lang['Last'] = 'Dernière';
+$lang['Last Page'] = "Dernière page";
$lang['letters'] = 'lettres';
$lang['Links'] = 'Liens';
$lang['login mustn\'t end with a space character'] = 'le nom d\'utilisateur ne doit pas se terminer par un espace';
diff --git a/themes/default/template/picture.tpl b/themes/default/template/picture.tpl
index bdf21bd65..8d94438cd 100644
--- a/themes/default/template/picture.tpl
+++ b/themes/default/template/picture.tpl
@@ -132,12 +132,20 @@ y.callService(
<span class="thumbHover prevThumbHover"></span>
<img src="{$previous.derivatives.square->get_url()}" alt="{$previous.TITLE|@escape}">
</a>
+ {elseif isset($U_UP)}
+ <a class="navThumb" id="linkFirst" href="{$U_UP}" title="{'Thumbnails'|@translate}" rel="prev">
+ <div class="thumbHover">{'First Page'|@translate}<br><br>{'Go back to the album'|@translate}</div>
+ </a>
{/if}
{if isset($next)}
<a class="navThumb" id="linkNext" href="{$next.U_IMG}" title="{'Next'|@translate} : {$next.TITLE|@escape}" rel="next">
<span class="thumbHover nextThumbHover"></span>
<img src="{$next.derivatives.square->get_url()}" alt="{$next.TITLE|@escape}">
</a>
+ {elseif isset($U_UP)}
+ <a class="navThumb" id="linkLast" href="{$U_UP}" title="{'Thumbnails'|@translate}" rel="next">
+ <div class="thumbHover">{'Last Page'|@translate}<br><br>{'Go back to the album'|@translate}</div>
+ </a>
{/if}
</div>
{/if}
diff --git a/themes/default/theme.css b/themes/default/theme.css
index 25444db30..c77e81c9d 100644
--- a/themes/default/theme.css
+++ b/themes/default/theme.css
@@ -391,14 +391,29 @@ TD.calDayCellFull, TD.calDayCellEmpty {
min-height: 120px;
}
-#linkPrev {
+#linkPrev, #linkFirst {
float: left;
margin: 5px 10px 0 5px;
}
-#linkNext {
+#linkNext, #linkLast {
float: right;
margin: 5px 5px 0 10px;
+ text-align: right;
+}
+
+#linkFirst, #linkLast {
+ border: 1px solid #ccc;
+ height: 118px;
+ line-height: 118px;
+}
+
+#linkFirst div, #linkLast div {
+ display: inline-block;
+ vertical-align: middle;
+ width: 108px;
+ line-height: 1.2;
+ margin: 0 5px;
}
.imageInfoTable UL { /*this is the album list*/
diff --git a/themes/elegant/theme.css b/themes/elegant/theme.css
index cd2be7e89..e5b046cbd 100644
--- a/themes/elegant/theme.css
+++ b/themes/elegant/theme.css
@@ -220,10 +220,10 @@ a:hover { border-bottom: none;}
}
#imageInfos .navThumbs { width: 250px; height: 130px; margin: auto; padding: 0 5px;}
-#imageInfos .navThumb { position: relative; width: 120px; height: 120px; margin: 0; overflow: hidden;}
+#imageInfos .navThumb { position: relative; margin: 0; overflow: hidden;}
#imageInfos #linkPrev { float: left;}
-#imageInfos #linkNext { float: right;}
-#imageInfos .thumbHover { position: absolute; width: 100%; height: 100%;}
+#imageInfos #linkNext { float: right;}
+#imageInfos #linkFirst, #imageInfos #linkLast { border-color: #444444;}
#imageInfos .prevThumbHover { background: transparent url(icon/none.png) no-repeat center center;}
#imageInfos .prevThumbHover:hover { background: transparent url(icon/img_prev.png) no-repeat center center;}
#imageInfos .nextThumbHover { background: transparent url(icon/none.png) no-repeat center center;}