From: Radek Czajka <radekczajka@nowoczesnapolska.org.pl>
Date: Fri, 31 Jan 2014 14:51:59 +0000 (+0100)
Subject: Merge branch 'leveling'
X-Git-Url: https://git.mdrn.pl/edumed.git/commitdiff_plain/118fd7ac41a586001b4c8f45c149731cc9a2e586?ds=sidebyside;hp=-c

Merge branch 'leveling'

Conflicts:
	edumed/settings.d/30-apps.py
---

118fd7ac41a586001b4c8f45c149731cc9a2e586
diff --combined edumed/settings.d/30-apps.py
index f7defa1,ee80ab7..d9eb0e6
--- a/edumed/settings.d/30-apps.py
+++ b/edumed/settings.d/30-apps.py
@@@ -3,13 -3,13 +3,14 @@@ INSTALLED_APPS = 
      'curriculum',
      'catalogue',
      'comment',
 +    'wtem',
+     'publishers',
  
      'fnpdjango',
      'south',
      'pipeline',
      # Disable, if not using Piwik.
-     'piwik.django',
+     'piwik',
      # Disable, if not using CAS.
      'honeypot',
      'django_cas',
diff --combined edumed/settings.d/40-middleware.py
index 4dcd91d,bb7401f..6175197
--- a/edumed/settings.d/40-middleware.py
+++ b/edumed/settings.d/40-middleware.py
@@@ -15,8 -15,6 +15,6 @@@ MIDDLEWARE_CLASSES = tuple(x for x in 
              if "django_cas" in INSTALLED_APPS else None,
      'django.contrib.messages.middleware.MessageMiddleware'
              if "django.contrib.messages" in INSTALLED_APPS else None,
-     'piwik.django.middleware.PiwikMiddleware'
-             if "piwik.django" in INSTALLED_APPS else None,
      # Uncomment the next line for simple clickjacking protection:
      # 'django.middleware.clickjacking.XFrameOptionsMiddleware',
      'pagination.middleware.PaginationMiddleware'
@@@ -24,6 -22,5 +22,6 @@@
      'django.middleware.cache.FetchFromCacheMiddleware',
      'fnpdjango.middleware.SetRemoteAddrFromXRealIP',
      'pybb.middleware.PybbMiddleware',
 -    'forum.middleware.ForumMiddleware'
 +    'forum.middleware.ForumMiddleware',
 +    'wtem.middleware.ThreadLocalMiddleware'
  ) if x is not None)
diff --combined edumed/settings.d/50-static.py
index a23551f,7cdd26c..40e38c3
--- a/edumed/settings.d/50-static.py
+++ b/edumed/settings.d/50-static.py
@@@ -39,8 -39,10 +39,10 @@@ PIPELINE_JS = 
              'catalogue/js/jquery.cycle.all.js',
              'jquery/colorbox/jquery.colorbox-min.js',
              'jquery/colorbox/jquery.colorbox-pl.js',
+             'catalogue/js/carousel.js',
              'catalogue/js/edumed.js',
              'catalogue/js/lesson.js',
+             'catalogue/js/lesson-list.js',
              'sponsors/js/sponsors.js',
              'curriculum/curriculum.js',
              'js/formset.js',
@@@ -48,15 -50,6 +50,15 @@@
          ),
          'output_filename': 'compressed/base.js',
      },
 +    'wtem': {
 +        'source_filenames': (
 +            'catalogue/js/jquery-ui-1.10.0.custom.js',
 +            'wtem/edumed.js',
 +            'wtem/wtem.js',
 +            'wtem/json2.js'
 +        ),
 +        'output_filename': 'compressed/wtem.js'
 +    },
  }
  
  PIPELINE_COMPILERS = (
diff --combined edumed/templates/base_super.html
index 8f2886b,9607254..b3ba9d8
--- a/edumed/templates/base_super.html
+++ b/edumed/templates/base_super.html
@@@ -3,6 -3,7 +3,7 @@@
  {% load fnp_common fnp_share fnp_lang macros %}
  {% load compressed static %}
  {% load subdomainurls %}
+ {% load piwik_tags %}
  
  {% macro title %}{% block title %}{% endblock %}{% endmacro %}
  {% macro site_name %}Edukacja medialna{% endmacro %}
@@@ -96,7 -97,8 +97,7 @@@
          </footer>
  
      <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js"></script>
 -    {% compressed_js 'base' %}
      {% block extra_script %}{% endblock %}
-     {{ piwik_tag|safe }}
+     {% tracking_code %}
      </body>
  </html>
diff --combined requirements.txt
index 77b381d,eea64b5..50b0286
--- a/requirements.txt
+++ b/requirements.txt
@@@ -1,15 -1,15 +1,15 @@@
  -i http://pypi.nowoczesnapolska.org.pl/simple
  
- Django>=1.5,<1.6
+ Django>=1.6,<1.7
  South>=0.7.4
  django-pipeline>=1.2,<1.3
  python-memcached
- piwik
+ django-piwik
  #pyScss
  #git+git://github.com/Kronuz/pyScss.git@d8f4da23a3c87696a75b3830ed4ab49b75550a93#egg=pyScss
  #TODO: pyScss support, for now just install sass
  
 -django-jsonfield>=0.9,<0.10
 +jsonfield>=0.9,<0.10
  
  django_cas>=2.1,<2.2
  fnpdjango>=0.1.14,<0.2