improvement of picture title on picture page, drop boxes on index page ...

sharpening uses a zider scale range 

git-svn-id: http://piwigo.org/svn/trunk@13115 68402e56-0260-453c-a942-63ccdbb3a9ee

4 files changed, 8 insertions, 22 deletions

diff --git a/themes/default/template/index.tpl b/themes/default/template/index.tpl
index 519e1a732..2502e42b1 100644
--- a/themes/default/template/index.tpl
+++ b/themes/default/template/index.tpl
@@ -8,8 +8,8 @@
 			<span class="pwg-icon pwg-icon-sort">&nbsp;</span><span class="pwg-button-text">{'Sort order'|@translate}</span>
 		</a>
 		<div id="sortOrderBox" style="display:none; text-align:left" onclick="toggleSortOrderBox()" onmouseout="e=event.toElement||event.relatedTarget;e.parentNode==this||e==this||toggleSortOrderBox()">
-			{'Sort order'|@translate}:
-			{foreach from=$image_orders item=image_order}<br>
+			{'Sort order'|@translate}<hr>
+			{foreach from=$image_orders item=image_order name=loop}{if !$smarty.foreach.loop.first}<br>{/if}
 			{if $image_order.SELECTED}
 			<span>{$image_order.DISPLAY}</span>
 			{else}
@@ -39,7 +39,8 @@ function toggleSortOrderBox() {
 			<span class="pwg-icon pwg-icon-sizes">&nbsp;</span><span class="pwg-button-text">{'Photo sizes'|@translate}</span>
 		</a>
 		<div id="derivativeSwitchBox" style="display:none; text-align:left" onclick="toggleImageDerivativesBox()" onmouseout="e=event.toElement||event.relatedTarget;e.parentNode==this||e==this||toggleImageDerivativesBox()">
-			{foreach from=$image_derivatives item=image_derivative name=deriv_loop}{if !$smarty.foreach.deriv_loop.first}<br>{/if}
+			{'Photo sizes'|@translate}<hr>
+			{foreach from=$image_derivatives item=image_derivative name=loop}{if !$smarty.foreach.loop.first}<br>{/if}
 			{if $image_derivative.SELECTED}
 			<span>{$image_derivative.DISPLAY}</span>
 			{else}
diff --git a/themes/default/template/picture.tpl b/themes/default/template/picture.tpl
index b679d2ebb..1c562cc4d 100644
--- a/themes/default/template/picture.tpl
+++ b/themes/default/template/picture.tpl
@@ -12,12 +12,9 @@
 
 <div id="imageHeaderBar">
 	<div class="browsePath">
-		{$SECTION_TITLE} {$LEVEL_SEPARATOR}{$current.TITLE}
+		{$SECTION_TITLE} {$LEVEL_SEPARATOR} <h2>{$current.TITLE}</h2>
 	</div>
 	<div class="imageNumber">{$PHOTO}</div>
-	{if $SHOW_PICTURE_NAME_ON_TITLE}
-	<h2>{$current.TITLE}</h2>
-	{/if}
 </div>
 
 <div id="imageToolBar">
diff --git a/themes/default/template/slideshow.tpl b/themes/default/template/slideshow.tpl
index a310935a2..71fa06558 100644
--- a/themes/default/template/slideshow.tpl
+++ b/themes/default/template/slideshow.tpl
@@ -3,11 +3,9 @@
     {if isset($U_SLIDESHOW_STOP) }
     [ <a href="{$U_SLIDESHOW_STOP}">{'stop the slideshow'|@translate}</a> ]
     {/if}
+		<h2 class="showtitle">{$current.TITLE}</h2>
   </div>
   <div class="imageNumber">{$PHOTO}</div>
-  {if $SHOW_PICTURE_NAME_ON_TITLE }
-  <h2 class="showtitle">{$current.TITLE}</h2>
-  {/if}
 </div>
 
 <div id="imageToolBar">
diff --git a/themes/default/theme.css b/themes/default/theme.css
index 00cb89482..853180af5 100644
--- a/themes/default/theme.css
+++ b/themes/default/theme.css
@@ -320,9 +320,9 @@ TD.calDayHead {
 }
 
 #imageHeaderBar H2 {
+	display: inline;
 	text-align: center;
 	padding: 0;
-	clear: both;
 }
 
 #imageToolBar {
@@ -342,7 +342,7 @@ TD.calDayHead {
 	padding: 0.2em;
 	position: absolute;
 	left: 5px;
-	top: 10%;
+	top: 12%;
 }
 
 #derivativeSwitchBox, #sortOrderBox {
@@ -357,12 +357,6 @@ TD.calDayHead {
 	position: relative; /*so that the drivative switch link is positioned relative to us*/
 }
 
-#theImage>IMG {
-	display: block;
-	margin: 0 auto;
-	border: 0;
-}
-
 #imageInfos {
 	position: relative;
 	min-height: 120px;
@@ -465,10 +459,6 @@ A.pwg-state-default:hover {
 	border-bottom: 0; /*reset above for icons*/
 }
 
-IMG {
-	border: 0;
-}
-
 #copyright {
 	clear: both;
 	font-size: 83%;