templates: strip label of embed dialog

[panikweb.git] / panikweb / urls.py

diff --git a/panikweb/urls.py b/panikweb/urls.py
index dc8dd968c97ada6f3181075330fc6bffe0dee7ab..5cee0b5b1e228412a3de0e9790bb8d5281f5f20e 100644 (file)
--- a/panikweb/urls.py
+++ b/panikweb/urls.py
@@ -1,41 +1,58 @@
-from django.conf.urls import patterns, include, url
+from django.conf.urls import include, url
 from django.conf import settings
 
 from django.views.generic import RedirectView
 from django.core.urlresolvers import reverse_lazy
 
 from django.contrib import admin
-admin.autodiscover()
-
-urlpatterns = patterns('',
-    url(r'^$', 'panikweb.views.home', name='home'),
-    url(r'^onair.json$', 'panikweb.views.onair', name='onair'),
-    url(r'^program/$', 'panikweb.views.program', name='program'),
-    url(r'^program/(?P<year>\d{4})/(?P<week>\d+)/$', 'panikweb.views.program', name='program_week'),
-    url(r'^grid$', 'panikweb.views.grid', name='grid'),
-    url(r'^emissions/$', 'panikweb.views.emissions', name='emissions'),
-    url(r'^emissions/(?P<slug>[\w,-]+)/episodes/$', 'panikweb.views.emissionEpisodes', name='emissionEpisodes'),
-    url(r'^emissions/(?P<emission_slug>[\w,-]+)/(?P<slug>[\w,-]+)/$', 'panikweb.views.episode', name='episode-view'),
-    url(r'^emissions/(?P<slug>[\w,-]+)/$', 'panikweb.views.emission', name='emission-view'),
-    url(r'^ckeditor/', include('ckeditor.urls')),
-    url(r'^emissions/archives$', 'panikweb.views.emissionsArchives', name='emissionsArchives'),
-    url(r'^listen/$', 'panikweb.search.listenArchives', name='listen'),
-    url(r'^news/$', 'panikweb.views.news', name='news'),
-    url(r'^news/archives/$', 'panikweb.views.newsArchives', name='newsArchives'),
-    url(r'^news/(?P<slug>[\w,-]+)$', 'panikweb.views.newsitemview', name='news-view'),
-
-    url(r'^search/', 'panikweb.search.view', name='search'),
-
-    url(r'^podcasts.rss', 'panikweb.views.podcasts_feed', name='podcasts-feed'),
+
+from . import search
+from . import views
+
+urlpatterns = [
+    url(r'^$', views.home, name='home'),
+    url(r'^onair.json$', views.onair, name='onair'),
+    url(r'^programme/$', views.program, name='program'),
+    url(r'^programme/(?P<year>\d{4})/(?P<week>\d+)/$', views.program, name='program_week'),
+    url(r'^grille$', views.grid, name='grid'),
+    url(r'^emissions/$', RedirectView.as_view(pattern_name='home'), name='emissions'),
+    url(r'^emissions/(?P<slug>[\w,-]+)/episodes/$', views.emissionEpisodes, name='emissionEpisodes'),
+    url(r'^emissions/(?P<slug>[\w,-]+)/podcasts.rss', views.emission_podcasts_feed, name='emission-podcasts'),
+    url(r'^emissions/(?P<slug>[\w,-]+)/chat/$', views.chat, name='emission-chat'),
+    url(r'^emissions/(?P<emission_slug>[\w,-]+)/(?P<slug>[\w,-]+)/$', views.episode, name='episode-view'),
+    url(r'^emissions/(?P<emission_slug>[\w,-]+)/(?P<episode_slug>[\w,-]+)/embed/(?P<pk>\d+)/$',
+        views.soundfile_embed, name='soundfile-embed-view'),
+    url(r'^emissions/(?P<emission_slug>[\w,-]+)/(?P<episode_slug>[\w,-]+)/dlg-embed/(?P<pk>\d+)/$',
+        views.soundfile_dlg_embed, name='soundfile-dialog-embed-view'),
+    url(r'^emissions/(?P<slug>[\w,-]+)/playlist/(?P<year>[0-9]{4})-(?P<month>[-\w]+)-(?P<day>[0-9]+)/$',
+        views.nonstop_playlist, name='nonstop-playlist'),
+    url(r'^emissions/(?P<slug>[\w,-]+)/$', views.emission, name='emission-view'),
+    url(r'^emissions/archives$', views.emissionsArchives, name='emissionsArchives'),
+    url(r'^sons/$', views.listen, name='listen'),
+    url(r'^sons/archives/$', search.listenArchives, name='listenArchives'),
+    url(r'^actus/$', views.news, name='news'),
+    url(r'^actus/agenda/$', views.agenda, name='agenda'),
+    url(r'^actus/agenda/(?P<year>[0-9]{4})/(?P<month>[0-9]+)/$',
+            views.agenda_by_month, name='agenda_by_month'),
+    url(r'^actus/agenda$', RedirectView.as_view(pattern_name='agenda', permanent=True)),
+    url(r'^actus/archives/$', search.newsArchives, name='newsArchives'),
+    url(r'^actus/(?P<slug>[\w,-]+)$', views.newsitemview, name='newsitem-view'),
+
+    url(r'^party', views.party, name='party'),
+
+    url(r'^recherche/', search.view, name='search'),
+
+    url(r'^actus.rss', views.rss_news_feed, name='rss-feed'),
+    url(r'^actus.atom', views.atom_news_feed, name='atom-feed'),
+    url(r'^podcasts.rss', views.podcasts_feed, name='podcasts-feed'),
 
     url(r'^newsletter/', include('newsletter.urls')),
-    (r'^api/v2/', include('fiber.rest_api.urls')),
-    (r'^admin/fiber/', include('fiber.admin_urls')),
-    (r'^jsi18n/$', 'django.views.i18n.javascript_catalog', {'packages': ('fiber',),}),
+
+    url(r'^archives/$', views.archives, name='espe-archives'),
 
     url(r'^admin/', include(admin.site.urls)),
     url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
-)
+]
 
 from django.contrib.staticfiles.urls import staticfiles_urlpatterns
 urlpatterns += staticfiles_urlpatterns()
@@ -43,11 +60,9 @@ urlpatterns += staticfiles_urlpatterns()
 from django.conf.urls.static import static
 urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
 
-urlpatterns += patterns('',
-    (r'', 'panikweb.views.fiber_page'),
-)
+urlpatterns.append(url(r'', include('combo.public.urls')))
 
 try:
     from local_urls import *
-except ImportError, e:
+except ImportError as e:
     pass