Skip to content
Snippets Groups Projects
Commit 3838b4d6 authored by Ernesto Rico Schmidt's avatar Ernesto Rico Schmidt
Browse files

removed django.conf.urls.patterns

parent 980f1e3c
No related branches found
No related tags found
No related merge requests found
from django.conf.urls import patterns, url from django.conf.urls import url
from django.views.static import serve
from views import get, get_current, nop_form from views import get, get_current, nop_form
import os import os
NOP_SITE_MEDIA = os.path.join(os.path.dirname(__file__), 'site_media') NOP_SITE_MEDIA = os.path.join(os.path.dirname(__file__), 'site_media')
urlpatterns = patterns('', urlpatterns = [
url(r'^/get_current/?$', get_current), url(r'^get_current/?$', get_current),
url(r'^/(?P<year>\d{4})/(?P<month>\d{1,2})/(?P<day>\d{1,2})/(?P<hour>\d{1,2})/(?P<minute>\d{1,2})/?$', get), url(r'^(?P<year>\d{4})/(?P<month>\d{1,2})/(?P<day>\d{1,2})/(?P<hour>\d{1,2})/(?P<minute>\d{1,2})/?$', get),
url(r'^/?$', nop_form), url(r'^$', nop_form),
url(r'^/static/(?P<path>.*)$', 'django.views.static.serve', {'document_root': NOP_SITE_MEDIA}), url(r'^static/(?P<path>.*)$', serve, {'document_root': NOP_SITE_MEDIA}),
) ]
from django.conf import settings from django.conf import settings
from django.conf.urls import patterns, url from django.conf.urls import url
from django.views.decorators.cache import cache_page from django.views.decorators.cache import cache_page
from django.views.static import serve
import views import views
import os import os
PROGRAM_SITE_MEDIA = os.path.join(os.path.dirname(__file__), '../site_media') PROGRAM_SITE_MEDIA = os.path.join(os.path.dirname(__file__), '../site_media')
urlpatterns = patterns('', urlpatterns = [
url(r'^today/?$', views.DayScheduleView.as_view()), url(r'^today/?$', views.DayScheduleView.as_view()),
url(r'^week/?$', views.WeekScheduleView.as_view()), url(r'^week/?$', views.WeekScheduleView.as_view()),
url(r'^(?P<year>\d{4})/(?P<month>\d{1,2})/(?P<day>\d{1,2})/?$', views.DayScheduleView.as_view()), url(r'^(?P<year>\d{4})/(?P<month>\d{1,2})/(?P<day>\d{1,2})/?$', views.DayScheduleView.as_view()),
url(r'^(?P<year>\d{4})/(?P<week>\d{1,2})/?$', views.WeekScheduleView.as_view()), url(r'^(?P<year>\d{4})/(?P<week>\d{1,2})/?$', views.WeekScheduleView.as_view()),
url(r'^current_box/?$', cache_page(60)(views.CurrentShowBoxView.as_view())), url(r'^current_box/?$', cache_page(60)(views.CurrentShowBoxView.as_view())),
url(r'^hosts/?$', views.HostListView.as_view()), url(r'^hosts/?$', views.HostListView.as_view()),
url(r'^hosts/(?P<pk>\d+)/?$', views.HostDetailView.as_view(), name='host-detail'), url(r'^hosts/(?P<pk>\d+)/?$', views.HostDetailView.as_view(), name='host-detail'),
url(r'^tips/?$', views.RecommendationsListView.as_view()), url(r'^tips/?$', views.RecommendationsListView.as_view()),
url(r'^tips_box/?$', views.RecommendationsBoxView.as_view()), url(r'^tips_box/?$', views.RecommendationsBoxView.as_view()),
url(r'^shows/?$', views.ShowListView.as_view()), url(r'^shows/?$', views.ShowListView.as_view()),
url(r'^shows/(?P<slug>[\w-]+)/?$', views.ShowDetailView.as_view(), name='show-detail'), url(r'^shows/(?P<slug>[\w-]+)/?$', views.ShowDetailView.as_view(), name='show-detail'),
url(r'^(?P<pk>\d+)/?$', views.TimeSlotDetailView.as_view(), name='timeslot-detail'), url(r'^(?P<pk>\d+)/?$', views.TimeSlotDetailView.as_view(), name='timeslot-detail'),
url(r'^styles.css$', views.StylesView.as_view()) url(r'^styles.css$', views.StylesView.as_view())
) ]
if settings.DEBUG: if settings.DEBUG:
urlpatterns += \ urlpatterns.append(url(r'^static/(?P<path>.*)$', serve, {'document_root': PROGRAM_SITE_MEDIA}))
patterns('',
url(r'^static/(?P<path>.*)$', 'django.views.static.serve', {'document_root': PROGRAM_SITE_MEDIA}))
from django.conf import settings from django.conf import settings
from django.conf.urls import patterns, url, include from django.conf.urls import url, include
from django.contrib import admin from django.contrib import admin
from django.views.static import serve
from program.views import json_day_schedule, json_timeslots_specials from program.views import json_day_schedule, json_timeslots_specials
admin.autodiscover() admin.autodiscover()
urlpatterns = patterns('', urlpatterns = [
url(r'^admin/', include(admin.site.urls)), url(r'^admin/', include(admin.site.urls)),
url(r'^program/', include('program.urls')), url(r'^program/', include('program.urls')),
url(r'^nop', include('nop.urls')), url(r'^nop', include('nop.urls')),
url(r'^tinymce/', include('tinymce.urls')), url(r'^tinymce/', include('tinymce.urls')),
url(r'^export/day_schedule/(?P<year>\d{4})/(?P<month>\d{1,2})/(?P<day>\d{1,2})/$', json_day_schedule), url(r'^export/day_schedule/(?P<year>\d{4})/(?P<month>\d{1,2})/(?P<day>\d{1,2})/$', json_day_schedule),
url(r'^export/timeslots_specials.json$', json_timeslots_specials) url(r'^export/timeslots_specials.json$', json_timeslots_specials)
) ]
if settings.DEBUG: if settings.DEBUG:
urlpatterns += patterns('', urlpatterns.append(url(r'^site_media/(?P<path>.*)$', serve, {'document_root': settings.MEDIA_ROOT}))
(r'^site_media/(?P<path>.*)$', 'django.views.static.serve',
{'document_root': settings.MEDIA_ROOT})
)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment