Changeset 23882 for trunk

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:

• picture.php (modified) (1 diff)
• themes/default/template/picture.tpl (modified) (2 diffs)

trunk/picture.php

@@ -945 +945 @@
 if (isset($picture['next'])
     and $picture['next']['src_image']->is_original()
+    and $template->get_template_vars('U_PREFETCH') == null
     and strpos($_SERVER['HTTP_USER_AGENT'], 'Chrome/') === false)
 {

trunk/themes/default/template/picture.tpl

@@ -32 +32 @@
         }
         jQuery('#derivativeSwitchBox .switchCheck').css('visibility','hidden');
-        jQuery('#derivativeChecked'+typeSave).css('visibility','visible');
+        jQuery('#derivativeChecked'+typeMap).css('visibility','visible');
         document.cookie = 'picture_deriv='+typeSave+';path={/literal}{$COOKIE_PATH}{literal}';
 }
@@ -43 +43 @@
   <div class="switchBoxTitle">{'Photo sizes'|@translate}</div>
   {foreach from=$current.unique_derivatives item=derivative key=derivative_type}
-  <span class="switchCheck" id="derivativeChecked{$derivative_type}"{if $derivative->get_type() ne $current.selected_derivative->get_type()} style="visibility:hidden"{/if}>&#x2714; </span>
+  <span class="switchCheck" id="derivativeChecked{$derivative->get_type()}"{if $derivative->get_type() ne $current.selected_derivative->get_type()} style="visibility:hidden"{/if}>&#x2714; </span>
   <a href="javascript:changeImgSrc('{$derivative->get_url()|@escape:javascript}','{$derivative_type}','{$derivative->get_type()}')">
     {$derivative->get_type()|@translate}<span class="derivativeSizeDetails"> ({$derivative->get_size_hr()})</span>