fnp / prawokultury.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: bb4d6a5)
Django 1.6.
authorRadek Czajka <radekczajka@nowoczesnapolska.org.pl>
Mon, 31 Mar 2014 12:44:31 +0000 (14:44 +0200)
committerRadek Czajka <radekczajka@nowoczesnapolska.org.pl>
Mon, 31 Mar 2014 12:44:31 +0000 (14:44 +0200)
prawokultury/settings.d/30-apps.py patch | blob | history
prawokultury/settings.d/40-auth.py patch | blob | history
prawokultury/settings.d/40-middleware.py patch | blob | history
prawokultury/settings.d/50-contrib.py patch | blob | history
prawokultury/templates/base.html patch | blob | history
requirements.txt patch | blob | history

diff --git a/prawokultury/settings.d/30-apps.py b/prawokultury/settings.d/30-apps.py
index 2acaaf9..3c8dc3d 100644 (file)
--- a/prawokultury/settings.d/30-apps.py
+++ b/prawokultury/settings.d/30-apps.py
@@ -8,7 +8,7 @@ INSTALLED_APPS = (
     'shop',
     'chunks',
 
     'shop',
     'chunks',
 
-    'gravatar',
+    'django_gravatar',
     'south',
     'django.contrib.comments',
     'django_comments_xtd',
     'south',
     'django.contrib.comments',
     'django_comments_xtd',
@@ -16,7 +16,7 @@ INSTALLED_APPS = (
     'haystack',
     'pagination',
     'sorl.thumbnail',
     'haystack',
     'pagination',
     'sorl.thumbnail',
-    'piwik.django',
+    'piwik',
     'django_cas',
     'honeypot',
     'taggit',
     'django_cas',
     'honeypot',
     'taggit',
diff --git a/prawokultury/settings.d/40-auth.py b/prawokultury/settings.d/40-auth.py
index 675db9d..14847ac 100644 (file)
--- a/prawokultury/settings.d/40-auth.py
+++ b/prawokultury/settings.d/40-auth.py
@@ -1,5 +1,5 @@
 if 'django_cas' in INSTALLED_APPS:
     AUTHENTICATION_BACKENDS = (
         'django.contrib.auth.backends.ModelBackend',
 if 'django_cas' in INSTALLED_APPS:
     AUTHENTICATION_BACKENDS = (
         'django.contrib.auth.backends.ModelBackend',
-        'django_cas.backends.CASBackend',
+        'fnpdjango.auth_backends.AttrCASBackend',
     )
     )
diff --git a/prawokultury/settings.d/40-middleware.py b/prawokultury/settings.d/40-middleware.py
index f0229cd..ffbe493 100644 (file)
--- a/prawokultury/settings.d/40-middleware.py
+++ b/prawokultury/settings.d/40-middleware.py
@@ -17,7 +17,6 @@ if 'django_cas' in INSTALLED_APPS:
 
 MIDDLEWARE_CLASSES += (
     'django.contrib.messages.middleware.MessageMiddleware',
 
 MIDDLEWARE_CLASSES += (
     'django.contrib.messages.middleware.MessageMiddleware',
-    'piwik.django.middleware.PiwikMiddleware',
     # Uncomment the next line for simple clickjacking protection:
     # 'django.middleware.clickjacking.XFrameOptionsMiddleware',
     'pagination.middleware.PaginationMiddleware',
     # Uncomment the next line for simple clickjacking protection:
     # 'django.middleware.clickjacking.XFrameOptionsMiddleware',
     'pagination.middleware.PaginationMiddleware',
diff --git a/prawokultury/settings.d/50-contrib.py b/prawokultury/settings.d/50-contrib.py
index 4625e79..906c9dc 100644 (file)
--- a/prawokultury/settings.d/50-contrib.py
+++ b/prawokultury/settings.d/50-contrib.py
@@ -14,7 +14,7 @@ THUMBNAIL_QUALITY = 95
 GRAVATAR_DEFAULT_IMAGE = 'http://localhost:8000/static/img/avatar.png'
 
 CAS_SERVER_URL = 'http://logowanie.nowoczesnapolska.org.pl/cas/'
 GRAVATAR_DEFAULT_IMAGE = 'http://localhost:8000/static/img/avatar.png'
 
 CAS_SERVER_URL = 'http://logowanie.nowoczesnapolska.org.pl/cas/'
-CAS_VERSION = '1'
+CAS_VERSION = '3'
 
 HONEYPOT_FIELD_NAME='miut'
 
 
 HONEYPOT_FIELD_NAME='miut'
 
@@ -24,6 +24,8 @@ GETPAID_BACKENDS = (
     'getpaid.backends.payu',
 )
 
     'getpaid.backends.payu',
 )
 
+PIWIK_URL = ''
+PIWIK_SITE_ID = 0
 
 import djcelery
 djcelery.setup_loader()
 
 import djcelery
 djcelery.setup_loader()
diff --git a/prawokultury/templates/base.html b/prawokultury/templates/base.html
index f296cb6..3da8027 100755 (executable)
--- a/prawokultury/templates/base.html
+++ b/prawokultury/templates/base.html
@@ -5,6 +5,7 @@
 {% load fnp_common menu_tags migdal_tags events_tags fnp_share fnp_lang fnp_annoy %}
 {% load compressed %}
 {% load chunks %}
 {% load fnp_common menu_tags migdal_tags events_tags fnp_share fnp_lang fnp_annoy %}
 {% load compressed %}
 {% load chunks %}
+{% load piwik_tags %}
 <html prefix="og: http://ogp.me/ns#">
     <head>
        <title>{% block "titleextra" %}{% endblock %}{% trans "Right to Culture" %}</title>
 <html prefix="og: http://ogp.me/ns#">
     <head>
        <title>{% block "titleextra" %}{% endblock %}{% trans "Right to Culture" %}</title>
@@ -33,7 +34,7 @@
         <div class="bar-right">
             <div class="org-fnp">
                 <span>{% trans "Organizer" %}</span><br/>
         <div class="bar-right">
             <div class="org-fnp">
                 <span>{% trans "Organizer" %}</span><br/>
-                <a href="http://nowoczesnapolska.org.pl">
+                <a href="//nowoczesnapolska.org.pl">
                     <img src="{% static 'img/logo-fnp.png' %}"
                         alt="{% trans "Modern Poland Foundation" %}" /></a>
             </div><div class="org-trust">
                     <img src="{% static 'img/logo-fnp.png' %}"
                         alt="{% trans "Modern Poland Foundation" %}" /></a>
             </div><div class="org-trust">
@@ -110,7 +111,7 @@
                 Nr konta: 46 10201097 0000 7502 0001 6766
             </p>
             <p class="footer-item">
                 Nr konta: 46 10201097 0000 7502 0001 6766
             </p>
             <p class="footer-item">
-                <a href="http://nowoczesnapolska.org.pl/prywatnosc/">Polityka prywatności i ciasteczka</a>
+                <a href="https://nowoczesnapolska.org.pl/prywatnosc/">Polityka prywatności i ciasteczka</a>
                 <br/><br/>
                 {% trans "If not explicitly stated otherwise, all texts are licensed under the <a href='http://creativecommons.org/licenses/by-sa/3.0/'>Creative Commons Attribution-Share Alike</a> free license." %}
             </p>
                 <br/><br/>
                 {% trans "If not explicitly stated otherwise, all texts are licensed under the <a href='http://creativecommons.org/licenses/by-sa/3.0/'>Creative Commons Attribution-Share Alike</a> free license." %}
             </p>
@@ -119,9 +120,9 @@
         </div>
 
     </div>
         </div>
 
     </div>
-    <script type="text/javascript" src="http://code.jquery.com/jquery-1.8.0.min.js" charset="utf-8"></script>
+    <script type="text/javascript" src="//code.jquery.com/jquery-1.8.0.min.js" charset="utf-8"></script>
     {% compressed_js 'base' %}
     {% compressed_js 'base' %}
-    {{ piwik_tag|safe }}
+    {% tracking_code %}
     {% block "extra_js" %}{% endblock %}
     </body>
 </html>
     {% block "extra_js" %}{% endblock %}
     </body>
 </html>
diff --git a/requirements.txt b/requirements.txt
index 8454969..5e71c9f 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,6 @@
 -i http://pypi.nowoczesnapolska.org.pl/simple
 
 -i http://pypi.nowoczesnapolska.org.pl/simple
 
-Django>=1.4,<1.5
+Django>=1.6,<1.7
 django_cas>=2.1,<2.2
 South>=0.7.4
 PIL
 django_cas>=2.1,<2.2
 South>=0.7.4
 PIL
@@ -8,26 +8,26 @@ sorl-thumbnail>=11.09,<12
 django-pagination
 django-honeypot
 
 django-pagination
 django-honeypot
 
-django-migdal>=0.3.1,<0.4
+django-migdal>=0.4,<0.5
 fnpdjango>=0.1.18,<0.2
 
 textile
 fnpdjango>=0.1.18,<0.2
 
 textile
-django-markupfield<1.1  # 1.1 wants Django-1.5
-django-gravatar
-django_comments_xtd==1.0a5
+django-markupfield>=1.2,<1.3
+django-gravatar2
+django-comments-xtd>=1.2,<1.3
 django-pipeline>=1.2,<1.3
 
 #pyScss
 #git+git://github.com/Kronuz/pyScss.git@d8f4da23a3c87696a75b3830ed4ab49b75550a93#egg=pyScss
 #TODO: pyScss support, for now just install sass
 
 django-pipeline>=1.2,<1.3
 
 #pyScss
 #git+git://github.com/Kronuz/pyScss.git@d8f4da23a3c87696a75b3830ed4ab49b75550a93#egg=pyScss
 #TODO: pyScss support, for now just install sass
 
--e git+https://github.com/toastdriven/django-haystack.git@61b377d97efd5390c60c5a37acd009b8e69eb2f3#egg=django-haystack
+django-haystack>=2.1,<2.2
 pysolr
 pysolr
-piwik
+django-piwik
 
 
-django-taggit
-django-taggit-autosuggest
+django-taggit>=0.11.2,<0.12
+django-taggit-autosuggest>=0.2.1,<0.3
 
 django-getpaid>=1.4,<1.5
 
 django-getpaid>=1.4,<1.5
-django-celery>=3.0.11
+django-celery>=3.0.11,<3.1
 django-kombu
 django-kombu