diff options
| author | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2013-05-01 21:20:55 -0400 |
|---|---|---|
| committer | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2013-05-01 21:20:55 -0400 |
| commit | 16afbbcad1e5db4896a434e1ff57a1c3ba540fd1 (patch) | |
| tree | 75bce9dd63238d566e3ce92cf1fc5da54d700b90 | |
| parent | cb01a8d0fc658821a9fcf313007da00a528c2008 (diff) | |
| parent | 12994f9a796433b048fd1fd0b1b9582bba7c0fa5 (diff) | |
| download | askbot-16afbbcad1e5db4896a434e1ff57a1c3ba540fd1.tar.gz askbot-16afbbcad1e5db4896a434e1ff57a1c3ba540fd1.tar.bz2 askbot-16afbbcad1e5db4896a434e1ff57a1c3ba540fd1.zip | |
Merge branch 'github'
| -rw-r--r-- | askbot/deps/livesettings/values.py | 1 | ||||
| -rw-r--r-- | askbot/templates/meta/bottom_scripts.html | 20 | ||||
| -rw-r--r-- | askbot/urls.py | 1 |
3 files changed, 12 insertions, 10 deletions
diff --git a/askbot/deps/livesettings/values.py b/askbot/deps/livesettings/values.py index 0f30808a..4ed2fe0e 100644 --- a/askbot/deps/livesettings/values.py +++ b/askbot/deps/livesettings/values.py @@ -1,3 +1,4 @@ +# -*- coding: utf-8 -*- """Taken and modified from the dbsettings project. http://code.google.com/p/django-values/ diff --git a/askbot/templates/meta/bottom_scripts.html b/askbot/templates/meta/bottom_scripts.html index 7af1d50d..eec4256d 100644 --- a/askbot/templates/meta/bottom_scripts.html +++ b/askbot/templates/meta/bottom_scripts.html @@ -56,16 +56,6 @@ <script type='text/javascript' src="{{"/js/jquery.history.js"|media }}"></script> <script type='text/javascript' src="{{"/js/utils.js"|media }}"></script> <script type="text/javascript" src="{{'/js/live_search.js'|media}}"></script> -{% if settings.ENABLE_MATHJAX %} - {# we don't want to load mathjax just in case, only if it is really enabled #} - <script type='text/javascript' src="{{settings.MATHJAX_BASE_URL}}/MathJax.js"> - MathJax.Hub.Config({ - extensions: ["tex2jax.js"], - jax: ["input/TeX","output/HTML-CSS"], - tex2jax: {inlineMath: [["$","$"],["\\(","\\)"]]} - }); - </script> -{% endif %} <script type="text/javascript"> /*<![CDATA[*/ $('.mceStatusbar').remove();//a hack to remove the tinyMCE status bar @@ -121,6 +111,16 @@ </script> {% endcompress %} {# stuff below should not be compressed #} +{% if settings.ENABLE_MATHJAX %} + {# we don't want to load mathjax just in case, only if it is really enabled #} + <script type='text/javascript' src="{{settings.MATHJAX_BASE_URL}}/MathJax.js"> + MathJax.Hub.Config({ + extensions: ["tex2jax.js"], + jax: ["input/TeX","output/HTML-CSS"], + tex2jax: {inlineMath: [["$","$"],["\\(","\\)"]]} + }); + </script> +{% endif %} {% if settings.USE_CUSTOM_JS %} <script src="{% url "custom_js" %}?v={{ settings.MEDIA_RESOURCE_REVISION }}" diff --git a/askbot/urls.py b/askbot/urls.py index d3426980..32867615 100644 --- a/askbot/urls.py +++ b/askbot/urls.py @@ -563,6 +563,7 @@ urlpatterns = patterns('', name = 'askbot_jsi18n' ), url('^messages/', include('group_messaging.urls')), + url('^settings/', include('livesettings.urls')), ) #todo - this url below won't work, because it is defined above |