From 18dc689d4d9305eebaaebd984608745c8ff7a405 Mon Sep 17 00:00:00 2001
From: Kyle Fiedler <kfiedler@thoughtbot.com>
Date: Tue, 24 Jul 2012 16:36:29 -0400
Subject: [PATCH] Added fix for where the course.css is being brought in

---
 lms/templates/courseware.html                 | 4 ++++
 lms/templates/info.html                       | 6 ++++++
 lms/templates/main.html                       | 1 -
 lms/templates/profile.html                    | 4 ++++
 lms/templates/simplewiki/simplewiki_base.html | 6 ++++++
 lms/templates/staticbook.html                 | 5 +++++
 6 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/lms/templates/courseware.html b/lms/templates/courseware.html
index 93595a2098..c1658b3dee 100644
--- a/lms/templates/courseware.html
+++ b/lms/templates/courseware.html
@@ -3,6 +3,10 @@
 <%block name="bodyclass">courseware</%block>
 <%block name="title"><title>Courseware – MITx 6.002x</title></%block>
 
+<%block name="headextra">
+  <%static:css group='course'/>
+</%block>
+
 <%block name="js_extra">
   <script type="text/javascript" src="${static.url('js/vendor/flot/jquery.flot.js')}"></script>
 
diff --git a/lms/templates/info.html b/lms/templates/info.html
index 122a185f3a..9365b9e76a 100644
--- a/lms/templates/info.html
+++ b/lms/templates/info.html
@@ -1,4 +1,10 @@
 <%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'" />
 <%! 
   from courseware.courses import get_course_info_section
diff --git a/lms/templates/main.html b/lms/templates/main.html
index c9b74c669c..7ef8960970 100644
--- a/lms/templates/main.html
+++ b/lms/templates/main.html
@@ -7,7 +7,6 @@
   <link rel="icon" type="image/x-icon" href="${static.url('images/favicon.ico')}" />
 
   <%static:css group='application'/>
-  <%static:css group='course'/>
 
   <!--[if lte IE 9]>
   <%static:css group='ie-fixes'/>
diff --git a/lms/templates/profile.html b/lms/templates/profile.html
index 2d54cddb13..1e3bde5969 100644
--- a/lms/templates/profile.html
+++ b/lms/templates/profile.html
@@ -1,5 +1,9 @@
 <%inherit file="main.html" />
 <%namespace name='static' file='static_content.html'/>
+
+<%block name="headextra">
+  <%static:css group='course'/>
+</%block>
 <%namespace name="profile_graphs" file="profile_graphs.js"/>
 
 <%block name="title"><title>Profile - edX 6.002x</title></%block>
diff --git a/lms/templates/simplewiki/simplewiki_base.html b/lms/templates/simplewiki/simplewiki_base.html
index 37f6afc75a..6306464467 100644
--- a/lms/templates/simplewiki/simplewiki_base.html
+++ b/lms/templates/simplewiki/simplewiki_base.html
@@ -3,6 +3,10 @@
 <%inherit file="../main.html"/>
 <%namespace name='static' file='../static_content.html'/>
 
+<%block name="headextra">
+  <%static:css group='course'/>
+</%block>
+
 <%!
   from django.core.urlresolvers import reverse
   from simplewiki.views import wiki_reverse
@@ -78,6 +82,7 @@
 <%include file="../course_navigation.html" args="active_page='wiki'" />
 %endif
 
+<section class="container">
 <section class="main-content">
   <div class="wiki-wrapper">
     <%block name="wiki_panel">
@@ -158,4 +163,5 @@
   </div>
 </section>
 
+</section>
 </%block>
diff --git a/lms/templates/staticbook.html b/lms/templates/staticbook.html
index bed80f8c87..c90170c3f3 100644
--- a/lms/templates/staticbook.html
+++ b/lms/templates/staticbook.html
@@ -1,6 +1,11 @@
 <%inherit file="main.html" />
+<%namespace name='static' file='static_content.html'/>
 <%block name="title"><title>Textbook – MITx 6.002x</title></%block>
 
+<%block name="headextra">
+<%static:css group='course'/>
+</%block>
+
 <%block name="js_extra">
 <script>
 var page=${ page };