Merge branch 'master' into jmpm-analytics

Conflicts:
	lms/djangoapps/instructor/views.py
	lms/envs/common.py
	lms/templates/courseware/instructor_dashboard.html

.gitignore

@@ -27,4 +27,5 @@ lms/lib/comment_client/python
 nosetests.xml
 cover_html/
 .idea/
+.redcar/
 chromedriver.log
\ No newline at end of file

.pep8

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

.ruby-version

+1.8.7-p371
\ No newline at end of file

Gemfile

 source :rubygems
-ruby "1.9.3"
-gem 'rake'
+gem 'rake', '~> 10.0.3'
 gem 'sass', '3.1.15'
 gem 'bourbon', '~> 1.3.6'
-gem 'colorize'
-gem 'launchy'
+gem 'colorize', '~> 0.5.8'
+gem 'launchy', '~> 2.1.2'

apt-packages.txt

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

cms/.coveragerc

 # .coveragerc for cms
 [run]
 data_file = reports/cms/.coverage
-source = cms
-omit = cms/envs/*, cms/manage.py
+source = cms,common/djangoapps
+omit = cms/envs/*, cms/manage.py, common/djangoapps/terrain/*, 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/__init__.py

-from xmodule.templates import update_templates
 
-update_templates()

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))
\ No newline at end of file
+        return int(idx_matcher.group(1))

cms/djangoapps/contentstore/features/advanced-settings.feature

+Feature: Advanced (manual) course policy
+  In order to specify course policy settings for which no custom user interface exists
+  I want to be able to manually enter JSON key/value pairs
+
+  Scenario: A course author sees only display_name on a newly created course
+    Given I have opened a new course in Studio
+    When I select the Advanced Settings
+    Then I see only the display name
+
+  Scenario: Test if there are no policy settings without existing UI controls
+    Given I am on the Advanced Course Settings page in Studio
+    When I delete the display name
+    Then there are no advanced policy settings
+    And I reload the page
+    Then there are no advanced policy settings
+
+  Scenario: Test cancel editing key name
+    Given I am on the Advanced Course Settings page in Studio
+    When I edit the name of a policy key
+    And I press the "Cancel" notification button
+    Then the policy key name is unchanged
+
+  Scenario: Test editing key name
+    Given I am on the Advanced Course Settings page in Studio
+    When I edit the name of a policy key
+    And I press the "Save" notification button
+    Then the policy key name is changed
+
+  Scenario: Test cancel editing key value
+    Given I am on the Advanced Course Settings page in Studio
+    When I edit the value of a policy key
+    And I press the "Cancel" notification button
+    Then the policy key value is unchanged
+
+  Scenario: Test editing key value
+    Given I am on the Advanced Course Settings page in Studio
+    When I edit the value of a policy key
+    And I press the "Save" notification button
+    Then the policy key value is changed
+
+  Scenario: Add new entries, and they appear alphabetically after save
+    Given I am on the Advanced Course Settings page in Studio
+    When I create New Entries
+    Then they are alphabetized
+    And I reload the page
+    Then they are alphabetized
+
+  Scenario: Test how multi-line input appears
+    Given I am on the Advanced Course Settings page in Studio
+    When I create a JSON object
+    Then it is displayed as formatted

cms/djangoapps/contentstore/features/advanced-settings.py

+from lettuce import world, step
+from common import *
+import time
+
+from nose.tools import assert_equal
+from nose.tools import assert_true
+
+"""
+http://selenium.googlecode.com/svn/trunk/docs/api/py/webdriver/selenium.webdriver.common.keys.html
+"""
+from selenium.webdriver.common.keys import Keys
+
+
+############### ACTIONS ####################
+@step('I select the Advanced Settings$')
+def i_select_advanced_settings(step):
+    expand_icon_css = 'li.nav-course-settings i.icon-expand'
+    if world.browser.is_element_present_by_css(expand_icon_css):
+        css_click(expand_icon_css)
+    link_css = 'li.nav-course-settings-advanced a'
+    css_click(link_css)
+
+
+@step('I am on the Advanced Course Settings page in Studio$')
+def i_am_on_advanced_course_settings(step):
+    step.given('I have opened a new course in Studio')
+    step.given('I select the Advanced Settings')
+
+
+# TODO: this is copied from terrain's step.py. Need to figure out how to share that code.
+@step('I reload the page$')
+def reload_the_page(step):
+    world.browser.reload()
+
+
+@step(u'I edit the name of a policy key$')
+def edit_the_name_of_a_policy_key(step):
+    policy_key_css = 'input.policy-key'
+    e = css_find(policy_key_css).first
+    e.fill('new')
+
+
+@step(u'I press the "([^"]*)" notification button$')
+def press_the_notification_button(step, name):
+    world.browser.click_link_by_text(name)
+
+
+@step(u'I edit the value of a policy key$')
+def edit_the_value_of_a_policy_key(step):
+    """
+    It is hard to figure out how to get into the CodeMirror
+    area, so cheat and do it from the policy key field :)
+    """
+    policy_key_css = 'input.policy-key'
+    e = css_find(policy_key_css).first
+    e._element.send_keys(Keys.TAB, Keys.END, Keys.ARROW_LEFT, ' ', 'X')
+
+
+@step('I delete the display name$')
+def delete_the_display_name(step):
+    delete_entry(0)
+    click_save()
+
+
+@step('create New Entries$')
+def create_new_entries(step):
+    create_entry("z", "apple")
+    create_entry("a", "zebra")
+    click_save()
+
+
+@step('I create a JSON object$')
+def create_JSON_object(step):
+    create_entry("json", '{"key": "value", "key_2": "value_2"}')
+    click_save()
+
+
+############### RESULTS ####################
+@step('I see only the display name$')
+def i_see_only_display_name(step):
+    assert_policy_entries(["display_name"], ['"Robot Super Course"'])
+
+
+@step('there are no advanced policy settings$')
+def no_policy_settings(step):
+    assert_policy_entries([], [])
+
+
+@step('they are alphabetized$')
+def they_are_alphabetized(step):
+    assert_policy_entries(["a", "display_name", "z"], ['"zebra"', '"Robot Super Course"', '"apple"'])
+
+
+@step('it is displayed as formatted$')
+def it_is_formatted(step):
+    assert_policy_entries(["display_name", "json"], ['"Robot Super Course"', '{\n    "key": "value",\n    "key_2": "value_2"\n}'])
+
+
+@step(u'the policy key name is unchanged$')
+def the_policy_key_name_is_unchanged(step):
+    policy_key_css = 'input.policy-key'
+    e = css_find(policy_key_css).first
+    assert_equal(e.value, 'display_name')
+
+
+@step(u'the policy key name is changed$')
+def the_policy_key_name_is_changed(step):
+    policy_key_css = 'input.policy-key'
+    e = css_find(policy_key_css).first
+    assert_equal(e.value, 'new')
+
+
+@step(u'the policy key value is unchanged$')
+def the_policy_key_value_is_unchanged(step):
+    policy_value_css = 'li.course-advanced-policy-list-item div.value textarea'
+    e = css_find(policy_value_css).first
+    assert_equal(e.value, '"Robot Super Course"')
+
+
+@step(u'the policy key value is changed$')
+def the_policy_key_value_is_unchanged(step):
+    policy_value_css = 'li.course-advanced-policy-list-item div.value textarea'
+    e = css_find(policy_value_css).first
+    assert_equal(e.value, '"Robot Super Course X"')
+
+
+############# HELPERS ###############
+def create_entry(key, value):
+    # Scroll down the page so the button is visible
+    world.scroll_to_bottom()
+    css_click_at('a.new-advanced-policy-item', 10, 10)
+    new_key_css = 'div#__new_advanced_key__ input'
+    new_key_element = css_find(new_key_css).first
+    new_key_element.fill(key)
+#   For some reason have to get the instance for each command (get error that it is no longer attached to the DOM)
+#   Have to do all this because Selenium has a bug that fill does not remove existing text
+    new_value_css = 'div.CodeMirror textarea'
+    css_find(new_value_css).last.fill("")
+    css_find(new_value_css).last._element.send_keys(Keys.DELETE, Keys.DELETE)
+    css_find(new_value_css).last.fill(value)
+
+
+def delete_entry(index):
+    """ 
+    Delete the nth entry where index is 0-based
+    """
+    css = '.delete-button'
+    assert_true(world.browser.is_element_present_by_css(css, 5))
+    delete_buttons = css_find(css)
+    assert_true(len(delete_buttons) > index, "no delete button exists for entry " + str(index))
+    delete_buttons[index].click()
+
+
+def assert_policy_entries(expected_keys, expected_values):
+    assert_entries('.key input', expected_keys)
+    assert_entries('.json', expected_values)
+
+
+def assert_entries(css, expected_values):
+    webElements = css_find(css)
+    assert_equal(len(expected_values), len(webElements))
+#   Sometimes get stale reference if I hold on to the array of elements
+    for counter in range(len(expected_values)):
+        assert_equal(expected_values[counter], css_find(css)[counter].value)
+
+
+def click_save():
+    css = ".save-button"
+
+    def is_shown(driver):
+        visible = css_find(css).first.visible
+        if visible:
+            # Even when waiting for visible, this fails sporadically. Adding in a small wait.
+            time.sleep(float(1))
+        return visible
+    wait_for(is_shown)
+    css_click(css)
+
+
+def fill_last_field(value):
+    newValue = css_find('#__new_advanced_key__ input').first
+    newValue.fill(value)

cms/djangoapps/contentstore/features/common.py

 from lettuce import world, step
-from factories import *
-from django.core.management import call_command
 from lettuce.django import django_url
-from django.conf import settings
-from django.core.management import call_command
 from nose.tools import assert_true
 from nose.tools import assert_equal
+from selenium.webdriver.support.ui import WebDriverWait
+
+from terrain.factories import UserFactory, RegistrationFactory, UserProfileFactory
+from terrain.factories import CourseFactory, GroupFactory
 import xmodule.modulestore.django
+from auth.authz import get_user_by_email
 
 from logging import getLogger
 logger = getLogger(__name__)
 
 ###########  STEP HELPERS ##############
+
+
 @step('I (?:visit|access|open) the Studio homepage$')
 def i_visit_the_studio_homepage(step):
     # To make this go to port 8001, put
     # 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):
     log_into_studio()
 
+
 @step('I confirm the alert$')
 def i_confirm_with_ok(step):
     world.browser.get_alert().accept()
 
+
 @step(u'I press the "([^"]*)" delete icon$')
 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)
 
+
+@step('I have opened a new course in Studio$')
+def i_have_opened_a_new_course(step):
+    clear_courses()
+    log_into_studio()
+    create_a_course()
+
 ####### HELPER FUNCTIONS ##############
+
+
 def create_studio_user(
         uname='robot',
         email='robot+studio@edx.org',
         password='test',
-        is_staff=False): 
+        is_staff=False):
     studio_user = UserFactory.build(
-        username=uname, 
+        username=uname,
         email=email,
         password=password,
         is_staff=is_staff)
@@ -58,6 +74,7 @@ def create_studio_user(
 
     user_profile = UserProfileFactory(user=studio_user)
 
+
 def flush_xmodule_store():
     # Flush and initialize the module store
     # It needs the templates because it creates new records
@@ -70,26 +87,57 @@ def flush_xmodule_store():
     xmodule.modulestore.django.modulestore().collection.drop()
     xmodule.templates.update_templates()
 
-def assert_css_with_text(css,text):
+
+def assert_css_with_text(css, text):
     assert_true(world.browser.is_element_present_by_css(css, 5))
     assert_equal(world.browser.find_by_css(css).text, text)
 
+
 def css_click(css):
+    assert_true(world.browser.is_element_present_by_css(css, 5))
     world.browser.find_by_css(css).first.click()
 
+
+def css_click_at(css, x=10, y=10):
+    '''
+    A method to click at x,y coordinates of the element
+    rather than in the center of the element
+    '''
+    assert_true(world.browser.is_element_present_by_css(css, 5))
+    e = world.browser.find_by_css(css).first
+    e.action_chains.move_to_element_with_offset(e._element, x, y)
+    e.action_chains.click()
+    e.action_chains.perform()
+
+
 def css_fill(css, value):
     world.browser.find_by_css(css).first.fill(value)
 
+
+def css_find(css):
+    return world.browser.find_by_css(css)
+
+
+def wait_for(func):
+    WebDriverWait(world.browser.driver, 10).until(func)
+
+
+def id_find(id):
+    return world.browser.find_by_id(id)
+
+
 def clear_courses():
     flush_xmodule_store()
 
+
 def fill_in_course_info(
         name='Robot Super Course',
         org='MITx',
         num='101'):
-    css_fill('.new-course-name',name)
-    css_fill('.new-course-org',org)
-    css_fill('.new-course-number',num)
+    css_fill('.new-course-name', name)
+    css_fill('.new-course-org', org)
+    css_fill('.new-course-number', num)
+
 
 def log_into_studio(
         uname='robot',
@@ -99,7 +147,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)
@@ -108,19 +160,34 @@ def log_into_studio(
 
     assert_true(world.browser.is_element_present_by_css('.new-course-button', 5))
 
+
 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))
+    c = CourseFactory.create(org='MITx', course='999', display_name='Robot Super Course')
+
+    # Add the user to the instructor group of the course
+    # so they will have the permissions to see it in studio
+    g = GroupFactory.create(name='instructor_MITx/999/Robot_Super_Course')
+    u = get_user_by_email('robot+studio@edx.org')
+    u.groups.add(g)
+    u.save()
+    world.browser.reload()
+
+    course_link_css = 'span.class-name'
+    css_click(course_link_css)
+    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'
     css_click(link_css)
-    name_css = '.new-section-name'
-    save_css = '.new-section-name-save'
-    css_fill(name_css,name)
+    name_css = 'input.new-section-name'
+    save_css = 'input.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'
@@ -128,4 +195,4 @@ def add_subsection(name='Subsection One'):
     name_css = 'input.new-subsection-name-input'
     save_css = 'input.new-subsection-name-save'
     css_fill(name_css, name)
-    css_click(save_css)
\ No newline at end of file
+    css_click(save_css)

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()
\ No newline at end of file
+    date_joined = datetime.now()

cms/djangoapps/contentstore/features/section.feature

@@ -11,6 +11,14 @@ Feature: Create Section
     And I see a release date for my section
     And I see a link to create a new subsection
 
+  Scenario: Add a new section (with a quote in the name) to a course (bug #216)
+    Given I have opened a new course in Studio
+    When I click the New Section link
+    And I enter a section name with a quote and click save
+    Then I see my section name with a quote on the Courseware page
+    And I click to edit the section name
+    Then I see the complete section name with a quote in the editor
+
   Scenario: Edit section release date
     Given I have opened a new course in Studio
     And I have added a new section

cms/djangoapps/contentstore/features/section.py

 from lettuce import world, step
 from common import *
+from nose.tools import assert_equal
 
 ############### ACTIONS ####################
-@step('I have opened a new course in Studio$')
-def i_have_opened_a_new_course(step):
-    clear_courses()
-    log_into_studio()
-    create_a_course()
+
 
 @step('I click the new section link$')
 def i_click_new_section_link(step):
     link_css = 'a.new-courseware-section-button'
     css_click(link_css)
 
+
 @step('I enter the section name and click save$')
 def i_save_section_name(step):
-    name_css = '.new-section-name'
-    save_css = '.new-section-name-save'
-    css_fill(name_css,'My Section')
-    css_click(save_css)
+    save_section_name('My Section')
+
+
+@step('I enter a section name with a quote and click save$')
+def i_save_section_name_with_quote(step):
+    save_section_name('Section with "Quote"')
+
 
 @step('I have added a new section$')
 def i_have_added_new_section(step):
     add_section()
-    
+
+
 @step('I click the Edit link for the release date$')
 def i_click_the_edit_link_for_the_release_date(step):
     button_css = 'div.section-published-date a.edit-button'
     css_click(button_css)
 
+
 @step('I save a new section release date$')
 def i_save_a_new_section_release_date(step):
     date_css = 'input.start-date.date.hasDatepicker'
     time_css = 'input.start-time.time.ui-timepicker-input'
-    css_fill(date_css,'12/25/2013')
+    css_fill(date_css, '12/25/2013')
     # click here to make the calendar go away
     css_click(time_css)
-    css_fill(time_css,'12:00am')
+    css_fill(time_css, '12:00am')
     css_click('a.save-button')
 
+
 ############ ASSERTIONS ###################
+
+
 @step('I see my section on the Courseware page$')
 def i_see_my_section_on_the_courseware_page(step):
-    section_css = 'span.section-name-span'
-    assert_css_with_text(section_css,'My Section')
+    see_my_section_on_the_courseware_page('My Section')
+
+
+@step('I see my section name with a quote on the Courseware page$')
+def i_see_my_section_name_with_quote_on_the_courseware_page(step):
+    see_my_section_on_the_courseware_page('Section with "Quote"')
+
+
+@step('I click to edit the section name$')
+def i_click_to_edit_section_name(step):
+    css_click('span.section-name-span')
+
+
+@step('I see the complete section name with a quote in the editor$')
+def i_see_complete_section_name_with_quote_in_editor(step):
+    css = '.edit-section-name'
+    assert world.browser.is_element_present_by_css(css, 5)
+    assert_equal(world.browser.find_by_css(css).value, 'Section with "Quote"')
+
 
 @step('the section does not exist$')
 def section_does_not_exist(step):
     css = 'span.section-name-span'
     assert world.browser.is_element_not_present_by_css(css)
 
+
 @step('I see a release date for my section$')
 def i_see_a_release_date_for_my_section(step):
     import re
@@ -63,20 +87,37 @@ def i_see_a_release_date_for_my_section(step):
     date_regex = '[01][0-9]\/[0-3][0-9]\/[12][0-9][0-9][0-9]'
     time_regex = '[0-2][0-9]:[0-5][0-9]'
     match_string = '%s %s at %s' % (msg, date_regex, time_regex)
-    assert re.match(match_string,status_text)
+    assert re.match(match_string, status_text)
+
 
 @step('I see a link to create a new subsection$')
 def i_see_a_link_to_create_a_new_subsection(step):
     css = 'a.new-subsection-item'
     assert world.browser.is_element_present_by_css(css)
 
+
 @step('the section release date picker is not visible$')
 def the_section_release_date_picker_not_visible(step):
     css = 'div.edit-subsection-publish-settings'
     assert False, world.browser.find_by_css(css).visible
 
+
 @step('the section release date is updated$')
 def the_section_release_date_is_updated(step):
     css = 'span.published-status'
     status_text = world.browser.find_by_css(css).text
     assert status_text == 'Will Release: 12/25/2013 at 12:00am'
+
+
+############ HELPER METHODS ###################
+
+def save_section_name(name):
+    name_css = '.new-section-name'
+    save_css = '.new-section-name-save'
+    css_fill(name_css, name)
+    css_click(save_css)
+
+
+def see_my_section_on_the_courseware_page(name):
+    section_css = 'span.section-name-span'
+    assert_css_with_text(section_css, name)
\ 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."
\ No newline at end of file
+    And I should see the message "please click on the activation link in your email."

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)
\ No newline at end of file
+    assert world.browser.is_text_present(msg, 5)

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)
\ No newline at end of file
+        assert_false(s.visible)

cms/djangoapps/contentstore/features/subsection.feature

@@ -9,6 +9,14 @@ Feature: Create Subsection
     And I enter the subsection name and click save
     Then I see my subsection on the Courseware page
 
+    Scenario: Add a new subsection (with a name containing a quote) to a section (bug #216)
+    Given I have opened a new course section in Studio
+    When I click the New Subsection link
+    And I enter a subsection name with a quote and click save
+    Then I see my subsection name with a quote on the Courseware page
+    And I click to edit the subsection name
+    Then I see the complete subsection name with a quote in the editor
+
     Scenario: Delete a subsection
     Given I have opened a new course section in Studio
     And I have added a new subsection

cms/djangoapps/contentstore/features/subsection.py

 from lettuce import world, step
 from common import *
+from nose.tools import assert_equal
 
 ############### ACTIONS ####################
+
+
 @step('I have opened a new course section in Studio$')
 def i_have_opened_a_new_course_section(step):
     clear_courses()
@@ -9,31 +12,69 @@ 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_click(save_css)
+    save_subsection_name('Subsection One')
+
+
+@step('I enter a subsection name with a quote and click save$')
+def i_save_subsection_name_with_quote(step):
+    save_subsection_name('Subsection With "Quote"')
+
+
+@step('I click to edit the subsection name$')
+def i_click_to_edit_subsection_name(step):
+    css_click('span.subsection-name-value')
+
+
+@step('I see the complete subsection name with a quote in the editor$')
+def i_see_complete_subsection_name_with_quote_in_editor(step):
+    css = '.subsection-display-name-input'
+    assert world.browser.is_element_present_by_css(css, 5)
+    assert_equal(world.browser.find_by_css(css).value, 'Subsection With "Quote"')
+
 
 @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)    
-    css = 'span.subsection-name-value'
-    assert_css_with_text(css,'Subsection One')
+    see_subsection_name('Subsection One')
+
+
+@step('I see my subsection name with a quote on the Courseware page$')
+def i_see_my_subsection_name_with_quote_on_the_courseware_page(step):
+    see_subsection_name('Subsection With "Quote"')
+
 
 @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)
\ No newline at end of file
+    assert world.browser.is_element_not_present_by_css(css)
+
+
+############ HELPER METHODS ###################
+
+def save_subsection_name(name):
+    name_css = 'input.new-subsection-name-input'
+    save_css = 'input.new-subsection-name-save'
+    css_fill(name_css, name)
+    css_click(save_css)
+
+def see_subsection_name(name):
+    css = 'span.subsection-name'
+    assert world.browser.is_element_present_by_css(css)
+    css = 'span.subsection-name-value'
+    assert_css_with_text(css, name)

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,26 +15,31 @@ 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'''
+    help = '''Delete a MongoDB backed course'''
 
     def handle(self, *args, **options):
-        if len(args) != 1:
-            raise CommandError("delete_course requires one argument: <location>")
+        if len(args) != 1 and len(args) != 2:
+            raise CommandError("delete_course requires one or more arguments: <location> |commit|")
 
         loc_str = args[0]
 
+        commit = False
+        if len(args) == 2:
+            commit = args[1] == 'commit'
+
+        if commit:
+            print 'Actually going to delete the course from DB....'
+
         ms = modulestore('direct')
         cs = contentstore()
 
         if query_yes_no("Deleting course {0}. Confirm?".format(loc_str), default="no"):
-          if query_yes_no("Are you sure. This action cannot be undone!", default="no"):
-            loc = CourseDescriptor.id_to_location(loc_str)
-            if delete_course(ms, cs, loc) == True:
-              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)            
-
-
-
+            if query_yes_no("Are you sure. This action cannot be undone!", default="no"):
+                loc = CourseDescriptor.id_to_location(loc_str)
+                if delete_course(ms, cs, loc, commit) == True:
+                    print 'removing User permissions from course....'
+                    # in the django layer, we need to remove all the user permissions groups associated with this course
+                    if commit:
+                        _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.
 
@@ -12,7 +13,7 @@ def query_yes_no(question, default="yes"):
     """
     valid = {"yes":True,   "y":True,  "ye":True,
              "no":False,     "n":False}
-    if default == None:
+    if default is None:
         prompt = " [y/n] "
     elif default == "yes":
         prompt = " [Y/n] "
@@ -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")
\ No newline at end of file
+                             "(or 'y' or 'n').\n")

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

+from xmodule.templates import update_templates
+from django.core.management.base import BaseCommand
+
+class Command(BaseCommand):
+    help = \
+'''Imports and updates the Studio component templates from the code pack and put in the DB'''
+
+    def handle(self, *args, **options):
+        update_templates()
\ No newline at end of file

cms/djangoapps/contentstore/module_info_model.py

-import logging
-from static_replace import replace_urls
+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_urls(module.definition['data'], course_namespace = Location([module.location.tag, module.location.org, module.location.course, None, None]))
+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)
 
-  return {
+    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,
+                None,
+                None
+            ])
+        )
+
+    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/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 uuid import uuid4
+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 a uuid to differentiate
+        # the mongo collections on jenkins.
+        self.orig_MODULESTORE = copy.deepcopy(settings.MODULESTORE)
+        self.test_MODULESTORE = self.orig_MODULESTORE
+        self.test_MODULESTORE['default']['OPTIONS']['collection'] = 'modulestore_%s' % uuid4().hex
+        self.test_MODULESTORE['direct']['OPTIONS']['collection'] = 'modulestore_%s' % uuid4().hex
+        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
@@ -72,12 +75,20 @@ def get_course_for_item(location):
     return courses[0]
 
 
-def get_lms_link_for_item(location, preview=False):
+def get_lms_link_for_item(location, preview=False, course_id=None):
+    if course_id is None:
+        course_id = get_course_id(location)
+
     if settings.LMS_BASE is not None:
-        lms_link = "//{preview}{lms_base}/courses/{course_id}/jump_to/{location}".format(
-            preview='preview.' if preview else '',
-            lms_base=settings.LMS_BASE,
-            course_id=get_course_id(location),
+        if preview:
+            lms_base = settings.MITX_FEATURES.get('PREVIEW_LMS_BASE',
+                'preview.' + settings.LMS_BASE)
+        else:
+            lms_base = settings.LMS_BASE
+     
+        lms_link = "//{lms_base}/courses/{course_id}/jump_to/{location}".format(
+            lms_base=lms_base,
+            course_id=course_id,
             location=Location(location)
         )
     else:
@@ -85,6 +96,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 +111,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 +119,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 +149,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 +157,4 @@ def update_item(location, value):
     if value is None:
         get_modulestore(location).delete_item(location)
     else:
-        get_modulestore(location).update_item(location, value)
\ No newline at end of file
+        get_modulestore(location).update_item(location, value)

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/djangoapps/models/settings/course_metadata.py

+from xmodule.modulestore import Location
+from contentstore.utils import get_modulestore
+from xmodule.x_module import XModuleDescriptor
+
+
+class CourseMetadata(object):
+    '''
+    For CRUD operations on metadata fields which do not have specific editors on the other pages including any user generated ones.
+    The objects have no predefined attrs but instead are obj encodings of the editable metadata.
+    '''
+    # __new_advanced_key__ is used by client not server; so, could argue against it being here
+    FILTERED_LIST = XModuleDescriptor.system_metadata_fields + ['start', 'end', 'enrollment_start', 'enrollment_end', 'tabs', 'graceperiod', '__new_advanced_key__']
+    
+    @classmethod
+    def fetch(cls, course_location):
+        """
+        Fetch the key:value editable course details for the given course from persistence and return a CourseMetadata model.
+        """
+        if not isinstance(course_location, Location):
+            course_location = Location(course_location)
+            
+        course = {}
+        
+        descriptor = get_modulestore(course_location).get_item(course_location)
+        
+        for k, v in descriptor.metadata.iteritems():
+            if k not in cls.FILTERED_LIST:
+                course[k] = v
+                
+        return course
+        
+    @classmethod
+    def update_from_json(cls, course_location, jsondict):
+        """
+        Decode the json into CourseMetadata and save any changed attrs to the db.
+        
+        Ensures none of the fields are in the blacklist.
+        """
+        descriptor = get_modulestore(course_location).get_item(course_location)
+        
+        dirty = False
+
+        for k, v in jsondict.iteritems():
+            # should it be an error if one of the filtered list items is in the payload?
+            if k not in cls.FILTERED_LIST and (k not in descriptor.metadata or descriptor.metadata[k] != v):
+                dirty = True
+                descriptor.metadata[k] = v
+            
+        if dirty:
+            get_modulestore(course_location).update_metadata(course_location, descriptor.metadata)
+            
+        # 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 cls.fetch(course_location)
+    
+    @classmethod
+    def delete_key(cls, course_location, payload):
+        '''
+        Remove the given metadata key(s) from the course. payload can be a single key or [key..]
+        '''
+        descriptor = get_modulestore(course_location).get_item(course_location)
+        
+        for key in payload['deleteKeys']:
+            if key in descriptor.metadata:
+                del descriptor.metadata[key]
+    
+        get_modulestore(course_location).update_metadata(course_location, descriptor.metadata)
+        
+        return cls.fetch(course_location)
+        
\ No newline at end of file

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/aws.py

@@ -5,8 +5,22 @@ import json
 
 from .common import *
 from logsettings import get_logger_config
+import os
 
-############################### ALWAYS THE SAME ################################
+# specified as an environment variable.  Typically this is set
+# in the service's upstart script and corresponds exactly to the service name.
+# Service variants apply config differences via env and auth JSON files,
+# the names of which correspond to the variant.
+SERVICE_VARIANT = os.environ.get('SERVICE_VARIANT', None)
+
+# when not variant is specified we attempt to load an unvaried
+# config set.
+CONFIG_PREFIX = ""
+
+if SERVICE_VARIANT:
+    CONFIG_PREFIX = SERVICE_VARIANT + "."
+
+############### ALWAYS THE SAME ################################
 DEBUG = False
 TEMPLATE_DEBUG = False
 
@@ -14,9 +28,9 @@ EMAIL_BACKEND = 'django_ses.SESBackend'
 SESSION_ENGINE = 'django.contrib.sessions.backends.cache'
 DEFAULT_FILE_STORAGE = 'storages.backends.s3boto.S3BotoStorage'
 
-########################### NON-SECURE ENV CONFIG ##############################
+############# NON-SECURE ENV CONFIG ##############################
 # Things like server locations, ports, etc.
-with open(ENV_ROOT / "cms.env.json") as env_file:
+with open(ENV_ROOT / CONFIG_PREFIX + "env.json") as env_file:
     ENV_TOKENS = json.load(env_file)
 
 LMS_BASE = ENV_TOKENS.get('LMS_BASE')
@@ -35,15 +49,12 @@ for feature, value in ENV_TOKENS.get('MITX_FEATURES', {}).items():
 LOGGING = get_logger_config(LOG_DIR,
                             logging_env=ENV_TOKENS['LOGGING_ENV'],
                             syslog_addr=(ENV_TOKENS['SYSLOG_SERVER'], 514),
-                            debug=False)
-
-with open(ENV_ROOT / "repos.json") as repos_file:
-    REPOS = json.load(repos_file)
-
+                            debug=False,
+                            service_variant=SERVICE_VARIANT)
 
-############################## SECURE AUTH ITEMS ###############################
+################ SECURE AUTH ITEMS ###############################
 # Secret things: passwords, access keys, etc.
-with open(ENV_ROOT / "cms.auth.json") as auth_file:
+with open(ENV_ROOT / CONFIG_PREFIX + "auth.json") as auth_file:
     AUTH_TOKENS = json.load(auth_file)
 
 AWS_ACCESS_KEY_ID = AUTH_TOKENS["AWS_ACCESS_KEY_ID"]

cms/envs/common.py

@@ -20,7 +20,6 @@ Longer TODO:
 """
 
 import sys
-import tempfile
 import os.path
 import os
 import lms.envs.common
@@ -33,8 +32,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
 
@@ -59,7 +58,8 @@ sys.path.append(COMMON_ROOT / 'lib')
 
 ############################# WEB CONFIGURATION #############################
 # This is where we stick our compiled template files.
-MAKO_MODULE_DIR = tempfile.mkdtemp('mako')
+from tempdir import mkdtemp_clean
+MAKO_MODULE_DIR = mkdtemp_clean('mako')
 MAKO_TEMPLATES = {}
 MAKO_TEMPLATES['main'] = [
     PROJECT_ROOT / 'templates',
@@ -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
@@ -179,6 +172,9 @@ LANGUAGE_CODE = 'en'            # http://www.i18nguy.com/unicode/language-identi
 USE_I18N = True
 USE_L10N = True
 
+# Tracking
+TRACK_MAX_EVENT = 10000
+
 # Messages
 MESSAGE_STORAGE = 'django.contrib.messages.storage.session.SessionStorage'
 
@@ -229,7 +225,7 @@ PIPELINE_JS = {
         'source_filenames': sorted(
             rooted_glob(COMMON_ROOT / 'static/', 'coffee/src/**/*.coffee') +
             rooted_glob(PROJECT_ROOT / 'static/', 'coffee/src/**/*.coffee')
-        ) + ['js/base.js'],
+        ) + ['js/hesitate.js', 'js/base.js'],
         'output_filename': 'js/cms-application.js',
     },
     'module-js': {
@@ -281,8 +277,13 @@ INSTALLED_APPS = (
     'contentstore',
     'auth',
     'student',  # misleading name due to sharing with lms
+    'course_groups',  # not used in cms (yet), but tests run
+
+    # tracking
+    'track',
 
     # For asset pipelining
     'pipeline',
     'staticfiles',
+    'static_replace',
 )

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"
@@ -28,6 +27,9 @@ STATIC_ROOT = TEST_ROOT / "staticfiles"
 GITHUB_REPO_ROOT = TEST_ROOT / "data"
 COMMON_TEST_DATA_ROOT = COMMON_ROOT / "test" / "data"
 
+# Makes the tests run much faster...
+SOUTH_TESTS_MIGRATE = False # To disable migrations and use syncdb instead
+
 # TODO (cpennington): We need to figure out how envs/test.py can inject things into common.py so that we don't have to repeat this sort of thing
 STATICFILES_DIRS = [
     COMMON_ROOT / "static",
@@ -63,7 +65,7 @@ CONTENTSTORE = {
     'ENGINE': 'xmodule.contentstore.mongo.MongoContentStore',
     'OPTIONS': {
         'host': 'localhost',
-        'db' : 'xcontent',
+        'db': 'xcontent',
     }
 }
 
@@ -72,23 +74,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 +106,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/advanced_entry.html

+<li class="field-group course-advanced-policy-list-item">
+	<div class="field text key" id="<%= (_.isEmpty(key) ? '__new_advanced_key__' : key) %>">
+		<label for="<%= keyUniqueId %>">Policy Key:</label>
+		<input type="text" class="short policy-key" id="<%= keyUniqueId %>" value="<%= key %>" />
+		<span class="tip tip-stacked">Keys are case	sensitive and cannot contain spaces or start with a number</span>
+  </div>
+  
+  <div class="field text value">
+    <label for="<%= valueUniqueId %>">Policy Value:</label>
+    <textarea class="json text" id="<%= valueUniqueId %>"><%= value %></textarea>
+  </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>
\ No newline at end of file

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/coffee/files.json

 {
   "js_files": [
+    "/static/js/vendor/RequireJS.js",
     "/static/js/vendor/jquery.min.js",
+    "/static/js/vendor/jquery-ui.min.js",
+    "/static/js/vendor/jquery.ui.draggable.js",
+    "/static/js/vendor/jquery.cookie.js",
     "/static/js/vendor/json2.js",
     "/static/js/vendor/underscore-min.js",
     "/static/js/vendor/backbone-min.js"

cms/static/coffee/src/views/tabs.coffee

 class CMS.Views.TabsEdit extends Backbone.View
-  events:
-    'click .new-tab': 'addNewTab'
 
   initialize: =>
     @$('.component').each((idx, element) =>
@@ -13,9 +11,10 @@ class CMS.Views.TabsEdit extends Backbone.View
         )
     )
 
+    @options.mast.find('.new-tab').on('click', @addNewTab)
     @$('.components').sortable(
       handle: '.drag-handle'
-      update: (event, ui) => alert 'not yet implemented!'
+      update: @tabMoved
       helper: 'clone'
       opacity: '0.5'
       placeholder: 'component-placeholder'
@@ -24,6 +23,20 @@ class CMS.Views.TabsEdit extends Backbone.View
       items: '> .component'
     )    
 
+  tabMoved: (event, ui) =>
+    tabs = []
+    @$('.component').each((idx, element) =>
+        tabs.push($(element).data('id'))
+    )
+    $.ajax({
+      type:'POST',
+      url: '/reorder_static_tabs', 
+      data: JSON.stringify({
+        tabs : tabs
+      }),
+      contentType: 'application/json'
+    })
+
   addNewTab: (event) =>
     event.preventDefault()
 

cms/static/css/tiny-mce.css

+@font-face{font-family:'Open Sans';font-style:normal;font-weight:700;src:local("Open Sans Bold"),local("OpenSans-Bold"),url(http://themes.googleusercontent.com/static/fonts/opensans/v6/k3k702ZOKiLJc3WVjuplzKRDOzjiPcYnFooOUGCOsRk.woff) format("woff")}@font-face{font-family:'Open Sans';font-style:normal;font-weight:300;src:local("Open Sans Light"),local("OpenSans-Light"),url(http://themes.googleusercontent.com/static/fonts/opensans/v6/DXI1ORHCpsQm3Vp6mXoaTaRDOzjiPcYnFooOUGCOsRk.woff) format("woff")}@font-face{font-family:'Open Sans';font-style:italic;font-weight:700;src:local("Open Sans Bold Italic"),local("OpenSans-BoldItalic"),url(http://themes.googleusercontent.com/static/fonts/opensans/v6/PRmiXeptR36kaC0GEAetxhbnBKKEOwRKgsHDreGcocg.woff) format("woff")}@font-face{font-family:'Open Sans';font-style:italic;font-weight:300;src:local("Open Sans Light Italic"),local("OpenSansLight-Italic"),url(http://themes.googleusercontent.com/static/fonts/opensans/v6/PRmiXeptR36kaC0GEAetxvR_54zmj3SbGZQh3vCOwvY.woff) format("woff")}@font-face{font-family:'Open Sans';font-style:italic;font-weight:400;src:local("Open Sans Italic"),local("OpenSans-Italic"),url(http://themes.googleusercontent.com/static/fonts/opensans/v6/xjAJXh38I15wypJXxuGMBrrIa-7acMAeDBVuclsi6Gc.woff) format("woff")}@font-face{font-family:'Open Sans';font-style:normal;font-weight:400;src:local("Open Sans"),local("OpenSans"),url(http://themes.googleusercontent.com/static/fonts/opensans/v6/cJZKeOuBrn4kERxqtaUH3bO3LdcAZYWl9Si6vvxL-qU.woff) format("woff")}
+
 .mceContentBody {
-  padding: 10px;
-  background-color: #fff;
-  font-family: 'Open Sans', Verdana, Arial, Helvetica, sans-serif;
-  font-size: 16px;
-  line-height: 1.6;
-  color: #3c3c3c;
-  scrollbar-3dlight-color: #F0F0EE;
-  scrollbar-arrow-color: #676662;
-  scrollbar-base-color: #F0F0EE;
-  scrollbar-darkshadow-color: #DDDDDD;
-  scrollbar-face-color: #E0E0DD;
-  scrollbar-highlight-color: #F0F0EE;
-  scrollbar-shadow-color: #F0F0EE;
-  scrollbar-track-color: #F5F5F5;
+    padding: 10px;
+    background-color: #fff;
+    font-family: 'Open Sans', Verdana, Arial, Helvetica, sans-serif;
+    font-size: 16px;
+    line-height: 1.6;
+    color: #3c3c3c;
+    scrollbar-3dlight-color: #F0F0EE;
+    scrollbar-arrow-color: #676662;
+    scrollbar-base-color: #F0F0EE;
+    scrollbar-darkshadow-color: #DDDDDD;
+    scrollbar-face-color: #E0E0DD;
+    scrollbar-highlight-color: #F0F0EE;
+    scrollbar-shadow-color: #F0F0EE;
+    scrollbar-track-color: #F5F5F5;
 }
 
 h1 {
-  color: #3c3c3c;
-  font-weight: normal;
-  font-size: 2em;
-  line-height: 1.4em;
-  letter-spacing: 1px;
+    color: #3c3c3c;
+    font-weight: normal;
+    font-size: 2em;
+    line-height: 1.4em;
+    letter-spacing: 1px;
+    margin: 0 0 1.416em 0;
 }
 
 h2 {
-  color: #646464;
-  font-weight: normal;
-  font-size: 1.2em;
-  line-height: 1.2em;
-  letter-spacing: 1px;
-  margin-bottom: 15px;
-  text-transform: uppercase;
-  -webkit-font-smoothing: antialiased;
+    color: #646464;
+    font-weight: normal;
+    font-size: 1.2em;
+    line-height: 1.2em;
+    letter-spacing: 1px;
+    margin-bottom: 15px;
+    text-transform: uppercase;
+    -webkit-font-smoothing: antialiased;
+}
+
+h3, h4, h5, h6 {
+    margin: 0 0 10px 0;
+    font-weight: 600;
 }
 
 h3 {
-  font-size: 1.2em;
-  font-weight: 600;
+    font-size: 1.2em;
+}
+
+h4 {
+    font-size: 1em;
+}
+
+h5 {
+    font-size: .83em;
+}
+
+h6 {
+    font-size: 0.75em;
 }
 
 p {
-  margin-bottom: 1.416em;
-  font-size: 1em;
-  line-height: 1.6em !important;
-  color: $baseFontColor;
+    margin-bottom: 1.416em;
+    font-size: 1em;
+    line-height: 1.6em !important;
+    color: #3c3c3c;
 }
 
 em, i {
-  font-style: italic;
+    font-style: italic;
 }
 
 strong, b {
-  font-style: bold;
+    font-style: bold;
 }
 
 p + p, ul + p, ol + p {
-  margin-top: 20px;
+    margin-top: 20px;
 }
 
 ol, ul {
-  margin: 1em 0;
-  padding: 0 0 0 1em;
+    margin: 1em 0;
+    padding: 0 0 0 1em;
+    color: #3c3c3c;
+
 }
 
 ol li, ul li {
-  margin-bottom: 0.708em;
+    margin-bottom: 0.708em;
 }
 
 ol {
-  list-style: decimal outside none;
+    list-style: decimal outside none;
 }
 
 ul {
-  list-style: disc outside none;
+    list-style: disc outside none;
 }
 
 a, a:link, a:visited, a:hover, a:active {
-  color: #1d9dd9;
-} 
+    color: #1d9dd9;
+}
 
 img {
-  max-width: 100%;
+    max-width: 100%;
 }
 
-code {
+pre {
+  margin: 1em 0;
+  color: #3c3c3c;
   font-family: monospace, serif;
-  background: none;
-}
\ No newline at end of file
+  font-size: 1em;
+  white-space: pre-wrap;
+  word-wrap: break-word;
+}
+
+code {
+    font-family: monospace, serif;
+    background: none;
+    color: #3c3c3c;
+    padding: 0;
+}
+
+table {
+    width: 100%;
+    border-collapse: collapse;
+    font-size: 16px;
+}
+
+th {
+    background: #eee;
+    font-weight: bold;
+}
+
+table td, th {
+    margin: 20px 0;
+    padding: 10px;
+    border: 1px solid #ccc !important;
+    text-align: left;
+    font-size: 14px;
+}

cms/static/js/hesitate.js

+/*
+ * Create a HesitateEvent and assign it as the event to execute:
+ *   $(el).on('mouseEnter', CMS.HesitateEvent( expand, 'mouseLeave').trigger);
+ *   It calls the executeOnTimeOut function with the event.currentTarget after the configurable timeout IFF the cancelSelector event
+ *   did not occur on the event.currentTarget. 
+ *   
+ *   More specifically, when trigger is called (triggered by the event you bound it to), it starts a timer 
+ *   which the cancelSelector event will cancel or if the timer finished, it executes the executeOnTimeOut function
+ *   passing it the original event (whose currentTarget s/b the specific ele). It never accumulates events; however, it doesn't hurt for your
+ *   code to minimize invocations of trigger by binding to mouseEnter v mouseOver and such.
+ *   
+ *   NOTE: if something outside of this wants to cancel the event, invoke cachedhesitation.untrigger(null | anything);
+ */
+
+CMS.HesitateEvent = function(executeOnTimeOut, cancelSelector, onlyOnce) {
+	this.executeOnTimeOut = executeOnTimeOut;
+	this.cancelSelector = cancelSelector;
+	this.timeoutEventId = null;
+	this.originalEvent = null;
+	this.onlyOnce = (onlyOnce === true);
+};
+
+CMS.HesitateEvent.DURATION = 800;
+
+CMS.HesitateEvent.prototype.trigger = function(event) {
+	if (event.data.timeoutEventId == null) {
+		event.data.timeoutEventId = window.setTimeout(
+				function() { event.data.fireEvent(event); }, 
+				CMS.HesitateEvent.DURATION);
+		event.data.originalEvent = event;
+		$(event.data.originalEvent.delegateTarget).on(event.data.cancelSelector, event.data, event.data.untrigger);
+	}
+};
+
+CMS.HesitateEvent.prototype.fireEvent = function(event) {
+	event.data.timeoutEventId = null;
+	$(event.data.originalEvent.delegateTarget).off(event.data.cancelSelector, event.data.untrigger);
+	if (event.data.onlyOnce) $(event.data.originalEvent.delegateTarget).off(event.data.originalEvent.type, event.data.trigger);
+	event.data.executeOnTimeOut(event.data.originalEvent);
+};
+
+CMS.HesitateEvent.prototype.untrigger = function(event) {
+	if (event.data.timeoutEventId) {
+		window.clearTimeout(event.data.timeoutEventId);
+		$(event.data.originalEvent.delegateTarget).off(event.data.cancelSelector, event.data.untrigger);
+	}
+	event.data.timeoutEventId = null;
+};
\ No newline at end of file

cms/static/js/models/settings/advanced.js

+if (!CMS.Models['Settings']) CMS.Models.Settings = {};
+
+CMS.Models.Settings.Advanced = Backbone.Model.extend({
+    // the key for a newly added policy-- before the user has entered a key value
+    new_key : "__new_advanced_key__",
+
+    defaults: {
+        // the properties are whatever the user types in (in addition to whatever comes originally from the server)
+    },
+    // which keys to send as the deleted keys on next save
+    deleteKeys : [],
+    blacklistKeys : [], // an array which the controller should populate directly for now [static not instance based]
+
+    validate: function (attrs) {
+        var errors = {};
+        for (var key in attrs) {
+            if (key === this.new_key || _.isEmpty(key)) {
+                errors[key] = "A key must be entered.";
+            }
+            else if (_.contains(this.blacklistKeys, key)) {
+                errors[key] = key + " is a reserved keyword or can be edited on another screen";
+            }
+        }
+        if (!_.isEmpty(errors)) return errors;
+    },
+    
+    save : function (attrs, options) {
+        // wraps the save call w/ the deletion of the removed keys after we know the saved ones worked
+        options = options ? _.clone(options) : {};
+        // add saveSuccess to the success
+        var success = options.success;
+        options.success = function(model, resp, options) {
+          model.afterSave(model);
+          if (success) success(model, resp, options);
+        };
+        Backbone.Model.prototype.save.call(this, attrs, options);
+    },
+    
+    afterSave : function(self) {
+        // remove deleted attrs
+        if (!_.isEmpty(self.deleteKeys)) {
+            // remove the to be deleted keys from the returned model
+            _.each(self.deleteKeys, function(key) { self.unset(key); });
+            // not able to do via backbone since we're not destroying the model
+            $.ajax({
+                url : self.url,
+                // json to and fro
+                contentType : "application/json",
+                dataType : "json",
+                // delete
+                type : 'DELETE',
+                // data
+                data : JSON.stringify({ deleteKeys : self.deleteKeys})
+            })
+            .fail(function(hdr, status, error) { CMS.ServerError(self, "Deleting keys:" + status); })
+            .done(function(data, status, error) {
+                // clear deleteKeys on success
+                self.deleteKeys = [];
+            });
+        }
+    }
+});

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}); 
-		// TODO remove all whitespace w/in string
-		else {
-			if (this.get('intro_video') !== newsource) this.save('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 "";
-	}
+    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
+    },
+
+    _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}); 
+        // TODO remove all whitespace w/in string
+        else {
+            if (this.get('intro_video') !== newsource) this.save('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_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
-	},
-
-	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;
-			}
-		}
-	}
-})
\ No newline at end of file

cms/static/js/template_loader.js

@@ -5,7 +5,7 @@
 	if (typeof window.templateLoader == 'function') return;
 	
     var templateLoader = {
-      templateVersion: "0.0.12",
+      templateVersion: "0.0.15",
       templates: {},
       loadRemoteTemplate: function(templateName, filename, callback) {
         if (!this.templates[templateName]) {

cms/static/js/views/course_info_edit.js

@@ -10,7 +10,7 @@ CMS.Views.CourseInfoEdit = Backbone.View.extend({
   render: function() {
     // instantiate the ClassInfoUpdateView and delegate the proper dom to it
     new CMS.Views.ClassInfoUpdateView({
-        el: this.$('#course-update-view'),
+        el: $('body.updates'),
         collection: this.model.get('updates')
     });
 
@@ -27,10 +27,10 @@ CMS.Views.ClassInfoUpdateView = Backbone.View.extend({
     // collection is CourseUpdateCollection
     events: {
         "click .new-update-button" : "onNew",
-        "click .save-button" : "onSave",
-        "click .cancel-button" : "onCancel",
-        "click .edit-button" : "onEdit",
-        "click .delete-button" : "onDelete"
+        "click #course-update-view .save-button" : "onSave",
+        "click #course-update-view .cancel-button" : "onCancel",
+        "click .post-actions > .edit-button" : "onEdit",
+        "click .post-actions > .delete-button" : "onDelete"
     },
         
     initialize: function() {
@@ -44,6 +44,8 @@ CMS.Views.ClassInfoUpdateView = Backbone.View.extend({
         		self.render();           
             }
         );
+        // when the client refetches the updates as a whole, re-render them
+        this.listenTo(this.collection, 'reset', this.render);
     },
         
     render: function () {
@@ -53,8 +55,12 @@ CMS.Views.ClassInfoUpdateView = Backbone.View.extend({
           $(updateEle).empty();
           var self = this;
           this.collection.each(function (update) {
-        	  var newEle = self.template({ updateModel : update });
-              $(updateEle).append(newEle);
+              try {
+                  var newEle = self.template({ updateModel : update });
+                  $(updateEle).append(newEle);
+            } catch (e) {
+                // ignore
+            }
           });
           this.$el.find(".new-update-form").hide();
           this.$el.find('.date').datepicker({ 'dateFormat': 'MM d, yy' });
@@ -99,10 +105,7 @@ CMS.Views.ClassInfoUpdateView = Backbone.View.extend({
         var targetModel = this.eventModel(event);
         targetModel.set({ date : this.dateEntry(event).val(), content : this.$codeMirror.getValue() });
         // push change to display, hide the editor, submit the change        
-        targetModel.save({}, {error : function(model, xhr) {
-        	// TODO use a standard component
-        	window.alert(xhr.responseText);
-        }});
+        targetModel.save({}, {error : CMS.ServerError});
         this.closeEditor(this);
     },
     
@@ -145,13 +148,15 @@ CMS.Views.ClassInfoUpdateView = Backbone.View.extend({
         this.modelDom(event).remove();
         var cacheThis = this;
         targetModel.destroy({success : function (model, response) { 
-            cacheThis.collection.fetch({success : function() {cacheThis.render();}});
-        }
+            cacheThis.collection.fetch({success : function() {cacheThis.render();},
+                error : CMS.ServerError});
+        },
+        error : CMS.ServerError
         });
     },
 
     closeEditor: function(self, removePost) {
-        var targetModel = self.collection.getByCid(self.$currentPost.attr('name'));
+        var targetModel = self.collection.get(self.$currentPost.attr('name'));
 
         if(removePost) {
             self.$currentPost.remove();
@@ -161,8 +166,13 @@ CMS.Views.ClassInfoUpdateView = Backbone.View.extend({
         self.$currentPost.removeClass('editing');
         self.$currentPost.find('.date-display').html(targetModel.get('date'));
         self.$currentPost.find('.date').val(targetModel.get('date'));
-        self.$currentPost.find('.update-contents').html(targetModel.get('content'));
-        self.$currentPost.find('.new-update-content').val(targetModel.get('content'));
+        try {
+            // just in case the content causes an error (embedded js errors)
+            self.$currentPost.find('.update-contents').html(targetModel.get('content'));
+            self.$currentPost.find('.new-update-content').val(targetModel.get('content'));
+        } catch (e) {
+            // ignore but handle rest of page
+        }
         self.$currentPost.find('form').hide();
         window.$modalCover.unbind('click');
         window.$modalCover.hide();
@@ -173,7 +183,7 @@ CMS.Views.ClassInfoUpdateView = Backbone.View.extend({
     // Dereferencing from events to screen elements    
     eventModel: function(event) {
         // not sure if it should be currentTarget or delegateTarget
-        return this.collection.getByCid($(event.currentTarget).attr("name"));
+        return this.collection.get($(event.currentTarget).attr("name"));
     },
         
     modelDom: function(event) {
@@ -225,7 +235,8 @@ CMS.Views.ClassInfoHandoutsView = Backbone.View.extend({
                             self.render();                
                         }
                     );
-                }
+                },
+                error : CMS.ServerError
             }
         );
     },
@@ -267,7 +278,7 @@ CMS.Views.ClassInfoHandoutsView = Backbone.View.extend({
     onSave: function(event) {
         this.model.set('data', this.$codeMirror.getValue());
         this.render();
-        this.model.save();
+        this.model.save({}, {error: CMS.ServerError});
         this.$form.hide();
         this.closeEditor(this);
     },

cms/static/js/views/server_error.js

+CMS.ServerError = function(model, error) {
+	// this handler is for the client:server communication not the validation errors which handleValidationError catches
+	window.alert("Server Error: " + error.responseText);
+};
\ No newline at end of file

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 : {
+        "change input" : "clearValidationErrors",
+        "change 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/_alerts.scss

+// notifications
+.wrapper-notification {
+	@include clearfix();
+	@include box-sizing(border-box);
+	@include transition (bottom 2.0s ease-in-out 5s);
+	@include box-shadow(0 -1px 2px rgba(0,0,0,0.1));
+	position: fixed;
+	bottom: -100px;
+	z-index: 1000;
+	width: 100%;
+	overflow: hidden;
+	opacity: 0;
+	border-top: 1px solid $darkGrey;
+	padding: 20px 40px;
+
+	&.is-shown {
+		bottom: 0;
+		opacity: 1.0;
+	}
+
+	&.wrapper-notification-warning {
+		border-color: shade($yellow, 25%);
+		background: tint($yellow, 25%);
+	}
+
+	&.wrapper-notification-error {
+		border-color: shade($red, 50%);
+		background: tint($red, 20%);
+		color: $white;
+	}
+
+	&.wrapper-notification-confirm {
+		border-color: shade($green, 30%);
+		background: tint($green, 40%);
+		color: shade($green, 30%);
+	}
+}
+
+.notification {
+	@include box-sizing(border-box);
+	margin: 0 auto;
+	width: flex-grid(12);
+	max-width: $fg-max-width;
+	min-width: $fg-min-width;
+
+	.copy {
+		float: left;
+		width: flex-grid(9, 12);
+		margin-right: flex-gutter();
+		margin-top: 5px;
+		font-size: 14px;
+
+		.icon {
+			display: inline-block;
+			vertical-align: top;
+			margin-right: 5px;
+			font-size: 20px;
+		}
+
+		p {
+			width: flex-grid(8, 9);
+			display: inline-block;
+			vertical-align: top;
+		}
+	}
+
+	.actions {
+		float: right;
+		width: flex-grid(3, 12);
+		margin-top: ($baseline/2);
+		text-align: right;
+
+		li {
+			display: inline-block;
+			vertical-align: middle;
+			margin-right: 10px;
+
+			&:last-child {
+				margin-right: 0;
+			}
+		}
+
+		.save-button {
+			@include blue-button;
+		}
+
+		.cancel-button {
+		  @include white-button;
+		}
+	}
+
+	strong {
+		font-weight: 700;
+	}
+}
+
+// adopted alerts
 .alert {
 	padding: 15px 20px;
 	margin-bottom: 30px;

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/_course-info.scss

@@ -37,6 +37,11 @@
 		padding: 34px 0 42px;
 		border-top: 1px solid #cbd1db;
 
+		&:first-child {
+			padding-top: 0;
+			border: none;
+		}
+
 		&.editing {
 			position: relative;
 			z-index: 1001;
@@ -88,6 +93,40 @@
 			background: #f6f6f6;
 			padding: 20px;
 		}
+
+		ol, ul {
+		  margin: 1em 0;
+		  padding: 0 0 0 1em;
+		  color: $baseFontColor;
+
+		  li {
+		    margin-bottom: 0.708em;
+		  }
+		}
+
+		ol {
+		  list-style: decimal outside none;
+		}
+
+		ul {
+		  list-style: disc outside none;
+		}
+
+		pre {
+		  margin: 1em 0;
+		  color: $baseFontColor;
+		  font-family: monospace, serif;
+		  font-size: 1em;
+		  white-space: pre-wrap;
+		  word-wrap: break-word;
+		}
+
+		code {
+		  color: $baseFontColor;
+		  font-family: monospace, serif;
+		  background: none;
+		  padding: 0;
+		}
 	}
 
 	.new-update-button {

cms/static/sass/_dashboard.scss

@@ -6,19 +6,27 @@
 	@include box-shadow(0 1px 2px rgba(0, 0, 0, .1));
 
 	li {
+		position: relative;
 		border-bottom: 1px solid $mediumGrey;
 
 		&:last-child {
 			border-bottom: none;
 		}
-	}
 
-	a {
-		padding: 20px 25px;
-		line-height: 1.3;
-		
-		&:hover {
-			background: $paleYellow;
+		.class-link {
+			z-index: 100;
+			display: block;
+			padding: 20px 25px;
+			line-height: 1.3;
+			
+			&:hover {
+				background: $paleYellow;
+
+				+ .view-live-button {
+					opacity: 1.0;
+					pointer-events: auto;
+				}
+			}
 		}
 	}
 
@@ -34,6 +42,22 @@
 		margin-right: 20px;
 		color: #3c3c3c;
 	}
+
+	// view live button
+	.view-live-button {
+		z-index: 10000;
+		position: absolute;
+		top: 15px;
+		right: $baseline;		
+		padding: ($baseline/4) ($baseline/2);
+		opacity: 0;
+		pointer-events: none;
+
+		&:hover {
+			opacity: 1.0;
+			pointer-events: auto;
+		}
+	}
 }
 
 .new-course {

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/_graphics.scss

@@ -254,6 +254,30 @@
 	background: url(../img/html-icon.png) center no-repeat;
 }
 
+.large-openended-icon {
+	display: inline-block;
+	width: 100px;
+	height: 60px;
+	margin-right: 5px;
+	background: url(../img/large-openended-icon.png) center no-repeat;
+}
+
+.large-annotations-icon {
+	display: inline-block;
+	width: 100px;
+	height: 60px;
+	margin-right: 5px;
+	background: url(../img/large-annotations-icon.png) center no-repeat;
+}
+
+.large-advanced-icon {
+	display: inline-block;
+	width: 100px;
+	height: 60px;
+	margin-right: 5px;
+	background: url(../img/large-advanced-icon.png) center no-repeat;
+}
+
 .large-textbook-icon {
 	display: inline-block;
 	width: 100px;

cms/static/sass/_index.scss

-body.index {
-  > header {
-    display: none;
-  }
+// how it works/not signed in index
+.index {
 
-  > h1 {
-    font-weight: 300;
-    color: lighten($dark-blue, 40%);
-    text-shadow: 0 1px 0 #fff;
-    -webkit-font-smoothing: antialiased;
-    max-width: 600px;
-    text-align: center;
-    margin: 80px auto 30px;
-  }
+  &.not-signedin {
+
+    .wrapper-header {
+      margin-bottom: 0;
+    }
+
+    .wrapper-footer {
+      margin: 0;
+      border-top: 2px solid $gray-l3;
+
+      footer.primary {
+        border: none;
+        margin-top: 0;
+        padding-top: 0;
+      }
+    }
+
+    .wrapper-content-header, .wrapper-content-features, .wrapper-content-cta {
+      @include box-sizing(border-box);
+      margin: 0;
+      padding: 0 $baseline;
+      position: relative;
+      width: 100%;
+    }
 
-  section.main-container {
-    border-right: 3px;
-    background: #FFF;
-    max-width: 600px;
-    margin: 0 auto;
-    display: block;
-    @include box-sizing(border-box);
-    border: 1px solid lighten( $dark-blue , 30% );
-    @include border-radius(3px);
-    overflow: hidden;
-    @include bounce-in-animation(.8s);
-
-    header {
-      border-bottom: 1px solid lighten($dark-blue, 50%);
-      @include linear-gradient(#fff, lighten($dark-blue, 62%));
+    .content {
       @include clearfix();
-      @include box-shadow( 0 2px 0 $light-blue, inset 0 -1px 0 #fff);
-      text-shadow: 0 1px 0 #fff;
+      @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 {
+        border: none;
+        padding-bottom: 0;
+        margin-bottom: 0;
+      }
+
+      h1, h2, h3, h4, h5, h6 {
+        color: $gray-d3;
+      }
+
+      h2 {
+
+      }
+
+      h3 {
+
+      }
+
+      h4 {
+
+      }
+    }
+
+    // welcome content
+    .wrapper-content-header {
+      @include linear-gradient($blue-l1,$blue,$blue-d1);
+      padding-bottom: ($baseline*4);
+      padding-top: ($baseline*4);
+    }
+
+    .content-header {
+      position: relative;
+      text-align: center;
+      color: $white;
 
       h1 {
-        font-size: 14px;
-        padding: 8px 20px;
-        float: left;
-        color: $dark-blue;
-        margin: 0;
+        @include font-size(52);
+        float: none;
+        margin: 0 0 ($baseline/2) 0;
+        border-bottom: 1px solid $blue-l1;
+        padding: 0;
+        font-weight: 500;
+        color: $white;
+      }
+
+      .logo {
+        @include text-hide();
+        position: relative;
+        top: 3px;
+        display: inline-block;
+        vertical-align: baseline;
+        width: 282px;
+        height: 57px;
+        background: transparent url('../img/logo-edx-studio-white.png') 0 0 no-repeat;
       }
 
-      a {
-        float: right;
-        padding: 8px 20px;
-        border-left: 1px solid lighten($dark-blue, 50%);
-        @include box-shadow( inset -1px 0 0 #fff);
-        font-weight: bold;
-        font-size: 22px;
-        line-height: 1;
-        color: $dark-blue;
+      .tagline {
+        @include font-size(24);
+        margin: 0;
+        color: $blue-l3;
       }
     }
 
-    ol {
-      list-style: none;
-      margin: 0;
-      padding: 0;
+    .arrow_box {
+      position: relative;
+      background: #fff;
+      border: 4px solid #000;
+    }
+    .arrow_box:after, .arrow_box:before {
+      top: 100%;
+      border: solid transparent;
+      content: " ";
+      height: 0;
+      width: 0;
+      position: absolute;
+      pointer-events: none;
+    }
+
+    .arrow_box:after {
+      border-color: rgba(255, 255, 255, 0);
+      border-top-color: #fff;
+      border-width: 30px;
+      left: 50%;
+      margin-left: -30px;
+    }
+    .arrow_box:before {
+      border-color: rgba(0, 0, 0, 0);
+      border-top-color: #000;
+      border-width: 36px;
+      left: 50%;
+      margin-left: -36px;
+    }
+
+    // feature content
+    .wrapper-content-features {
+      @include box-shadow(0 -1px ($baseline/4) $shadow);
+      padding-bottom: ($baseline*2);
+      padding-top: ($baseline*3);
+      background: $white;
+    }
 
-      li {
-        border-bottom: 1px solid lighten($dark-blue, 50%);
+    .content-features {
 
-        a {
-          display: block;
-          padding: 10px 20px;
+      .list-features {
+
+      }
+
+      // indiv features
+      .feature {
+        @include clearfix();
+        margin: 0 0 ($baseline*2) 0;
+        border-bottom: 1px solid $gray-l4;
+        padding: 0 0 ($baseline*2) 0;
+
+        .img {
+          @include box-sizing(border-box);
+          float: left;
+          width: flex-grid(3, 12);
+          margin-right: flex-gutter();
+
+          a {
+            @include box-sizing(border-box);
+            @include box-shadow(0 1px ($baseline/10) $shadow-l1);
+            position: relative;
+            top: 0;
+            display: block;
+            overflow: hidden;
+            border: 1px solid $gray-l3;
+            padding: ($baseline/4);
+            background: $white;
+
+            .action-zoom {
+              @include transition(bottom .50s ease-in-out);
+              position: absolute;
+              bottom: -30px;
+              right: ($baseline/2);
+              opacity: 0;
+
+              .ss-icon {
+                @include font-size(18);
+                @include border-top-radius(3px);
+                display: inline-block;
+                padding: ($baseline/4) ($baseline/2);
+                background: $blue;
+                color: $white;
+                text-align: center;
+              }
+            }
 
-          &:hover {
-            color: $dark-blue;
-            background: lighten($yellow, 10%);
-            text-shadow: 0 1px 0 #fff;
+            &:hover {
+              border-color: $blue;
+
+              .action-zoom {
+                opacity: 1.0;
+                bottom: -2px;
+              }
+            }
+          }
+
+          img {
+            display: block;
+            width: 100%;
+            height: 100%;
+          }
+        }
+
+        .copy {
+          float: left;
+          width: flex-grid(9, 12);
+          margin-top: -($baseline/4);
+
+          h3 {
+            margin: 0 0 ($baseline/2) 0;
+            @include font-size(24);
+            font-weight: 600;
+          }
+
+          > p {
+            @include font-size(18);
+            color: $gray-d1;
+          }
+
+          strong {
+            color: $gray-d2;
+            font-weight: 500;
+          }
+
+          .list-proofpoints {
+            @include clearfix();
+            @include font-size(14);
+            width: flex-grid(9, 9);
+            margin: ($baseline*1.5) 0 0 0;
+
+            .proofpoint {
+              @include box-sizing(border-box);
+              @include border-radius(($baseline/4));
+              @include transition(color .50s ease-in-out);
+              position: relative;
+              top: 0;
+              float: left;
+              width: flex-grid(3, 9);
+              min-height: ($baseline*8);
+              margin-right: flex-gutter();
+              padding: ($baseline*0.75) $baseline;
+              color: $gray-l1;
+
+              .title {
+                @include font-size(16);
+                margin: 0 0 ($baseline/4) 0;
+                font-weight: 500;
+                color: $gray-d3;
+              }
+
+              &:hover {
+                @include box-shadow(0 1px ($baseline/10) $shadow-l1);
+                background: $blue-l5;
+                top: -($baseline/5);
+
+                .title {
+                  color: $blue;
+                }
+              }
+
+              &:last-child {
+                margin-right: 0;
+              }
+            }
           }
         }
 
+
         &:last-child {
-          border-bottom: none;
+          margin-bottom: 0;
+          border: none;
+          padding-bottom: 0;
+        }
+
+        &:nth-child(even) {
+
+          .img {
+            float: right;
+            margin-right: 0;
+            margin-left: flex-gutter();
+          }
+
+          .copy {
+            float: right;
+            text-align: right;
+          }
+
+          .list-proofpoints {
+
+            .proofpoint {
+              float: right;
+              width: flex-grid(3, 9);
+              margin-left: flex-gutter();
+              margin-right: 0;
+
+              &:last-child {
+                margin-left: 0;
+              }
+            }
+          }
+        }
+      }
+    }
+
+    // call to action content
+    .wrapper-content-cta {
+      padding-bottom: ($baseline*2);
+      padding-top: ($baseline*2);
+      background: $white;
+    }
+
+    .content-cta {
+      border-top: 1px solid $gray-l4;
+
+      header {
+        border: none;
+        margin: 0;
+        padding: 0;
+      }
+
+      .list-actions {
+        position: relative;
+        margin-top: -($baseline*1.5);
+
+        li {
+          width: flex-grid(6, 12); 
+          margin: 0 auto;
+        }
+
+        .action {
+          display: block;
+          width: 100%;
+          text-align: center;
+        }
+
+        .action-primary {
+          @include blue-button;
+          @include transition(all .15s);
+          @include font-size(18);
+          padding: ($baseline*0.75) ($baseline/2);
+          font-weight: 600;
+          text-align: center;
+          text-transform: uppercase;
+        }
+
+        .action-secondary {
+          @include font-size(14);
+          margin-top: ($baseline/2);
         }
       }
     }
   }
-}
+}
\ 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