Update for new upstream snapshot

[memories.git] / debian / patches / 102_fix-uris.diff

diff --git a/debian/patches/102_fix-uris.diff b/debian/patches/102_fix-uris.diff
index 1fa0c8b62bea9d47990e603580dcf9ec2b39d9d5..cff7e54092f9ea3461120c504384e2aaf69a7779 100644 (file)
--- a/debian/patches/102_fix-uris.diff
+++ b/debian/patches/102_fix-uris.diff
@@ -4,7 +4,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 %] 
@@ -14,18 +14,19 @@
 @@ -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>
 --- memories.orig/templates/macros
 +++ memories/templates/macros
-@@ -1,6 +1,6 @@
+@@ -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>
  [% END; MACRO thumb(photo, album) BLOCK %]
@@ -34,9 +35,9 @@
 +++ 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 %]
@@ -47,7 +48,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 %]
@@ -57,8 +58,8 @@
 @@ -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>
@@ -68,8 +69,8 @@
 @@ -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>
@@ -80,7 +81,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 %]