X-Git-Url: http://git.ithinksw.org/~kgodey/maayanwich.git/blobdiff_plain/f3cb6c9aac4ebeec54e8a82959cf8d56b30b15b5..eb29f2a3fc433fc4dfd510ddb3e20ce03aca80b0:/urls.py diff --git a/urls.py b/urls.py index 7062efa..2f8f17e 100644 --- a/urls.py +++ b/urls.py @@ -6,12 +6,15 @@ 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[-\w]+)/(?P[-\w]+)/$', views.sandwich_month, name='sandwich_by_month'), + url(r'^sandwich/(?P[-\w]+)/edit/', views.edit_sandwich, name='edit_sandwich'), url(r'^sandwich/(?P[-\w]+)/$', views.specific_sandwich, name='sandwich_by_slug'), + url(r'^sandwich/(?P[-\w]+)/(?P[-\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'^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'), )