merged with mine

diff --git a/floof/config/routing.py b/floof/config/routing.py
index 32093bb..c8b94b9 100644 (file)
--- a/floof/config/routing.py
+++ b/floof/config/routing.py
@@ -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')
@@ -32,6 +33,14 @@ def make_map():
     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.

diff --git a/floof/templates/art/new.mako b/floof/templates/art/new.mako
index 4988917..e2c00fb 100644 (file)
--- a/floof/templates/art/new.mako
+++ b/floof/templates/art/new.mako
@@ -5,5 +5,5 @@
 
 ${h.form(h.url_for(controller='art', action='upload'), multipart=True)}
 ${h.file('file')}
-${h.submit('submit', 'Upload!')}
-${h.end_form()}
\ No newline at end of file
+${h.submit(None, 'Upload!')}
+${h.end_form()}

diff --git a/floof/templates/art/show.mako b/floof/templates/art/show.mako
index fc0a3f8..2ac5305 100644 (file)
--- a/floof/templates/art/show.mako
+++ b/floof/templates/art/show.mako
@@ -10,8 +10,8 @@ ${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?