diff options
| author | rvelices <rv-github@modusoptimus.com> | 2013-07-08 23:14:14 +0000 |
|---|---|---|
| committer | rvelices <rv-github@modusoptimus.com> | 2013-07-08 23:14:14 +0000 |
| commit | c3c807b553ab42d0486af45bae71aac411f48e7c (patch) | |
| tree | f7ce2432d8030b79fbb4fd831e288c90a8e71146 | |
| parent | 571ebc12f7b6285cc7662c8901b9f2148d653287 (diff) | |
- 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
git-svn-id: http://piwigo.org/svn/trunk@23882 68402e56-0260-453c-a942-63ccdbb3a9ee
| -rw-r--r-- | picture.php | 1 | ||||
| -rw-r--r-- | themes/default/template/picture.tpl | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/picture.php b/picture.php index e736373ba..d5050abcd 100644 --- a/picture.php +++ b/picture.php @@ -944,6 +944,7 @@ $template->assign( 'ELEMENT_CONTENT', $element_content ); 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) { $template->assign( diff --git a/themes/default/template/picture.tpl b/themes/default/template/picture.tpl index f41b573e3..debe06dd2 100644 --- a/themes/default/template/picture.tpl +++ b/themes/default/template/picture.tpl @@ -31,7 +31,7 @@ function changeImgSrc(url,typeSave,typeMap) theImg.useMap = "#map"+typeMap; } 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}'; } (SwitchBox=window.SwitchBox||[]).push("#derivativeSwitchLink", "#derivativeSwitchBox"); @@ -42,7 +42,7 @@ function changeImgSrc(url,typeSave,typeMap) <div id="derivativeSwitchBox" class="switchBox"> <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}>✔ </span> + <span class="switchCheck" id="derivativeChecked{$derivative->get_type()}"{if $derivative->get_type() ne $current.selected_derivative->get_type()} style="visibility:hidden"{/if}>✔ </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> </a><br> |