X-Git-Url: http://git.cascardo.info/?a=blobdiff_plain;f=urls.py;h=241e53a07bc22aa0806908897d1e9d8a479b9735;hb=b6d59da4f3751baa1cee852e0ce903f32fda5464;hp=c516b314ae725789be7e9ca97e73b39b29015a66;hpb=937615436ceacf35c74375ffa2808045defb0a2c;p=cascardo%2Feventmanager.git

diff --git a/urls.py b/urls.py
index c516b31..241e53a 100644
--- a/urls.py
+++ b/urls.py
@@ -17,12 +17,25 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.
 """
 from django.conf.urls.defaults import *
+from django.conf import settings
+from conteudo import views as conteudo_views
 import views
+import os
 
 urlpatterns = patterns('',
+    (r'^noticias/(\d+)/$', conteudo_views.noticia),
+    (r'^secao/(\d+)/$', conteudo_views.secao),
     (r'^admin/', include('django.contrib.admin.urls')),
     (r'^logout/', 'django.contrib.auth.views.logout',
         {'next_page': '/'}),
-    (r'^inscrever_palestra/', views.inscrever_palestra),
+    (r'^inscricao/', views.inscricao),
+    (r'^submeter_trabalho/', views.submeter_trabalho),
+    (r'^cadastro_palestrante/', views.cadastro_palestrante),
+    (r'^meus_trabalhos/', views.meus_trabalhos),
+    (r'^meus_dados/', views.meus_dados),
+    (r'^chamada_trabalhos/', views.chamada_trabalhos),
+
+    (r'^site_media/(.*)$', 'django.views.static.serve',
+     {'document_root': os.path.join(settings.LOCAL_INSTANCE, 'media')}),
     (r'^$', views.index),
 )