Fix bad merge

[cascardo/ema.git] / eventos / urls.py

diff --git a/eventos/urls.py b/eventos/urls.py
index 35bb882..f078fa9 100644 (file)
--- a/eventos/urls.py
+++ b/eventos/urls.py
@@ -3,9 +3,13 @@ from django.conf.urls.defaults import *
 urlpatterns = patterns('',
     (r'^login/', 'eventos.views.login'),
     (r'^logout/', 'eventos.views.logout'),
-    (r'^lecturer/(\d+)/$', 'eventos.views.lecturer_details'),
-    (r'^lecturer/(\d+)/talks/$', 'eventos.views.lecturer_talks'),
+    (r'^speaker/add/$', 'eventos.views.speaker_add'),
+    (r'^speaker/(\d+)/$', 'eventos.views.speaker_details'),
+    (r'^speaker/(\d+)/talks/$', 'eventos.views.speaker_talks'),
     (r'^talks/(\d+)/$', 'eventos.views.talk_details'),
     (r'^talks/(\d+)/delete/$', 'eventos.views.talk_delete'),
     (r'^talks/add/$', 'eventos.views.talk_add'),
+    (r'^improve/$', 'eventos.views.list_all_talks'),
+    (r'^improve/(\d+)/$', 'eventos.views.talk_improve'),
+    (r'^subscribe/$', 'eventos.views.subscribe'),
 )