Mercurial > hg > montage

changeset 9:33349e5178b3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix up templates
author k0s <k0scist@gmail.com>
date Fri, 25 Dec 2009 18:56:23 -0500
parents 93af41dcff3a
children 73d18f0cf8bb
files montage/templates/grid.html montage/templates/strip.html setup.py
diffstat 3 files changed, 15 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/montage/templates/grid.html	Fri Dec 25 18:27:45 2009 -0500
+++ b/montage/templates/grid.html	Fri Dec 25 18:56:23 2009 -0500
@@ -6,14 +6,20 @@
       xmlns:xi="http://www.w3.org/2001/XInclude">
   <head>
     <title>${title or path}</title>
+    <link py:for="sheet in stylesheets" rel="stylesheet" type="text/css" href="${sheet}"/>
   </head>
   <body>
+    <xi:include py:if="include" href="${include}"/>
+
     <center>
-    <table>
+    <table class="image">
       <tr py:for="row in range(len(files)/columns)">
         <td py:for="col in range(columns)" py:with="image = files[row*columns + col]">
           <center>
-            <img src="${image['path']}" width="${width or None}" height="${height or None}"/><br/>
+            <a href="${image['link']}">
+               <img src="${image['path']}" width="${width or None}" height="${height or None}"/>
+            </a>
+          <br/>
             ${image.get('title', image['description'])}            
           </center>
         </td>
--- a/montage/templates/strip.html	Fri Dec 25 18:27:45 2009 -0500
+++ b/montage/templates/strip.html	Fri Dec 25 18:56:23 2009 -0500
@@ -6,10 +6,14 @@
       xmlns:xi="http://www.w3.org/2001/XInclude">
   <head>
     <title>${title or path}</title>
+    <link py:for="sheet in stylesheets" rel="stylesheet" type="text/css" href="${sheet}"/>
   </head>
   <body>
+    <xi:include py:if="include" href="${include}"/>
+
+    <center>
     <py:for each="index, image in enumerate(files)">
-      <div>
+      <div class="image">
         <a href="${image['link']}">
           <img src="${image['path']}" width="${width or None}" height="${height or None}"/>
         </a>
@@ -18,5 +22,6 @@
       </div>
       <hr width="${width}px" py:if="index != len(files) - 1"/>
     </py:for>
+    </center>
   </body>
 </html>
--- a/setup.py	Fri Dec 25 18:27:45 2009 -0500
+++ b/setup.py	Fri Dec 25 18:56:23 2009 -0500
@@ -2,7 +2,7 @@
 from setuptools import setup, find_packages
 import sys, os
 
-version = '0.2'
+version = '0.2.1'
 
 setup(name='montage',
       version=version,