X-Git-Url: http://git.ithinksw.org/~kgodey/maayanwich.git/blobdiff_plain/46ed4211e32129bf050a0213e0469675a7d002f2..2a2e81bae73647b9ea060e30a092d2679b6bff7e:/urls.py?ds=sidebyside

diff --git a/urls.py b/urls.py
index 8f48e0f..a90d4fc 100644
--- a/urls.py
+++ b/urls.py
@@ -6,10 +6,17 @@ urlpatterns = patterns('',
 	url(r'^sandwich/add/$', views.add_sandwich, name='add_sandwich'),
 	url(r'^sandwich/addingredient/$', views.add_ingredient, name='add_ingredient'),
 	url(r'^sandwich/all/$', views.all_sandwich, name='all_sandwiches'),
-	url(r'^sandwich/(?P<year>[-\w]+)/(?P<month>[-\w]+)/$', views.sandwich_month, name='sandwich_by_month'),
+	url(r'^sandwich/(?P<gusername>[-\w]+)/edit/', views.edit_user, name='edit_user'),
+	url(r'^sandwich/(?P<slug>[-\w]+)/edit/', views.edit_sandwich, name='edit_sandwich'),
+	url(r'^sandwich/(?P<slug>[-\w]+)/delete/', views.del_sandwich, name='del_sandwich'),
 	url(r'^sandwich/(?P<slug>[-\w]+)/$', views.specific_sandwich, name='sandwich_by_slug'),
+	url(r'^sandwich/(?P<year>[-\w]+)/(?P<month>[-\w]+)/$', views.sandwich_month, name='sandwich_by_month'),
 	url(r'^login/$', views.login_view, name='login'),
+	url(r'^login2/$', views.login_view2, name='login2'),
 	url(r'^logout/$', views.logout_view, name='logout'),
 	url(r'^signup/$', views.create_user, name='signup'),
-	url(r'', views.current_home, name='index'),
+	url(r'^ajaxfun', views.ajaxfun, name='ajaxfun'),
+	url(r'^comments/posted/$', views.comment_posted, name='comment_posted'),
+	(r'^comments/', include('django.contrib.comments.urls')),
+	url(r'^home/$', views.current_home, name='index'),
 )