From 659236643fbb4a0a5579734bc44a878fd4083833 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Sun, 27 Jan 2019 19:58:03 +0100 Subject: [PATCH] update for django 1.11 --- panikweb/settings.py | 34 ++++++---- panikweb/urls.py | 67 ++++++++++--------- panikweb/views.py | 6 +- .../templates/emissions/nav.html | 8 +-- .../templates/episodes/resume.html | 10 +-- .../templates/includes/metaNav.html | 14 ++-- .../templates/includes/week-nav.html | 2 +- panikweb_templates/templates/listen/nav.html | 2 +- .../templates/soundfiles/resume.html | 2 +- 9 files changed, 76 insertions(+), 69 deletions(-) diff --git a/panikweb/settings.py b/panikweb/settings.py index 3631a77..0c2fa86 100644 --- a/panikweb/settings.py +++ b/panikweb/settings.py @@ -6,7 +6,6 @@ import os import django.conf.global_settings as DEFAULT_SETTINGS DEBUG = True # Turn off for production -TEMPLATE_DEBUG = DEBUG DEBUG_TOOLBAR = False PROJECT_DIR = os.path.normpath(os.path.dirname(os.path.dirname(__file__))) @@ -96,13 +95,6 @@ STATICFILES_FINDERS = ( # Make this unique, and don't share it with anybody. SECRET_KEY = '3qm&@6264-=st16)7_xa*ds+31e0mqqs@+*!ud7gzt$tq!b^qn' -# List of callables that know how to import templates from various sources. -TEMPLATE_LOADERS = ( - 'django.template.loaders.filesystem.Loader', - 'django.template.loaders.app_directories.Loader', -# 'django.template.loaders.eggs.load_template_source', -) - MIDDLEWARE_CLASSES = ( 'django.middleware.cache.UpdateCacheMiddleware', #'django.middleware.gzip.GZipMiddleware', @@ -117,10 +109,27 @@ MIDDLEWARE_CLASSES = ( 'django.middleware.cache.FetchFromCacheMiddleware', ) -TEMPLATE_CONTEXT_PROCESSORS = DEFAULT_SETTINGS.TEMPLATE_CONTEXT_PROCESSORS + ( - 'django.core.context_processors.request', - 'panikweb.context_processors.site_url', -) +TEMPLATES = [ + { + 'BACKEND': 'django.template.backends.django.DjangoTemplates', + 'DIRS': [ + os.path.join(PROJECT_DIR, 'panikweb_templates'), + ], + 'APP_DIRS': True, + 'OPTIONS': { + 'context_processors': [ + 'django.contrib.auth.context_processors.auth', + 'django.template.context_processors.debug', + 'django.template.context_processors.i18n', + 'django.template.context_processors.media', + 'django.template.context_processors.request', + 'django.template.context_processors.static', + 'django.template.context_processors.tz', + 'panikweb.context_processors.site_url', + ], + }, + }, +] ROOT_URLCONF = 'panikweb.urls' @@ -146,7 +155,6 @@ INSTALLED_APPS = ( 'panikweb.paniktags', 'compressor', 'sorl.thumbnail', - 'jquery', 'ckeditor', 'emissions', 'newsletter', diff --git a/panikweb/urls.py b/panikweb/urls.py index df09ae4..9d4bbd3 100644 --- a/panikweb/urls.py +++ b/panikweb/urls.py @@ -1,4 +1,4 @@ -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 @@ -6,50 +6,51 @@ from django.core.urlresolvers import reverse_lazy from django.contrib import admin -urlpatterns = patterns('', - url(r'^$', 'panikweb.views.home', name='home'), - url(r'^onair.json$', 'panikweb.views.onair', name='onair'), - url(r'^programme/$', 'panikweb.views.program', name='program'), - url(r'^programme/(?P\d{4})/(?P\d+)/$', 'panikweb.views.program', name='program_week'), - url(r'^grille$', 'panikweb.views.grid', name='grid'), - url(r'^emissions/$', 'panikweb.views.emissions', name='emissions'), - url(r'^emissions/(?P[\w,-]+)/episodes/$', 'panikweb.views.emissionEpisodes', name='emissionEpisodes'), - url(r'^emissions/(?P[\w,-]+)/podcasts.rss', 'panikweb.views.emission_podcasts_feed', name='emission-podcasts'), - url(r'^emissions/(?P[\w,-]+)/chat/$', 'panikweb.views.chat', name='emission-chat'), - url(r'^emissions/(?P[\w,-]+)/(?P[\w,-]+)/$', 'panikweb.views.episode', name='episode-view'), - url(r'^emissions/(?P[\w,-]+)/(?P[\w,-]+)/$', 'panikweb.views.episode', name='episode-view'), +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\d{4})/(?P\d+)/$', views.program, name='program_week'), + url(r'^grille$', views.grid, name='grid'), + url(r'^emissions/$', views.emissions, name='emissions'), + url(r'^emissions/(?P[\w,-]+)/episodes/$', views.emissionEpisodes, name='emissionEpisodes'), + url(r'^emissions/(?P[\w,-]+)/podcasts.rss', views.emission_podcasts_feed, name='emission-podcasts'), + url(r'^emissions/(?P[\w,-]+)/chat/$', views.chat, name='emission-chat'), + url(r'^emissions/(?P[\w,-]+)/(?P[\w,-]+)/$', views.episode, name='episode-view'), url(r'^emissions/(?P[\w,-]+)/(?P[\w,-]+)/embed/(?P\d+)/$', - 'panikweb.views.soundfile_embed', name='soundfile-embed-view'), + views.soundfile_embed, name='soundfile-embed-view'), url(r'^emissions/(?P[\w,-]+)/(?P[\w,-]+)/dlg-embed/(?P\d+)/$', - 'panikweb.views.soundfile_dlg_embed', name='soundfile-dialog-embed-view'), + views.soundfile_dlg_embed, name='soundfile-dialog-embed-view'), url(r'^emissions/(?P[\w,-]+)/playlist/(?P[0-9]{4})-(?P[-\w]+)-(?P[0-9]+)/$', - 'panikweb.views.nonstop_playlist', name='nonstop-playlist'), - url(r'^emissions/(?P[\w,-]+)/$', 'panikweb.views.emission', name='emission-view'), - url(r'^ckeditor/', include('ckeditor.urls')), - url(r'^emissions/archives$', 'panikweb.views.emissionsArchives', name='emissionsArchives'), - url(r'^sons/$', 'panikweb.views.listen', name='listen'), - url(r'^sons/archives/$', 'panikweb.search.listenArchives', name='listenArchives'), - url(r'^actus/$', 'panikweb.views.news', name='news'), - url(r'^actus/agenda/$', 'panikweb.views.agenda', name='agenda'), + views.nonstop_playlist, name='nonstop-playlist'), + url(r'^emissions/(?P[\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[0-9]{4})/(?P[0-9]+)/$', - 'panikweb.views.agenda_by_month', name='agenda_by_month'), + views.agenda_by_month, name='agenda_by_month'), url(r'^actus/agenda$', RedirectView.as_view(pattern_name='agenda', permanent=True)), - url(r'^actus/archives/$', 'panikweb.search.newsArchives', name='newsArchives'), - url(r'^actus/(?P[\w,-]+)$', 'panikweb.views.newsitemview', name='newsitem-view'), + url(r'^actus/archives/$', search.newsArchives, name='newsArchives'), + url(r'^actus/(?P[\w,-]+)$', views.newsitemview, name='newsitem-view'), - url(r'^party', 'panikweb.views.party', name='party'), + url(r'^party', views.party, name='party'), - url(r'^recherche/', 'panikweb.search.view', name='search'), + url(r'^recherche/', search.view, name='search'), - url(r'^actus.rss', 'panikweb.views.rss_news_feed', name='rss-feed'), - url(r'^actus.atom', 'panikweb.views.atom_news_feed', name='atom-feed'), - url(r'^podcasts.rss', 'panikweb.views.podcasts_feed', name='podcasts-feed'), + 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')), 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() @@ -57,7 +58,7 @@ urlpatterns += staticfiles_urlpatterns() from django.conf.urls.static import static urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) -urlpatterns += patterns('', url(r'', include('combo.public.urls'))) +urlpatterns.append(url(r'', include('combo.public.urls'))) try: from local_urls import * diff --git a/panikweb/views.py b/panikweb/views.py index ab07c7b..1b074eb 100644 --- a/panikweb/views.py +++ b/panikweb/views.py @@ -8,7 +8,7 @@ import urlparse from django.core.urlresolvers import reverse from django.conf import settings -from django.http import Http404 +from django.http import Http404, JsonResponse from django.views.decorators.cache import cache_control from django.views.generic.base import TemplateView from django.views.generic.detail import DetailView @@ -23,7 +23,6 @@ from django.contrib.syndication.views import Feed, add_domain from django.utils.feedgenerator import Atom1Feed, Rss201rev2Feed from haystack.query import SearchQuerySet -from jsonresponse import to_json from emissions.models import Category, Emission, Episode, Diffusion, SoundFile, \ Schedule, Nonstop, NewsItem, NewsCategory, Focus @@ -625,7 +624,6 @@ listen = Listen.as_view() @cache_control(max_age=15) @csrf_exempt -@to_json('api') def onair(request): d = whatsonair() if d.get('episode'): @@ -652,7 +650,7 @@ def onair(request): d.update(get_current_nonstop_track()) if d.get('current_slot'): del d['current_slot'] - return d + return JsonResponse(d) class NewsItemDetailView(DetailView): diff --git a/panikweb_templates/templates/emissions/nav.html b/panikweb_templates/templates/emissions/nav.html index 750767b..e9fd833 100644 --- a/panikweb_templates/templates/emissions/nav.html +++ b/panikweb_templates/templates/emissions/nav.html @@ -4,16 +4,16 @@