Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #679 from MITx/feature/bridger/wiki_fixes

Browse Source 
Feature/bridger/wiki fixes
This commit is contained in:
David Ormsbee
2012-09-13 11:53:52 -07:00
parent 021f86a9a8 a3760d484d
commit 4a4b4a5c56
3 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lms/templates/main_django.html
View File

@@ -3,34 +3,37 @@
<html>
<head>
{% block title %}<title>edX</title>{% endblock %}
<link rel="icon" type="image/x-icon" href="{% static "images/favicon.ico" %}" />
{% compressed_css 'application' %}
{% compressed_js 'main_vendor' %}
{% block headextra %}{% endblock %}
{% render_block "css" %}
<meta name="path_prefix" content="{{MITX_ROOT_URL}}">
<!--[if lt IE 9]>
<script src="{% static "js/html5shiv.js" %}"></script>
<script src="${static.url('js/html5shiv.js')}"></script>
<![endif]-->
<!--[if lte IE 9]>
<%static:css group='ie-fixes'/>
<![endif]-->
<meta name="path_prefix" content="{{MITX_ROOT_URL}}">
</head>
<body class="{% block bodyclass %}{% endblock %}">
{% include "navigation.html" %}
<section class="content-wrapper">
{% block body %}{% endblock %}
{% block bodyextra %}{% endblock %}
</section>
{% include "footer.html" %}
{% compressed_js 'application' %}
{% compressed_js 'module-js' %}
{% render_block "js" %}
</body>
</html>

3
lms/templates/wiki/base.html
View File

@@ -31,6 +31,9 @@
{% addtoblock 'js' %}
{% comment %} These scripts load at the bottom of the body {% endcomment %}
<script>
window.onload = add_schematic_handler(window.onload);
</script>
<script src="{% static 'js/bootstrap-alert.js' %}"></script>
<script src="{% static 'js/bootstrap-collapse.js' %}"></script>

4
lms/templates/wiki/preview_inline.html
View File

@@ -41,6 +41,10 @@
{% compressed_js 'application' %}
{% compressed_js 'module-js' %}
<script>
window.onload = add_schematic_handler(window.onload);
</script>
{% with mathjax_mode='wiki' %}
{% include "mathjax_include.html" %}
{% endwith %}