Mercurial > hg > decoupage

changeset 47:0cfb84d788d6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* make head.html actually be correct; * bump version, cuz this breaks backwards compatability
author Jeff Hammel <jhammel@mozilla.com>
date Wed, 27 Oct 2010 09:42:58 -0700
parents 127843e097b3
children af73a3fda723
files decoupage/templates/head.html decoupage/templates/index.html setup.py
diffstat 3 files changed, 11 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/decoupage/templates/head.html	Wed Oct 27 09:33:45 2010 -0700
+++ b/decoupage/templates/head.html	Wed Oct 27 09:42:58 2010 -0700
@@ -3,5 +3,8 @@
       xmlns:xi="http://www.w3.org/2001/XInclude"
       py:strip="True">
   <!-- generic head template to be <xi:include>-d -->
+  <title>${title or path}</title>
   <link py:if="icon" rel="icon" href="${icon}"/>
+  <link py:for="sheet in css or ()" rel="stylesheet" type="text/css" href="${sheet}"/>
+  <script py:for="script in scripts or ()" src="${script}"></script>
 </head>
--- a/decoupage/templates/index.html	Wed Oct 27 09:33:45 2010 -0700
+++ b/decoupage/templates/index.html	Wed Oct 27 09:42:58 2010 -0700
@@ -7,22 +7,22 @@
   <head>
     <title>${title or path}</title>
     <link py:if="icon" rel="icon" href="${icon}"/>
-    <link py:for="sheet in css" rel="stylesheet" type="text/css" href="${sheet}"/>
-    <script py:for="script in scripts" src="${script}"></script>
-    
+    <link py:for="sheet in css or ()" rel="stylesheet" type="text/css" href="${sheet}"/>
+    <script py:for="script in scripts or ()" src="${script}"></script>
   </head>
   <body>
     <xi:include py:if="include" href="${include}"/>
     <h1 py:if="title">${title}</h1>
     <ul id="listing">
       <li py:for="f in files">
+        <a name="${f['path']}"></a>
         <a href="${f['path']}">
-        ${f.get('title', f['description']) or f['name']}</a><span py:if="'title' in f and f['description']">: ${f['description']}
+          ${f.get('title', f['description']) or f['name']}</a><span py:if="'title' in f and f['description']">: ${f['description']}
           </span>
           <py:if test="'links' in f">
-          <span py:for="link in f['links']" class="link">
-          <a href="${link['link']}">${link['text']}</a>
-          </span>
+            <span py:for="link in f['links']" class="link">
+              <a href="${link['link']}">${link['text']}</a>
+            </span>
           </py:if>
       </li>
     </ul>
--- a/setup.py	Wed Oct 27 09:33:45 2010 -0700
+++ b/setup.py	Wed Oct 27 09:42:58 2010 -0700
@@ -6,7 +6,7 @@
 except IOError:
     description = ''
 
-version = '0.7.2'
+version = '0.8'
 
 setup(name='decoupage',
       version=version,