Merge branch 'master' into feature/cas/manual-policy

Conflicts:
	cms/djangoapps/contentstore/features/common.py
	cms/djangoapps/contentstore/features/section.py
	cms/djangoapps/contentstore/tests/test_course_settings.py
	cms/djangoapps/contentstore/views.py
	cms/static/js/models/settings/course_grading_policy.js
	cms/static/js/views/settings/main_settings_view.js
	cms/static/sass/_settings.scss
	cms/templates/settings.html
	cms/urls.py

.pep8

+[pep8]
+ignore=E501
\ No newline at end of file

apt-packages.txt

@@ -9,6 +9,7 @@ gfortran
 liblapack-dev
 libfreetype6-dev
 libpng12-dev
+libjpeg-dev
 libxml2-dev
 libxslt-dev
 yui-compressor

cms/.coveragerc

@@ -2,7 +2,7 @@
 [run]
 data_file = reports/cms/.coverage
 source = cms,common/djangoapps
-omit = cms/envs/*, cms/manage.py
+omit = cms/envs/*, cms/manage.py, common/djangoapps/*/migrations/*
 
 [report]
 ignore_errors = True

cms/__init__.py

-

cms/djangoapps/auth/authz.py

@@ -18,6 +18,8 @@ STAFF_ROLE_NAME = 'staff'
 # we're just making a Django group for each location/role combo
 # to do this we're just creating a Group name which is a formatted string
 # of those two variables
+
+
 def get_course_groupname_for_role(location, role):
     loc = Location(location)
     # hack: check for existence of a group name in the legacy LMS format <role>_<course>
@@ -25,11 +27,12 @@ def get_course_groupname_for_role(location, role):
     # more information
     groupname = '{0}_{1}'.format(role, loc.course)
 
-    if len(Group.objects.filter(name = groupname)) == 0:
-        groupname = '{0}_{1}'.format(role,loc.course_id)
+    if len(Group.objects.filter(name=groupname)) == 0:
+        groupname = '{0}_{1}'.format(role, loc.course_id)
 
     return groupname
 
+
 def get_users_in_course_group_by_role(location, role):
     groupname = get_course_groupname_for_role(location, role)
     (group, created) = Group.objects.get_or_create(name=groupname)
@@ -39,6 +42,8 @@ def get_users_in_course_group_by_role(location, role):
 '''
 Create all permission groups for a new course and subscribe the caller into those roles
 '''
+
+
 def create_all_course_groups(creator, location):
     create_new_course_group(creator, location, INSTRUCTOR_ROLE_NAME)
     create_new_course_group(creator, location, STAFF_ROLE_NAME)
@@ -46,7 +51,7 @@ def create_all_course_groups(creator, location):
 
 def create_new_course_group(creator, location, role):
     groupname = get_course_groupname_for_role(location, role)
-    (group, created) =Group.objects.get_or_create(name=groupname)
+    (group, created) = Group.objects.get_or_create(name=groupname)
     if created:
         group.save()
 
@@ -59,6 +64,8 @@ def create_new_course_group(creator, location, role):
 This is to be called only by either a command line code path or through a app which has already
 asserted permissions
 '''
+
+
 def _delete_course_group(location):
     # remove all memberships
     instructors = Group.objects.get(name=get_course_groupname_for_role(location, INSTRUCTOR_ROLE_NAME))
@@ -75,6 +82,8 @@ def _delete_course_group(location):
 This is to be called only by either a command line code path or through an app which has already
 asserted permissions to do this action
 '''
+
+
 def _copy_course_group(source, dest):
     instructors = Group.objects.get(name=get_course_groupname_for_role(source, INSTRUCTOR_ROLE_NAME))
     new_instructors_group = Group.objects.get(name=get_course_groupname_for_role(dest, INSTRUCTOR_ROLE_NAME))
@@ -86,7 +95,7 @@ def _copy_course_group(source, dest):
     new_staff_group = Group.objects.get(name=get_course_groupname_for_role(dest, STAFF_ROLE_NAME))
     for user in staff.user_set.all():
         user.groups.add(new_staff_group)
-        user.save()    
+        user.save()
 
 
 def add_user_to_course_group(caller, user, location, role):
@@ -133,8 +142,6 @@ def remove_user_from_course_group(caller, user, location, role):
 def is_user_in_course_group_role(user, location, role):
     if user.is_active and user.is_authenticated:
         # all "is_staff" flagged accounts belong to all groups
-        return user.is_staff or user.groups.filter(name=get_course_groupname_for_role(location,role)).count() > 0
+        return user.is_staff or user.groups.filter(name=get_course_groupname_for_role(location, role)).count() > 0
 
     return False
-
-    

cms/djangoapps/contentstore/course_info_model.py

@@ -8,6 +8,8 @@ import logging
 
 ## TODO store as array of { date, content } and override  course_info_module.definition_from_xml
 ## This should be in a class which inherits from XmlDescriptor
+
+
 def get_course_updates(location):
     """
     Retrieve the relevant course_info updates and unpack into the model which the client expects:
@@ -21,13 +23,13 @@ def get_course_updates(location):
 
     # current db rep: {"_id" : locationjson, "definition" : { "data" : "<ol>[<li><h2>date</h2>content</li>]</ol>"} "metadata" : ignored}
     location_base = course_updates.location.url()
-    
+
     # purely to handle free formed updates not done via editor. Actually kills them, but at least doesn't break.
     try:
         course_html_parsed = html.fromstring(course_updates.definition['data'])
     except:
         course_html_parsed = html.fromstring("<ol></ol>")
-        
+
     # Confirm that root is <ol>, iterate over <li>, pull out <h2> subs and then rest of val
     course_upd_collection = []
     if course_html_parsed.tag == 'ol':
@@ -40,25 +42,26 @@ def get_course_updates(location):
                 content = update[0].tail
             else:
                 content = "\n".join([html.tostring(ele) for ele in update[1:]])
-                
+
             # make the id on the client be 1..len w/ 1 being the oldest and len being the newest
-            course_upd_collection.append({"id" : location_base + "/" + str(len(course_html_parsed) - idx),
-                                          "date" : update.findtext("h2"),
-                                          "content" : content})
-            
+            course_upd_collection.append({"id": location_base + "/" + str(len(course_html_parsed) - idx),
+                                          "date": update.findtext("h2"),
+                                          "content": content})
+
     return course_upd_collection
 
+
 def update_course_updates(location, update, passed_id=None):
     """
     Either add or update the given course update. It will add it if the passed_id is absent or None. It will update it if
     it has an passed_id which has a valid value. Until updates have distinct values, the passed_id is the location url + an index
-    into the html structure. 
+    into the html structure.
     """
     try:
         course_updates = modulestore('direct').get_item(location)
     except ItemNotFoundError:
         return HttpResponseBadRequest
-    
+
     # purely to handle free formed updates not done via editor. Actually kills them, but at least doesn't break.
     try:
         course_html_parsed = html.fromstring(course_updates.definition['data'])
@@ -67,7 +70,7 @@ def update_course_updates(location, update, passed_id=None):
 
     # No try/catch b/c failure generates an error back to client
     new_html_parsed = html.fromstring('<li><h2>' + update['date'] + '</h2>' + update['content'] + '</li>')
-        
+
     # Confirm that root is <ol>, iterate over <li>, pull out <h2> subs and then rest of val
     if course_html_parsed.tag == 'ol':
         # ??? Should this use the id in the json or in the url or does it matter?
@@ -80,14 +83,15 @@ def update_course_updates(location, update, passed_id=None):
 
             idx = len(course_html_parsed)
             passed_id = course_updates.location.url() + "/" + str(idx)
-        
+
         # update db record
         course_updates.definition['data'] = html.tostring(course_html_parsed)
         modulestore('direct').update_item(location, course_updates.definition['data'])
-        
-        return {"id" : passed_id,
-                "date" : update['date'],
-                "content" :update['content']}
+
+        return {"id": passed_id,
+                "date": update['date'],
+                "content": update['content']}
+
 
 def delete_course_update(location, update, passed_id):
     """
@@ -96,19 +100,19 @@ def delete_course_update(location, update, passed_id):
     """
     if not passed_id:
         return HttpResponseBadRequest
-        
+
     try:
         course_updates = modulestore('direct').get_item(location)
     except ItemNotFoundError:
         return HttpResponseBadRequest
-    
+
     # TODO use delete_blank_text parser throughout and cache as a static var in a class
     # purely to handle free formed updates not done via editor. Actually kills them, but at least doesn't break.
     try:
         course_html_parsed = html.fromstring(course_updates.definition['data'])
     except:
         course_html_parsed = html.fromstring("<ol></ol>")
-        
+
     if course_html_parsed.tag == 'ol':
         # ??? Should this use the id in the json or in the url or does it matter?
         idx = get_idx(passed_id)
@@ -120,10 +124,11 @@ def delete_course_update(location, update, passed_id):
         # update db record
         course_updates.definition['data'] = html.tostring(course_html_parsed)
         store = modulestore('direct')
-        store.update_item(location, course_updates.definition['data'])  
-          
+        store.update_item(location, course_updates.definition['data'])
+
     return get_course_updates(location)
-    
+
+
 def get_idx(passed_id):
     """
     From the url w/ idx appended, get the idx.
@@ -131,4 +136,4 @@ def get_idx(passed_id):
     # TODO compile this regex into a class static and reuse for each call
     idx_matcher = re.search(r'.*/(\d+)$', passed_id)
     if idx_matcher:
-        return int(idx_matcher.group(1))
+        return int(idx_matcher.group(1))
\ No newline at end of file

cms/djangoapps/contentstore/features/common.py

@@ -16,7 +16,8 @@ def i_visit_the_studio_homepage(step):
     # LETTUCE_SERVER_PORT = 8001
     # in your settings.py file.
     world.browser.visit(django_url('/'))
-    assert world.browser.is_element_present_by_css('body.no-header', 10)
+    signin_css = 'a.action-signin'
+    assert world.browser.is_element_present_by_css(signin_css, 10)
 
 @step('I am logged into Studio$')
 def i_am_logged_into_studio(step):
@@ -31,7 +32,7 @@ def i_press_the_category_delete_icon(step, category):
     if category == 'section':
         css = 'a.delete-button.delete-section-button span.delete-icon'
     elif category == 'subsection':
-        css='a.delete-button.delete-subsection-button  span.delete-icon'
+        css = 'a.delete-button.delete-subsection-button  span.delete-icon'
     else:
         assert False, 'Invalid category: %s' % category
     css_click(css)
@@ -116,7 +117,11 @@ def log_into_studio(
     create_studio_user(uname=uname, email=email, is_staff=is_staff)
     world.browser.cookies.delete()
     world.browser.visit(django_url('/'))
-    world.browser.is_element_present_by_css('body.no-header', 10)
+    signin_css = 'a.action-signin'
+    world.browser.is_element_present_by_css(signin_css, 10)
+
+    # click the signin button
+    css_click(signin_css)
 
     login_form = world.browser.find_by_css('form#login_form')
     login_form.find_by_name('email').fill(email)
@@ -129,7 +134,8 @@ def create_a_course():
     css_click('a.new-course-button')
     fill_in_course_info()
     css_click('input.new-course-save')
-    assert_true(world.browser.is_element_present_by_css('a#courseware-tab', 5))
+    course_title_css = 'span.course-title'
+    assert_true(world.browser.is_element_present_by_css(course_title_css, 5))
 
 def add_section(name='My Section'):
     link_css = 'a.new-courseware-section-button'
@@ -138,6 +144,8 @@ def add_section(name='My Section'):
     save_css = '.new-section-name-save'
     css_fill(name_css,name)
     css_click(save_css)
+    span_css = 'span.section-name-span'
+    assert_true(world.browser.is_element_present_by_css(span_css, 5))
 
 def add_subsection(name='Subsection One'):
     css = 'a.new-subsection-item'

cms/djangoapps/contentstore/features/courses.py

@@ -2,49 +2,61 @@ from lettuce import world, step
 from common import *
 
 ############### ACTIONS ####################
+
+
 @step('There are no courses$')
 def no_courses(step):
     clear_courses()
 
+
 @step('I click the New Course button$')
 def i_click_new_course(step):
     css_click('.new-course-button')
 
+
 @step('I fill in the new course information$')
 def i_fill_in_a_new_course_information(step):
     fill_in_course_info()
 
+
 @step('I create a new course$')
 def i_create_a_course(step):
     create_a_course()
 
+
 @step('I click the course link in My Courses$')
 def i_click_the_course_link_in_my_courses(step):
     course_css = 'span.class-name'
     css_click(course_css)
 
 ############ ASSERTIONS ###################
+
+
 @step('the Courseware page has loaded in Studio$')
 def courseware_page_has_loaded_in_studio(step):
-    courseware_css = 'a#courseware-tab'
-    assert world.browser.is_element_present_by_css(courseware_css)
+    course_title_css = 'span.course-title'
+    assert world.browser.is_element_present_by_css(course_title_css)
+
 
 @step('I see the course listed in My Courses$')
 def i_see_the_course_in_my_courses(step):
     course_css = 'span.class-name'
-    assert_css_with_text(course_css,'Robot Super Course')
+    assert_css_with_text(course_css, 'Robot Super Course')
+
 
 @step('the course is loaded$')
 def course_is_loaded(step):
     class_css = 'a.class-name'
-    assert_css_with_text(class_css,'Robot Super Course')
+    assert_css_with_text(class_css, 'Robot Super Course')
+
 
 @step('I am on the "([^"]*)" tab$')
 def i_am_on_tab(step, tab_name):
     header_css = 'div.inner-wrapper h1'
-    assert_css_with_text(header_css,tab_name)
+    assert_css_with_text(header_css, tab_name)
+
 
 @step('I see a link for adding a new section$')
 def i_see_new_section_link(step):
     link_css = 'a.new-courseware-section-button'
-    assert_css_with_text(link_css,'New Section')
+    assert_css_with_text(link_css, 'New Section')

cms/djangoapps/contentstore/features/factories.py

@@ -3,6 +3,7 @@ from student.models import User, UserProfile, Registration
 from datetime import datetime
 import uuid
 
+
 class UserProfileFactory(factory.Factory):
     FACTORY_FOR = UserProfile
 
@@ -10,12 +11,14 @@ class UserProfileFactory(factory.Factory):
     name = 'Robot Studio'
     courseware = 'course.xml'
 
+
 class RegistrationFactory(factory.Factory):
     FACTORY_FOR = Registration
 
     user = None
     activation_key = uuid.uuid4().hex
 
+
 class UserFactory(factory.Factory):
     FACTORY_FOR = User
 
@@ -28,4 +31,4 @@ class UserFactory(factory.Factory):
     is_active = True
     is_superuser = False
     last_login = datetime.now()
-    date_joined = datetime.now()
+    date_joined = datetime.now()
\ No newline at end of file

cms/djangoapps/contentstore/features/signup.feature

@@ -5,8 +5,8 @@ Feature: Sign in
 
   Scenario: Sign up from the homepage
     Given I visit the Studio homepage
-    When I click the link with the text "Sign up"
+    When I click the link with the text "Sign Up"
     And I fill in the registration form
-    And I press the "Create My Account" button on the registration form
+    And I press the Create My Account button on the registration form
     Then I should see be on the studio home page
-    And I should see the message "please click on the activation link in your email."
+    And I should see the message "please click on the activation link in your email."
\ No newline at end of file

cms/djangoapps/contentstore/features/signup.py

 from lettuce import world, step
 
+
 @step('I fill in the registration form$')
 def i_fill_in_the_registration_form(step):
     register_form = world.browser.find_by_css('form#register_form')
@@ -9,15 +10,19 @@ def i_fill_in_the_registration_form(step):
     register_form.find_by_name('name').fill('Robot Studio')
     register_form.find_by_name('terms_of_service').check()
 
-@step('I press the "([^"]*)" button on the registration form$')
-def i_press_the_button_on_the_registration_form(step, button):
+
+@step('I press the Create My Account button on the registration form$')
+def i_press_the_button_on_the_registration_form(step):
     register_form = world.browser.find_by_css('form#register_form')
-    register_form.find_by_value(button).click()
+    submit_css = 'button#submit'
+    register_form.find_by_css(submit_css).click()
+
 
 @step('I should see be on the studio home page$')
 def i_should_see_be_on_the_studio_home_page(step):
     assert world.browser.find_by_css('div.inner-wrapper')
 
+
 @step(u'I should see the message "([^"]*)"$')
 def i_should_see_the_message(step, msg):
-    assert world.browser.is_text_present(msg, 5)
+    assert world.browser.is_text_present(msg, 5)
\ No newline at end of file

cms/djangoapps/contentstore/features/studio-overview-togglesection.py

@@ -6,11 +6,13 @@ from nose.tools import assert_true, assert_false, assert_equal
 from logging import getLogger
 logger = getLogger(__name__)
 
+
 @step(u'I have a course with no sections$')
 def have_a_course(step):
     clear_courses()
     course = CourseFactory.create()
 
+
 @step(u'I have a course with 1 section$')
 def have_a_course_with_1_section(step):
     clear_courses()
@@ -18,8 +20,9 @@ def have_a_course_with_1_section(step):
     section = ItemFactory.create(parent_location=course.location)
     subsection1 = ItemFactory.create(
         parent_location=section.location,
-        template = 'i4x://edx/templates/sequential/Empty',
-        display_name = 'Subsection One',)
+        template='i4x://edx/templates/sequential/Empty',
+        display_name='Subsection One',)
+
 
 @step(u'I have a course with multiple sections$')
 def have_a_course_with_two_sections(step):
@@ -28,19 +31,20 @@ def have_a_course_with_two_sections(step):
     section = ItemFactory.create(parent_location=course.location)
     subsection1 = ItemFactory.create(
         parent_location=section.location,
-        template = 'i4x://edx/templates/sequential/Empty',
-        display_name = 'Subsection One',)
+        template='i4x://edx/templates/sequential/Empty',
+        display_name='Subsection One',)
     section2 = ItemFactory.create(
         parent_location=course.location,
         display_name='Section Two',)
     subsection2 = ItemFactory.create(
         parent_location=section2.location,
-        template = 'i4x://edx/templates/sequential/Empty',
-        display_name = 'Subsection Alpha',)
+        template='i4x://edx/templates/sequential/Empty',
+        display_name='Subsection Alpha',)
     subsection3 = ItemFactory.create(
         parent_location=section2.location,
-        template = 'i4x://edx/templates/sequential/Empty',
-        display_name = 'Subsection Beta',)
+        template='i4x://edx/templates/sequential/Empty',
+        display_name='Subsection Beta',)
+
 
 @step(u'I navigate to the course overview page$')
 def navigate_to_the_course_overview_page(step):
@@ -48,15 +52,18 @@ def navigate_to_the_course_overview_page(step):
     course_locator = '.class-name'
     css_click(course_locator)
 
+
 @step(u'I navigate to the courseware page of a course with multiple sections')
 def nav_to_the_courseware_page_of_a_course_with_multiple_sections(step):
     step.given('I have a course with multiple sections')
     step.given('I navigate to the course overview page')
 
+
 @step(u'I add a section')
 def i_add_a_section(step):
     add_section(name='My New Section That I Just Added')
 
+
 @step(u'I click the "([^"]*)" link$')
 def i_click_the_text_span(step, text):
     span_locator = '.toggle-button-sections span'
@@ -65,16 +72,19 @@ def i_click_the_text_span(step, text):
     assert_equal(world.browser.find_by_css(span_locator).value, text)
     css_click(span_locator)
 
+
 @step(u'I collapse the first section$')
 def i_collapse_a_section(step):
     collapse_locator = 'section.courseware-section a.collapse'
     css_click(collapse_locator)
 
+
 @step(u'I expand the first section$')
 def i_expand_a_section(step):
     expand_locator = 'section.courseware-section a.expand'
     css_click(expand_locator)
 
+
 @step(u'I see the "([^"]*)" link$')
 def i_see_the_span_with_text(step, text):
     span_locator = '.toggle-button-sections span'
@@ -82,6 +92,7 @@ def i_see_the_span_with_text(step, text):
     assert_equal(world.browser.find_by_css(span_locator).value, text)
     assert_true(world.browser.find_by_css(span_locator).visible)
 
+
 @step(u'I do not see the "([^"]*)" link$')
 def i_do_not_see_the_span_with_text(step, text):
     # Note that the span will exist on the page but not be visible
@@ -89,6 +100,7 @@ def i_do_not_see_the_span_with_text(step, text):
     assert_true(world.browser.is_element_present_by_css(span_locator))
     assert_false(world.browser.find_by_css(span_locator).visible)
 
+
 @step(u'all sections are expanded$')
 def all_sections_are_expanded(step):
     subsection_locator = 'div.subsection-list'
@@ -96,9 +108,10 @@ def all_sections_are_expanded(step):
     for s in subsections:
         assert_true(s.visible)
 
+
 @step(u'all sections are collapsed$')
 def all_sections_are_expanded(step):
     subsection_locator = 'div.subsection-list'
     subsections = world.browser.find_by_css(subsection_locator)
     for s in subsections:
-        assert_false(s.visible)
+        assert_false(s.visible)
\ No newline at end of file

cms/djangoapps/contentstore/features/subsection.py

@@ -2,6 +2,8 @@ from lettuce import world, step
 from common import *
 
 ############### ACTIONS ####################
+
+
 @step('I have opened a new course section in Studio$')
 def i_have_opened_a_new_course_section(step):
     clear_courses()
@@ -9,31 +11,37 @@ def i_have_opened_a_new_course_section(step):
     create_a_course()
     add_section()
 
+
 @step('I click the New Subsection link')
 def i_click_the_new_subsection_link(step):
     css = 'a.new-subsection-item'
     css_click(css)
 
+
 @step('I enter the subsection name and click save$')
 def i_save_subsection_name(step):
     name_css = 'input.new-subsection-name-input'
     save_css = 'input.new-subsection-name-save'
-    css_fill(name_css,'Subsection One')
+    css_fill(name_css, 'Subsection One')
     css_click(save_css)
 
+
 @step('I have added a new subsection$')
 def i_have_added_a_new_subsection(step):
     add_subsection()
 
 ############ ASSERTIONS ###################
+
+
 @step('I see my subsection on the Courseware page$')
 def i_see_my_subsection_on_the_courseware_page(step):
     css = 'span.subsection-name'
-    assert world.browser.is_element_present_by_css(css)    
+    assert world.browser.is_element_present_by_css(css)
     css = 'span.subsection-name-value'
-    assert_css_with_text(css,'Subsection One')
+    assert_css_with_text(css, 'Subsection One')
+
 
 @step('the subsection does not exist$')
 def the_subsection_does_not_exist(step):
     css = 'span.subsection-name'
-    assert world.browser.is_element_not_present_by_css(css)
+    assert world.browser.is_element_not_present_by_css(css)
\ No newline at end of file

cms/djangoapps/contentstore/management/commands/clone.py

@@ -14,6 +14,7 @@ from auth.authz import _copy_course_group
 # To run from command line: rake cms:clone SOURCE_LOC=MITx/111/Foo1 DEST_LOC=MITx/135/Foo3
 #
 
+
 class Command(BaseCommand):
     help = \
 '''Clone a MongoDB backed course to another location'''

cms/djangoapps/contentstore/management/commands/delete_course.py

@@ -15,6 +15,7 @@ from auth.authz import _delete_course_group
 # To run from command line: rake cms:delete_course LOC=MITx/111/Foo1
 #
 
+
 class Command(BaseCommand):
     help = \
 '''Delete a MongoDB backed course'''
@@ -35,6 +36,3 @@ class Command(BaseCommand):
               print 'removing User permissions from course....'
               # in the django layer, we need to remove all the user permissions groups associated with this course
               _delete_course_group(loc)            
-
-
-

cms/djangoapps/contentstore/management/commands/prompt.py

 import sys
 
+
 def query_yes_no(question, default="yes"):
     """Ask a yes/no question via raw_input() and return their answer.
 
@@ -30,4 +31,4 @@ def query_yes_no(question, default="yes"):
             return valid[choice]
         else:
             sys.stdout.write("Please respond with 'yes' or 'no' "\
-                             "(or 'y' or 'n').\n")
+                             "(or 'y' or 'n').\n")
\ No newline at end of file

cms/djangoapps/contentstore/module_info_model.py

-import logging
 from static_replace import replace_static_urls
 from xmodule.modulestore.exceptions import ItemNotFoundError
 from xmodule.modulestore import Location
-from xmodule.modulestore.django import modulestore
-from lxml import etree
-import re
-from django.http import HttpResponseBadRequest, Http404
+from django.http import Http404
 
-def get_module_info(store, location, parent_location = None, rewrite_static_links = False):
-  try:
-    if location.revision is None:
-        module = store.get_item(location)
-    else:
-        module = store.get_item(location)
-  except ItemNotFoundError:
-    raise Http404
 
-  data = module.definition['data']
-  if rewrite_static_links:
-    data = replace_static_urls(
-        module.definition['data'],
-        None,
-        course_namespace=Location([
-            module.location.tag,
-            module.location.org,
-            module.location.course,
+def get_module_info(store, location, parent_location=None, rewrite_static_links=False):
+    try:
+        if location.revision is None:
+            module = store.get_item(location)
+        else:
+            module = store.get_item(location)
+    except ItemNotFoundError:
+        # create a new one
+        template_location = Location(['i4x', 'edx', 'templates', location.category, 'Empty'])
+        module = store.clone_item(template_location, location)
+
+    data = module.definition['data']
+    if rewrite_static_links:
+        data = replace_static_urls(
+            module.definition['data'],
             None,
-            None
-        ])
-    )
+            course_namespace=Location([
+                module.location.tag,
+                module.location.org,
+                module.location.course,
+                None,
+                None
+            ])
+        )
 
-  return {
+    return {
         'id': module.location.url(),
         'data': data,
         'metadata': module.metadata
     }
 
-def set_module_info(store, location, post_data):
-  module = None
-  isNew = False
-  try:
-    if location.revision is None:
-        module = store.get_item(location)
-    else:
-        module = store.get_item(location)
-  except:
-    pass
-
-  if module is None:
-    # new module at this location
-    # presume that we have an 'Empty' template
-    template_location = Location(['i4x', 'edx', 'templates', location.category, 'Empty'])
-    module = store.clone_item(template_location, location)
-    isNew = True
 
-  if post_data.get('data') is not None:
-      data = post_data['data']
-      store.update_item(location, data)
-
-  # cdodge: note calling request.POST.get('children') will return None if children is an empty array
-  # so it lead to a bug whereby the last component to be deleted in the UI was not actually
-  # deleting the children object from the children collection
-  if 'children' in post_data and post_data['children'] is not None:
-      children = post_data['children']
-      store.update_children(location, children)
-
-  # cdodge: also commit any metadata which might have been passed along in the
-  # POST from the client, if it is there
-  # NOTE, that the postback is not the complete metadata, as there's system metadata which is
-  # not presented to the end-user for editing. So let's fetch the original and
-  # 'apply' the submitted metadata, so we don't end up deleting system metadata
-  if post_data.get('metadata') is not None:
-      posted_metadata = post_data['metadata']
+def set_module_info(store, location, post_data):
+    module = None
+    try:
+        if location.revision is None:
+            module = store.get_item(location)
+        else:
+            module = store.get_item(location)
+    except:
+        pass
 
-      # update existing metadata with submitted metadata (which can be partial)
-      # IMPORTANT NOTE: if the client passed pack 'null' (None) for a piece of metadata that means 'remove it'
-      for metadata_key in posted_metadata.keys():
+    if module is None:
+        # new module at this location
+        # presume that we have an 'Empty' template
+        template_location = Location(['i4x', 'edx', 'templates', location.category, 'Empty'])
+        module = store.clone_item(template_location, location)
 
-          # let's strip out any metadata fields from the postback which have been identified as system metadata
-          # and therefore should not be user-editable, so we should accept them back from the client
-          if metadata_key in module.system_metadata_fields:
-              del posted_metadata[metadata_key]
-          elif posted_metadata[metadata_key] is None:
-              # remove both from passed in collection as well as the collection read in from the modulestore
-              if metadata_key in module.metadata:
-                  del module.metadata[metadata_key]
-              del posted_metadata[metadata_key]
+    if post_data.get('data') is not None:
+        data = post_data['data']
+        store.update_item(location, data)
 
-      # overlay the new metadata over the modulestore sourced collection to support partial updates
-      module.metadata.update(posted_metadata)
+    # cdodge: note calling request.POST.get('children') will return None if children is an empty array
+    # so it lead to a bug whereby the last component to be deleted in the UI was not actually
+    # deleting the children object from the children collection
+    if 'children' in post_data and post_data['children'] is not None:
+        children = post_data['children']
+        store.update_children(location, children)
 
-      # commit to datastore
-      store.update_metadata(location, module.metadata)
+    # cdodge: also commit any metadata which might have been passed along in the
+    # POST from the client, if it is there
+    # NOTE, that the postback is not the complete metadata, as there's system metadata which is
+    # not presented to the end-user for editing. So let's fetch the original and
+    # 'apply' the submitted metadata, so we don't end up deleting system metadata
+    if post_data.get('metadata') is not None:
+        posted_metadata = post_data['metadata']
+        
+        # update existing metadata with submitted metadata (which can be partial)
+        # IMPORTANT NOTE: if the client passed pack 'null' (None) for a piece of metadata that means 'remove it'
+        for metadata_key in posted_metadata.keys():
+        
+            # let's strip out any metadata fields from the postback which have been identified as system metadata
+            # and therefore should not be user-editable, so we should accept them back from the client
+            if metadata_key in module.system_metadata_fields:
+                del posted_metadata[metadata_key]
+            elif posted_metadata[metadata_key] is None:
+                # remove both from passed in collection as well as the collection read in from the modulestore
+                if metadata_key in module.metadata:
+                    del module.metadata[metadata_key]
+                del posted_metadata[metadata_key]
+        
+        # overlay the new metadata over the modulestore sourced collection to support partial updates
+        module.metadata.update(posted_metadata)
+        
+        # commit to datastore
+        store.update_metadata(location, module.metadata)

cms/djangoapps/contentstore/tests/factories.py

 from factory import Factory
-from xmodule.modulestore import Location
-from xmodule.modulestore.django import modulestore
-from time import gmtime
+from datetime import datetime
 from uuid import uuid4
-from xmodule.timeparse import stringify_time
+from student.models import (User, UserProfile, Registration,
+                            CourseEnrollmentAllowed)
+from django.contrib.auth.models import Group
 
 
-def XMODULE_COURSE_CREATION(class_to_create, **kwargs): 
-    return XModuleCourseFactory._create(class_to_create, **kwargs)
+class UserProfileFactory(Factory):
+    FACTORY_FOR = UserProfile
 
-def XMODULE_ITEM_CREATION(class_to_create, **kwargs):
-    return XModuleItemFactory._create(class_to_create, **kwargs)
+    user = None
+    name = 'Robot Studio'
+    courseware = 'course.xml'
 
-class XModuleCourseFactory(Factory):
-    """
-    Factory for XModule courses.
-    """
 
-    ABSTRACT_FACTORY = True
-    _creation_function = (XMODULE_COURSE_CREATION,)
+class RegistrationFactory(Factory):
+    FACTORY_FOR = Registration
 
-    @classmethod
-    def _create(cls, target_class, *args, **kwargs):
+    user = None
+    activation_key = uuid4().hex
 
-        template = Location('i4x', 'edx', 'templates', 'course', 'Empty')
-        org = kwargs.get('org')
-        number = kwargs.get('number')
-        display_name = kwargs.get('display_name')
-        location = Location('i4x', org, number, 
-                            'course', Location.clean(display_name))
 
-        store = modulestore('direct')
+class UserFactory(Factory):
+    FACTORY_FOR = User
 
-        # Write the data to the mongo datastore
-        new_course = store.clone_item(template, location)
+    username = 'robot'
+    email = 'robot@edx.org'
+    password = 'test'
+    first_name = 'Robot'
+    last_name = 'Tester'
+    is_staff = False
+    is_active = True
+    is_superuser = False
+    last_login = datetime.now()
+    date_joined = datetime.now()
 
-        # This metadata code was copied from cms/djangoapps/contentstore/views.py
-        if display_name is not None:
-            new_course.metadata['display_name'] = display_name
 
-        new_course.metadata['data_dir'] = uuid4().hex
-        new_course.metadata['start'] = stringify_time(gmtime())
-        new_course.tabs = [{"type": "courseware"}, 
-            {"type": "course_info", "name": "Course Info"}, 
-            {"type": "discussion", "name": "Discussion"},
-            {"type": "wiki", "name": "Wiki"},
-            {"type": "progress", "name": "Progress"}]
+class GroupFactory(Factory):
+    FACTORY_FOR = Group
 
-        # Update the data in the mongo datastore
-        store.update_metadata(new_course.location.url(), new_course.own_metadata)   
+    name = 'test_group'
 
-        return new_course
 
-class Course:
-    pass
+class CourseEnrollmentAllowedFactory(Factory):
+    FACTORY_FOR = CourseEnrollmentAllowed
 
-class CourseFactory(XModuleCourseFactory):
-    FACTORY_FOR = Course
-
-    template = 'i4x://edx/templates/course/Empty'
-    org = 'MITx'
-    number = '999'
-    display_name = 'Robot Super Course'
-
-class XModuleItemFactory(Factory):
-    """
-    Factory for XModule items.
-    """
-
-    ABSTRACT_FACTORY = True
-    _creation_function = (XMODULE_ITEM_CREATION,)
-
-    @classmethod
-    def _create(cls, target_class, *args, **kwargs):
-        """
-        kwargs must include parent_location, template. Can contain display_name
-        target_class is ignored
-        """
-
-        DETACHED_CATEGORIES = ['about', 'static_tab', 'course_info']
-        
-        parent_location = Location(kwargs.get('parent_location'))
-        template = Location(kwargs.get('template'))
-        display_name = kwargs.get('display_name')
-
-        store = modulestore('direct')
-
-        # This code was based off that in cms/djangoapps/contentstore/views.py
-        parent = store.get_item(parent_location)
-        dest_location = parent_location._replace(category=template.category, name=uuid4().hex)
-
-        new_item = store.clone_item(template, dest_location)
-
-        # TODO: This needs to be deleted when we have proper storage for static content
-        new_item.metadata['data_dir'] = parent.metadata['data_dir']
-
-        # replace the display name with an optional parameter passed in from the caller
-        if display_name is not None:
-            new_item.metadata['display_name'] = display_name
-
-        store.update_metadata(new_item.location.url(), new_item.own_metadata)
-
-        if new_item.location.category not in DETACHED_CATEGORIES:
-            store.update_children(parent_location, parent.definition.get('children', []) + [new_item.location.url()])
-
-        return new_item
-
-class Item:
-    pass
-
-class ItemFactory(XModuleItemFactory):
-    FACTORY_FOR = Item
-
-    parent_location = 'i4x://MITx/999/course/Robot_Super_Course'
-    template = 'i4x://edx/templates/chapter/Empty'
-    display_name = 'Section One'
+    email = 'test@edx.org'
+    course_id = 'edX/test/2012_Fall'
\ No newline at end of file

cms/djangoapps/contentstore/tests/test_core_caching.py

-from django.test.testcases import TestCase
 from cache_toolbox.core import get_cached_content, set_cached_content, del_cached_content
 from xmodule.modulestore import Location
 from xmodule.contentstore.content import StaticContent
+from django.test import TestCase
+
 
 class Content:
     def __init__(self, location, content):
@@ -11,6 +12,7 @@ class Content:
     def get_id(self):
         return StaticContent.get_id_from_location(self.location)
 
+
 class CachingTestCase(TestCase):
 #   Tests for https://edx.lighthouseapp.com/projects/102637/tickets/112-updating-asset-does-not-refresh-the-cached-copy
     unicodeLocation = Location(u'c4x', u'mitX', u'800', u'thumbnail', u'monsters.jpg')
@@ -32,7 +34,3 @@ class CachingTestCase(TestCase):
             'should not be stored in cache with unicodeLocation')
         self.assertEqual(None, get_cached_content(self.nonUnicodeLocation),
             'should not be stored in cache with nonUnicodeLocation')
-
-
-
-

cms/djangoapps/contentstore/tests/test_course_updates.py

@@ -2,29 +2,30 @@ from cms.djangoapps.contentstore.tests.test_course_settings import CourseTestCas
 from django.core.urlresolvers import reverse
 import json
 
+
 class CourseUpdateTest(CourseTestCase):
     def test_course_update(self):
         # first get the update to force the creation
-        url = reverse('course_info', kwargs={'org' : self.course_location.org, 'course' : self.course_location.course, 
-                                       'name' : self.course_location.name })
+        url = reverse('course_info', kwargs={'org': self.course_location.org, 'course': self.course_location.course,
+                                       'name': self.course_location.name})
         self.client.get(url)
 
         content = '<iframe width="560" height="315" src="http://www.youtube.com/embed/RocY-Jd93XU" frameborder="0"></iframe>'
-        payload = { 'content' : content,
-                   'date' : 'January 8, 2013'}
-        url = reverse('course_info', kwargs={'org' : self.course_location.org, 'course' : self.course_location.course,
-                                             'provided_id' : ''})
-        
+        payload = {'content': content,
+                   'date': 'January 8, 2013'}
+        url = reverse('course_info', kwargs={'org': self.course_location.org, 'course': self.course_location.course,
+                                             'provided_id': ''})
+
         resp = self.client.post(url, json.dumps(payload), "application/json")
-        
-        payload= json.loads(resp.content)
-        
+
+        payload = json.loads(resp.content)
+
         self.assertHTMLEqual(content, payload['content'], "single iframe")
-        
-        url = reverse('course_info', kwargs={'org' : self.course_location.org, 'course' : self.course_location.course,
-                                             'provided_id' : payload['id']})
+
+        url = reverse('course_info', kwargs={'org': self.course_location.org, 'course': self.course_location.course,
+                                             'provided_id': payload['id']})
         content += '<div>div <p>p</p></div>'
         payload['content'] = content
         resp = self.client.post(url, json.dumps(payload), "application/json")
-        
+
         self.assertHTMLEqual(content, json.loads(resp.content)['content'], "iframe w/ div")

cms/djangoapps/contentstore/tests/test_utils.py

-from django.test.testcases import TestCase
 from  cms.djangoapps.contentstore import utils
 import mock
+from django.test import TestCase
+
 
 class LMSLinksTestCase(TestCase):
     def about_page_test(self):
-        location = 'i4x','mitX','101','course', 'test'
+        location = 'i4x', 'mitX', '101', 'course', 'test'
         utils.get_course_id = mock.Mock(return_value="mitX/101/test")
         link = utils.get_lms_link_for_about_page(location)
         self.assertEquals(link, "//localhost:8000/courses/mitX/101/test/about")
 
     def ls_link_test(self):
-        location = 'i4x','mitX','101','vertical', 'contacting_us'
+        location = 'i4x', 'mitX', '101', 'vertical', 'contacting_us'
         utils.get_course_id = mock.Mock(return_value="mitX/101/test")
         link = utils.get_lms_link_for_item(location, False)
         self.assertEquals(link, "//localhost:8000/courses/mitX/101/test/jump_to/i4x://mitX/101/vertical/contacting_us")

cms/djangoapps/contentstore/tests/utils.py

+import json
+import copy
+from time import time
+from django.test import TestCase
+from django.conf import settings
+
+from student.models import Registration
+from django.contrib.auth.models import User
+
+import xmodule.modulestore.django
+from xmodule.templates import update_templates
+
+
+class ModuleStoreTestCase(TestCase):
+    """ Subclass for any test case that uses the mongodb
+    module store. This populates a uniquely named modulestore
+    collection with templates before running the TestCase
+    and drops it they are finished. """
+
+    def _pre_setup(self):
+        super(ModuleStoreTestCase, self)._pre_setup()
+
+        # Use the current seconds since epoch to differentiate
+        # the mongo collections on jenkins.
+        sec_since_epoch = '%s' % int(time() * 100)
+        self.orig_MODULESTORE = copy.deepcopy(settings.MODULESTORE)
+        self.test_MODULESTORE = self.orig_MODULESTORE
+        self.test_MODULESTORE['default']['OPTIONS']['collection'] = 'modulestore_%s' % sec_since_epoch
+        self.test_MODULESTORE['direct']['OPTIONS']['collection'] = 'modulestore_%s' % sec_since_epoch
+        settings.MODULESTORE = self.test_MODULESTORE
+
+        # Flush and initialize the module store
+        # It needs the templates because it creates new records
+        # by cloning from the template.
+        # Note that if your test module gets in some weird state
+        # (though it shouldn't), do this manually
+        # from the bash shell to drop it:
+        # $ mongo test_xmodule --eval "db.dropDatabase()"
+        xmodule.modulestore.django._MODULESTORES = {}
+        update_templates()
+
+    def _post_teardown(self):
+        # Make sure you flush out the modulestore.
+        # Drop the collection at the end of the test,
+        # otherwise there will be lingering collections leftover
+        # from executing the tests.
+        xmodule.modulestore.django._MODULESTORES = {}
+        xmodule.modulestore.django.modulestore().collection.drop()
+        settings.MODULESTORE = self.orig_MODULESTORE
+
+        super(ModuleStoreTestCase, self)._post_teardown()
+
+
+def parse_json(response):
+    """Parse response, which is assumed to be json"""
+    return json.loads(response.content)
+
+
+def user(email):
+    """look up a user by email"""
+    return User.objects.get(email=email)
+
+
+def registration(email):
+    """look up registration object by email"""
+    return Registration.objects.get(user__email=email)

cms/djangoapps/contentstore/utils.py

@@ -5,18 +5,20 @@ from xmodule.modulestore.exceptions import ItemNotFoundError
 
 DIRECT_ONLY_CATEGORIES = ['course', 'chapter', 'sequential', 'about', 'static_tab', 'course_info']
 
+
 def get_modulestore(location):
     """
     Returns the correct modulestore to use for modifying the specified location
     """
     if not isinstance(location, Location):
         location = Location(location)
-        
+
     if location.category in DIRECT_ONLY_CATEGORIES:
         return modulestore('direct')
     else:
         return modulestore()
 
+
 def get_course_location_for_item(location):
     '''
     cdodge: for a given Xmodule, return the course that it belongs to
@@ -46,6 +48,7 @@ def get_course_location_for_item(location):
 
     return location
 
+
 def get_course_for_item(location):
     '''
     cdodge: for a given Xmodule, return the course that it belongs to
@@ -85,6 +88,7 @@ def get_lms_link_for_item(location, preview=False):
 
     return lms_link
 
+
 def get_lms_link_for_about_page(location):
     """
     Returns the url to the course about page from the location tuple.
@@ -99,6 +103,7 @@ def get_lms_link_for_about_page(location):
 
     return lms_link
 
+
 def get_course_id(location):
     """
     Returns the course_id from a given the location tuple.
@@ -106,6 +111,7 @@ def get_course_id(location):
     # TODO: These will need to be changed to point to the particular instance of this problem in the particular course
     return modulestore().get_containing_courses(Location(location))[0].id
 
+
 class UnitState(object):
     draft = 'draft'
     private = 'private'
@@ -135,6 +141,7 @@ def compute_unit_state(unit):
 def get_date_display(date):
     return date.strftime("%d %B, %Y at %I:%M %p")
 
+
 def update_item(location, value):
     """
     If value is None, delete the db entry. Otherwise, update it using the correct modulestore.
@@ -142,4 +149,4 @@ def update_item(location, value):
     if value is None:
         get_modulestore(location).delete_item(location)
     else:
-        get_modulestore(location).update_item(location, value)
+        get_modulestore(location).update_item(location, value)
\ No newline at end of file

cms/djangoapps/models/settings/course_details.py

@@ -31,16 +31,16 @@ class CourseDetails(object):
         """
         if not isinstance(course_location, Location):
             course_location = Location(course_location)
-            
+
         course = cls(course_location)
-        
+
         descriptor = get_modulestore(course_location).get_item(course_location)
-            
+
         course.start_date = descriptor.start
         course.end_date = descriptor.end
         course.enrollment_start = descriptor.enrollment_start
         course.enrollment_end = descriptor.enrollment_end
-        
+
         temploc = course_location._replace(category='about', name='syllabus')
         try:
             course.syllabus = get_modulestore(temploc).get_item(temploc).definition['data']
@@ -52,32 +52,32 @@ class CourseDetails(object):
             course.overview = get_modulestore(temploc).get_item(temploc).definition['data']
         except ItemNotFoundError:
             pass
-        
+
         temploc = temploc._replace(name='effort')
         try:
             course.effort = get_modulestore(temploc).get_item(temploc).definition['data']
         except ItemNotFoundError:
             pass
-        
+
         temploc = temploc._replace(name='video')
         try:
             raw_video = get_modulestore(temploc).get_item(temploc).definition['data']
-            course.intro_video = CourseDetails.parse_video_tag(raw_video) 
+            course.intro_video = CourseDetails.parse_video_tag(raw_video)
         except ItemNotFoundError:
             pass
-        
+
         return course
-        
+
     @classmethod
     def update_from_json(cls, jsondict):
         """
         Decode the json into CourseDetails and save any changed attrs to the db
         """
-        ## TODO make it an error for this to be undefined & for it to not be retrievable from modulestore        
+        ## TODO make it an error for this to be undefined & for it to not be retrievable from modulestore
         course_location = jsondict['course_location']
         ## Will probably want to cache the inflight courses because every blur generates an update
         descriptor = get_modulestore(course_location).get_item(course_location)
-        
+
         dirty = False
 
         if 'start_date' in jsondict:
@@ -87,7 +87,7 @@ class CourseDetails(object):
         if converted != descriptor.start:
             dirty = True
             descriptor.start = converted
-            
+
         if 'end_date' in jsondict:
             converted = jsdate_to_time(jsondict['end_date'])
         else:
@@ -96,7 +96,7 @@ class CourseDetails(object):
         if converted != descriptor.end:
             dirty = True
             descriptor.end = converted
-            
+
         if 'enrollment_start' in jsondict:
             converted = jsdate_to_time(jsondict['enrollment_start'])
         else:
@@ -105,7 +105,7 @@ class CourseDetails(object):
         if converted != descriptor.enrollment_start:
             dirty = True
             descriptor.enrollment_start = converted
-            
+
         if 'enrollment_end' in jsondict:
             converted = jsdate_to_time(jsondict['enrollment_end'])
         else:
@@ -114,10 +114,10 @@ class CourseDetails(object):
         if converted != descriptor.enrollment_end:
             dirty = True
             descriptor.enrollment_end = converted
-            
+
         if dirty:
             get_modulestore(course_location).update_metadata(course_location, descriptor.metadata)
-            
+
         # NOTE: below auto writes to the db w/o verifying that any of the fields actually changed
         # to make faster, could compare against db or could have client send over a list of which fields changed.
         temploc = Location(course_location)._replace(category='about', name='syllabus')
@@ -125,19 +125,19 @@ class CourseDetails(object):
 
         temploc = temploc._replace(name='overview')
         update_item(temploc, jsondict['overview'])
-        
+
         temploc = temploc._replace(name='effort')
         update_item(temploc, jsondict['effort'])
-        
+
         temploc = temploc._replace(name='video')
         recomposed_video_tag = CourseDetails.recompose_video_tag(jsondict['intro_video'])
         update_item(temploc, recomposed_video_tag)
-        
-                    
+
+
         # Could just generate and return a course obj w/o doing any db reads, but I put the reads in as a means to confirm
         # it persisted correctly
         return CourseDetails.fetch(course_location)
-    
+
     @staticmethod
     def parse_video_tag(raw_video):
         """
@@ -147,17 +147,17 @@ class CourseDetails(object):
         """
         if not raw_video:
             return None
-         
+
         keystring_matcher = re.search('(?<=embed/)[a-zA-Z0-9_-]+', raw_video)
         if keystring_matcher is None:
             keystring_matcher = re.search('<?=\d+:[a-zA-Z0-9_-]+', raw_video)
-        
+
         if keystring_matcher:
             return keystring_matcher.group(0)
         else:
             logging.warn("ignoring the content because it doesn't not conform to expected pattern: " + raw_video)
             return None
-    
+
     @staticmethod
     def recompose_video_tag(video_key):
         # TODO should this use a mako template? Of course, my hope is that this is a short-term workaround for the db not storing
@@ -168,7 +168,7 @@ class CourseDetails(object):
                 video_key + '?autoplay=1&rel=0" frameborder="0" allowfullscreen=""></iframe>'
         return result
 
-    
+
 
 # TODO move to a more general util? Is there a better way to do the isinstance model check?
 class CourseSettingsEncoder(json.JSONEncoder):

cms/envs/acceptance.py

 """
-This config file extends the test environment configuration 
+This config file extends the test environment configuration
 so that we can run the lettuce acceptance tests.
 """
 from .test import *
@@ -21,14 +21,14 @@ DATA_DIR = COURSES_ROOT
 #     }
 # }
 
-# Set this up so that rake lms[acceptance] and running the 
+# Set this up so that rake lms[acceptance] and running the
 # harvest command both use the same (test) database
 # which they can flush without messing up your dev db
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.sqlite3',
         'NAME': ENV_ROOT / "db" / "test_mitx.db",
-        'TEST_NAME': ENV_ROOT / "db" / "test_mitx.db",     
+        'TEST_NAME': ENV_ROOT / "db" / "test_mitx.db",
     }
 }
 

cms/envs/common.py

@@ -33,8 +33,8 @@ MITX_FEATURES = {
     'USE_DJANGO_PIPELINE': True,
     'GITHUB_PUSH': False,
     'ENABLE_DISCUSSION_SERVICE': False,
-    'AUTH_USE_MIT_CERTIFICATES' : False,
-    'STUB_VIDEO_FOR_TESTING': False, # do not display video when running automated acceptance tests
+    'AUTH_USE_MIT_CERTIFICATES': False,
+    'STUB_VIDEO_FOR_TESTING': False,   # do not display video when running automated acceptance tests
 }
 ENABLE_JASMINE = False
 
@@ -74,8 +74,8 @@ TEMPLATE_DIRS = MAKO_TEMPLATES['main']
 
 MITX_ROOT_URL = ''
 
-LOGIN_REDIRECT_URL = MITX_ROOT_URL + '/login'
-LOGIN_URL = MITX_ROOT_URL + '/login'
+LOGIN_REDIRECT_URL = MITX_ROOT_URL + '/signin'
+LOGIN_URL = MITX_ROOT_URL + '/signin'
 
 
 TEMPLATE_CONTEXT_PROCESSORS = (
@@ -165,13 +165,6 @@ STATICFILES_DIRS = [
 # This is how you would use the textbook images locally
 #    ("book", ENV_ROOT / "book_images")
 ]
-if os.path.isdir(GITHUB_REPO_ROOT):
-    STATICFILES_DIRS += [
-        # TODO (cpennington): When courses aren't loaded from github, remove this
-        (course_dir, GITHUB_REPO_ROOT / course_dir)
-        for course_dir in os.listdir(GITHUB_REPO_ROOT)
-        if os.path.isdir(GITHUB_REPO_ROOT / course_dir)
-    ]
 
 # Locale/Internationalization
 TIME_ZONE = 'America/New_York'  # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
@@ -229,7 +222,7 @@ PIPELINE_JS = {
         'source_filenames': sorted(
             rooted_glob(COMMON_ROOT / 'static/', 'coffee/src/**/*.coffee') +
             rooted_glob(PROJECT_ROOT / 'static/', 'coffee/src/**/*.coffee')
-        ) + [ 'js/hesitate.js', 'js/base.js'],
+        ) + ['js/hesitate.js', 'js/base.js'],
         'output_filename': 'js/cms-application.js',
     },
     'module-js': {

cms/envs/dev.py

@@ -12,7 +12,7 @@ TEMPLATE_DEBUG = DEBUG
 LOGGING = get_logger_config(ENV_ROOT / "log",
                             logging_env="dev",
                             tracking_filename="tracking.log",
-                            dev_env = True,
+                            dev_env=True,
                             debug=True)
 
 modulestore_options = {
@@ -41,7 +41,7 @@ CONTENTSTORE = {
     'ENGINE': 'xmodule.contentstore.mongo.MongoContentStore',
     'OPTIONS': {
         'host': 'localhost',
-        'db' : 'xcontent',
+        'db': 'xcontent',
     }
 }
 

cms/envs/dev_ike.py

@@ -9,8 +9,6 @@ import socket
 
 MITX_FEATURES['AUTH_USE_MIT_CERTIFICATES'] = True
 
-MITX_FEATURES['USE_DJANGO_PIPELINE']=False      # don't recompile scss
-
-SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTOCOL', 'https')	# django 1.4 for nginx ssl proxy
-
+MITX_FEATURES['USE_DJANGO_PIPELINE'] = False      # don't recompile scss
 
+SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTOCOL', 'https')  	# django 1.4 for nginx ssl proxy

cms/envs/test.py

@@ -11,7 +11,6 @@ from .common import *
 import os
 from path import path
 
-
 # Nose Test Runner
 INSTALLED_APPS += ('django_nose',)
 NOSE_ARGS = ['--with-xunit']
@@ -20,7 +19,7 @@ TEST_RUNNER = 'django_nose.NoseTestSuiteRunner'
 TEST_ROOT = path('test_root')
 
 # Makes the tests run much faster...
-SOUTH_TESTS_MIGRATE = False # To disable migrations and use syncdb instead
+SOUTH_TESTS_MIGRATE = False   # To disable migrations and use syncdb instead
 
 # Want static files in the same dir for running on jenkins.
 STATIC_ROOT = TEST_ROOT / "staticfiles"
@@ -63,7 +62,7 @@ CONTENTSTORE = {
     'ENGINE': 'xmodule.contentstore.mongo.MongoContentStore',
     'OPTIONS': {
         'host': 'localhost',
-        'db' : 'xcontent',
+        'db': 'xcontent',
     }
 }
 
@@ -72,23 +71,12 @@ DATABASES = {
         'ENGINE': 'django.db.backends.sqlite3',
         'NAME': ENV_ROOT / "db" / "cms.db",
     },
-
-    # The following are for testing purposes...
-    'edX/toy/2012_Fall': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': ENV_ROOT / "db" / "course1.db",
-    },
-    
-    'edx/full/6.002_Spring_2012': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': ENV_ROOT / "db" / "course2.db",
-    }
 }
 
 LMS_BASE = "localhost:8000"
 
 CACHES = {
-    # This is the cache used for most things. Askbot will not work without a 
+    # This is the cache used for most things. Askbot will not work without a
     # functioning cache -- it relies on caching to load its settings in places.
     # In staging/prod envs, the sessions also live here.
     'default': {
@@ -115,4 +103,4 @@ CACHES = {
 PASSWORD_HASHERS = (
     'django.contrib.auth.hashers.SHA1PasswordHasher',
     'django.contrib.auth.hashers.MD5PasswordHasher',
-)
+)
\ No newline at end of file

cms/manage.py

@@ -2,7 +2,7 @@
 from django.core.management import execute_manager
 import imp
 try:
-    imp.find_module('settings') # Assumed to be in the same directory.
+    imp.find_module('settings')   # Assumed to be in the same directory.
 except ImportError:
     import sys
     sys.stderr.write("Error: Can't find the file 'settings.py' in the directory containing %r. "

cms/static/client_templates/course_grade_policy.html

-<li class="input input-existing multi course-grading-assignment-list-item">
-	<div class="row row-col2">
-		<label for="course-grading-assignment-name">Assignment Type	Name:</label>
-
-		<div class="field">
-			<div class="input course-grading-assignment-name">
-				<input type="text" class="long"
-					id="course-grading-assignment-name" value="<%= model.get('type') %>"> 
-					<span class="tip tip-stacked">e.g. Homework, Labs, Midterm Exams, Final Exam</span>
-			</div>
-		</div>
-	</div>
-
-	<div class="row row-col2">
-		<label for="course-grading-shortname">Abbreviation:</label>
-
-		<div class="field">
-			<div class="input course-grading-shortname">
-				<input type="text" class="short"
-					id="course-grading-assignment-shortname"
-					value="<%= model.get('short_label') %>"> 
-					<span class="tip tip-inline">e.g. HW, Midterm, Final</span>
-			</div>
-		</div>
-	</div>
-
-	<div class="row row-col2">
-		<label for="course-grading-gradeweight">Weight of Total
-			Grade:</label>
-
-		<div class="field">
-			<div class="input course-grading-gradeweight">
-				<input type="text" class="short"
-					id="course-grading-assignment-gradeweight"
-					value = "<%= model.get('weight') %>"> 
-					<span class="tip tip-inline">e.g. 25%</span>
-			</div>
-		</div>
-	</div>
-
-	<div class="row row-col2">
-		<label for="course-grading-assignment-totalassignments">Total
-			Number:</label>
-
-		<div class="field">
-			<div class="input course-grading-totalassignments">
-				<input type="text" class="short"
-					id="course-grading-assignment-totalassignments"
-                    value = "<%= model.get('min_count') %>"> 
-                    <span class="tip tip-inline">total exercises assigned</span>
-			</div>
-		</div>
-	</div>
-
-	<div class="row row-col2">
-		<label for="course-grading-assignment-droppable">Number of
-			Droppable:</label>
-
-		<div class="field">
-			<div class="input course-grading-droppable">
-				<input type="text" class="short"
-					id="course-grading-assignment-droppable"
-                    value = "<%= model.get('drop_count') %>"> 
-                    <span class="tip tip-inline">total exercises that won't be graded</span>
-			</div>
-		</div>
-	</div>		
-		<a href="#" class="delete-button standard remove-item remove-grading-data"><span class="delete-icon"></span>Delete</a>
+<li class="field-group course-grading-assignment-list-item">
+  <div class="field text" id="field-course-grading-assignment-name">
+  	<label for="course-grading-assignment-name">Assignment Type	Name</label>
+  	<input type="text" class="long" id="course-grading-assignment-name" value="<%= model.get('type') %>" /> 
+  	<span class="tip tip-stacked">e.g. Homework, Midterm Exams</span> 
+  </div>
+
+  <div class="field text" id="field-course-grading-assignment-shortname">
+    <label for="course-grading-assignment-shortname">Abbreviation:</label>
+    <input type="text" class="short" id="course-grading-assignment-shortname" value="<%= model.get('short_label') %>" /> 
+    <span class="tip tip-inline">e.g. HW, Midterm</span>
+  </div>
+  
+  <div class="field text" id="field-course-grading-assignment-gradeweight">
+    <label for="course-grading-assignment-gradeweight">Weight of Total Grade</label>
+    <input type="text" class="short" id="course-grading-assignment-gradeweight" value = "<%= model.get('weight') %>" /> 
+    <span class="tip tip-inline">e.g. 25%</span>
+  </div>
+  
+  <div class="field text" id="field-course-grading-assignment-totalassignments">
+    <label for="course-grading-assignment-totalassignments">Total
+			Number</label>
+    <input type="text" class="short" id="course-grading-assignment-totalassignments" value = "<%= model.get('min_count') %>" /> 
+    <span class="tip tip-inline">total exercises assigned</span>
+  </div>
+  
+  <div class="field text" id="field-course-grading-assignment-droppable">
+    <label for="course-grading-assignment-droppable">Number of
+			Droppable</label>
+    <input type="text" class="short" id="course-grading-assignment-droppable" value = "<%= model.get('drop_count') %>" />
+    <span class="tip tip-inline">total exercises that won't be graded</span>
+  </div>
+  
+  <div class="actions">
+  	<a href="#" class="button delete-button standard remove-item remove-grading-data"><span class="delete-icon"></span>Delete</a>
+  </div>
 </li>

cms/static/js/models/settings/course_details.js

 if (!CMS.Models['Settings']) CMS.Models.Settings = new Object();
 
 CMS.Models.Settings.CourseDetails = Backbone.Model.extend({
-	defaults: {
-		location : null,	// the course's Location model, required
-		start_date: null,	// maps to 'start'
-		end_date: null,		// maps to 'end'
-		enrollment_start: null,
-		enrollment_end: null,
-		syllabus: null,
-		overview: "",
-		intro_video: null,
-		effort: null	// an int or null
-	},
-	
-	// When init'g from html script, ensure you pass {parse: true} as an option (2nd arg to reset)
-	parse: function(attributes) {
-		if (attributes['course_location']) {
-			attributes.location = new CMS.Models.Location(attributes.course_location, {parse:true});
-		}
-		if (attributes['start_date']) {
-			attributes.start_date = new Date(attributes.start_date);
-		}
-		if (attributes['end_date']) {
-			attributes.end_date = new Date(attributes.end_date);
-		}
-		if (attributes['enrollment_start']) {
-			attributes.enrollment_start = new Date(attributes.enrollment_start);
-		}
-		if (attributes['enrollment_end']) {
-			attributes.enrollment_end = new Date(attributes.enrollment_end);
-		}
-		return attributes;
-	},
-	
-	validate: function(newattrs) {
-		// Returns either nothing (no return call) so that validate works or an object of {field: errorstring} pairs
-		// A bit funny in that the video key validation is asynchronous; so, it won't stop the validation.
-		var errors = {};
-		if (newattrs.start_date && newattrs.end_date && newattrs.start_date >= newattrs.end_date) {
-			errors.end_date = "The course end date cannot be before the course start date.";
-		}
-		if (newattrs.start_date && newattrs.enrollment_start && newattrs.start_date < newattrs.enrollment_start) {
-			errors.enrollment_start = "The course start date cannot be before the enrollment start date.";
-		}
-		if (newattrs.enrollment_start && newattrs.enrollment_end && newattrs.enrollment_start >= newattrs.enrollment_end) {
-			errors.enrollment_end = "The enrollment start date cannot be after the enrollment end date.";
-		}
-		if (newattrs.end_date && newattrs.enrollment_end && newattrs.end_date < newattrs.enrollment_end) {
-			errors.enrollment_end = "The enrollment end date cannot be after the course end date.";
-		}
-		if (newattrs.intro_video && newattrs.intro_video !== this.get('intro_video')) {
-			if (this._videokey_illegal_chars.exec(newattrs.intro_video)) {
-				errors.intro_video = "Key should only contain letters, numbers, _, or -";
-			}
-			// TODO check if key points to a real video using google's youtube api
-		}
-		if (!_.isEmpty(errors)) return errors;
-		// NOTE don't return empty errors as that will be interpreted as an error state
-	},
-	
-	url: function() {
-		var location = this.get('location');
-		return '/' + location.get('org') + "/" + location.get('course') + '/settings/' + location.get('name') + '/section/details';
-	},
-	
-	_videokey_illegal_chars : /[^a-zA-Z0-9_-]/g,
-	save_videosource: function(newsource) {
-		// newsource either is <video youtube="speed:key, *"/> or just the "speed:key, *" string
-		// returns the videosource for the preview which iss the key whose speed is closest to 1
-		if (_.isEmpty(newsource) && !_.isEmpty(this.get('intro_video'))) this.save({'intro_video': null},
-				{ error : CMS.ServerError}); 
-		// TODO remove all whitespace w/in string
-		else {
-			if (this.get('intro_video') !== newsource) this.save('intro_video', newsource,
-					{ error : CMS.ServerError});
-		}
-		
-		return this.videosourceSample();
-	},
-	videosourceSample : function() {
-		 if (this.has('intro_video')) return "http://www.youtube.com/embed/" + this.get('intro_video');
-		 else return "";
-	}
+    defaults: {
+        location : null,	// the course's Location model, required
+        start_date: null,	// maps to 'start'
+        end_date: null,		// maps to 'end'
+        enrollment_start: null,
+        enrollment_end: null,
+        syllabus: null,
+        overview: "",
+        intro_video: null,
+        effort: null	// an int or null
+    },
+
+    // When init'g from html script, ensure you pass {parse: true} as an option (2nd arg to reset)
+    parse: function(attributes) {
+        if (attributes['course_location']) {
+            attributes.location = new CMS.Models.Location(attributes.course_location, {parse:true});
+        }
+        if (attributes['start_date']) {
+            attributes.start_date = new Date(attributes.start_date);
+        }
+        if (attributes['end_date']) {
+            attributes.end_date = new Date(attributes.end_date);
+        }
+        if (attributes['enrollment_start']) {
+            attributes.enrollment_start = new Date(attributes.enrollment_start);
+        }
+        if (attributes['enrollment_end']) {
+            attributes.enrollment_end = new Date(attributes.enrollment_end);
+        }
+        return attributes;
+    },
+
+    validate: function(newattrs) {
+        // Returns either nothing (no return call) so that validate works or an object of {field: errorstring} pairs
+        // A bit funny in that the video key validation is asynchronous; so, it won't stop the validation.
+        var errors = {};
+        if (newattrs.start_date && newattrs.end_date && newattrs.start_date >= newattrs.end_date) {
+            errors.end_date = "The course end date cannot be before the course start date.";
+        }
+        if (newattrs.start_date && newattrs.enrollment_start && newattrs.start_date < newattrs.enrollment_start) {
+            errors.enrollment_start = "The course start date cannot be before the enrollment start date.";
+        }
+        if (newattrs.enrollment_start && newattrs.enrollment_end && newattrs.enrollment_start >= newattrs.enrollment_end) {
+            errors.enrollment_end = "The enrollment start date cannot be after the enrollment end date.";
+        }
+        if (newattrs.end_date && newattrs.enrollment_end && newattrs.end_date < newattrs.enrollment_end) {
+            errors.enrollment_end = "The enrollment end date cannot be after the course end date.";
+        }
+        if (newattrs.intro_video && newattrs.intro_video !== this.get('intro_video')) {
+            if (this._videokey_illegal_chars.exec(newattrs.intro_video)) {
+                errors.intro_video = "Key should only contain letters, numbers, _, or -";
+            }
+            // TODO check if key points to a real video using google's youtube api
+        }
+        if (!_.isEmpty(errors)) return errors;
+        // NOTE don't return empty errors as that will be interpreted as an error state
+    },
+
+    url: function() {
+        var location = this.get('location');
+        return '/' + location.get('org') + "/" + location.get('course') + '/settings-details/' + location.get('name') + '/section/details';
+    },
+
+    _videokey_illegal_chars : /[^a-zA-Z0-9_-]/g,
+    save_videosource: function(newsource) {
+        // newsource either is <video youtube="speed:key, *"/> or just the "speed:key, *" string
+        // returns the videosource for the preview which iss the key whose speed is closest to 1
+        if (_.isEmpty(newsource) && !_.isEmpty(this.get('intro_video'))) this.set({'intro_video': null}); 
+        // TODO remove all whitespace w/in string
+        else {
+            if (this.get('intro_video') !== newsource) this.set('intro_video', newsource);
+        }
+
+        return this.videosourceSample();
+    },
+    videosourceSample : function() {
+        if (this.has('intro_video')) return "http://www.youtube.com/embed/" + this.get('intro_video');
+        else return "";
+    }
 });

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);
             }
@@ -27,7 +28,7 @@ CMS.Models.Settings.CourseGradingPolicy = Backbone.Model.extend({
     },
     url : function() {
         var location = this.get('course_location');
-        return '/' + location.get('org') + "/" + location.get('course') + '/settings/' + location.get('name') + '/section/grading';
+        return '/' + location.get('org') + "/" + location.get('course') + '/settings-details/' + location.get('name') + '/section/grading';
     },
     gracePeriodToDate : function() {
         var newDate = new Date();
@@ -119,7 +120,7 @@ CMS.Models.Settings.CourseGraderCollection = Backbone.Collection.extend({
     model : CMS.Models.Settings.CourseGrader,
     course_location : null, // must be set to a Location object
     url : function() {
-        return '/' + this.course_location.get('org') + "/" + this.course_location.get('course') + '/grades/' + this.course_location.get('name') + '/';
+        return '/' + this.course_location.get('org') + "/" + this.course_location.get('course') + '/settings-grading/' + this.course_location.get('name') + '/';
     },
     sumWeights : function() {
         return this.reduce(function(subtotal, grader) { return subtotal + grader.get('weight'); }, 0);

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

 if (!CMS.Models['Settings']) CMS.Models.Settings = new Object();
 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,
-		problems: null,
-		discussions: null
-	},
+    // a container for the models representing the n possible tabbed states
+    defaults: {
+        courseLocation: null,
+        details: null,
+        faculty: null,
+        grading: null,
+        problems: null,
+        discussions: null
+    },
 
-	retrieve: function(submodel, callback) {
-		if (this.get(submodel)) callback();
-		else {
-			var cachethis = this;
-			switch (submodel) {
-			case 'details':
-				var details = new CMS.Models.Settings.CourseDetails({location: this.get('courseLocation')});
-				details.fetch( {
-					success : function(model) {
-						cachethis.set('details', model);
-						callback(model);
-					}
-				});
-				break;
-			case 'grading':
-				var grading = new CMS.Models.Settings.CourseGradingPolicy({course_location: this.get('courseLocation')});
-				grading.fetch( {
-					success : function(model) {
-						cachethis.set('grading', model);
-						callback(model);
-					}
-				});
-				break;
+    retrieve: function(submodel, callback) {
+        if (this.get(submodel)) callback();
+        else {
+            var cachethis = this;
+            switch (submodel) {
+            case 'details':
+                var details = new CMS.Models.Settings.CourseDetails({location: this.get('courseLocation')});
+                details.fetch( {
+                    success : function(model) {
+                        cachethis.set('details', model);
+                        callback(model);
+                    }
+                });
+                break;
+            case 'grading':
+                var grading = new CMS.Models.Settings.CourseGradingPolicy({course_location: this.get('courseLocation')});
+                grading.fetch( {
+                    success : function(model) {
+                        cachethis.set('grading', model);
+                        callback(model);
+                    }
+                });
+                break;
 
-			default:
-				break;
-			}
-		}
-	}
+            default:
+                break;
+            }
+        }
+    }
 })
\ No newline at end of file

cms/static/js/views/overview.js

@@ -58,6 +58,9 @@ $(document).ready(function() {
         drop: onSectionReordered,
         greedy: true
     });
+    
+    // stop clicks on drag bars from doing their thing w/o stopping drag
+    $('.drag-handle').click(function(e) {e.preventDefault(); });
 
 });
 
@@ -202,13 +205,17 @@ function _handleReorder(event, ui, parentIdField, childrenSelector) {
                 children = _.without(children, ui.draggable.data('id'));
         }
         // add to this parent (figure out where)
-        for (var i = 0; i < _els.length; i++) {
-                if (!ui.draggable.is(_els[i]) && ui.offset.top < $(_els[i]).offset().top) {
+        for (var i = 0, bump = 0; i < _els.length; i++) {
+            if (ui.draggable.is(_els[i])) {
+                bump = -1; // bump indicates that the draggable was passed in the dom but not children's list b/c
+                // it's not in that list
+            }
+            else if (ui.offset.top < $(_els[i]).offset().top) {
                         // insert at i in children and _els
                         ui.draggable.insertBefore($(_els[i]));
                         // TODO figure out correct way to have it remove the style: top:n; setting (and similar line below)
                         ui.draggable.attr("style", "position:relative;");
-                        children.splice(i, 0, ui.draggable.data('id'));
+                        children.splice(i + bump, 0, ui.draggable.data('id'));
                         break;
                 }
         }

cms/static/js/views/validating_view.js

+CMS.Views.ValidatingView = Backbone.View.extend({
+    // Intended as an abstract class which catches validation errors on the model and 
+    // decorates the fields. Needs wiring per class, but this initialization shows how 
+    // either have your init call this one or copy the contents
+    initialize : function() {
+        this.model.on('error', this.handleValidationError, this);
+        this.selectorToField = _.invert(this.fieldToSelectorMap);
+    },
+
+    errorTemplate : _.template('<span class="message-error"><%= message %></span>'),
+
+    events : {
+        "blur input" : "clearValidationErrors",
+        "blur textarea" : "clearValidationErrors"
+    },
+    fieldToSelectorMap : {
+        // Your subclass must populate this w/ all of the model keys and dom selectors 
+        // which may be the subjects of validation errors
+    },
+    _cacheValidationErrors : [],
+    handleValidationError : function(model, error) {
+        // error triggered either by validation or server error
+        // error is object w/ fields and error strings
+        for (var field in error) {
+            var ele = this.$el.find('#' + this.fieldToSelectorMap[field]);
+            if (ele.length === 0) {
+                // check if it might a server error: note a typo in the field name 
+                // or failure to put in a map may cause this to muffle validation errors
+                if (_.has(error, 'error') && _.has(error, 'responseText')) {
+                    CMS.ServerError(model, error);
+                    return;
+                }
+                else continue;
+            }
+            this._cacheValidationErrors.push(ele);
+            if ($(ele).is('div')) {
+                // put error on the contained inputs
+                $(ele).find('input, textarea').addClass('error');
+            }
+            else $(ele).addClass('error');
+            $(ele).parent().append(this.errorTemplate({message : error[field]}));
+        }
+    },
+
+    clearValidationErrors : function() {
+        // error is object w/ fields and error strings
+        while (this._cacheValidationErrors.length > 0) {
+            var ele = this._cacheValidationErrors.pop(); 
+            if ($(ele).is('div')) {
+                // put error on the contained inputs
+                $(ele).find('input, textarea').removeClass('error');
+            }
+            else $(ele).removeClass('error');
+            $(ele).nextAll('.message-error').remove();
+        }
+    },
+
+    saveIfChanged : function(event) {
+        // returns true if the value changed and was thus sent to server
+        var field = this.selectorToField[event.currentTarget.id];
+        var currentVal = this.model.get(field);
+        var newVal = $(event.currentTarget).val();
+        this.clearValidationErrors(); // curr = new if user reverts manually
+        if (currentVal != newVal) {
+            this.model.save(field, newVal);
+            return true;
+        }
+        else return false;
+    },
+    // these should perhaps go into a superclass but lack of event hash inheritance demotivates me
+    inputFocus : function(event) {
+        $("label[for='" + event.currentTarget.id + "']").addClass("is-focused");
+    },
+    inputUnfocus : function(event) {
+        $("label[for='" + event.currentTarget.id + "']").removeClass("is-focused");
+    }
+});

cms/static/sass/_account.scss

+// Studio - Sign In/Up
+// ====================
+body.signup, body.signin {
+
+  .wrapper-content {
+    margin: 0;
+    padding: 0 $baseline;
+    position: relative;
+    width: 100%;
+  }
+
+  .content {
+    @include clearfix();
+    @include font-size(16);
+    max-width: $fg-max-width;
+    min-width: $fg-min-width;
+    width: flex-grid(12);
+    margin: 0 auto;
+    color: $gray-d2;
+    
+    header {
+      position: relative;
+      margin-bottom: $baseline;
+      border-bottom: 1px solid $gray-l4;
+      padding-bottom: ($baseline/2);
+
+      h1 {
+        @include font-size(32);
+        margin: 0;
+        padding: 0;
+        font-weight: 600;
+      }
+
+      .action {
+        @include font-size(13);
+        position: absolute;
+        right: 0;
+        top: 40%;
+      }
+    }
+
+    .introduction {
+      @include font-size(14);
+      margin: 0 0 $baseline 0;
+    }
+  }
+
+  .content-primary, .content-supplementary {
+    @include box-sizing(border-box);
+    float: left;
+  }
+
+  .content-primary {
+    width: flex-grid(8, 12);
+    margin-right: flex-gutter();
+
+    form {
+      @include box-sizing(border-box);
+      @include box-shadow(0 1px 2px $shadow-l1);
+      @include border-radius(2px);
+      width: 100%;
+      border: 1px solid $gray-l2;
+      padding: $baseline ($baseline*1.5);
+      background: $white;
+
+      .form-actions {
+        margin-top: $baseline;
+
+        .action-primary {
+          @include blue-button;
+          @include transition(all .15s);
+          @include font-size(15);
+          display:block;
+          width: 100%;
+          padding: ($baseline*0.75) ($baseline/2);
+          font-weight: 600;
+          text-transform: uppercase;
+        }
+      }
+
+      .list-input {
+        margin: 0;
+        padding: 0;
+        list-style: none;
+
+        .field {
+          margin: 0 0 ($baseline*0.75) 0;
+
+          &:last-child {
+            margin-bottom: 0;
+          }
+
+          &.required {
+
+            label {
+              font-weight: 600;
+            }
+
+            label:after {
+              margin-left: ($baseline/4);
+              content: "*";
+            }
+          }
+
+          label, input, textarea {
+            display: block;
+          }
+
+          label {
+            @include font-size(14);
+            @include transition(color, 0.15s, ease-in-out);
+            margin: 0 0 ($baseline/4) 0;
+
+            &.is-focused {
+              color: $blue;
+            }
+          }
+
+          input, textarea {
+            @include font-size(16);
+            height: 100%;
+            width: 100%;
+            padding: ($baseline/2);       
+
+            &.long {
+              width: 100%;
+            }
+
+            &.short {
+              width: 25%;
+            }
+
+            ::-webkit-input-placeholder {
+               color: $gray-l4;
+            }
+
+            :-moz-placeholder {
+               color: $gray-l3; 
+            }
+
+            ::-moz-placeholder {
+               color: $gray-l3;  
+            }
+
+            :-ms-input-placeholder {  
+               color: $gray-l3; 
+            }
+
+            &:focus {
+
+              + .tip {
+                color: $gray;
+              }
+            }
+          }
+
+          textarea.long {
+            height: ($baseline*5);
+          }
+
+          input[type="checkbox"] {
+            display: inline-block;
+            margin-right: ($baseline/4);
+            width: auto;
+            height: auto;
+
+            & + label {
+              display: inline-block;
+            }
+          }
+
+          .tip {
+            @include transition(color, 0.15s, ease-in-out);
+            @include font-size(13);
+            display: block;
+            margin-top: ($baseline/4);
+            color: $gray-l3;
+          }
+        }
+
+        .field-group {
+          @include clearfix();
+          margin: 0 0 ($baseline/2) 0;
+
+          .field {
+            display: block;
+            width: 47%;
+            border-bottom: none;
+            margin: 0 $baseline 0 0;
+            padding-bottom: 0;
+
+            &:nth-child(odd) {
+              float: left;
+            }
+
+            &:nth-child(even) {
+              float: right;
+              margin-right: 0;
+            }
+
+            input, textarea {
+              width: 100%;
+            }
+          }
+        }
+      }
+    }
+  }
+
+  .content-supplementary {
+    width: flex-grid(4, 12);
+
+    .bit {
+      @include font-size(13);
+      margin: 0 0 $baseline 0;
+      border-bottom: 1px solid $gray-l4;
+      padding: 0 0 $baseline 0;
+      color: $gray-l1;
+
+      &:last-child {
+        margin-bottom: 0;
+        border: none;
+        padding-bottom: 0;
+      }
+
+      h3 {
+        @include font-size(14);
+        margin: 0 0 ($baseline/4) 0;
+        color: $gray-d2;
+        font-weight: 600;
+      }
+
+    }
+  }
+}
+
+.signup {
+
+}
+
+.signin {
+
+  #field-password {
+    position: relative;
+
+    .action-forgotpassword {
+      @include font-size(13);
+      position: absolute;
+      top: 0;
+      right: 0;
+    }
+  }
+}
+
+// ====================
+
+// messages
+.message {
+  @include font-size(14);
+  display: block;
+}
+
+.message-status {
+  display: none;
+  @include border-top-radius(2px);
+  @include box-sizing(border-box);
+  border-bottom: 2px solid $yellow-d2;
+  margin: 0 0 $baseline 0;
+  padding: ($baseline/2) $baseline;
+  font-weight: 500;
+  background: $yellow-d1;
+  color: $white;
+
+  .ss-icon {
+    position: relative;
+    top: 3px;
+    @include font-size(16);
+    display: inline-block;
+    margin-right: ($baseline/2);
+  }
+
+  .text {
+    display: inline-block;
+  }
+
+  &.error {
+    border-color: shade($red, 50%);
+    background: tint($red, 20%);
+  }
+
+  &.is-shown {
+    display: block;
+  }
+}

cms/static/sass/_assets.scss

-.assets {
+.uploads {
   input.asset-search-input {
     float: left;
     width: 260px;

cms/static/sass/_cms_mixins.scss

@@ -28,7 +28,7 @@
 		}
 	}
 
-	&:hover {
+	&:hover, &.active {
 		@include box-shadow(0 1px 0 rgba(255, 255, 255, .3) inset, 0 1px 1px rgba(0, 0, 0, .15));
 	}
 }
@@ -41,7 +41,7 @@
 	background-color: $blue;
 	color: #fff;
 
-	&:hover {
+	&:hover, &.active {
 		background-color: #62aaf5;
 		color: #fff;
 	}
@@ -285,4 +285,11 @@
   padding: 0; 
   position: absolute; 
   width: 1px;
+}
+
+@mixin active {
+	@include linear-gradient(top, rgba(255, 255, 255, .4), rgba(255, 255, 255, 0));
+	background-color: rgba(255, 255, 255, .3);
+	@include box-shadow(0 -1px 0 rgba(0, 0, 0, .2) inset, 0 1px 0 #fff inset);
+	text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
 }
\ No newline at end of file

cms/static/sass/_extends.scss

+.faded-hr-divider {
+  @include background-image(linear-gradient(180deg, rgba(200,200,200, 0) 0%,
+                                                    rgba(200,200,200, 1) 50%,
+                                                    rgba(200,200,200, 0)));
+  height: 1px;
+  width: 100%;
+}
+
+.faded-hr-divider-medium {
+  @include background-image(linear-gradient(180deg, rgba(240,240,240, 0) 0%,
+                                                    rgba(240,240,240, 1) 50%,
+                                                    rgba(240,240,240, 0)));
+  height: 1px;
+  width: 100%;
+}
+
+.faded-hr-divider-light {
+  @include background-image(linear-gradient(180deg, rgba(255,255,255, 0) 0%,
+                                                    rgba(255,255,255, 0.8) 50%,
+                                                    rgba(255,255,255, 0)));
+  height: 1px;
+  width: 100%;
+}
+
+.faded-vertical-divider {
+  @include background-image(linear-gradient(90deg, rgba(200,200,200, 0) 0%,
+                                                    rgba(200,200,200, 1) 50%,
+                                                    rgba(200,200,200, 0)));
+  height: 100%;
+  width: 1px;
+}
+
+.faded-vertical-divider-light {
+  @include background-image(linear-gradient(90deg, rgba(255,255,255, 0) 0%,
+                                                    rgba(255,255,255, 0.6) 50%,
+                                                    rgba(255,255,255, 0)));
+  height: 100%;
+  width: 1px;
+}
+
+.vertical-divider {
+  @extend .faded-vertical-divider;
+  position: relative;
+
+  &::after {
+    @extend .faded-vertical-divider-light;
+    content: "";
+    display: block;
+    position: absolute;
+    left: 1px;
+  }
+}
+
+.horizontal-divider {
+  border: none;
+  @extend .faded-hr-divider;
+  position: relative;
+
+  &::after {
+    @extend .faded-hr-divider-light;
+    content: "";
+    display: block;
+    position: absolute;
+    top: 1px;
+  }
+}
+
+.fade-right-hr-divider {
+  @include background-image(linear-gradient(180deg, rgba(200,200,200, 0) 0%,
+                                                    rgba(200,200,200, 1)));
+  border: none;
+}
+
+.fade-left-hr-divider {
+  @include background-image(linear-gradient(180deg, rgba(200,200,200, 1) 0%,
+                                                    rgba(200,200,200, 0)));
+  border: none;
+}
\ No newline at end of file

cms/static/sass/_footer.scss

+//studio global footer
+.wrapper-footer {
+  margin: ($baseline*1.5) 0 $baseline 0;
+  padding: $baseline;
+  position: relative;
+  width: 100%;
+
+  footer.primary {
+    @include clearfix();
+    @include font-size(13);
+    max-width: $fg-max-width;
+    min-width: $fg-min-width;
+    width: flex-grid(12);
+    margin: 0 auto;
+    padding-top: $baseline;
+    border-top: 1px solid $gray-l4;
+    color: $gray-l2;
+
+    .colophon {
+      width: flex-grid(4, 12);
+      float: left;
+      margin-right: flex-gutter(2);
+    }
+
+    .nav-peripheral {
+      width: flex-grid(6, 12);
+      float: right;
+      text-align: right;
+
+      .nav-item {
+        display: inline-block;
+        margin-right: ($baseline/2);
+
+        &:last-child {
+          margin-right: 0;
+        }
+      }
+    }
+
+    a {
+      color: $gray-l1;
+
+      &:hover, &:active {
+        color: $blue;
+      }
+    }
+  }
+}
\ No newline at end of file

cms/static/sass/_modal.scss

@@ -54,4 +54,16 @@
 		@include white-button;
 		margin-top: 13px;
 	}
+}
+
+// lean modal alternative
+#lean_overlay {
+	position: fixed;
+	z-index: 10000;
+	top: 0px;
+	left: 0px;
+	display: none;
+	height: 100%;
+	width: 100%;
+	background: $black;
 }
\ No newline at end of file

cms/static/sass/_reset.scss

@@ -54,4 +54,118 @@ del {
 table {
 	border-collapse: collapse;
 	border-spacing: 0;
+}
+
+/* Reset styles to remove ui-lightness jquery ui theme 
+from the tabs component (used in the add component problem tab menu) 
+*/
+
+.ui-tabs {
+	padding: 0;
+	white-space: normal;
+}
+
+.ui-corner-all, .ui-corner-bottom, .ui-corner-left, ui-corner-top, .ui-corner-br, .ui-corner-right {
+	border-bottom-right-radius: 0;
+	border-bottom-left-radius: 0;
+	border-top-right-radius: 0;
+	border-top-left-radius: 0;
+}
+
+
+.ui-widget-content {
+	border: 0;
+	background: none;
+}
+.ui-widget {
+	font-family: 'Open Sans', sans-serif;
+	font-size: 16px;
+}
+
+.ui-widget-header {
+	border:none;
+	background: none;
+}
+
+.ui-tabs .ui-tabs-nav {
+	padding: 0;
+}
+
+.ui-tabs .ui-tabs-nav li {
+	margin: 0;
+	padding: 0;
+	border: none;
+	top: 0;
+	margin: 0;
+	float: none; 
+	border-top-left-radius: 0;
+	border-top-right-radius: 0;
+}
+
+.ui-tabs-nav {
+
+	li {
+		top: 0;
+		margin: 0;
+	}
+	a {
+		float: none;
+		font-weight: normal;
+	}
+}
+
+.ui-tabs .ui-tabs-panel {
+	padding: 0;
+}
+
+/* reapplying the tab styles from unit.scss after 
+removing jquery ui ui-lightness styling 
+*/
+
+.problem-type-tabs {
+	border:none;
+	list-style-type: none;
+	width: 100%;
+	@include linear-gradient(top, rgba(255, 255, 255, .4), rgba(255, 255, 255, 0));
+	//background-color: $lightBluishGrey;
+	@include box-shadow(0 1px 0 rgba(255, 255, 255, 0.2) inset, 0 -1px 0 rgba(0, 0, 0, 0.2) inset);
+	
+	li:first-child {
+		margin-left: 20px;
+	}
+	li {
+		opacity: .8;
+
+		&:ui-state-active {
+			background-color: rgba(255, 255, 255, .3);
+			opacity: 1;
+			font-weight: 400;
+		}
+		a:focus {
+			outline: none;
+			border: 0px;
+		}
+	}
+/*
+	li {
+		float:left;
+		display:inline-block;
+		text-align:center;
+		width: auto;
+		//@include linear-gradient(top, rgba(255, 255, 255, .4), rgba(255, 255, 255, 0));
+		//background-color: tint($lightBluishGrey, 20%);
+		//@include box-shadow(0 1px 0 rgba(255, 255, 255, 0.2) inset, 0 -1px 0 rgba(0, 0, 0, 0.2) inset);
+		opacity:.8;
+
+		&:hover {
+		  opacity:1;
+		}
+
+		&.current {
+		  border: 0px;
+		  //@include active;
+		  opacity:1;
+		}
+	}
+*/
 }
\ No newline at end of file

cms/static/sass/_static-pages.scss

@@ -29,6 +29,7 @@
 
     &.new-component-item {
       margin-top: 20px;
+      background: transparent;
     }
   }
 

cms/static/sass/_subsection.scss

+.subsection .main-wrapper {
+  margin: 40px;
+}
+
+.subsection .inner-wrapper {
+  @include clearfix();
+}
+
 .subsection-body {
 	padding: 32px 40px;
 	@include clearfix;

cms/static/sass/_unit.scss

-.unit .main-wrapper,
-.subsection .main-wrapper {
+.unit .main-wrapper {
+  @include clearfix();
   margin: 40px;
 }
 
+//Problem Selector tab menu requirements
+.js .tabs .tab {
+ display: none;
+}
+//end problem selector reqs
+
 .main-column {
   clear: both;
   float: left;
@@ -58,6 +64,7 @@
       margin: 20px 40px;
 
 
+
       .title {
         margin: 0 0 15px 0;
         color: $mediumGrey;
@@ -67,22 +74,25 @@
       }
 
       &.new-component-item {
-        padding: 20px;
-        border: none;
-        border-radius: 3px;
-        background: $lightGrey;
+        margin: 20px 0px;
+        border-top: 1px solid $mediumGrey;
+        box-shadow: 0 2px 1px rgba(182, 182, 182, 0.75) inset;
+        background-color: $lightGrey;
+        margin-bottom: 0px;
+        padding-bottom: 20px;
 
         .new-component-button {
           display: block;
           padding: 20px;
           text-align: center;
-          color: #6d788b;
+          color: #edf1f5;
         }
 
         h5 {
-          margin-bottom: 8px;
+          margin: 20px 0px;
           color: #fff;
-          font-weight: 700;
+          font-weight: 600;
+          font-size: 18px;
         }
 
         .rendered-component {
@@ -92,18 +102,21 @@
         }
 
         .new-component-type {
+
           a,
           li {
             display: inline-block;
           }
 
           a {
+            border: 1px solid $mediumGrey;
             width: 100px;
             height: 100px;
-            margin-right: 10px;
-            margin-bottom: 10px;
+            color: #fff;
+            margin-right: 15px;
+            margin-bottom: 20px;
             border-radius: 8px;
-            font-size: 13px;
+            font-size: 15px;
             line-height: 14px;
             text-align: center;
             @include box-shadow(0 1px 1px rgba(0, 0, 0, .2), 0 1px 0 rgba(255, 255, 255, .4) inset);
@@ -115,25 +128,40 @@
               width: 100%;
               padding: 10px;
               @include box-sizing(border-box);
+              color: #fff;
             }
           }
         }
 
         .new-component-templates {
           display: none;
-          padding: 20px;
+          margin: 20px 40px 20px 40px;
+          border-radius: 3px;
+          border: 1px solid $mediumGrey;
+          background-color: #fff;
+          @include box-shadow(0 1px 1px rgba(0, 0, 0, .2), 0 1px 0 rgba(255, 255, 255, .4) inset);
           @include clearfix;
 
           .cancel-button {
+            margin: 20px 0px 10px 10px;
             @include white-button;
           }
 
+          .problem-type-tabs {
+            display: none;
+          }
+
           // specific menu types
           &.new-component-problem {
+            padding-bottom:10px;
 
             .ss-icon, .editor-indicator {
               display: inline-block;
             }
+
+            .problem-type-tabs {
+              display: inline-block;
+            }
           }
         }
 
@@ -146,7 +174,6 @@
             border: 1px solid $darkGreen;
             background: tint($green,20%);
             color: #fff;            
-            @include transition(background-color .15s);
 
             &:hover {
               background: $brightGreen;
@@ -154,19 +181,81 @@
           }
         }
 
+        .problem-type-tabs {
+          list-style-type: none;
+          border-radius: 0;
+          width: 100%;
+          @include linear-gradient(top, rgba(255, 255, 255, .4), rgba(255, 255, 255, 0));
+          background-color: $lightBluishGrey;
+          @include box-shadow(0 1px 0 rgba(255, 255, 255, 0.2) inset, 0 -1px 0 rgba(0, 0, 0, 0.2) inset);
+
+          li:first-child {
+            margin-left: 20px;
+          }
+
+          li {
+            float:left;
+            display:inline-block;
+            text-align:center;
+            width: auto;
+            @include linear-gradient(top, rgba(255, 255, 255, .4), rgba(255, 255, 255, 0));
+            background-color: tint($lightBluishGrey, 10%);
+            @include box-shadow(0 1px 0 rgba(255, 255, 255, 0.2) inset, 0 -1px 0 rgba(0, 0, 0, 0.2) inset);
+            opacity:.8;
+
+            &:hover {
+              opacity:1;
+              background-color: tint($lightBluishGrey, 20%);
+            }
+
+            &.ui-state-active {
+              border: 0px;
+              @include active;
+              opacity:1;
+            }
+          }
+
+          a{
+            display: block;
+            padding: 15px 25px;
+            font-size: 15px;
+            line-height: 16px;
+            text-align: center;
+            color: #3c3c3c;
+            text-shadow: 0 1px 0 rgba(255, 255, 255, 0.3);
+          }
+        }
+
         .new-component-template {
-          margin-bottom: 20px;
 
-          li:last-child {
+          a {
+            background: #fff;
+            border: 0px;
+            color: #3c3c3c;
+            @include transition (none);
+
+            &:hover {
+              background: tint($green,30%); 
+              color: #fff;        
+              @include transition(background-color .15s);
+            }
+          }
+
+          li {
+              border:none;
+              border-bottom: 1px dashed $lightGrey;
+              color: #fff;      
+          }
+
+          li:first-child {
             a {
-              border-radius: 0 0 3px 3px;
-              border-bottom: 1px solid $darkGreen;
+              border-top: 0px;
             }
           }
 
           li:nth-child(2) {
             a {
-              border-radius: 3px 3px 0 0;
+              border-radius: 0px;
             }
           }
 
@@ -175,18 +264,20 @@
             display: block;
             padding: 7px 20px;
             border-bottom: none;
-            font-weight: 300;
+            font-weight: 500;
 
             .name {
               float: left;
 
               .ss-icon {
                 @include transition(opacity .15s);
-                position: relative;
+                display: inline-block;
                 top: 1px;
-                font-size: 13px;
                 margin-right: 5px;
                 opacity: 0.5;
+                width: 17;
+                height: 21px;
+                vertical-align: middle;
               }
             }
 
@@ -204,6 +295,7 @@
             }
 
             &:hover {
+              color: #fff;
 
               .ss-icon {
                 opacity: 1.0;
@@ -217,14 +309,18 @@
 
           // specific editor types 
           .empty {
-            @include box-shadow(0 1px 3px rgba(0,0,0,0.2));
-            margin-bottom: 10px;
 
             a {
-              border-bottom: 1px solid $darkGreen;
-              border-radius: 3px;
-              font-weight: 500;
-              background: $green;
+              line-height: 1.4;
+              font-weight: 400;
+              background: #fff;
+              color: #3c3c3c;
+
+
+              &:hover {
+              background: tint($green,30%); 
+              color: #fff;
+            }
             }
           }
         }
@@ -233,7 +329,7 @@
           text-align: center;
 
           h5 {
-            color: $green;
+            color: $darkGreen;
           }
           
         }
@@ -507,6 +603,7 @@
 
 .edit-state-draft {
   .visibility,
+
   .edit-draft-message,
   .view-button {
     display: none;

cms/static/sass/_variables.scss

-$gw-column: 80px;
-$gw-gutter: 20px;
+$baseline: 20px;
 
+// grid
+$gw-column: ($baseline*3);
+$gw-gutter: $baseline;
 $fg-column: $gw-column;
 $fg-gutter: $gw-gutter;
 $fg-max-columns: 12;
-$fg-max-width: 1400px;
-$fg-min-width: 810px;
+$fg-max-width: 1280px;
+$fg-min-width: 900px;
 
+// type
 $sans-serif: 'Open Sans', $verdana;
 $body-line-height: golden-ratio(.875em, 1);
+$error-red: rgb(253, 87, 87);
 
-$white: rgb(255,255,255);
+// colors - new for re-org
 $black: rgb(0,0,0);
-$pink: rgb(182,37,104);
-$error-red: rgb(253, 87, 87);
+$white: rgb(255,255,255);
+
+$gray: rgb(127,127,127);
+$gray-l1: tint($gray,20%);
+$gray-l2: tint($gray,40%);
+$gray-l3: tint($gray,60%);
+$gray-l4: tint($gray,80%);
+$gray-l5: tint($gray,90%);
+$gray-d1: shade($gray,20%);
+$gray-d2: shade($gray,40%);
+$gray-d3: shade($gray,60%);
+$gray-d4: shade($gray,80%);
+
+$blue: rgb(85, 151, 221);
+$blue-l1: tint($blue,20%);
+$blue-l2: tint($blue,40%);
+$blue-l3: tint($blue,60%);
+$blue-l4: tint($blue,80%);
+$blue-l5: tint($blue,90%);
+$blue-d1: shade($blue,20%);
+$blue-d2: shade($blue,40%);
+$blue-d3: shade($blue,60%);
+$blue-d4: shade($blue,80%);
+
+$pink: rgb(183, 37, 103);
+$pink-l1: tint($pink,20%);
+$pink-l2: tint($pink,40%);
+$pink-l3: tint($pink,60%);
+$pink-l4: tint($pink,80%);
+$pink-l5: tint($pink,90%);
+$pink-d1: shade($pink,20%);
+$pink-d2: shade($pink,40%);
+$pink-d3: shade($pink,60%);
+$pink-d4: shade($pink,80%);
 
+$green: rgb(37, 184, 90);
+$green-l1: tint($green,20%);
+$green-l2: tint($green,40%);
+$green-l3: tint($green,60%);
+$green-l4: tint($green,80%);
+$green-l5: tint($green,90%);
+$green-d1: shade($green,20%);
+$green-d2: shade($green,40%);
+$green-d3: shade($green,60%);
+$green-d4: shade($green,80%);
+
+$yellow: rgb(231, 214, 143);
+$yellow-l1: tint($yellow,20%);
+$yellow-l2: tint($yellow,40%);
+$yellow-l3: tint($yellow,60%);
+$yellow-l4: tint($yellow,80%);
+$yellow-l5: tint($yellow,90%);
+$yellow-d1: shade($yellow,20%);
+$yellow-d2: shade($yellow,40%);
+$yellow-d3: shade($yellow,60%);
+$yellow-d4: shade($yellow,80%);
+
+$shadow: rgba(0,0,0,0.2);
+$shadow-l1: rgba(0,0,0,0.1);
+$shadow-d1: rgba(0,0,0,0.4);
+
+// colors - inherited 
 $baseFontColor: #3c3c3c;
 $offBlack: #3c3c3c;
-$black: rgb(0,0,0);
-$white: rgb(255,255,255);
-$blue: #5597dd;
 $orange: #edbd3c;
 $red: #b20610;
 $green: #108614;
@@ -34,4 +94,4 @@ $brightGreen: rgb(22, 202, 87);
 $disabledGreen: rgb(124, 206, 153);
 $darkGreen: rgb(52, 133, 76);
 $lightBluishGrey: rgb(197, 207, 223);
-$lightBluishGrey2: rgb(213, 220, 228);
+$lightBluishGrey2: rgb(213, 220, 228);
\ No newline at end of file

cms/static/sass/base-style.scss

 @import 'bourbon/bourbon';
+@import 'bourbon/addons/button';
 @import 'vendor/normalize';
 @import 'keyframes';
 
@@ -8,8 +9,10 @@
 @import "fonts";
 @import "variables";
 @import "cms_mixins";
+@import "extends";
 @import "base";
 @import "header";
+@import "footer";
 @import "dashboard";
 @import "courseware";
 @import "subsection";
@@ -26,6 +29,8 @@
 @import "modal";
 @import "alerts";
 @import "login";
+@import "account";
+@import "index";
 @import 'jquery-ui-calendar';
 
 @import 'content-types';

cms/templates/activation_active.html

@@ -7,7 +7,7 @@
 
 <section class="activation">
   <h1>Account already active!</h1>
-  <p> This account has already been activated. <a href="/login">Log in here</a>.</p>
+  <p> This account has already been activated. <a href="/signin">Log in here</a>.</p>
 </div>
 </section>
 

cms/templates/activation_complete.html

@@ -5,7 +5,7 @@
 <section class="tos">
 <div>
   <h1>Activation Complete!</h1>
-  <p>Thanks for activating your account. <a href="/login">Log in here</a>.</p>
+  <p>Thanks for activating your account. <a href="/signin">Log in here</a>.</p>
 </div>
 </section>
 

cms/templates/asset_index.html

 <%inherit file="base.html" />
 <%! from django.core.urlresolvers import reverse %>
-<%block name="bodyclass">assets</%block>
-<%block name="title">Courseware Assets</%block>
+<%block name="bodyclass">is-signedin course uploads</%block>
+<%block name="title">Uploads &amp; Files</%block>
 
 <%namespace name='static' file='static_content.html'/>
 

cms/templates/base.html

@@ -5,23 +5,29 @@
   <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <title>
+        <%block name="title"></%block> | 
+        % if context_course:
+        <% ctx_loc = context_course.location %>
+        ${context_course.display_name} | 
+        % endif
+        edX Studio
+    </title>
+
+    <meta name="viewport" content="width=device-width,initial-scale=1">
+    <meta name="path_prefix" content="${MITX_ROOT_URL}">
 
     <%static:css group='base-style'/>
     <link rel="stylesheet" type="text/css" href="${static.url('js/vendor/markitup/skins/simple/style.css')}" />
     <link rel="stylesheet" type="text/css" href="${static.url('js/vendor/markitup/sets/wiki/style.css')}" />
-    <link rel="stylesheet" type="text/css" href="${static.url('css/vendor/symbolset.ss-standard.css')}" />
     <link rel="stylesheet" type="text/css" href="${static.url('css/vendor/symbolset.ss-symbolicons-block.css')}" />
+    <link rel="stylesheet" type="text/css" href="${static.url('css/vendor/symbolset.ss-standard.css')}" />
    
-    <title><%block name="title"></%block></title>
-    <meta name="viewport" content="width=device-width,initial-scale=1">
-
-    <meta name="path_prefix" content="${MITX_ROOT_URL}">
-
     <%block name="header_extras"></%block>
   </head>
 
   <body class="<%block name='bodyclass'></%block> hide-wip">
-    <%include file="widgets/header.html" args="active_tab=active_tab"/>
+    <%include file="widgets/header.html" />
     <%include file="courseware_vendor_js.html"/>
 
     <script type="text/javascript" src="${static.url('js/vendor/json2.js')}"></script>
@@ -47,9 +53,9 @@
     </script>
 
     <%block name="content"></%block>
+    <%include file="widgets/footer.html" />
 
     <%block name="jsextra"></%block>
-
   </body>
 </html>
 

cms/templates/course_index.html

 <%inherit file="base.html" />
-<%block name="title">Course Manager</%block>
+
 <%include file="widgets/header.html"/>
 
 <%block name="content">

cms/templates/course_info.html

@@ -2,8 +2,9 @@
 <%namespace name='static' file='static_content.html'/>
 
 <!-- TODO decode course # from context_course into title -->
-<%block name="title">Course Info</%block>
-<%block name="bodyclass">course-info</%block>
+<%block name="title">Updates</%block>
+<%block name="bodyclass">is-signedin course course-info updates</%block>
+
 
 <%block name="jsextra">
   <script type="text/javascript" src="${static.url('js/template_loader.js')}"></script>

cms/templates/edit-static-page.html

 <%inherit file="base.html" />
 <%! from django.core.urlresolvers import reverse %>
-<%block name="title">Edit Static Page</%block>
-<%block name="bodyclass">edit-static-page</%block>
+<%block name="title">Editing Static Page</%block>
+<%block name="bodyclass">is-signedin course pages edit-static-page</%block>
 
 <%block name="content">
 <div class="main-wrapper">

cms/templates/edit-tabs.html

 <%inherit file="base.html" />
 <%! from django.core.urlresolvers import reverse %>
-<%block name="title">Tabs</%block>
-<%block name="bodyclass">static-pages</%block>
+<%block name="title">Static Pages</%block>
+<%block name="bodyclass">is-signedin course pages static-pages</%block>
 
 <%block name="jsextra">
   <script type='text/javascript'>

cms/templates/edit_subsection.html

@@ -7,8 +7,9 @@
 %>
 
 <%! from django.core.urlresolvers import reverse %>
-<%block name="bodyclass">subsection</%block>
 <%block name="title">CMS Subsection</%block>
+<%block name="bodyclass">is-signedin course subsection</%block>
+
 
 <%namespace name="units" file="widgets/units.html" />
 <%namespace name='static' file='static_content.html'/>
@@ -97,6 +98,7 @@
     </div>
   </div>
 </div>
+</div>
 </%block>
 
 <%block name="jsextra">
@@ -107,6 +109,8 @@
   <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/models/settings/course_grading_policy.js')}"></script>
+  <script type="text/javascript" src="${static.url('js/views/overview.js')}"></script>
+  
 
 <script type="text/javascript">
     $(document).ready(function() {

cms/templates/export.html

@@ -2,8 +2,8 @@
 <%namespace name='static' file='static_content.html'/>
 
 <%! from django.core.urlresolvers import reverse %>
-<%block name="title">Export</%block>
-<%block name="bodyclass">export</%block>
+<%block name="title">Export Course</%block>
+<%block name="bodyclass">is-signedin course tools export</%block>
 
 <%block name="content">
 <div class="main-wrapper">

cms/templates/howitworks.html

+<%inherit file="base.html" />
+<%! from django.core.urlresolvers import reverse %>
+
+<%block name="title">Welcome</%block>
+<%block name="bodyclass">not-signedin index howitworks</%block>
+
+<%block name="content">
+
+<div class="wrapper-content-header wrapper">
+  <section class="content content-header">
+    <header>
+      <h1>Welcome to <span class="logo">edX Studio</span></h1>
+      <p class="tagline">Studio helps manage your courses online, so you can focus on teaching them</p>
+    </header>
+  </section>
+</div>
+
+<div class="wrapper-content-features wrapper">
+  <section class="content content-features">
+    <header>
+      <h2 class="sr">Studio's Many Features</h2>
+    </header>
+
+    <ol class="list-features">
+      <li class="feature">
+        <figure class="img zoom">
+          <a rel="modal" href="#hiw-feature1">
+            <img src="/static/img/thumb-hiw-feature1.png" alt="Studio Helps You Keep Your Courses Organized" />
+            <figcaption class="sr">Studio Helps You Keep Your Courses Organized</figcaption>
+            <span class="action-zoom">
+              <i class="ss-icon ss-symbolicons-block">&#xE002;</i>
+            </span>
+          </a>
+        </figure>
+
+        <div class="copy">
+          <h3>Keeping Your Course Organized</h3>
+          <p>The backbone of your course is how it is organized. Studio offers an <strong>Outline</strong> editor, providing a simple hierarchy and easy drag and drop to help you and your students stay organized.</p>
+
+          <ul class="list-proofpoints">
+            <li class="proofpoint">
+              <h4 class="title">Simple Organization For Content</h4>
+              <p>Studio uses a simple hierarchy of <strong>sections</strong> and <strong>subsections</strong> to organize your content.</p>
+            </li>
+
+            <li class="proofpoint">
+              <h4 class="title">Change Your Mind Anytime</h4>
+              <p>Draft your outline and build content anywhere. Simple drag and drop tools let your reorganize quickly.</p>
+            </li>
+
+            <li class="proofpoint">
+              <h4 class="title">Go A Week Or A Semester At A Time</h4>
+              <p>Build and release <strong>sections</strong> to your students incrementally. You don't have to have it all done at once.</p>
+            </li>
+          </ul>
+        </div>
+      </li>
+
+      <li class="feature">
+        <figure class="img zoom">
+        <a rel="modal" href="#hiw-feature2">
+          <img src="/static/img/thumb-hiw-feature2.png" alt="Learning is More than Just Lectures" />
+          <figcaption class="sr">Learning is More than Just Lectures</figcaption>
+          <span class="action-zoom">
+            <i class="ss-icon ss-symbolicons-block">&#xE002;</i>
+          </span>
+        </a>
+        </figure>
+
+        <div class="copy">
+          <h3>Learning is More than Just Lectures</h3>
+          <p>Studio lets you weave your content together in a way that reinforces learning &mdash; short video lectures interleaved with exercises and more. Insert videos and author a wide variety of exercise types with just a few clicks. </p>
+
+          <ul class="list-proofpoints">
+            <li class="proofpoint">
+              <h4 class="title">Create Learning Pathways</h4>
+              <p>Help your students understand a small interactive piece at a time with multimedia, HTML, and exercises.</p>
+            </li>
+
+            <li class="proofpoint">
+              <h4 class="title">Work Visually, Organize Quickly</h4>
+              <p>Work visually and see exactly what your students will see. Reorganize all your content with drag and drop.</p>
+            </li>
+
+            <li class="proofpoint">
+              <h4 class="title">A Broad Library of Problem Types</h4>
+              <p>It's more than just multiple choice. Studio has nearly a dozen types of problems to challenge your learners.</p>
+            </li>
+          </ul>
+        </div>
+      </li>
+
+      <li class="feature">
+        <figure class="img zoom">
+          <a rel="modal" href="#hiw-feature3">
+            <img src="/static/img/thumb-hiw-feature3.png" alt="Studio Gives You Simple, Fast, and Incremental Publishing. With Friends." />
+            <figcaption class="sr">Studio Gives You Simple, Fast, and Incremental Publishing. With Friends.</figcaption>
+            <span class="action-zoom">
+              <i class="ss-icon ss-symbolicons-block">&#xE002;</i>
+            </span>
+          </a>
+        </figure>
+
+        <div class="copy">
+          <h3>Simple, Fast, and Incremental Publishing. With Friends.</h3>
+          <p>Studio works like web applications you already know, yet understands how you build curriculum. Instant publishing to the web when you want it, incremental release when it makes sense. And with co-authors, you can have a whole team building a course, together.</p>
+
+          <ul class="list-proofpoints">
+            <li class="proofpoint">
+              <h4 class="title">Instant Changes</h4>
+              <p>Caught a bug? No problem. When you want, your changes to live when you hit Save.</p>
+            </li>
+
+            <li class="proofpoint">
+              <h4 class="title">Release-On Date Publishing</h4>
+              <p>When you've finished a <strong>section</strong>, pick when you want it to go live and Studio takes care of the rest. Build your course incrementally.</p>
+            </li>
+
+            <li class="proofpoint">
+              <h4 class="title">Work in Teams</h4>
+              <p>Co-authors have full access to all the same authoring tools. Make your course better through a team effort.</p>
+            </li>
+          </ul>
+        </div>
+      </li>
+    </ol>
+  </section>
+</div>
+
+<div class="wrapper-content-cta wrapper">
+  <section class="content content-cta">
+    <header>
+      <h2 class="sr">Sign Up for Studio Today!</h2>
+    </header>
+    
+    <ul class="list-actions">
+      <li>
+        <a href="${reverse('signup')}" class="action action-primary">Sign Up &amp; Start Making an edX Course</a>
+      </li>
+      <li>
+        <a href="${reverse('login')}" class="action action-secondary">Already have a Studio Account? Sign In</a>
+      </li>
+    </ul>
+  </section>
+</div>
+
+<div class="content-modal" id="hiw-feature1">
+  <h3 class="title">Outlining Your Course</h3>
+  <figure>
+    <img src="/static/img/hiw-feature1.png" alt="" />
+    <figcaption class="description">Simple two-level outline to organize your couse. Drag and drop, and see your course at a glance.</figcaption>
+  </figure>
+
+  <a href="#" rel="view" class="action action-modal-close">
+    <i class="ss-icon ss-symbolicons-block">&#x2421;</i>
+    <span class="label">close modal</span>
+  </a>
+</div>
+
+<div class="content-modal" id="hiw-feature2">
+  <h3 class="title">More than Just Lectures</h3>
+  <figure>
+    <img src="/static/img/hiw-feature2.png" alt="" />
+    <figcaption class="description">Quickly create videos, text snippets, inline discussions, and a variety of problem types.</figcaption>
+  </figure>
+
+  <a href="#" rel="view" class="action action-modal-close">
+    <i class="ss-icon ss-symbolicons-block">&#x2421;</i>
+    <span class="label">close modal</span>
+  </a>
+</div>
+
+<div class="content-modal" id="hiw-feature3">
+  <h3 class="title">Publishing on Date</h3>
+  <figure>
+    <img src="/static/img/hiw-feature3.png" alt="" />
+    <figcaption class="description">Simply set the date of a section or subsection, and Studio will publish it to your students for you.</figcaption>
+  </figure>
+
+  <a href="#" rel="view" class="action action-modal-close">
+    <i class="ss-icon ss-symbolicons-block">&#x2421;</i>
+    <span class="label">close modal</span>
+  </a>
+</div>
+</%block>
+
+<%block name="jsextra">
+  <script type="text/javascript">
+    (function() {
+
+      // lean modal window
+      $('a[rel*=modal]').leanModal({overlay : 0.50, closeButton: '.action-modal-close' });
+      $('a.action-modal-close').click(function(e){
+        (e).preventDefault();
+      });
+
+    })(this)
+  </script>
+</%block>
\ No newline at end of file

cms/templates/import.html

@@ -2,8 +2,8 @@
 <%namespace name='static' file='static_content.html'/>
 
 <%! from django.core.urlresolvers import reverse %>
-<%block name="title">Import</%block>
-<%block name="bodyclass">import</%block>
+<%block name="title">Import Course</%block>
+<%block name="bodyclass">is-signedin course tools import</%block>
 
 <%block name="content">
 <div class="main-wrapper">

cms/templates/index.html

 <%inherit file="base.html" />
-<%block name="bodyclass">index</%block>
+
 <%block name="title">Courses</%block>
+<%block name="bodyclass">is-signedin index dashboard</%block>
 
 <%block name="header_extras">
   <script type="text/template" id="new-course-template">
@@ -37,7 +38,9 @@
 			<h1>My Courses</h1>
 			<article class="my-classes">
 				% if user.is_active:
-				<a href="#" class="new-button new-course-button"><span class="plus-icon white"></span> New Course</a>
+          % if not disable_course_creation:
+				    <a href="#" class="new-button new-course-button"><span class="plus-icon white"></span> New Course</a>
+          %endif
 				<ul class="class-list">
 					%for course, url in courses:
 			    <li>

cms/templates/login.html

 <%inherit file="base.html" />
 <%! from django.core.urlresolvers import reverse %>
-<%block name="title">Log in</%block>
-<%block name="bodyclass">no-header</%block>
+<%block name="title">Sign In</%block>
+<%block name="bodyclass">not-signedin signin</%block>
 
 <%block name="content">
 
-  <div class="edx-studio-logo-large"></div>
-
-  <article class="log-in-box">
+<div class="wrapper-content wrapper">
+  <section class="content">
     <header>
-      <h1>Log in to edX studio</h1>
+      <h1 class="title title-1">Sign In to edX Studio</h1>
+      <a href="${reverse('signup')}" class="action action-signin">Don't have a Studio Account? Sign up!</a>
     </header>
-    <form class="log-in-form" id="login_form" action="login_post" method="post">
-      <div class="row">
-        <label>Email</label>
-        <input name="email" type="email" class="email-field" tabindex="1">
-      </div>
-      <div class="row">
-        <label>Password <a href="${forgot_password_link}" class="forgot-button">Forgot password?</a></label>
-        <input name="password" type="password" class="password-field" tabindex="2">
-      </div>
-      <div class="row form-actions">
-        <input name="submit" type="submit" value="Log In" class="log-in-button" tabindex="3">
-        <span class="or">or</span>
-        <a href="${reverse('signup')}" class="sign-up-button" tabindex="4">Sign up</a>
+
+    <article class="content-primary" role="main">
+      <form id="login_form" method="post" action="login_post">
+        
+        <fieldset>
+          <legend class="sr">Required Information to Sign In to edX Studio</legend>
+          
+          <ol class="list-input">
+            <li class="field text required" id="field-email">
+              <label for="email">Email Address</label>
+              <input id="email" type="email" name="email" placeholder="e.g. jane.doe@gmail.com" />              
+            </li>
+
+            <li class="field text required" id="field-password">
+              <a href="${forgot_password_link}" class="action action-forgotpassword" tabindex="-1">Forgot password?</a>
+              <label for="password">Password</label>
+              <input id="password" type="password" name="password" />              
+            </li>
+          </ol>
+        </fieldset>
+
+        <div class="form-actions">
+          <button type="submit" id="submit" name="submit" class="action action-primary">Sign In to edX Studio</button>
+        </div>
+
+        <!-- no honor code for CMS, but need it because we're using the lms student object -->
+        <input name="honor_code" type="checkbox" value="true" checked="true" hidden="true">
+      </form>
+    </article>
+
+    <aside class="content-supplementary" role="complimentary">
+      <h2 class="sr">Studio Support</h2>
+
+      <div class="bit">
+        <h3 class="title-3">Need Help?</h3>
+        <p>Having trouble with your account? Use <a href="http://help.edge.edx.org" rel="external">our support center</a> to look over self help steps, find solutions others have found to the same problem, or let us know of your issue.</p>
       </div>
-    </form>
-  </article>
+    </aside>
+  </section>
+</div>
+</%block>
 
+<%block name="jsextra">
 <script type="text/javascript">
 (function() {
   function getCookie(name) {
@@ -51,12 +77,16 @@
       submit_data,
       function(json) {
         if(json.success) {
-          location.href = "${reverse('index')}";
+          var next = /next=([^&]*)/g.exec(decodeURIComponent(window.location.search));
+          if (next && next.length > 1) {
+            location.href = next[1];
+          }
+          else location.href = "${reverse('homepage')}";
         } else if($('#login_error').length == 0) {
-          $('#login_form').prepend('<div id="login_error">' + json.value + '</div>');
-          $('#login_error').slideDown(150);
+          $('#login_form').prepend('<div id="login_error" class="message message-status error">' + json.value + '</span></div>');
+          $('#login_error').addClass('is-shown');
         } else {
-          $('#login_error').stop().slideDown(150);
+          $('#login_error').stop().addClass('is-shown');
           $('#login_error').html(json.value);
         }
       }
@@ -64,5 +94,4 @@
   });
 })(this)
 </script>
-      
-</%block>
+</%block>
\ No newline at end of file

cms/templates/manage_users.html

 <%inherit file="base.html" />
 <%block name="title">Course Staff Manager</%block>
-<%block name="bodyclass">users</%block>
+<%block name="bodyclass">is-signedin course users settings team</%block>
+
 
 <%block name="content">
 <div class="main-wrapper">
@@ -97,7 +98,7 @@
     $cancelButton.bind('click', hideNewUserForm);
 
     $('.new-user-button').bind('click', showNewUserForm);
-    $body.bind('keyup', { $cancelButton: $cancelButton }, checkForCancel);
+    $('body').bind('keyup', { $cancelButton: $cancelButton }, checkForCancel);
 
     $('.remove-user').click(function() {
       $.ajax({

cms/templates/overview.html

@@ -6,7 +6,8 @@
    from datetime import datetime
 %>
 <%! from django.core.urlresolvers import reverse %>
-<%block name="title">CMS Courseware Overview</%block>
+<%block name="title">Course Outline</%block>
+<%block name="bodyclass">is-signedin course outline</%block>
 
 <%namespace name='static' file='static_content.html'/>
 <%namespace name="units" file="widgets/units.html" />

cms/templates/settings_graders.html

+<%inherit file="base.html" />
+<%block name="title">Grading</%block>
+<%block name="bodyclass">is-signedin course grading 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(){
+
+      $("form :input").focus(function() {
+        $("label[for='" + this.id + "']").addClass("is-focused");
+      }).blur(function() {
+        $("label").removeClass("is-focused");
+      });
+    
+      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="wrapper-content wrapper">
+  <section class="content">
+    <header class="page">
+      <span class="title-sub">Settings</span>
+      <h1 class="title-1">Grading</h1>
+    </header>
+
+    <!-- <div class="introduction">
+      <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>
+    </div> -->
+
+    <article class="content-primary" role="main">
+      <form id="settings_details" class="settings-grading" method="post" action="">
+        <section class="group-settings grade-range">
+          <header>
+            <h2 class="title-2">Overall Grade Range</h2>
+            <span class="tip">Your overall grading scale for student final grades</span>
+          </header>
+
+          <ol class="list-input">
+            <li class="field" id="field-course-grading-range">
+              <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>
+            </li>
+          </ol>
+        </section>
+
+        <hr class="divide" />
+
+        <section class="group-settings grade-rules">
+          <header>
+            <h2 class="title-2">Grading Rules &amp; Policies</h2>
+            <span class="tip">Deadlines, requirements, and logistics around grading student work</span>
+          </header>
+
+          <ol class="list-input">
+            <li class="field text" id="field-course-grading-graceperiod">
+              <label for="course-grading-graceperiod">Grace Period on Deadline:</label>
+              <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>
+            </li>
+          </ol>
+        </section>
+
+        <hr class="divide" />
+
+        <section class="group-settings assignment-types">
+          <header>
+            <h2 class="title-2">Assignment Types</h2>
+            <span class="tip">Categories and labels for any exercises that are gradable</span>
+          </header>
+
+          <ol class="list-input course-grading-assignment-list enum">
+              
+          </ol> 
+
+          <div class="actions">
+            <a href="#" class="new-button new-course-grading-item add-grading-data">
+              <span class="plus-icon white"></span>New Assignment Type
+            </a>            
+          </div>
+        </section>
+      </form>
+    </article>
+
+    <aside class="content-supplementary" role="complimentary">
+      <div class="bit">
+        <h3 class="title-3">How will these settings be used</h3>
+        <p>Your grading settings will be used to calculate students grades and performance.</p>
+
+        <p>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">
+      % if context_course:
+      <% ctx_loc = context_course.location %>
+      <%! from django.core.urlresolvers import reverse %>
+        <h3 class="title-3">Other Course Settings</h3>
+        <nav class="nav-related">
+          <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))}">Details &amp; Schedule</a></li>
+            <li class="nav-item"><a href="${reverse('manage_users', kwargs=dict(location=ctx_loc))}">Course Team</a></li>
+          </ul>
+        </nav>
+      % endif
+      </div>
+    </aside>
+  </section>
+</div>
+</%block>

cms/templates/signup.html

 <%inherit file="base.html" />
 <%! from django.core.urlresolvers import reverse %>
 
-<%block name="title">Sign up</%block>
-<%block name="bodyclass">no-header</%block>
+<%block name="title">Sign Up</%block>
+<%block name="bodyclass">not-signedin signup</%block>
 
 <%block name="content">
 
-<div class="edx-studio-logo-large"></div>
-
-<article class="sign-up-box">
-  <header>
-    <h1>Register for edX studio</h1>
-  </header>
-  <form id="register_form" method="post">
-    <div id="register_error" name="register_error"></div>
-    <div class="row">
-      <label>Email</label>
-      <input name="email" type="email">
-    </div>
-    <div class="row">
-      <label>Password</label>
-      <input name="password" type="password">
-    </div>
-    <div class="row">
-      <label>Public Username</label>
-      <input name="username" type="text">
-    </div>
-    <div class="row">
-      <label>Full Name</label>
-      <input name="name" type="text">
-    </div>
-    <div class="row">
-      <div class="split">
-        <label>Your Location</label>
-        <input name="location" type="text">
+<div class="wrapper-content wrapper">
+  <section class="content">
+    <header>
+      <h1 class="title title-1">Sign Up for edX Studio</h1>
+      <a href="${reverse('login')}" class="action action-signin">Already have a Studio Account? Sign in</a>
+    </header>
+
+    <p class="introduction">Ready to start creating online courses? Sign up below and start creating your first edX course today.</p>
+
+    <article class="content-primary" role="main">
+      <form id="register_form" method="post" action="register_post">
+        <div id="register_error" name="register_error" class="message message-status message-status error">
+        </div>
+        
+        <fieldset>
+          <legend class="sr">Required Information to Sign Up for edX Studio</legend>
+          
+          <ol class="list-input">
+            <li class="field text required" id="field-email">
+              <label for="email">Email Address</label>
+              <input id="email" type="email" name="email" placeholder="e.g. jane.doe@gmail.com" />              
+            </li>
+
+            <li class="field text required" id="field-password">
+              <label for="password">Password</label>
+              <input id="password" type="password" name="password" />              
+            </li>
+
+            <li class="field text required" id="field-username">
+              <label for="username">Public Username</label>
+              <input id="username" type="text" name="username" placeholder="e.g. janedoe" />
+              <span class="tip tip-stacked">This will be used in public discussions with your courses and in our edX101 support forums</span>      
+            </li>
+
+            <li class="field text required" id="field-name">
+              <label for="name">Full Name</label>
+              <input id="name" type="text" name="name" placeholder="e.g. Jane Doe" />              
+            </li>
+
+            <li class="field-group">
+              <div class="field text" id="field-location">
+                <label for="location">Your Location</label>
+                <input class="short" id="location" type="text" name="location" />              
+              </div>
+
+              <div class="field text" id="field-language">
+                <label for="language">Preferred Language</label>
+                <input class="short" id="language" type="text" name="language" />              
+              </div>
+            </li>
+
+            <li class="field checkbox required" id="field-tos">
+              <input id="tos" name="terms_of_service" type="checkbox" value="true" />
+              <label for="tos">I agree to the Terms of Service</label>             
+            </li>
+          </ol>
+        </fieldset>
+
+        <div class="form-actions">
+          <button type="submit" id="submit" name="submit" class="action action-primary">Create My Account & Start Authoring Courses</button>
+        </div>
+
+        <!-- no honor code for CMS, but need it because we're using the lms student object -->
+        <input name="honor_code" type="checkbox" value="true" checked="true" hidden="true">
+      </form>
+    </article>
+
+    <aside class="content-supplementary" role="complimentary">
+      <h2 class="sr">Common Studio Questions</h2>
+
+      <div class="bit">
+        <h3 class="title-3">Who is Studio for?</h3>
+        <p>Studio is for anyone that wants to create online courses that leverage the global edX platform. Our users are often faculty members, teaching assistants and course staff, and members of instructional technology groups.</p>
+      </div>
+
+      <div class="bit">
+        <h3 class="title-3">How technically savvy do I need to be to create courses in Studio?</h3>
+        <p>Studio is designed to be easy to use by almost anyone familiar with common web-based authoring environments (Wordpress, Moodle, etc.). No programming knowledge is required, but for some of the more advanced features, a technical background would be helpful. As always, we are here to help, so don't hesitate to dive right in.</p>
       </div>
-      <div class="split">
-        <label>Preferred Language</label>
-        <input name="language" type="text">
+
+      <div class="bit">
+        <h3 class="title-3">I've never authored a course online before. Is there help?</h3>
+        <p>Absolutely. We have created an online course, edX101, that describes some best practices: from filming video, creating exercises, to the basics of running an online course. Additionally, we're always here to help, just drop us a note.</p>
       </div>
-    </div>
-    <div class="row">
-      <label class="terms-of-service">
-        <input name="terms_of_service" type="checkbox" value="true">
-        I agree to the
-        <a href="#">Terms of Service</a>
-      </label>
-    </div>
-    
-    <!-- no honor code for CMS, but need it because we're using the lms student object -->
-      <input name="honor_code" type="checkbox" value="true" checked="true" hidden="true">
-
-    <div class="row form-actions submit">
-      <input name="submit" type="submit" value="Create My Account" class="create-account-button">
-      <p class="enrolled">Already enrolled? <a href="/">Log In.</a></p>
-    </div>
-  </form>
-</article>
-
-<script type="text/javascript">
-  (function() {
-    function getCookie(name) {
-      return $.cookie(name);
-    }
-
-    function postJSON(url, data, callback) {
-      $.ajax({type:'POST',
-        url: url,
-        dataType: 'json',
-        data: data,
-        success: callback,
-        headers : {'X-CSRFToken':getCookie('csrftoken')}
+    </aside>
+  </section>
+</div>
+</%block>
+
+<%block name="jsextra">
+  <script type="text/javascript">
+    (function() {
+
+      $("form :input").focus(function() {
+        $("label[for='" + this.id + "']").addClass("is-focused");
+      }).blur(function() {
+        $("label").removeClass("is-focused");
       });
-    }
-
-    $('form#register_form').submit(function(e) {
-      e.preventDefault();
-      var submit_data = $('#register_form').serialize();
-
-      postJSON('/create_account',
-        submit_data,
-        function(json) {
-          if(json.success) {
-            location.href = "${reverse('index')}";
-          } else {
-            $('#register_error').html(json.value).stop().slideDown(150);
+  
+
+      function getCookie(name) {
+        return $.cookie(name);
+      }
+
+      // form validation
+      function postJSON(url, data, callback) {
+        $.ajax({type:'POST',
+          url: url,
+          dataType: 'json',
+          data: data,
+          success: callback,
+          headers : {'X-CSRFToken':getCookie('csrftoken')}
+        });
+      }
+
+      $('form#register_form').submit(function(e) {
+        e.preventDefault();
+        var submit_data = $('#register_form').serialize();
+
+        postJSON('/create_account',
+          submit_data,
+          function(json) {
+            if(json.success) {
+              location.href = "${reverse('index')}";
+            } else {
+              $('#register_error').html(json.value).stop().addClass('is-shown');
+            }
           }
-        }
-      );
-    });
-  })(this)
-</script>
+        );
+      });
+    })(this)
+  </script>
 </%block>
\ No newline at end of file

cms/templates/unit.html

 <%inherit file="base.html" />
 <%! from django.core.urlresolvers import reverse %>
 <%namespace name="units" file="widgets/units.html" />
-<%block name="bodyclass">unit</%block>
-<%block name="title">CMS Unit</%block>
+<%block name="title">Individual Unit</%block>
+<%block name="bodyclass">is-signedin course unit</%block>
+
 <%block name="jsextra">
   <script type='text/javascript'>
   $(document).ready(function() {
@@ -13,12 +14,20 @@
         state: '${unit_state}'
       })
     });
-  
+
+    $(document).ready(function() {
+      $('body').addClass('js');
+
+      // tabs
+      $('.tab-group').tabs();
+    });
+
     $('.new-component-template').each(function(){
         $emptyEditor = $(this).find('.empty');
         $(this).prepend($emptyEditor);
       });
     });
+
   </script>
 
 </%block>
@@ -56,38 +65,66 @@
               </div>
                 % for type, templates in sorted(component_templates.items()):
                 <div class="new-component-templates new-component-${type}">
-                    <h3 class="title">Select <span class="type">${type}</span> component type:</h3>
-
-                    <ul class="new-component-template">
-                        % for name, location, has_markdown, is_empty in templates:
-
-                          % if is_empty:
-                            <li class="editor-md empty">
-                              <a href="#" data-location="${location}">
-                                <span class="name"><i class="ss-icon ss-symbolicons-block">&#xE714;</i> ${name}</span>
-                                <span class="editor-indicator">Simple <span class="sr">Editor</span></span>
-                              </a>
-                            </li>
-
-                          % elif has_markdown:
-                            <li class="editor-md">
-                              <a href="#" data-location="${location}">
-                                <span class="name"><i class="ss-icon ss-symbolicons-block">&#xE714;</i> ${name}</span>
-                                <span class="editor-indicator">Simple <span class="sr">Editor</span></span>
-                              </a>
-                            </li>
-
-                          % else:
-                            <li class="editor-manual">
-                              <a href="#" data-location="${location}">
-                                <span class="name"><i class="ss-icon ss-symbolicons-block">&#x1F527;</i> ${name}</span>
-                                <span class="editor-indicator">Advanced <span class="sr">Editor</span></span>
-                              </a>
-                            </li>
-                          % endif
-
-                        %endfor
-                    </ul>
+                    % if type == "problem":
+                    <div class="tab-group tabs">
+                            <ul class="problem-type-tabs nav-tabs">
+                              <li class="current">
+                                <a class="link-tab" href="#tab1">Common Problem Types</a>
+                              </li>
+                              <li>
+                                <a class="link-tab" href="#tab2">Advanced</a>
+                              </li>
+                            </ul>
+                    % endif
+                        <div class="tab current" id="tab1">
+                          <ul class="new-component-template">
+                              % for name, location, has_markdown, is_empty in templates:
+                                % if has_markdown or type != "problem":
+                                    % if is_empty:
+                                      <li class="editor-md empty">
+                                        <a href="#" data-location="${location}">
+                                          <span class="name"> ${name}</span>
+                                        </a>
+                                      </li>
+                                    
+                                    % else:
+                                      <li class="editor-md">
+                                        <a href="#" data-location="${location}">
+                                          <span class="name"> ${name}</span>
+                                        </a>
+                                      </li>
+                                    % endif
+                                % endif
+                    
+                              %endfor
+                          </ul>
+                        </div>
+                    % if type == "problem":
+                            <div class="tab" id="tab2">
+                              <ul class="new-component-template">
+                                  % for name, location, has_markdown, is_empty in templates:
+                                    % if not has_markdown:  
+                                        % if is_empty:
+                                          <li class="editor-manual empty">
+                                            <a href="#" data-location="${location}">
+                                              <span class="name">${name}</span>
+                                            </a>
+                                          </li>
+                                        
+                                        % else:
+                                          <li class="editor-manual">
+                                            <a href="#" data-location="${location}">
+                                              <span class="name"> ${name}</span>
+                                            </a>
+                                        
+                                          </li>
+                                        % endif
+                                    % endif
+                                  % endfor
+                              </ul>
+                            </div>
+                    </div>
+                    % endif
                     <a href="#" class="cancel-button">Cancel</a>
                 </div>
                 % endfor

cms/templates/widgets/footer.html

+<%! from django.core.urlresolvers import reverse %>
+
+<div class="wrapper-footer wrapper">
+  <footer class="primary" role="contentinfo">
+    <div class="colophon">
+      <p>&copy; 2013 <a href="http://www.edx.org" rel="external">edX</a>. All rights reserved.</p>
+    </div>
+    
+    <nav class="nav-peripheral">
+      <ol>
+        <!-- <li class="nav-item nav-peripheral-tos">
+          <a href="#">Terms of Service</a>
+        </li>
+        <li class="nav-item nav-peripheral-pp">
+          <a href="#">Privacy Policy</a>
+        </li> -->
+        <li class="nav-item nav-peripheral-help">
+          <a href="http://help.edge.edx.org/" rel="external">edX Studio Help</a>
+        </li>
+        <li class="nav-item nav-peripheral-contact">
+          <a href="https://www.edx.org/contact" rel="external">Contact edX</a>
+        </li>
+        
+        % if user.is_authenticated():
+        <!-- add in zendesk/tender feedback form UI -->
+        % endif
+      </ol>
+    </nav>
+  </footer>
+</div>
\ No newline at end of file

cms/templates/widgets/header.html

 <%! from django.core.urlresolvers import reverse %>
 
-<% active_tab_class = 'active-tab-' + active_tab if active_tab else '' %>
-<header class="primary-header ${active_tab_class}">  
-  <div class="class">
-    <div class="inner-wrapper">
-      <div class="left">        
-        % if context_course:
-          <% ctx_loc = context_course.location %>
-          <a href="/" class="home"><span class="small-home-icon"></span></a> › 
-          <a href="${reverse('course_index', kwargs=dict(org=ctx_loc.org, course=ctx_loc.course, name=ctx_loc.name))}" class="class-name">${context_course.display_name}</a> ›
-        % endif
-      </div>
+<div class="wrapper-header wrapper">
+  <header class="primary" role="banner">
 
-      <div class="right">
-        <span class="username">${ user.username }</span>
-        % if user.is_authenticated():
-           <a href="${reverse('logout')}" class="log-out"><span class="log-out-icon"></span></a>
-        % else:
-           <a href="${reverse('login')}">Log in</a>
-        % endif
+    <div class="wrapper wrapper-left ">
+      <h1 class="branding"><a href="/">edX Studio</a></h1>
+      
+      % if context_course:
+      <% ctx_loc = context_course.location %>
+      <div class="info-course">
+        <h2 class="sr">Current Course:</h2>
+        <a href="${reverse('course_index', kwargs=dict(org=ctx_loc.org, course=ctx_loc.course, name=ctx_loc.name))}">
+        <span class="course-org">${ctx_loc.org}</span><span class="course-number">${ctx_loc.course}</span>
+        <span class="course-title" title="${context_course.display_name}">${context_course.display_name}</span>
+        </a>
       </div>
+      
+      <nav class="nav-course primary nav-dropdown" role="navigation">
+        <h2 class="sr">PH207x's Navigation:</h2>
+
+        <ol>
+          <li class="nav-item nav-course-courseware">
+            <h3 class="title"><span class="label-prefix">Course </span>Content <i class="ss-icon ss-symbolicons-block icon-expand">&#x25BE;</i></h3>
+            
+            <div class="wrapper wrapper-nav-sub">
+              <div class="nav-sub">
+                <ul>
+                  <li class="nav-item nav-course-courseware-outline"><a href="${reverse('course_index', kwargs=dict(org=ctx_loc.org, course=ctx_loc.course, name=ctx_loc.name))}">Outline</a></li>
+                  <li class="nav-item nav-course-courseware-updates"><a href="${reverse('course_info', kwargs=dict(org=ctx_loc.org, course=ctx_loc.course, name=ctx_loc.name))}">Updates</a></li>
+                  <li class="nav-item nav-course-courseware-pages"><a href="${reverse('edit_tabs', kwargs=dict(org=ctx_loc.org, course=ctx_loc.course, coursename=ctx_loc.name))}">Static Pages</a></li>
+                  <li class="nav-item nav-course-courseware-uploads"><a href="${reverse('asset_index', kwargs=dict(org=ctx_loc.org, course=ctx_loc.course, name=ctx_loc.name))}">Files &amp; Uploads</a></li>
+                </ul>
+              </div>
+            </div>            
+          </li>
+
+          <li class="nav-item nav-course-settings">
+            <h3 class="title"><span class="label-prefix">Course </span>Settings <i class="ss-icon ss-symbolicons-block icon-expand">&#x25BE;</i></h3>
+            
+            <div class="wrapper wrapper-nav-sub">
+              <div class="nav-sub">
+                <ul>
+                  <li class="nav-item nav-course-settings-schedule"><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 nav-course-settings-grading"><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 nav-course-settings-team"><a href="${reverse('manage_users', kwargs=dict(location=ctx_loc))}">Course Team</a></li>
+                  <!-- <li class="nav-item nav-course-settings-advanced"><a href="${reverse('course_settings', kwargs={'org' : ctx_loc.org, 'course' : ctx_loc.course, 'name': ctx_loc.name})}">Advanced Settings</a></li> -->
+                </ul>
+              </div>
+            </div>            
+          </li>
+
+          <li class="nav-item nav-course-tools">
+            <h3 class="title">Tools <i class="ss-icon ss-symbolicons-block icon-expand">&#x25BE;</i></h3>
+            
+            <div class="wrapper wrapper-nav-sub">
+              <div class="nav-sub">
+                <ul>
+                  <li class="nav-item nav-course-tools-import"><a href="${reverse('import_course', kwargs=dict(org=ctx_loc.org, course=ctx_loc.course, name=ctx_loc.name))}">Import</a></li>
+                  <li class="nav-item nav-course-tools-export"><a href="${reverse('export_course', kwargs=dict(org=ctx_loc.org, course=ctx_loc.course, name=ctx_loc.name))}">Export</a></li>
+                </ul>
+              </div>
+            </div>
+          </li>
+        </ol>
+      </nav>
+      % endif
+    </div>
+    
+    <div class="wrapper wrapper-right">
+      % if user.is_authenticated():    
+      <nav class="nav-account nav-is-signedin nav-dropdown">
+        <h2 class="sr">Currently logged in as:</h2>
+        <ol>
+          <li class="nav-item nav-account-username">
+            <a href="#" class="title">
+              <span class="account-username">
+                <i class="ss-icon ss-symbolicons-standard icon-user">&#x1F464;</i> 
+                ${ user.username }
+              </span>
+              <i class="ss-icon ss-symbolicons-block icon-expand">&#x25BE;</i>
+            </a>
+
+            <div class="wrapper wrapper-nav-sub">
+              <div class="nav-sub">
+                <ul>
+                  <li class="nav-item nav-account-dashboard"><a href="/">My Courses</a></li>
+                  <li class="nav-item nav-account-help"><a href="http://help.edge.edx.org/" rel="external">Studio Help</a></li>
+                  <li class="nav-item nav-account-signout"><a class="action action-signout" href="${reverse('logout')}">Sign Out</a></li>
+                </ul>
+              </div>
+            </div>
+          </li>
+        </ol>
+      </nav>
+      % else:
+      <nav class="nav-not-signedin">
+        <h2 class="sr">You're not currently signed in</h2>
+        <ol>
+          <li class="nav-item nav-not-signedin-hiw">
+            <a href="/">How Studio Works</a>
+          </li>
+          <li class="nav-item nav-not-signedin-help">
+            <a href="http://help.edge.edx.org/" rel="external">Studio Help</a>
+          </li>
+          <li class="nav-item nav-not-signedin-signup">
+            <a class="action action-signup" href="${reverse('signup')}">Sign Up</a>
+          </li>
+          <li class="nav-item nav-not-signedin-signin">
+            <a class="action action-signin" href="${reverse('login')}">Sign In</a>
+          </li>
+        </ol>
+      </nav>
+      % endif      
     </div>
-  </div>
-  <nav class="class-nav-bar">
-    % if context_course:
+  </header>
+</div>
\ No newline at end of file
-    <% ctx_loc = context_course.location %>
-    <ul class="class-nav inner-wrapper">
-      <li><a href="${reverse('course_index', kwargs=dict(org=ctx_loc.org, course=ctx_loc.course, name=ctx_loc.name))}" id='courseware-tab'>Courseware</a></li>
-      <li><a href="${reverse('course_info', kwargs=dict(org=ctx_loc.org, course=ctx_loc.course, name=ctx_loc.name))}" id='courseinfo-tab'>Course Info</a></li>
-      <li><a href="${reverse('edit_tabs', kwargs=dict(org=ctx_loc.org, course=ctx_loc.course, coursename=ctx_loc.name))}" id='pages-tab'>Pages</a></li>
-      <li><a href="${reverse('manage_users', kwargs=dict(location=ctx_loc))}" id='users-tab'>Users</a></li>
-      <li><a href="${reverse('asset_index', kwargs=dict(org=ctx_loc.org, course=ctx_loc.course, name=ctx_loc.name))}" id='assets-tab'>Assets</a></li>
-      <li><a href="${reverse('course_settings', kwargs=dict(org=ctx_loc.org, course=ctx_loc.course, name=ctx_loc.name))}" id='settings-tab'>Settings</a></li>
-      <li><a href="${reverse('import_course', kwargs=dict(org=ctx_loc.org, course=ctx_loc.course, name=ctx_loc.name))}" id='import-tab'>Import</a></li>
-      <li><a href="${reverse('export_course', kwargs=dict(org=ctx_loc.org, course=ctx_loc.course, name=ctx_loc.name))}" id='export-tab'>Export</a></li>
-    </ul>
-    % endif
-  </nav>
-</header>

cms/templates/widgets/problem-edit.html

 <%include file="metadata-edit.html" />
 <section class="problem-editor editor">
     <div class="row">
-        %if markdown != '' or data == '<problem>\n</problem>\n':
+        %if enable_markdown:
         <div class="editor-bar">
             <ul class="format-buttons">
                 <li><a href="#" class="header-button" data-tooltip="Heading 1"><span
                         class="problem-editor-icon heading1"></span></a></li>
                 <li><a href="#" class="multiple-choice-button" data-tooltip="Multiple Choice"><span
                         class="problem-editor-icon multiple-choice"></span></a></li>
-                <li><a href="#" class="checks-button" data-tooltip="Check Multiple"><span
+                <li><a href="#" class="checks-button" data-tooltip="Checkboxes"><span
                         class="problem-editor-icon checks"></span></a></li>
-                <li><a href="#" class="string-button" data-tooltip="String Response"><span
+                <li><a href="#" class="string-button" data-tooltip="Text Input"><span
                         class="problem-editor-icon string"></span></a></li>
-                <li><a href="#" class="number-button" data-tooltip="Numerical Response"><span
+                <li><a href="#" class="number-button" data-tooltip="Numerical Input"><span
                         class="problem-editor-icon number"></span></a></li>
-                <li><a href="#" class="dropdown-button" data-tooltip="Option Response"><span
+                <li><a href="#" class="dropdown-button" data-tooltip="Dropdown"><span
                         class="problem-editor-icon dropdown"></span></a></li>
                 <li><a href="#" class="explanation-button" data-tooltip="Explanation"><span
                         class="problem-editor-icon explanation"></span></a></li>
@@ -56,7 +56,7 @@
                 </div>
             </div>
             <div class="row">
-                <h6>Check Multiple</h6>
+                <h6>Checkboxes</h6>
                 <div class="col sample check-multiple">
                     <img src="/static/img/multi-example.png" />
                 </div>
@@ -67,7 +67,7 @@
                 </div>
             </div>
             <div class="row">
-                <h6>String Response</h6>
+                <h6>Text Input</h6>
                 <div class="col sample string-response">
                     <img src="/static/img/string-example.png" />
                 </div>
@@ -76,7 +76,7 @@
                 </div>
             </div>
             <div class="row">
-                <h6>Numerical Response</h6>
+                <h6>Numerical Input</h6>
                 <div class="col sample numerical-response">
                     <img src="/static/img/number-example.png" />
                 </div>
@@ -85,7 +85,7 @@
                 </div>
             </div>
             <div class="row">
-                <h6>Option Response</h6>
+                <h6>Dropdown</h6>
                 <div class="col sample option-reponse">
                     <img src="/static/img/select-example.png" />
                 </div>

cms/urls.py

@@ -6,7 +6,8 @@ from django.conf.urls import patterns, include, url
 # admin.autodiscover()
 
 urlpatterns = ('',
-    url(r'^$', 'contentstore.views.index', name='index'),
+    url(r'^$', 'contentstore.views.howitworks', name='homepage'),
+    url(r'^listing', 'contentstore.views.index', name='index'),
     url(r'^edit/(?P<location>.*?)$', 'contentstore.views.edit_unit', name='edit_unit'),
     url(r'^subsection/(?P<location>.*?)$', 'contentstore.views.edit_subsection', name='edit_subsection'),
     url(r'^preview_component/(?P<location>.*?)$', 'contentstore.views.preview_component', name='preview_component'),
@@ -42,14 +43,14 @@ 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>[^/]+)/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>[^/]+)/advanced/(?P<name>[^/]+).*$', 'contentstore.views.course_metadata_rest_access', name='course_advanced_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'),
 
-    url(r'^pages/(?P<org>[^/]+)/(?P<course>[^/]+)/course/(?P<coursename>[^/]+)$', 'contentstore.views.static_pages', 
+    url(r'^pages/(?P<org>[^/]+)/(?P<course>[^/]+)/course/(?P<coursename>[^/]+)$', 'contentstore.views.static_pages',
         name='static_pages'),
     url(r'^edit_static/(?P<org>[^/]+)/(?P<course>[^/]+)/course/(?P<coursename>[^/]+)$', 'contentstore.views.edit_static', name='edit_static'),
     url(r'^edit_tabs/(?P<org>[^/]+)/(?P<course>[^/]+)/course/(?P<coursename>[^/]+)$', 'contentstore.views.edit_tabs', name='edit_tabs'),
@@ -57,7 +58,7 @@ urlpatterns = ('',
 
     # this is a generic method to return the data/metadata associated with a xmodule
     url(r'^module_info/(?P<module_location>.*)$', 'contentstore.views.module_info', name='module_info'),
- 
+
 
     # temporary landing page for a course
     url(r'^edge/(?P<org>[^/]+)/(?P<course>[^/]+)/course/(?P<coursename>[^/]+)$', 'contentstore.views.landing', name='landing'),
@@ -77,13 +78,15 @@ urlpatterns = ('',
 
 # User creation and updating views
 urlpatterns += (
+    url(r'^howitworks$', 'contentstore.views.howitworks', name='howitworks'),
     url(r'^signup$', 'contentstore.views.signup', name='signup'),
 
     url(r'^create_account$', 'student.views.create_account'),
     url(r'^activate/(?P<key>[^/]*)$', 'student.views.activate_account', name='activate'),
 
     # form page
-    url(r'^login$', 'contentstore.views.login_page', name='login'),
+    url(r'^login$', 'contentstore.views.old_login_redirect', name='old_login'),
+    url(r'^signin$', 'contentstore.views.login_page', name='login'),
     # ajax view that actually does the work
     url(r'^login_post$', 'student.views.login_user', name='login_post'),