From b4142246fe7ca5d98ba39375f22f5561fc5f1acb Mon Sep 17 00:00:00 2001 From: Bridger Maxwell Date: Thu, 13 Sep 2012 11:39:32 -0400 Subject: [PATCH 1/2] Added ie fixes stylesheet to main_django.html. Cleaned up whitespace to more closely match main.html. --- lms/templates/main_django.html | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/lms/templates/main_django.html b/lms/templates/main_django.html index 20514b4ce4..f5ee06d280 100644 --- a/lms/templates/main_django.html +++ b/lms/templates/main_django.html @@ -3,34 +3,37 @@ {% block title %}edX{% endblock %} + {% compressed_css 'application' %} {% compressed_js 'main_vendor' %} - {% block headextra %}{% endblock %} {% render_block "css" %} - + + + - {% include "navigation.html" %} -
{% block body %}{% endblock %} - {% block bodyextra %}{% endblock %}
+ {% include "footer.html" %} {% compressed_js 'application' %} {% compressed_js 'module-js' %} + {% render_block "js" %} From a3760d484ddae8d75148fc50a9219a48209782f5 Mon Sep 17 00:00:00 2001 From: Bridger Maxwell Date: Thu, 13 Sep 2012 12:38:28 -0400 Subject: [PATCH 2/2] Added call to load schematics on wiki pages. --- lms/templates/wiki/base.html | 3 +++ lms/templates/wiki/preview_inline.html | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/lms/templates/wiki/base.html b/lms/templates/wiki/base.html index 8a9686f546..22b107104b 100644 --- a/lms/templates/wiki/base.html +++ b/lms/templates/wiki/base.html @@ -31,6 +31,9 @@ {% addtoblock 'js' %} {% comment %} These scripts load at the bottom of the body {% endcomment %} + diff --git a/lms/templates/wiki/preview_inline.html b/lms/templates/wiki/preview_inline.html index a5c6668d16..2f09d21bd3 100644 --- a/lms/templates/wiki/preview_inline.html +++ b/lms/templates/wiki/preview_inline.html @@ -41,6 +41,10 @@ {% compressed_js 'application' %} {% compressed_js 'module-js' %} + + {% with mathjax_mode='wiki' %} {% include "mathjax_include.html" %} {% endwith %}