merged in my branch 'resources', which is not aptly named anymore since it no longer...

diff --cc floof/controllers/art.py
index a0aecd7,8dfc487..5186daa
--- 1/floof/controllers/art.py
--- 2/floof/controllers/art.py
+++ b/floof/controllers/art.py
@@@ -37,14 -50,13 +50,7 @@@ class ArtController(BaseController)
              c.your_score = c.art.user_score(c.user)
          return render("/art/show.mako")
          
-     # TODO: login required
-     # also, require post
-     def tag(self, id):
-         # c.art = h.get_object_or_404(Art, id=id)
-         c.art.add_tags(request.params.get("tags",""), c.user)
-         elixir.session.commit()
-         redirect_to('show_art', id=c.art.id)
-     
 -    # # TODO: login required
 -    # def tag(self, id):
 -    #     # c.art = h.get_object_or_404(Art, id=id)
 -    #     c.art.add_tags(request.params["tags"], c.user)
 -    #     elixir.session.commit()
 -    #     redirect_to('show_art', id=c.art.id)
 -    # 
++
      # TODO: login required
      def rate(self, id):
          # c.art = h.get_object_or_404(Art, id=id)

diff --cc floof/controllers/tag.py
index 3b69ed6,c00eaf6..874e605
--- 1/floof/controllers/tag.py
--- 2/floof/controllers/tag.py
+++ b/floof/controllers/tag.py
@@@ -12,9 -13,17 +13,17 @@@ from floof.model.art import Art, Ta
  
  class TagController(BaseController):
  
-     def delete(self, id):
-         tag = Tag.get(id)
-         if tag:
-             elixir.session.delete(tag)
-             elixir.session.commit()
-         redirect_to(request.referrer)
+     # TODO: login required
+     def delete(self, art_id, id):
+         tag = h.get_object_or_404(Tag, id=id)
+         elixir.session.delete(tag)
+         elixir.session.commit()
+         redirect(url('show_art', id=art_id))
+         
+     # TODO: login required
+     def create(self, art_id):
+         c.art = h.get_object_or_404(Art, id=art_id)
 -        c.art.add_tags(request.params["tags"], c.user)
++        c.art.add_tags(request.params.get("tags",""), c.user)
+         elixir.session.commit()
+         redirect(url('show_art', id=c.art.id))
+