Cleaned up websetup a little.

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

diff --git a/floof/templates/art/show.mako b/floof/templates/art/show.mako
index 5895be8..e13c295 100644 (file)
--- a/floof/templates/art/show.mako
+++ b/floof/templates/art/show.mako
@@ -1,23 +1,45 @@
 <%inherit file="/base.mako" />
 <%inherit file="/base.mako" />

-<%namespace name="comments" file="/comments.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>
 

-% if c.user:
-${h.form (h.url("art_tags", art_id=c.art.id))}
-Add Some Tags: ${h.text('tags')}
-${h.submit('submit', 'Tag!')}
-${h.end_form()}
+<div>
+    <img class="full" src="${h.storage_url('art/medium', c.art.hash)}">
+</div>
+
+<h2>Tags</h2>
+<ul>
+## Relations
+% for label, relations in (('Artist', c.art.artists), \
+                           ('Recipient', c.art.recipients), \
+                           ('Participant', c.art.participants)):
+    % for user in relations:
+    <li>${label}: <a href="${h.url('user_page', name=user.name)}">${user.name}</a>
+    % endfor
+% endfor

 
 

+## Regular tags

 % for tag in c.art.tags:
 ${h.form(h.url("art_tag", art_id=c.art.id, id=tag.id), method="delete")}
 % for tag in c.art.tags:
 ${h.form(h.url("art_tag", art_id=c.art.id, id=tag.id), method="delete")}

-${h.submit('delete', 'X')}
+${h.HTML.input(type='image', src='/icons/overlay/tag--minus.png', alt='[Remove]')}

 <a href="${url(controller='search', action='index', query=tag)}">${tag}</a>
 ${h.end_form()}
 % endfor
 
 <a href="${url(controller='search', action='index', query=tag)}">${tag}</a>
 ${h.end_form()}
 % endfor
 

+% if c.user:
+${h.form(h.url("art_tags", art_id=c.art.id))}
+<p>
+    ${h.image('/icons/overlay/tag--plus.png', '')}
+    ${h.text('tags')} ${h.submit(None, 'Add tags!')}
+</p>
+${h.end_form()}
+% endif
+</ul>
+
+
+% if c.user:

 <h2>What do you think?</h2>
 ${h.form (h.url("rate_art", id=c.art.id), method="put")}
 % for score,text in sorted(Rating.options.items()):
 <h2>What do you think?</h2>
 ${h.form (h.url("rate_art", id=c.art.id), method="put")}
 % for score,text in sorted(Rating.options.items()):


@@ -32,6 +54,4 @@ ${h.submit('score', text)}
 ${h.end_form()}
 % endif
 
 ${h.end_form()}
 % endif
 

-<img class="full" src="${c.art.get_path()}">
-
-${comments.entire_thread(c.art.discussion)}
+${comments.comment_block(c.art.discussion.comments)}