projects
/
zzz-floof.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Depend on wtforms.
[zzz-floof.git]
/
floof
/
templates
/
base.mako
diff --git
a/floof/templates/base.mako
b/floof/templates/base.mako
index
7290a11
..
2fb385a
100644
(file)
--- a/
floof/templates/base.mako
+++ b/
floof/templates/base.mako
@@
-13,12
+13,13
@@
% if c.user:
| <a href="${h.url("new_art")}">Add Art</a>
| <a href="${h.url_for(controller="search", action="list")}">Your Searches</a>
% if c.user:
| <a href="${h.url("new_art")}">Add Art</a>
| <a href="${h.url_for(controller="search", action="list")}">Your Searches</a>
+| <a href="${h.url_for(controller="art", action="watchstream", name=c.user.name.lower())}">Watchstream</a>
## | <a href="${h.url_for("/users/"+c.user}">Your Page</a>
% endif
## | <a href="${h.url_for("/users/"+c.user}">Your Page</a>
% endif
-${h.form(
h.url_for
('search'), method='GET')}
-${h.text('query', c.query)}
-${h.submit('button', 'Search')}
+${h.form(
url
('search'), method='GET')}
+${h.text('query', c.query)}
+${h.submit('button', 'Search')}
% if c.user:
${h.submit('button', 'Save')}
% if c.user:
${h.submit('button', 'Save')}
@@
-32,25
+33,39
@@
${h.end_form()}
<div id="user">
% if c.user:
<form action="${url(controller='account', action='logout')}" method="POST">
<div id="user">
% if c.user:
<form action="${url(controller='account', action='logout')}" method="POST">
- <p>Logged in as <a href="${h.url('user_page', name=c.user.name)}">${c.user.name}</a>. ${h.submit(None, 'Log out')}</p>
+ <p>Logged in as <a href="${h.url('user_page', name=c.user.name
.lower()
)}">${c.user.name}</a>. ${h.submit(None, 'Log out')}</p>
</form>
% else:
<form action="${url(controller='account', action='login_begin')}" method="POST">
</form>
% else:
<form action="${url(controller='account', action='login_begin')}" method="POST">
+ <p>Log in or register with <img src="/icons/openid.png" alt="OpenID" title="OpenID"> OpenID:</p>
<p>
<p>
-
Identity URL: <input type="text" name="identity_
url">
+
<input type="text" name="identity_url" id="identity-
url">
<input type="submit" value="Log in">
</p>
<input type="submit" value="Log in">
</p>
+ <p class="what"><a href="${url(controller='account', action='login')}">What's this?</a></p>
</form>
% endif
</div>
</div>
</form>
% endif
</div>
</div>
+
+<% messages = h.flash.pop_messages() %>
+% if messages:
+<ul id="flash-messages">
+ % for message in messages:
+ <li>${message}</li>
+ % endfor
+</ul>
+% endif
+
+
<div id="body">
${next.body()}
</div>
<div id="footer">
<p>Powered by floof</p>
<div id="body">
${next.body()}
</div>
<div id="footer">
<p>Powered by floof</p>
+ <p>Fugue icon set by <a href="http://www.pinvoke.com/">Yusuke Kamiyamane</a></p>
</div>
</body>
</html>
</div>
</body>
</html>