X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=debian%2Fpatches%2F102_fix-uris.diff;fp=debian%2Fpatches%2F102_fix-uris.diff;h=cff7e54092f9ea3461120c504384e2aaf69a7779;hb=873b88d64b580485bd29c734b444a1e555892a3a;hp=1fa0c8b62bea9d47990e603580dcf9ec2b39d9d5;hpb=c4b2f2843ca943f5235a1abb001523bffb7205c4;p=memories.git
diff --git a/debian/patches/102_fix-uris.diff b/debian/patches/102_fix-uris.diff
index 1fa0c8b..cff7e54 100644
--- a/debian/patches/102_fix-uris.diff
+++ b/debian/patches/102_fix-uris.diff
@@ -4,7 +4,7 @@
[% FOR album = minilist %]
[% album %]
--
+-
+
[%album.photos.size %]
@@ -14,18 +14,19 @@
@@ -8,7 +8,7 @@
[% FOR object = minilist %]
|
- [% object %]
--
+ [% object %]
+-
+
[%object.photos.size %]
photo[%-"s" IF object.photos.size != 1 %]
--- memories.orig/templates/macros
+++ memories/templates/macros
-@@ -1,6 +1,6 @@
+@@ -6,7 +6,7 @@
+ [% END; END %]
[% MACRO minithumb(photo) BLOCK %]
--
+-
+
[% END; MACRO thumb(photo, album) BLOCK %]
@@ -34,9 +35,9 @@
+++ memories/templates/nav
@@ -4,7 +4,7 @@
|
- [% FOR photo = request.recent_uploads %]
+ [% FOR photo = request.recent %]
--
+-
+
[% END %]
@@ -47,7 +48,7 @@
[% FILTER html %]
--
+-
+
[% END %]
@@ -57,8 +58,8 @@
@@ -14,7 +14,7 @@
[% IF photos.last %]
-
--
+
+-
+
|
@@ -68,8 +69,8 @@
@@ -14,7 +14,7 @@
[% IF photos.last %]
-
--
+
+-
+
|
@@ -80,7 +81,7 @@
[% SET photos = user.photos %]
[% user %]
[% IF photos.last %]
--
+-
+
[%photos.size %]
|