From: Alan H. <min...@us...> - 2005-07-13 16:33:49
|
Update of /cvsroot/gallery/gallery2/modules/imageblock/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22077/modules/imageblock/templates Modified Files: ImageBlock.tpl Log Message: Renamed ImageBlockSystemContent to ImageBlockData. Fixed testExternalImageBlock. Index: ImageBlock.tpl =================================================================== RCS file: /cvsroot/gallery/gallery2/modules/imageblock/templates/ImageBlock.tpl,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- ImageBlock.tpl 10 Jul 2005 01:33:40 -0000 1.25 +++ ImageBlock.tpl 13 Jul 2005 16:33:39 -0000 1.26 @@ -4,7 +4,7 @@ * may overwrite it. Instead, copy it into a new directory called "local" and edit that * version. Gallery will look for that file first and use it if it exists. *} -{foreach from=$ImageBlockSystemContent.blocks item=block} +{foreach from=$ImageBlockData.blocks item=block} <div class="one-image"> {if !empty($block.title)} <h3> {g->text text=$block.title} </h3> @@ -12,8 +12,8 @@ {capture name="link"} <a href="{g->url arg1="view=core.ShowItem" arg2="itemId=`$block.id`"}" {strip} - {if isset($ImageBlockSystemContent.linkTarget)} - target="{$ImageBlockSystemContent.linkTarget}" + {if isset($ImageBlockData.linkTarget)} + target="{$ImageBlockData.linkTarget}" {/if}{/strip}> {/capture} {if $block.item.canContainChildren} @@ -21,17 +21,17 @@ {else} {assign var=frameType value="itemFrame"} {/if} - {if array_key_exists('maxSize', $ImageBlockSystemContent)} - {assign var=maxSize value=$ImageBlockSystemContent.maxSize} - {elseif isset($ImageBlockSystemContent.$frameType) - && $ImageBlockSystemContent.$frameType != 'none'} + {if array_key_exists('maxSize', $ImageBlockData)} + {assign var=maxSize value=$ImageBlockData.maxSize} + {elseif isset($ImageBlockData.$frameType) + && $ImageBlockData.$frameType != 'none'} {assign var=maxSize value=120} {else} {assign var=maxSize value=150} {/if} - {if isset($ImageBlockSystemContent.$frameType)} + {if isset($ImageBlockData.$frameType)} {g->container type="imageframe.ImageFrame" - frame=$ImageBlockSystemContent.$frameType} + frame=$ImageBlockData.$frameType} {$smarty.capture.link} {g->image item=$block.item image=$block.thumb id="%ID%" class="%CLASS%" maxSize=$maxSize} </a> @@ -42,27 +42,27 @@ </a> {/if} - {if isset($ImageBlockSystemContent.show.title) && isset($block.item.title)} + {if isset($ImageBlockData.show.title) && isset($block.item.title)} <h4 class="giDescription"> {$block.item.title|markup} </h4> {/if} - {if isset($ImageBlockSystemContent.show.date) || - isset($ImageBlockSystemContent.show.views) || - isset($ImageBlockSystemContent.show.owner)} + {if isset($ImageBlockData.show.date) || + isset($ImageBlockData.show.views) || + isset($ImageBlockData.show.owner)} <p class="giInfo"> - {if isset($ImageBlockSystemContent.show.date)} + {if isset($ImageBlockData.show.date)} {g->text text="Date:"} {g->date timestamp=$block.item.originationTimestamp} <br/> {/if} - {if isset($ImageBlockSystemContent.show.views)} + {if isset($ImageBlockData.show.views)} {g->text text="Views: %d" arg1=$block.viewCount} <br/> {/if} - {if isset($ImageBlockSystemContent.show.owner)} + {if isset($ImageBlockData.show.owner)} {g->text text="Owner: %s" arg1=$block.owner.fullName|default:$block.owner.userName} <br/> {/if} |