- simplified inneficient css rules

- template language key
- group picture scripts on the bottom of the page


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

4 files changed, 32 insertions, 32 deletions

diff --git a/include/template.class.php b/include/template.class.php
index 529601a6a..2e62d3d94 100644
--- a/include/template.class.php
+++ b/include/template.class.php
@@ -596,9 +596,10 @@ class Template {
       }
       if (count($this->scriptLoader->inline_scripts))
       {
-        $content[]= '<script type="text/javascript">';
+        $content[]= '<script type="text/javascript">//<![CDATA[ 
+';
         $content = array_merge($content, $this->scriptLoader->inline_scripts);
-        $content[]= '</script>';
+        $content[]= '//]]></script>';
       }
 
       if (count($scripts[1]))
@@ -1170,7 +1171,7 @@ final class FileCombiner
       $is_reload =
         (isset($_SERVER['HTTP_CACHE_CONTROL']) && strpos($_SERVER['HTTP_CACHE_CONTROL'], 'max-age=0') !== false)
         || (isset($_SERVER['HTTP_PRAGMA']) && strpos($_SERVER['HTTP_PRAGMA'], 'no-cache'));
-      if ($is_reload)
+      if (is_admin() && $is_reload)
       {// the user pressed F5 in the browser
         if ($is_css || $conf['template_compile_check']==false)
           $exists = false; // we foce regeneration of css because @import sub-files are never checked for modification
diff --git a/themes/default/template/picture.tpl b/themes/default/template/picture.tpl
index 9afef3d5a..1288e1f17 100644
--- a/themes/default/template/picture.tpl
+++ b/themes/default/template/picture.tpl
@@ -60,7 +60,7 @@
 		</a>
 {/if}
 {if isset($U_SET_AS_REPRESENTATIVE)}
-		<a href="{$U_SET_AS_REPRESENTATIVE}" title="{'set as category representative'|@translate}" class="pwg-state-default pwg-button" rel="nofollow">
+		<a href="{$U_SET_AS_REPRESENTATIVE}" title="{'set as album representative'|@translate}" class="pwg-state-default pwg-button" rel="nofollow">
 			<span class="pwg-icon pwg-icon-representative">&nbsp;</span><span class="pwg-button-text">{'representative'|@translate}</span>
 		</a>
 {/if}
@@ -70,7 +70,7 @@
 		</a>
 {/if}
 {if isset($U_CADDIE)}{*caddie management BEGIN*}
-<script type="text/javascript">
+{footer_script}
 {literal}function addToCadie(aElement, rootUrl, id)
 {
 if (aElement.disabled) return;
@@ -85,7 +85,7 @@ y.callService(
 	}
 	);
 }{/literal}
-</script>
+{/footer_script}
 		<a href="{$U_CADDIE}" onclick="addToCadie(this, '{$ROOT_URL|@escape:'javascript'}', {$current.id}); return false;" title="{'add to caddie'|@translate}" class="pwg-state-default pwg-button" rel="nofollow">
 			<span class="pwg-icon pwg-icon-caddie-add">&nbsp;</span><span class="pwg-button-text">{'caddie'|@translate}</span>
 		</a>
@@ -241,7 +241,7 @@ y.callService(
 		<td class="label">{'Who can see this photo?'|@translate}</td>
 		<td class="value"> 
 {combine_script id='core.scripts' load='async' path='themes/default/js/scripts.js'}
-<script type="text/javascript">
+{footer_script}
 {literal}function setPrivacyLevel(selectElement, rootUrl, id, level)
 {
 selectElement.disabled = true;
@@ -255,7 +255,7 @@ y.callService(
 	}
 	);
 }{/literal}
-</script>
+{/footer_script}
 	<select onchange="setPrivacyLevel(this, '{$ROOT_URL|@escape:'javascript'}', {$current.id}, this.options[selectedIndex].value)">
 		{foreach from=$available_permission_levels item=label key=level}
 		<option label="{$label}" value="{$level}"{if $level == $current.level} selected="selected"{/if}>{$label}</option>
diff --git a/themes/default/template/picture_nav_buttons.tpl b/themes/default/template/picture_nav_buttons.tpl
index 03000676b..1a0e2c315 100644
--- a/themes/default/template/picture_nav_buttons.tpl
+++ b/themes/default/template/picture_nav_buttons.tpl
@@ -84,7 +84,7 @@
 {/if}
 </div>
 
-<script type="text/javascript">// <![CDATA[ {literal}
+{footer_script}{literal}
 document.onkeydown = function(e)
 {
 	e=e||window.event;
@@ -97,29 +97,28 @@ document.onkeydown = function(e)
 	switch(keyCode) {
 {/literal}
 {if isset($next)}
-	case 63235: case 39: if (e.ctrlKey || docElem.scrollLeft==docElem.scrollWidth-docElem.clientWidth)url="{$next.U_IMG|@escape:jasvascript}";  break;
+	case 63235: case 39: if (e.ctrlKey || docElem.scrollLeft==docElem.scrollWidth-docElem.clientWidth)url="{$next.U_IMG}";  break;
 {/if}
 {if isset($previous)}
-	case 63234: case 37: if (e.ctrlKey || docElem.scrollLeft==0)url="{$previous.U_IMG|@escape:jasvascript}"; break;
+	case 63234: case 37: if (e.ctrlKey || docElem.scrollLeft==0)url="{$previous.U_IMG}"; break;
 {/if}
 {if isset($first)}
-	/*Home*/case 36: if (e.ctrlKey)url="{$first.U_IMG|@escape:jasvascript}"; break;
+	/*Home*/case 36: if (e.ctrlKey)url="{$first.U_IMG}"; break;
 {/if}
 {if isset($last)}
-	/*End*/case 35: if (e.ctrlKey)url="{$last.U_IMG|@escape:jasvascript}"; break;
+	/*End*/case 35: if (e.ctrlKey)url="{$last.U_IMG}"; break;
 {/if}
 {if isset($U_UP) and !isset($slideshow)}
-	/*Up*/case 38: if (e.ctrlKey)url="{$U_UP|@escape:jasvascript}"; break;
+	/*Up*/case 38: if (e.ctrlKey)url="{$U_UP}"; break;
 {/if}
-
 {if isset($slideshow.U_START_PLAY)}
-	/*Pause*/case 32: url="{$slideshow.U_START_PLAY|@escape:jasvascript}"; break;
+	/*Pause*/case 32: url="{$slideshow.U_START_PLAY}"; break;
 {/if}
 {if isset($slideshow.U_STOP_PLAY)}
-	/*Play*/case 32: url="{$slideshow.U_STOP_PLAY|@escape:jasvascript}"; break;
+	/*Play*/case 32: url="{$slideshow.U_STOP_PLAY}"; break;
 {/if}
 	}
 	if (url) {ldelim}window.location=url.replace("&amp;","&"); return false;}
 	return true;
 }
-// ]]></script>
+{/footer_script}
diff --git a/themes/default/theme.css b/themes/default/theme.css
index c8f352504..9238f9ac0 100644
--- a/themes/default/theme.css
+++ b/themes/default/theme.css
@@ -507,53 +507,53 @@ FIELDSET {
 	overflow: hidden; /* <- makes Opera happy */
 }
 
-FORM.filter FIELDSET UL {
+FORM.filter UL {
   margin: 0;
 }
-FORM.filter FIELDSET UL,
-FORM.filter FIELDSET LABEL {
+FORM.filter UL,
+FORM.filter LABEL {
 	display: block;
 	float: left;
 	margin-right: 1em;
 	padding: 0;
 }
 
-FORM.filter FIELDSET LI {
+FORM.filter LI {
 	list-style: none;
 	margin-bottom: 0.5em;
 }
 
-FORM.filter FIELDSET LI LABEL {
+FORM.filter LI LABEL {
 	display: inline;
 	float: none;
 }
 
-FORM.filter FIELDSET UL.tagSelection LABEL {
+FORM.filter UL.tagSelection LABEL {
 	display: inline;
 	float: none;
 	margin-right:0.5em;/*reduce from above*/
 }
 
 /* cannot use FIELDSET>LABEL because of IE<=6 */
-FORM.filter FIELDSET LABEL INPUT,
-FORM.filter FIELDSET LABEL SELECT,
-FORM.filter FIELDSET LABEL SPAN,
-FORM.filter FIELDSET LABEL TEXTAREA {
+FORM.filter LABEL INPUT,
+FORM.filter LABEL SELECT,
+FORM.filter LABEL SPAN,
+FORM.filter LABEL TEXTAREA {
   display: block;
   margin: 0.5em 0;
 }
 FORM.filter FIELDSET * LABEL INPUT,
 FORM.filter FIELDSET * LABEL SELECT,
 FORM.filter FIELDSET * LABEL TEXTAREA,
-FORM.filter FIELDSET LABEL SPAN INPUT,
-FORM.filter FIELDSET LABEL SPAN SELECT,
-FORM.filter FIELDSET LABEL SPAN TEXTAREA {
+FORM.filter LABEL SPAN INPUT,
+FORM.filter LABEL SPAN SELECT,
+FORM.filter LABEL SPAN TEXTAREA {
 	display: inline;
 	vertical-align: top;
 	margin: 0 0.5em 0 0;
 }
 
-FORM.filter FIELDSET UL.tagSelection LI LABEL INPUT {
+FORM.filter UL.tagSelection LI LABEL INPUT {
 	margin-right:0;
 }