Changeset 8299 for trunk/themes

Timestamp:

Dec 25, 2010, 1:15:46 PM (13 years ago)

Author:

rvelices

Message:

• simplified inneficient css rules
• template language key
• group picture scripts on the bottom of the page

Location:

trunk/themes/default

Files:

• template/picture.tpl (modified) (5 diffs)
• template/picture_nav_buttons.tpl (modified) (3 diffs)
• theme.css (modified) (5 diffs)

trunk/themes/default/template/picture.tpl

@@ -61 +61 @@
 {/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>
@@ -71 +71 @@
 {/if}
 {if isset($U_CADDIE)}{*caddie management BEGIN*}
-<script type="text/javascript">
+{footer_script}
 {literal}function addToCadie(aElement, rootUrl, id)
 {
@@ -86 +86 @@
         );
 }{/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>
@@ -242 +242 @@
                 <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)
 {
@@ -256 +256 @@
         );
 }{/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}

trunk/themes/default/template/picture_nav_buttons.tpl

@@ -85 +85 @@
 </div>
 
-<script type="text/javascript">// <![CDATA[ {literal}
+{footer_script}{literal}
 document.onkeydown = function(e)
 {
@@ -98 +98 @@
 {/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}
         }
@@ -123 +122 @@
         return true;
 }
-// ]]></script>
+{/footer_script}

trunk/themes/default/theme.css

@@ -508 +508 @@
 }
 
-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;
@@ -519 +519 @@
 }
 
-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;
@@ -536 +536 @@
 
 /* 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;
@@ -546 +546 @@
 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;
@@ -554 +554 @@
 }
 
-FORM.filter FIELDSET UL.tagSelection LI LABEL INPUT {
+FORM.filter UL.tagSelection LI LABEL INPUT {
         margin-right:0;
 }