Changeset 23689 for trunk

Timestamp:

Jun 30, 2013, 7:57:49 AM (11 years ago)

Author:

rvelices

Message:

on picture page add TITLE_ESC variable for every thumb to avoid escaping TITLE more than 40 times in the template...

Location:

trunk

Files:

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

trunk/picture.php

@@ -542 +542 @@
   $picture[$i] = $row;
   $picture[$i]['TITLE'] = render_element_name($row);
+  $picture[$i]['TITLE_ESC'] = str_replace('"', '"', $picture[$i]['TITLE']);
 
   if ('previous'==$i and $page['previous_item']==$page['first_item'])

trunk/themes/default/template/picture.tpl

@@ -129 +129 @@
         <div class="navThumbs">
                 {if isset($previous)}
-                        <a class="navThumb" id="linkPrev" href="{$previous.U_IMG}" title="{'Previous'|@translate} : {$previous.TITLE|@escape}" rel="prev">
+                        <a class="navThumb" id="linkPrev" href="{$previous.U_IMG}" title="{'Previous'|@translate} : {$previous.TITLE_ESC}" rel="prev">
                                 <span class="thumbHover prevThumbHover"></span>
-                                <img src="{$previous.derivatives.square->get_url()}" alt="{$previous.TITLE|@escape}">
+                                <img src="{$previous.derivatives.square->get_url()}" alt="{$previous.TITLE_ESC}">
                         </a>
                 {elseif isset($U_UP)}
@@ -139 +139 @@
                 {/if}
                 {if isset($next)}
-                        <a class="navThumb" id="linkNext" href="{$next.U_IMG}" title="{'Next'|@translate} : {$next.TITLE|@escape}" rel="next">
+                        <a class="navThumb" id="linkNext" href="{$next.U_IMG}" title="{'Next'|@translate} : {$next.TITLE_ESC}" rel="next">
                                 <span class="thumbHover nextThumbHover"></span>
-                                <img src="{$next.derivatives.square->get_url()}" alt="{$next.TITLE|@escape}">
+                                <img src="{$next.derivatives.square->get_url()}" alt="{$next.TITLE_ESC}">
                         </a>
                 {elseif isset($U_UP)}

trunk/themes/default/template/picture_content.tpl

@@ -5 +5 @@
 {/if}
 
-<img {if $current.selected_derivative->is_cached()}src="{$current.selected_derivative->get_url()}" {$current.selected_derivative->get_size_htm()}{else}src="{$ROOT_URL}{$themeconf.img_dir}/ajax_loader.gif" data-src="{$current.selected_derivative->get_url()}"{/if} alt="{$ALT_IMG}" id="theMainImage" usemap="#map{$current.selected_derivative->get_type()}" title="{if isset($COMMENT_IMG)}{$COMMENT_IMG|@strip_tags:false|@replace:'"':' '}{else}{$current.TITLE|@replace:'"':' '} - {$ALT_IMG}{/if}">
+<img {if $current.selected_derivative->is_cached()}src="{$current.selected_derivative->get_url()}" {$current.selected_derivative->get_size_htm()}{else}src="{$ROOT_URL}{$themeconf.img_dir}/ajax_loader.gif" data-src="{$current.selected_derivative->get_url()}"{/if} alt="{$ALT_IMG}" id="theMainImage" usemap="#map{$current.selected_derivative->get_type()}" title="{if isset($COMMENT_IMG)}{$COMMENT_IMG|@strip_tags:false|@replace:'"':' '}{else}{$current.TITLE_ESC} - {$ALT_IMG}{/if}">
 
 {foreach from=$current.unique_derivatives item=derivative key=derivative_type}{strip}
@@ -11 +11 @@
 {assign var='size' value=$derivative->get_size()}
 {if isset($previous)}
-<area shape=rect coords="0,0,{($size[0]/4)|@intval},{$size[1]}" href="{$previous.U_IMG}" title="{'Previous'|@translate} : {$previous.TITLE|@escape}" alt="{$previous.TITLE|@escape}">
+<area shape=rect coords="0,0,{($size[0]/4)|@intval},{$size[1]}" href="{$previous.U_IMG}" title="{'Previous'|@translate} : {$previous.TITLE_ESC}" alt="{$previous.TITLE_ESC}">
 {/if}
 <area shape=rect coords="{($size[0]/4)|@intval},0,{($size[0]/1.34)|@intval},{($size[1]/4)|@intval}" href="{$U_UP}" title="{'Thumbnails'|@translate}" alt="{'Thumbnails'|@translate}">
 {if isset($next)}
-<area shape=rect coords="{($size[0]/1.33)|@intval},0,{$size[0]},{$size[1]}" href="{$next.U_IMG}" title="{'Next'|@translate} : {$next.TITLE|@escape}" alt="{$next.TITLE|@escape}">
+<area shape=rect coords="{($size[0]/1.33)|@intval},0,{$size[0]},{$size[1]}" href="{$next.U_IMG}" title="{'Next'|@translate} : {$next.TITLE_ESC}" alt="{$next.TITLE_ESC}">
 {/if}
 </map>

trunk/themes/default/template/picture_nav_buttons.tpl

@@ -46 +46 @@
 {/if}{/strip}
 {strip}{if isset($previous)}
-        <a href="{$previous.U_IMG}" title="{'Previous'|@translate} : {$previous.TITLE|@escape}" class="pwg-state-default pwg-button">
+        <a href="{$previous.U_IMG}" title="{'Previous'|@translate} : {$previous.TITLE_ESC}" class="pwg-state-default pwg-button">
                 <span class="pwg-icon pwg-icon-arrow-w">&nbsp;</span><span class="pwg-button-text">{'Previous'|@translate}</span>
         </a>
@@ -65 +65 @@
 {/if}
 {strip}{if isset($next)}
-        <a href="{$next.U_IMG}" title="{'Next'|@translate} : {$next.TITLE|@escape}" class="pwg-state-default pwg-button pwg-button-icon-right">
+        <a href="{$next.U_IMG}" title="{'Next'|@translate} : {$next.TITLE_ESC}" class="pwg-state-default pwg-button pwg-button-icon-right">
                 <span class="pwg-icon pwg-icon-arrow-e">&nbsp;</span><span class="pwg-button-text">{'Next'|@translate}</span>
         </a>