Changeset 8299


Ignore:
Timestamp:
Dec 25, 2010, 1:15:46 PM (10 years ago)
Author:
rvelices
Message:
  • simplified inneficient css rules
  • template language key
  • group picture scripts on the bottom of the page
Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/include/template.class.php

    r8170 r8299  
    597597      if (count($this->scriptLoader->inline_scripts))
    598598      {
    599         $content[]= '<script type="text/javascript">';
     599        $content[]= '<script type="text/javascript">//<![CDATA[
     600';
    600601        $content = array_merge($content, $this->scriptLoader->inline_scripts);
    601         $content[]= '</script>';
     602        $content[]= '//]]></script>';
    602603      }
    603604
     
    11711172        (isset($_SERVER['HTTP_CACHE_CONTROL']) && strpos($_SERVER['HTTP_CACHE_CONTROL'], 'max-age=0') !== false)
    11721173        || (isset($_SERVER['HTTP_PRAGMA']) && strpos($_SERVER['HTTP_PRAGMA'], 'no-cache'));
    1173       if ($is_reload)
     1174      if (is_admin() && $is_reload)
    11741175      {// the user pressed F5 in the browser
    11751176        if ($is_css || $conf['template_compile_check']==false)
  • trunk/themes/default/template/picture.tpl

    r8119 r8299  
    6161{/if}
    6262{if isset($U_SET_AS_REPRESENTATIVE)}
    63                 <a href="{$U_SET_AS_REPRESENTATIVE}" title="{'set as category representative'|@translate}" class="pwg-state-default pwg-button" rel="nofollow">
     63                <a href="{$U_SET_AS_REPRESENTATIVE}" title="{'set as album representative'|@translate}" class="pwg-state-default pwg-button" rel="nofollow">
    6464                        <span class="pwg-icon pwg-icon-representative">&nbsp;</span><span class="pwg-button-text">{'representative'|@translate}</span>
    6565                </a>
     
    7171{/if}
    7272{if isset($U_CADDIE)}{*caddie management BEGIN*}
    73 <script type="text/javascript">
     73{footer_script}
    7474{literal}function addToCadie(aElement, rootUrl, id)
    7575{
     
    8686        );
    8787}{/literal}
    88 </script>
     88{/footer_script}
    8989                <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">
    9090                        <span class="pwg-icon pwg-icon-caddie-add">&nbsp;</span><span class="pwg-button-text">{'caddie'|@translate}</span>
     
    242242                <td class="value">
    243243{combine_script id='core.scripts' load='async' path='themes/default/js/scripts.js'}
    244 <script type="text/javascript">
     244{footer_script}
    245245{literal}function setPrivacyLevel(selectElement, rootUrl, id, level)
    246246{
     
    256256        );
    257257}{/literal}
    258 </script>
     258{/footer_script}
    259259        <select onchange="setPrivacyLevel(this, '{$ROOT_URL|@escape:'javascript'}', {$current.id}, this.options[selectedIndex].value)">
    260260                {foreach from=$available_permission_levels item=label key=level}
  • trunk/themes/default/template/picture_nav_buttons.tpl

    r8119 r8299  
    8585</div>
    8686
    87 <script type="text/javascript">// <![CDATA[ {literal}
     87{footer_script}{literal}
    8888document.onkeydown = function(e)
    8989{
     
    9898{/literal}
    9999{if isset($next)}
    100         case 63235: case 39: if (e.ctrlKey || docElem.scrollLeft==docElem.scrollWidth-docElem.clientWidth)url="{$next.U_IMG|@escape:jasvascript}";  break;
     100        case 63235: case 39: if (e.ctrlKey || docElem.scrollLeft==docElem.scrollWidth-docElem.clientWidth)url="{$next.U_IMG}";  break;
    101101{/if}
    102102{if isset($previous)}
    103         case 63234: case 37: if (e.ctrlKey || docElem.scrollLeft==0)url="{$previous.U_IMG|@escape:jasvascript}"; break;
     103        case 63234: case 37: if (e.ctrlKey || docElem.scrollLeft==0)url="{$previous.U_IMG}"; break;
    104104{/if}
    105105{if isset($first)}
    106         /*Home*/case 36: if (e.ctrlKey)url="{$first.U_IMG|@escape:jasvascript}"; break;
     106        /*Home*/case 36: if (e.ctrlKey)url="{$first.U_IMG}"; break;
    107107{/if}
    108108{if isset($last)}
    109         /*End*/case 35: if (e.ctrlKey)url="{$last.U_IMG|@escape:jasvascript}"; break;
     109        /*End*/case 35: if (e.ctrlKey)url="{$last.U_IMG}"; break;
    110110{/if}
    111111{if isset($U_UP) and !isset($slideshow)}
    112         /*Up*/case 38: if (e.ctrlKey)url="{$U_UP|@escape:jasvascript}"; break;
     112        /*Up*/case 38: if (e.ctrlKey)url="{$U_UP}"; break;
    113113{/if}
    114 
    115114{if isset($slideshow.U_START_PLAY)}
    116         /*Pause*/case 32: url="{$slideshow.U_START_PLAY|@escape:jasvascript}"; break;
     115        /*Pause*/case 32: url="{$slideshow.U_START_PLAY}"; break;
    117116{/if}
    118117{if isset($slideshow.U_STOP_PLAY)}
    119         /*Play*/case 32: url="{$slideshow.U_STOP_PLAY|@escape:jasvascript}"; break;
     118        /*Play*/case 32: url="{$slideshow.U_STOP_PLAY}"; break;
    120119{/if}
    121120        }
     
    123122        return true;
    124123}
    125 // ]]></script>
     124{/footer_script}
  • trunk/themes/default/theme.css

    r8269 r8299  
    508508}
    509509
    510 FORM.filter FIELDSET UL {
     510FORM.filter UL {
    511511  margin: 0;
    512512}
    513 FORM.filter FIELDSET UL,
    514 FORM.filter FIELDSET LABEL {
     513FORM.filter UL,
     514FORM.filter LABEL {
    515515        display: block;
    516516        float: left;
     
    519519}
    520520
    521 FORM.filter FIELDSET LI {
     521FORM.filter LI {
    522522        list-style: none;
    523523        margin-bottom: 0.5em;
    524524}
    525525
    526 FORM.filter FIELDSET LI LABEL {
     526FORM.filter LI LABEL {
    527527        display: inline;
    528528        float: none;
    529529}
    530530
    531 FORM.filter FIELDSET UL.tagSelection LABEL {
     531FORM.filter UL.tagSelection LABEL {
    532532        display: inline;
    533533        float: none;
     
    536536
    537537/* cannot use FIELDSET>LABEL because of IE<=6 */
    538 FORM.filter FIELDSET LABEL INPUT,
    539 FORM.filter FIELDSET LABEL SELECT,
    540 FORM.filter FIELDSET LABEL SPAN,
    541 FORM.filter FIELDSET LABEL TEXTAREA {
     538FORM.filter LABEL INPUT,
     539FORM.filter LABEL SELECT,
     540FORM.filter LABEL SPAN,
     541FORM.filter LABEL TEXTAREA {
    542542  display: block;
    543543  margin: 0.5em 0;
     
    546546FORM.filter FIELDSET * LABEL SELECT,
    547547FORM.filter FIELDSET * LABEL TEXTAREA,
    548 FORM.filter FIELDSET LABEL SPAN INPUT,
    549 FORM.filter FIELDSET LABEL SPAN SELECT,
    550 FORM.filter FIELDSET LABEL SPAN TEXTAREA {
     548FORM.filter LABEL SPAN INPUT,
     549FORM.filter LABEL SPAN SELECT,
     550FORM.filter LABEL SPAN TEXTAREA {
    551551        display: inline;
    552552        vertical-align: top;
     
    554554}
    555555
    556 FORM.filter FIELDSET UL.tagSelection LI LABEL INPUT {
     556FORM.filter UL.tagSelection LI LABEL INPUT {
    557557        margin-right:0;
    558558}
Note: See TracChangeset for help on using the changeset viewer.