projects
/
zzz-floof.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rearranged user/art relations.
[zzz-floof.git]
/
floof
/
templates
/
art
/
show.mako
diff --git
a/floof/templates/art/show.mako
b/floof/templates/art/show.mako
index
f2320fd
..
bf14dff
100644
(file)
--- a/
floof/templates/art/show.mako
+++ b/
floof/templates/art/show.mako
@@
-1,27
+1,54
@@
<%inherit file="/base.mako" />
<%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>View
ing
Art</h1>
-${h.form (h.url_for (controller='art', action='tag', id=c.art.id), multipart=True)}
+% 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()}
% for tag in c.art.tags:
Add Some Tags: ${h.text('tags')}
${h.submit('submit', 'Tag!')}
${h.end_form()}
% 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.submit('delete', 'X')}
+<a href="${url(controller='search', action='index', query=tag)}">${tag}</a>
+${h.end_form()}
% endfor
% endfor
-What do you think?
+<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()):
% 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:
% if c.your_score == score:
-class="selected" \
+${h.submit('score', text, class_="selected")}
+% else:
+${h.submit('score', text)}
+% endif
+
+% endfor
+${h.end_form()}
% endif
% endif
->${text}</a>
+
+<h2>Relations</h2>
+<ul>
+% 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
% 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)}