From e834737e848c7328638a9080868cf92541b656a9 Mon Sep 17 00:00:00 2001
From: rub <rub@piwigo.org>
Date: Sun, 9 Mar 2008 07:53:02 +0000
Subject: Resolved issue 0000807: New slideshow features

change icon actions


git-svn-id: http://piwigo.org/svn/trunk@2270 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 language/en_UK/common.lang.php             |   4 +-
 language/es_ES/common.lang.php             |   4 +-
 language/fr_FR/common.lang.php             |   4 +-
 language/nl_NL/common.lang.php             |   4 +-
 template/yoga/icon/dec_period.png          | Bin 1209 -> 1230 bytes
 template/yoga/icon/dec_period_unactive.png | Bin 1169 -> 1042 bytes
 template/yoga/icon/inc_period.png          | Bin 1230 -> 1209 bytes
 template/yoga/icon/inc_period_unactive.png | Bin 1255 -> 1039 bytes
 template/yoga/picture_nav_buttons.tpl      |  74 ++++++++++++++---------------
 9 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/language/en_UK/common.lang.php b/language/en_UK/common.lang.php
index b6cdb666b..b19db1e8b 100644
--- a/language/en_UK/common.lang.php
+++ b/language/en_UK/common.lang.php
@@ -363,8 +363,8 @@ $lang['start_play'] = 'Play of slideshow';
 $lang['stop_play'] = 'Pause of slideshow';
 $lang['start_repeat'] = 'Repeat the slideshow';
 $lang['stop_repeat'] = 'Not repeat the slideshow';
-$lang['inc_period'] = 'Increase waiting between pictures';
-$lang['dec_period'] = 'Decrease waiting between pictures';
+$lang['inc_period'] = 'Reduce diaporama speed';
+$lang['dec_period'] = 'Accelerate diaporama speed';
 $lang['Submit'] = 'Submit';
 $lang['Yes'] = 'Yes';
 $lang['No'] = 'No';
diff --git a/language/es_ES/common.lang.php b/language/es_ES/common.lang.php
index 7daa903d7..c143b5903 100644
--- a/language/es_ES/common.lang.php
+++ b/language/es_ES/common.lang.php
@@ -363,8 +363,8 @@ $lang['from %s to %s'] = 'de %s a %s';
 /* TODO */ $lang['stop_play'] = 'Pause of slideshow';
 /* TODO */ $lang['start_repeat'] = 'Repeat the slideshow';
 /* TODO */ $lang['stop_repeat'] = 'Not repeat the slideshow';
-/* TODO */ $lang['inc_period'] = 'Increase waiting between pictures';
-/* TODO */ $lang['dec_period'] = 'Decrease waiting between pictures';
+/* TODO */ $lang['inc_period'] = 'Reduce diaporama speed';
+/* TODO */ $lang['dec_period'] = 'Accelerate diaporama speed';
 $lang['Submit'] = 'Validar';
 $lang['Yes'] = 'Si';
 $lang['No'] = 'No';
diff --git a/language/fr_FR/common.lang.php b/language/fr_FR/common.lang.php
index d207515bf..73dbbb92a 100644
--- a/language/fr_FR/common.lang.php
+++ b/language/fr_FR/common.lang.php
@@ -363,8 +363,8 @@ $lang['start_play'] = 'Lecture du diaporama';
 $lang['stop_play'] = 'Pause du diaporama';
 $lang['start_repeat'] = 'Répeter le diaporama';
 $lang['stop_repeat'] = 'Ne pas répeter le diaporama';
-$lang['inc_period'] = 'Augmenter l\'attente entre les images';
-$lang['dec_period'] = 'Diminuer l\'attente entre les images';
+$lang['inc_period'] = 'Ralentir la vitesse du diaporama';
+$lang['dec_period'] = 'Accélerer la vitesse du diaporama';
 $lang['Submit'] = 'Valider';
 $lang['Yes'] = 'Oui';
 $lang['No'] = 'Non';
diff --git a/language/nl_NL/common.lang.php b/language/nl_NL/common.lang.php
index 816b55387..5b46e4a3a 100644
--- a/language/nl_NL/common.lang.php
+++ b/language/nl_NL/common.lang.php
@@ -363,8 +363,8 @@ $lang['from %s to %s'] = 'van %s tot %s';
 /* TODO */ $lang['stop_play'] = 'Pause of slideshow';
 /* TODO */ $lang['start_repeat'] = 'Repeat the slideshow';
 /* TODO */ $lang['stop_repeat'] = 'Not repeat the slideshow';
-/* TODO */ $lang['inc_period'] = 'Increase waiting between pictures';
-/* TODO */ $lang['dec_period'] = 'Decrease waiting between pictures';
+/* TODO */ $lang['inc_period'] = 'Reduce diaporama speed';
+/* TODO */ $lang['dec_period'] = 'Accelerate diaporama speed';
 $lang['Submit'] = 'Bevestig';
 $lang['Yes'] = 'Ja';
 $lang['No'] = 'Nee';
diff --git a/template/yoga/icon/dec_period.png b/template/yoga/icon/dec_period.png
index 28fef3d1b..107cd16ec 100644
Binary files a/template/yoga/icon/dec_period.png and b/template/yoga/icon/dec_period.png differ
diff --git a/template/yoga/icon/dec_period_unactive.png b/template/yoga/icon/dec_period_unactive.png
index 1df2f1bc3..5bc67affd 100644
Binary files a/template/yoga/icon/dec_period_unactive.png and b/template/yoga/icon/dec_period_unactive.png differ
diff --git a/template/yoga/icon/inc_period.png b/template/yoga/icon/inc_period.png
index 107cd16ec..28fef3d1b 100644
Binary files a/template/yoga/icon/inc_period.png and b/template/yoga/icon/inc_period.png differ
diff --git a/template/yoga/icon/inc_period_unactive.png b/template/yoga/icon/inc_period_unactive.png
index ac1c7ca03..f45507dce 100644
Binary files a/template/yoga/icon/inc_period_unactive.png and b/template/yoga/icon/inc_period_unactive.png differ
diff --git a/template/yoga/picture_nav_buttons.tpl b/template/yoga/picture_nav_buttons.tpl
index f82f5f467..081696ee2 100644
--- a/template/yoga/picture_nav_buttons.tpl
+++ b/template/yoga/picture_nav_buttons.tpl
@@ -2,62 +2,62 @@
   <div class="navButtons">
   
 {if isset($last)}
-	<a class="navButton prev" href="{$last.U_IMG}" title="{'last_page'|@translate} : {$last.TITLE}" rel="last"><img src="{$ROOT_URL}{$themeconf.icon_dir}/last.png" class="button" alt="{'last_page'|@translate}"></a>
+  <a class="navButton prev" href="{$last.U_IMG}" title="{'last_page'|@translate} : {$last.TITLE}" rel="last"><img src="{$ROOT_URL}{$themeconf.icon_dir}/last.png" class="button" alt="{'last_page'|@translate}"></a>
 {else}
-	<a class="navButton prev"><img src="{$ROOT_URL}{$themeconf.icon_dir}/last_unactive.png" class="button" alt=""></a>
+  <a class="navButton prev"><img src="{$ROOT_URL}{$themeconf.icon_dir}/last_unactive.png" class="button" alt=""></a>
 {/if}
   
 {if isset($next)}
-	<a class="navButton next" href="{$next.U_IMG}" title="{'next_page'|@translate} : {$next.TITLE}" rel="next"><img src="{$ROOT_URL}{$themeconf.icon_dir}/right.png" class="button" alt="{'next_page'|@translate}"></a>
+  <a class="navButton next" href="{$next.U_IMG}" title="{'next_page'|@translate} : {$next.TITLE}" rel="next"><img src="{$ROOT_URL}{$themeconf.icon_dir}/right.png" class="button" alt="{'next_page'|@translate}"></a>
 {else}
-	<a class="navButton next"><img src="{$ROOT_URL}{$themeconf.icon_dir}/right_unactive.png" class="button" alt=""></a>
+  <a class="navButton next"><img src="{$ROOT_URL}{$themeconf.icon_dir}/right_unactive.png" class="button" alt=""></a>
 {/if}
 
 {if isset($slideshow.U_START_PLAY)}
-	<a class="navButton play" href="{$slideshow.U_START_PLAY}" title="{'start_play'|@translate}" rel="play"><img src="{$ROOT_URL}{$themeconf.icon_dir}/play.png" class="button" alt="{'start_play'|@translate}"></a>
+  <a class="navButton play" href="{$slideshow.U_START_PLAY}" title="{'start_play'|@translate}" rel="play"><img src="{$ROOT_URL}{$themeconf.icon_dir}/play.png" class="button" alt="{'start_play'|@translate}"></a>
 {/if}
 
 {if isset($slideshow.U_STOP_PLAY)}
-	<a class="navButton play" href="{$slideshow.U_STOP_PLAY}" title="{'stop_play'|@translate}" rel="play"><img src="{$ROOT_URL}{$themeconf.icon_dir}/pause.png" class="button" alt="{'stop_play'|@translate}"></a>
+  <a class="navButton play" href="{$slideshow.U_STOP_PLAY}" title="{'stop_play'|@translate}" rel="play"><img src="{$ROOT_URL}{$themeconf.icon_dir}/pause.png" class="button" alt="{'stop_play'|@translate}"></a>
 {/if}
 
 {if isset($U_UP) and !isset($slideshow)}
-	<a class="navButton up" href="{$U_UP}" title="{'thumbnails'|@translate}" rel="up"><img src="{$ROOT_URL}{$themeconf.icon_dir}/up.png" class="button" alt="{'thumbnails'|@translate}"></a>
+  <a class="navButton up" href="{$U_UP}" title="{'thumbnails'|@translate}" rel="up"><img src="{$ROOT_URL}{$themeconf.icon_dir}/up.png" class="button" alt="{'thumbnails'|@translate}"></a>
 {/if}
   
 {if isset($previous)}
-	<a class="navButton prev" href="{$previous.U_IMG}" title="{'previous_page'|@translate} : {$previous.TITLE}" rel="prev"><img src="{$ROOT_URL}{$themeconf.icon_dir}/left.png" class="button" alt="{'previous_page'|@translate}"></a>
+  <a class="navButton prev" href="{$previous.U_IMG}" title="{'previous_page'|@translate} : {$previous.TITLE}" rel="prev"><img src="{$ROOT_URL}{$themeconf.icon_dir}/left.png" class="button" alt="{'previous_page'|@translate}"></a>
 {else}
-	<a class="navButton prev"><img src="{$ROOT_URL}{$themeconf.icon_dir}/left_unactive.png" class="button" alt=""></a>
+  <a class="navButton prev"><img src="{$ROOT_URL}{$themeconf.icon_dir}/left_unactive.png" class="button" alt=""></a>
 {/if}
   
 {if isset($first)}
-	<a class="navButton prev" href="{$first.U_IMG}" title="{'first_page'|@translate} : {$first.TITLE}" rel="first"><img src="{$ROOT_URL}{$themeconf.icon_dir}/first.png" class="button" alt="{'first_page'|@translate}"></a>
+  <a class="navButton prev" href="{$first.U_IMG}" title="{'first_page'|@translate} : {$first.TITLE}" rel="first"><img src="{$ROOT_URL}{$themeconf.icon_dir}/first.png" class="button" alt="{'first_page'|@translate}"></a>
 {else}
-	<a class="navButton prev"><img src="{$ROOT_URL}{$themeconf.icon_dir}/first_unactive.png" class="button" alt=""></a>
+  <a class="navButton prev"><img src="{$ROOT_URL}{$themeconf.icon_dir}/first_unactive.png" class="button" alt=""></a>
 {/if}
 
 
 {if isset($slideshow.U_START_REPEAT)}
-	<a class="navButton repeat" href="{$slideshow.U_START_REPEAT}" title="{'start_repeat'|@translate}" rel="repeat"><img src="{$ROOT_URL}{$themeconf.icon_dir}/start_repeat.png" class="button" alt="{'start_repeat'|@translate}"></a>
+  <a class="navButton repeat" href="{$slideshow.U_START_REPEAT}" title="{'start_repeat'|@translate}" rel="repeat"><img src="{$ROOT_URL}{$themeconf.icon_dir}/start_repeat.png" class="button" alt="{'start_repeat'|@translate}"></a>
 {/if}
 
 {if isset($slideshow.U_STOP_REPEAT)}
-	<a class="navButton repeat" href="{$slideshow.U_STOP_REPEAT}" title="{'stop_repeat'|@translate}" rel="repeat"><img src="{$ROOT_URL}{$themeconf.icon_dir}/stop_repeat.png" class="button" alt="{'stop_repeat'|@translate}"></a>
+  <a class="navButton repeat" href="{$slideshow.U_STOP_REPEAT}" title="{'stop_repeat'|@translate}" rel="repeat"><img src="{$ROOT_URL}{$themeconf.icon_dir}/stop_repeat.png" class="button" alt="{'stop_repeat'|@translate}"></a>
 {/if}
 
 {if isset($slideshow)}
-{if isset($slideshow.U_INC_PERIOD)}
-	<a class="navButton inc_period" href="{$slideshow.U_INC_PERIOD}" title="{'inc_period'|@translate}" rel="repeat"><img src="{$ROOT_URL}{$themeconf.icon_dir}/inc_period.png" class="button" alt="{'inc_period'|@translate}"></a>
-{else}
-	<a class="navButton inc_period"> <img src="{$ROOT_URL}{$themeconf.icon_dir}/inc_period_unactive.png" class="button" alt=""></a>
-{/if}
+  {if isset($slideshow.U_DEC_PERIOD)}
+    <a class="navButton dec_period" href="{$slideshow.U_DEC_PERIOD}" title="{'dec_period'|@translate}" rel="repeat"><img src="{$ROOT_URL}{$themeconf.icon_dir}/dec_period.png" class="button" alt="{'dec_period'|@translate}"></a>
+  {else}
+    <a class="navButton dec_period"> <img src="{$ROOT_URL}{$themeconf.icon_dir}/dec_period_unactive.png" class="button" alt=""></a>
+  {/if}
 
-{if isset($slideshow.U_DEC_PERIOD)}
-	<a class="navButton dec_period" href="{$slideshow.U_DEC_PERIOD}" title="{'dec_period'|@translate}" rel="repeat"><img src="{$ROOT_URL}{$themeconf.icon_dir}/dec_period.png" class="button" alt="{'dec_period'|@translate}"></a>
-{else}
-	<a class="navButton dec_period"> <img src="{$ROOT_URL}{$themeconf.icon_dir}/dec_period_unactive.png" class="button" alt=""></a>
-{/if}
+  {if isset($slideshow.U_INC_PERIOD)}
+    <a class="navButton inc_period" href="{$slideshow.U_INC_PERIOD}" title="{'inc_period'|@translate}" rel="repeat"><img src="{$ROOT_URL}{$themeconf.icon_dir}/inc_period.png" class="button" alt="{'inc_period'|@translate}"></a>
+  {else}
+    <a class="navButton inc_period"> <img src="{$ROOT_URL}{$themeconf.icon_dir}/inc_period_unactive.png" class="button" alt=""></a>
+  {/if}
 {/if}
 
   </div>
@@ -66,35 +66,35 @@
 {literal}
 function keyboardNavigation(e)
 {
-	if(!e) var e=window.event;
-	if (e.altKey) return true;
-	var target = e.target || e.srcElement;
-	if (target && target.type) return true; //an input editable element
-	var keyCode=e.keyCode || e.which;
-	var docElem = document.documentElement;
-	switch(keyCode) {
+  if(!e) var e=window.event;
+  if (e.altKey) return true;
+  var target = e.target || e.srcElement;
+  if (target && target.type) return true; //an input editable element
+  var keyCode=e.keyCode || e.which;
+  var docElem = document.documentElement;
+  switch(keyCode) {
 {/literal}
 {if isset($next)}
-	case 63235: case 39: if (e.ctrlKey || docElem.scrollLeft==docElem.scrollWidth-docElem.clientWidth ){ldelim}window.location="{$next.U_IMG}".replace( "&amp;", "&" ); return false; } break;
+  case 63235: case 39: if (e.ctrlKey || docElem.scrollLeft==docElem.scrollWidth-docElem.clientWidth ){ldelim}window.location="{$next.U_IMG}".replace( "&amp;", "&" ); return false; } break;
 {/if}
 {if isset($previous)}
-	case 63234: case 37: if (e.ctrlKey || docElem.scrollLeft==0){ldelim}window.location="{$previous.U_IMG|@escape:jasvascript}".replace("&amp;","&"); return false; } break;
+  case 63234: case 37: if (e.ctrlKey || docElem.scrollLeft==0){ldelim}window.location="{$previous.U_IMG|@escape:jasvascript}".replace("&amp;","&"); return false; } break;
 {/if}
 {if isset($first)}
-	/*Home*/case 36: if (e.ctrlKey){ldelim}window.location="{$first.U_IMG|@escape:jasvascript}".replace("&amp;","&"); return false; } break;
+  /*Home*/case 36: if (e.ctrlKey){ldelim}window.location="{$first.U_IMG|@escape:jasvascript}".replace("&amp;","&"); return false; } break;
 {/if}
 {if isset($last)}
-	/*End*/case 35: if (e.ctrlKey){ldelim}window.location="{$last.U_IMG|@escape:jasvascript}".replace("&amp;","&"); return false; } break;
+  /*End*/case 35: if (e.ctrlKey){ldelim}window.location="{$last.U_IMG|@escape:jasvascript}".replace("&amp;","&"); return false; } break;
 {/if}
 {if isset($U_UP) and !isset($slideshow)}
-    /*Up*/case 38: if (e.ctrlKey){ldelim}window.location="{$U_UP|@escape:jasvascript}".replace("&amp;","&"); return false; } break;
+  /*Up*/case 38: if (e.ctrlKey){ldelim}window.location="{$U_UP|@escape:jasvascript}".replace("&amp;","&"); return false; } break;
 {/if}
 
 {if isset($slideshow.U_START_PLAY)}
-    /*Pause*/case 32: {ldelim}window.location="{$slideshow.U_START_PLAY|@escape:jasvascript}".replace("&amp;","&"); return false; } break;
+  /*Pause*/case 32: {ldelim}window.location="{$slideshow.U_START_PLAY|@escape:jasvascript}".replace("&amp;","&"); return false; } break;
 {/if}
 {if isset($slideshow.U_STOP_PLAY)}
-    /*Play*/case 32: {ldelim}window.location="{$slideshow.U_STOP_PLAY|@escape:jasvascript}".replace("&amp;","&"); return false; } break;
+  /*Play*/case 32: {ldelim}window.location="{$slideshow.U_STOP_PLAY|@escape:jasvascript}".replace("&amp;","&"); return false; } break;
 {/if}
   }
   return true;
-- 
cgit v1.2.3