From 3b37f10e4286b65d1f7faa78970f7d7151bde6b1 Mon Sep 17 00:00:00 2001
From: Matthew Mongeau <halogenandtoast@gmail.com>
Date: Thu, 14 Jun 2012 15:02:29 -0400
Subject: [PATCH] Split course navigation out

---
 lms/templates/course_info.html     | 6 ++----
 lms/templates/courseware.html      | 2 +-
 lms/templates/info.html            | 2 +-
 lms/templates/simplewiki_base.html | 2 +-
 lms/templates/staticbook.html      | 2 +-
 5 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/lms/templates/course_info.html b/lms/templates/course_info.html
index 17a97d11df..fcfe4102a4 100644
--- a/lms/templates/course_info.html
+++ b/lms/templates/course_info.html
@@ -1,12 +1,10 @@
-<%inherit file="main.html" />
-<%include file="guest_navigation.html" />
-
 <%namespace name='static' file='static_content.html'/>
 <%block name="js_extra">
-  <script src="${static.url('js/my_courses_dropdown.js')}"></script>
   <script src="${static.url('js/course_info.js')}"></script>
 </%block>
 
+<%inherit file="main.html" />
+
 <section class="container">
   <section class="course-info">
     <header>
diff --git a/lms/templates/courseware.html b/lms/templates/courseware.html
index ba3be46f3d..86e464e330 100644
--- a/lms/templates/courseware.html
+++ b/lms/templates/courseware.html
@@ -14,7 +14,7 @@
 </script>
 </%block>
 
-<%include file="navigation.html" args="active_page='courseware'" />
+<%include file="course_navigation.html" args="active_page='courseware'" />
 
 <section class="container">
   <div class="course-wrapper">
diff --git a/lms/templates/info.html b/lms/templates/info.html
index 66ff7ef9d3..97bf413638 100644
--- a/lms/templates/info.html
+++ b/lms/templates/info.html
@@ -1,5 +1,5 @@
 <%inherit file="main.html" />
-<%include file="navigation.html" args="active_page='info'" />
+<%include file="course_navigation.html" args="active_page='info'" />
 
 <section class="container">
   <section class="course-content">
diff --git a/lms/templates/simplewiki_base.html b/lms/templates/simplewiki_base.html
index ba34ada8e1..6a9be3bf08 100644
--- a/lms/templates/simplewiki_base.html
+++ b/lms/templates/simplewiki_base.html
@@ -69,7 +69,7 @@
 
 <%block name="bodyextra">
 
-<%include file="navigation.html" args="active_page='wiki'" />
+<%include file="course_navigation.html" args="active_page='wiki'" />
 
 <section class="main-content">
   <div class="wiki-wrapper">
diff --git a/lms/templates/staticbook.html b/lms/templates/staticbook.html
index 0e510a486c..cc95a49644 100644
--- a/lms/templates/staticbook.html
+++ b/lms/templates/staticbook.html
@@ -54,7 +54,7 @@ $("#open_close_accordion a").click(function(){
 </script>
 </%block>
 
-<%include file="navigation.html" args="active_page='book'" />
+<%include file="course_navigation.html" args="active_page='book'" />
 
 <section class="main-content">
   <div class="book-wrapper">