- local.lang is loaded without fallback on default language or PHPWG_DEFAULT_LANGUAGE (needed to change the signature of load_language which became a little too big)

- move a function from functions.inc.php to functions_picture.inc.php (included only when necessary)
- removed some css (not as much as I wanted)

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

4 files changed, 35 insertions, 38 deletions

diff --git a/template-extension/distributed/samples/my-picture.tpl b/template-extension/distributed/samples/my-picture.tpl
index 4e81ff696..1f2f6f13d 100644
--- a/template-extension/distributed/samples/my-picture.tpl
+++ b/template-extension/distributed/samples/my-picture.tpl
@@ -22,13 +22,13 @@
 </div>
 
 {if isset($previous) }
-<a class="navThumb" id="thumbPrev" href="{$previous.U_IMG}" title="{'previous_page'|@translate} : {$previous.TITLE}" rel="prev">
-  <img src="{$previous.THUMB_SRC}" class="thumbLink" id="linkPrev" alt="{$previous.TITLE}">
+<a class="navThumb" id="linkPrev" href="{$previous.U_IMG}" title="{'previous_page'|@translate} : {$previous.TITLE}" rel="prev">
+  <img src="{$previous.THUMB_SRC}" alt="{$previous.TITLE}">
 </a>
 {/if}
 {if isset($next) }
-<a class="navThumb" id="thumbNext" href="{$next.U_IMG}" title="{'next_page'|@translate} : {$next.TITLE}" rel="next">
-  <img src="{$next.THUMB_SRC}" class="thumbLink" id="linkNext" alt="{$next.TITLE}">
+<a class="navThumb" id="linkNext" href="{$next.U_IMG}" title="{'next_page'|@translate} : {$next.TITLE}" rel="next">
+  <img src="{$next.THUMB_SRC}" alt="{$next.TITLE}">
 </a>
 {/if}
 
diff --git a/template/yoga/default-layout.css b/template/yoga/default-layout.css
index 4e96abe5a..c8b77d12e 100644
--- a/template/yoga/default-layout.css
+++ b/template/yoga/default-layout.css
@@ -163,25 +163,25 @@ FORM.filter FIELDSET LABEL SPAN SELECT {
 
 FORM.filter FIELDSET P
 {
-  clear: left;
-  display: block;
+	clear: left;
+	display: block;
 }
 
 FORM.filter INPUT[type="submit"] {
-  margin-top: 1em;
+	margin-top: 1em;
 }
 
-FORM.properties UL, FORM#update UL {
-  list-style-type: none;
-  margin: 0;
-  padding: 0;
+FORM.properties UL {
+	list-style-type: none;
+	margin: 0;
+	padding: 0;
 }
 
-FORM.properties LI, FORM#update UL  {
-  margin-bottom: 0.5em;
-  padding: 0;
-  line-height: 1.8em;
-  clear: left;
+FORM.properties LI {
+	margin-bottom: 0.5em;
+	padding: 0;
+	line-height: 1.8em;
+	clear: left;
 }
 
 FORM.properties SPAN.property {
diff --git a/template/yoga/picture.css b/template/yoga/picture.css
index 839760053..945d729a4 100644
--- a/template/yoga/picture.css
+++ b/template/yoga/picture.css
@@ -58,25 +58,22 @@
   border-style: solid;
 }
 
-.navThumb {
-    margin-top: 2px;
-}
-#thumbPrev {
-    float: left;
+#linkPrev {
+	float: left;
 }
 
-#thumbNext {
-    float: right;
+#linkNext {
+	float: right;
 }
 
-#linkPrev {
-    margin-right: 10px;
-    margin-left: 5px;
+#linkPrev IMG {
+	margin-right: 10px;
+	margin-left: 5px;
 }
 
-#linkNext {
-    margin-right: 5px;
-    margin-left: 10px;
+#linkNext IMG {
+	margin-right: 5px;
+	margin-left: 10px;
 }
 
 TABLE.infoTable .value {
@@ -96,17 +93,17 @@ TABLE.infoTable TD.value UL {
 }
 
 .rateButton, .rateButtonSelected, .rateButtonStarFull, .rateButtonStarEmpty  {
-  padding:0;
-  border:0;
+	padding:0;
+	border:0;
 }
 
 .rateButton, .rateButtonStarFull, .rateButtonStarEmpty {
-  cursor: pointer;
+	cursor: pointer;
 }
 
 .rateButtonSelected {
-  font-weight:bold;
-  font-size:120%;
+	font-weight:bold;
+	font-size:120%;
 }
 
 .rateButtonStarFull {
diff --git a/template/yoga/picture.tpl b/template/yoga/picture.tpl
index aec446bd6..a807eb728 100644
--- a/template/yoga/picture.tpl
+++ b/template/yoga/picture.tpl
@@ -93,13 +93,13 @@ y.callService(
 </div>
 
 {if isset($previous) }
-<a class="navThumb" id="thumbPrev" href="{$previous.U_IMG}" title="{'previous_page'|@translate} : {$previous.TITLE}" rel="prev">
-  <img src="{$previous.THUMB_SRC}" class="thumbLink" id="linkPrev" alt="{$previous.TITLE}">
+<a class="navThumb" id="linkPrev" href="{$previous.U_IMG}" title="{'previous_page'|@translate} : {$previous.TITLE}" rel="prev">
+  <img src="{$previous.THUMB_SRC}" alt="{$previous.TITLE}">
 </a>
 {/if}
 {if isset($next) }
-<a class="navThumb" id="thumbNext" href="{$next.U_IMG}" title="{'next_page'|@translate} : {$next.TITLE}" rel="next">
-  <img src="{$next.THUMB_SRC}" class="thumbLink" id="linkNext" alt="{$next.TITLE}">
+<a class="navThumb" id="linkNext" href="{$next.U_IMG}" title="{'next_page'|@translate} : {$next.TITLE}" rel="next">
+  <img src="{$next.THUMB_SRC}" alt="{$next.TITLE}">
 </a>
 {/if}