Show some photos on the front page #11.

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

diff --git a/Memories.pm b/Memories.pm
index 7027b09e400e3f7c9cd7defd3d2984b5d0027760..efad269268d29b667f6d7e0e52d5c7ff3ff394fb 100644 (file)
--- a/Memories.pm
+++ b/Memories.pm
@@ -112,11 +112,13 @@ sub do_cached {
     return @stuff;
 }
 
-sub _recent_uploads { Memories::Photo->search_recent() }
-sub _random { Memories::Photo->search_random() }
+for my $how (qw(random recent interesting popular)) {
+    no strict;
+    my $method = "search_$how";
+    *{"_$how"} = sub { Memories::Photo->$method };
+    *{$how} = sub { shift->do_cached(\&{"_$how"})};
+}
 
-sub recent_uploads { shift->do_cached(\&_recent_uploads) }
-sub random { shift->do_cached(\&_random) }
 sub tagcloud { shift->do_cached(\&_tagcloud) }
 
 sub _tagcloud {

diff --git a/templates/frontpage b/templates/frontpage
index 9bd95766eba306d8e062f70253708713830a4f29..31a9f7c22be598b9db87133ade706c6d7ae353e7 100644 (file)
--- a/templates/frontpage
+++ b/templates/frontpage
@@ -1,6 +1,16 @@
 [% INCLUDE header %]
-<h1> Welcome to Memories </h1>
-
+[% PROCESS macros %]
+<table class="frontpagetable" width="100%">
+[% FOR how = ["popular", "interesting", "random"] %]
+<tr><th colspan="4">[%how | ucfirst%] photos</th></tr>
+<tr>
+[% FOR pic = request.$how %]
+    <td align="center"> [% minithumb(pic) %] <br> [%pic.title%] </td>
+[% END %]
+</tr>
+[% END %]
+</table>
+   
 <p>
  Memories is a site where you can upload and share your photos.
 </p>

diff --git a/templates/static/memories.css b/templates/static/memories.css
index 4147e182bb34c4feeea42634349af6ad8e7c5d92..77476f213e87d09abcaede27a021b1ec6db12433 100644 (file)
--- a/templates/static/memories.css
+++ b/templates/static/memories.css
@@ -91,6 +91,8 @@ p { font-family: sans-serif; }
 .photolicense { font-size: 80%; padding: 10px; }
 .smaller { font-size: 80%  }
 
+.frontpagetable { padding: 10px;  }
+.frontpagetable th { border: 1px solid black; }
 span.tagcloud0 { font-size: 9px;}
 span.tagcloud1 { font-size: 10px;}
 span.tagcloud2 { font-size: 10px;}