Commit 18dc689d by Kyle Fiedler

Added fix for where the course.css is being brought in

parent 00596d2f
...@@ -3,6 +3,10 @@ ...@@ -3,6 +3,10 @@
<%block name="bodyclass">courseware</%block> <%block name="bodyclass">courseware</%block>
<%block name="title"><title>Courseware – MITx 6.002x</title></%block> <%block name="title"><title>Courseware – MITx 6.002x</title></%block>
<%block name="headextra">
<%static:css group='course'/>
</%block>
<%block name="js_extra"> <%block name="js_extra">
<script type="text/javascript" src="${static.url('js/vendor/flot/jquery.flot.js')}"></script> <script type="text/javascript" src="${static.url('js/vendor/flot/jquery.flot.js')}"></script>
......
<%inherit file="main.html" /> <%inherit file="main.html" />
<%namespace name='static' file='static_content.html'/>
<%block name="headextra">
<%static:css group='course'/>
</%block>
<%include file="course_navigation.html" args="active_page='info'" /> <%include file="course_navigation.html" args="active_page='info'" />
<%! <%!
from courseware.courses import get_course_info_section from courseware.courses import get_course_info_section
......
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
<link rel="icon" type="image/x-icon" href="${static.url('images/favicon.ico')}" /> <link rel="icon" type="image/x-icon" href="${static.url('images/favicon.ico')}" />
<%static:css group='application'/> <%static:css group='application'/>
<%static:css group='course'/>
<!--[if lte IE 9]> <!--[if lte IE 9]>
<%static:css group='ie-fixes'/> <%static:css group='ie-fixes'/>
......
<%inherit file="main.html" /> <%inherit file="main.html" />
<%namespace name='static' file='static_content.html'/> <%namespace name='static' file='static_content.html'/>
<%block name="headextra">
<%static:css group='course'/>
</%block>
<%namespace name="profile_graphs" file="profile_graphs.js"/> <%namespace name="profile_graphs" file="profile_graphs.js"/>
<%block name="title"><title>Profile - edX 6.002x</title></%block> <%block name="title"><title>Profile - edX 6.002x</title></%block>
......
...@@ -3,6 +3,10 @@ ...@@ -3,6 +3,10 @@
<%inherit file="../main.html"/> <%inherit file="../main.html"/>
<%namespace name='static' file='../static_content.html'/> <%namespace name='static' file='../static_content.html'/>
<%block name="headextra">
<%static:css group='course'/>
</%block>
<%! <%!
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
from simplewiki.views import wiki_reverse from simplewiki.views import wiki_reverse
...@@ -78,6 +82,7 @@ ...@@ -78,6 +82,7 @@
<%include file="../course_navigation.html" args="active_page='wiki'" /> <%include file="../course_navigation.html" args="active_page='wiki'" />
%endif %endif
<section class="container">
<section class="main-content"> <section class="main-content">
<div class="wiki-wrapper"> <div class="wiki-wrapper">
<%block name="wiki_panel"> <%block name="wiki_panel">
...@@ -158,4 +163,5 @@ ...@@ -158,4 +163,5 @@
</div> </div>
</section> </section>
</section>
</%block> </%block>
<%inherit file="main.html" /> <%inherit file="main.html" />
<%namespace name='static' file='static_content.html'/>
<%block name="title"><title>Textbook – MITx 6.002x</title></%block> <%block name="title"><title>Textbook – MITx 6.002x</title></%block>
<%block name="headextra">
<%static:css group='course'/>
</%block>
<%block name="js_extra"> <%block name="js_extra">
<script> <script>
var page=${ page }; var page=${ page };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment