From: Nick Retallack <nickretallack@gmil.com>
Date: Mon, 5 Oct 2009 17:44:08 +0000 (-0700)
Subject: merged with mine
X-Git-Url: http://git.veekun.com/zzz-floof.git/commitdiff_plain/d4609fff2bfd910366c41116f1da35e4037da7d4?hp=-c

merged with mine
---

d4609fff2bfd910366c41116f1da35e4037da7d4
diff --combined floof/config/routing.py
index 5bd87d9,32093bb..c8b94b9
--- a/floof/config/routing.py
+++ b/floof/config/routing.py
@@@ -22,7 -22,6 +22,7 @@@ def make_map()
  
      map.connect('/', controller='main', action='index')
  
 +    # User stuff
      map.connect('/account/login', controller='account', action='login')
      map.connect('/account/login_begin', controller='account', action='login_begin', **require_POST)
      map.connect('/account/login_finish', controller='account', action='login_finish')
@@@ -33,14 -32,11 +33,19 @@@
      map.connect('/users', controller='users', action='list')
      map.connect('/users/{name}', controller='users', action='view')
  
 +    # Art stuff
 +    map.connect('/art/new', controller='art', action='new')
 +    map.connect('/art/upload', controller='art', action='upload')
 +    map.connect('/art/{id}', controller='art', action='show')
 +    map.connect('/art/{id}/tag', controller='art', action='tag')
 +
 +    map.connect('/tag/{id}/delete', controller='tag', action='delete')
 +
      map.connect('/search', controller='search', action='index')
  
+     # default routing is back so we can test stuff.
+     # please don't take it away until we have some more core features in.
+     map.connect('/{controller}/{action}')
+     map.connect('/{controller}/{action}/{id}')
+ 
      return map
diff --combined floof/templates/art/show.mako
index 02f61d4,fc0a3f8..2ac5305
--- a/floof/templates/art/show.mako
+++ b/floof/templates/art/show.mako
@@@ -1,5 -1,7 +1,7 @@@
  <%inherit file="/base.mako" />
  
+ <%! from floof.model.art import Rating %>
+ 
  <h1>View Art</h1>
  
  ${h.form (h.url_for (controller='art', action='tag', id=c.art.id), multipart=True)}
@@@ -8,10 -10,18 +10,18 @@@ ${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='index')}?query=${tag}">${tag}</a>
 +<a href="${url(controller='tag', action='delete', id=tag.id)}">x</a>
 +<a href="${url(controller='search', action='index', query=tag)}">${tag}</a>
  % endfor
  
+ What do you think?
+ % 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" \
+ % endif
+ >${text}</a> 
+ % endfor
  
  <img class="full" src="${c.art.get_path()}">