Grading and details split out. Put the unimplemented tabs into a single

file not used.

cms/djangoapps/contentstore/views.py

@@ -1109,8 +1109,31 @@ def get_course_settings(request, org, course, name):
     course_details = CourseDetails.fetch(location)
 
     return render_to_response('settings.html', {
-        'active_tab': 'settings',
         'context_course': course_module,
+        'course_location' : location,
+        'course_details' : json.dumps(course_details, cls=CourseSettingsEncoder)
+    })
+
+@login_required
+@ensure_csrf_cookie
+def course_config_graders_page(request, org, course, name):
+    """
+    Send models and views as well as html for editing the course settings to the client.
+
+    org, course, name: Attributes of the Location for the item to edit
+    """
+    location = ['i4x', org, course, 'course', name]
+
+    # check that logged in user has permissions to this item
+    if not has_access(request.user, location):
+        raise PermissionDenied()
+
+    course_module = modulestore().get_item(location)
+    course_details = CourseGradingModel.fetch(location)
+
+    return render_to_response('settings_graders.html', {
+        'context_course': course_module,
+        'course_location' : location,
         'course_details' : json.dumps(course_details, cls=CourseSettingsEncoder)
     })
 

cms/static/js/models/settings/course_grading_policy.js

@@ -13,7 +13,8 @@ CMS.Models.Settings.CourseGradingPolicy = Backbone.Model.extend({
         }
         if (attributes['graders']) {
             var graderCollection;
-			if (this.has('graders')) {
+            // interesting race condition: if {parse:true} when newing, then parse called before .attributes created
+            if (this.attributes && this.has('graders')) {
                 graderCollection = this.get('graders');
                 graderCollection.reset(attributes.graders);
             }

cms/static/js/models/settings/course_settings.js

@@ -3,7 +3,6 @@ CMS.Models.Settings.CourseSettings = Backbone.Model.extend({
     // a container for the models representing the n possible tabbed states
     defaults: {
         courseLocation: null,
-		// NOTE: keep these sync'd w/ the data-section names in settings-page-menu
         details: null,
         faculty: null,
         grading: null,

cms/templates/settings_graders.html

+<%inherit file="base.html" />
+<%block name="title">Grading</%block>
+<%block name="bodyclass">is-signedin course settings</%block>
+
+
+<%namespace name='static' file='static_content.html'/>
+<%!
+from contentstore import utils 
+%>
+
+
+<%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 type="text/javascript" src="${static.url('js/template_loader.js')}"></script>
+  <script type="text/javascript" src="${static.url('js/views/server_error.js')}"></script>
+  <script type="text/javascript" src="${static.url('js/models/course_relative.js')}"></script>
+  <script type="text/javascript" src="${static.url('js/views/validating_view.js')}"></script>
+  <script type="text/javascript" src="${static.url('js/models/settings/course_grading_policy.js')}"></script>
+  <script type="text/javascript" src="${static.url('js/views/settings/settings_grading_view.js')}"></script>
+  
+  <script type="text/javascript">
+    $(document).ready(function(){
+    
+        var editor = new CMS.Views.Settings.Grading({
+            el: $('.settings-grading'),
+            model : new CMS.Models.Settings.CourseGradingPolicy(${course_details|n},{parse:true})
+        });
+        
+        editor.render();
+    });
+      
+  </script>
+</%block>
+
+<%block name="content">
+  <!-- -->
+  <div class="main-wrapper">
+    <div class="inner-wrapper">      
+      <h1>Settings</h1>
+      <article class="settings-overview">
+        <div class="settings-page-section main-column">
+
+          <section class="settings-grading is-shown">
+            <h2 class="title">Grading</h2>
+
+            <section class="settings-grading-range">
+              <header>
+                <h3>Overall Grade Range</h3>
+                <span class="detail">Course grade ranges and their values</span>
+              </header>
+
+              <div class="row">
+                
+                <div class="grade-controls course-grading-range well">
+                  <a href="#" class="new-grade-button"><span class="plus-icon"></span></a>
+                  <div class="grade-slider">
+                    <div class="grade-bar">
+                      <ol class="increments">
+                        <li class="increment-0">0</li>
+                        <li class="increment-10">10</li>
+                        <li class="increment-20">20</li>
+                        <li class="increment-30">30</li>
+                        <li class="increment-40">40</li>
+                        <li class="increment-50">50</li>
+                        <li class="increment-60">60</li>
+                        <li class="increment-70">70</li>
+                        <li class="increment-80">80</li>
+                        <li class="increment-90">90</li>
+                        <li class="increment-100">100</li>
+                      </ol>
+                      <ol class="grades">
+                      </ol>
+                    </div>
+                  </div>
+                </div>
+
+              </div>
+            </section>
+
+            <section class="settings-grading-general">
+              <header>
+                <h3>General Grading</h3>
+                <span class="detail">Deadlines and Requirements</span>
+              </header>
+
+              <div class="row row-col2">
+                <label for="course-grading-graceperiod">Grace Period on Deadline:</label>
+
+                <div class="field">
+                  <div class="input">
+                    <input type="text" class="short time" id="course-grading-graceperiod" value="0:00" placeholder="e.g. 10 minutes">
+                    <span class="tip tip-inline">leeway on due dates</span>
+                  </div>
+                </div>
+              </div>
+            </section>
+
+            <section class="setting-grading-assignment-types">
+              <header>
+                <h3>Assignment Types</h3>
+              </header>
+
+              <div class="row">
+                <div class="field enum">
+                  <ul class="input-list course-grading-assignment-list">
+                  </ul>
+
+                  <a href="#" class="new-button new-course-grading-item add-grading-data">
+                    <span class="plus-icon white"></span>New Assignment Type
+                  </a>
+                  </div>
+                </div>
+            </section>
+          </section><!-- .settings-grading -->
+
+        </div>
+      </article>
+    </div>
+  </div>
+  <footer></footer>
+</%block>

cms/templates/widgets/header.html

@@ -42,7 +42,7 @@
               <div class="nav-sub">
                 <ul>
                   <li class="nav-item"><a href="${reverse('contentstore.views.get_course_settings', kwargs=dict(org=ctx_loc.org, course=ctx_loc.course, name=ctx_loc.name))}">Schedule &amp; Details</a></li>
-                  <li class="nav-item"><a href="${reverse('contentstore.views.get_course_settings', kwargs={'org' : ctx_loc.org, 'course' : ctx_loc.course, 'name': ctx_loc.name})}">Grading</a></li>
+                  <li class="nav-item"><a href="${reverse('contentstore.views.course_config_graders_page', kwargs={'org' : ctx_loc.org, 'course' : ctx_loc.course, 'name': ctx_loc.name})}">Grading</a></li>
                   <li class="nav-item"><a href="${reverse('manage_users', kwargs=dict(location=ctx_loc))}">Course Team</a></li>
                   <li class="nav-item"><a href="${reverse('course_settings', kwargs={'org' : ctx_loc.org, 'course' : ctx_loc.course, 'name': ctx_loc.name})}">Advanced Settings</a></li>
                 </ul>
@@ -84,7 +84,10 @@
             <div class="wrapper wrapper-nav-sub">
               <div class="nav-sub">
                 <ul>
+                  % if context_course:
+                  <% ctx_loc = context_course.location %>
                   <li class="nav-item"><a href="${reverse('course_index', kwargs=dict(org=ctx_loc.org, course=ctx_loc.course, name=ctx_loc.name))}">My Courses</a></li>
+                  % endif
                   <li class="nav-item"><a href="http://help.edge.edx.org/" rel="external">Help</a></li>
                   <li class="nav-item"><a class="action action-logout" href="${reverse('logout')}">Logout</a></li>
                 </ul>

cms/urls.py

@@ -43,6 +43,7 @@ urlpatterns = ('',
     url(r'^(?P<org>[^/]+)/(?P<course>[^/]+)/info/(?P<name>[^/]+)$', 'contentstore.views.course_info', name='course_info'),
     url(r'^(?P<org>[^/]+)/(?P<course>[^/]+)/course_info/updates/(?P<provided_id>.*)$', 'contentstore.views.course_info_updates', name='course_info'),
     url(r'^(?P<org>[^/]+)/(?P<course>[^/]+)/settings/(?P<name>[^/]+)$', 'contentstore.views.get_course_settings', name='course_settings'),
+    url(r'^(?P<org>[^/]+)/(?P<course>[^/]+)/grades/(?P<name>[^/]+)$', 'contentstore.views.course_config_graders_page', name='course_settings'),
     url(r'^(?P<org>[^/]+)/(?P<course>[^/]+)/settings/(?P<name>[^/]+)/section/(?P<section>[^/]+).*$', 'contentstore.views.course_settings_updates', name='course_settings'),
     url(r'^(?P<org>[^/]+)/(?P<course>[^/]+)/grades/(?P<name>[^/]+)/(?P<grader_index>.*)$', 'contentstore.views.course_grader_updates', name='course_settings'),