# HG changeset patch # User Jeff Hammel # Date 1288198084 25200 # Node ID ee74cf1e444b3b01faa03a750950d984a1d82526 # Parent f3b6bf903499446e1833feaaea029f51f2f50ce7 * update templates to use head.html * bump decoupage version to depend on diff -r f3b6bf903499 -r ee74cf1e444b montage/templates/background.html --- 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"> - ${title or path} - + diff -r f3b6bf903499 -r ee74cf1e444b montage/templates/grid.html --- 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"> - ${title or path} - + diff -r f3b6bf903499 -r ee74cf1e444b montage/templates/sequence.html --- 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"> - ${title or path} - +
+ @@ -29,5 +29,6 @@ ${image.get('title', image.get('description', '««'))}
+ diff -r f3b6bf903499 -r ee74cf1e444b montage/templates/strip.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"> - ${title or path} - + diff -r f3b6bf903499 -r ee74cf1e444b setup.py --- 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="""