Mail Index


[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [ApacheGallery] Text::Template instead of CGI::FastTemplate patch



Attached is a bugfix for this patch (and a cleanup for two of the
template files modified in 227) against revision 231.


Don Armstrong

-- 
Il semble que la perfection soit atteinte non quand il n'y a plus rien
a ajouter, mais quand il n'y a plus rien a retrancher.
(Perfection is apparently not achieved when nothing more can be added,
but when nothing else can be removed.)
-- Antoine de Saint-Exupe'ry, Terres des Hommes

http://www.donarmstrong.com
http://www.anylevel.com
http://rzlab.ucr.edu
Index: lib/Apache/Gallery.pm
===================================================================
--- lib/Apache/Gallery.pm	(revision 231)
+++ lib/Apache/Gallery.pm	(working copy)
@@ -637,8 +636,10 @@
 
 		}
 		else {
-			$tpl_vars{PICTUREINFO} = 'nopictureinfo';
-		}	
+			$tpl_vars{PICTUREINFO} = fill_in_file($tpl_vars{nopictureinfo},
+							      HASH => \%tpl_vars,
+							     );
+		}
 
 		my $scaleable = 0;
 		foreach my $size (@sizes) {
Index: templates/default/pictureinfo.tpl
===================================================================
--- templates/default/pictureinfo.tpl	(revision 231)
+++ templates/default/pictureinfo.tpl	(working copy)
@@ -1,10 +1,10 @@
 <td width="60%">
           <center>
             <table align="center" class="info">
+              <tr>
+                <td>
 									{ $COMMENT }
 									{ $INFO }
-									{ $COMMENT }
-									{ $INFO }
                 </td>
               </tr>
             </table>
Index: templates/default/file.tpl
===================================================================
--- templates/default/file.tpl	(revision 231)
+++ templates/default/file.tpl	(working copy)
@@ -1 +1 @@
-    <div id="folder"><a href="{ $FILEURL }"><img border="0" alt="{ $ALT }" src="/icons/gallery/{ $FILETYPE.png }"><br>{ $FILE }</a></div>
+    <div id="folder"><a href="{ $FILEURL }"><img border="0" alt="{ $ALT }" src="/icons/gallery/{ $FILETYPE }.png"><br>{ $FILE }</a></div>
Index: templates/new/file.tpl
===================================================================
--- templates/new/file.tpl	(revision 231)
+++ templates/new/file.tpl	(working copy)
@@ -1 +1 @@
-    <div class="folder"><a href="{ $FILEURL }"><img border="0" alt="{ $ALT }" src="/icons/gallery/{ $FILETYPE.png }"><br>{ $FILE }</a></div>
+    <div class="folder"><a href="{ $FILEURL }"><img border="0" alt="{ $ALT }" src="/icons/gallery/{ $FILETYPE }.png "><br>{ $FILE }</a></div>

Attachment: signature.asc
Description: Digital signature