merged suff, commented out some of my own

[zzz-floof.git] / floof / templates / art / show.mako

diff --git a/floof/templates/art/show.mako b/floof/templates/art/show.mako
index 45ebcb9..9356447 100644 (file)
--- a/floof/templates/art/show.mako
+++ b/floof/templates/art/show.mako
@@ -1,7 +1,7 @@
 <%inherit file="/base.mako" />
 <%namespace name="comments" file="/comments/lib.mako" />
 
 <%inherit file="/base.mako" />
 <%namespace name="comments" file="/comments/lib.mako" />
 

-<%! from floof.model.art import Rating %>
+<%! from floof.model import Rating %>

 
 <h1>Viewing Art</h1>
 
 
 <h1>Viewing Art</h1>
 


@@ -34,18 +34,15 @@ ${h.end_form()}
 
 <h2>Relations</h2>
 <ul>
 
 <h2>Relations</h2>
 <ul>

-% for relation in c.art.user_relations:
-<li>${relation.kind}: ${relation.user}
+% for label, relations in (('Artist', c.art.artists), \
+                               ('Recipient', c.art.recipients), \
+                               ('Participant', c.art.participants)):
+% for user in relations:
+<li>${label}: ${user.name}
+% endfor

 % endfor
 </ul>
 
 % endfor
 </ul>
 

-<h2>Add Relations</h2>
-${h.form (h.url("create_relation", kind="by", art_id=c.art.id))}
-By: ${h.text('username')}
-${h.submit('add','Add')}
-${h.end_form()}
-
-
-<img class="full" src="${c.art.get_path()}">
+<img class="full" src="${h.storage_url('art/medium', c.art.hash)}">

 
 ${comments.comment_block(c.art.discussion.comments)}
 
 ${comments.comment_block(c.art.discussion.comments)}