Mercurial > hg > montage

changeset 26:ee74cf1e444b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* update templates to use head.html * bump decoupage version to depend on
author Jeff Hammel <jhammel@mozilla.com>
date Wed, 27 Oct 2010 09:48:04 -0700
parents f3b6bf903499
children e5336ec2ee02
files montage/templates/background.html montage/templates/grid.html montage/templates/sequence.html montage/templates/strip.html setup.py
diffstat 5 files changed, 12 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/montage/templates/background.html	Mon Feb 15 20:46:45 2010 -0500
+++ b/montage/templates/background.html	Wed Oct 27 09:48:04 2010 -0700
@@ -5,14 +5,13 @@
       xmlns:py="http://genshi.edgewall.org/"
       xmlns:xi="http://www.w3.org/2001/XInclude">
   <head py:with="background = request.GET.get('image', files[0]['link'])">
-    <title>${title or path}</title>
-    <link py:for="sheet in css" rel="stylesheet" type="text/css" href="${sheet}"/>
+    <xi:include href="head.html"/>
     <style type="text/css">
-    body { background-image: url('${background}'); 
-background-repeat:no-repeat;
-background-position: right;
-background-attachment: fixed;
-}
+      body { background-image: url('${background}'); 
+      background-repeat:no-repeat;
+      background-position: right;
+      background-attachment: fixed;
+      }
     </style>
   </head>
   <body>
--- a/montage/templates/grid.html	Mon Feb 15 20:46:45 2010 -0500
+++ b/montage/templates/grid.html	Wed Oct 27 09:48:04 2010 -0700
@@ -5,8 +5,7 @@
       xmlns:py="http://genshi.edgewall.org/"
       xmlns:xi="http://www.w3.org/2001/XInclude">
   <head>
-    <title>${title or path}</title>
-    <link py:for="sheet in css" rel="stylesheet" type="text/css" href="${sheet}"/>
+    <xi:include href="head.html"/>
   </head>
   <body>
     <xi:include py:if="include" href="${include}"/>
--- a/montage/templates/sequence.html	Mon Feb 15 20:46:45 2010 -0500
+++ b/montage/templates/sequence.html	Wed Oct 27 09:48:04 2010 -0700
@@ -5,14 +5,14 @@
       xmlns:py="http://genshi.edgewall.org/"
       xmlns:xi="http://www.w3.org/2001/XInclude">
   <head>
-    <title>${title or path}</title>
-    <link py:for="sheet in css" rel="stylesheet" type="text/css" href="${sheet}"/>
+    <xi:include href="head.html"/>
   </head>
   <body>
     <xi:include py:if="include" href="${include}"/>
 
     <center py:if="files" py:with="index = int(request.GET.get('index', 0))">
       <div py:with="image = files[index]" class="image">
+        <a name="${image['path']}"></a>
         <a href="${image['link']}">
           <img src="${image['path']}" width="${width or None}" height="${height or None}"/>
         </a>
@@ -29,5 +29,6 @@
 	<a href="?index=${index + 1}" py:with="image=files[index + 1]">${image.get('title', image.get('description', '&laquo;&laquo;'))}</a>
       </py:if>
     </center>
+
   </body>
 </html>
--- a/montage/templates/strip.html	Mon Feb 15 20:46:45 2010 -0500
+++ b/montage/templates/strip.html	Wed Oct 27 09:48:04 2010 -0700
@@ -5,8 +5,7 @@
       xmlns:py="http://genshi.edgewall.org/"
       xmlns:xi="http://www.w3.org/2001/XInclude">
   <head>
-    <title>${title or path}</title>
-    <link py:for="sheet in css" rel="stylesheet" type="text/css" href="${sheet}"/>
+    <xi:include href="head.html"/>
   </head>
   <body>
     <xi:include py:if="include" href="${include}"/>
--- a/setup.py	Mon Feb 15 20:46:45 2010 -0500
+++ b/setup.py	Wed Oct 27 09:48:04 2010 -0700
@@ -23,7 +23,7 @@
       zip_safe=False,
       install_requires=[
           # -*- Extra requirements: -*-
-        'decoupage',
+        'decoupage >= 0.8',
         'cropresize'
       ],
       entry_points="""