From 8367f565dcb2315518ed583a66e08e89562b2c4a Mon Sep 17 00:00:00 2001
From: Brian Talbot <btalbot@edx.org>
Date: Mon, 11 Feb 2013 13:21:35 -0500
Subject: [PATCH] studio - settings: revised URLs for temporary consistency and
 added in help/explanation text 1st draft

---
 cms/templates/settings.html         | 12 ++----------
 cms/templates/settings_graders.html |  5 ++---
 cms/urls.py                         |  8 ++++----
 3 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/cms/templates/settings.html b/cms/templates/settings.html
index 82e89db31f..df92be5586 100644
--- a/cms/templates/settings.html
+++ b/cms/templates/settings.html
@@ -46,13 +46,6 @@ from contentstore import utils
     <header class="page">
       <span class="title-sub">Settings</span>
       <h1 class="title-1">Schedule &amp; Details</h1>
-
-      <!-- <nav class="nav-settings secondary">
-        <ul>
-          <li class="nav-item"><a href="#">Grading</a></li>
-          <li class="nav-item"><a href="#">Advanced Settings</a></li>
-        </ul>
-      </nav> -->
     </header>
 
     <!-- <div class="introduction">
@@ -210,9 +203,9 @@ from contentstore import utils
     </article>
 
     <aside class="content-supplementary" role="complimentary">
-      <div class="bit">
+     <div class="bit">
         <h3 class="title-3">How will these settings be used</h3>
-        <p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem.</p>
+        <p>Your course's schedule settings determine when students can enroll in and begin a course as well as when the course. Additionally, details provided on this page are also used in edX's catalog of courses, which new and returning students use to choose new courses to study.</p>
       </div>
 
       <div class="bit">
@@ -220,7 +213,6 @@ from contentstore import utils
         <nav class="nav-related">
           <ul>
             <li class="nav-item"><a href="">Grading</a></li>
-            <li class="nav-item"><a href="">Advanced Settings</a></li>
           </ul>
         </nav>
       </div>
diff --git a/cms/templates/settings_graders.html b/cms/templates/settings_graders.html
index be59aeca86..85fb626e61 100644
--- a/cms/templates/settings_graders.html
+++ b/cms/templates/settings_graders.html
@@ -127,15 +127,14 @@ from contentstore import utils
     <aside class="content-supplementary" role="complimentary">
       <div class="bit">
         <h3 class="title-3">How will these settings be used</h3>
-        <p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem.</p>
+        <p>Your grading settings will be used to calculate students grades and performance. Overall grade range will be used in students' final grades, which are calculated by the weighting you determine for each custom assignment type.</p>
       </div>
 
       <div class="bit">
         <h3 class="title-3">Other Course Settings</h3>
         <nav class="nav-related">
           <ul>
-            <li class="nav-item"><a href="">Details &amp; Schedule</a></li>
-            <li class="nav-item"><a href="">Advanced Settings</a></li>
+            <li class="nav-item"><a href="#">Details &amp; Schedule</a></li>
           </ul>
         </nav>
       </div>
diff --git a/cms/urls.py b/cms/urls.py
index 87875b050c..cb5f954cb8 100644
--- a/cms/urls.py
+++ b/cms/urls.py
@@ -42,10 +42,10 @@ urlpatterns = ('',
         'contentstore.views.remove_user', name='remove_user'),
     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'),
+    url(r'^(?P<org>[^/]+)/(?P<course>[^/]+)/settings-details/(?P<name>[^/]+)$', 'contentstore.views.get_course_settings', name='course_settings'),
+    url(r'^(?P<org>[^/]+)/(?P<course>[^/]+)/settings-grading/(?P<name>[^/]+)$', 'contentstore.views.course_config_graders_page', name='course_settings'),
+    url(r'^(?P<org>[^/]+)/(?P<course>[^/]+)/settings-details/(?P<name>[^/]+)/section/(?P<section>[^/]+).*$', 'contentstore.views.course_settings_updates', name='course_settings'),
+    url(r'^(?P<org>[^/]+)/(?P<course>[^/]+)/settings-grading/(?P<name>[^/]+)/(?P<grader_index>.*)$', 'contentstore.views.course_grader_updates', name='course_settings'),
 
     url(r'^(?P<org>[^/]+)/(?P<course>[^/]+)/(?P<category>[^/]+)/(?P<name>[^/]+)/gradeas.*$', 'contentstore.views.assignment_type_update', name='assignment_type_update'),