Merge branch 'master' of github.com:ASKBOT/askbot-devel

8 files changed, 54 insertions, 29 deletions

diff --git a/askbot/setup_templates/settings.py b/askbot/setup_templates/settings.py
index 3b41dfbd..7020b612 100644
--- a/askbot/setup_templates/settings.py
+++ b/askbot/setup_templates/settings.py
@@ -170,6 +170,7 @@ INSTALLED_APPS = (
     'django.contrib.humanize',
     'django.contrib.sitemaps',
     'django.contrib.messages',
+    'compressor',
     #'debug_toolbar',
     #'haystack',
     'askbot',
@@ -297,3 +298,12 @@ GROUP_MESSAGING = {
 }
 
 ASKBOT_MULTILINGUAL = False
+
+ASKBOT_CSS_DEVEL = False
+if 'ASKBOT_CSS_DEVEL' in locals() and ASKBOT_CSS_DEVEL == True:
+    COMPRESS_PRECOMPILERS = (
+        ('text/less', 'lessc {infile} {outfile}'),
+    )
+
+COMPRESS_JS_FILTERS = []
+JINJA2_EXTENSIONS = ('compressor.contrib.jinja2ext.CompressorExtension',)
diff --git a/askbot/setup_templates/settings.py.mustache b/askbot/setup_templates/settings.py.mustache
index 61ee5993..a879a5be 100644
--- a/askbot/setup_templates/settings.py.mustache
+++ b/askbot/setup_templates/settings.py.mustache
@@ -167,6 +167,7 @@ INSTALLED_APPS = (
     #'debug_toolbar',
     #Optional, to enable haystack search
     #'haystack',
+    'compressor',
     'askbot',
     'askbot.deps.django_authopenid',
     #'askbot.importers.stackexchange', #se loader
@@ -241,6 +242,11 @@ STATIC_ROOT = os.path.join(PROJECT_ROOT, "static")
 STATICFILES_DIRS = (
     ('default/media', os.path.join(ASKBOT_ROOT, 'media')),
 )
+STATICFILES_FINDERS = (
+    'django.contrib.staticfiles.finders.FileSystemFinder',
+    'django.contrib.staticfiles.finders.AppDirectoriesFinder',
+    'compressor.finders.CompressorFinder',
+)
 
 RECAPTCHA_USE_SSL = True
 
@@ -288,3 +294,12 @@ GROUP_MESSAGING = {
 }
 
 ASKBOT_MULTILINGUAL = False
+
+ASKBOT_CSS_DEVEL = False
+if 'ASKBOT_CSS_DEVEL' in locals() and ASKBOT_CSS_DEVEL == True:
+    COMPRESS_PRECOMPILERS = (
+        ('text/less', 'lessc {infile} {outfile}'),
+    )
+
+COMPRESS_JS_FILTERS = []
+JINJA2_EXTENSIONS = ('compressor.contrib.jinja2ext.CompressorExtension',)
diff --git a/askbot/startup_procedures.py b/askbot/startup_procedures.py
index 7d2e0216..31bc5c3d 100644
--- a/askbot/startup_procedures.py
+++ b/askbot/startup_procedures.py
@@ -309,22 +309,24 @@ def test_celery():
 
 def test_compressor():
     """test settings for django compressor"""
-    precompilers = getattr(django_settings, 'COMPRESS_PRECOMPILERS', None)
     errors = list()
-    lessc_item = ('text/less', 'lessc {infile} {outfile}')
-    if precompilers is None:
-        errors.append(
-            'Please add to your settings.py file: \n'
-            'COMPRESS_PRECOMPILERS = (\n'
-            "    ('%s', '%s'),\n"
-            ')' % lessc_item
-        )
-    else:
-        if lessc_item not in precompilers:
+
+    if getattr(django_settings, 'ASKBOT_CSS_DEVEL', False):
+        precompilers = getattr(django_settings, 'COMPRESS_PRECOMPILERS', None)
+        lessc_item = ('text/less', 'lessc {infile} {outfile}')
+        if precompilers is None:
             errors.append(
-                'Please add to the COMPRESS_PRECOMPILERS the following item:\n'
-                "('%s', '%s')," % lessc_item
+                'Please add to your settings.py file: \n'
+                'COMPRESS_PRECOMPILERS = (\n'
+                "    ('%s', '%s'),\n"
+                ')' % lessc_item
             )
+        else:
+            if lessc_item not in precompilers:
+                errors.append(
+                    'Please add to the COMPRESS_PRECOMPILERS the following item:\n'
+                    "('%s', '%s')," % lessc_item
+                )
 
     js_filters = getattr(django_settings, 'COMPRESS_JS_FILTERS', [])
     if len(js_filters) > 0:
diff --git a/askbot/templates/question/content.html b/askbot/templates/question/content.html
index 467f0217..82185919 100644
--- a/askbot/templates/question/content.html
+++ b/askbot/templates/question/content.html
@@ -20,8 +20,6 @@
 
     {{ macros.paginator(paginator_context, anchor='#sort-top') }}
     <div class="clean"></div>
-{% else %}
-    {% include "question/sharing_prompt_phrase.html" %}
 {% endif %}
 
 {# buttons below cannot be cached yet #}
diff --git a/askbot/templates/question/new_answer_form.html b/askbot/templates/question/new_answer_form.html
index f9559c4d..2235f4f4 100644
--- a/askbot/templates/question/new_answer_form.html
+++ b/askbot/templates/question/new_answer_form.html
@@ -3,9 +3,6 @@
         action="{% url answer question.id %}"
         method="post"
         >{% csrf_token %}
-    {# ==== START: question/subscribe_by_email_prompt.html ==== #}
-    {% include "question/subscribe_by_email_prompt.html" %}
-    {# ==== END: question/subscribe_by_email_prompt.html ==== #}
     <div style="clear:both"></div>
     {% if request.user.is_anonymous() and settings.ALLOW_POSTING_BEFORE_LOGGING_IN == False %}
         {% if not thread.closed %}
diff --git a/askbot/templates/question/sharing_prompt_phrase.html b/askbot/templates/question/sharing_prompt_phrase.html
deleted file mode 100644
index 2e68d1f3..00000000
--- a/askbot/templates/question/sharing_prompt_phrase.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{% set question_url=(settings.APP_URL|strip_path + question.get_absolute_url())|urlencode %}
-<h2 class="share-question">{% trans %}Know someone who can answer?  Share a <a href="{{ question_url }}">link</a> to this question via{% endtrans %}
-    {% if settings.ENABLE_SHARING_TWITTER %}{{ macros.share(site = 'twitter', site_label = 'Twitter') }},{% endif %}
-    {% if settings.ENABLE_SHARING_FACEBOOK %}{{ macros.share(site = 'facebook', site_label = 'Facebook') }},{% endif %}
-    {% if settings.ENABLE_SHARING_LINKEDIN %}{{ macros.share(site = 'linkedin', site_label = 'LinkedIn') }},{% endif %}
-    {% if settings.ENABLE_SHARING_IDENTICA %}{{ macros.share(site = 'identica', site_label = 'Identi.ca') }},{% endif %}
-    {%- if settings.ENABLE_SHARING_TWITTER or settings.ENABLE_SHARING_FACEBOOK or settings.ENABLE_SHARING_LINKEDIN or settings.ENABLE_SHARING_IDENTICA -%}
-        {% trans %} or{% endtrans %}
-    {% endif %}
-    <a href="mailto:?subject={{ settings.APP_SHORT_NAME|urlencode }}&amp;body={{ question_url }}">{% trans %}email{% endtrans %}</a>.
-</h2>
diff --git a/askbot/templates/widgets/modal_menu.html b/askbot/templates/widgets/modal_menu.html
new file mode 100644
index 00000000..186a8fbc
--- /dev/null
+++ b/askbot/templates/widgets/modal_menu.html
@@ -0,0 +1,9 @@
+<div class="modal {% block modal_class %}{% endblock %}" style="display:none">
+    <div class="modal-header">
+        <a class="close" data-dismiss="modal">x</a>
+        <h3>{% block modal_title %}{% endblock %}</h3>
+    </div>
+    <div class="modal-body">{% block modal_body %}{% endblock %}</div>
+    <div class="modal-footer">
+    </div>
+</div>
diff --git a/askbot/templatetags/extra_filters_jinja.py b/askbot/templatetags/extra_filters_jinja.py
index 6fd12aab..a8681f5c 100644
--- a/askbot/templatetags/extra_filters_jinja.py
+++ b/askbot/templatetags/extra_filters_jinja.py
@@ -11,6 +11,7 @@ from django.contrib.humanize.templatetags import humanize
 from django.template import defaultfilters
 from django.core.urlresolvers import reverse, resolve
 from django.http import Http404
+from django.utils import simplejson
 from askbot import exceptions as askbot_exceptions
 from askbot.conf import settings as askbot_settings
 from django.conf import settings as django_settings
@@ -45,6 +46,10 @@ def as_js_bool(some_object):
     return 'false'
 
 @register.filter
+def as_json(data):
+    return simplejson.dumps(data)
+
+@register.filter
 def is_current_language(lang):
     return lang == django_get_language()