Changeset 23882 for trunk


Ignore:
Timestamp:
Jul 9, 2013, 1:14:14 AM (11 years ago)
Author:
rvelices
Message:
  • on picture.php do not set the prefetch link if already set by a plugin
  • picture.tpl set the derivative size checkbox id to the correct name
Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/picture.php

    r23689 r23882  
    945945if (isset($picture['next'])
    946946    and $picture['next']['src_image']->is_original()
     947    and $template->get_template_vars('U_PREFETCH') == null
    947948    and strpos($_SERVER['HTTP_USER_AGENT'], 'Chrome/') === false)
    948949{
  • trunk/themes/default/template/picture.tpl

    r23689 r23882  
    3232        }
    3333        jQuery('#derivativeSwitchBox .switchCheck').css('visibility','hidden');
    34         jQuery('#derivativeChecked'+typeSave).css('visibility','visible');
     34        jQuery('#derivativeChecked'+typeMap).css('visibility','visible');
    3535        document.cookie = 'picture_deriv='+typeSave+';path={/literal}{$COOKIE_PATH}{literal}';
    3636}
     
    4343  <div class="switchBoxTitle">{'Photo sizes'|@translate}</div>
    4444  {foreach from=$current.unique_derivatives item=derivative key=derivative_type}
    45   <span class="switchCheck" id="derivativeChecked{$derivative_type}"{if $derivative->get_type() ne $current.selected_derivative->get_type()} style="visibility:hidden"{/if}>&#x2714; </span>
     45  <span class="switchCheck" id="derivativeChecked{$derivative->get_type()}"{if $derivative->get_type() ne $current.selected_derivative->get_type()} style="visibility:hidden"{/if}>&#x2714; </span>
    4646  <a href="javascript:changeImgSrc('{$derivative->get_url()|@escape:javascript}','{$derivative_type}','{$derivative->get_type()}')">
    4747    {$derivative->get_type()|@translate}<span class="derivativeSizeDetails"> ({$derivative->get_size_hr()})</span>
Note: See TracChangeset for help on using the changeset viewer.