[prev in list] [next in list] [prev in thread] [next in thread] 

List:       gallery-checkins
Subject:    [Gallery-checkins] CVS: gallery2/layouts/classic/templates albumBody.tpl,1.12,1.13 singleBody.tpl,1.
From:       Bharat Mediratta <bharat () users ! sourceforge ! net>
Date:       2002-11-25 10:22:53
[Download RAW message or body]

Update of /cvsroot/gallery/gallery2/layouts/classic/templates
In directory sc8-pr-cvs1:/tmp/cvs-serv32227/layouts/classic/templates

Modified Files:
	albumBody.tpl singleBody.tpl 
Log Message:
* Classic layout now displays number of children each album contains 
 
* GalleryDataItems have a new propery, "canBeViewedInline".  The layout 
  will use that to determine if the full size image should be displayed 
  inline (like a photo) or if it should be downloaded externally (like 
  a word document) 
        - XXX: might want to make this an actual property of the item 
               instead of a property of a specific class, so that we can 
               support some GalleryMovieItem's that are inline and 
               others that aren't 
 
* Fixed minor open_basedir issue with imagemagick module 
 
* Fixed bugs in the way that GalleryModule::getItemLinks were returning 
  links. 
 
* Added GalleryItemHelper 
 
* Registered GalleryUnknownItem to hold any items with mime types 
  that we don't explicitly support 
 


Index: albumBody.tpl
===================================================================
RCS file: /cvsroot/gallery/gallery2/layouts/classic/templates/albumBody.tpl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- albumBody.tpl	22 Nov 2002 23:42:07 -0000	1.12
+++ albumBody.tpl	25 Nov 2002 10:22:51 -0000	1.13
@@ -17,10 +17,12 @@
 		<tr>	
 		  <td>
 		    {foreach from=$moduleItemLinks item=module}
-		    {foreach from=$module item=link}
+		    {foreach from=$module item=links}
+		    {foreach from=$links item=link}
 		    <a href="{$link.url}">[{$link.text}]</a>
 		    {/foreach}
 		    {/foreach}
+		    {/foreach}
 		  </td>
 		  <td align="right">
 		    {foreach from=$moduleSystemLinks item=module}
@@ -83,6 +85,18 @@
 		<i>{$child.summary}</i>
 		{else}
 		&nbsp;
+		{/if}
+
+		{if !empty($child.childCount)}
+		<br>
+		{gallerySmallerFont}
+		{galleryText one="This album contains %d item"
+                             many="This album contains %d items"
+                             count=$child.childCount
+                             arg1=$child.childCount}
+		{/gallerySmallerFont}
+		{else}
+		&nbsp
 		{/if}
 		
 		{if (!empty($child.moduleSummaries)) }

Index: singleBody.tpl
===================================================================
RCS file: /cvsroot/gallery/gallery2/layouts/classic/templates/singleBody.tpl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- singleBody.tpl	22 Nov 2002 23:42:07 -0000	1.8
+++ singleBody.tpl	25 Nov 2002 10:22:51 -0000	1.9
@@ -6,10 +6,12 @@
 		<tr>	
 		  <td>
 		    {foreach from=$moduleItemLinks item=module}
-		    {foreach from=$module item=link}
+		    {foreach from=$module item=links}
+		    {foreach from=$links item=link}
 		    <a href="{$link.url}">[{$link.text}]</a>
 		    {/foreach}
 		    {/foreach}
+		    {/foreach}
 		  </td>
 		  <td align="right">
 		    {foreach from=$moduleSystemLinks item=module}
@@ -47,8 +49,10 @@
 		<tr>
 		  <td align=center>
 		    {strip}
-		    {galleryThinFrame}
 		    {assign var="image" value=$imageViews.$imageViewsIndex}
+
+		    {if ($image.inline)}
+		    {galleryThinFrame}
 		    <img src="{galleryUrl view=core:DownloadItem itemId=$image.id}"
 		    {if ($image.width && $image.height)}
 		         width="{$image.width}"
@@ -57,6 +61,11 @@
 		         border="0"
 		    >
 		    {/galleryThinFrame}
+		    {else}
+		    <a href="{galleryUrl view=core:DownloadItem itemId=$image.id}">
+		    {galleryText text="Download this item"} 
+		    </a>
+		    {/if}
 		    {/strip}
 		  </td>
 		</tr>
@@ -75,6 +84,7 @@
 		      <b>
 			{/if}
 
+			{if $imageViews[imageView].inline}
 			[
 			{if empty($imageViews[imageView].width)}
 			{galleryText text="??? x ???"}
@@ -82,6 +92,7 @@
 			{galleryText text="%d x %d" arg1=$imageViews[imageView].width arg2=$imageViews[imageView].height}
 			{/if}
 			]
+			{/if}
 
 			{if $smarty.section.imageView.index == $imageViewsIndex}
 		      </b>



-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
__[ g a l l e r y - c h e c k i n s ]_________________________

[ list info/archive --> http://gallery.sf.net/lists.php ]
[ gallery info/FAQ/download --> http://gallery.sf.net ]
[prev in list] [next in list] [prev in thread] [next in thread]