local merge with master - finished

cms/templates/overview.html

@@ -13,17 +13,17 @@
 <%namespace name="units" file="widgets/units.html" />
 
 <%block name="jsextra">
-<link rel="stylesheet" type="text/css" href="${static.url('js/vendor/timepicker/jquery.timepicker.css')}" />
-<script src="${static.url('js/vendor/timepicker/jquery.timepicker.js')}"></script>
-<script src="${static.url('js/vendor/timepicker/datepair.js')}"></script>
-<script src="${static.url('js/vendor/date.js')}"></script>
-<script type="text/javascript" src="${static.url('js/models/course_relative.js')}"></script>
-<script type="text/javascript" src="${static.url('js/views/grader-select-view.js')}"></script>
-<script type="text/javascript" src="${static.url('js/views/overview.js')}"></script>
-<script type="text/javascript" src="${static.url('js/models/settings/course_grading_policy.js')}"></script>
-
-<script type="text/javascript">
-$(document).ready(function(){
+  <link rel="stylesheet" type="text/css" href="${static.url('js/vendor/timepicker/jquery.timepicker.css')}" />
+  <script src="${static.url('js/vendor/timepicker/jquery.timepicker.js')}"></script>
+  <script src="${static.url('js/vendor/timepicker/datepair.js')}"></script>
+  <script src="${static.url('js/vendor/date.js')}"></script>
+  <script type="text/javascript" src="${static.url('js/models/course_relative.js')}"></script>
+  <script type="text/javascript" src="${static.url('js/views/grader-select-view.js')}"></script>
+  <script type="text/javascript" src="${static.url('js/views/overview.js')}"></script>
+  <script type="text/javascript" src="${static.url('js/models/settings/course_grading_policy.js')}"></script>
+
+  <script type="text/javascript">
+  $(document).ready(function(){
     // TODO figure out whether these should be in window or someplace else or whether they're only needed as local vars
     // I believe that current (New Section/New Subsection) cause full page reloads which means these aren't needed globally
     // but we really should change that behavior.
@@ -39,13 +39,13 @@ $(document).ready(function(){
             graders : window.graderTypes
         });
     });
-});
+  });
   
-</script>
+  </script>
 </%block>
 
 <%block name="header_extras">
-<script type="text/template" id="new-section-template">
+  <script type="text/template" id="new-section-template">
     <section class="courseware-section branch new-section">
       <header>
         <a href="#"  data-tooltip="Collapse/expand this section" class="expand-collapse-icon collapse"></a>
@@ -59,9 +59,9 @@ $(document).ready(function(){
         </div>
       </header>
     </section>
-</script>
+  </script>
 
-<script type="text/template" id="blank-slate-template">
+  <script type="text/template" id="blank-slate-template">
     <section class="courseware-section branch new-section">
       <header>
         <a href="#"  data-tooltip="Collapse/expand this section" class="expand-collapse-icon collapse"></a>
@@ -80,9 +80,9 @@ $(document).ready(function(){
         </div>
       </header>
     </section>
-</script>
+  </script>
 
-<script type="text/template" id="new-subsection-template">
+  <script type="text/template" id="new-subsection-template">
     <li class="branch collapsed">
       <div class="section-item editing">
         <form class="new-subsection-form">
@@ -102,11 +102,11 @@ $(document).ready(function(){
         </li>
       </ol>
     </li>
-</script>
+  </script>
 </%block>
 
 <%block name="content">
-<div class="edit-subsection-publish-settings">
+  <div class="edit-subsection-publish-settings">
     <div class="settings">
       <h3>Section Release Date</h3>
       <div class="picker datepair">
@@ -118,9 +118,9 @@ $(document).ready(function(){
       </div>
       <a href="#" class="save-button">Save</a><a href="#" class="cancel-button">Cancel</a>
     </div>
-</div>
+  </div>
 
-<div class="wrapper-mast wrapper">
+  <div class="wrapper-mast wrapper">
     <header class="mast has-actions has-subtitle">
       <div class="title">
         <span class="title-sub">Course Content</span>
@@ -142,15 +142,16 @@ $(document).ready(function(){
         </ul>
       </nav>
     </header>
-</div>
+  </div>
 
-<div class="main-wrapper">
+  <div class="main-wrapper">
     <div class="inner-wrapper">
       <article class="courseware-overview" data-course-id="${context_course.location.url()}">        
         % for section in sections:
         <section class="courseware-section branch" data-id="${section.location}">
           <header>
             <a href="#" data-tooltip="Expand/collapse this section" class="expand-collapse-icon collapse"></a>
+
             <div class="item-details" data-id="${section.location}">
               <h3 class="section-name">
                 <span data-tooltip="Edit this section's name" class="section-name-span">${section.display_name}</span>
@@ -212,43 +213,10 @@ $(document).ready(function(){
               % endfor
             </ol>
           </div>
-        </header>
-        <div class="subsection-list">
-          <div class="list-header">
-            <a href="#" class="new-subsection-item" data-template="${new_subsection_template}">
-              <span class="new-folder-icon"></span>New Subsection
-            </a>
-          </div>
-          <ol data-section-id="${section.location.url()}">
-            % for subsection in section.get_children():
-            <li class="branch collapsed id-holder" data-id="${subsection.location}">
-              <div class="section-item">
-                <div class="details">
-                  <a href="#" data-tooltip="Expand/collapse this subsection" class="expand-collapse-icon expand"></a>
-                  <a href="${reverse('edit_subsection', args=[subsection.location])}">
-                    <span class="folder-icon"></span>
-                    <span class="subsection-name"><span class="subsection-name-value">${subsection.display_name}</span></span>
-                  </a>
-                </div>
-                
-                <div class="gradable-status" data-initial-status="${subsection.metadata.get('format', 'Not Graded')}">
-                </div>
-                
-                <div class="item-actions">
-                  <a href="#" data-tooltip="Delete this subsection" class="delete-button delete-subsection-button"><span class="delete-icon"></span></a>                    
-                  <a href="#" data-tooltip="Drag to reorder" class="drag-handle"></a>
-                </div>
-              </div>
-              ${units.enum_units(subsection)}
-            </li>
-            % endfor
-          </ol>
-        </div>
         </section>
         % endfor
       </article>
     </div>
-</div>
-<footer></footer>
-
+  </div>
+  <footer></footer>
 </%block>