X-Git-Url: http://git.veekun.com/zzz-floof.git/blobdiff_plain/11f3ff4140edcd5dd4d8e20f918c58003c634d10..HEAD:/floof/templates/art/show.mako?ds=sidebyside

diff --git a/floof/templates/art/show.mako b/floof/templates/art/show.mako
index f2320fd..e13c295 100644
--- a/floof/templates/art/show.mako
+++ b/floof/templates/art/show.mako
@@ -1,27 +1,57 @@
 <%inherit file="/base.mako" />
+<%namespace name="comments" file="/comments/lib.mako" />
 
-<%! from floof.model.art import Rating %>
+<%! from floof.model import Rating %>
 
-<h1>View Art</h1>
+<h1>Viewing Art</h1>
 
-${h.form (h.url_for (controller='art', action='tag', id=c.art.id), multipart=True)}
-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:
-<a href="${h.url_for (controller='tag', action='delete', id=tag.id)}">x</a> 
-<a href="${h.url_for (controller='search', action='results')}?query=${tag}">${tag}</a>
+${h.form(h.url("art_tag", art_id=c.art.id, id=tag.id), method="delete")}
+${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
 
-What do you think?
+% 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()):
-<a href="${h.url_for(controller='art', action='rate', id=c.art.id)}?score=${score}" \
+
 % if c.your_score == score:
-class="selected" \
+${h.submit('score', text, class_="selected")}
+% else:
+${h.submit('score', text)}
 % endif
->${text}</a> 
-% endfor
 
-<img class="full" src="${c.art.get_path()}">
+% endfor
+${h.end_form()}
+% endif
 
+${comments.comment_block(c.art.discussion.comments)}