X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=debian%2Fpatches%2F102_fix-uris.diff;h=cff7e54092f9ea3461120c504384e2aaf69a7779;hb=873b88d64b580485bd29c734b444a1e555892a3a;hp=8e79469d66fcf2ae14a9c5560debb520567998ff;hpb=a22b5cf52ccb7fb0338f88ce2d184ba4e3ecd5b7;p=memories.git

diff --git a/debian/patches/102_fix-uris.diff b/debian/patches/102_fix-uris.diff
index 8e79469..cff7e54 100644
--- a/debian/patches/102_fix-uris.diff
+++ b/debian/patches/102_fix-uris.diff
@@ -1,87 +1,87 @@
---- trunk.orig/templates/album/list
-+++ trunk/templates/album/list
+--- memories.orig/templates/album/list
++++ memories/templates/album/list
 @@ -8,7 +8,7 @@
      [% FOR album = minilist %]
          <td>
          <a href="[%base%]/album/view/[%album.id%]">[% album %]<br/>
--        <img src="[% album.photos.last.thumb_url |uri%]"></a><br/>
+-        <img src="[% album.photos.last.thumb_url %]"></a><br/>
 +        <img src="[% album.photos.last.thumb_url |html%]"></a><br/>
          <span class="info">
              [%album.photos.size %] 
          photo[%-"s" IF album.photos.size != 1 %]
---- trunk.orig/templates/custom/list
-+++ trunk/templates/custom/list
+--- memories.orig/templates/custom/list
++++ memories/templates/custom/list
 @@ -8,7 +8,7 @@
      [% FOR object = minilist %]
          <td>
-         <a href="[%base%]/object/view/[%object.id%]">[% object %]<br/>
--        <img src="[% object.photos.last.thumb_url |uri%]"></a><br/>
+         <a href="[%base%]/[%object.moniker%]/view/[%object.id%]">[% object %]<br/>
+-        <img src="[% object.photos.last.thumb_url %]"></a><br/>
 +        <img src="[% object.photos.last.thumb_url |html%]"></a><br/>
          <span class="info">
              [%object.photos.size %] 
          photo[%-"s" IF object.photos.size != 1 %]</span>
---- trunk.orig/templates/macros
-+++ trunk/templates/macros
-@@ -2,7 +2,7 @@
- <table class="thumb">
-     <tr><td>
+--- memories.orig/templates/macros
++++ memories/templates/macros
+@@ -6,7 +6,7 @@
+ [% END; END %]
+ [% MACRO minithumb(photo) BLOCK %]
          <a href="[%base%]/photo/view/[%photo.id%]">
--        <img src="[% photo.thumb_url |uri%]" alt="[%photo.title|html%]"/>
+-        <img src="[% photo.thumb_url %]" alt="[%photo.title|html%]"/>
 +        <img src="[% photo.thumb_url |html%]" alt="[%photo.title|html%]"/>
          </a>
-         </td> </tr>
-     <tr><td> 
---- trunk.orig/templates/nav
-+++ trunk/templates/nav
+ [% END; MACRO thumb(photo, album) BLOCK %]
+ <table class="thumb">
+--- memories.orig/templates/nav
++++ memories/templates/nav
 @@ -4,7 +4,7 @@
  </td><td align="right">
- [% FOR photo = request.recent_uploads %]
+ [% FOR photo = request.recent %]
          <a href="[%base%]/photo/view/[%photo.id%]">
--        <img src="[% photo.thumb_url |uri%]" alt="[%photo.title|html%]"/>
+-        <img src="[% photo.thumb_url%]" alt="[%photo.title|html%]"/>
 +        <img src="[% photo.thumb_url |html%]" alt="[%photo.title|html%]"/>
          </a>
  [% END %]
  </td></tr></table>
---- trunk.orig/templates/recent.rss
-+++ trunk/templates/recent.rss
+--- memories.orig/templates/recent.rss
++++ memories/templates/recent.rss
 @@ -12,7 +12,7 @@
          <description>
  [% FILTER html %]
          <a href="[%base%]/photo/view/[%photo.id%]">
--        <img src="[% photo.thumb_url |uri%]" alt="[%photo.title|html%]"/>
+-        <img src="[% photo.thumb_url %]" alt="[%photo.title|html%]"/>
 +        <img src="[% photo.thumb_url |html%]" alt="[%photo.title|html%]"/>
          </a>
  [% END %]
          </description>
---- trunk.orig/templates/systemtag/list
-+++ trunk/templates/systemtag/list
+--- memories.orig/templates/systemtag/list
++++ memories/templates/systemtag/list
 @@ -14,7 +14,7 @@
          [% IF photos.last %]
          <tr><td>
-         <a href="[%base%]/tag/view/[%tag.name |html|uri%]">
--            <img src="[% photos.last.thumb_url |uri%]">
+         <a href="[%base%]/tag/view/[%tag.name |html%]">
+-            <img src="[% photos.last.thumb_url %]">
 +            <img src="[% photos.last.thumb_url |html%]">
          </a>
          </td></tr>
          <tr><td class="info">
---- trunk.orig/templates/tag/list
-+++ trunk/templates/tag/list
+--- memories.orig/templates/tag/list
++++ memories/templates/tag/list
 @@ -14,7 +14,7 @@
          [% IF photos.last %]
          <tr><td>
-         <a href="[%base%]/tag/view/[%tag.name |html|uri%]">
--            <img src="[% photos.last.thumb_url |uri%]">
+         <a href="[%base%]/tag/view/[%tag.name |html%]">
+-            <img src="[% photos.last.thumb_url%]">
 +            <img src="[% photos.last.thumb_url |html%]">
          </a>
          </td></tr>
          <tr><td class="info">
---- trunk.orig/templates/user/list
-+++ trunk/templates/user/list
+--- memories.orig/templates/user/list
++++ memories/templates/user/list
 @@ -10,7 +10,7 @@
          [% SET photos = user.photos %]
          <a href="[%base%]/user/view/[%user.id%]">[% user %]<br/>
          [% IF photos.last %]
--        <img src="[% photos.last.thumb_url |uri%]"></a><br/>
+-        <img src="[% photos.last.thumb_url %]"></a><br/>
 +        <img src="[% photos.last.thumb_url |html%]"></a><br/>
          <span class="info">
              [%photos.size %]