Always used the "paged" template for multiple photo display. Fixes #19.

git-svn-id: http://svn.simon-cozens.org/memories/trunk@57 041978f6-d955-411f-a9d7-1d8545c9c3c7

diff --git a/Memories/Photo.pm b/Memories/Photo.pm
index 9e922f3daa3212c1de7b3e01a1763d89ad4b3358..5ce8d956145728a8906e6f6418b78aba0893cd95 100644 (file)
--- a/Memories/Photo.pm
+++ b/Memories/Photo.pm
@@ -65,7 +65,7 @@ sub do_upload :Exported {
     }
     $r->objects(\@photos);
     if (@photos == 0) { $r->template("upload"); return  }
-    if (@photos > 1) { $r->template("list") } 
+    if (@photos > 1) { $r->template_args->{title} = "This upload"; $r->template("paged") } 
     else { $r->template("view"); }
     $r->message("Thanks for the upload!"); 
 }
@@ -84,7 +84,7 @@ sub quarantine :Exported {
     }
     $r->{session}{quarantined} = join ",", sort keys %q;
     if (!$r->{session}{quarantined}) {
-        $r->template("list");
+        $r->template_args->{title} = "This upload"; $r->template("paged");
         $r->objects([ map { $self->retrieve($_) } @quarantined ]);
     } else {
         $r->objects([ map { $self->retrieve($_) } sort keys %q ]);

diff --git a/templates/photo/paged b/templates/photo/paged
index 8009fe8655bc1b939731b9332d616ee0ee000a79..549682dc961417a6466e77e34618a6406f94d8dc 100644 (file)
--- a/templates/photo/paged
+++ b/templates/photo/paged
@@ -1,6 +1,6 @@
 [% INCLUDE header %]
 [% PROCESS macros %]
-<h1> Most [% request.action %] photos </h1>
+<h1> [% IF title; title | html; ELSE %] Most [% request.action %] photos [% END %]</h1>
 <table class="userlist">
 [% WHILE photos.size > 0 %]
 [% SET triple = photos.splice(0,3) %]