From: <min...@us...> - 2006-10-05 19:03:50
|
Revision: 14697 http://svn.sourceforge.net/gallery/?rev=14697&view=rev Author: mindless Date: 2006-10-05 12:03:46 -0700 (Thu, 05 Oct 2006) Log Message: ----------- don't use a template variable called "link" in any theme, to avoid imageblock interpreting this as a block parameter. Modified Paths: -------------- trunk/gallery2/themes/carbon/templates/album.tpl trunk/gallery2/themes/carbon/templates/navigator.tpl trunk/gallery2/themes/carbon/templates/photo.tpl trunk/gallery2/themes/hybrid/templates/hybrid.tpl trunk/gallery2/themes/slider/templates/sidebar.tpl trunk/gallery2/themes/slider/templates/slider.tpl Modified: trunk/gallery2/themes/carbon/templates/album.tpl =================================================================== --- trunk/gallery2/themes/carbon/templates/album.tpl 2006-10-05 18:43:17 UTC (rev 14696) +++ trunk/gallery2/themes/carbon/templates/album.tpl 2006-10-05 19:03:46 UTC (rev 14697) @@ -21,28 +21,28 @@ {if (isset($links) || isset($theme.itemLinks))} {if !isset($links)}{assign var="links" value=$theme.itemLinks}{/if} - {foreach from=$links item=link} - {if $link.moduleId == "cart"} + {foreach from=$links item=itemLink} + {if $itemLink.moduleId == "cart"} <td class="gsActionIcon"> - <div class="buttonCart"><a href="{g->url params=$link.params}" - title="{$link.text}"></a></div> + <div class="buttonCart"><a href="{g->url params=$itemLink.params}" + title="{$itemLink.text}"></a></div> </td> - {elseif $link.moduleId == "comment"} - {if $link.params.view == "comment.AddComment" } + {elseif $itemLink.moduleId == "comment"} + {if $itemLink.params.view == "comment.AddComment" } <td class="gsActionIcon"> - <div class="buttonAddComment"><a href="{g->url params=$link.params}" - title="{$link.text}"></a></div> + <div class="buttonAddComment"><a href="{g->url params=$itemLink.params}" + title="{$itemLink.text}"></a></div> </td> - {elseif $link.params.view == "comment.ShowAllComments"} + {elseif $itemLink.params.view == "comment.ShowAllComments"} <td class="gsActionIcon"> - <div class="buttonViewComments"><a href="{g->url params=$link.params}" - title="{$link.text}"></a></div> + <div class="buttonViewComments"><a href="{g->url params=$itemLink.params}" + title="{$itemLink.text}"></a></div> </td> {/if} - {elseif $link.moduleId == "slideshow"} + {elseif $itemLink.moduleId == "slideshow"} <td class="gsActionIcon"> - <div class="buttonViewSlideshow"><a href="{g->url params=$link.params}" - title="{$link.text}"></a></div> + <div class="buttonViewSlideshow"><a href="{g->url params=$itemLink.params}" + title="{$itemLink.text}"></a></div> </td> {/if} {/foreach} Modified: trunk/gallery2/themes/carbon/templates/navigator.tpl =================================================================== --- trunk/gallery2/themes/carbon/templates/navigator.tpl 2006-10-05 18:43:17 UTC (rev 14696) +++ trunk/gallery2/themes/carbon/templates/navigator.tpl 2006-10-05 19:03:46 UTC (rev 14697) @@ -47,17 +47,17 @@ {if (isset($links) || isset($theme.itemLinks))} {if !isset($links)}{assign var="links" value=$theme.itemLinks}{/if} - {foreach from=$links item=link} - {if $link.moduleId == "cart"} + {foreach from=$links item=itemLink} + {if $itemLink.moduleId == "cart"} <td class="gsActionIcon"> - <div class="buttonCart"><a href="{g->url params=$link.params}" - title="{$link.text}"></a></div> + <div class="buttonCart"><a href="{g->url params=$itemLink.params}" + title="{$itemLink.text}"></a></div> </td> - {elseif $link.moduleId == "comment"} - {if $link.params.view == "comment.AddComment" } + {elseif $itemLink.moduleId == "comment"} + {if $itemLink.params.view == "comment.AddComment" } <td class="gsActionIcon"> - <div class="buttonAddComment"><a href="{g->url params=$link.params}" - title="{$link.text}"></a></div> + <div class="buttonAddComment"><a href="{g->url params=$itemLink.params}" + title="{$itemLink.text}"></a></div> </td> {/if} {/if} Modified: trunk/gallery2/themes/carbon/templates/photo.tpl =================================================================== --- trunk/gallery2/themes/carbon/templates/photo.tpl 2006-10-05 18:43:17 UTC (rev 14696) +++ trunk/gallery2/themes/carbon/templates/photo.tpl 2006-10-05 19:03:46 UTC (rev 14697) @@ -24,17 +24,17 @@ {if (isset($links) || isset($theme.itemLinks))} {if !isset($links)}{assign var="links" value=$theme.itemLinks}{/if} - {foreach from=$links item=link} - {if $link.moduleId == "slideshow"} + {foreach from=$links item=itemLink} + {if $itemLink.moduleId == "slideshow"} <td class="gsActionIcon"> - <div class="buttonViewSlideshow"><a href="{g->url params=$link.params}" - title="{$link.text}"></a></div> + <div class="buttonViewSlideshow"><a href="{g->url params=$itemLink.params}" + title="{$itemLink.text}"></a></div> </td> - {elseif $link.moduleId == "comment"} - {if $link.params.view == "comment.ShowAllComments"} + {elseif $itemLink.moduleId == "comment"} + {if $itemLink.params.view == "comment.ShowAllComments"} <td class="gsActionIcon"> - <div class="buttonViewComments"><a href="{g->url params=$link.params}" - title="{$link.text}"></a></div> + <div class="buttonViewComments"><a href="{g->url params=$itemLink.params}" + title="{$itemLink.text}"></a></div> </td> {/if} {/if} Modified: trunk/gallery2/themes/hybrid/templates/hybrid.tpl =================================================================== --- trunk/gallery2/themes/hybrid/templates/hybrid.tpl 2006-10-05 18:43:17 UTC (rev 14696) +++ trunk/gallery2/themes/hybrid/templates/hybrid.tpl 2006-10-05 19:03:46 UTC (rev 14697) @@ -141,19 +141,19 @@ {/if} <a id="info_{$it.imageIndex}" href="{g->url params=$theme.pageUrl arg1="itemId=`$it.id`" arg2="detail=1"}"></a> - {capture assign=link} + {capture assign=href} <a href="" onclick="image_show({$it.imageIndex});return false"> {/capture} {if isset($it.thumbnail) && isset($theme.params.itemFrame)} {g->container type="imageframe.ImageFrame" frame=$theme.params.itemFrame width=$it.thumbnail.width height=$it.thumbnail.height} - {$link} + {$href} {g->image item=$it image=$it.thumbnail id="%ID%" class="%CLASS% giThumbnail" title=$smarty.capture.thumbTitle} </a> {/g->container} {else} - {$link} + {$href} {if isset($it.thumbnail)} {g->image item=$it image=$it.thumbnail class="giThumbnail" title=$smarty.capture.thumbTitle} @@ -163,19 +163,19 @@ </a> {/if} {elseif ($it.canContainChildren || $it.entityType == 'GalleryLinkItem')} - {capture assign=link} + {capture assign=href} <a href="{g->url arg1="view=core.ShowItem" arg2="itemId=`$it.id`"}"> {/capture} {if isset($it.thumbnail) && isset($theme.params.albumFrame)} {g->container type="imageframe.ImageFrame" frame=$theme.params.albumFrame width=$it.thumbnail.width height=$it.thumbnail.height} - {$link} + {$href} {g->image item=$it image=$it.thumbnail id="%ID%" class="%CLASS% giThumbnail" title=$smarty.capture.thumbTitle} </a> {/g->container} {else} - {$link} + {$href} {if isset($it.thumbnail)} {g->image item=$it image=$it.thumbnail class="giThumbnail" title=$smarty.capture.thumbTitle} @@ -236,8 +236,8 @@ {/if} {if isset($it.itemLinks)} <span id="links_{$i}" style="display: none"> - {foreach from=$it.itemLinks item=link} - <a href="{g->url params=$link.params}">{$link.text}</a><br/> + {foreach from=$it.itemLinks item=itemLink} + <a href="{g->url params=$itemLink.params}">{$itemLink.text}</a><br/> {/foreach} </span> {/if} Modified: trunk/gallery2/themes/slider/templates/sidebar.tpl =================================================================== --- trunk/gallery2/themes/slider/templates/sidebar.tpl 2006-10-05 18:43:17 UTC (rev 14696) +++ trunk/gallery2/themes/slider/templates/sidebar.tpl 2006-10-05 19:03:46 UTC (rev 14697) @@ -38,8 +38,9 @@ <option label="{g->text text="« actions »"}" value=""> {g->text text="« actions »"} </option> - {foreach from=$theme.itemLinks item=link} - <option label="{$link.text}" value="{g->url params=$link.params}">{$link.text}</option> + {foreach from=$theme.itemLinks item=itemLink} + <option label="{$itemLink.text}" + value="{g->url params=$itemLink.params}">{$itemLink.text}</option> {/foreach} </select> </div> Modified: trunk/gallery2/themes/slider/templates/slider.tpl =================================================================== --- trunk/gallery2/themes/slider/templates/slider.tpl 2006-10-05 18:43:17 UTC (rev 14696) +++ trunk/gallery2/themes/slider/templates/slider.tpl 2006-10-05 19:03:46 UTC (rev 14697) @@ -16,8 +16,9 @@ {/if} <span id="title_{$it.imageIndex}">{$it.title|markup}</span> <select id="links_{$it.imageIndex}"> - {foreach from=$it.itemLinks item=link} - <option label="{$link.text}" value="{g->url params=$link.params}">{$link.text}</option> + {foreach from=$it.itemLinks item=itemLink} + <option label="{$itemLink.text}" + value="{g->url params=$itemLink.params}">{$itemLink.text}</option> {/foreach} </select> {/if} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |