Move files.

lms/djangoapps/staticbook/views.py

@@ -7,7 +7,7 @@ from courseware.courses import check_course
 @login_required
 def index(request, course_id, page=0):
     course = check_course(course_id)
-    return render_to_response('staticbook.html', {'page': int(page), 'course': course})
+    return render_to_response('staticbook/staticbook.html', {'page': int(page), 'course': course})
 
 
 def index_shifted(request, course_id, page):

lms/templates/courseware/course_about.html

@@ -158,4 +158,4 @@
 %endif
 
 
-<%include file="../video_modal.html" />
+<%include file="../common/video_modal.html" />

lms/templates/courseware-error.html → lms/templates/courseware/courseware-error.html

-<%inherit file="main.html" />
+<%inherit file="../common/main.html" />
 <%block name="bodyclass">courseware</%block>
 <%block name="title"><title>Courseware – edX</title></%block>
 
-<%include file="course_navigation.html" args="active_page='courseware'" />
+<%include file="../common/course_navigation.html" args="active_page='courseware'" />
 
 <section class="main-content">
   <section class="outside-app">

lms/templates/courseware/courseware.html

-<%inherit file="main.html" />
-<%namespace name='static' file='static_content.html'/>
+<%inherit file="../common/main.html" />
+<%namespace name='static' file='../static_content.html'/>
 <%block name="bodyclass">courseware</%block>
 <%block name="title"><title>Courseware – MITx 6.002x</title></%block>
 
@@ -34,7 +34,7 @@
   </script>
 </%block>
 
-<%include file="course_navigation.html" args="active_page='courseware'" />
+<%include file="../common/course_navigation.html" args="active_page='courseware'" />
 
 <section class="container">
   <div class="course-wrapper">

lms/templates/courseware/info.html

-<%inherit file="main.html" />
-<%include file="course_navigation.html" args="active_page='info'" />
+<%inherit file="../common/main.html" />
+<%include file="../common/course_navigation.html" args="active_page='info'" />
 <%! 
   from courseware.courses import get_course_info_section
 %>

lms/templates/mitxhome.html

-<%inherit file="main.html" />
-
-<%block name="js_extra">
-<script>
-
-$(document).ready(function(){
-   //if(!page) {
-   //  cookie_page = $.cookie("book_page");
-   //  if(cookie_page) {
-   //    goto_page(cookie_page);
-   //  }
-   //}
-
-   $(".handouts ol").treeview({collapsed:true, unique:true/*, cookieId: "treeview-book-nav", persist: "cookie"*/});
-});
-
-</script>
-</%block>
-
-<%block name="title"><title>MITx Home</title></%block>
-
-<%include file="navigation.html" args="active_page='info'" />
-
-<section class="main-content">
-  <div class="info-wrapper">
-    <section class="updates">
-   <h2>Welcome to MITx</h2>
-   <hr width="100%">
-   <h3>Courses available:</h3>
-    <ul>
-      % for coursename, info in courseinfo.items():
-        % if info['active']:
-          <li><a href=${ MITX_ROOT_URL }/courseware/${coursename}/>${info['title']} (${coursename})</a></li>
-	% endif
-      % endfor
-  </ul>
-  </section>
-</div>
-</section>

lms/templates/simplewiki/simplewiki_base.html

@@ -75,7 +75,7 @@
 <%block name="bodyextra">
 
 %if course:
-<%include file="../course_navigation.html" args="active_page='wiki'" />
+<%include file="../common/course_navigation.html" args="active_page='wiki'" />
 %endif
 
 <section class="main-content">

lms/templates/staticbook.html → lms/templates/staticbook/staticbook.html

-<%inherit file="main.html" />
+<%inherit file="../common/main.html" />
 <%block name="title"><title>Textbook – MITx 6.002x</title></%block>
 
 <%block name="js_extra">
@@ -54,7 +54,7 @@ $("#open_close_accordion a").click(function(){
 </script>
 </%block>
 
-<%include file="course_navigation.html" args="active_page='book'" />
+<%include file="../common/course_navigation.html" args="active_page='book'" />
 
 <section class="main-content">
   <div class="book-wrapper">

lms/templates/using.html

-<h1>Using the system</h1>
-
-<ul>
-  <li>
-    <p>During video playback, use the subtitles and the scroll bar to navigate. Clicking the subtitles is a fast way to skip forwards and backwards by small amounts.</p>
-  </li>
-
-  <li>
-    <p>If you are on a low-resolution display, the left navigation bar can be hidden by clicking on the set of three left arrows next to it.</p>
-  </li>
-
-  <li>
-    <p>If you need bigger or smaller fonts, use your browsers settings to scale them up or down. Under Google Chrome, this is done by pressing ctrl-plus, or ctrl-minus at the same time.</p>
-  </li>
-</ul>