From: Simon Cozens <simon@simon-cozens.org>
Date: Tue, 6 Feb 2007 22:22:10 +0000 (+0000)
Subject: If you've got it, flaunt it.
X-Git-Tag: 1.2+svn20070808~61
X-Git-Url: https://git.decadent.org.uk/gitweb/?p=memories.git;a=commitdiff_plain;h=7f2c0b18cfff36d5a9d0f93e9cb4102d6a931768

If you've got it, flaunt it.


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

diff --git a/templates/photo/view b/templates/photo/view
index b8a06bf..3950ce6 100644
--- a/templates/photo/view
+++ b/templates/photo/view
@@ -76,6 +76,14 @@ photo.uploader %] </a>
     [% SET request.session.scale = size %]
 </div>
 
+[% IF photo.description OR photo.copyright OR photo.license %]
+<div class="photodesc"> 
+    [% photo.description | html %] 
+    [% IF photo.copyright %] <div class="photorights"> [% photo.copyright | html %] </div> [% END %]
+    [% IF photo.license %] <div class="photolicense"> [% photo.license | html %] </div> [% END %]
+</div>
+[% END %]
+
 [% MACRO do_tab(tabname, label) BLOCK; %]
 <li>
     [% IF tab == tabname %]<a class="active">
diff --git a/templates/static/memories.css b/templates/static/memories.css
index 45752c9..3728111 100644
--- a/templates/static/memories.css
+++ b/templates/static/memories.css
@@ -88,6 +88,10 @@ p { font-family: sans-serif; }
 
 .albums { background: #ffc; padding-left: 15px; border: 1px dotted black; }
 .htmltagcloud { text-align:  center; font-family: sans-serif; }
+.photodesc { background: #fff; padding: 10px; margin: 5px 15px 5px 15px; text-align: center; }
+.photorights { font-size: 90%; padding: 10px; text-align: right; font-weight: bold; }
+.photolicense { font-size: 80%; padding: 10px; }
+
 span.tagcloud0 { font-size: 9px;}
 span.tagcloud1 { font-size: 10px;}
 span.tagcloud2 { font-size: 10px;}