Fixed broken css after minification. Disable minification,

improve settings to support newer version of compressor.

* askbot/deployment/templates/settings_py.jinja2,
  askbot/setup_templates/settings.py.jinja2,
  testproject/testproject/settings.py;
  - migrated from COMPRESS_JS_FILTERS to COMPRESS_FILTERS
* askbot/jinja2/ask/index.html:
  - highlightSyntax -> highlightAll renamed at call sites
* deleted askbot/media/css/prettify.css
* deleted askbot/media/jslib/prettify.js b/askbot/media/jslib/prettify.js
* askbot/startup_procedures.py:
  - error when COMPRESS_JS_FILTERS is used require to migrate to COMPRESS_FILTERS
  - if COMPRESS_FILTERS['js'] is not empty - error out - we do not support minification yet

Author: evgenyfadeev

askbot/deployment/templates/settings_py.jinja2

@@ -213,7 +213,13 @@ if 'ASKBOT_CSS_DEVEL' in locals() and ASKBOT_CSS_DEVEL == True:
         ('text/less', 'lessc {infile} {outfile}'),
     )
 
-COMPRESS_JS_FILTERS = []
+COMPRESS_FILTERS = {
+    'css': [
+        'compressor.filters.css_default.CssAbsoluteFilter',
+        'compressor.filters.cssmin.rCSSMinFilter',
+    ],
+    'js': [],
+}
 COMPRESS_PARSER = 'compressor.parser.HtmlParser'
 JINJA2_EXTENSIONS = ('compressor.contrib.jinja2ext.CompressorExtension',)
 JINJA2_TEMPLATES = ('captcha',) # FIXME: unused but checked in startup_procedures

askbot/jinja2/ask/index.html

@@ -81,9 +81,9 @@
         highlight: false,
         wait: 3000,
         captureLength: 5,
-        callback: highlightSyntax
+        callback: function() { hljs.highlightAll(); }
       });
-      highlightSyntax();
+      hljs.highlightAll();
 
       if (askbot['data']['userIsAuthenticated']) {
         var draftHandler = new DraftQuestion();

askbot/media/css/prettify.css

@@ -342,7 +342,13 @@ if 'ASKBOT_CSS_DEVEL' in locals() and ASKBOT_CSS_DEVEL == True:
         ('text/less', 'lessc {infile} {outfile}'),
     )
 
-COMPRESS_JS_FILTERS = []
+COMPRESS_FILTERS = {
+    'css': [
+        'compressor.filters.css_default.CssAbsoluteFilter',
+        'compressor.filters.cssmin.rCSSMinFilter',
+    ],
+    'js': [],
+}
 COMPRESS_PARSER = 'compressor.parser.HtmlParser'
 JINJA2_EXTENSIONS = ('compressor.contrib.jinja2ext.CompressorExtension',)
 JINJA2_TEMPLATES = ('captcha',) # FIXME: unused but checked in startup_procedures

askbot/media/jslib/prettify.js

@@ -374,11 +374,28 @@ def test_compressor():
     """test settings for django compressor"""
     errors = list()
 
-    js_filters = getattr(django_settings, 'COMPRESS_JS_FILTERS', [])
+    new_filters_msg = (
+        'Please replace COMPRESS_JS_FILTERS with COMPRESS_FILTERS in your settings.py:\n'
+        "COMPRESS_FILTERS = {\n"
+        "    'css': [\n"
+        "        'compressor.filters.css_default.CssAbsoluteFilter',\n"
+        "        'compressor.filters.cssmin.rCSSMinFilter',\n"
+        "    ],\n"
+        "    'js': [],\n"
+        "}"
+    )
+
+    if hasattr(django_settings, 'COMPRESS_JS_FILTERS'):
+        errors.append(
+            'COMPRESS_JS_FILTERS is deprecated and ignored by django-compressor.\n'
+            + new_filters_msg
+        )
+
+    compress_filters = getattr(django_settings, 'COMPRESS_FILTERS', {})
+    js_filters = compress_filters.get('js', [])
     if js_filters:
         errors.append(
-            'Askbot does not yet support js minification, please add to your settings.py:\n'
-            'COMPRESS_JS_FILTERS = []'
+            'Askbot does not yet support js minification.\n' + new_filters_msg
         )
 
     if 'compressor' not in django_settings.INSTALLED_APPS:

askbot/setup_templates/settings.py.jinja2

@@ -320,7 +320,13 @@
         ('text/less', 'lessc {infile} {outfile}'),
     )
 
-COMPRESS_JS_FILTERS = []
+COMPRESS_FILTERS = {
+    'css': [
+        'compressor.filters.css_default.CssAbsoluteFilter',
+        'compressor.filters.cssmin.rCSSMinFilter',
+    ],
+    'js': [],
+}
 COMPRESS_PARSER = 'compressor.parser.HtmlParser'
 JINJA2_EXTENSIONS = ('compressor.contrib.jinja2ext.CompressorExtension',)
 JINJA2_TEMPLATES = ('captcha',)