update for django 1.11

diff --git a/panikdb/settings.py b/panikdb/settings.py
index f00b18df3ac07ae550790cda5307b202444a0601..4992ae6b1b1fb1d4e619c6da6018e4857ca156aa 100644 (file)
--- a/panikdb/settings.py
+++ b/panikdb/settings.py
@@ -141,9 +141,6 @@ INSTALLED_APPS = (
     'ckeditor',
     'haystack',
     'taggit',
-    'jquery',
-    'datetimewidget',
-    'django_bootstrap_staticfiles',
     'emissions',
     'newsletter',
     'matos',

diff --git a/panikdb/templates/base.html b/panikdb/templates/base.html
index e643bed726a3430a2aba93886abcd8ddfaab9dc7..f95c6ff8e1179875d361939780991d828a3baf35 100644 (file)
--- a/panikdb/templates/base.html
+++ b/panikdb/templates/base.html
@@ -14,7 +14,10 @@
 
     {% block css %}
     {{ block.super }}
-    {% import_django_select2_js_css %}
+    <link href="/static/django_select2/css/select2.css" rel="stylesheet">
+    <link href="/static/django_select2/css/extra.css" rel="stylesheet"><script type="text/javascript" src="/static/django_select2/js/select2.js"></script>
+    <script type="text/javascript" src="/static/django_select2/js/heavy_data.js"></script>
+
     <link href="{{ STATIC_URL }}css/datetimepicker.css" rel="stylesheet" type="text/css"/>
     {% endblock %}
 

diff --git a/panikdb/templates/home.html b/panikdb/templates/home.html
index 95f5f9b91ae0863ad8c56d56238ff031840f5401..eb4545b3a51c537bd33682793531a5ea86fbf0fb 100644 (file)
--- a/panikdb/templates/home.html
+++ b/panikdb/templates/home.html
@@ -63,7 +63,7 @@
 
 <ul class="episode-list">
 {% for newsitem in emission.get_sorted_newsitems|slice:":5" %}
-<li>{{ newsitem.date|date:"d E o H:i"|lower }}
+<li>{{ newsitem.date|date:"d E o"|lower }}
 <a href="{% url 'newsitem-view' slug=newsitem.slug %}">{{ newsitem.title }}</a>
 </li>
 {% empty %}
@@ -87,7 +87,7 @@ Aucune actu.
 
 <ul class="episode-list">
 {% for newsitem in news_category.get_sorted_newsitems|slice:":10" %}
-<li>{{ newsitem.date|date:"d E o H:i"|lower }}
+<li>{{ newsitem.date|date:"d E o"|lower }}
 <a href="{% url 'newsitem-view' slug=newsitem.slug %}">{{ newsitem.title }}</a>
 </li>
 {% empty %}

diff --git a/panikdb/templates/registration/login.html b/panikdb/templates/registration/login.html
index d566e107407b726197fbee1d1d7470cfa7091ab0..ad0f239a88fbd8c08f621b3a99d37cff7a9998bb 100644 (file)
--- a/panikdb/templates/registration/login.html
+++ b/panikdb/templates/registration/login.html
@@ -1,5 +1,4 @@
 {% extends "registration/base.html" %}
-{% load url from future %}
 
 {% block user-links %}{% endblock %}
 {% block bodyargs %}{{block.super}} class="login"{% endblock %}
@@ -22,7 +21,7 @@ de nouveaux épisodes et nouvelles actualités.
 <p>Mot de passe incorrect. Essayez encore.</p>
 {% endif %}
 
-<form method="post" id="login-form" action="{% url 'django.contrib.auth.views.login' %}">
+<form method="post" id="login-form" action="{% url 'auth_login' %}">
 {% csrf_token %}
 
 <p>

diff --git a/panikdb/urls.py b/panikdb/urls.py
index 5c7b7abc67ff85e6c3c70e23a2005c9171cc7bcb..1fdadc47fa3167e4ccc1f5edef48f859db04d97c 100644 (file)
--- a/panikdb/urls.py
+++ b/panikdb/urls.py
@@ -1,8 +1,9 @@
-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.auth.decorators import login_required
+from django.contrib.auth.views import logout_then_login
 
 from django.contrib import admin
 
@@ -18,6 +19,10 @@ from emissions.models import Emission, Episode, NewsItem
 from newsletter.urls import management_patterns as newsletter_urlpatterns
 from matos.urls import urlpatterns as matos_urlpatterns
 from nonstop.urls import urlpatterns as nonstop_urlpatterns
+import panikombo.views
+
+from .poll import views as poll_views
+from . import views
 
 from combo.manager.urls import urlpatterns as combo_manager_urls
 
@@ -26,14 +31,14 @@ from urls_utils import decorated_includes, cms_permission_required
 
 sqs = SearchQuerySet().models(Emission, Episode, NewsItem).facet('categories').facet('tags')
 
-urlpatterns = patterns('',
-    url(r'^$', 'panikdb.views.home', name='home'),
+urlpatterns = [
+    url(r'^$', views.home, name='home'),
     url(r'^ckeditor/upload/', login_required(ckeditor_upload)),
     url(r'^ckeditor/browse/', login_required(ckeditor_browse)),
     url(r'^search/', search_view_factory(view_class=FacetedSearchView,
         form_class=FacetedSearchForm, searchqueryset=sqs), name='haystack_search'),
 
-    url(r'^emissions/$', 'panikdb.views.emissions_list', name='emission-list'),
+    url(r'^emissions/$', views.emissions_list, name='emission-list'),
 
     url(r'^emissions/',
         decorated_includes(login_required, include(emissions_urlpatterns))),
@@ -44,36 +49,36 @@ urlpatterns = patterns('',
     url(r'^nonstop/',
         decorated_includes(login_required, include(nonstop_urlpatterns))),
 
-    url(r'^newsletters/add$', 'panikdb.views.newsletter_create', name='newsletter-create'),
+    url(r'^newsletters/add$', views.newsletter_create, name='newsletter-create'),
     url(r'^newsletters/',
         decorated_includes(login_required, include(newsletter_urlpatterns))),
 
     url(r'^cms/',
         decorated_includes(cms_permission_required, include(combo_manager_urls))),
 
-    url(r'^news/$', 'panikdb.views.news', name='news-list'),
+    url(r'^news/$', views.news, name='news-list'),
 
     url(r'^focus/set/(?P<object_type>[\w,-]+)/(?P<object_id>\d+)$',
-        'panikdb.views.focus_set', name='focus-set'),
+        views.focus_set, name='focus-set'),
     url(r'^focus/unset/(?P<object_type>[\w,-]+)/(?P<object_id>\d+)$',
-        'panikdb.views.focus_unset', name='focus-unset'),
+        views.focus_unset, name='focus-unset'),
 
-    url(r'^cms/pages/(?P<page_pk>\w+)/make-topik$', 'panikdb.views.make_topik',
+    url(r'^cms/pages/(?P<page_pk>\w+)/make-topik$', views.make_topik,
         name='make-topik'),
-    url(r'^cms/pages/topik/(?P<pk>\w+)/edit-topik$', 'panikombo.views.topik_edit',
+    url(r'^cms/pages/topik/(?P<pk>\w+)/edit-topik$', panikombo.views.topik_edit,
         name='edit-topik'),
 
-    url(r'^accounts/logout/', 'django.contrib.auth.views.logout_then_login', name='logout'),
+    url(r'^accounts/logout/', logout_then_login, name='logout'),
     url(r'^accounts/', include('registration.backends.default.urls')),
 
-    url(r'^combok/soundfiles/', 'panikombo.views.soundfiles'),
-    url(r'^combok/episodes/', 'panikombo.views.episodes'),
+    url(r'^combok/soundfiles/', panikombo.views.soundfiles),
+    url(r'^combok/episodes/', panikombo.views.episodes),
 
-    url(r'^vote/$', 'panikdb.poll.views.vote', name='vote'),
-    url(r'^vote/results/$', 'panikdb.poll.views.vote_results', name='vote-results'),
+    url(r'^vote/$', poll_views.vote, name='vote'),
+    url(r'^vote/results/$', poll_views.vote_results, name='vote-results'),
 
     url(r'^admin/', include(admin.site.urls)),
-)
+]
 
 from combo import plugins
 urlpatterns = plugins.register_plugins_urls(urlpatterns)