Removed some commented-out code.

[zzz-floof.git] / floof / templates / base.mako

diff --git a/floof/templates/base.mako b/floof/templates/base.mako
index e36f3ea..e4acc6f 100644 (file)
--- a/floof/templates/base.mako
+++ b/floof/templates/base.mako
@@ -10,13 +10,30 @@
 <div id="header">
 <a href="${h.url_for("/")}">Home</a>
 
 <div id="header">
 <a href="${h.url_for("/")}">Home</a>
 

-${h.form(h.url_for(controller='search'), method='GET')}
-${h.text('query')} ${h.submit(None, 'Search')}
+% 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("/users/"+c.user}">Your Page</a>
+% endif
+
+${h.form(h.url_for('search'), method='GET')}
+${h.text('query', c.query)}
+${h.submit('button', 'Search')}
+
+% if c.user:
+${h.submit('button', 'Save')}
+% endif
+
+## Note: should probably only display "save" when we're on a results page
+## Also, what if we had it save a hidden form containing the search result that was
+## actually rendered?  Might be confusing though.

 ${h.end_form()}
 
     <div id="user">
         % if c.user:
 ${h.end_form()}
 
     <div id="user">
         % if c.user:

-        <p>Logged in as ${c.user.name}</p>
+        <form action="${url(controller='account', action='logout')}" method="POST">
+        <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">
         <p>
         % else:
         <form action="${url(controller='account', action='login_begin')}" method="POST">
         <p>


@@ -29,6 +46,17 @@ ${h.end_form()}
 
 
 </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="body">
 ${next.body()}
 </div>