merged conflicting stuff. Added 'me' tag

[zzz-floof.git] / floof / templates / users / view.mako

diff --git a/floof/templates/users/view.mako b/floof/templates/users/view.mako
index d128276..3bff21a 100644 (file)
--- a/floof/templates/users/view.mako
+++ b/floof/templates/users/view.mako
@@ -3,7 +3,26 @@
 
 <p>This is the userpage for ${c.this_user.name}.</p>
 
 
 <p>This is the userpage for ${c.this_user.name}.</p>
 

-% for gallery in c.this_user.galleries:
+<%! from floof.model.users import UserRelationshipTypes %>
+% if c.this_user == c.user:
+## Nothing
+<% pass %>\
+% else:
+${h.form(url(controller='user_settings', action='rel_toggle', name=c.user.name.lower()), method='POST')}
+<p>
+    <input type="hidden" name="target_user" value="${c.this_user.id}">
+    <input type="hidden" name="type" value="${UserRelationshipTypes.IS_WATCHING}">
+    % if UserRelationshipTypes.IS_WATCHING in c.relationships:
+    <input type="hidden" name="add_remove" value="remove">
+    <input type="submit" value="Unwatch">
+    % else:
+    <input type="hidden" name="add_remove" value="add">
+    <input type="submit" value="Watch">
+    % endif
+% endif
+
+<%! from floof.lib.tags import parse %>
+% for gallery in c.this_user.primary_page.galleries:

 <h2>${gallery.string}</h2>
 <h2>${gallery.string}</h2>

-${macros.thumbs(gallery.search.results)}
-% endfor
\ No newline at end of file
+${macros.thumbs(parse(gallery.search.string))}
+% endfor