Merge branch 'master' into feature/kevin/flagging

.pylintrc

@@ -34,6 +34,7 @@ load-plugins=
 # multiple time (only on the command line, not in the configuration file where
 # it should appear only once).
 disable=
+# C0301: Line too long
 # W0141: Used builtin function 'map'
 # W0142: Used * or ** magic
 # R0201: Method could be a function
@@ -42,7 +43,7 @@ disable=
 # R0903: Too few public methods (1/2)
 # R0904: Too many public methods
 # R0913: Too many arguments
-    W0141,W0142,R0201,R0901,R0902,R0903,R0904,R0913
+    C0301,W0141,W0142,R0201,R0901,R0902,R0903,R0904,R0913
 
 
 [REPORTS]

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

@@ -1,6 +1,6 @@
 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
+  I want to be able to manually enter JSON key /value pairs
 
   Scenario: A course author sees default advanced settings
     Given I have opened a new course in Studio
@@ -21,8 +21,7 @@ Feature: Advanced (manual) course policy
 
   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
+    When I edit the value of a policy key and save
     Then the policy key value is changed
     And I reload the page
     Then the policy key value is changed

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

@@ -1,9 +1,10 @@
+#pylint: disable=C0111
+#pylint: disable=W0621
+
 from lettuce import world, step
 from common import *
 import time
 from terrain.steps import reload_the_page
-from selenium.common.exceptions import WebDriverException
-from selenium.webdriver.support import expected_conditions as EC
 
 from nose.tools import assert_true, assert_false, assert_equal
 
@@ -18,13 +19,14 @@ DISPLAY_NAME_KEY = "display_name"
 DISPLAY_NAME_VALUE = '"Robot Super Course"'
 
 ############### 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)
+        world.css_click(expand_icon_css)
     link_css = 'li.nav-course-settings-advanced a'
-    css_click(link_css)
+    world.css_click(link_css)
 
 
 @step('I am on the Advanced Course Settings page in Studio$')
@@ -35,24 +37,8 @@ def i_am_on_advanced_course_settings(step):
 
 @step(u'I press the "([^"]*)" notification button$')
 def press_the_notification_button(step, name):
-    def is_visible(driver):
-        return EC.visibility_of_element_located((By.CSS_SELECTOR, css,))
-
-    #    def is_invisible(driver):
-    #        return EC.invisibility_of_element_located((By.CSS_SELECTOR,css,))
-
     css = 'a.%s-button' % name.lower()
-    wait_for(is_visible)
-    time.sleep(float(1))
-    css_click_at(css)
-
-#   is_invisible is not returning a boolean, not working
-#    try:
-#        css_click_at(css)
-#        wait_for(is_invisible)
-#    except WebDriverException, e:
-#        css_click_at(css)
-#        wait_for(is_invisible)
+    world.css_click_at(css)
 
 
 @step(u'I edit the value of a policy key$')
@@ -61,10 +47,15 @@ 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 :)
     """
-    e = css_find(KEY_CSS)[get_index_of(DISPLAY_NAME_KEY)]
+    e = world.css_find(KEY_CSS)[get_index_of(DISPLAY_NAME_KEY)]
     e._element.send_keys(Keys.TAB, Keys.END, Keys.ARROW_LEFT, ' ', 'X')
 
 
+@step(u'I edit the value of a policy key and save$')
+def edit_the_value_of_a_policy_key(step):
+    change_display_name_value(step, '"foo"')
+
+
 @step('I create a JSON object as a value$')
 def create_JSON_object(step):
     change_display_name_value(step, '{"key": "value", "key_2": "value_2"}')
@@ -85,7 +76,7 @@ def i_see_default_advanced_settings(step):
 
 @step('the settings are alphabetized$')
 def they_are_alphabetized(step):
-    key_elements = css_find(KEY_CSS)
+    key_elements = world.css_find(KEY_CSS)
     all_keys = []
     for key in key_elements:
         all_keys.append(key.value)
@@ -110,7 +101,7 @@ def the_policy_key_value_is_unchanged(step):
 
 @step(u'the policy key value is changed$')
 def the_policy_key_value_is_changed(step):
-    assert_equal(get_display_name_value(), '"Robot Super Course X"')
+    assert_equal(get_display_name_value(), '"foo"')
 
 
 ############# HELPERS ###############
@@ -118,13 +109,13 @@ def assert_policy_entries(expected_keys, expected_values):
     for counter in range(len(expected_keys)):
         index = get_index_of(expected_keys[counter])
         assert_false(index == -1, "Could not find key: " + expected_keys[counter])
-        assert_equal(expected_values[counter], css_find(VALUE_CSS)[index].value, "value is incorrect")
+        assert_equal(expected_values[counter], world.css_find(VALUE_CSS)[index].value, "value is incorrect")
 
 
 def get_index_of(expected_key):
-    for counter in range(len(css_find(KEY_CSS))):
+    for counter in range(len(world.css_find(KEY_CSS))):
         #   Sometimes get stale reference if I hold on to the array of elements
-        key = css_find(KEY_CSS)[counter].value
+        key = world.css_find(KEY_CSS)[counter].value
         if key == expected_key:
             return counter
 
@@ -133,14 +124,14 @@ def get_index_of(expected_key):
 
 def get_display_name_value():
     index = get_index_of(DISPLAY_NAME_KEY)
-    return css_find(VALUE_CSS)[index].value
+    return world.css_find(VALUE_CSS)[index].value
 
 
 def change_display_name_value(step, new_value):
-    e = css_find(KEY_CSS)[get_index_of(DISPLAY_NAME_KEY)]
+    e = world.css_find(KEY_CSS)[get_index_of(DISPLAY_NAME_KEY)]
     display_name = get_display_name_value()
     for count in range(len(display_name)):
         e._element.send_keys(Keys.TAB, Keys.END, Keys.BACK_SPACE)
         # Must delete "" before typing the JSON value
     e._element.send_keys(Keys.TAB, Keys.END, Keys.BACK_SPACE, Keys.BACK_SPACE, new_value)
-    press_the_notification_button(step, "Save")
+    press_the_notification_button(step, "Save")

cms/djangoapps/contentstore/features/checklists.py

@@ -1,15 +1,19 @@
+#pylint: disable=C0111
+#pylint: disable=W0621
+
 from lettuce import world, step
-from common import *
+from nose.tools import assert_true, assert_equal
 from terrain.steps import reload_the_page
+from selenium.common.exceptions import StaleElementReferenceException
 
 ############### ACTIONS ####################
 @step('I select Checklists from the Tools menu$')
 def i_select_checklists(step):
     expand_icon_css = 'li.nav-course-tools i.icon-expand'
     if world.browser.is_element_present_by_css(expand_icon_css):
-        css_click(expand_icon_css)
+        world.css_click(expand_icon_css)
     link_css = 'li.nav-course-tools-checklists a'
-    css_click(link_css)
+    world.css_click(link_css)
 
 
 @step('I have opened Checklists$')
@@ -20,7 +24,7 @@ def i_have_opened_checklists(step):
 
 @step('I see the four default edX checklists$')
 def i_see_default_checklists(step):
-    checklists = css_find('.checklist-title')
+    checklists = world.css_find('.checklist-title')
     assert_equal(4, len(checklists))
     assert_true(checklists[0].text.endswith('Getting Started With Studio'))
     assert_true(checklists[1].text.endswith('Draft a Rough Course Outline'))
@@ -58,7 +62,7 @@ def i_select_a_link_to_the_course_outline(step):
 
 @step('I am brought to the course outline page$')
 def i_am_brought_to_course_outline(step):
-    assert_equal('Course Outline', css_find('.outline .title-1')[0].text)
+    assert_equal('Course Outline', world.css_find('.outline .title-1')[0].text)
     assert_equal(1, len(world.browser.windows))
 
 
@@ -90,30 +94,30 @@ def i_am_brought_to_help_page_in_new_window(step):
 def verifyChecklist2Status(completed, total, percentage):
     def verify_count(driver):
         try:
-            statusCount = css_find('#course-checklist1 .status-count').first
+            statusCount = world.css_find('#course-checklist1 .status-count').first
             return statusCount.text == str(completed)
         except StaleElementReferenceException:
             return False
 
-    wait_for(verify_count)
-    assert_equal(str(total), css_find('#course-checklist1 .status-amount').first.text)
+    world.wait_for(verify_count)
+    assert_equal(str(total), world.css_find('#course-checklist1 .status-amount').first.text)
     # Would like to check the CSS width, but not sure how to do that.
-    assert_equal(str(percentage), css_find('#course-checklist1 .viz-checklist-status-value .int').first.text)
+    assert_equal(str(percentage), world.css_find('#course-checklist1 .viz-checklist-status-value .int').first.text)
 
 
 def toggleTask(checklist, task):
-    css_click('#course-checklist' + str(checklist) +'-task' + str(task))
+    world.css_click('#course-checklist' + str(checklist) +'-task' + str(task))
 
 
 def clickActionLink(checklist, task, actionText):
     # toggle checklist item to make sure that the link button is showing
     toggleTask(checklist, task)
-    action_link = css_find('#course-checklist' + str(checklist) + ' a')[task]
+    action_link = world.css_find('#course-checklist' + str(checklist) + ' a')[task]
 
     # text will be empty initially, wait for it to populate
     def verify_action_link_text(driver):
         return action_link.text == actionText
 
-    wait_for(verify_action_link_text)
+    world.wait_for(verify_action_link_text)
     action_link.click()
 

cms/djangoapps/contentstore/features/common.py

@@ -1,28 +1,30 @@
+#pylint: disable=C0111
+#pylint: disable=W0621
+
 from lettuce import world, step
-from lettuce.django import django_url
 from nose.tools import assert_true
 from nose.tools import assert_equal
-from selenium.webdriver.support.ui import WebDriverWait
-from selenium.common.exceptions import WebDriverException, StaleElementReferenceException
-from selenium.webdriver.support import expected_conditions as EC
-from selenium.webdriver.common.by import By
 
 from xmodule.modulestore.django import _MODULESTORES, modulestore
 from xmodule.templates import update_templates
 from auth.authz import get_user_by_email
 
+from selenium.webdriver.common.keys import Keys
+import time
+
 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('/'))
+    world.visit('/')
     signin_css = 'a.action-signin'
-    assert world.browser.is_element_present_by_css(signin_css, 10)
+    assert world.is_css_present(signin_css)
 
 
 @step('I am logged into Studio$')
@@ -43,12 +45,12 @@ def i_press_the_category_delete_icon(step, category):
         css = 'a.delete-button.delete-subsection-button  span.delete-icon'
     else:
         assert False, 'Invalid category: %s' % category
-    css_click(css)
+    world.css_click(css)
 
 
 @step('I have opened a new course in Studio$')
 def i_have_opened_a_new_course(step):
-    clear_courses()
+    world.clear_courses()
     log_into_studio()
     create_a_course()
 
@@ -74,80 +76,13 @@ def create_studio_user(
     user_profile = world.UserProfileFactory(user=studio_user)
 
 
-def flush_xmodule_store():
-    # 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()"
-    _MODULESTORES = {}
-    modulestore().collection.drop()
-    update_templates()
-
-
-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):
-    '''
-    First try to use the regular click method, 
-    but if clicking in the middle of an element
-    doesn't work it might be that it thinks some other
-    element is on top of it there so click in the upper left
-    '''
-    try:
-        css_find(css).first.click()
-    except WebDriverException, e:
-        css_click_at(css)
-
-
-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
-    '''
-    e = css_find(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):
-    def is_visible(driver):
-        return EC.visibility_of_element_located((By.CSS_SELECTOR,css,))
-
-    world.browser.is_element_present_by_css(css, 5)
-    wait_for(is_visible)
-    return world.browser.find_by_css(css)
-
-
-def wait_for(func):
-    WebDriverWait(world.browser.driver, 5).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)
+    world.css_fill('.new-course-name', name)
+    world.css_fill('.new-course-org', org)
+    world.css_fill('.new-course-number', num)
 
 
 def log_into_studio(
@@ -155,21 +90,22 @@ def log_into_studio(
         email='robot+studio@edx.org',
         password='test',
         is_staff=False):
-    create_studio_user(uname=uname, email=email, is_staff=is_staff)
-    world.browser.cookies.delete()
-    world.browser.visit(django_url('/'))
-    signin_css = 'a.action-signin'
-    world.browser.is_element_present_by_css(signin_css, 10)
 
-    # click the signin button
-    css_click(signin_css)
+    create_studio_user(uname=uname, email=email, is_staff=is_staff)
+
+    world.browser.cookies.delete()
+    world.visit('/')
+
+    signin_css = 'a.action-signin'
+    world.is_css_present(signin_css)
+    world.css_click(signin_css)
 
     login_form = world.browser.find_by_css('form#login_form')
     login_form.find_by_name('email').fill(email)
     login_form.find_by_name('password').fill(password)
     login_form.find_by_name('submit').click()
 
-    assert_true(world.browser.is_element_present_by_css('.new-course-button', 5))
+    assert_true(world.is_css_present('.new-course-button'))
 
 
 def create_a_course():
@@ -184,26 +120,37 @@ def create_a_course():
     world.browser.reload()
 
     course_link_css = 'span.class-name'
-    css_click(course_link_css)
+    world.css_click(course_link_css)
     course_title_css = 'span.course-title'
-    assert_true(world.browser.is_element_present_by_css(course_title_css, 5))
+    assert_true(world.is_css_present(course_title_css))
 
 
 def add_section(name='My Section'):
     link_css = 'a.new-courseware-section-button'
-    css_click(link_css)
+    world.css_click(link_css)
     name_css = 'input.new-section-name'
     save_css = 'input.new-section-name-save'
-    css_fill(name_css, name)
-    css_click(save_css)
+    world.css_fill(name_css, name)
+    world.css_click(save_css)
     span_css = 'span.section-name-span'
-    assert_true(world.browser.is_element_present_by_css(span_css, 5))
+    assert_true(world.is_css_present(span_css))
 
 
 def add_subsection(name='Subsection One'):
     css = 'a.new-subsection-item'
-    css_click(css)
+    world.css_click(css)
     name_css = 'input.new-subsection-name-input'
     save_css = 'input.new-subsection-name-save'
-    css_fill(name_css, name)
-    css_click(save_css)
+    world.css_fill(name_css, name)
+    world.css_click(save_css)
+
+
+def set_date_and_time(date_css, desired_date, time_css, desired_time):
+    world.css_fill(date_css, desired_date)
+    # hit TAB to get to the time field
+    e = world.css_find(date_css).first
+    e._element.send_keys(Keys.TAB)
+    world.css_fill(time_css, desired_time)
+    e = world.css_find(time_css).first
+    e._element.send_keys(Keys.TAB)
+    time.sleep(float(1))    

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

@@ -1,5 +1,7 @@
+#pylint: disable=C0111
+#pylint: disable=W0621
+
 from lettuce import world, step
-from common import *
 from terrain.steps import reload_the_page
 from selenium.webdriver.common.keys import Keys
 import time
@@ -16,8 +18,8 @@ COURSE_END_TIME_CSS = "#course-end-time"
 ENROLLMENT_START_TIME_CSS = "#course-enrollment-start-time"
 ENROLLMENT_END_TIME_CSS = "#course-enrollment-end-time"
 
-DUMMY_TIME = "3:30pm"
-DEFAULT_TIME = "12:00am"
+DUMMY_TIME = "15:30"
+DEFAULT_TIME = "00:00"
 
 
 ############### ACTIONS ####################
@@ -25,9 +27,9 @@ DEFAULT_TIME = "12:00am"
 def test_i_select_schedule_and_details(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)
+        world.css_click(expand_icon_css)
     link_css = 'li.nav-course-settings-schedule a'
-    css_click(link_css)
+    world.css_click(link_css)
 
 
 @step('I have set course dates$')
@@ -97,9 +99,9 @@ def test_i_clear_the_course_start_date(step):
 
 @step('I receive a warning about course start date$')
 def test_i_receive_a_warning_about_course_start_date(step):
-    assert_css_with_text('.message-error', 'The course must have an assigned start date.')
-    assert_true('error' in css_find(COURSE_START_DATE_CSS).first._element.get_attribute('class'))
-    assert_true('error' in css_find(COURSE_START_TIME_CSS).first._element.get_attribute('class'))
+    assert_true(world.css_has_text('.message-error', 'The course must have an assigned start date.'))
+    assert_true('error' in world.css_find(COURSE_START_DATE_CSS).first._element.get_attribute('class'))
+    assert_true('error' in world.css_find(COURSE_START_TIME_CSS).first._element.get_attribute('class'))
 
 
 @step('The previously set start date is shown on refresh$')
@@ -124,9 +126,9 @@ def test_i_have_entered_a_new_course_start_date(step):
 
 @step('The warning about course start date goes away$')
 def test_the_warning_about_course_start_date_goes_away(step):
-    assert_equal(0, len(css_find('.message-error')))
-    assert_false('error' in css_find(COURSE_START_DATE_CSS).first._element.get_attribute('class'))
-    assert_false('error' in css_find(COURSE_START_TIME_CSS).first._element.get_attribute('class'))
+    assert_equal(0, len(world.css_find('.message-error')))
+    assert_false('error' in world.css_find(COURSE_START_DATE_CSS).first._element.get_attribute('class'))
+    assert_false('error' in world.css_find(COURSE_START_TIME_CSS).first._element.get_attribute('class'))
 
 
 @step('My new course start date is shown on refresh$')
@@ -142,8 +144,8 @@ def set_date_or_time(css, date_or_time):
     """
     Sets date or time field.
     """
-    css_fill(css, date_or_time)
-    e = css_find(css).first
+    world.css_fill(css, date_or_time)
+    e = world.css_find(css).first
     # hit Enter to apply the changes
     e._element.send_keys(Keys.ENTER)
 
@@ -152,7 +154,7 @@ def verify_date_or_time(css, date_or_time):
     """
     Verifies date or time field.
     """
-    assert_equal(date_or_time, css_find(css).first.value)
+    assert_equal(date_or_time, world.css_find(css).first.value)
 
 
 def pause():

cms/djangoapps/contentstore/features/courses.feature

@@ -10,4 +10,4 @@ Feature: Create Course
     And I fill in the new course information
     And I press the "Save" button
     Then the Courseware page has loaded in Studio
-    And I see a link for adding a new section
+    And I see a link for adding a new section

cms/djangoapps/contentstore/features/courses.py

@@ -1,3 +1,6 @@
+#pylint: disable=C0111
+#pylint: disable=W0621
+
 from lettuce import world, step
 from common import *
 
@@ -6,12 +9,12 @@ from common import *
 
 @step('There are no courses$')
 def no_courses(step):
-    clear_courses()
+    world.clear_courses()
 
 
 @step('I click the New Course button$')
 def i_click_new_course(step):
-    css_click('.new-course-button')
+    world.css_click('.new-course-button')
 
 
 @step('I fill in the new course information$')
@@ -27,7 +30,7 @@ def i_create_a_course(step):
 @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)
+    world.css_click(course_css)
 
 ############ ASSERTIONS ###################
 
@@ -35,28 +38,28 @@ def i_click_the_course_link_in_my_courses(step):
 @step('the Courseware page has loaded in Studio$')
 def courseware_page_has_loaded_in_studio(step):
     course_title_css = 'span.course-title'
-    assert world.browser.is_element_present_by_css(course_title_css)
+    assert world.is_css_present(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 world.css_has_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 world.css_has_text(course_css, 'Robot Super Cousre')
 
 
 @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 world.css_has_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 world.css_has_text(link_css, '+ New Section')

cms/djangoapps/contentstore/features/section.py

@@ -1,8 +1,9 @@
+#pylint: disable=C0111
+#pylint: disable=W0621
+
 from lettuce import world, step
 from common import *
 from nose.tools import assert_equal
-from selenium.webdriver.common.keys import Keys
-import time
 
 ############### ACTIONS ####################
 
@@ -10,7 +11,7 @@ import time
 @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)
+    world.css_click(link_css)
 
 
 @step('I enter the section name and click save$')
@@ -31,21 +32,13 @@ def i_have_added_new_section(step):
 @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)
+    world.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')
-    # hit TAB to get to the time field
-    e = css_find(date_css).first
-    e._element.send_keys(Keys.TAB)
-    css_fill(time_css, '12:00am')
-    e = css_find(time_css).first
-    e._element.send_keys(Keys.TAB)
-    time.sleep(float(1))
+    set_date_and_time('input.start-date.date.hasDatepicker', '12/25/2013',
+        'input.start-time.time.ui-timepicker-input', '00:00')
     world.browser.click_link_by_text('Save')
 
 
@@ -64,13 +57,13 @@ def i_see_my_section_name_with_quote_on_the_courseware_page(step):
 
 @step('I click to edit the section name$')
 def i_click_to_edit_section_name(step):
-    css_click('span.section-name-span')
+    world.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 world.is_css_present(css)
     assert_equal(world.browser.find_by_css(css).value, 'Section with "Quote"')
 
 
@@ -85,7 +78,7 @@ def i_see_a_release_date_for_my_section(step):
     import re
 
     css = 'span.published-status'
-    assert world.browser.is_element_present_by_css(css)
+    assert world.is_css_present(css)
     status_text = world.browser.find_by_css(css).text
 
     # e.g. 11/06/2012 at 16:25
@@ -99,20 +92,20 @@ def i_see_a_release_date_for_my_section(step):
 @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)
+    assert world.is_css_present(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
+    assert not world.css_visible(css)
 
 
 @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_equal(status_text,'Will Release: 12/25/2013 at 12:00am')
+    status_text = world.css_text(css)
+    assert_equal(status_text, 'Will Release: 12/25/2013 at 00:00 UTC')
 
 
 ############ HELPER METHODS ###################
@@ -120,10 +113,10 @@ def the_section_release_date_is_updated(step):
 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)
+    world.css_fill(name_css, name)
+    world.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)
+    assert world.css_has_text(section_css, name)

cms/djangoapps/contentstore/features/signup.py

@@ -1,3 +1,6 @@
+#pylint: disable=C0111
+#pylint: disable=W0621
+
 from lettuce import world, step
 from common import *
 
@@ -17,9 +20,10 @@ def i_press_the_button_on_the_registration_form(step):
     submit_css = 'form#register_form button#submit'
     # Workaround for click not working on ubuntu
     # for some unknown reason.
-    e = css_find(submit_css)
+    e = world.css_find(submit_css)
     e.type(' ')
 
+
 @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')

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

@@ -1,30 +1,30 @@
 Feature: Overview Toggle Section
 	In order to quickly view the details of a course's section or to scan the inventory of sections
-	As a course author
-	I want to toggle the visibility of each section's  subsection details in the overview listing
+        As a course author
+        I want to toggle the visibility of each section's  subsection details in the overview listing
 
 	Scenario: The default layout for the overview page is to show sections in expanded view
 		Given I have a course with multiple sections
-		When I navigate to the course overview page
-		Then I see the "Collapse All Sections" link
-		And all sections are expanded
+                When I navigate to the course overview page
+                Then I see the "Collapse All Sections" link
+                And all sections are expanded
 
-	Scenario: Expand/collapse for a course with no sections
+	Scenario: Expand /collapse for a course with no sections
 		Given I have a course with no sections
-		When I navigate to the course overview page
-		Then I do not see the "Collapse All Sections" link
+                When I navigate to the course overview page
+                Then I do not see the "Collapse All Sections" link
 
 	Scenario: Collapse link appears after creating first section of a course
 		Given I have a course with no sections
-		When I navigate to the course overview page
-		And I add a section
-		Then I see the "Collapse All Sections" link
-		And all sections are expanded
+                When I navigate to the course overview page
+                And I add a section
+                Then I see the "Collapse All Sections" link
+                And all sections are expanded
 
 	@skip-phantom
 	Scenario: Collapse link is not removed after last section of a course is deleted
 		Given I have a course with 1 section
-		And I navigate to the course overview page
+                And I navigate to the course overview page
 	    When I press the "section" delete icon
 	    And I confirm the alert
 		Then I see the "Collapse All Sections" link

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

@@ -1,3 +1,6 @@
+#pylint: disable=C0111
+#pylint: disable=W0621
+
 from lettuce import world, step
 from common import *
 from nose.tools import assert_true, assert_false, assert_equal
@@ -8,13 +11,13 @@ logger = getLogger(__name__)
 
 @step(u'I have a course with no sections$')
 def have_a_course(step):
-    clear_courses()
+    world.clear_courses()
     course = world.CourseFactory.create()
 
 
 @step(u'I have a course with 1 section$')
 def have_a_course_with_1_section(step):
-    clear_courses()
+    world.clear_courses()
     course = world.CourseFactory.create()
     section = world.ItemFactory.create(parent_location=course.location)
     subsection1 = world.ItemFactory.create(
@@ -25,7 +28,7 @@ def have_a_course_with_1_section(step):
 
 @step(u'I have a course with multiple sections$')
 def have_a_course_with_two_sections(step):
-    clear_courses()
+    world.clear_courses()
     course = world.CourseFactory.create()
     section = world.ItemFactory.create(parent_location=course.location)
     subsection1 = world.ItemFactory.create(
@@ -49,7 +52,7 @@ def have_a_course_with_two_sections(step):
 def navigate_to_the_course_overview_page(step):
     log_into_studio(is_staff=True)
     course_locator = '.class-name'
-    css_click(course_locator)
+    world.css_click(course_locator)
 
 
 @step(u'I navigate to the courseware page of a course with multiple sections')
@@ -66,44 +69,44 @@ def i_add_a_section(step):
 @step(u'I click the "([^"]*)" link$')
 def i_click_the_text_span(step, text):
     span_locator = '.toggle-button-sections span'
-    assert_true(world.browser.is_element_present_by_css(span_locator, 5))
+    assert_true(world.browser.is_element_present_by_css(span_locator))
     # first make sure that the expand/collapse text is the one you expected
     assert_equal(world.browser.find_by_css(span_locator).value, text)
-    css_click(span_locator)
+    world.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)
+    world.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)
+    world.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'
-    assert_true(world.browser.is_element_present_by_css(span_locator, 5))
-    assert_equal(world.browser.find_by_css(span_locator).value, text)
-    assert_true(world.browser.find_by_css(span_locator).visible)
+    assert_true(world.is_css_present(span_locator))
+    assert_equal(world.css_find(span_locator).value, text)
+    assert_true(world.css_visible(span_locator))
 
 
 @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
     span_locator = '.toggle-button-sections span'
-    assert_true(world.browser.is_element_present_by_css(span_locator))
-    assert_false(world.browser.find_by_css(span_locator).visible)
+    assert_true(world.is_css_present(span_locator))
+    assert_false(world.css_visible(span_locator))
 
 
 @step(u'all sections are expanded$')
 def all_sections_are_expanded(step):
     subsection_locator = 'div.subsection-list'
-    subsections = world.browser.find_by_css(subsection_locator)
+    subsections = world.css_find(subsection_locator)
     for s in subsections:
         assert_true(s.visible)
 
@@ -111,6 +114,6 @@ def all_sections_are_expanded(step):
 @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)
+    subsections = world.css_find(subsection_locator)
     for s in subsections:
         assert_false(s.visible)

cms/djangoapps/contentstore/features/subsection.feature

@@ -17,6 +17,21 @@ Feature: Create Subsection
     And I click to edit the subsection name
     Then I see the complete subsection name with a quote in the editor
 
+    Scenario: Assign grading type to a subsection and verify it is still shown after refresh (bug #258)
+    Given I have opened a new course section in Studio
+    And I have added a new subsection
+    And I mark it as Homework
+    Then I see it marked as Homework
+    And I reload the page
+    Then I see it marked as Homework
+
+    Scenario: Set a due date in a different year (bug #256)
+    Given I have opened a new subsection in Studio
+    And I have set a release date and due date in different years
+    Then I see the correct dates
+    And I reload the page
+    Then I see the correct dates
+
     @skip-phantom
     Scenario: Delete a subsection
     Given I have opened a new course section in Studio
@@ -25,3 +40,5 @@ Feature: Create Subsection
     When I press the "subsection" delete icon
     And I confirm the alert
     Then the subsection does not exist
+   
+

cms/djangoapps/contentstore/features/subsection.py

@@ -1,3 +1,6 @@
+#pylint: disable=C0111
+#pylint: disable=W0621
+
 from lettuce import world, step
 from common import *
 from nose.tools import assert_equal
@@ -7,16 +10,27 @@ from nose.tools import assert_equal
 
 @step('I have opened a new course section in Studio$')
 def i_have_opened_a_new_course_section(step):
-    clear_courses()
+    world.clear_courses()
     log_into_studio()
     create_a_course()
     add_section()
 
 
+@step('I have added a new subsection$')
+def i_have_added_a_new_subsection(step):
+    add_subsection()
+
+
+@step('I have opened a new subsection in Studio$')
+def i_have_opened_a_new_subsection(step):
+    step.given('I have opened a new course section in Studio')
+    step.given('I have added a new subsection')
+    world.css_click('span.subsection-name-value')
+
+
 @step('I click the New Subsection link')
 def i_click_the_new_subsection_link(step):
-    css = 'a.new-subsection-item'
-    css_click(css)
+    world.css_click('a.new-subsection-item')
 
 
 @step('I enter the subsection name and click save$')
@@ -31,19 +45,41 @@ def i_save_subsection_name_with_quote(step):
 
 @step('I click to edit the subsection name$')
 def i_click_to_edit_subsection_name(step):
-    css_click('span.subsection-name-value')
+    world.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"')
+    assert world.is_css_present(css)
+    assert_equal(world.css_find(css).value, 'Subsection With "Quote"')
 
 
-@step('I have added a new subsection$')
-def i_have_added_a_new_subsection(step):
-    add_subsection()
+@step('I have set a release date and due date in different years$')
+def test_have_set_dates_in_different_years(step):
+    set_date_and_time('input#start_date', '12/25/2011', 'input#start_time', '03:00')
+    world.css_click('.set-date')
+    # Use a year in the past so that current year will always be different.
+    set_date_and_time('input#due_date', '01/02/2012', 'input#due_time', '04:00')
+
+
+@step('I see the correct dates$')
+def i_see_the_correct_dates(step):
+    assert_equal('12/25/2011', world.css_find('input#start_date').first.value)
+    assert_equal('03:00', world.css_find('input#start_time').first.value)
+    assert_equal('01/02/2012', world.css_find('input#due_date').first.value)
+    assert_equal('04:00', world.css_find('input#due_time').first.value)
+
+
+@step('I mark it as Homework$')
+def i_mark_it_as_homework(step):
+    world.css_click('a.menu-toggle')
+    world.browser.click_link_by_text('Homework')
+
+
+@step('I see it marked as Homework$')
+def i_see_it_marked__as_homework(step):
+    assert_equal(world.css_find(".status-label").value, 'Homework')
 
 
 ############ ASSERTIONS ###################
@@ -70,11 +106,12 @@ def the_subsection_does_not_exist(step):
 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)
+    world.css_fill(name_css, name)
+    world.css_click(save_css)
+
 
 def see_subsection_name(name):
     css = 'span.subsection-name'
-    assert world.browser.is_element_present_by_css(css)
+    assert world.is_css_present(css)
     css = 'span.subsection-name-value'
-    assert_css_with_text(css, name)
+    assert world.css_has_text(css, name)

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

@@ -0,0 +1,68 @@
+from django.core.management.base import BaseCommand, CommandError
+from xmodule.modulestore.django import modulestore
+from xmodule.modulestore.xml_importer import check_module_metadata_editability
+from xmodule.course_module import CourseDescriptor
+
+from request_cache.middleware import RequestCache
+
+
+class Command(BaseCommand):
+    help = '''Enumerates through the course and find common errors'''
+
+    def handle(self, *args, **options):
+        if len(args) != 1:
+            raise CommandError("check_course requires one argument: <location>")
+
+        loc_str = args[0]
+
+        loc = CourseDescriptor.id_to_location(loc_str)
+        store = modulestore()
+
+        # setup a request cache so we don't throttle the DB with all the metadata inheritance requests
+        store.request_cache = RequestCache.get_request_cache()
+
+        course = store.get_item(loc, depth=3)
+
+        err_cnt = 0
+
+        def _xlint_metadata(module):
+            err_cnt = check_module_metadata_editability(module)
+            for child in module.get_children():
+                err_cnt = err_cnt + _xlint_metadata(child)
+            return err_cnt
+
+        err_cnt = err_cnt + _xlint_metadata(course)
+
+        # we've had a bug where the xml_attributes field can we rewritten as a string rather than a dict
+        def _check_xml_attributes_field(module):
+            err_cnt = 0
+            if hasattr(module, 'xml_attributes') and isinstance(module.xml_attributes, basestring):
+                print 'module = {0} has xml_attributes as a string. It should be a dict'.format(module.location.url())
+                err_cnt = err_cnt + 1
+            for child in module.get_children():
+                err_cnt = err_cnt + _check_xml_attributes_field(child)
+            return err_cnt
+
+        err_cnt = err_cnt + _check_xml_attributes_field(course)
+
+        # check for dangling discussion items, this can cause errors in the forums
+        def _get_discussion_items(module):
+            discussion_items = []
+            if module.location.category == 'discussion':
+                discussion_items = discussion_items + [module.location.url()]
+
+            for child in module.get_children():
+                discussion_items = discussion_items + _get_discussion_items(child)
+
+            return discussion_items
+
+        discussion_items = _get_discussion_items(course)
+
+        # now query all discussion items via get_items() and compare with the tree-traversal
+        queried_discussion_items = store.get_items(['i4x', course.location.org, course.location.course, 
+                                                    'discussion', None, None])
+
+        for item in queried_discussion_items:
+            if item.location.url() not in discussion_items:
+                print 'Found dangling discussion module = {0}'.format(item.location.url())
+

cms/djangoapps/contentstore/tests/test_contentstore.py

@@ -25,7 +25,7 @@ from xmodule.modulestore.django import modulestore
 from xmodule.contentstore.django import contentstore
 from xmodule.templates import update_templates
 from xmodule.modulestore.xml_exporter import export_to_xml
-from xmodule.modulestore.xml_importer import import_from_xml
+from xmodule.modulestore.xml_importer import import_from_xml, perform_xlint
 from xmodule.modulestore.inheritance import own_metadata
 
 from xmodule.capa_module import CapaDescriptor
@@ -85,6 +85,106 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase):
     def test_edit_unit_full(self):
         self.check_edit_unit('full')
 
+    def _get_draft_counts(self, item):
+        cnt = 1 if getattr(item, 'is_draft', False) else 0
+        for child in item.get_children():
+            cnt = cnt + self._get_draft_counts(child)
+
+        return cnt
+
+    def test_draft_metadata(self):
+        '''
+        This verifies a bug we had where inherited metadata was getting written to the
+        module as 'own-metadata' when publishing. Also verifies the metadata inheritance is
+        properly computed
+        '''
+        store = modulestore()
+        draft_store = modulestore('draft')
+        import_from_xml(store, 'common/test/data/', ['simple'])
+
+        course = draft_store.get_item(Location(['i4x', 'edX', 'simple',
+                                               'course', '2012_Fall', None]), depth=None)
+        html_module = draft_store.get_item(['i4x', 'edX', 'simple', 'html', 'test_html', None])
+
+        self.assertEqual(html_module.lms.graceperiod, course.lms.graceperiod)
+        self.assertNotIn('graceperiod', own_metadata(html_module))
+
+        draft_store.clone_item(html_module.location, html_module.location)
+
+        # refetch to check metadata
+        html_module = draft_store.get_item(['i4x', 'edX', 'simple', 'html', 'test_html', None])
+
+        self.assertEqual(html_module.lms.graceperiod, course.lms.graceperiod)
+        self.assertNotIn('graceperiod', own_metadata(html_module))
+
+        # publish module
+        draft_store.publish(html_module.location, 0)
+
+        # refetch to check metadata
+        html_module = draft_store.get_item(['i4x', 'edX', 'simple', 'html', 'test_html', None])
+
+        self.assertEqual(html_module.lms.graceperiod, course.lms.graceperiod)
+        self.assertNotIn('graceperiod', own_metadata(html_module))
+
+        # put back in draft and change metadata and see if it's now marked as 'own_metadata'
+        draft_store.clone_item(html_module.location, html_module.location)
+        html_module = draft_store.get_item(['i4x', 'edX', 'simple', 'html', 'test_html', None])
+
+        new_graceperiod = timedelta(**{'hours': 1})
+
+        self.assertNotIn('graceperiod', own_metadata(html_module))
+        html_module.lms.graceperiod = new_graceperiod
+        self.assertIn('graceperiod', own_metadata(html_module))
+        self.assertEqual(html_module.lms.graceperiod, new_graceperiod)
+
+        draft_store.update_metadata(html_module.location, own_metadata(html_module))
+
+        # read back to make sure it reads as 'own-metadata'
+        html_module = draft_store.get_item(['i4x', 'edX', 'simple', 'html', 'test_html', None])
+
+        self.assertIn('graceperiod', own_metadata(html_module))
+        self.assertEqual(html_module.lms.graceperiod, new_graceperiod)
+
+        # republish
+        draft_store.publish(html_module.location, 0)
+
+        # and re-read and verify 'own-metadata'
+        draft_store.clone_item(html_module.location, html_module.location)
+        html_module = draft_store.get_item(['i4x', 'edX', 'simple', 'html', 'test_html', None])
+
+        self.assertIn('graceperiod', own_metadata(html_module))
+        self.assertEqual(html_module.lms.graceperiod, new_graceperiod)
+
+    def test_get_depth_with_drafts(self):
+        import_from_xml(modulestore(), 'common/test/data/', ['simple'])
+
+        course = modulestore('draft').get_item(Location(['i4x', 'edX', 'simple', 
+            'course', '2012_Fall', None]), depth=None)
+
+        # make sure no draft items have been returned
+        num_drafts = self._get_draft_counts(course)
+        self.assertEqual(num_drafts, 0)
+
+        problem = modulestore('draft').get_item(Location(['i4x', 'edX', 'simple', 
+            'problem', 'ps01-simple', None]))
+
+        # put into draft
+        modulestore('draft').clone_item(problem.location, problem.location)
+
+        # make sure we can query that item and verify that it is a draft
+        draft_problem = modulestore('draft').get_item(Location(['i4x', 'edX', 'simple', 
+            'problem', 'ps01-simple', None]))
+        self.assertTrue(getattr(draft_problem,'is_draft', False))
+
+        #now requery with depth
+        course = modulestore('draft').get_item(Location(['i4x', 'edX', 'simple', 
+            'course', '2012_Fall', None]), depth=None)
+
+        # make sure just one draft item have been returned
+        num_drafts = self._get_draft_counts(course)
+        self.assertEqual(num_drafts, 1)       
+
+
     def test_static_tab_reordering(self):
         import_from_xml(modulestore(), 'common/test/data/', ['full'])
 
@@ -123,6 +223,10 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase):
         # check that there's actually content in the 'question' field
         self.assertGreater(len(items[0].question),0)
 
+    def test_xlint_fails(self):
+        err_cnt = perform_xlint('common/test/data', ['full'])
+        self.assertGreater(err_cnt, 0)
+
     def test_delete(self):
         import_from_xml(modulestore(), 'common/test/data/', ['full'])
 
@@ -524,6 +628,113 @@ class ContentStoreTest(ModuleStoreTestCase):
         self.assertIn('markdown', context, "markdown is missing from context")
         self.assertNotIn('markdown', problem.editable_metadata_fields, "Markdown slipped into the editable metadata fields")
 
+    def test_cms_imported_course_walkthrough(self):
+        """
+        Import and walk through some common URL endpoints. This just verifies non-500 and no other
+        correct behavior, so it is not a deep test
+        """
+        import_from_xml(modulestore(), 'common/test/data/', ['simple'])
+        loc = Location(['i4x', 'edX', 'simple', 'course', '2012_Fall', None])
+        resp = self.client.get(reverse('course_index',
+                                       kwargs={'org': loc.org,
+                                               'course': loc.course,
+                                               'name': loc.name}))
+
+        self.assertEqual(200, resp.status_code)
+        self.assertContains(resp, 'Chapter 2')
+
+        # go to various pages
+
+        # import page
+        resp = self.client.get(reverse('import_course',
+                                       kwargs={'org': loc.org,
+                                               'course': loc.course,
+                                               'name': loc.name}))
+        self.assertEqual(200, resp.status_code)
+
+        # export page
+        resp = self.client.get(reverse('export_course',
+                                       kwargs={'org': loc.org,
+                                               'course': loc.course,
+                                               'name': loc.name}))
+        self.assertEqual(200, resp.status_code)
+
+        # manage users
+        resp = self.client.get(reverse('manage_users',
+                                       kwargs={'location': loc.url()}))
+        self.assertEqual(200, resp.status_code)
+
+        # course info
+        resp = self.client.get(reverse('course_info',
+                                       kwargs={'org': loc.org,
+                                               'course': loc.course,
+                                               'name': loc.name}))
+        self.assertEqual(200, resp.status_code)
+
+        # settings_details
+        resp = self.client.get(reverse('settings_details',
+                                       kwargs={'org': loc.org,
+                                               'course': loc.course,
+                                               'name': loc.name}))
+        self.assertEqual(200, resp.status_code)
+
+        # settings_details
+        resp = self.client.get(reverse('settings_grading',
+                                       kwargs={'org': loc.org,
+                                               'course': loc.course,
+                                               'name': loc.name}))
+        self.assertEqual(200, resp.status_code)
+
+        # static_pages
+        resp = self.client.get(reverse('static_pages',
+                                       kwargs={'org': loc.org,
+                                               'course': loc.course,
+                                               'coursename': loc.name}))
+        self.assertEqual(200, resp.status_code)
+
+        # static_pages
+        resp = self.client.get(reverse('asset_index',
+                                       kwargs={'org': loc.org,
+                                               'course': loc.course,
+                                               'name': loc.name}))
+        self.assertEqual(200, resp.status_code)
+
+        # go look at a subsection page
+        subsection_location = loc._replace(category='sequential', name='test_sequence')
+        resp = self.client.get(reverse('edit_subsection',
+                                       kwargs={'location': subsection_location.url()}))
+        self.assertEqual(200, resp.status_code)
+
+        # go look at the Edit page
+        unit_location = loc._replace(category='vertical', name='test_vertical')
+        resp = self.client.get(reverse('edit_unit',
+                                       kwargs={'location': unit_location.url()}))
+        self.assertEqual(200, resp.status_code)
+
+        # delete a component
+        del_loc = loc._replace(category='html', name='test_html')
+        resp = self.client.post(reverse('delete_item'),
+                                json.dumps({'id': del_loc.url()}), "application/json")
+        self.assertEqual(200, resp.status_code)
+
+        # delete a unit
+        del_loc = loc._replace(category='vertical', name='test_vertical')
+        resp = self.client.post(reverse('delete_item'),
+                                json.dumps({'id': del_loc.url()}), "application/json")
+        self.assertEqual(200, resp.status_code)
+
+        # delete a unit
+        del_loc = loc._replace(category='sequential', name='test_sequence')
+        resp = self.client.post(reverse('delete_item'),
+                                json.dumps({'id': del_loc.url()}), "application/json")
+        self.assertEqual(200, resp.status_code)
+
+        # delete a chapter
+        del_loc = loc._replace(category='chapter', name='chapter_2')
+        resp = self.client.post(reverse('delete_item'),
+                                json.dumps({'id': del_loc.url()}), "application/json")
+        self.assertEqual(200, resp.status_code)
+
     def test_import_metadata_with_attempts_empty_string(self):
         import_from_xml(modulestore(), 'common/test/data/', ['simple'])
         module_store = modulestore('direct')

cms/djangoapps/contentstore/tests/utils.py

@@ -1,3 +1,9 @@
+'''
+Utilities for contentstore tests
+'''
+
+#pylint: disable=W0603
+
 import json
 import copy
 from uuid import uuid4
@@ -17,36 +23,89 @@ class ModuleStoreTestCase(TestCase):
     collection with templates before running the TestCase
     and drops it they are finished. """
 
-    def _pre_setup(self):
-        super(ModuleStoreTestCase, self)._pre_setup()
+    @staticmethod
+    def flush_mongo_except_templates():
+        '''
+        Delete everything in the module store except templates
+        '''
+        modulestore = xmodule.modulestore.django.modulestore()
+
+        # This query means: every item in the collection
+        # that is not a template
+        query = {"_id.course": {"$ne": "templates"}}
+
+        # Remove everything except templates
+        modulestore.collection.remove(query)
+
+    @staticmethod
+    def load_templates_if_necessary():
+        '''
+        Load templates into the modulestore only if they do not already exist.
+        We need the templates, because they are copied to create
+        XModules such as sections and problems
+        '''
+        modulestore = xmodule.modulestore.django.modulestore()
+
+        # Count the number of templates
+        query = {"_id.course": "templates"}
+        num_templates = modulestore.collection.find(query).count()
+
+        if num_templates < 1:
+            update_templates()
+
+    @classmethod
+    def setUpClass(cls):
+        '''
+        Flush the mongo store and set up templates
+        '''
 
         # 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()"
+        cls.orig_modulestore = copy.deepcopy(settings.MODULESTORE)
+        test_modulestore = cls.orig_modulestore
+        test_modulestore['default']['OPTIONS']['collection'] = 'modulestore_%s' % uuid4().hex
+        test_modulestore['direct']['OPTIONS']['collection'] = 'modulestore_%s' % uuid4().hex
         xmodule.modulestore.django._MODULESTORES = {}
-        update_templates()
+
+        settings.MODULESTORE = test_modulestore
+
+        TestCase.setUpClass()
+
+    @classmethod
+    def tearDownClass(cls):
+        '''
+        Revert to the old modulestore settings
+        '''
+
+        # Clean up by dropping the collection
+        modulestore = xmodule.modulestore.django.modulestore()
+        modulestore.collection.drop()
+
+        # Restore the original modulestore settings
+        settings.MODULESTORE = cls.orig_modulestore
+
+    def _pre_setup(self):
+        '''
+        Remove everything but the templates before each test
+        '''
+
+        # Flush anything that is not a template
+        ModuleStoreTestCase.flush_mongo_except_templates()
+
+        # Check that we have templates loaded; if not, load them
+        ModuleStoreTestCase.load_templates_if_necessary()
+
+        # Call superclass implementation
+        super(ModuleStoreTestCase, self)._pre_setup()
 
     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
+        '''
+        Flush everything we created except the templates
+        '''
+        # Flush anything that is not a template
+        ModuleStoreTestCase.flush_mongo_except_templates()
 
+        # Call superclass implementation
         super(ModuleStoreTestCase, self)._post_teardown()
 
 

cms/djangoapps/contentstore/utils.py

@@ -1,11 +1,15 @@
+import logging
 from django.conf import settings
 from xmodule.modulestore import Location
 from xmodule.modulestore.django import modulestore
 from xmodule.modulestore.exceptions import ItemNotFoundError
 from django.core.urlresolvers import reverse
+import copy
 
 DIRECT_ONLY_CATEGORIES = ['course', 'chapter', 'sequential', 'about', 'static_tab', 'course_info']
 
+#In order to instantiate an open ended tab automatically, need to have this data
+OPEN_ENDED_PANEL = {"name" : "Open Ended Panel", "type" : "open_ended"}
 
 def get_modulestore(location):
     """
@@ -137,7 +141,7 @@ def compute_unit_state(unit):
     'private' content is editabled and not visible in the LMS
     """
 
-    if unit.cms.is_draft:
+    if getattr(unit, 'is_draft', False):
         try:
             modulestore('direct').get_item(unit.location)
             return UnitState.draft
@@ -147,10 +151,6 @@ def compute_unit_state(unit):
         return UnitState.public
 
 
-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.
@@ -191,3 +191,35 @@ class CoursePageNames:
     SettingsGrading = "settings_grading"
     CourseOutline = "course_index"
     Checklists = "checklists"
+
+def add_open_ended_panel_tab(course):
+    """
+    Used to add the open ended panel tab to a course if it does not exist.
+    @param course: A course object from the modulestore.
+    @return: Boolean indicating whether or not a tab was added and a list of tabs for the course.
+    """
+    #Copy course tabs
+    course_tabs = copy.copy(course.tabs)
+    changed = False
+    #Check to see if open ended panel is defined in the course
+    if OPEN_ENDED_PANEL not in course_tabs:
+        #Add panel to the tabs if it is not defined
+        course_tabs.append(OPEN_ENDED_PANEL)
+        changed = True
+    return changed, course_tabs
+
+def remove_open_ended_panel_tab(course):
+    """
+    Used to remove the open ended panel tab from a course if it exists.
+    @param course: A course object from the modulestore.
+    @return: Boolean indicating whether or not a tab was added and a list of tabs for the course.
+    """
+    #Copy course tabs
+    course_tabs = copy.copy(course.tabs)
+    changed = False
+    #Check to see if open ended panel is defined in the course
+    if OPEN_ENDED_PANEL in course_tabs:
+        #Add panel to the tabs if it is not defined
+        course_tabs = [ct for ct in course_tabs if ct!=OPEN_ENDED_PANEL]
+        changed = True
+    return changed, course_tabs

cms/djangoapps/contentstore/views.py

@@ -6,7 +6,6 @@ import sys
 import time
 import tarfile
 import shutil
-from datetime import datetime
 from collections import defaultdict
 from uuid import uuid4
 from path import path
@@ -42,17 +41,19 @@ from xmodule.modulestore.mongo import MongoUsage
 from mitxmako.shortcuts import render_to_response, render_to_string
 from xmodule.modulestore.django import modulestore
 from xmodule_modifiers import replace_static_urls, wrap_xmodule
-from xmodule.exceptions import NotFoundError
+from xmodule.exceptions import NotFoundError, ProcessingError
 from functools import partial
 
 from xmodule.contentstore.django import contentstore
 from xmodule.contentstore.content import StaticContent
+from xmodule.util.date_utils import get_default_time_display
 
 from auth.authz import is_user_in_course_group_role, get_users_in_course_group_by_role
 from auth.authz import get_user_by_email, add_user_to_course_group, remove_user_from_course_group
 from auth.authz import INSTRUCTOR_ROLE_NAME, STAFF_ROLE_NAME, create_all_course_groups
 from .utils import get_course_location_for_item, get_lms_link_for_item, compute_unit_state, \
-    get_date_display, UnitState, get_course_for_item, get_url_reverse
+    UnitState, get_course_for_item, get_url_reverse, add_open_ended_panel_tab, \
+    remove_open_ended_panel_tab
 
 from xmodule.modulestore.xml_importer import import_from_xml
 from contentstore.course_info_model import get_course_updates, \
@@ -73,7 +74,8 @@ log = logging.getLogger(__name__)
 
 COMPONENT_TYPES = ['customtag', 'discussion', 'html', 'problem', 'video']
 
-ADVANCED_COMPONENT_TYPES = ['annotatable', 'combinedopenended', 'peergrading']
+OPEN_ENDED_COMPONENT_TYPES = ["combinedopenended", "peergrading"]
+ADVANCED_COMPONENT_TYPES = ['annotatable'] + OPEN_ENDED_COMPONENT_TYPES
 ADVANCED_COMPONENT_CATEGORY = 'advanced'
 ADVANCED_COMPONENT_POLICY_KEY = 'advanced_modules'
 
@@ -118,6 +120,12 @@ def howitworks(request):
     else:
         return render_to_response('howitworks.html', {})
 
+
+# static/proof-of-concept views
+def ux_alerts(request):
+    return render_to_response('ux-alerts.html', {})
+
+
 # ==== Views for any logged-in user ==================================
 
 
@@ -188,7 +196,7 @@ def course_index(request, org, course, name):
         'coursename': name
     })
 
-    course = modulestore().get_item(location)
+    course = modulestore().get_item(location, depth=3)
     sections = course.get_children()
 
     return render_to_response('overview.html', {
@@ -208,19 +216,14 @@ def course_index(request, org, course, name):
 @login_required
 def edit_subsection(request, location):
     # check that we have permissions to edit this item
-    if not has_access(request.user, location):
+    course = get_course_for_item(location)
+    if not has_access(request.user, course.location):
         raise PermissionDenied()
 
-    item = modulestore().get_item(location)
+    item = modulestore().get_item(location, depth=1)
 
-    # TODO: we need a smarter way to figure out what course an item is in
-    for course in modulestore().get_courses():
-        if (course.location.org == item.location.org and
-            course.location.course == item.location.course):
-            break
-
-    lms_link = get_lms_link_for_item(location)
-    preview_link = get_lms_link_for_item(location, preview=True)
+    lms_link = get_lms_link_for_item(location, course_id=course.location.course_id)
+    preview_link = get_lms_link_for_item(location, course_id=course.location.course_id, preview=True)
 
     # make sure that location references a 'sequential', otherwise return BadRequest
     if item.location.category != 'sequential':
@@ -277,19 +280,13 @@ def edit_unit(request, location):
 
     id: A Location URL
     """
-    # check that we have permissions to edit this item
-    if not has_access(request.user, location):
+    course = get_course_for_item(location)
+    if not has_access(request.user, course.location):
         raise PermissionDenied()
 
-    item = modulestore().get_item(location)
+    item = modulestore().get_item(location, depth=1)
 
-    # TODO: we need a smarter way to figure out what course an item is in
-    for course in modulestore().get_courses():
-        if (course.location.org == item.location.org and
-            course.location.course == item.location.course):
-            break
-
-    lms_link = get_lms_link_for_item(item.location)
+    lms_link = get_lms_link_for_item(item.location, course_id=course.location.course_id)
 
     component_templates = defaultdict(list)
 
@@ -374,7 +371,7 @@ def edit_unit(request, location):
         'draft_preview_link': preview_lms_link,
         'published_preview_link': lms_link,
         'subsection': containing_subsection,
-        'release_date': get_date_display(datetime.fromtimestamp(time.mktime(containing_subsection.lms.start))) if containing_subsection.lms.start is not None else None,
+        'release_date': get_default_time_display(containing_subsection.lms.start) if containing_subsection.lms.start is not None else None,
         'section': containing_section,
         'create_new_unit_template': Location('i4x', 'edx', 'templates', 'vertical', 'Empty'),
         'unit_state': unit_state,
@@ -448,9 +445,16 @@ def preview_dispatch(request, preview_id, location, dispatch=None):
     # Let the module handle the AJAX
     try:
         ajax_return = instance.handle_ajax(dispatch, request.POST)
+
     except NotFoundError:
         log.exception("Module indicating to user that request doesn't exist")
         raise Http404
+
+    except ProcessingError:
+        log.warning("Module raised an error while processing AJAX request",
+                    exc_info=True)
+        return HttpResponseBadRequest()
+
     except:
         log.exception("error processing ajax call")
         raise
@@ -830,7 +834,7 @@ def upload_asset(request, org, course, coursename):
     readback = contentstore().find(content.location)
 
     response_payload = {'displayname': content.name,
-        'uploadDate': get_date_display(readback.last_modified_at),
+        'uploadDate': get_default_time_display(readback.last_modified_at.timetuple()),
         'url': StaticContent.get_url_path_from_location(content.location),
         'thumb_url': StaticContent.get_url_path_from_location(thumbnail_location) if thumbnail_content is not None else None,
         'msg': 'Upload completed'
@@ -1273,15 +1277,48 @@ def course_advanced_updates(request, org, course, name):
     location = get_location_and_verify_access(request, org, course, name)
 
     real_method = get_request_method(request)
-        
+
     if real_method == 'GET':
         return HttpResponse(json.dumps(CourseMetadata.fetch(location)), mimetype="application/json")
     elif real_method == 'DELETE':
-        return HttpResponse(json.dumps(CourseMetadata.delete_key(location, json.loads(request.body))), mimetype="application/json")
+        return HttpResponse(json.dumps(CourseMetadata.delete_key(location, json.loads(request.body))),
+                            mimetype="application/json")
     elif real_method == 'POST' or real_method == 'PUT':
         # NOTE: request.POST is messed up because expect_json cloned_request.POST.copy() is creating a defective entry w/ the whole payload as the key
-        return HttpResponse(json.dumps(CourseMetadata.update_from_json(location, json.loads(request.body))), mimetype="application/json")
-
+        request_body = json.loads(request.body)
+        #Whether or not to filter the tabs key out of the settings metadata
+        filter_tabs = True
+        #Check to see if the user instantiated any advanced components.  This is a hack to add the open ended panel tab
+        #to a course automatically if the user has indicated that they want to edit the combinedopenended or peergrading
+        #module, and to remove it if they have removed the open ended elements.
+        if ADVANCED_COMPONENT_POLICY_KEY in request_body:
+            #Check to see if the user instantiated any open ended components
+            found_oe_type = False
+            #Get the course so that we can scrape current tabs
+            course_module = modulestore().get_item(location)
+            for oe_type in OPEN_ENDED_COMPONENT_TYPES:
+                if oe_type in request_body[ADVANCED_COMPONENT_POLICY_KEY]:
+                    #Add an open ended tab to the course if needed
+                    changed, new_tabs = add_open_ended_panel_tab(course_module)
+                    #If a tab has been added to the course, then send the metadata along to CourseMetadata.update_from_json
+                    if changed:
+                        request_body.update({'tabs': new_tabs})
+                        #Indicate that tabs should not be filtered out of the metadata
+                        filter_tabs = False
+                    #Set this flag to avoid the open ended tab removal code below.
+                    found_oe_type = True
+                    break
+            #If we did not find an open ended module type in the advanced settings,
+            # we may need to remove the open ended tab from the course.
+            if not found_oe_type:
+                #Remove open ended tab to the course if needed
+                changed, new_tabs = remove_open_ended_panel_tab(course_module)
+                if changed:
+                    request_body.update({'tabs': new_tabs})
+                    #Indicate that tabs should not be filtered out of the metadata
+                    filter_tabs = False
+        response_json = json.dumps(CourseMetadata.update_from_json(location, request_body, filter_tabs=filter_tabs))
+        return HttpResponse(response_json, mimetype="application/json")
 
 @ensure_csrf_cookie
 @login_required
@@ -1402,7 +1439,7 @@ def asset_index(request, org, course, name):
         id = asset['_id']
         display_info = {}
         display_info['displayname'] = asset['displayname']
-        display_info['uploadDate'] = get_date_display(asset['uploadDate'])
+        display_info['uploadDate'] = get_default_time_display(asset['uploadDate'].timetuple())
 
         asset_location = StaticContent.compute_location(id['org'], id['course'], id['name'])
         display_info['url'] = StaticContent.get_url_path_from_location(asset_location)

cms/djangoapps/models/settings/course_metadata.py

@@ -4,7 +4,7 @@ from xmodule.x_module import XModuleDescriptor
 from xmodule.modulestore.inheritance import own_metadata
 from xblock.core import Scope
 from xmodule.course_module import CourseDescriptor
-
+import copy
 
 class CourseMetadata(object):
     '''
@@ -39,7 +39,7 @@ class CourseMetadata(object):
         return course
 
     @classmethod
-    def update_from_json(cls, course_location, jsondict):
+    def update_from_json(cls, course_location, jsondict, filter_tabs=True):
         """
         Decode the json into CourseMetadata and save any changed attrs to the db.
 
@@ -48,10 +48,16 @@ class CourseMetadata(object):
         descriptor = get_modulestore(course_location).get_item(course_location)
 
         dirty = False
+		
+        #Copy the filtered list to avoid permanently changing the class attribute
+        filtered_list = copy.copy(cls.FILTERED_LIST)
+        #Don't filter on the tab attribute if filter_tabs is False
+        if not filter_tabs:
+            filtered_list.remove("tabs")
 
         for k, v in jsondict.iteritems():
             # should it be an error if one of the filtered list items is in the payload?
-            if k in cls.FILTERED_LIST:
+            if k in filtered_list:
                 continue
 
             if hasattr(descriptor, k) and getattr(descriptor, k) != v:

cms/envs/aws.py

@@ -46,6 +46,9 @@ SESSION_COOKIE_DOMAIN = ENV_TOKENS.get('SESSION_COOKIE_DOMAIN')
 for feature, value in ENV_TOKENS.get('MITX_FEATURES', {}).items():
     MITX_FEATURES[feature] = value
 
+# load segment.io key, provide a dummy if it does not exist
+SEGMENT_IO_KEY = ENV_TOKENS.get('SEGMENT_IO_KEY', '***REMOVED***')
+
 LOGGING = get_logger_config(LOG_DIR,
                             logging_env=ENV_TOKENS['LOGGING_ENV'],
                             syslog_addr=(ENV_TOKENS['SYSLOG_SERVER'], 514),

cms/envs/common.py

@@ -34,6 +34,9 @@ MITX_FEATURES = {
     'ENABLE_DISCUSSION_SERVICE': False,
     'AUTH_USE_MIT_CERTIFICATES': False,
     'STUB_VIDEO_FOR_TESTING': False,   # do not display video when running automated acceptance tests
+    'STAFF_EMAIL': '',			# email address for staff (eg to request course creation)
+    'STUDIO_NPS_SURVEY': True, 
+    'SEGMENT_IO': True,
 }
 ENABLE_JASMINE = False
 
@@ -113,6 +116,7 @@ TEMPLATE_LOADERS = (
 
 MIDDLEWARE_CLASSES = (
     'contentserver.middleware.StaticContentServer',
+    'request_cache.middleware.RequestCache',
     'django.middleware.cache.UpdateCacheMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',

cms/envs/dev.py

@@ -112,6 +112,10 @@ CACHE_TIMEOUT = 0
 # Dummy secret key for dev
 SECRET_KEY = '85920908f28904ed733fe576320db18cabd7b6cd'
 
+################################ PIPELINE #################################
+
+PIPELINE_SASS_ARGUMENTS = '--debug-info --require {proj_dir}/static/sass/bourbon/lib/bourbon.rb'.format(proj_dir=PROJECT_ROOT)
+
 ################################ DEBUG TOOLBAR #################################
 INSTALLED_APPS += ('debug_toolbar', 'debug_toolbar_mongo')
 MIDDLEWARE_CLASSES += ('django_comment_client.utils.QueryCountDebugMiddleware',
@@ -142,4 +146,10 @@ DEBUG_TOOLBAR_CONFIG = {
 
 # To see stacktraces for MongoDB queries, set this to True.
 # Stacktraces slow down page loads drastically (for pages with lots of queries).
-DEBUG_TOOLBAR_MONGO_STACKTRACES = False
+DEBUG_TOOLBAR_MONGO_STACKTRACES = True
+
+# disable NPS survey in dev mode
+MITX_FEATURES['STUDIO_NPS_SURVEY'] = False
+
+# segment-io key for dev
+SEGMENT_IO_KEY = 'mty8edrrsg'

cms/envs/test.py

@@ -58,6 +58,10 @@ MODULESTORE = {
     'direct': {
         'ENGINE': 'xmodule.modulestore.mongo.MongoModuleStore',
         'OPTIONS': modulestore_options
+    },
+    'draft': {
+        'ENGINE': 'xmodule.modulestore.mongo.DraftMongoModuleStore',
+        'OPTIONS': modulestore_options
     }
 }
 
@@ -114,3 +118,6 @@ PASSWORD_HASHERS = (
     'django.contrib.auth.hashers.SHA1PasswordHasher',
     'django.contrib.auth.hashers.MD5PasswordHasher',
 )
+
+# dummy segment-io key
+SEGMENT_IO_KEY = '***REMOVED***'

cms/one_time_startup.py

@@ -1,13 +1,15 @@
 from dogapi import dog_http_api, dog_stats_api
 from django.conf import settings
 from xmodule.modulestore.django import modulestore
+from request_cache.middleware import RequestCache
 
 from django.core.cache import get_cache, InvalidCacheBackendError
 
 cache = get_cache('mongo_metadata_inheritance')
 for store_name in settings.MODULESTORE:
     store = modulestore(store_name)
-    store.metadata_inheritance_cache = cache
+    store.metadata_inheritance_cache_subsystem = cache
+    store.request_cache = RequestCache.get_request_cache()
 
 if hasattr(settings, 'DATADOG_API'):
     dog_http_api.api_key = settings.DATADOG_API

cms/static/client_templates/checklist.html

@@ -44,7 +44,7 @@
 
                 <% if (item['action_text'] !== '' && item['action_url'] !== '') { %>
                 <ul class="list-actions task-actions">
-                    <li>
+                    <li class="action-item">
                         <a href="<%= item['action_url'] %>" class="action action-primary"
                         <% if (item['action_external']) { %>
                         rel="external" title="This link will open in a new browser window/tab"

cms/static/coffee/src/views/module_edit.coffee

@@ -15,7 +15,7 @@ class CMS.Views.ModuleEdit extends Backbone.View
   $component_editor: => @$el.find('.component-editor')
 
   loadDisplay: ->
-       XModule.loadModule(@$el.find('.xmodule_display'))
+    XModule.loadModule(@$el.find('.xmodule_display'))
 
   loadEdit: ->
     if not @module
@@ -55,6 +55,11 @@ class CMS.Views.ModuleEdit extends Backbone.View
   clickSaveButton: (event) =>
     event.preventDefault()
     data = @module.save()
+
+    analytics.track "Saved Module",
+      course: course_location_analytics
+      id: _this.model.id
+
     data.metadata = _.extend(data.metadata || {}, @metadata())
     @hideModal()
     @model.save(data).done( =>

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

@@ -28,6 +28,10 @@ class CMS.Views.TabsEdit extends Backbone.View
     @$('.component').each((idx, element) =>
         tabs.push($(element).data('id'))
     )
+
+    analytics.track "Reordered Static Pages",
+      course: course_location_analytics
+
     $.ajax({
       type:'POST',
       url: '/reorder_static_tabs', 
@@ -56,10 +60,18 @@ class CMS.Views.TabsEdit extends Backbone.View
       'i4x://edx/templates/static_tab/Empty'
     )
 
+    analytics.track "Added Static Page",
+      course: course_location_analytics
+
   deleteTab: (event) =>
     if not confirm 'Are you sure you want to delete this component? This action cannot be undone.'
       return
     $component = $(event.currentTarget).parents('.component')
+
+    analytics.track "Deleted Static Page",
+      course: course_location_analytics
+      id: $component.data('id')
+
     $.post('/delete_item', {
       id: $component.data('id')
     }, =>

cms/static/coffee/src/views/unit.coffee

@@ -35,6 +35,10 @@ class CMS.Views.UnitEdit extends Backbone.View
     @$('.components').sortable(
       handle: '.drag-handle'
       update: (event, ui) =>
+        analytics.track "Reordered Components",
+          course: course_location_analytics
+          id: unit_location_analytics
+
         payload = children : @components()
         options = success : => @model.unset('children')
         @model.save(payload, options)
@@ -89,6 +93,11 @@ class CMS.Views.UnitEdit extends Backbone.View
       $(event.currentTarget).data('location')
     )
 
+    analytics.track "Added a Component",
+      course: course_location_analytics
+      unit_id: unit_location_analytics
+      type: $(event.currentTarget).data('location')
+
     @closeNewComponent(event)
 
   components: => @$('.component').map((idx, el) -> $(el).data('id')).get()
@@ -111,6 +120,11 @@ class CMS.Views.UnitEdit extends Backbone.View
     $.post('/delete_item', {
       id: $component.data('id')
     }, =>
+      analytics.track "Deleted a Component",
+        course: course_location_analytics
+        unit_id: unit_location_analytics
+        id: $component.data('id')
+
       $component.remove()
       # b/c we don't vigilantly keep children up to date
       # get rid of it before it hurts someone
@@ -129,6 +143,10 @@ class CMS.Views.UnitEdit extends Backbone.View
       id: @$el.data('id')
       delete_children: true
     }, =>
+      analytics.track "Deleted Draft",
+        course: course_location_analytics
+        unit_id: unit_location_analytics
+
       window.location.reload()
     )
 
@@ -138,6 +156,10 @@ class CMS.Views.UnitEdit extends Backbone.View
     $.post('/create_draft', {
       id: @$el.data('id')
     }, =>
+      analytics.track "Created Draft",
+        course: course_location_analytics
+        unit_id: unit_location_analytics
+
       @model.set('state', 'draft')
     )
 
@@ -148,20 +170,31 @@ class CMS.Views.UnitEdit extends Backbone.View
     $.post('/publish_draft', {
       id: @$el.data('id')
     }, =>
+      analytics.track "Published Draft",
+        course: course_location_analytics
+        unit_id: unit_location_analytics
+
       @model.set('state', 'public')
     )
 
   setVisibility: (event) ->
     if @$('.visibility-select').val() == 'private'
       target_url = '/unpublish_unit'
+      visibility = "private"
     else
       target_url = '/publish_draft'
+      visibility = "public"
 
     @wait(true)
 
     $.post(target_url, {
       id: @$el.data('id')
     }, =>
+      analytics.track "Set Unit Visibility",
+        course: course_location_analytics
+        unit_id: unit_location_analytics
+        visibility: visibility
+
       @model.set('state', @$('.visibility-select').val())
     )
 
@@ -193,6 +226,11 @@ class CMS.Views.UnitEdit.NameEdit extends Backbone.View
     @model.save(metadata: metadata)
     # Update name shown in the right-hand side location summary.
     $('.unit-location .editing .unit-name').html(metadata.display_name)
+    analytics.track "Edited Unit Name",
+      course: course_location_analytics
+      unit_id: unit_location_analytics
+      display_name: metadata.display_name
+
 
 class CMS.Views.UnitEdit.LocationState extends Backbone.View
   initialize: =>

cms/static/js/base.js

@@ -4,6 +4,9 @@ var $modalCover;
 var $newComponentItem;
 var $changedInput;
 var $spinner;
+var $newComponentTypePicker;
+var $newComponentTemplatePickers;
+var $newComponentButton;
 
 $(document).ready(function () {
     $body = $('body');
@@ -34,17 +37,21 @@ $(document).ready(function () {
         $(this).select();
     });
 
+    $('body').addClass('js');
+
     $('.unit .item-actions .delete-button').bind('click', deleteUnit);
     $('.new-unit-item').bind('click', createNewUnit);
 
-    $('body').addClass('js');
-
     // lean/simple modal
     $('a[rel*=modal]').leanModal({overlay : 0.80, closeButton: '.action-modal-close' });
     $('a.action-modal-close').click(function(e){
         (e).preventDefault();
     });
 
+    // alerts/notifications - manual close
+    $('.action-alert-close, .alert.has-actions .nav-actions a').bind('click', hideAlert);
+    $('.action-notification-close').bind('click', hideNotification);
+
     // nav - dropdown related
     $body.click(function (e) {
         $('.nav-dropdown .nav-item .wrapper-nav-sub').removeClass('is-shown');
@@ -83,6 +90,11 @@ $(document).ready(function () {
     // general link management - smooth scrolling page links
     $('a[rel*="view"][href^="#"]').bind('click', smoothScrollLink);
 
+    // tender feedback window scrolling
+    $('a.show-tender').bind('click', smoothScrollTop);
+
+    // toggling footer additional support
+    $('.cta-show-sock').bind('click', toggleSock);
 
     // toggling overview section details
     $(function () {
@@ -151,15 +163,27 @@ $(document).ready(function () {
 function smoothScrollLink(e) {
     (e).preventDefault();
 
-    $.smoothScroll({ 
-        offset: -200, 
-        easing: 'swing', 
+    $.smoothScroll({
+        offset: -200,
+        easing: 'swing',
         speed: 1000,
         scrollElement: null,
         scrollTarget: $(this).attr('href')
     });
 }
 
+function smoothScrollTop(e) {
+    (e).preventDefault();
+
+    $.smoothScroll({
+        offset: -200,
+        easing: 'swing',
+        speed: 1000,
+        scrollElement: null,
+        scrollTarget: $('#view-top')
+    });
+}
+
 function linkNewWindow(e) {
     window.open($(e.target).attr('href'));
     e.preventDefault();
@@ -228,7 +252,7 @@ function syncReleaseDate(e) {
     $("#start_time").val("");
 }
 
-function getEdxTimeFromDateTimeVals(date_val, time_val, format) {
+function getEdxTimeFromDateTimeVals(date_val, time_val) {
     var edxTimeStr = null;
 
     if (date_val != '') {
@@ -237,20 +261,17 @@ function getEdxTimeFromDateTimeVals(date_val, time_val, format) {
 
         // Note, we are using date.js utility which has better parsing abilities than the built in JS date parsing
         var date = Date.parse(date_val + " " + time_val);
-        if (format == null)
-            format = 'yyyy-MM-ddTHH:mm';
-
-        edxTimeStr = date.toString(format);
+        edxTimeStr = date.toString('yyyy-MM-ddTHH:mm');
     }
 
     return edxTimeStr;
 }
 
-function getEdxTimeFromDateTimeInputs(date_id, time_id, format) {
+function getEdxTimeFromDateTimeInputs(date_id, time_id) {
     var input_date = $('#' + date_id).val();
     var input_time = $('#' + time_id).val();
 
-    return getEdxTimeFromDateTimeVals(input_date, input_time, format);
+    return getEdxTimeFromDateTimeVals(input_date, input_time);
 }
 
 function autosaveInput(e) {
@@ -291,10 +312,8 @@ function saveSubsection() {
     }
 
     // Piece back together the date/time UI elements into one date/time string
-    // NOTE: our various "date/time" metadata elements don't always utilize the same formatting string
-    // so make sure we're passing back the correct format
     metadata['start'] = getEdxTimeFromDateTimeInputs('start_date', 'start_time');
-    metadata['due'] = getEdxTimeFromDateTimeInputs('due_date', 'due_time', 'MMMM dd HH:mm');
+    metadata['due'] = getEdxTimeFromDateTimeInputs('due_date', 'due_time');
 
     $.ajax({
         url: "/save_item",
@@ -316,8 +335,14 @@ function saveSubsection() {
 function createNewUnit(e) {
     e.preventDefault();
 
-    parent = $(this).data('parent');
-    template = $(this).data('template');
+    var parent = $(this).data('parent');
+    var template = $(this).data('template');
+
+    analytics.track('Created a Unit', {
+        'course': course_location_analytics,
+        'parent_location': parent
+    });
+
 
     $.post('/clone_item',
         {'parent_location': parent,
@@ -351,6 +376,12 @@ function _deleteItem($el) {
 
     var id = $el.data('id');
 
+    analytics.track('Deleted an Item', {
+        'course': course_location_analytics,
+        'id': id
+    });
+
+
     $.post('/delete_item',
         {'id': id, 'delete_children': true, 'delete_all_versions': true},
         function (data) {
@@ -414,6 +445,11 @@ function displayFinishedUpload(xhr) {
     var html = Mustache.to_html(template, resp);
     $('table > tbody').prepend(html);
 
+    analytics.track('Uploaded a File', {
+        'course': course_location_analytics,
+        'asset_url': resp.url
+    });
+
 }
 
 function markAsLoaded() {
@@ -441,6 +477,33 @@ function onKeyUp(e) {
     }
 }
 
+function toggleSock(e) {
+    e.preventDefault();
+
+    var $btnLabel = $(this).find('.copy');
+    var $sock = $('.wrapper-sock');
+    var $sockContent = $sock.find('.wrapper-inner');
+
+    $sock.toggleClass('is-shown');
+    $sockContent.toggle('fast');
+
+    $.smoothScroll({
+       offset: -200,
+       easing: 'swing',
+       speed: 1000,
+       scrollElement: null,
+       scrollTarget: $sock
+    });
+
+    if($sock.hasClass('is-shown')) {
+        $btnLabel.text('Hide Studio Help');
+    }
+
+    else {
+        $btnLabel.text('Looking for Help with Studio?');
+    }
+}
+
 function toggleSubmodules(e) {
     e.preventDefault();
     $(this).toggleClass('expand').toggleClass('collapse');
@@ -479,6 +542,17 @@ function removeDateSetter(e) {
     $block.find('.time').val('');
 }
 
+
+function hideNotification(e) {
+    (e).preventDefault();
+    $(this).closest('.wrapper-notification').removeClass('is-shown').addClass('is-hiding').attr('aria-hidden','true');
+}
+
+function hideAlert(e) {
+    (e).preventDefault();
+    $(this).closest('.wrapper-alert').removeClass('is-shown');
+}
+
 function showToastMessage(message, $button, lifespan) {
     var $toast = $('<div class="toast-notification"></div>');
     var $closeBtn = $('<a href="#" class="close-button">×</a>');
@@ -543,6 +617,11 @@ function saveNewSection(e) {
     var template = $saveButton.data('template');
     var display_name = $(this).find('.new-section-name').val();
 
+    analytics.track('Created a Section', {
+        'course': course_location_analytics,
+        'display_name': display_name
+    });
+
     $.post('/clone_item', {
             'parent_location': parent,
             'template': template,
@@ -588,6 +667,12 @@ function saveNewCourse(e) {
         return;
     }
 
+    analytics.track('Created a Course', {
+        'org': org,
+        'number': number,
+        'display_name': display_name
+    });
+
     $.post('/create_new_course', {
             'template': template,
             'org': org,
@@ -634,9 +719,14 @@ function saveNewSubsection(e) {
 
     var parent = $(this).find('.new-subsection-name-save').data('parent');
     var template = $(this).find('.new-subsection-name-save').data('template');
-
     var display_name = $(this).find('.new-subsection-name-input').val();
 
+    analytics.track('Created a Subsection', {
+        'course': course_location_analytics,
+        'display_name': display_name
+    });
+
+
     $.post('/clone_item', {
             'parent_location': parent,
             'template': template,
@@ -690,6 +780,13 @@ function saveEditSectionName(e) {
         return;
     }
 
+    analytics.track('Edited Section Name', {
+        'course': course_location_analytics,
+        'display_name': display_name,
+        'id': id
+    });
+
+
     var $_this = $(this);
     // call into server to commit the new order
     $.ajax({
@@ -729,6 +826,12 @@ function saveSetSectionScheduleDate(e) {
 
     var id = $modal.attr('data-id');
 
+    analytics.track('Edited Section Release Date', {
+        'course': course_location_analytics,
+        'id': id,
+        'start': start
+    });
+
     // call into server to commit the new order
     $.ajax({
         url: "/save_item",
@@ -738,7 +841,7 @@ function saveSetSectionScheduleDate(e) {
         data: JSON.stringify({ 'id': id, 'metadata': {'start': start}})
     }).success(function () {
             var $thisSection = $('.courseware-section[data-id="' + id + '"]');
-            $thisSection.find('.section-published-date').html('<span class="published-status"><strong>Will Release:</strong> ' + input_date + ' at ' + input_time + '</span><a href="#" class="edit-button" data-date="' + input_date + '" data-time="' + input_time + '" data-id="' + id + '">Edit</a>');
+            $thisSection.find('.section-published-date').html('<span class="published-status"><strong>Will Release:</strong> ' + input_date + ' at ' + input_time + ' UTC</span><a href="#" class="edit-button" data-date="' + input_date + '" data-time="' + input_time + '" data-id="' + id + '">Edit</a>');
             $thisSection.find('.section-published-date').animate({
                 'background-color': 'rgb(182,37,104)'
             }, 300).animate({
@@ -751,4 +854,4 @@ function saveSetSectionScheduleDate(e) {
 
             hideModal();
         });
-}
+}

cms/static/js/views/checklists_view.js

@@ -77,11 +77,18 @@ CMS.Views.Checklists = Backbone.View.extend({
         var task_index = $checkbox.data('task');
         var model = this.collection.at(checklist_index);
         model.attributes.items[task_index].is_checked = $task.hasClass(completed);
+
         model.save({},
             {
                 success : function() {
                     var updatedTemplate = self.renderTemplate(model, checklist_index);
                     self.$el.find('#course-checklist'+checklist_index).first().replaceWith(updatedTemplate);
+
+                    analytics.track('Toggled a Checklist Task', {
+                        'course': course_location_analytics,
+                        'task': model.attributes.items[task_index].short_description,
+                        'state': model.attributes.items[task_index].is_checked
+                    });
                 },
                 error : CMS.ServerError
             });

cms/static/js/views/course_info_edit.js

@@ -107,6 +107,11 @@ CMS.Views.ClassInfoUpdateView = Backbone.View.extend({
         // push change to display, hide the editor, submit the change        
         targetModel.save({}, {error : CMS.ServerError});
         this.closeEditor(this);
+
+        analytics.track('Saved Course Update', {
+            'course': course_location_analytics,
+            'date': this.dateEntry(event).val() 
+        });
     },
     
     onCancel: function(event) {
@@ -147,6 +152,11 @@ CMS.Views.ClassInfoUpdateView = Backbone.View.extend({
             return;
         }
 
+        analytics.track('Deleted Course Update', {
+            'course': course_location_analytics,
+            'date': this.dateEntry(event).val() 
+        });
+
         var targetModel = this.eventModel(event);
         this.modelDom(event).remove();
         var cacheThis = this;
@@ -284,6 +294,11 @@ CMS.Views.ClassInfoHandoutsView = Backbone.View.extend({
         this.model.save({}, {error: CMS.ServerError});
         this.$form.hide();
         this.closeEditor(this);
+
+        analytics.track('Saved Course Handouts', {
+            'course': course_location_analytics
+        });
+
     },
 
     onCancel: function(event) {

cms/static/js/views/settings/advanced_view.js

@@ -32,7 +32,7 @@ CMS.Views.Settings.Advanced = CMS.Views.ValidatingView.extend({
 
         var listEle$ = this.$el.find('.course-advanced-policy-list');
         listEle$.empty();
-        
+
         // b/c we've deleted all old fields, clear the map and repopulate
         this.fieldToSelectorMap = {};
         this.selectorToField = {};
@@ -101,13 +101,13 @@ CMS.Views.Settings.Advanced = CMS.Views.ValidatingView.extend({
         });
     },
     showMessage: function (type) {
-        this.$el.find(".message-status").removeClass("is-shown");
+        $(".wrapper-alert").removeClass("is-shown");
         if (type) {
             if (type === this.error_saving) {
-                this.$el.find(".message-status.error").addClass("is-shown");
+                $(".wrapper-alert-error").addClass("is-shown").attr('aria-hidden','false');
             }
             else if (type === this.successful_changes) {
-                this.$el.find(".message-status.confirm").addClass("is-shown");
+                $(".wrapper-alert-confirmation").addClass("is-shown").attr('aria-hidden','false');
                 this.hideSaveCancelButtons();
             }
         }
@@ -117,17 +117,20 @@ CMS.Views.Settings.Advanced = CMS.Views.ValidatingView.extend({
         }
     },
     showSaveCancelButtons: function(event) {
-        if (!this.buttonsVisible) {
+        if (!this.notificationBarShowing) {
             this.$el.find(".message-status").removeClass("is-shown");
-            $('.wrapper-notification').addClass('is-shown');
-            this.buttonsVisible = true;
+            $('.wrapper-notification').removeClass('is-hiding').addClass('is-shown').attr('aria-hidden','false');
+            this.notificationBarShowing = true;
         }
     },
     hideSaveCancelButtons: function() {
-        $('.wrapper-notification').removeClass('is-shown');
-        this.buttonsVisible = false;
+        if (this.notificationBarShowing) {
+            $('.wrapper-notification').removeClass('is-shown').addClass('is-hiding').attr('aria-hidden','true');
+            this.notificationBarShowing = false;
+        }
     },
     saveView : function(event) {
+        smoothScrollTop(event);
         // TODO one last verification scan:
         //    call validateKey on each to ensure proper format
         //    check for dupes
@@ -137,11 +140,16 @@ CMS.Views.Settings.Advanced = CMS.Views.ValidatingView.extend({
             success : function() {
                 self.render();
                 self.showMessage(self.successful_changes);
+                analytics.track('Saved Advanced Settings', {
+                    'course': course_location_analytics
+                });
+
             },
             error : CMS.ServerError
         });
     },
     revertView : function(event) {
+        event.preventDefault();
         var self = event.data;
         self.model.deleteKeys = [];
         self.model.clear({silent : true});
@@ -154,7 +162,7 @@ CMS.Views.Settings.Advanced = CMS.Views.ValidatingView.extend({
         var newKeyId = _.uniqueId('policy_key_'),
         newEle = this.template({ key : key, value : JSON.stringify(value, null, 4),
             keyUniqueId: newKeyId, valueUniqueId: _.uniqueId('policy_value_')});
-        
+
         this.fieldToSelectorMap[key] = newKeyId;
         this.selectorToField[newKeyId] = key;
         return newEle;
@@ -165,4 +173,4 @@ CMS.Views.Settings.Advanced = CMS.Views.ValidatingView.extend({
     blurInput : function(event) {
         $(event.target).prev().removeClass("is-focused");
     }
-});
+});

cms/static/js/views/settings/main_settings_view.js

@@ -110,7 +110,7 @@ CMS.Views.Settings.Details = CMS.Views.ValidatingView.extend({
         };
 
         // instrument as date and time pickers
-        timefield.timepicker();
+        timefield.timepicker({'timeFormat' : 'H:i'});
         datefield.datepicker();
 
         // Using the change event causes savefield to be triggered twice, but it is necessary

cms/static/sass/_base.scss

@@ -22,10 +22,10 @@ body, input {
 a {
   text-decoration: none;
   color: $blue;
-  @include transition(color .15s);
+  @include transition(color 0.25s ease-in-out);
 
   &:hover {
-    color: #cb9c40;
+    color: $orange-d1;
   }
 }
 
@@ -50,12 +50,72 @@ h1 {
 
 // ====================
 
+// typography - basic
+.title-1, .title-2, .title-3, .title-4, .title-5, .title-6 {
+  font-weight: 600;
+  color: $gray-d3;
+  margin: 0;
+  padding: 0;
+}
+
+.title-1 {
+  @include font-size(32);
+  margin-bottom: ($baseline*1.5);
+}
+
+.title-2 {
+  @include font-size(24);
+  margin-bottom: $baseline;
+}
+
+.title-3 {
+  @include font-size(18);
+  margin-bottom: ($baseline/2);
+}
+
+.title-4 {
+  @include font-size(14);
+  margin-bottom: $baseline;
+  font-weight: 500
+}
+
+.title-5 {
+  @include font-size(14);
+  color: $gray-l1;
+  margin-bottom: $baseline;
+  font-weight: 500
+}
+
+.title-6 {
+  @include font-size(14);
+  color: $gray-l2;
+  margin-bottom: $baseline;
+  font-weight: 500
+}
+
+p, ul, ol, dl {
+  margin-bottom: ($baseline/2);
+
+  &:last-child {
+    margin-bottom: 0;
+  }
+}
+
+// ====================
+
+// layout - basic
+.wrapper-view {
+
+}
+
+// ====================
+
 // layout - basic page header
 .wrapper-mast {
-  margin: 0;
+  margin: ($baseline*1.5) 0 0 0;
   padding: 0 $baseline;
   position: relative;
-  
+
   .mast, .metadata {
     @include clearfix();
     @include font-size(16);
@@ -272,33 +332,46 @@ h1 {
   }
 
   .title-1 {
-
+    @extend .t-title-1;
   }
 
   .title-2 {
-    @include font-size(24);
+    @extend .t-title-2;
     margin: 0 0 ($baseline/2) 0;
-    font-weight: 600;
   }
 
   .title-3 {
-    @include font-size(16);
+    @extend .t-title-3;
     margin: 0 0 ($baseline/2) 0;
-    font-weight: 600;
   }
 
-  .title-4 {
+  header {
+    @include clearfix();
 
-  }
-
-  .title-5 {
+    .title-2 {
+      width: flex-grid(5, 12);
+      margin: 0 flex-gutter() 0 0;
+      float: left;
+    }
 
+    .tip {
+      @include font-size(13);
+      width: flex-grid(7, 12);
+      float: right;
+      margin-top: ($baseline/2);
+      text-align: right;
+      color: $gray-l2;
+    }
   }
 }
 
 // layout - supplemental content
 .content-supplementary {
 
+  > section {
+    margin: 0 0 $baseline 0;
+  }
+
   .bit {
     @include font-size(13);
     margin: 0 0 $baseline 0;
@@ -351,7 +424,7 @@ h1 {
 // layout - grandfathered
 .main-wrapper {
   position: relative;
-  margin: 40px;
+  margin: 0 ($baseline*2);
 }
 
 .inner-wrapper {
@@ -644,7 +717,7 @@ hr.divide {
   position: absolute;
   top: 0;
   left: 0;
-  z-index: 99999;
+  z-index: 10000;
   padding: 0 10px;
   border-radius: 3px;
   background: rgba(0, 0, 0, 0.85);
@@ -764,10 +837,10 @@ body.js {
 
 // ====================
 
-// works in progress
+// works in progress & testing
 body.hide-wip {
 
   .wip-box {
     display: none;
   }
-}
+}

cms/static/sass/_cms_mixins.scss

@@ -1,6 +1,7 @@
 // studio - utilities - mixins and extends
 // ====================
 
+// mixins - utility
 @mixin clearfix {
 	&:after {
 		content: '';
@@ -11,19 +12,20 @@
 	}
 }
 
+// mixins - grandfathered
 @mixin button {
 	display: inline-block;
-	padding: 4px 20px 6px;
-	font-size: 14px;
+	padding: ($baseline/5) $baseline ($baseline/4);
+	@include font-size(14);
 	font-weight: 700;
 	@include box-shadow(0 1px 0 rgba(255, 255, 255, .3) inset, 0 0 0 rgba(0, 0, 0, 0));
 	@include transition(background-color .15s, box-shadow .15s);
 
 	&.disabled {
-		border: 1px solid $lightGrey !important;
+		border: 1px solid $gray-l1 !important;
 		border-radius: 3px !important;
-		background: $lightGrey !important;
-		color: $darkGrey !important;
+		background: $gray-l1 !important;
+		color: $gray-d1 !important;
 		pointer-events: none;
 		cursor: none;
 		&:hover {
@@ -36,32 +38,111 @@
 	}
 }
 
-@mixin blue-button {
+@mixin green-button {
 	@include button;
-	border: 1px solid #437fbf;
+	border: 1px solid $green-d1;
 	border-radius: 3px;
 	@include linear-gradient(top, rgba(255, 255, 255, .3), rgba(255, 255, 255, 0));
-	background-color: $blue;
-	color: #fff;
+	background-color: $green;
+	@include box-shadow(0 1px 0 rgba(255, 255, 255, .3) inset);
+	color: $white;
 
-	&:hover, &.active {
-		background-color: #62aaf5;
-		color: #fff;
+	&:hover {
+		background-color: $green-s1;
+		color: $white;
+	}
+
+	&.disabled {
+		border: 1px solid $green-l3 !important;
+		background: $green-l3 !important;
+		color: $white !important;
+		@include box-shadow(none);
 	}
 }
 
-@mixin green-button {
-  @include button;
-  border: 1px solid #0d7011;
-  border-radius: 3px;
-  @include linear-gradient(top, rgba(255, 255, 255, .3), rgba(255, 255, 255, 0));
-  background-color: $green;
-  color: #fff;
+@mixin blue-button {
+	@include button;
+	border: 1px solid $blue-d1;
+	border-radius: 3px;
+	@include linear-gradient(top, rgba(255, 255, 255, .3), rgba(255, 255, 255, 0));
+	background-color: $blue;
+	color: $white;
 
-  &:hover {
-  background-color: #129416;
-  color: #fff;
-  }
+	&:hover, &.active {
+		background-color: $blue-s2;
+		color: $white;
+	}
+
+	&.disabled {
+		border: 1px solid $blue-l3 !important;
+		background: $blue-l3 !important;
+		color: $white !important;
+		@include box-shadow(none);
+	}
+}
+
+@mixin red-button {
+	@include button;
+	border: 1px solid $red-d1;
+	border-radius: 3px;
+	@include linear-gradient(top, rgba(255, 255, 255, .3), rgba(255, 255, 255, 0));
+	background-color: $red;
+	color: $white;
+
+	&:hover, &.active {
+		background-color: $red-s1;
+		color: $white;
+	}
+
+	&.disabled {
+		border: 1px solid $red-l3 !important;
+		background: $red-l3 !important;
+		color: $white !important;
+		@include box-shadow(none);
+	}
+}
+
+@mixin pink-button {
+	@include button;
+	border: 1px solid $pink-d1;
+	border-radius: 3px;
+	@include linear-gradient(top, rgba(255, 255, 255, .3), rgba(255, 255, 255, 0));
+	background-color: $pink;
+	color: $white;
+
+	&:hover, &.active {
+		background-color: $pink-s1;
+		color: $white;
+	}
+
+	&.disabled {
+		border: 1px solid $pink-l3 !important;
+		background: $pink-l3 !important;
+		color: $white !important;
+		@include box-shadow(none);
+	}
+}
+
+@mixin orange-button {
+	@include button;
+	border: 1px solid $orange-d1;
+	border-radius: 3px;
+	@include linear-gradient(top, rgba(255, 255, 255, 0.4), rgba(255, 255, 255, 0) 60%);
+	background-color: $orange;
+	@include box-shadow(0 1px 0 rgba(255, 255, 255, .3) inset);
+	color: $gray-d2;
+
+	&:hover {
+		background-color: $orange-s2;
+		color: $gray-d2;
+	}
+
+	&.disabled {
+		border: 1px solid $orange-l3 !important;
+		background: $orange-l2 !important;
+		color: $gray-l1 !important;
+		@include box-shadow(none);
+	}
 }
 
 @mixin white-button {
@@ -80,24 +161,9 @@
   }
 }
 
-@mixin orange-button {
-	@include button;
-	border: 1px solid #bda046;
-	border-radius: 3px;
-	@include linear-gradient(top, rgba(255, 255, 255, 0.4), rgba(255, 255, 255, 0) 60%);
-	background-color: #edbd3c;
-	@include box-shadow(0 1px 0 rgba(255, 255, 255, .3) inset);
-	color: #3c3c3c;
-
-	&:hover {
-		background-color: #ffcd46;
-		color: #3c3c3c;
-	}
-}
-
 @mixin grey-button {
 	@include button;
-	border: 1px solid $darkGrey;
+	border: 1px solid $gray-d2;
 	border-radius: 3px;
 	@include linear-gradient(top, rgba(255, 255, 255, .3), rgba(255, 255, 255, 0));
 	background-color: #d1dae3;
@@ -110,39 +176,32 @@
 	}
 }
 
-@mixin green-button {
+@mixin gray-button {
 	@include button;
-	border: 1px solid $darkGreen;
+	border: 1px solid $gray-d1;
 	border-radius: 3px;
-	@include linear-gradient(top, rgba(255, 255, 255, .3), rgba(255, 255, 255, 0));
-	background-color: $green;
-	@include box-shadow(0 1px 0 rgba(255, 255, 255, .3) inset);
-	color: #fff;
+	@include linear-gradient(top, $white-t1, rgba(255, 255, 255, 0));
+	background-color: $gray-d2;
+	@include box-shadow(0 1px 0 $white-t1 inset);
+	color: $gray-l3;
 
 	&:hover {
-		background-color: $brightGreen;
-		color: #fff;
-	}
-
-	&.disabled {
-		border: 1px solid $disabledGreen !important;
-		background: $disabledGreen !important;
-		color: #fff !important;
-		@include box-shadow(none);
+		background-color: $gray-d3;
+		color: $white;
 	}
 }
 
 @mixin dark-grey-button {
 	@include button;
-	border: 1px solid #1c1e20;
+	border: 1px solid $gray-d2;
 	border-radius: 3px;
-	background: -webkit-linear-gradient(top, rgba(255, 255, 255, .2), rgba(255, 255, 255, 0)) $extraDarkGrey;
+	background: -webkit-linear-gradient(top, rgba(255, 255, 255, .2), rgba(255, 255, 255, 0)) $gray-d1;
 	box-shadow: 0 1px 0 rgba(255, 255, 255, .2) inset;
-	color: #fff;
+	color: $white;
 
 	&:hover {
-		background-color: #595f64;
-		color: #fff;
+		background-color: $gray-d4;
+		color: $white;
 	}
 }
 
@@ -163,7 +222,7 @@
 	}
 
 	textarea {
-		min-height: 80px;		
+		min-height: 80px;
 	}
 
 	h5 {
@@ -208,7 +267,7 @@
 	.section-item {
 		position: relative;
 		display: block;
-		padding: 6px 8px 8px 16px;			
+		padding: 6px 8px 8px 16px;
 		background: #edf1f5;
 		font-size: 13px;
 
@@ -279,20 +338,100 @@
 	}
 }
 
-@mixin sr-text {
-  border: 0; 
-  clip: rect(0 0 0 0); 
-  height: 1px; 
-  margin: -1px; 
-  overflow: hidden; 
-  padding: 0; 
-  position: absolute; 
-  width: 1px;
-}
+// ====================
 
+// sunsetted mixins
 @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);
-}
+}
+
+// ====================
+
+// extends - buttons
+.btn {
+  @include box-sizing(border-box);
+  @include transition(color 0.25s ease-in-out, border-color 0.25s ease-in-out, background 0.25s ease-in-out, box-shadow 0.25s ease-in-out);
+  display: inline-block;
+  cursor: pointer;
+
+  &:hover, &:active {
+
+  }
+
+  &.disabled, &[disabled] {
+    cursor: default;
+    pointer-events: none;
+    opacity: 0.5;
+  }
+
+  .icon-inline {
+    display: inline-block;
+    vertical-align: middle;
+    margin-right: ($baseline/4);
+  }
+}
+
+// pill button
+.btn-pill {
+	@include border-radius($baseline/5);
+}
+
+.btn-rounded {
+	@include border-radius($baseline/2);
+}
+
+// primary button
+.btn-primary {
+  @extend .btn;
+  @extend .btn-pill;
+  padding:($baseline/2) $baseline;
+  border-width: 1px;
+  border-style: solid;
+  line-height: 1.5em;
+  text-align: center;
+
+  &:hover, &:active {
+    @include box-shadow(0 2px 1px $shadow-l1);
+  }
+
+  &.current, &.active {
+  	@include box-shadow(inset 1px 1px 2px $shadow-d1);
+
+  	&:hover, &:active {
+  		@include box-shadow(inset 1px 1px 1px $shadow-d1);
+  	}
+  }
+}
+
+// secondary button
+.btn-secondary {
+	@extend .btn;
+	@extend .btn-pill;
+	border-width: 1px;
+  border-style: solid;
+	padding:($baseline/2) $baseline;
+  background: transparent;
+  line-height: 1.5em;
+  text-align: center;
+
+	&:hover, &:active {
+
+	}
+
+	&.current, &.active {
+
+	}
+}
+
+// ====================
+
+// extends - depth levels
+.depth0 { z-index: 0; }
+.depth1 { z-index: 10; }
+.depth2 { z-index: 100; }
+.depth3 { z-index: 1000; }
+.depth4 { z-index: 10000; }
+.depth5 { z-index: 100000; }

cms/static/sass/_reset.scss

@@ -1,6 +1,7 @@
 // studio - utilities - reset
 // ====================
 
+// not ready for this yet, but this should be done as things get cleaner
 // * {
 // 	@include box-sizing(border-box);
 // }
@@ -26,6 +27,10 @@ time, mark, audio, video {
 	vertical-align: baseline;
 }
 
+html,body {
+  height: 100%;
+}
+
 article, aside, details, figcaption, figure, 
 footer, header, hgroup, menu, nav, section {
 	display: block;
@@ -57,6 +62,12 @@ table {
 	border-spacing: 0;
 }
 
+abbr[title] {
+	border-bottom: none;
+	text-decoration: none;
+	cursor: help;
+}
+
 // ====================
 
 // grandfathered styles

cms/static/sass/_variables.scss

@@ -22,6 +22,7 @@ $black-t0: rgba(0,0,0,0.125);
 $black-t1: rgba(0,0,0,0.25);
 $black-t2: rgba(0,0,0,0.50);
 $black-t3: rgba(0,0,0,0.75);
+
 $white: rgb(255,255,255);
 $white-t0: rgba(255,255,255,0.125);
 $white-t1: rgba(255,255,255,0.25);
@@ -56,6 +57,10 @@ $blue-s3: saturate($blue,45%);
 $blue-u1: desaturate($blue,15%);
 $blue-u2: desaturate($blue,30%);
 $blue-u3: desaturate($blue,45%);
+$blue-t0: rgba(85, 151, 221,0.125);
+$blue-t1: rgba(85, 151, 221,0.25);
+$blue-t2: rgba(85, 151, 221,0.50);
+$blue-t3: rgba(85, 151, 221,0.75);
 
 $pink: rgb(183, 37, 103);
 $pink-l1: tint($pink,20%);
@@ -108,7 +113,7 @@ $green-u1: desaturate($green,15%);
 $green-u2: desaturate($green,30%);
 $green-u3: desaturate($green,45%);
 
-$yellow: rgb(231, 214, 143);
+$yellow: rgb(237, 189, 60);
 $yellow-l1: tint($yellow,20%);
 $yellow-l2: tint($yellow,40%);
 $yellow-l3: tint($yellow,60%);
@@ -144,10 +149,15 @@ $orange-u3: desaturate($orange,45%);
 
 $shadow: rgba(0,0,0,0.2);
 $shadow-l1: rgba(0,0,0,0.1);
+$shadow-l2: rgba(0,0,0,0.05);
 $shadow-d1: rgba(0,0,0,0.4);
 
+
+// specific UI
+$notification-height: ($baseline*10);
+
 // colors - inherited 
-$baseFontColor: #3c3c3c;
+$baseFontColor: $gray-d2;
 $offBlack: #3c3c3c;
 $green: #108614;
 $lightGrey: #edf1f5;

cms/static/sass/assets/_keyframes.scss

@@ -1,7 +1,133 @@
-@mixin bounce-in {
+// studio animations & keyframes
+// ====================
+
+// rotate clockwise
+@mixin rotateClockwise {
+  0% {
+    @include transform(rotate(0deg));
+  }
+
+  100% {
+    @include transform(rotate(360deg));
+  }
+}
+
+@-moz-keyframes rotateClockwise { @include rotateClockwise(); }
+@-webkit-keyframes rotateClockwise { @include rotateClockwise(); }
+@-o-keyframes rotateClockwise { @include rotateClockwise(); }
+@keyframes rotateClockwise { @include rotateClockwise();}
+
+@mixin anim-rotateClockwise($duration, $timing: ease-in-out, $count: 1, $delay: 0) {
+  @include animation-name(rotateClockwise);
+  @include animation-duration($duration);
+  @include animation-delay($delay);
+  @include animation-timing-function($timing);
+  @include animation-iteration-count($count);
+  @include animation-fill-mode(both);
+
+}
+
+// ====================
+
+// notifications slide up
+@mixin notificationsSlideUp {
+  0% {
+    @include transform(translateY(0));
+  }
+
+  90% {
+    @include transform(translateY(-($notification-height)));
+  }
+
+  100% {
+    @include transform(translateY(-($notification-height*0.99)));
+  }
+}
+
+@-moz-keyframes notificationsSlideUp { @include notificationsSlideUp(); }
+@-webkit-keyframes notificationsSlideUp { @include notificationsSlideUp(); }
+@-o-keyframes notificationsSlideUp { @include notificationsSlideUp(); }
+@keyframes notificationsSlideUp { @include notificationsSlideUp();}
+
+@mixin anim-notificationsSlideUp($duration, $timing: ease-in-out, $count: 1, $delay: 0) {
+  @include animation-name(notificationsSlideUp);
+  @include animation-duration($duration);
+  @include animation-delay($delay);
+  @include animation-timing-function($timing);
+  @include animation-iteration-count($count);
+  @include animation-fill-mode(both);
+
+}
+
+// ====================
+
+// notifications slide down
+@mixin notificationsSlideDown {
+  0% {
+    @include transform(translateY(-($notification-height*0.99)));
+  }
+
+  10% {
+    @include transform(translateY(-($notification-height)));
+  }
+
+  100% {
+    @include transform(translateY(0));
+  }
+}
+
+@-moz-keyframes notificationsSlideDown { @include notificationsSlideDown(); }
+@-webkit-keyframes notificationsSlideDown { @include notificationsSlideDown(); }
+@-o-keyframes notificationsSlideDown { @include notificationsSlideDown(); }
+@keyframes notificationsSlideDown { @include notificationsSlideDown();}
+
+@mixin anim-notificationsSlideDown($duration, $timing: ease-in-out, $count: 1, $delay: 0) {
+  @include animation-name(notificationsSlideDown);
+  @include animation-duration($duration);
+  @include animation-delay($delay);
+  @include animation-timing-function($timing);
+  @include animation-iteration-count($count);
+  @include animation-fill-mode(both);
+}
+
+// ====================
+
+// notifications slide up then down
+@mixin notificationsSlideUpDown {
+  0%, 100% { 
+    @include transform(translateY(0));
+  }
+
+  15%, 85% {
+    @include transform(translateY(-($notification-height)));
+  }
+
+  20%, 80% {
+    @include transform(translateY(-($notification-height*0.99)));
+  }
+}
+
+@-moz-keyframes notificationsSlideUpDown { @include notificationsSlideUpDown(); }
+@-webkit-keyframes notificationsSlideUpDown { @include notificationsSlideUpDown(); }
+@-o-keyframes notificationsSlideUpDown { @include notificationsSlideUpDown(); }
+@keyframes notificationsSlideUpDown { @include notificationsSlideUpDown();}
+
+@mixin anim-notificationsSlideUpDown($duration, $timing: ease-in-out, $count: 1, $delay: 0) {
+  @include animation-name(notificationsSlideUpDown);
+  @include animation-duration($duration);
+  @include animation-delay($delay);
+  @include animation-timing-function($timing);
+  @include animation-iteration-count($count);
+  @include animation-fill-mode(both);
+}
+
+// ====================
+
+// bounce in
+@mixin bounceIn {
   0% {
     opacity: 0;
-    @include transform(scale(.3));
+    @include transform(scale(0.3));
   }
 
   50% {
@@ -14,14 +140,63 @@
   }
 }
 
-@-moz-keyframes bounce-in { @include bounce-in(); }
-@-webkit-keyframes bounce-in { @include bounce-in(); }
-@-o-keyframes bounce-in { @include bounce-in(); }
-@keyframes bounce-in { @include bounce-in();}
+@-moz-keyframes bounceIn { @include bounceIn(); }
+@-webkit-keyframes bounceIn { @include bounceIn(); }
+@-o-keyframes bounceIn { @include bounceIn(); }
+@keyframes bounceIn { @include bounceIn();}
 
-@mixin bounce-in-animation($duration, $timing: ease-in-out) {
-  @include animation-name(bounce-in);
+@mixin anim-bounceIn($duration, $timing: ease-in-out, $count: 1, $delay: 0) {
+  @include animation-name(bounceIn);
   @include animation-duration($duration);
+  @include animation-delay($delay);
   @include animation-timing-function($timing);
+  @include animation-iteration-count($count);
   @include animation-fill-mode(both);
 }
+
+// ====================
+
+// bounce in
+@mixin bounceOut {
+  0% {
+    opacity: 0;
+    @include transform(scale(0.3));
+  }
+
+  50% {
+    opacity: 1;
+    @include transform(scale(1.05));
+  }
+
+  100% {
+    @include transform(scale(1));
+  }
+
+  0% {
+    @include transform(scale(1));
+  }
+
+  50% {
+    opacity: 1;
+    @include transform(scale(1.05));
+  }
+
+  100% {
+    opacity: 0;
+    @include transform(scale(0.3));
+  }
+}
+
+@-moz-keyframes bounceOut { @include bounceOut(); }
+@-webkit-keyframes bounceOut { @include bounceOut(); }
+@-o-keyframes bounceOut { @include bounceOut(); }
+@keyframes bounceOut { @include bounceOut();}
+
+@mixin anim-bounceOut($duration, $timing: ease-in-out, $count: 1, $delay: 0) {
+  @include animation-name(bounceOut);
+  @include animation-duration($duration);
+  @include animation-delay($delay);
+  @include animation-timing-function($timing);
+  @include animation-iteration-count($count);
+  @include animation-fill-mode(both);
+}

cms/static/sass/base-style.scss

@@ -4,6 +4,7 @@
 // bourbon libs and resets
 @import 'bourbon/bourbon';
 @import 'bourbon/addons/button';
+@import "variables";
 @import 'vendor/normalize';
 @import 'reset';
 
@@ -21,13 +22,18 @@
 @import 'base';
 
 // elements
+@import 'elements/typography';
+@import 'elements/icons';
+@import 'elements/controls';
+@import 'elements/navigation';
 @import 'elements/header';
 @import 'elements/footer';
-@import 'elements/navigation';
+@import 'elements/sock';
 @import 'elements/forms';
 @import 'elements/modal';
 @import 'elements/alerts';
-@import 'elements/jquery-ui-calendar';
+@import 'elements/vendor';
+@import 'elements/tender-widget';
 
 // specific views
 @import 'views/account';

cms/static/sass/elements/_alerts.scss

@@ -1,135 +1,761 @@
-// studio - elements - alerts, notifications, prompts
+// studio alerts, prompts and notifications
+// ====================
+
+// shared
+.wrapper-notification, .wrapper-alert, .prompt {
+  @include box-sizing(border-box);
+
+  .copy {
+    @include font-size(13);
+  }
+}
+
+.wrapper-notification, .wrapper-alert, .prompt {
+  background: $gray-d3;
+
+  .copy {
+    color: $gray-l2;
+
+    .title {
+      color: $white;
+    }
+
+    .nav-actions {
+
+      .action-primary {
+        color: $gray-d4;
+      }
+    }
+  }
+}
+
+.alert, .notification, .prompt {
+
+  // types - confirm
+  &.confirm {
+
+    .nav-actions .action-primary {
+      @include blue-button();
+      border-color: $blue-d2;
+    }
+
+    a {
+      color: $blue;
+
+      &:hover {
+        color: $blue-s2;
+      }
+    }
+  }
+
+  // types - warning
+  &.warning {
+
+    .nav-actions .action-primary {
+      @include orange-button();
+      border-color: $orange-d2;
+      color: $gray-d4;
+    }
+
+    a {
+      color: $orange;
+
+      &:hover {
+        color: $orange-s2;
+      }
+    }
+  }
+
+  // types - error
+  &.error {
+
+    .nav-actions .action-primary {
+      @include red-button();
+      border-color: $red-d2;
+    }
+
+    a {
+      color: $red-l1;
+
+      &:hover {
+        color: $red;
+      }
+    }
+  }
+
+  // types - announcement
+  &.announcement {
+
+    .nav-actions .action-primary {
+      @include blue-button();
+      border-color: $blue-d2;
+    }
+
+    a {
+      color: $blue;
+
+      &:hover {
+        color: $blue-s2;
+      }
+    }
+  }
+
+  // types - confirmation
+  &.confirmation {
+
+    .nav-actions .action-primary {
+      @include green-button();
+      border-color: $green-d2;
+    }
+
+    a {
+      color: $green;
+
+      &:hover {
+        color: $green-s2;
+      }
+    }
+  }
+
+  // types - step required
+  &.step-required {
+
+    .nav-actions .action-primary {
+      border-color: $pink-d2;
+      @include pink-button();
+    }
+
+    a {
+      color: $pink;
+
+      &:hover {
+        color: $pink-s1;
+      }
+    }
+  }
+}
+
+// prompts
+.wrapper-prompt {
+  @include transition(all 0.05s ease-in-out);
+  position: fixed;
+  top: 0;
+  background: $black-t0;
+  width: 100%;
+  height: 100%;
+  text-align: center;
+  z-index: 10000;
+
+  &:before {
+    content: '';
+    display: inline-block;
+    height: 100%;
+    vertical-align: middle;
+    margin-right: -0.25em; /* Adjusts for spacing */
+  }
+
+  .prompt {
+    @include border-radius(($baseline/5));
+    @include box-shadow(0 0 3px $shadow-d1);
+    display: inline-block;
+    vertical-align: middle;
+    width: $baseline*17.5;
+    border: 4px solid $black;
+    text-align: left;
+
+    .copy {
+      border-top: 4px solid $blue;
+      padding: $baseline;
+    }
+
+    .nav-actions {
+      @include box-shadow(inset 0 1px 2px $shadow-d1);
+      border-top: 1px solid $black-t1;
+      padding: ($baseline*0.75) $baseline;
+      background: $gray-d4;
+
+      .nav-item {
+        display: inline-block;
+        margin-right: ($baseline*0.75);
+
+        &:last-child {
+          margin-right: 0;
+        }
+      }
+
+      .action-primary {
+        @include font-size(13);
+        font-weight: 600;
+      }
+
+      .action-secondary {
+        @include font-size(13);
+      }
+    }
+  }
+
+  // types of prompts - error
+  .prompt.error {
+
+    .icon-error {
+      color: $red-l1;
+    }
+
+    .copy {
+      border-top-color: $red-l1;
+    }
+  }
+
+  // types of prompts - confirmation
+  .prompt.confirmation {
+
+    .icon-error {
+      color: $green;
+    }
+
+    .copy {
+      border-top-color: $green;
+    }
+  }
+
+  // types of prompts - error
+  .prompt.warning {
+
+    .icon-warning {
+      color: $orange;
+    }
+
+    .copy {
+      border-top-color: $orange;
+    }
+  }
+}
+
 // ====================
 
 // 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;
+  @include clearfix();
+  @include box-shadow(0 -1px 3px $shadow, inset 0 3px 1px $blue);
+  position: fixed;
+  bottom: 0;
+  z-index: 1000;
+  width: 100%;
+  padding: $baseline ($baseline*2);
 
-	&.is-shown {
-		bottom: 0;
-		opacity: 1.0;
-	}
+  &.wrapper-notification-warning {
+    @include box-shadow(0 -1px 3px $shadow, inset 0 3px 1px $orange);
 
-	&.wrapper-notification-warning {
-		border-color: shade($yellow, 25%);
-		background: tint($yellow, 25%);
-	}
+    .icon-warning {
+      color: $orange;
+    }
+  }
 
-	&.wrapper-notification-error {
-		border-color: shade($red, 50%);
-		background: tint($red, 20%);
-		color: $white;
-	}
+  &.wrapper-notification-error {
+    @include box-shadow(0 -1px 3px $shadow, inset 0 3px 1px $red-l1);
 
-	&.wrapper-notification-confirm {
-		border-color: shade($green, 30%);
-		background: tint($green, 40%);
-		color: shade($green, 30%);
-	}
+    .icon-error {
+      color: $red-l1;
+    }
+  }
+
+  &.wrapper-notification-confirmation {
+    @include box-shadow(0 -1px 3px $shadow, inset 0 3px 1px $green);
+
+    .icon-confirmation {
+      color: $green;
+    }
+  }
+
+  &.wrapper-notification-saving {
+    @include box-shadow(0 -1px 3px $shadow, inset 0 3px 1px $pink);
+  }
+
+  // shorter/status notifications
+  &.wrapper-notification-status {
+    @include border-top-radius(3px);
+    width: ($baseline*8);
+    right: ($baseline);
+    border: 4px solid $black;
+    border-bottom: none;
+    padding: ($baseline/2) $baseline;
+
+    .notification {
+      @include box-sizing(border-box);
+      @include clearfix();
+      width: 100%;
+      max-width: none;
+      min-width: none;
+
+      .icon, .copy {
+        float: none;
+        display: inline-block;
+        vertical-align: middle;
+      }
+
+      .icon {
+        width: $baseline;
+        height: ($baseline*1.25);
+        margin-right: ($baseline*0.75);
+        line-height: 3rem;
+      }
+
+      .copy {
+
+      }
+    }
+  }
+
+  // help notifications
+  &.wrapper-notification-help {
+    @include border-top-radius(3px);
+    width: ($baseline*14);
+    right: ($baseline);
+    border: 4px solid $black;
+    border-bottom: none;
+    padding: $baseline;
+
+    .notification {
+      @include box-sizing(border-box);
+      @include clearfix();
+      width: 100%;
+      max-width: none;
+      min-width: none;
+
+      .icon-help {
+        width: $baseline;
+        margin-right: ($baseline*0.75);
+      }
+
+      .action-notification-close {
+        right: 0;
+      }
+
+      .copy {
+        width: ($baseline*10);
+      }
+    }
+  }
 }
 
 .notification {
-	@include box-sizing(border-box);
-	margin: 0 auto;
-	width: flex-grid(12);
-	max-width: $fg-max-width;
-	min-width: $fg-min-width;
+  @include box-sizing(border-box);
+  @include clearfix();
+  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;
+  strong {
+    font-weight: 700;
+  }
 
-		.icon {
-			display: inline-block;
-			vertical-align: top;
-			margin-right: 5px;
-			font-size: 20px;
-		}
+  .icon, .copy {
+    float: left;
+    display: inline-block;
+    vertical-align: middle;
+  }
 
-		p {
-			width: flex-grid(8, 9);
-			display: inline-block;
-			vertical-align: top;
-		}
-	}
+  .icon {
+    @include transition (color 0.5s ease-in-out);
+    @include font-size(22);
+    width: flex-grid(1, 12);
+    height: ($baseline*1.25);
+    margin-right: flex-gutter();
+    text-align: right;
+    color: $white;
+  }
 
-	.actions {
-		float: right;
-		width: flex-grid(3, 12);
-		margin-top: ($baseline/2);
-		text-align: right;
+  .copy {
+    @include font-size(13);
+    width: flex-grid(10, 12);
+    color: $gray-l2;
 
-		li {
-			display: inline-block;
-			vertical-align: middle;
-			margin-right: 10px;
+    .title {
+      @include font-size(14);
+      margin-bottom: 0;
+      color: $white;
+    }
+  }
 
-			&:last-child {
-				margin-right: 0;
-			}
-		}
+  // with actions
+  &.has-actions {
 
-		.save-button {
-			@include blue-button;
-		}
+    .icon {
+      width: flex-grid(1, 12);
+    }
 
-		.cancel-button {
-		  @include white-button;
-		}
-	}
+    .copy {
+      width: flex-grid(7, 12);
+      margin-right: flex-gutter();
+    }
 
-	strong {
-		font-weight: 700;
-	}
+    .nav-actions {
+      width: flex-grid(4, 12);
+      float: right;
+      margin-top: ($baseline/4);
+      text-align: right;
+
+      .nav-item {
+        display: inline-block;
+        vertical-align: middle;
+        margin-right: ($baseline/2);
+
+        &:last-child {
+          margin-right: 0;
+        }
+      }
+    }
+
+    .action-primary {
+      @include blue-button();
+      @include font-size(13);
+      border-color: $blue-d2;
+      font-weight: 600;
+    }
+
+    .action-secondary {
+      @include font-size(13);
+    }
+  }
+
+  &.confirmation {
+
+    .copy {
+      margin-top: ($baseline/5);
+    }
+  }
+
+  &.saving {
+
+    .icon-saving {
+      @include anim-rotateClockwise(3s, linear, infinite);
+      width: 22px;
+    }
+
+    .copy p {
+      @include text-sr();
+    }
+  }
+}
+
+// ====================
+
+// alerts
+.wrapper-alert {
+  @include box-sizing(border-box);
+  @include box-shadow(0 1px 1px $white, inset 0 2px 2px $shadow-d1, inset 0 -4px 1px $blue);
+  position: relative;
+  z-index: 100;
+  overflow: hidden;
+  width: 100%;
+  border-top: 1px solid $black;
+  padding: $baseline ($baseline*2) ($baseline*1.5) ($baseline*2);
+  background: $gray-d3;
+
+  // needed since page load is very slow
+  display: none;
+
+  // needed since page load is very slow
+  &.is-shown {
+    display: block;
+  }
+
+  &.wrapper-alert-warning {
+    @include box-shadow(0 1px 1px $white, inset 0 2px 2px $shadow-d1, inset 0 -4px 1px $orange);
+
+    .icon-warning {
+      color: $orange;
+    }
+  }
+
+  &.wrapper-alert-error {
+    @include box-shadow(0 1px 1px $white, inset 0 2px 2px $shadow-d1, inset 0 -4px 1px $red-l1);
+
+    .icon-error {
+      color: $red-l1;
+    }
+  }
+
+  &.wrapper-alert-confirmation {
+    @include box-shadow(0 1px 1px $white, inset 0 2px 2px $shadow-d1, inset 0 -4px 1px $green);
+
+    .icon-confirmation {
+      color: $green;
+    }
+  }
+
+  &.wrapper-alert-announcement {
+    @include box-shadow(0 1px 1px $white, inset 0 2px 2px $shadow-d1, inset 0 -4px 1px $blue);
+
+    .icon-announcement {
+      color: $blue;
+    }
+  }
+
+  &.wrapper-alert-step-required {
+    @include box-shadow(0 1px 1px $white, inset 0 2px 2px $shadow-d1, inset 0 -4px 1px $pink);
+
+    .icon-step-required {
+      color: $pink;
+    }
+  }
 }
 
 // adopted alerts
 .alert {
-	padding: 15px 20px;
-	margin-bottom: 30px;
-	border-radius: 3px;
-	border: 1px solid #edbd3c;
-	border-radius: 3px;
-	background: #fbf6e1;
-	// background: #edbd3c;
-	font-size: 14px;
-	@include clearfix;
+	@include font-size(14);
+  @include box-sizing(border-box);
+  @include clearfix();
+  margin: 0 auto;
+  width: flex-grid(12);
+  max-width: $fg-max-width;
+  min-width: $fg-min-width;
+  color: $white;
 
-	.alert-message {
-		float: left;
-		margin-top: 4px;
-	}
+  strong {
+    font-weight: 700;
+  }
 
-	strong {
-		font-weight: 700;
-	}
+  .icon, .copy {
+    float: left;
+  }
 
-	.alert-action {
-		float: right;
+  .icon {
+    @include transition (color 0.5s ease-in-out);
+    @include font-size(22);
+    width: flex-grid(1, 12);
+    margin: ($baseline/4) flex-gutter() 0 0;
+    text-align: right;
+  }
 
-		&.secondary {
-			@include orange-button;
-		}
-	}
+  .copy {
+    @include font-size(13);
+    width: flex-grid(10, 12);
+    color: $gray-l2;
+
+    .title {
+      margin-bottom: 0;
+      color: $white;
+    }
+  }
+
+  // with actions
+  &.has-actions {
+
+    .icon {
+      width: flex-grid(1, 12);
+    }
+
+  	.copy {
+  		width: flex-grid(7, 12);
+  		margin-right: flex-gutter();
+  	}
+
+  	.nav-actions {
+  	  width: flex-grid(4, 12);
+      float: right;
+      margin-top: ($baseline/2);
+  	  text-align: right;
+
+  	  .nav-item {
+  	    display: inline-block;
+  	    vertical-align: middle;
+  	    margin-right: ($baseline/2);
+
+  	    &:last-child {
+  	      margin-right: 0;
+  	    }
+
+        .action-primary {
+          @include font-size(13);
+          font-weight: 600;
+        }
+
+        .action-secondary {
+          @include font-size(13);
+        }
+  	  }
+  	}
+  }
+
+  // with cancel
+  .action-alert-close {
+    @include border-bottom-radius(($baseline/5));
+    position: absolute;
+    top: -($baseline/10);
+    right: $baseline;
+    padding: ($baseline/4) ($baseline/2) 0 ($baseline/2);
+    background: $gray-d4;
+    text-align: center;
+
+    .label {
+      @include text-sr();
+    }
+
+    .icon {
+      @include font-size(14);
+      color: $white;
+      width: auto;
+      margin: 0;
+      padding: 2px;
+    }
+
+    &:hover {
+      background: $gray-d1;
+    }
+  }
+}
+
+// ====================
+
+// js enabled
+.js {
+
+  // prompt set-up
+  .wrapper-prompt {
+    visibility: hidden;
+    pointer-events: none;
+
+    .prompt {
+      opacity: 0;
+    }
+  }
+
+  // prompt showing/hiding
+  &.prompt-is-shown {
+
+    .wrapper-view {
+      -webkit-filter: blur(2px) grayscale(25%);
+      filter: blur(2px) grayscale(25%);
+    }
+
+    .wrapper-prompt.is-shown {
+      visibility: visible;
+      pointer-events: auto;
+
+      .prompt {
+        @include anim-bounceIn(0.5s);
+        opacity: 1.0;
+      }
+    }
+  }
+
+  // alert showing/hiding
+  .wrapper-alert {
+    display: none;
+
+    &.is-shown {
+      display: block;
+    }
+  }
+
+  // notification showing/hiding
+  .wrapper-notification {
+    bottom: -($notification-height);
+
+    // varying animations
+    &.is-shown {
+      @include anim-notificationsSlideUp(1s);
+    }
+
+    &.is-hiding {
+      @include anim-notificationsSlideDown(0.25s);
+    }
+
+    &.is-fleeting {
+      @include anim-notificationsSlideUpDown(2s);
+    }
+  }
+}
+
+// ====================
+
+// temporary
+body.uxdesign.alerts {
+
+  .content-primary, .content-supplementary {
+    @include box-sizing(border-box);
+    float: left;
+  }
+
+  .content-primary {
+    @extend .window;
+    width: flex-grid(12, 12);
+    margin-right: flex-gutter();
+    padding: $baseline ($baseline*1.5);
+
+    > section {
+      margin-bottom: ($baseline*2);
+
+      &:last-child {
+        margin-bottom: 0;
+      }
+    }
+
+    ul {
+
+      li {
+        @include clearfix();
+        width: flex-grid(12, 12);
+        margin-bottom: ($baseline/4);
+        border-bottom: 1px solid $gray-l4;
+        padding-bottom: ($baseline/4);
+
+        &:last-child {
+          margin-bottom: 0;
+          border-bottom: none;
+          padding-bottom: 0;
+        }
+
+        a {
+          float: left;
+          width: flex-grid(5, 12);
+          margin-right: flex-gutter();
+        }
+      }
+    }
+  }
+}
+
+// ====================
+
+// artifact styles
+.main-wrapper {
+  .alert {
+    padding: 15px 20px;
+    margin-bottom: 30px;
+    border-radius: 3px;
+    border: 1px solid #edbd3c;
+    border-radius: 3px;
+    background: #fbf6e1;
+    // background: #edbd3c;
+    font-size: 14px;
+    @include clearfix;
+
+    .alert-message {
+      float: left;
+      margin: 4px 0 0 0;
+      color: $gray-d3;
+    }
+
+    strong {
+      font-weight: 700;
+    }
+
+    .alert-action {
+      float: right;
+
+      &.secondary {
+        @include orange-button;
+      }
+    }
+  }
 }
 
 body.error {
-	background: $darkGrey;
-	color: #3c3c3c;
+	background: $gray-d4;
+	color: $gray-d3;
 
 	.primary-header {
 		display: none;
@@ -140,7 +766,7 @@ body.error {
 		margin: 150px auto;
 		padding: 60px 50px 90px;
 		border-radius: 3px;
-		background: #fff;
+		background: $white;
 		text-align: center;
 	}
 
@@ -148,8 +774,8 @@ body.error {
 		float: none;
 		margin: 0;
 		font-size: 60px;
-		font-weight: 300;		
-		color: #3c3c3c;
+		font-weight: 300;
+		color: $gray-d3;
 	}
 
 	.description {
@@ -162,4 +788,4 @@ body.error {
 		padding: 14px 40px 18px;
 		font-size: 18px;
 	}
-}
+}

cms/static/sass/elements/_controls.scss

@@ -0,0 +1,143 @@
+// studio - elements - UI controls
+// ====================
+
+// gray primary button
+.btn-primary-gray {
+  @extend .btn-primary;
+  background: $gray-l1;
+  border-color: $gray-l2;
+  color: $white;
+
+  &:hover, &:active {
+    border-color: $gray-l1;
+    background: $gray;
+  }
+
+  &.current, &.active {
+    background: $gray-d1;
+    color: $gray-l1;
+
+    &:hover, &:active {
+      background: $gray-d1;
+    }
+  }
+}
+
+// blue primary button
+.btn-primary-blue {
+  @extend .btn-primary;
+  background: $blue;
+  border-color: $blue-s1;
+  color: $white;
+
+  &:hover, &:active {
+    background: $blue-s2;
+    border-color: $blue-s2;
+  }
+
+  &.current, &.active {
+    background: $blue-d1;
+    color: $blue-l4;
+    border-color: $blue-d2;
+
+    &:hover, &:active {
+      background: $blue-d1;
+    }
+  }
+}
+
+// green primary button
+.btn-primary-green {
+  @extend .btn-primary;
+  background: $green;
+  border-color: $green;
+  color: $white;
+
+  &:hover, &:active {
+    background: $green-s1;
+    border-color: $green-s1;
+  }
+
+  &.current, &.active {
+    background: $green-d1;
+    color: $green-l4;
+    border-color: $green-d2;
+
+    &:hover, &:active {
+      background: $green-d1;
+    }
+  }
+}
+
+// gray secondary button
+.btn-secondary-gray {
+  @extend .btn-secondary;
+  border-color: $gray-l3;
+  color: $gray-l1;
+
+  &:hover, &:active {
+    background: $gray-l3;
+    color: $gray-d2;
+  }
+
+  &.current, &.active {
+    background: $gray-d2;
+    color: $gray-l5;
+
+    &:hover, &:active {
+      background: $gray-d2;
+    }
+  }
+}
+
+// blue secondary button
+.btn-secondary-blue {
+  @extend .btn-secondary;
+  border-color: $blue-l3;
+  color: $blue;
+
+  &:hover, &:active {
+    background: $blue-l3;
+    color: $blue-s2;
+  }
+
+  &.current, &.active {
+    border-color: $blue-l3;
+    background: $blue-l3;
+    color: $blue-d1;
+
+    &:hover, &:active {
+
+    }
+  }
+}
+
+// green secondary button
+.btn-secondary-green {
+  @extend .btn-secondary;
+  border-color: $green-l4;
+  color: $green-l2;
+
+  &:hover, &:active {
+    background: $green-l4;
+    color: $green-s1;
+  }
+
+  &.current, &.active {
+    background: $green-s1;
+    color: $green-l4;
+
+    &:hover, &:active {
+      background: $green-s1;
+    }
+  }
+}
+
+// ====================
+
+// layout-based buttons
+
+// ====================
+
+// calls-to-action
+

cms/static/sass/elements/_footer.scss

@@ -2,10 +2,10 @@
 // ====================
 
 .wrapper-footer {
-  margin: ($baseline*1.5) 0 $baseline 0;
-  padding: $baseline;
   position: relative;
   width: 100%;
+  margin: 0 0 $baseline 0;
+  padding: $baseline;
 
   footer.primary {
     @include clearfix();
@@ -14,9 +14,7 @@
     min-width: $fg-min-width;
     width: flex-grid(12);
     margin: 0 auto;
-    padding-top: $baseline;
-    border-top: 1px solid $gray-l4;
-    color: $gray-l2;
+    color: $gray-l1;
 
     .colophon {
       width: flex-grid(4, 12);
@@ -24,6 +22,14 @@
       margin-right: flex-gutter(2);
     }
 
+    a {
+      color: $gray;
+
+      &:hover, &:active {
+        color: $gray-d2;
+      }
+    }
+
     .nav-peripheral {
       width: flex-grid(6, 12);
       float: right;
@@ -36,14 +42,33 @@
         &:last-child {
           margin-right: 0;
         }
-      }
-    }
 
-    a {
-      color: $gray-l1;
+        a {
+          @include border-radius(2px);
+          padding: ($baseline/2) ($baseline*0.75);
+          background: transparent;
 
-      &:hover, &:active {
-        color: $blue;
+          .ss-icon {
+            @include transition(top .25s ease-in-out .25s);
+            @include font-size(15);
+            display: inline-block;
+            vertical-align: middle;
+            margin-right: ($baseline/4);
+            color: $gray-l1;
+          }
+
+          &:hover, &:active {
+            color: $gray-d2;
+
+            .ss-icon {
+              color: $gray-d2;
+            }
+          }
+
+          &.is-active {
+            color: $gray-d2;
+          }
+        }
       }
     }
   }

cms/static/sass/elements/_header.scss

@@ -2,15 +2,15 @@
 // ====================
 
 .wrapper-header {
-  margin: 0 0 ($baseline*1.5) 0;
+  margin: 0;
   padding: $baseline;
   border-bottom: 1px solid $gray;
-  @include box-shadow(0 1px 5px 0 rgba(0,0,0, 0.1));
+  @include box-shadow(0 1px 5px 0 rgba(0,0,0, 0.2));
   background: $white;
   height: 76px;
   position: relative;
   width: 100%;
-  z-index: 10;
+  z-index: 1000;
 
   a {
     color: $baseFontColor;
@@ -132,7 +132,7 @@
 
 // specific elements - course nav
 .nav-course {
-  width: 335px;
+  width: 285px;
   margin-top: -($baseline/4);
   @include font-size(14);
 

cms/static/sass/elements/_icons.scss

@@ -0,0 +1,16 @@
+// studio - elements - icons
+// ====================
+
+.icon {
+
+}
+
+.ss-icon {
+  
+}
+
+.icon-inline {
+  display: inline-block;
+  vertical-align: middle;
+  margin-right: ($baseline/4);
+}

cms/static/sass/elements/_sock.scss

@@ -0,0 +1,152 @@
+// studio - elements - support sock
+// ====================
+
+.wrapper-sock {
+  @include clearfix();
+  position: relative;
+  margin: ($baseline*2) 0 0 0;
+  border-top: 1px solid $gray-l4;
+  width: 100%;
+
+  .wrapper-inner {
+    @include linear-gradient($gray-d3 0%, $gray-d3 98%, $black 100%);
+    @extend .depth0;
+    display: none;
+    width: 100% !important;
+    border-bottom: 1px solid $white;
+    padding: 0 $baseline !important;
+  }
+
+  // sock - actions
+  .list-cta {
+    @extend .depth1;
+    position: absolute;
+    top: -($baseline*0.75);
+    width: 100%;
+    margin: 0 auto;
+    text-align: center;
+
+    .cta-show-sock {
+      @extend .btn-pill;
+      @extend .t-action3;
+      background: $gray-l5;
+      padding: ($baseline/2) $baseline;
+      color: $gray;
+
+      .icon {
+        @include font-size(16);
+      }
+
+      &:hover {
+        background: $blue;
+        color: $white;
+      }
+    }
+  }
+
+  // sock - additional help
+  .sock {
+    @include clearfix();
+    @extend .t-copy-sub2;
+    max-width: $fg-max-width;
+    min-width: $fg-min-width;
+    width: flex-grid(12);
+    margin: 0 auto;
+    padding: ($baseline*2) 0;
+    color: $gray-l3;
+
+    // support body
+    header {
+
+      .title {
+        @extend .t-title-2;
+      }
+
+      .ss-icon {
+        @extend .t-icon;
+        @extend .icon-inline;
+      }
+    }
+
+    // shared elements
+    .support, .feedback {
+      @include box-sizing(border-box);
+
+      .title {
+        @extend .t-title-3;
+        color: $white;
+        margin-bottom: ($baseline/2);
+      }
+
+      .copy {
+        margin: 0 0 $baseline 0;
+      }
+
+      .list-actions {
+        @include clearfix();
+
+        .action-item {
+          float: left;
+          margin-right: ($baseline/2);
+
+          &:last-child {
+            margin-right: 0;
+          }
+
+          .action {
+            display: block;
+
+            .icon {
+              @include font-size(18);
+            }
+
+            &:hover, &:active {
+
+            }
+          }
+
+          .tip {
+            @extend .sr;
+          }
+        }
+
+        .action-primary {
+          @extend .btn-primary-blue;
+          @extend .t-action3;
+        }
+      }
+    }
+
+    // studio support content
+    .support {
+      width: flex-grid(8,12);
+      float: left;
+      margin-right: flex-gutter();
+
+      .action-item {
+        width: flexgrid(4,8);
+      }
+    }
+
+    // studio feedback content
+    .feedback {
+      width: flex-grid(4,12);
+      float: left;
+
+      .action-item {
+        width: flexgrid(4,4);
+      }
+    }
+  }
+
+  // case: sock content is shown
+  &.is-shown {
+    border-color: $gray-d3;
+
+    .list-cta .cta-show-sock {
+      background: $gray-d3;
+      border-color: $gray-d3;
+      color: $white;
+    }
+  }
+}

cms/static/sass/elements/_tender-widget.scss

@@ -0,0 +1,267 @@
+// tender help/support widget
+// ====================
+
+#tender_frame, #tender_window {
+  background-image: none !important;
+  background: none;
+}
+
+#tender_window {
+  @include border-radius(3px);
+  @include box-shadow(0 2px 3px $shadow);
+  height: ($baseline*35) !important;
+  background: $white !important;
+  border: 1px solid $gray;
+}
+
+#tender_window {
+  padding: 0 !important;
+}
+
+#tender_frame {
+  background: $white;
+}
+
+#tender_closer {
+  color: $blue-l2 !important;
+  text-transform: uppercase;
+
+  &:hover {
+    color: $blue-l4 !important;
+  }
+}
+
+// ====================
+
+// tender style overrides - not rendered through here, but an archive is needed
+#tender_frame iframe html {
+  font-size: 62.5%;
+}
+
+.widget-layout {
+  font-family: 'Open Sans', sans-serif;
+}
+
+.widget-layout .search, 
+.widget-layout .tabs, 
+.widget-layout .footer, 
+.widget-layout .header h1 a {
+  display: none;
+}
+
+.widget-layout .header {
+  background: rgb(85, 151, 221);
+  padding: 10px 20px;
+}
+
+.widget-layout h1, .widget-layout h2, .widget-layout h3, .widget-layout h4, .widget-layout h5, .widget-layout h6, .widget-layout label {
+  font-weight: 600;
+}
+
+.widget-layout .header h1 {
+  font-size: 22px;
+}
+
+.widget-layout .content {
+  overflow: auto;
+  height: auto !important;
+  padding: 20px;
+}
+
+.widget-layout .flash {
+  margin: -10px 0 15px 0;
+  padding: 10px 20px !important;
+  background-image: none !important;
+}
+
+.widget-layout .flash-error {
+  background: rgb(178, 6, 16) !important;
+  color: rgb(255,255,255) !important;
+}
+
+.widget-layout label {
+  font-size: 14px;
+  margin-bottom: 5px;
+  color: #4c4c4c;
+  font-weight: 500;
+}
+
+.widget-layout input[type="text"], .widget-layout textarea {
+  padding: 10px;
+  font-size: 16px;
+  color: rgb(0,0,0) !important;
+  border: 1px solid #b0b6c2;
+  border-radius: 2px;
+  background-color: #edf1f5;
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #edf1f5),color-stop(100%, #fdfdfe));
+  background-image: -webkit-linear-gradient(top, #edf1f5,#fdfdfe);
+  background-image: -moz-linear-gradient(top, #edf1f5,#fdfdfe);
+  background-image: -ms-linear-gradient(top, #edf1f5,#fdfdfe);
+  background-image: -o-linear-gradient(top, #edf1f5,#fdfdfe);
+  background-image: linear-gradient(top, #edf1f5,#fdfdfe);
+  background-color: #edf1f5;
+  -webkit-box-shadow: 0 1px 2px rgba(0,0,0,0.1) inset;
+  -moz-box-shadow: 0 1px 2px rgba(0,0,0,0.1) inset;
+  box-shadow: 0 1px 2px rgba(0,0,0,0.1) inset;
+}
+
+.widget-layout input[type="text"]:focus, .widget-layout textarea:focus {
+  background-color: #fffcf1;
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #fffcf1),color-stop(100%, #fffefd));
+  background-image: -webkit-linear-gradient(top, #fffcf1,#fffefd);
+  background-image: -moz-linear-gradient(top, #fffcf1,#fffefd);
+  background-image: -ms-linear-gradient(top, #fffcf1,#fffefd);
+  background-image: -o-linear-gradient(top, #fffcf1,#fffefd);
+  background-image: linear-gradient(top, #fffcf1,#fffefd);
+  outline: 0;
+}
+
+.widget-layout textarea {
+  width: 97%;
+}
+
+.widget-layout p.note {
+  text-align: right !important;
+  display: inline-block !important;
+  position: absolute !important;
+  right: -130px !important;
+  top: -5px !important;
+  font-size: 13px !important;
+  opacity: 0.80;
+}
+
+.widget-layout .form-actions {
+  margin: 15px 0;
+  border: none;
+  padding: 0;
+}
+
+.widget-layout dl.form {
+  float: none;
+  width: 100%;
+  border-bottom: 1px solid #f2f2f2;
+  margin-bottom: 10px;
+  padding-bottom: 10px;
+}
+
+.widget-layout dl.form:last-child {
+  border: none;
+  padding-bottom: 0;
+  margin-bottom: 20px;
+}
+
+.widget-layout dl.form dt, .widget-layout dl.form dd {
+  display: inline-block;
+  vertical-align: middle;
+}
+
+.widget-layout dl.form dt {
+  margin-right: 15px;
+  width: 70px;
+}
+
+.widget-layout dl.form dd {
+  width: 65%;
+  position: relative;
+}
+
+// specific elements
+.widget-layout #discussion_body {
+
+}
+
+.widget-layout #discussion_body:before {
+  content: "What Question or Feedback Would You Like to Share?";
+  display: block;
+  font-size: 14px;
+  margin-bottom: 5px;
+  color: #4c4c4c;
+  font-weight: 500;
+}
+
+
+.widget-layout dl#brain_buster_captcha {
+  float: none;
+  width: 100%;
+  border-top: 1px solid #f2f2f2;
+  margin-top: 10px;
+  padding-top: 10px;
+}
+
+.widget-layout dl#brain_buster_captcha dd {
+  display: block !important;
+}
+
+.widget-layout dl#brain_buster_captcha #captcha_answer {
+  border-color: #333;
+}
+
+.widget-layout dl#brain_buster_captcha dd label {
+  display: block;
+  font-weight: 700;
+  margin: 0 15px 5px 0 !important;
+}
+
+.widget-layout dl#brain_buster_captcha dd #captcha_answer {
+  display: block;
+  width: 97%%;
+}
+
+.widget-layout .form-actions .btn-post_topic {
+  display: block;
+  width: 100%;
+  height: auto !important;
+  font-size: 16px;
+  font-weight: 700;
+  -webkit-box-shadow: 0 1px 0 rgba(255,255,255,0.3) inset,0 0 0 rgba(0,0,0,0);
+  -moz-box-shadow: 0 1px 0 rgba(255,255,255,0.3) inset,0 0 0 rgba(0,0,0,0);
+  box-shadow: 0 1px 0 rgba(255,255,255,0.3) inset,0 0 0 rgba(0,0,0,0);
+  -webkit-transition-property: background-color,0.15s;
+  -moz-transition-property: background-color,0.15s;
+  -ms-transition-property: background-color,0.15s;
+  -o-transition-property: background-color,0.15s;
+  transition-property: background-color,0.15s;
+  -webkit-transition-duration: box-shadow,0.15s;
+  -moz-transition-duration: box-shadow,0.15s;
+  -ms-transition-duration: box-shadow,0.15s;
+  -o-transition-duration: box-shadow,0.15s;
+  transition-duration: box-shadow,0.15s;
+  -webkit-transition-timing-function: ease-out;
+  -moz-transition-timing-function: ease-out;
+  -ms-transition-timing-function: ease-out;
+  -o-transition-timing-function: ease-out;
+  transition-timing-function: ease-out;
+  -webkit-transition-delay: 0;
+  -moz-transition-delay: 0;
+  -ms-transition-delay: 0;
+  -o-transition-delay: 0;
+  transition-delay: 0;
+  border: 1px solid #34854c;
+  border-radius: 3px;
+  background-color: rgba(255,255,255,0.3);
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, rgba(255,255,255,0.3)),color-stop(100%, rgba(255,255,255,0)));
+  background-image: -webkit-linear-gradient(top, rgba(255,255,255,0.3),rgba(255,255,255,0));
+  background-image: -moz-linear-gradient(top, rgba(255,255,255,0.3),rgba(255,255,255,0));
+  background-image: -ms-linear-gradient(top, rgba(255,255,255,0.3),rgba(255,255,255,0));
+  background-image: -o-linear-gradient(top, rgba(255,255,255,0.3),rgba(255,255,255,0));
+  background-image: linear-gradient(top, rgba(255,255,255,0.3),rgba(255,255,255,0));
+  background-color: #25b85a;
+  -webkit-box-shadow: 0 1px 0 rgba(255,255,255,0.3) inset;
+  -moz-box-shadow: 0 1px 0 rgba(255,255,255,0.3) inset;
+  box-shadow: 0 1px 0 rgba(255,255,255,0.3) inset;
+  color: #fff;
+  text-align: center;
+  margin-top: 20px;
+  padding: 10px 20px;
+}
+
+.widget-layout .form-actions #private-discussion-opt {
+  float: none;
+  text-align: left;
+  margin: 0 0 15px 0;
+}
+
+.widget-layout .form-actions .btn-post_topic:hover, .widget-layout .form-actions .btn-post_topic:active {
+  background-color: #16ca57;
+  color: #fff;
+}

cms/static/sass/elements/_typography.scss

@@ -0,0 +1,85 @@
+// studio - elements - typography
+// ====================
+
+// headings/titles
+.t-title-1, .t-title-2, .t-title-3, .t-title-4, .t-title-5, .t-title-5 {
+  color: $gray-d3;
+}
+
+.t-title-1 {
+  @include font-size(36);
+}
+
+.t-title-2 {
+  @include font-size(24);
+  font-weight: 600;
+}
+
+.t-title-3 {
+  @include font-size(16);
+  font-weight: 600;
+}
+
+.t-title-4 {
+
+}
+
+.t-title-5 {
+
+}
+
+// ====================
+
+// copy
+.t-copy-base {
+  @include font-size(16);
+}
+
+.t-copy-lead1 {
+  @include font-size(18);
+}
+
+.t-copy-lead2 {
+  @include font-size(20);
+}
+
+.t-copy-sub1 {
+  @include font-size(14);
+}
+
+.t-copy-sub2 {
+  @include font-size(13);
+}
+
+.t-copy-sub3 {
+  @include font-size(12);
+}
+
+// ====================
+
+// actions/labels
+.t-action1 {
+  @include font-size(14);
+  font-weight: 600;
+}
+
+.t-action2 {
+  @include font-size(13);
+  font-weight: 600;
+  text-transform: uppercase;
+}
+
+.t-action3 {
+  @include font-size(13);
+}
+
+.t-action4 {
+  @include font-size(12);
+}
+
+// ====================
+
+// misc
+.t-icon {
+  line-height: 0;
+}

cms/static/sass/elements/_vendor.scss

@@ -1,6 +1,7 @@
-// studio - elements - JQUI calendar
+// studio - elements - vendor overrides
 // ====================
 
+// JQUI calendar
 .ui-datepicker {
   border-color: $darkGrey;
   border-radius: 2px;
@@ -8,6 +9,7 @@
   font-family: $sans-serif;
   font-size: 12px;
   @include box-shadow(0 5px 10px rgba(0, 0, 0, 0.1));
+  z-index: 100000 !important;
 
   .ui-widget-header {
     background: $darkGrey;
@@ -53,4 +55,11 @@
     border-color: $orange;
     color: #fff;
   }
+}
+
+// ====================
+
+// JQUI timepicker
+.ui-timepicker-list {
+  z-index: 100000 !important;
 }

cms/static/sass/views/_account.scss

@@ -71,7 +71,7 @@ body.signup, body.signin {
           @include blue-button;
           @include transition(all .15s);
           @include font-size(15);
-          display:block;
+          display: block;
           width: 100%;
           padding: ($baseline*0.75) ($baseline/2);
           font-weight: 600;

cms/static/sass/views/_index.scss

@@ -9,17 +9,6 @@ body.index {
       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;
@@ -199,7 +188,7 @@ body.index {
           img {
             display: block;
             width: 100%;
-            height: 100%;
+            height: auto;
           }
         }
 
@@ -306,8 +295,8 @@ body.index {
 
     // call to action content
     .wrapper-content-cta {
-      padding-bottom: ($baseline*2);
-      padding-top: ($baseline*2);
+      position: relative;
+      padding: ($baseline*2) 0;
       background: $white;
     }
 

cms/static/sass/views/_outline.scss

@@ -26,7 +26,7 @@ body.course.outline {
           position: relative;
           top: -4px;
           right: 50px;
-          width: 145px;
+          width: 100px;
 
           .status-label {
             position: absolute;
@@ -62,7 +62,7 @@ body.course.outline {
                 opacity: 0.0;
                 position: absolute;
                 top: -1px;
-                left: 5px;
+                right: 0;
                 margin: 0;
                 padding: 8px 12px;
                 background: $white;
@@ -160,7 +160,7 @@ body.course.outline {
       .section-published-date {
           position: absolute;
           top: 19px;
-          right: 90px;
+          right: 80px;
           padding: 4px 10px;
           border-radius: 3px;
           background: $lightGrey;
@@ -271,8 +271,6 @@ body.course.outline {
 
           .section-published-date {
             float: right;
-            width: 265px;
-            margin-right: 220px;                              
             @include border-radius(3px);
             background: $lightGrey;
 
@@ -606,13 +604,39 @@ body.course.outline {
       }
 
       .picker {
+          @include clearfix();
           margin: 30px 0 65px;
+
+          .field {
+            float: left;
+            margin-right: ($baseline/2);
+
+            &:first-child {
+              margin-left: ($baseline*5);
+            }
+
+            &:last-child {
+              margin-right: 0;
+            }
+
+            label, input {
+              display: block;
+              text-align: left;
+            }
+
+            label {
+              @include font-size(14);
+              margin-bottom: ($baseline/4);
+            }
+          }
       }
 
       .description {
+          float: left;
           margin-top: 30px;
           font-size: 14px;
           line-height: 20px;
+          width: 100%;
       }
 
       strong {

cms/static/sass/views/_subsection.scss

@@ -3,11 +3,41 @@
 
 body.course.subsection {
 
+  .main-wrapper {
+    margin-top: ($baseline*2);
+  }
+
   .unit-settings {
     .window-contents {
       padding: 10px 20px;
     }
 
+    .datepair {
+
+      .field {
+        display: inline-block;
+        margin-right: ($baseline/4);
+        width: 45%;
+
+        &:last-child {
+          margin-right: 0;
+        }
+
+        label, input {
+          display: block;
+          text-align: left;
+        }
+
+        input {
+          width: 100%;
+        }
+
+        label {
+          margin-bottom: ($baseline/4);
+        }
+      }
+    }
+
     .unit-actions {
       border-bottom: none;
       padding-bottom: 0;
@@ -74,7 +104,7 @@ body.course.subsection {
       }
 
       .window-contents {
-        display: none;  
+        display: none;
       }
     }
 
@@ -232,6 +262,7 @@ body.course.subsection {
 
     .remove-date {
       display: block;
+      margin-top: ($baseline/4);
     }
   }
 
@@ -259,7 +290,7 @@ body.course.subsection {
       background-position: 0 -50px;
 
       .hidden {
-        background-position: 0 -5px;      
+        background-position: 0 -5px;
       }
     }
   }
@@ -369,4 +400,4 @@ body.course.subsection {
       }
     }
   }
-}
+}

cms/static/sass/views/_unit.scss

@@ -3,9 +3,8 @@
 
 body.course.unit {
 
-  .unit .main-wrapper {
-    @include clearfix();
-    margin: 40px;
+  .main-wrapper {
+    margin-top: ($baseline*2);
   }
 
   //Problem Selector tab menu requirements
@@ -31,7 +30,7 @@ body.course.unit {
   }
 
   .unit-body {
-    
+
     .unit-name-input {
       padding: 20px 40px;
 
@@ -44,7 +43,7 @@ body.course.unit {
         font-size: 20px;
       }
     }
-    
+
     .breadcrumbs {
       border-radius: 3px 3px 0 0;
       border-bottom: 1px solid #cbd1db;
@@ -189,10 +188,10 @@ body.course.unit {
             @include clearfix;
 
             a {
-              position: relative;            
+              position: relative;
               border: 1px solid $darkGreen;
               background: tint($green,20%);
-              color: #fff;            
+              color: #fff;
 
               &:hover {
                 background: $brightGreen;
@@ -254,8 +253,8 @@ body.course.unit {
               @include transition (none);
 
               &:hover {
-                background: tint($green,30%); 
-                color: #fff;        
+                background: tint($green,30%);
+                color: #fff;
                 @include transition(background-color .15s);
               }
             }
@@ -263,7 +262,7 @@ body.course.unit {
             li {
                 border:none;
                 border-bottom: 1px dashed $lightGrey;
-                color: #fff;      
+                color: #fff;
             }
 
             li:first-child {
@@ -326,7 +325,7 @@ body.course.unit {
               }
             }
 
-            // specific editor types 
+            // specific editor types
             .empty {
 
               a {
@@ -337,20 +336,20 @@ body.course.unit {
 
 
                 &:hover {
-                background: tint($green,30%); 
+                background: tint($green,30%);
                 color: #fff;
               }
               }
             }
           }
 
-          .new-component {          
+          .new-component {
             text-align: center;
 
             h5 {
               color: $darkGreen;
             }
-            
+
           }
         }
       }
@@ -374,7 +373,7 @@ body.course.unit {
       &.editing {
         border: 1px solid $lightBluishGrey2;
         z-index: auto;
-        
+
         .drag-handle,
         .component-actions {
           display: none;
@@ -434,7 +433,7 @@ body.course.unit {
 
         label {
           display: inline-block;
-          margin-right: 10px;  
+          margin-right: 10px;
         }
       }
 
@@ -528,7 +527,7 @@ body.course.unit {
       }
 
       .window-contents {
-        display: none;  
+        display: none;
       }
     }
 
@@ -678,4 +677,4 @@ body.unit {
       padding-top: 0;
     }
   }
-}
+}

cms/templates/base.html

@@ -23,13 +23,13 @@
     <link rel="stylesheet" type="text/css" href="${static.url('css/vendor/symbolset.ss-symbolicons-block.css')}" />
     <link rel="stylesheet" type="text/css" href="${static.url('css/vendor/symbolset.ss-standard.css')}" />
 
+    <%include file="widgets/segment-io.html" />
+
     <%block name="header_extras"></%block>
   </head>
 
   <body class="<%block name='bodyclass'></%block> hide-wip">
-    <%include file="widgets/header.html" />
     <%include file="courseware_vendor_js.html"/>
-
     <script type="text/javascript" src="${static.url('js/vendor/json2.js')}"></script>
     <script type="text/javascript" src="${static.url('js/vendor/underscore-min.js')}"></script>
     <script type="text/javascript" src="${static.url('js/vendor/backbone-min.js')}"></script>
@@ -49,15 +49,32 @@
     <script type="text/javascript" src="${static.url('js/vendor/CodeMirror/htmlmixed.js')}"></script>
     <script type="text/javascript" src="${static.url('js/vendor/CodeMirror/css.js')}"></script>
     <script type="text/javascript">
-      document.write('\x3Cscript type="text/javascript" src="' +
-          document.location.protocol + '//www.youtube.com/player_api">\x3C/script>');
+    document.write('\x3Cscript type="text/javascript" src="' +
+      document.location.protocol + '//www.youtube.com/player_api">\x3C/script>');
     </script>
 
-    <%block name="content"></%block>
-    <%include file="widgets/footer.html" />
+    <!-- view -->
+    <div class="wrapper wrapper-view">
+      <%include file="widgets/header.html" />
 
+      <%block name="view_alerts"></%block>
+      <%block name="view_banners"></%block>
+
+      <%block name="content"></%block>
+
+      % if user.is_authenticated():
+      <%include file="widgets/sock.html" />
+      % endif
+
+      <%include file="widgets/footer.html" />
+      <%include file="widgets/tender.html" />
+
+      <%block name="view_notifications"></%block>
+    </div>
+
+    <%block name="view_prompts"></%block>
     <%block name="jsextra"></%block>
   </body>
+
+  <%include file="widgets/qualaroo.html" />
 </html>
-
-

cms/templates/course_info.html

@@ -80,5 +80,4 @@
       </div>
     </div>
   </div>
-  </div>
 </%block>

cms/templates/edit_subsection.html

@@ -1,9 +1,7 @@
 <%inherit file="base.html" />
 <%!
-   from time import mktime
-   import dateutil.parser
    import logging
-   from datetime import datetime
+   from xmodule.util.date_utils import get_time_struct_display
 %>
 
 <%! from django.core.urlresolvers import reverse %>
@@ -13,7 +11,6 @@
 
 <%namespace name="units" file="widgets/units.html" />
 <%namespace name='static' file='static_content.html'/>
-<%namespace name='datetime' module='datetime'/>
 
 <%block name="content">
 <div class="main-wrapper">
@@ -36,20 +33,22 @@
     <h4 class="header">Subsection Settings</h4>
     <div class="window-contents">
       <div class="scheduled-date-input row">
-        <label>Release date:<!-- <span class="description">Determines when this subsection and the units within it will be released publicly.</span>--></label>
         <div class="datepair" data-language="javascript">
-            <%
-                start_date = datetime.fromtimestamp(mktime(subsection.lms.start)) if subsection.lms.start is not None else None
-                parent_start_date = datetime.fromtimestamp(mktime(parent_item.lms.start)) if parent_item.lms.start is not None else None
-            %>
-          <input type="text" id="start_date" name="start_date" value="${start_date.strftime('%m/%d/%Y') if start_date is not None else ''}" placeholder="MM/DD/YYYY" class="date" size='15' autocomplete="off"/>
-          <input type="text" id="start_time" name="start_time" value="${start_date.strftime('%H:%M') if start_date is not None else ''}" placeholder="HH:MM" class="time" size='10' autocomplete="off"/>
+          <div class="field field-start-date">
+            <label for="start_date">Release Day</label>
+            <input type="text" id="start_date" name="start_date" value="${get_time_struct_display(subsection.lms.start, '%m/%d/%Y')}" placeholder="MM/DD/YYYY" class="date" size='15' autocomplete="off"/>
+          </div>
+          <div class="field field-start-time">
+            <label for="start_time">Release Time (<abbr title="Coordinated Universal Time">UTC</abbr>)</label>
+            <input type="text" id="start_time" name="start_time" value="${get_time_struct_display(subsection.lms.start, '%H:%M')}" placeholder="HH:MM" class="time" size='10' autocomplete="off"/>
+          </div>
         </div>
         % if subsection.lms.start != parent_item.lms.start and subsection.lms.start:
-            % if parent_start_date is None:
+            % if parent_item.lms.start is None:
             <p class="notice">The date above differs from the release date of ${parent_item.display_name_with_default}, which is unset.
             % else:
-            <p class="notice">The date above differs from the release date of ${parent_item.display_name_with_default} – ${parent_start_date.strftime('%m/%d/%Y')} at ${parent_start_date.strftime('%H:%M')}.
+            <p class="notice">The date above differs from the release date of ${parent_item.display_name_with_default} –
+                ${get_time_struct_display(parent_item.lms.start, '%m/%d/%Y at %H:%M UTC')}.
             % endif
             <a href="#" class="sync-date no-spinner">Sync to ${parent_item.display_name_with_default}.</a></p>
         % endif
@@ -62,18 +61,17 @@
     </div>
 
     <div class="due-date-input row">
-      <label>Due date:</label>
       <a href="#" class="set-date">Set a due date</a>
       <div class="datepair date-setter">
-        <p class="date-description">
-          <%
-              # due date uses it own formatting for stringifying the date. As with capa_module.py, there's a utility module available for us to use
-             due_date = dateutil.parser.parse(subsection.lms.due) if subsection.lms.due else None
-          %>
-          <input type="text" id="due_date" name="due_date" value="${due_date.strftime('%m/%d/%Y') if due_date is not None else ''}" placeholder="MM/DD/YYYY" class="date" size='15' autocomplete="off"/>
-          <input type="text" id="due_time" name="due_time" value="${due_date.strftime('%H:%M') if due_date is not None else ''}" placeholder="HH:MM" class="time" size='10' autocomplete="off"/>
-          <a href="#" class="remove-date">Remove due date</a>
-        </p>
+        <div class="field field-start-date">
+          <label for="due_date">Due Day</label>
+          <input type="text" id="due_date" name="due_date" value="${get_time_struct_display(subsection.lms.due, '%m/%d/%Y')}" placeholder="MM/DD/YYYY" class="date" size='15' autocomplete="off"/>
+        </div>
+        <div class="field field-start-time">
+          <label for="due_time">Due Time (<abbr title="Coordinated Universal Time">UTC</abbr>)</label>
+          <input type="text" id="due_time" name="due_time" value="${get_time_struct_display(subsection.lms.due, '%H:%M')}" placeholder="HH:MM" class="time" size='10' autocomplete="off"/>
+        </div>
+        <a href="#" class="remove-date">Remove due date</a>
       </div>
     </div>
     <div class="row unit-actions">

cms/templates/howitworks.html

@@ -134,10 +134,10 @@
     </header>
     
     <ul class="list-actions">
-      <li>
+      <li class="action-item">
         <a href="${reverse('signup')}" class="action action-primary">Sign Up &amp; Start Making an edX Course</a>
       </li>
-      <li>
+      <li class="action-item">
         <a href="${reverse('login')}" class="action action-secondary">Already have a Studio Account? Sign In</a>
       </li>
     </ul>

cms/templates/index.html

@@ -46,6 +46,8 @@
           <li class="nav-item">
             % if not disable_course_creation:
               <a href="#" class="button new-button new-course-button"><i class="ss-icon ss-symbolicons-standard icon icon-create">&#x002B;</i> New Course</a>
+	    % elif settings.MITX_FEATURES.get('STAFF_EMAIL',''):
+	      <a href="mailto:${settings.MITX_FEATURES.get('STAFF_EMAIL','')}">Email staff to create course</a>
             % endif
           </li>
         </ul>
@@ -67,7 +69,7 @@
       <article class="my-classes">
         % if user.is_active:
         <ul class="class-list">
-          %for course, url, lms_link in courses:
+          %for course, url, lms_link in sorted(courses, key=lambda s: s[0].lower() if s[0] is not None else ''):
           <li>
             <a class="class-link" href="${url}" class="class-name">
               <span class="class-name">${course}</span>

cms/templates/overview.html

@@ -1,9 +1,7 @@
 <%inherit file="base.html" />
 <%!
-   from time import mktime
-   import dateutil.parser
    import logging
-   from datetime import datetime
+   from xmodule.util.date_utils import get_time_struct_display
 %>
 <%! from django.core.urlresolvers import reverse %>
 <%block name="title">Course Outline</%block>
@@ -28,9 +26,9 @@
     // I believe that current (New Section/New Subsection) cause full page reloads which means these aren't needed globally
     // but we really should change that behavior.
     if (!window.graderTypes) {
-	    window.graderTypes = new CMS.Models.Settings.CourseGraderCollection();
-	    window.graderTypes.course_location = new CMS.Models.Location('${parent_location}');
-	    window.graderTypes.reset(${course_graders|n});
+      window.graderTypes = new CMS.Models.Settings.CourseGraderCollection();
+      window.graderTypes.course_location = new CMS.Models.Location('${parent_location}');
+      window.graderTypes.reset(${course_graders|n});
     }
 
     $(".gradable-status").each(function(index, ele) {
@@ -106,20 +104,6 @@
 </%block>
 
 <%block name="content">
-  <div class="edit-subsection-publish-settings">
-    <div class="settings">
-      <h3>Section Release Date</h3>
-      <div class="picker datepair">
-        <input class="start-date date" type="text" name="start_date" value="" placeholder="MM/DD/YYYY" class="date" size='15' autocomplete="off"/>
-        <input class="start-time time" type="text" name="start_time" value="" placeholder="HH:MM" class="time" size='10' autocomplete="off"/>
-        <div class="description">
-          <p>On the date set above, this section – <strong class="section-name"></strong> – will be released to students. Any units marked private will only be visible to admins.</p>
-        </div>
-      </div>
-      <a href="#" class="save-button">Save</a><a href="#" class="cancel-button">Cancel</a>
-    </div>
-  </div>
-
   <div class="wrapper-mast wrapper">
     <header class="mast has-actions has-subtitle">
       <div class="title">
@@ -163,15 +147,14 @@
               </h3>
               <div class="section-published-date">
                 <%
-                  start_date = datetime.fromtimestamp(mktime(section.lms.start)) if section.lms.start is not None else None
-                  start_date_str = start_date.strftime('%m/%d/%Y') if start_date is not None else ''
-                  start_time_str = start_date.strftime('%H:%M') if start_date is not None else ''
+                  start_date_str = get_time_struct_display(section.lms.start, '%m/%d/%Y')
+                  start_time_str = get_time_struct_display(section.lms.start, '%H:%M')
                 %>
-                %if start_date is None:
+                %if section.lms.start is None:
                   <span class="published-status">This section has not been released.</span>
                   <a href="#" class="schedule-button" data-date="" data-time="" data-id="${section.location}">Schedule</a>
                 %else:
-                  <span class="published-status"><strong>Will Release:</strong> ${start_date_str} at ${start_time_str}</span>
+                  <span class="published-status"><strong>Will Release:</strong> ${get_time_struct_display(section.lms.start, '%m/%d/%Y at %H:%M UTC')}</span>
                   <a href="#" class="edit-button" data-date="${start_date_str}" data-time="${start_time_str}" data-id="${section.location}">Edit</a>
                 %endif
               </div>
@@ -200,7 +183,7 @@
                     </a>
                   </div>
 
-                  <div class="gradable-status" data-initial-status="${subsection.lms.format if section.lms.format is not None else 'Not Graded'}">
+                  <div class="gradable-status" data-initial-status="${subsection.lms.format if subsection.lms.format is not None else 'Not Graded'}">
                   </div>
 
                   <div class="item-actions">
@@ -219,4 +202,25 @@
     </div>
   </div>
   <footer></footer>
+
+  <div class="edit-subsection-publish-settings">
+    <div class="settings">
+      <h3>Section Release Date</h3>
+      <div class="picker datepair">
+        <div class="field field-start-date">
+          <label for="">Release Day</label>
+          <input class="start-date date" type="text" name="start_date" value="" placeholder="MM/DD/YYYY" class="date" size='15' autocomplete="off"/>
+        </div>
+        <div class="field field-start-time">
+          <label for="">Release Time (<abbr title="Coordinated Universal Time">UTC</abbr>)</label>
+          <input class="start-time time" type="text" name="start_time" value="" placeholder="HH:MM" class="time" size='10' autocomplete="off"/>
+        </div>
+
+        <div class="description">
+          <p>On the date set above, this section – <strong class="section-name"></strong> – will be released to students. Any units marked private will only be visible to admins.</p>
+        </div>
+      </div>
+      <a href="#" class="save-button">Save</a><a href="#" class="cancel-button">Cancel</a>
+    </div>
+  </div>
 </%block>

cms/templates/settings_advanced.html

@@ -19,6 +19,12 @@ from contentstore import utils
 <script type="text/javascript">
 $(document).ready(function () {
 
+    $("form :input").focus(function() {
+      $("label[for='" + this.id + "']").addClass("is-focused");
+    }).blur(function() {
+      $("label").removeClass("is-focused");
+    });
+
     // proactively populate advanced b/c it has the filtered list and doesn't really follow the model pattern
     var advancedModel = new CMS.Models.Settings.Advanced(${advanced_dict | n}, {parse: true});
     advancedModel.url = "${reverse('course_advanced_settings_updates', kwargs=dict(org=context_course.location.org, course=context_course.location.course, name=context_course.location.name))}";
@@ -36,13 +42,17 @@ editor.render();
 </%block>
 
 <%block name="content">
-<div class="wrapper-content wrapper">
-  <section class="content">
-    <header class="page">
+<div class="wrapper-mast wrapper">
+  <header class="mast has-subtitle">
+    <div class="title">
       <span class="title-sub">Settings</span>
       <h1 class="title-1">Advanced Settings</h1>
-    </header>
+    </div>
+  </header>
+</div>
 
+<div class="wrapper-content wrapper">
+  <section class="content">
     <article class="content-primary" role="main">
       <form id="settings_advanced" class="settings-advanced" method="post" action="">
 
@@ -63,7 +73,7 @@ editor.render();
           <p class="instructions"><strong>Warning</strong>: Do not modify these policies unless you are familiar with their purpose.</p>
 
           <ul class="list-input course-advanced-policy-list enum">
-              
+
           </ul>
         </section>
       </form>
@@ -94,23 +104,61 @@ editor.render();
     </aside>
   </section>
 </div>
+</%block>
 
+<%block name="view_notifications">
 <!-- notification: change has been made and a save is needed -->
-<div class="wrapper wrapper-notification wrapper-notification-warning">
-  <div class="notification warning">
-    <div class="copy">
-      <i class="ss-icon ss-symbolicons-block icon icon-warning">&#x26A0;</i>
+<div class="wrapper wrapper-notification wrapper-notification-warning" aria-hidden="true" role="dialog" aria-labelledby="notification-changesMade-title" aria-describedby="notification-changesMade-description">
+  <div class="notification warning has-actions">
+    <i class="ss-icon ss-symbolicons-block icon icon-warning">&#x26A0;</i>
 
-      <p><strong>Note: </strong>Your changes will not take effect until you <strong>save your
-      progress</strong>. Take care with policy value formatting, as validation is <strong>not implemented</strong>.</p>
+    <div class="copy">
+      <h2 class="title title-3" id="notification-changesMade-title">You've Made Some Changes</h2>
+      <p id="notification-changesMade-description">Your changes will not take effect until you <strong>save your progress</strong>. Take care with key and value formatting, as validation is <strong>not implemented</strong>.</p>
     </div>
 
-    <div class="actions">
+    <nav class="nav-actions">
+      <h3 class="sr">Notification Actions</h3>
       <ul>
-        <li><a href="#" class="save-button">Save</a></li>
-        <li><a href="#" class="cancel-button">Cancel</a></li>
+        <li class="nav-item">
+          <a href="" class="action-primary save-button">Save Changes</a>
+        </li>
+        <li class="nav-item">
+          <a href="" class="action-secondary cancel-button">Cancel</a>
+        </li>
       </ul>
+    </nav>
+  </div>
+</div>
+</%block>
+
+<%block name="view_alerts">
+<!-- alert: save confirmed with close -->
+<div class="wrapper wrapper-alert wrapper-alert-confirmation" role="status">
+  <div class="alert confirmation">
+    <i class="ss-icon ss-symbolicons-standard icon icon-confirmation">&#x2713;</i>
+
+    <div class="copy">
+      <h2 class="title title-3">Your policy changes have been saved.</h2>
+      <p>Please note that validation of your policy key and value pairs is not currently in place yet. If you are having difficulties, please review your policy pairs.</p>
+    </div>
+
+    <a href="" rel="view" class="action action-alert-close">
+      <i class="ss-icon ss-symbolicons-block icon icon-close">&#x2421;</i>
+      <span class="label">close alert</span>
+    </a>
+  </div>
+</div>
+
+<!-- alert: error -->
+<div class="wrapper wrapper-alert wrapper-alert-error" role="status">
+  <div class="alert error">
+    <i class="ss-icon ss-symbolicons-block icon icon-error">&#x26A0;</i>
+
+    <div class="copy">
+      <h2 class="title title-3">There was an error saving your information</h2>
+      <p>Please see the error below and correct it to ensure there are no problems in rendering your course.</p>
     </div>
   </div>
 </div>
-</%block>
+</%block>

cms/templates/unit.html

@@ -16,7 +16,6 @@
     });
 
     $(document).ready(function() {
-      $('body').addClass('js');
 
       // tabs
       $('.tab-group').tabs();
@@ -28,6 +27,7 @@
       });
     });
 
+    var unit_location_analytics = '${unit_location}';
   </script>
 
 </%block>

cms/templates/ux-alerts.html

@@ -0,0 +1,544 @@
+<%inherit file="base.html" />
+<%block name="title">Studio Alerts</%block>
+<%block name="bodyclass">is-signedin course uxdesign alerts</%block>
+
+<%block name="jsextra">
+<script type="text/javascript">
+  // notifications - demo
+  $(document).ready(function() {
+
+    // alert and notifications - manual close
+    $('.action-alert-close, .alert.has-actions .nav-actions a').click(function(e) {
+        (e).preventDefault();
+        console.log('closing alert');
+        $(this).closest('.wrapper-alert').removeClass('is-shown');
+    });
+
+    // alert and notifications - manual & action-based close
+    $('.action-notification-close').click(function(e) {
+        (e).preventDefault();
+        $(this).closest('.wrapper-notification').removeClass('is-shown').addClass('is-hiding');
+    });
+
+    // prompt pop
+    $('.action-prompt').click(function(e){
+        (e).preventDefault();
+        $body.toggleClass('prompt-is-shown');
+        $(this).closest('.wrapper-prompt').attr('aria-hidden','false');
+    });
+
+    // prompt close
+    $('.prompt .action-cancel, .prompt .action-proceed').click(function(e) {
+        (e).preventDefault();
+        $body.removeClass('prompt-is-shown');
+        $(this).closest('.wrapper-prompt').attr('aria-hidden','true');
+    });
+
+    $('.hide-notification').click(function(e) {
+        (e).preventDefault();
+        $('.wrapper-notification').removeClass('is-hiding is-shown').attr('aria-hidden','true');
+        $(this.hash).addClass('is-hiding').attr('aria-hidden','true');
+    });
+
+    $('.show-notification').click(function(e) {
+        (e).preventDefault();
+        $('.wrapper-notification').removeClass('is-shown is-hiding');
+        $(this.hash).addClass('is-shown').attr('aria-hidden','false');
+    });
+
+    $('.show-notification-fleeting').click(function(e) {
+        (e).preventDefault();
+        $('.wrapper-notification').removeClass('is-fleeting').attr('aria-hidden','true');
+        $(this.hash).addClass('is-fleeting').attr('aria-hidden','false');
+    });
+
+    $('.hide-alert').click(function(e) {
+        (e).preventDefault();
+        $('.wrapper-alert').removeClass('is-hiding');
+        $(this.hash).addClass('is-hiding');
+    });
+
+    $('.show-alert').click(function(e) {
+        (e).preventDefault();
+        $('.wrapper-alert').removeClass('is-shown');
+        $(this.hash).addClass('is-shown');
+    });
+
+    $('.hide-prompt').click(function(e){
+        (e).preventDefault();
+        $body.removeClass('prompt-is-shown');
+    });
+
+    $('.show-prompt').click(function(e) {
+        (e).preventDefault();
+        $body.toggleClass('prompt-is-shown');
+        $('.wrapper-prompt').removeClass('is-shown');
+        $(this.hash).addClass('is-shown').attr('aria-hidden','false');
+    });
+  });
+</script>
+</%block>
+
+<%block name="content">
+<div class="wrapper-mast wrapper">
+  <header class="mast has-actions has-subtitle">
+    <div class="title">
+      <span class="title-sub">UX Design</span>
+      <h1 class="title-1">System Notifications</h1>
+    </div>
+  </header>
+</div>
+
+<div class="wrapper-content wrapper">
+  <section class="content">
+    <article class="content-primary" role="main">
+      <section>
+        <header>
+          <h2 class="title-2">Alerts</h2>
+          <span class="tip">persistant, static messages to the user</span>
+        </header>
+
+        <p>In Studio, alerts are 1) general warnings/notes (e.g. drafts, published content, next steps) about the current view a user is interacting with or 2) notes about the status (e.g. saved confirmations, errors, next system steps) of any previous state that need to communicated to the user when arriving at the current view.</p>
+
+        <h3 class="title-3">Different Static Examples of Alerts</h3>
+        <p>Note: alerts will probably never been shown based on click or page action and will primarily be loaded along with a pageload and initial display</p>
+
+        <ul>
+          <li><a href="#alert-draft" class="show-alert">Show Draft</a></li>
+          <li><a href="#alert-version" class="show-alert">Show Version</a></li>
+          <li><a href="#alert-saved" class="show-alert">Show Previous View/Action</a></li>
+          <li><a href="#alert-close" class="show-alert">Show Alert with Close Option</a></li>
+          <li><a href="#alert-removed" class="show-alert">Show Previous View/Action Removed</a></li>
+          <li><a href="#alert-system-error" class="show-alert">Show System Error</a></li>
+          <li><a href="#alert-user-error" class="show-alert">Show User Error</a></li>
+          <li><a href="#alert-announcement2" class="show-alert">Show Announcement</a></li>
+          <li><a href="#alert-announcement1" class="show-alert">Show Announcement with Actions</a></li>
+          <li><a href="#alert-activation" class="show-alert">Show Activiation</a></li>
+        </ul>
+      </section>
+
+      <section>
+        <header>
+          <h2 class="title-2">Notifications</h2>
+          <span class="tip">contextual, feedback-based, and temporal messages to the user</span>
+        </header>
+
+        <p>In Studio, notifications are meant to inform the user of 1) any system status (e.g. saving, processing/validating) occurring based on any action they have taken or 2) any decisions (e.g. saving/discarding) a user must make to confirm.</p>
+
+        <h3 class="title-3">Different Static Examples of Notifications</h3>
+
+        <ul>
+          <li>
+            <a href="#notification-change" class="show-notification">Show Change Warning</a>
+            <a href="#notification-change" class="hide-notification">Hide Change Warning</a>
+          </li>
+          <li>
+            <a href="#notification-version" class="show-notification">Show New Version Warning</a>
+            <a href="#notification-version" class="hide-notification">Hide New Version Warning</a>
+          </li>
+          <li>
+            <a href="#notification-dangerous" class="show-notification">Show Editing Warning</a>
+            <a href="#notification-dangerous" class="hide-notification">Hide Editing Warning</a>
+          </li>
+          <li>
+            <a href="#notification-confirmation" class="show-notification-fleeting">Show Confirmation (Fleeting Notification)</a>
+          </li>
+          <li>
+            <a href="#notification-saving" class="show-notification">Show Saving</a>
+            <a href="#notification-saving" class="hide-notification">Hide Saving</a>
+          </li>
+          <li>
+            <a href="#notification-help" class="show-notification">Show Help</a>
+            <a href="#notification-help" class="hide-notification">Hide Help</a>
+          </li>
+        </ul>
+      </section>
+
+      <section>
+        <header>
+          <h2 class="title-2">Prompts</h2>
+          <span class="tip">presents a user with a choice, based on their previous interaction, that must be decided before they can proceed</span>
+        </header>
+
+        <p>In Studio, prompts are dialogs that are presented above all other page components and present a user with a choice, based on their previous interaction, that must be decided before they can proceed (or return to the previous interaction step).</p>
+
+        <h3 class="title-3">Different Static Examples of Prompts</h3>
+
+        <ul>
+          <li>
+            <a href="#prompt-confirm" class="show-prompt">Show Confirm Prompt</a>
+          </li>
+          <li>
+            <a href="#prompt-warning" class="show-prompt">Show Warning Prompt</a>
+          </li>
+          <li>
+            <a href="#prompt-error" class="show-prompt">Show Error Prompt</a>
+          </li>
+        </ul>
+      </section>
+    </article>
+  </section>
+</div>
+</%block>
+
+<%block name="view_alerts">
+<!-- alert: you're editing a draft -->
+<div class="wrapper wrapper-alert wrapper-alert-warning" id="alert-draft">
+  <div class="alert warning has-actions">
+    <i class="ss-icon ss-symbolicons-block icon icon-warning">&#x26A0;</i>
+
+    <div class="copy">
+      <h2 class="title title-3">You are editing a draft</h2>
+      <p class="message">Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa.</p>
+    </div>
+
+    <nav class="nav-actions">
+      <h3 class="sr">Alert Actions</h3>
+      <ul>
+        <li class="nav-item">
+          <a href="#" class="button save-button action-primary">Save Draft</a>
+        </li>
+        <li class="nav-item">
+          <a href="#" class="button cancel-button action-secondary">Disgard Draft</a>
+        </li>
+      </ul>
+    </nav>
+  </div>
+</div>
+
+<!-- alert: newer version -->
+<div class="wrapper wrapper-alert wrapper-alert-warning" id="alert-version">
+  <div class="alert warning has-actions">
+    <i class="ss-icon ss-symbolicons-block icon icon-warning">&#x26A0;</i>
+
+    <div class="copy">
+      <h2 class="title title-3">A Newer Version of This Exists</h2>
+      <p class="message">Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa.</p>
+    </div>
+
+    <nav class="nav-actions">
+      <h3 class="sr">Alert Actions</h3>
+      <ul>
+        <li class="nav-item">
+          <a href="#" class="button save-button action-primary">Go to Newer Version</a>
+        </li>
+        <li class="nav-item">
+          <a href="#" class="button cancel-button action-secondary">Continue Editing</a>
+        </li>
+      </ul>
+    </nav>
+  </div>
+</div>
+
+<!-- alert: save confirmed -->
+<div class="wrapper wrapper-alert wrapper-alert-confirmation" id="alert-saved">
+  <div class="alert confirmation">
+    <i class="ss-icon ss-symbolicons-standard icon icon-confirmation">&#x2713;</i>
+
+    <div class="copy">
+      <h2 class="title title-3">Your changes have been saved</h2>
+      <p class="message">Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. <a rel="page" href="#test">Please see below</a></p>
+    </div>
+  </div>
+</div>
+
+<!-- alert: save confirmed with close -->
+<div class="wrapper wrapper-alert wrapper-alert-confirmation" id="alert-close">
+  <div class="alert confirmation">
+    <i class="ss-icon ss-symbolicons-standard icon icon-confirmation">&#x2713;</i>
+
+    <div class="copy">
+      <h2 class="title title-3">Your changes have been saved</h2>
+      <p class="message">Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. <a rel="page" href="#test">Please see below</a></p>
+    </div>
+
+    <a href="#" rel="view" class="action action-alert-close">
+      <i class="ss-icon ss-symbolicons-block icon icon-close">&#x2421;</i>
+      <span class="label">close alert</span>
+    </a>
+  </div>
+</div>
+
+<!-- alert: delete confirmed -->
+<div class="wrapper wrapper-alert wrapper-alert-confirmation" id="alert-removed">
+  <div class="alert confirmation">
+    <i class="ss-icon ss-symbolicons-standard icon icon-confirmation">&#x2713;</i>
+
+    <div class="copy">
+      <h2 class="title title-3">X Has been removed</h2>
+      <p class="message">Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa.</p>
+    </div>
+  </div>
+</div>
+
+<!-- alert: system error -->
+<div class="wrapper wrapper-alert wrapper-alert-error" id="alert-system-error">
+  <div class="alert error">
+    <i class="ss-icon ss-symbolicons-block icon icon-error">&#x26A0;</i>
+
+    <div class="copy">
+      <h2 class="title title-3">We're sorry, there was a error with Studio</h2>
+      <p class="message">Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa.</p>
+    </div>
+  </div>
+</div>
+
+<!-- alert: user error -->
+<div class="wrapper wrapper-alert wrapper-alert-error" id="alert-user-error">
+  <div class="alert error has-actions">
+    <i class="ss-icon ss-symbolicons-block icon icon-error">&#x26A0;</i>
+
+    <div class="copy">
+      <h2 class="title title-3">There was an error in your submission</h2>
+      <p class="message">Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. <a rel="page" href="#test">Please see below</a></p>
+    </div>
+
+    <nav class="nav-actions">
+      <h3 class="sr">Alert Actions</h3>
+      <ul>
+        <li class="nav-item">
+          <a href="#" class="button cancel-button action-primary">Cancel Your Submission</a>
+        </li>
+      </ul>
+    </nav>
+  </div>
+</div>
+
+<!-- alert: announcement w/ actions -->
+<div class="wrapper wrapper-alert wrapper-alert-announcement" id="alert-announcement1">
+  <div class="alert announcement has-actions">
+    <i class="ss-icon ss-symbolicons-block icon icon-announcement">&#x1F4E2;</i>
+
+    <div class="copy">
+      <h2 class="title title-3">Studio will be unavailable this weekend</h2>
+      <p class="message">Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa.</p>
+    </div>
+
+    <nav class="nav-actions">
+      <h3 class="sr">Alert Actions</h3>
+      <ul>
+        <li class="nav-item">
+          <a href="#" rel="external" class="action-primary">Contact edX Staff</a>
+        </li>
+        <li class="nav-item">
+          <a href="#" class="action-secondary">Manage Your edX Notifications</a>
+        </li>
+      </ul>
+    </nav>
+  </div>
+</div>
+
+<!-- alert: announcement -->
+<div class="wrapper wrapper-alert wrapper-alert-announcement" id="alert-announcement2">
+  <div class="alert announcement">
+    <i class="ss-icon ss-symbolicons-block icon icon-announcement">&#x1F4E2;</i>
+
+    <div class="copy">
+      <h2 class="title title-3">Studio will be unavailable this weekend</h2>
+      <p class="message">Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa.</p>
+    </div>
+  </div>
+</div>
+
+<!-- alert: step required -->
+<div class="wrapper wrapper-alert wrapper-alert-step-required" id="alert-activation">
+  <div class="alert step-required has-actions">
+    <i class="ss-icon ss-symbolicons-block icon icon-step-required">&#xE0D1;</i>
+
+    <div class="copy">
+      <h2 class="title title-3">Your Studio account has been created, but needs to be activated</h2>
+      <p class="message">Donec sed odio dui. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Cras mattis consectetur purus sit amet fermentum. Curabitur blandit tempus porttitor.</p>
+    </div>
+
+    <nav class="nav-actions">
+      <h3 class="sr">Alert Actions</h3>
+      <ul>
+        <li class="nav-item">
+          <a href="#" class="action-primary">Re-send Activation Message</a>
+        </li>
+        <li class="nav-item">
+          <a href="#" rel="external" class="action-secondary">Contact edX Support</a>
+        </li>
+      </ul>
+    </nav>
+  </div>
+</div>
+</%block>
+
+<%block name="view_notifications">
+<!-- notification: change has been made and a save is needed -->
+<div class="wrapper wrapper-notification wrapper-notification-change" id="notification-change" role="status">
+  <div class="notification change has-actions">
+    <i class="ss-icon ss-symbolicons-block icon icon-change">&#x1F4DD;</i>
+
+    <div class="copy">
+      <h2 class="title title-3">You've Made Some Changes</h2>
+      <p class="message">Your changes will not take effect until you <strong>save your progress</strong>.</p>
+    </div>
+
+    <nav class="nav-actions">
+      <h3 class="sr">Notification Actions</h3>
+      <ul>
+        <li class="nav-item">
+          <a href="#" class="action-primary">Save Changes</a>
+        </li>
+        <li class="nav-item">
+          <a href="#" class="action-secondary">Don't Save</a>
+        </li>
+      </ul>
+    </nav>
+  </div>
+</div>
+
+<!-- notification: newer version exists -->
+<div class="wrapper wrapper-notification wrapper-notification-warning" id="notification-version" aria-hidden="true" role="dialog" aria-labelledby="notification-warning-title" aria-describedby="notification-warning-description">
+  <div class="notification warning has-actions">
+    <i class="ss-icon ss-symbolicons-block icon icon-warning">&#x26A0;</i>
+
+    <div class="copy">
+      <h2 class="title title-3" id="notification-warning-title">A Newer Version of This Exists</h2>
+      <p class="message" id="notification-warning-description">Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa.</p>
+    </div>
+
+    <nav class="nav-actions">
+      <h3 class="sr">Notification Actions</h3>
+      <ul>
+        <li class="nav-item">
+          <a href="#" class="button save-button action-primary">Go to Newer Version</a>
+        </li>
+        <li class="nav-item">
+          <a href="#" class="button cancel-button action-secondary">Continue Editing</a>
+        </li>
+      </ul>
+    </nav>
+  </div>
+</div>
+
+<!-- notification: warning about editing something dangerous -->
+<div class="wrapper wrapper-notification wrapper-notification-warning" id="notification-dangerous" aria-hidden="true" role="dialog" aria-labelledby="notification-dangerous-title" aria-describedby="notification-dangerous-description">
+  <div class="notification warning has-actions">
+    <i class="ss-icon ss-symbolicons-block icon icon-warning">&#x26A0;</i>
+
+    <div class="copy">
+      <h2 class="title title-3" id="notification-dangerous-title">Are You Sure You Want to Edit That?</h2>
+      <p class="message" id="notification-dangerous-description">Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa.</p>
+    </div>
+
+    <nav class="nav-actions">
+      <h3 class="sr">Notification Actions</h3>
+      <ul>
+        <li class="nav-item">
+          <a href="#" class="action-primary">Yes, I want to Edit X</a>
+        </li>
+        <li class="nav-item">
+          <a href="#" class="action-secondary">No, I do not</a>
+        </li>
+      </ul>
+    </nav>
+  </div>
+</div>
+
+<!-- notification: status - saving -->
+<div class="wrapper wrapper-notification wrapper-notification-status wrapper-notification-saving" id="notification-saving">
+  <div class="notification saving">
+    <i class="ss-icon ss-symbolicons-block icon icon-saving">&#x2699;</i>
+
+    <div class="copy">
+      <h2 class="title title-3" role="status">Saving &hellip;</h2>
+    </div>
+  </div>
+</div>
+
+<!-- notification: status- confirmed -->
+<div class="wrapper wrapper-notification wrapper-notification-confirmation" id="notification-confirmation">
+  <div class="notification confirmation">
+    <i class="ss-icon ss-symbolicons-standard icon icon-confirmation">&#x2713;</i>
+
+    <div class="copy">
+      <h2 class="title title-3" role="status"><a href="#">Your Section</a> Has Been Created</h2>
+    </div>
+  </div>
+</div>
+
+<!-- notification: help - DYK -->
+<div class="wrapper wrapper-notification wrapper-notification-help" id="notification-help">
+  <div class="notification help">
+    <i class="ss-icon ss-symbolicons-block icon icon-help">&#x2753;</i>
+
+    <div class="copy">
+      <h2 class="title title-3">Fun Fact:</h2>
+      <p class="message">Using the checkmark will allow you make a subsection gradable as an assignment, which counts towards a student's total grade</p>
+    </div>
+
+    <a href="#" rel="view" class="action action-notification-close">
+      <i class="ss-icon ss-symbolicons-block icon icon-close">&#x2421;</i>
+      <span class="label">close notification</span>
+    </a>
+  </div>
+</div>
+</%block>
+
+<%block name="view_prompts">
+<!-- prompt - confirm deletion -->
+<div class="wrapper wrapper-prompt wrapper-prompt-confirm" id="prompt-confirm" aria-hidden="true" role="dialog" aria-labelledby="prompt-confirm-sectionDelete-title" aria-describedby="prompt-confirm-sectionDelete-description">
+  <div class="prompt confirm">
+    <div class="copy">
+      <h2 class="title title-3" id="prompt-confirm-sectionDelete-title">Delete "Introduction &amp; Overview"?</h2>
+      <p class="message" id="prompt-confirm-sectionDelete-description">Deleting a section cannot be undone and its contents cannot be recovered.</p>
+    </div>
+
+    <nav class="nav-actions">
+      <h3 class="sr">Prompt Actions</h3>
+      <ul>
+        <li class="nav-item">
+          <a href="#" class="action-primary action-proceed">Yes, delete this section</a>
+        </li>
+        <li class="nav-item">
+          <a href="#" class="action-secondary action-cancel">Cancel</a>
+        </li>
+      </ul>
+    </nav>
+  </div>
+</div>
+
+<!-- prompt - warning -->
+<div class="wrapper wrapper-prompt wrapper-prompt-warning" id="prompt-warning" aria-hidden="true" role="dialog" aria-labelledby="prompt-warning-useAdvanced-title" aria-describedby="prompt-warning-useAdvanced-description">
+  <div class="prompt warning">
+    <div class="copy">
+      <h2 class="title title-3" id="prompt-warning-useAdvanced-title">Use Advanced Problem Editor?</h2>
+      <p class="message" id="prompt-warning-useAdvanced-description">If you proceed, you cannot edit this problem using the simple problem editor.</p>
+    </div>
+
+    <nav class="nav-actions">
+      <h3 class="sr">Prompt Actions</h3>
+      <ul>
+        <li class="nav-item">
+          <a href="#" class="action-primary action-proceed">Continue to Advanced Editor</a>
+        </li>
+        <li class="nav-item">
+          <a href="#" class="action-secondary action-cancel">Cancel</a>
+        </li>
+      </ul>
+    </nav>
+  </div>
+</div>
+
+<!-- prompt - error -->
+<div class="wrapper wrapper-prompt wrapper-prompt-error" id="prompt-error" aria-hidden="true" role="dialog" aria-labelledby="prompt-errorUser-title" aria-describedby="prompt-errorUser-description">
+  <div class="prompt error">
+    <div class="copy">
+      <h2 class="title title-3" id="prompt-errorUser-title">There Were Errors in Your Submission</h2>
+      <p class="message" id="prompt-errorUser-description">Please correct the errors noted on the page and try again.</p>
+    </div>
+
+    <nav class="nav-actions">
+      <h3 class="sr">Prompt Actions</h3>
+      <ul>
+        <li class="nav-item">
+          <a href="#" class="action-primary action-proceed">Correct errors &amp; try again</a>
+        </li>
+      </ul>
+    </nav>
+  </div>
+</div>
+</%block>

cms/templates/widgets/footer.html

@@ -1,6 +1,5 @@
 <%! from django.core.urlresolvers import reverse %>
-
-<div class="wrapper-footer wrapper">
+<div class="wrapper-footer wrapper">  
   <footer class="primary" role="contentinfo">
     <div class="colophon">
       <p>&copy; 2013 <a href="http://www.edx.org" rel="external">edX</a>. All rights reserved.</p>
@@ -14,16 +13,11 @@
         <li class="nav-item nav-peripheral-pp">
           <a href="#">Privacy Policy</a>
         </li> -->
-        <li class="nav-item nav-peripheral-help">
-          <a href="http://help.edge.edx.org/" rel="external">edX Studio Help</a>
-        </li>
-        <li class="nav-item nav-peripheral-contact">
-          <a href="https://www.edx.org/contact" rel="external">Contact edX</a>
-        </li>
-        
         % if user.is_authenticated():
-        <!-- add in zendesk/tender feedback form UI -->
-        % endif
+        <li class="nav-item nav-peripheral-feedback">
+          <a href="http://help.edge.edx.org/discussion/new" class="show-tender" title="Use our feedback tool, Tender, to share your feedback">Contact Us</a>
+        </li>
+        % endif    
       </ol>
     </nav>
   </footer>

cms/templates/widgets/header.html

@@ -1,6 +1,6 @@
 <%! from django.core.urlresolvers import reverse %>
 
-<div class="wrapper-header wrapper">
+<div class="wrapper-header wrapper" id="view-top">
   <header class="primary" role="banner">
 
     <div class="wrapper wrapper-left ">

cms/templates/widgets/qualaroo.html

@@ -0,0 +1,13 @@
+% if settings.MITX_FEATURES.get('STUDIO_NPS_SURVEY'):
+    <!-- Qualaroo is used for net promoter score surveys -->
+    <script type="text/javascript">
+        % if user.is_authenticated():
+            var _kiq = _kiq || [];
+            _kiq.push(['identify', "${ user.email }" ]);
+        % endif
+    </script>
+
+    <!-- Qualaroo for edx.org -->
+    <script type="text/javascript" src="//s3.amazonaws.com/ki.js/48221/9SN.js" async="true"></script>
+    <!-- end Qualaroo -->
+% endif

cms/templates/widgets/segment-io.html

@@ -0,0 +1,32 @@
+% if settings.MITX_FEATURES.get('SEGMENT_IO'):
+<!-- begin Segment.io -->
+<script type="text/javascript">
+  // if inside course, inject the course location into the JS namespace
+  %if context_course:
+  var course_location_analytics = "${context_course.location}";
+  %endif
+
+  var analytics=analytics||[];analytics.load=function(e){var t=document.createElement("script");t.type="text/javascript",t.async=!0,t.src=("https:"===document.location.protocol?"https://":"http://")+"d2dq2ahtl5zl1z.cloudfront.net/analytics.js/v1/"+e+"/analytics.min.js";var n=document.getElementsByTagName("script")[0];n.parentNode.insertBefore(t,n);var r=function(e){return function(){analytics.push([e].concat(Array.prototype.slice.call(arguments,0)))}},i=["identify","track","trackLink","trackForm","trackClick","trackSubmit","pageview","ab","alias","ready"];for(var s=0;s<i.length;s++)analytics[i[s]]=r(i[s])};
+  analytics.load("${ settings.SEGMENT_IO_KEY }");
+
+  % if user.is_authenticated():
+  analytics.identify("${ user.id }", {
+      email     : "${ user.email }",
+      username  : "${ user.username }"
+  });
+
+  % endif
+</script>
+<!-- end Segment.io -->
+% else:
+<!-- dummy segment.io -->
+<script type="text/javascript">
+  %if context_course:
+  var course_location_analytics = "${context_course.location}";
+  %endif
+  var analytics = {
+    track: function() { return; }
+  };
+</script>
+<!-- end dummy segment.io -->
+% endif

cms/templates/widgets/sock.html

@@ -0,0 +1,54 @@
+<%! from django.core.urlresolvers import reverse %>
+<div class="wrapper-sock wrapper">
+  <ul class="list-actions list-cta">
+    <li class="action-item">
+      <a href="#sock" class="cta cta-show-sock"><i class="ss-icon ss-symbolicons-block icon icon-inline icon-help">&#x2753;</i> <span class="copy">Looking for Help with Studio?</span></a>
+    </li>
+  </ul>
+
+  <div class="wrapper-inner wrapper">
+    <section class="sock" id="sock">
+      <header>
+        <h2 class="title sr"><i class="ss-icon ss-symbolicons-block icon icon-inline icon-help">&#x2753;</i> edX Studio Help</h2>
+      </header>
+
+      <div class="support">
+        <h3 class="title">Studio Support</h3>
+
+        <div class="copy">
+           <p>Need help with Studio? Creating a course is complex, so we're here to help. Take advantage of our documentation, help center, as well as our edX101 introduction course for course authors.</p>
+        </div>
+
+      <ul class="list-actions">
+        <li class="action-item">
+          <a href="http://files.edx.org/Getting_Started_with_Studio.pdf" class="action action-primary" title="This is a PDF Document"><i class="ss-icon icon ss-symbolicons-block icon icon-inline icon-pdf">&#xEC00;</i> Download Studio Documentation</a>
+          <span class="tip">How to use Studio to build your course</span>
+        </li>
+        <li class="action-item">
+          <a href="http://help.edge.edx.org/" rel="external" class="action action-primary"><i class="ss-icon icon ss-symbolicons-block icon icon-inline icon-help">&#xEE11;</i> Studio Help Center</a>
+          <span class="tip"><i class="ss-icon ss-symbolicons-block icon-help">&#xEE11;</i> Studio Help Center</span>
+        </li>
+        <li class="action-item">
+          <a href="https://edge.edx.org/courses/edX/edX101/How_to_Create_an_edX_Course/about" rel="external" class="action action-primary"><i class="ss-icon icon ss-symbolicons-block icon icon-inline icon-enroll">&#x1F393;</i> Enroll in edX101</a>
+          <span class="tip">How to use Studio to build your course</span>
+        </li>
+      </ul>
+      </div>
+
+      <div class="feedback">
+        <h3 class="title">Contact us about Studio</h3>
+
+        <div class="copy">
+           <p>Have problems, questions, or suggestions about Studio? We're also here to listen to any feedback you want to share.</p>
+        </div>
+
+        <ul class="list-actions">
+          <li class="action-item">
+
+            <a href="http://help.edge.edx.org/discussion/new" class="action action-primary show-tender" title="Use our feedback tool, Tender, to share your feedback"><i class="ss-icon ss-symbolicons-block icon icon-inline icon-feedback">&#xE398;</i> Contact Us</a>
+          </li>
+        </ul>
+      </div>
+    </section>
+  </div>
+</div>

cms/templates/widgets/tender.html

@@ -0,0 +1,13 @@
+% if user.is_authenticated():
+
+<script type="text/javascript">
+  Tender = {
+    hideToggle: true,
+    title: '',
+    body: '',
+    hide_kb: 'true',
+    widgetToggles: $('.show-tender')
+  }
+</script>
+<script src="https://edxedge.tenderapp.com/tender_widget.js" type="text/javascript"></script>
+% endif

cms/urls.py

@@ -116,6 +116,8 @@ urlpatterns += (
 
     url(r'^logout$', 'student.views.logout_user', name='logout'),
 
+    # static/proof-of-concept views
+    url(r'^ux-alerts$', 'contentstore.views.ux_alerts', name='ux-alerts')
     )
 
 if settings.ENABLE_JASMINE:

cms/xmodule_namespace.py

@@ -40,7 +40,6 @@ class CmsNamespace(Namespace):
     """
     Namespace with fields common to all blocks in Studio
     """
-    is_draft = Boolean(help="Whether this module is a draft", default=False, scope=Scope.settings)
     published_date = DateTuple(help="Date when the module was published", scope=Scope.settings)
     published_by = String(help="Id of the user who published this module", scope=Scope.settings)
     empty = StringyBoolean(help="Whether this is an empty template", scope=Scope.settings, default=False)

common/djangoapps/request_cache/middleware.py

@@ -0,0 +1,20 @@
+import threading
+
+_request_cache_threadlocal = threading.local()
+_request_cache_threadlocal.data = {}
+
+class RequestCache(object):
+    @classmethod
+    def get_request_cache(cls):
+        return _request_cache_threadlocal
+            
+    def clear_request_cache(self):
+        _request_cache_threadlocal.data = {}
+
+    def process_request(self, request):
+        self.clear_request_cache()
+        return None
+
+    def process_response(self, request, response):
+        self.clear_request_cache()
+        return response

common/djangoapps/terrain/course_helpers.py

@@ -0,0 +1,140 @@
+#pylint: disable=C0111
+#pylint: disable=W0621
+
+from lettuce import world, step
+from .factories import *
+from django.conf import settings
+from django.http import HttpRequest
+from django.contrib.auth.models import User
+from django.contrib.auth import authenticate, login
+from django.contrib.auth.middleware import AuthenticationMiddleware
+from django.contrib.sessions.middleware import SessionMiddleware
+from student.models import CourseEnrollment
+from xmodule.modulestore.django import _MODULESTORES, modulestore
+from xmodule.templates import update_templates
+from bs4 import BeautifulSoup
+import os.path
+from urllib import quote_plus
+from lettuce.django import django_url
+
+
+@world.absorb
+def create_user(uname):
+
+    # If the user already exists, don't try to create it again
+    if len(User.objects.filter(username=uname)) > 0:
+        return
+
+    portal_user = UserFactory.build(username=uname, email=uname + '@edx.org')
+    portal_user.set_password('test')
+    portal_user.save()
+
+    registration = world.RegistrationFactory(user=portal_user)
+    registration.register(portal_user)
+    registration.activate()
+
+    user_profile = world.UserProfileFactory(user=portal_user)
+
+
+@world.absorb
+def log_in(username, password):
+    '''
+    Log the user in programatically
+    '''
+
+    # Authenticate the user
+    user = authenticate(username=username, password=password)
+    assert(user is not None and user.is_active)
+
+    # Send a fake HttpRequest to log the user in
+    # We need to process the request using
+    # Session middleware and Authentication middleware
+    # to ensure that session state can be stored
+    request = HttpRequest()
+    SessionMiddleware().process_request(request)
+    AuthenticationMiddleware().process_request(request)
+    login(request, user)
+
+    # Save the session
+    request.session.save()
+
+    # Retrieve the sessionid and add it to the browser's cookies
+    cookie_dict = {settings.SESSION_COOKIE_NAME: request.session.session_key}
+    try:
+        world.browser.cookies.add(cookie_dict)
+
+    # WebDriver has an issue where we cannot set cookies
+    # before we make a GET request, so if we get an error,
+    # we load the '/' page and try again
+    except:
+        world.browser.visit(django_url('/'))
+        world.browser.cookies.add(cookie_dict)
+
+
+@world.absorb
+def register_by_course_id(course_id, is_staff=False):
+    create_user('robot')
+    u = User.objects.get(username='robot')
+    if is_staff:
+        u.is_staff = True
+        u.save()
+    CourseEnrollment.objects.get_or_create(user=u, course_id=course_id)
+
+
+
+@world.absorb
+def save_the_course_content(path='/tmp'):
+    html = world.browser.html.encode('ascii', 'ignore')
+    soup = BeautifulSoup(html)
+
+    # get rid of the header, we only want to compare the body
+    soup.head.decompose()
+
+    # for now, remove the data-id attributes, because they are
+    # causing mismatches between cms-master and master
+    for item in soup.find_all(attrs={'data-id': re.compile('.*')}):
+        del item['data-id']
+
+    # we also need to remove them from unrendered problems,
+    # where they are contained in the text of divs instead of
+    # in attributes of tags
+    # Be careful of whether or not it was the last attribute
+    # and needs a trailing space
+    for item in soup.find_all(text=re.compile(' data-id=".*?" ')):
+        s = unicode(item.string)
+        item.string.replace_with(re.sub(' data-id=".*?" ', ' ', s))
+
+    for item in soup.find_all(text=re.compile(' data-id=".*?"')):
+        s = unicode(item.string)
+        item.string.replace_with(re.sub(' data-id=".*?"', ' ', s))
+
+    # prettify the html so it will compare better, with
+    # each HTML tag on its own line
+    output = soup.prettify()
+
+    # use string slicing to grab everything after 'courseware/' in the URL
+    u = world.browser.url
+    section_url = u[u.find('courseware/') + 11:]
+
+
+    if not os.path.exists(path):
+        os.makedirs(path)
+
+    filename = '%s.html' % (quote_plus(section_url))
+    f = open('%s/%s' % (path, filename), 'w')
+    f.write(output)
+    f.close
+
+
+@world.absorb
+def clear_courses():
+    # 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()"
+    _MODULESTORES = {}
+    modulestore().collection.drop()
+    update_templates()

common/djangoapps/terrain/steps.py

@@ -1,20 +1,21 @@
+#pylint: disable=C0111
+#pylint: disable=W0621
+
+# Disable the "wildcard import" warning so we can bring in all methods from
+# course helpers and ui helpers
+#pylint: disable=W0401
+
+# Disable the "Unused import %s from wildcard import" warning
+#pylint: disable=W0614
+
+# Disable the "unused argument" warning because lettuce uses "step"
+#pylint: disable=W0613
+
 from lettuce import world, step
-from .factories import *
+from .course_helpers import *
+from .ui_helpers import *
 from lettuce.django import django_url
-from django.conf import settings
-from django.http import HttpRequest
-from django.contrib.auth.models import User
-from django.contrib.auth import authenticate, login
-from django.contrib.auth.middleware import AuthenticationMiddleware
-from django.contrib.sessions.middleware import SessionMiddleware
-from student.models import CourseEnrollment
-from urllib import quote_plus
-from nose.tools import assert_equals
-from bs4 import BeautifulSoup
-import time
-import re
-import os.path
-from selenium.common.exceptions import WebDriverException
+from nose.tools import assert_equals, assert_in
 
 from logging import getLogger
 logger = getLogger(__name__)
@@ -22,7 +23,7 @@ logger = getLogger(__name__)
 
 @step(u'I wait (?:for )?"(\d+)" seconds?$')
 def wait(step, seconds):
-    time.sleep(float(seconds))
+    world.wait(seconds)
 
 
 @step('I reload the page$')
@@ -37,42 +38,42 @@ def browser_back(step):
 
 @step('I (?:visit|access|open) the homepage$')
 def i_visit_the_homepage(step):
-    world.browser.visit(django_url('/'))
-    assert world.browser.is_element_present_by_css('header.global', 10)
+    world.visit('/')
+    assert world.is_css_present('header.global')
 
 
 @step(u'I (?:visit|access|open) the dashboard$')
 def i_visit_the_dashboard(step):
-    world.browser.visit(django_url('/dashboard'))
-    assert world.browser.is_element_present_by_css('section.container.dashboard', 5)
+    world.visit('/dashboard')
+    assert world.is_css_present('section.container.dashboard')
 
 
 @step('I should be on the dashboard page$')
 def i_should_be_on_the_dashboard(step):
-    assert world.browser.is_element_present_by_css('section.container.dashboard', 5)
+    assert world.is_css_present('section.container.dashboard')
     assert world.browser.title == 'Dashboard'
 
 
 @step(u'I (?:visit|access|open) the courses page$')
 def i_am_on_the_courses_page(step):
-    world.browser.visit(django_url('/courses'))
-    assert world.browser.is_element_present_by_css('section.courses')
+    world.visit('/courses')
+    assert world.is_css_present('section.courses')
 
 
 @step(u'I press the "([^"]*)" button$')
 def and_i_press_the_button(step, value):
     button_css = 'input[value="%s"]' % value
-    world.browser.find_by_css(button_css).first.click()
+    world.css_click(button_css)
 
 
 @step(u'I click the link with the text "([^"]*)"$')
 def click_the_link_with_the_text_group1(step, linktext):
-    world.browser.find_link_by_text(linktext).first.click()
+    world.click_link(linktext)
 
 
 @step('I should see that the path is "([^"]*)"$')
 def i_should_see_that_the_path_is(step, path):
-    assert world.browser.url == django_url(path)
+    assert world.url_equals(path)
 
 
 @step(u'the page title should be "([^"]*)"$')
@@ -85,10 +86,15 @@ def the_page_title_should_contain(step, title):
     assert(title in world.browser.title)
 
 
+@step('I log in$')
+def i_log_in(step):
+    world.log_in('robot', 'test')
+
+
 @step('I am a logged in user$')
 def i_am_logged_in_user(step):
-    create_user('robot')
-    log_in('robot', 'test')
+    world.create_user('robot')
+    world.log_in('robot', 'test')
 
 
 @step('I am not logged in$')
@@ -98,151 +104,41 @@ def i_am_not_logged_in(step):
 
 @step('I am staff for course "([^"]*)"$')
 def i_am_staff_for_course_by_id(step, course_id):
-    register_by_course_id(course_id, True)
+    world.register_by_course_id(course_id, True)
 
 
-@step('I log in$')
-def i_log_in(step):
-    log_in('robot', 'test')
+@step(r'click (?:the|a) link (?:called|with the text) "([^"]*)"$')
+def click_the_link_called(step, text):
+    world.click_link(text)
+
+
+@step(r'should see that the url is "([^"]*)"$')
+def should_have_the_url(step, url):
+    assert_equals(world.browser.url, url)
+
+
+@step(r'should see (?:the|a) link (?:called|with the text) "([^"]*)"$')
+def should_see_a_link_called(step, text):
+    assert len(world.browser.find_link_by_text(text)) > 0
+
+
+@step(r'should see "(.*)" (?:somewhere|anywhere) in (?:the|this) page')
+def should_see_in_the_page(step, text):
+    assert_in(text, world.css_text('body'))
+
+
+@step('I am logged in$')
+def i_am_logged_in(step):
+    world.create_user('robot')
+    world.log_in('robot', 'test')
+    world.browser.visit(django_url('/'))
 
 
 @step(u'I am an edX user$')
 def i_am_an_edx_user(step):
-    create_user('robot')
-
-#### helper functions
+    world.create_user('robot')
 
 
-@world.absorb
-def scroll_to_bottom():
-    # Maximize the browser
-    world.browser.execute_script("window.scrollTo(0, screen.height);")
-
-
-@world.absorb
-def create_user(uname):
-
-    # If the user already exists, don't try to create it again
-    if len(User.objects.filter(username=uname)) > 0:
-        return
-
-    portal_user = UserFactory.build(username=uname, email=uname + '@edx.org')
-    portal_user.set_password('test')
-    portal_user.save()
-
-    registration = world.RegistrationFactory(user=portal_user)
-    registration.register(portal_user)
-    registration.activate()
-
-    user_profile = world.UserProfileFactory(user=portal_user)
-
-
-@world.absorb
-def log_in(username, password):
-    '''
-    Log the user in programatically
-    '''
-
-    # Authenticate the user
-    user = authenticate(username=username, password=password)
-    assert(user is not None and user.is_active)
-
-    # Send a fake HttpRequest to log the user in
-    # We need to process the request using
-    # Session middleware and Authentication middleware
-    # to ensure that session state can be stored
-    request = HttpRequest()
-    SessionMiddleware().process_request(request)
-    AuthenticationMiddleware().process_request(request)
-    login(request, user)
-
-    # Save the session
-    request.session.save()
-
-    # Retrieve the sessionid and add it to the browser's cookies
-    cookie_dict = {settings.SESSION_COOKIE_NAME: request.session.session_key}
-    try:
-        world.browser.cookies.add(cookie_dict)
-
-    # WebDriver has an issue where we cannot set cookies
-    # before we make a GET request, so if we get an error,
-    # we load the '/' page and try again
-    except:
-        world.browser.visit(django_url('/'))
-        world.browser.cookies.add(cookie_dict)
-
-
-@world.absorb
-def register_by_course_id(course_id, is_staff=False):
-    create_user('robot')
-    u = User.objects.get(username='robot')
-    if is_staff:
-        u.is_staff = True
-        u.save()
-    CourseEnrollment.objects.get_or_create(user=u, course_id=course_id)
-
-
-@world.absorb
-def save_the_html(path='/tmp'):
-    u = world.browser.url
-    html = world.browser.html.encode('ascii', 'ignore')
-    filename = '%s.html' % quote_plus(u)
-    f = open('%s/%s' % (path, filename), 'w')
-    f.write(html)
-    f.close
-
-
-@world.absorb
-def save_the_course_content(path='/tmp'):
-    html = world.browser.html.encode('ascii', 'ignore')
-    soup = BeautifulSoup(html)
-
-    # get rid of the header, we only want to compare the body
-    soup.head.decompose()
-
-    # for now, remove the data-id attributes, because they are
-    # causing mismatches between cms-master and master
-    for item in soup.find_all(attrs={'data-id': re.compile('.*')}):
-        del item['data-id']
-
-    # we also need to remove them from unrendered problems,
-    # where they are contained in the text of divs instead of
-    # in attributes of tags
-    # Be careful of whether or not it was the last attribute
-    # and needs a trailing space
-    for item in soup.find_all(text=re.compile(' data-id=".*?" ')):
-        s = unicode(item.string)
-        item.string.replace_with(re.sub(' data-id=".*?" ', ' ', s))
-
-    for item in soup.find_all(text=re.compile(' data-id=".*?"')):
-        s = unicode(item.string)
-        item.string.replace_with(re.sub(' data-id=".*?"', ' ', s))
-
-    # prettify the html so it will compare better, with
-    # each HTML tag on its own line
-    output = soup.prettify()
-
-    # use string slicing to grab everything after 'courseware/' in the URL
-    u = world.browser.url
-    section_url = u[u.find('courseware/') + 11:]
-
-
-    if not os.path.exists(path):
-        os.makedirs(path)
-
-    filename = '%s.html' % (quote_plus(section_url))
-    f = open('%s/%s' % (path, filename), 'w')
-    f.write(output)
-    f.close
-
-@world.absorb
-def css_click(css_selector):
-    try:
-        world.browser.find_by_css(css_selector).click()
-
-    except WebDriverException:
-        # Occassionally, MathJax or other JavaScript can cover up
-        # an element  temporarily.
-        # If this happens, wait a second, then try again
-        time.sleep(1)
-        world.browser.find_by_css(css_selector).click()
+@step(u'User "([^"]*)" is an edX user$')
+def registered_edx_user(step, uname):
+    world.create_user(uname)

common/djangoapps/terrain/ui_helpers.py

@@ -0,0 +1,117 @@
+#pylint: disable=C0111
+#pylint: disable=W0621
+
+from lettuce import world, step
+import time
+from urllib import quote_plus
+from selenium.common.exceptions import WebDriverException
+from selenium.webdriver.support import expected_conditions as EC
+from selenium.webdriver.common.by import By
+from selenium.webdriver.support.ui import WebDriverWait
+from lettuce.django import django_url
+
+
+@world.absorb
+def wait(seconds):
+    time.sleep(float(seconds))
+
+
+@world.absorb
+def wait_for(func):
+    WebDriverWait(world.browser.driver, 5).until(func)
+
+
+@world.absorb
+def visit(url):
+    world.browser.visit(django_url(url))
+
+
+@world.absorb
+def url_equals(url):
+    return world.browser.url == django_url(url)
+
+
+@world.absorb
+def is_css_present(css_selector):
+    return world.browser.is_element_present_by_css(css_selector, wait_time=4)
+
+
+@world.absorb
+def css_has_text(css_selector, text):
+    return world.css_text(css_selector) == text
+
+
+@world.absorb
+def css_find(css):
+    def is_visible(driver):
+        return EC.visibility_of_element_located((By.CSS_SELECTOR, css,))
+
+    world.browser.is_element_present_by_css(css, 5)
+    wait_for(is_visible)
+    return world.browser.find_by_css(css)
+
+
+@world.absorb
+def css_click(css_selector):
+    '''
+    First try to use the regular click method,
+    but if clicking in the middle of an element
+    doesn't work it might be that it thinks some other
+    element is on top of it there so click in the upper left
+    '''
+    try:
+        world.browser.find_by_css(css_selector).click()
+
+    except WebDriverException:
+        # Occassionally, MathJax or other JavaScript can cover up
+        # an element  temporarily.
+        # If this happens, wait a second, then try again
+        time.sleep(1)
+        world.browser.find_by_css(css_selector).click()
+
+
+@world.absorb
+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
+    '''
+    e = css_find(css).first
+    e.action_chains.move_to_element_with_offset(e._element, x, y)
+    e.action_chains.click()
+    e.action_chains.perform()
+
+
+@world.absorb
+def css_fill(css_selector, text):
+    world.browser.find_by_css(css_selector).first.fill(text)
+
+
+@world.absorb
+def click_link(partial_text):
+    world.browser.find_link_by_partial_text(partial_text).first.click()
+
+
+@world.absorb
+def css_text(css_selector):
+
+    # Wait for the css selector to appear
+    if world.is_css_present(css_selector):
+        return world.browser.find_by_css(css_selector).first.text
+    else:
+        return ""
+
+
+@world.absorb
+def css_visible(css_selector):
+    return world.browser.find_by_css(css_selector).visible
+
+
+@world.absorb
+def save_the_html(path='/tmp'):
+    u = world.browser.url
+    html = world.browser.html.encode('ascii', 'ignore')
+    filename = '%s.html' % quote_plus(u)
+    f = open('%s/%s' % (path, filename), 'w')
+    f.write(html)
+    f.close

common/djangoapps/xmodule_modifiers.py

@@ -108,6 +108,22 @@ def add_histogram(get_html, module, user):
         histogram = grade_histogram(module_id)
         render_histogram = len(histogram) > 0
 
+        if settings.MITX_FEATURES.get('ENABLE_LMS_MIGRATION'):
+            [filepath, filename] = getattr(module.descriptor, 'xml_attributes', {}).get('filename', ['', None])
+            osfs = module.system.filestore
+            if filename is not None and osfs.exists(filename):
+                # if original, unmangled filename exists then use it (github
+                # doesn't like symlinks)
+                filepath = filename
+            data_dir = osfs.root_path.rsplit('/')[-1]
+            giturl = getattr(module.lms, 'giturl', '') or 'https://github.com/MITx'
+            edit_link = "%s/%s/tree/master/%s" % (giturl, data_dir, filepath)
+        else:
+            edit_link = False
+            # Need to define all the variables that are about to be used
+            giturl = ""
+            data_dir = ""
+
         source_file = module.lms.source_file  # source used to generate the problem XML, eg latex or word
 
         # useful to indicate to staff if problem has been released or not
@@ -121,12 +137,15 @@ def add_histogram(get_html, module, user):
 
         staff_context = {'fields': [(field.name, getattr(module, field.name)) for field in module.fields],
                          'lms_fields': [(field.name, getattr(module.lms, field.name)) for field in module.lms.fields],
+                         'xml_attributes' : getattr(module.descriptor, 'xml_attributes', {}),
                          'location': module.location,
                          'xqa_key': module.lms.xqa_key,
                          'source_file': source_file,
+                         'source_url': '%s/%s/tree/master/%s' % (giturl, data_dir, source_file),
                          'category': str(module.__class__.__name__),
                          # Template uses element_id in js function names, so can't allow dashes
                          'element_id': module.location.html_id().replace('-', '_'),
+                         'edit_link': edit_link,
                          'user': user,
                          'xqa_server': settings.MITX_FEATURES.get('USE_XQA_SERVER', 'http://xqa:server@content-qa.mitx.mit.edu/xqa'),
                          'histogram': json.dumps(histogram),

common/lib/capa/capa/capa_problem.py

@@ -32,6 +32,8 @@ from copy import deepcopy
 
 import chem
 import chem.miller
+import chem.chemcalc
+import chem.chemtools
 import verifiers
 import verifiers.draganddrop
 
@@ -67,6 +69,9 @@ global_context = {'random': random,
                   'scipy': scipy,
                   'calc': calc,
                   'eia': eia,
+                  'chemcalc': chem.chemcalc,
+                  'chemtools': chem.chemtools,
+                  'miller': chem.miller,
                   'draganddrop': verifiers.draganddrop}
 
 # These should be removed from HTML output, including all subelements
@@ -118,7 +123,7 @@ class LoncapaProblem(object):
         #       3. Assign from the OS's random number generator
         self.seed = state.get('seed', seed)
         if self.seed is None:
-            self.seed = struct.unpack('i', os.urandom(4))
+            self.seed = struct.unpack('i', os.urandom(4))[0]
         self.student_answers = state.get('student_answers', {})
         if 'correct_map' in state:
             self.correct_map.set_dict(state['correct_map'])

common/lib/capa/capa/correctmap.py

@@ -80,16 +80,17 @@ class CorrectMap(object):
 
         Special migration case:
             If correct_map is a one-level dict, then convert it to the new dict of dicts format.
-        '''
-        if correct_map and not (type(correct_map[correct_map.keys()[0]]) == dict):
-            # empty current dict
-            self.__init__()
 
-            # create new dict entries
+        '''
+        # empty current dict
+        self.__init__()
+
+        # create new dict entries
+        if correct_map and not isinstance(correct_map.values()[0], dict):
+            # special migration
             for k in correct_map:
-                self.set(k, correct_map[k])
+                self.set(k, correctness=correct_map[k])
         else:
-            self.__init__()
             for k in correct_map:
                 self.set(k, **correct_map[k])
 

common/lib/capa/capa/inputtypes.py

@@ -655,9 +655,9 @@ class MatlabInput(CodeInput):
         # Check if problem has been queued
         self.queuename = 'matlab'
         self.queue_msg = ''
-        if 'queue_msg' in self.input_state and self.status in ['queued','incomplete', 'unsubmitted']:
+        if 'queue_msg' in self.input_state and self.status in ['queued', 'incomplete', 'unsubmitted']:
             self.queue_msg = self.input_state['queue_msg']
-        if 'queued' in self.input_state and self.input_state['queuestate'] is not None:
+        if 'queuestate' in self.input_state and self.input_state['queuestate'] == 'queued':
             self.status = 'queued'
             self.queue_len = 1
             self.msg = self.plot_submitted_msg
@@ -702,7 +702,7 @@ class MatlabInput(CodeInput):
     def _extra_context(self):
         ''' Set up additional context variables'''
         extra_context = {
-                'queue_len': self.queue_len,
+                'queue_len': str(self.queue_len),
                 'queue_msg': self.queue_msg
                 }
         return extra_context
@@ -1140,12 +1140,13 @@ registry.register(DesignProtein2dInput)
 
 class EditAGeneInput(InputTypeBase):
     """
-        An input type for editing a gene. Integrates with the genex java applet.
+        An input type for editing a gene.
+        Integrates with the genex GWT application.
 
         Example:
 
-        <editagene width="800" hight="500" dna_sequence="ETAAGGCTATAACCGA" />
-        """
+        <editagene genex_dna_sequence="CGAT" genex_problem_number="1"/>
+    """
 
     template = "editageneinput.html"
     tags = ['editageneinput']
@@ -1155,9 +1156,7 @@ class EditAGeneInput(InputTypeBase):
         """
         Note: width, height, and dna_sequencee are required.
         """
-        return [Attribute('width'),
-                Attribute('height'),
-                Attribute('dna_sequence'),
+        return [Attribute('genex_dna_sequence'),
                 Attribute('genex_problem_number')
                 ]
 

common/lib/capa/capa/responsetypes.py

@@ -17,6 +17,7 @@ import logging
 import numbers
 import numpy
 import os
+import sys
 import random
 import re
 import requests
@@ -52,12 +53,17 @@ class LoncapaProblemError(Exception):
 
 class ResponseError(Exception):
     '''
-    Error for failure in processing a response
+    Error for failure in processing a response, including
+    exceptions that occur when executing a custom script.
     '''
     pass
 
 
 class StudentInputError(Exception):
+    '''
+    Error for an invalid student input.
+    For example, submitting a string when the problem expects a number
+    '''
     pass
 
 #-----------------------------------------------------------------------------
@@ -833,7 +839,7 @@ class NumericalResponse(LoncapaResponse):
             import sys
             type, value, traceback = sys.exc_info()
 
-            raise StudentInputError, ("Invalid input: could not interpret '%s' as a number" %
+            raise StudentInputError, ("Could not interpret '%s' as a number" %
                                       cgi.escape(student_answer)), traceback
 
         if correct:
@@ -1072,13 +1078,10 @@ def sympy_check2():
                 correct = self.context['correct']
                 messages = self.context['messages']
                 overall_message = self.context['overall_message']
+
             except Exception as err:
-                print "oops in customresponse (code) error %s" % err
-                print "context = ", self.context
-                print traceback.format_exc()
-                # Notify student
-                raise StudentInputError(
-                    "Error: Problem could not be evaluated with your input")
+                self._handle_exec_exception(err)
+
         else:
             # self.code is not a string; assume its a function
 
@@ -1105,13 +1108,9 @@ def sympy_check2():
                     nargs, args, kwargs))
 
                 ret = fn(*args[:nargs], **kwargs)
+
             except Exception as err:
-                log.error("oops in customresponse (cfn) error %s" % err)
-                # print "context = ",self.context
-                log.error(traceback.format_exc())
-                raise Exception("oops in customresponse (cfn) error %s" % err)
-            log.debug(
-                "[courseware.capa.responsetypes.customresponse.get_score] ret = %s" % ret)
+                self._handle_exec_exception(err)
 
             if type(ret) == dict:
 
@@ -1147,9 +1146,9 @@ def sympy_check2():
                     correct = []
                     messages = []
                     for input_dict in input_list:
-                        correct.append('correct' 
+                        correct.append('correct'
                                 if input_dict['ok'] else 'incorrect')
-                        msg = (self.clean_message_html(input_dict['msg']) 
+                        msg = (self.clean_message_html(input_dict['msg'])
                                 if 'msg' in input_dict else None)
                         messages.append(msg)
 
@@ -1157,7 +1156,7 @@ def sympy_check2():
                 # Raise an exception
                 else:
                     log.error(traceback.format_exc())
-                    raise Exception(
+                    raise ResponseError(
                         "CustomResponse: check function returned an invalid dict")
 
             # The check function can return a boolean value,
@@ -1174,7 +1173,7 @@ def sympy_check2():
         correct_map.set_overall_message(overall_message)
 
         for k in range(len(idset)):
-            npoints = (self.maxpoints[idset[k]] 
+            npoints = (self.maxpoints[idset[k]]
                     if correct[k] == 'correct' else 0)
             correct_map.set(idset[k], correct[k], msg=messages[k],
                             npoints=npoints)
@@ -1227,6 +1226,22 @@ def sympy_check2():
             return {self.answer_ids[0]: self.expect}
         return self.default_answer_map
 
+    def _handle_exec_exception(self, err):
+        '''
+        Handle an exception raised during the execution of
+        custom Python code.
+
+        Raises a ResponseError
+        '''
+
+        # Log the error if we are debugging
+        msg = 'Error occurred while evaluating CustomResponse'
+        log.warning(msg, exc_info=True)
+
+        # Notify student with a student input error
+        _, _, traceback_obj = sys.exc_info()
+        raise ResponseError, err.message, traceback_obj
+
 #-----------------------------------------------------------------------------
 
 
@@ -1901,7 +1916,14 @@ class SchematicResponse(LoncapaResponse):
         submission = [json.loads(student_answers[
                                  k]) for k in sorted(self.answer_ids)]
         self.context.update({'submission': submission})
-        exec self.code in global_context, self.context
+
+        try:
+            exec self.code in global_context, self.context
+
+        except Exception as err:
+            _, _, traceback_obj = sys.exc_info()
+            raise ResponseError, ResponseError(err.message), traceback_obj
+
         cmap = CorrectMap()
         cmap.set_dict(dict(zip(sorted(
             self.answer_ids), self.context['correct'])))
@@ -2106,7 +2128,7 @@ class AnnotationResponse(LoncapaResponse):
             option_scoring = dict([(option['id'], {
                     'correctness': choices.get(option['choice']),
                     'points': scoring.get(option['choice'])
-                }) for option in self._find_options(inputfield) ])
+                }) for option in self._find_options(inputfield)])
 
             scoring_map[inputfield.get('id')] = option_scoring
 

common/lib/capa/capa/templates/choicegroup.html

@@ -17,7 +17,7 @@
 
         % for choice_id, choice_description in choices:
         <label for="input_${id}_${choice_id}"
-            % if input_type == 'radio' and choice_id == value:
+            % if input_type == 'radio' and ( (isinstance(value, basestring) and (choice_id == value))  or  (not isinstance(value, basestring) and choice_id in value) ):
             <% 
                 if status == 'correct':
                     correctness = 'correct'
@@ -30,9 +30,9 @@
             class="choicegroup_${correctness}"
             % endif
             % endif
-            >  
+            >
             <input type="${input_type}" name="input_${id}${name_array_suffix}" id="input_${id}_${choice_id}" value="${choice_id}"
-            % if input_type == 'radio' and choice_id == value:
+            % if input_type == 'radio' and ( (isinstance(value, basestring) and (choice_id == value))  or  (not isinstance(value, basestring) and choice_id in value) ):
             checked="true" 
             % elif input_type != 'radio' and choice_id in value:
             checked="true"

common/lib/capa/capa/templates/editageneinput.html

@@ -13,7 +13,7 @@
     % endif
     
     <div id="genex_container"></div>
-    <input type="hidden" name="dna_sequence" id="dna_sequence" value ="${dna_sequence}"></input>
+    <input type="hidden" name="genex_dna_sequence" id="genex_dna_sequence" value ="${genex_dna_sequence}"></input>
     <input type="hidden" name="genex_problem_number" id="genex_problem_number" value ="${genex_problem_number}"></input>
     <input type="hidden" name="input_${id}" id="input_${id}" value="${value|h}"/>
 

common/lib/capa/capa/tests/test_inputtypes.py

@@ -361,7 +361,6 @@ class MatlabTest(unittest.TestCase):
                  'feedback': {'message': '3'}, }
         elt = etree.fromstring(self.xml)
 
-        input_class = lookup_tag('matlabinput')
         the_input = self.input_class(test_system, elt, state)
         context = the_input._get_render_context()
 
@@ -381,6 +380,31 @@ class MatlabTest(unittest.TestCase):
 
         self.assertEqual(context, expected)
 
+    def test_rendering_while_queued(self):
+        state = {'value': 'print "good evening"',
+                 'status': 'incomplete',
+                 'input_state': {'queuestate': 'queued'},
+                 }
+        elt = etree.fromstring(self.xml)
+
+        the_input = self.input_class(test_system, elt, state)
+        context = the_input._get_render_context()
+        expected = {'id': 'prob_1_2',
+                    'value': 'print "good evening"',
+                   'status': 'queued',
+                   'msg': self.input_class.plot_submitted_msg,
+                   'mode': self.mode,
+                   'rows': self.rows,
+                   'cols': self.cols,
+                   'queue_msg': '',
+                   'linenumbers': 'true',
+                   'hidden': '',
+                   'tabsize': int(self.tabsize),
+                   'queue_len': '1',
+                   }
+
+        self.assertEqual(context, expected)
+
     def test_plot_data(self):
         get = {'submission': 'x = 1234;'}
         response = self.the_input.handle_ajax("plot", get)
@@ -391,6 +415,43 @@ class MatlabTest(unittest.TestCase):
         self.assertTrue(self.the_input.input_state['queuekey'] is not None)
         self.assertEqual(self.the_input.input_state['queuestate'], 'queued')
 
+    def test_ungraded_response_success(self):
+        queuekey = 'abcd'
+        input_state = {'queuekey': queuekey, 'queuestate': 'queued'}
+        state = {'value': 'print "good evening"',
+                 'status': 'incomplete',
+                 'input_state': input_state,
+                 'feedback': {'message': '3'}, }
+        elt = etree.fromstring(self.xml)
+
+        the_input = self.input_class(test_system, elt, state)
+        inner_msg = 'hello!'
+        queue_msg = json.dumps({'msg': inner_msg})
+
+        the_input.ungraded_response(queue_msg, queuekey)
+        self.assertTrue(input_state['queuekey'] is None)
+        self.assertTrue(input_state['queuestate'] is None)
+        self.assertEqual(input_state['queue_msg'], inner_msg)
+
+    def test_ungraded_response_key_mismatch(self):
+        queuekey = 'abcd'
+        input_state = {'queuekey': queuekey, 'queuestate': 'queued'}
+        state = {'value': 'print "good evening"',
+                 'status': 'incomplete',
+                 'input_state': input_state,
+                 'feedback': {'message': '3'}, }
+        elt = etree.fromstring(self.xml)
+
+        the_input = self.input_class(test_system, elt, state)
+        inner_msg = 'hello!'
+        queue_msg = json.dumps({'msg': inner_msg})
+
+        the_input.ungraded_response(queue_msg, 'abc')
+        self.assertEqual(input_state['queuekey'], queuekey)
+        self.assertEqual(input_state['queuestate'], 'queued')
+        self.assertFalse('queue_msg' in input_state)
+
+
 
 
 

common/lib/capa/capa/tests/test_responsetypes.py

@@ -13,6 +13,8 @@ import textwrap
 from . import test_system
 
 import capa.capa_problem as lcp
+from capa.responsetypes import LoncapaProblemError, \
+                            StudentInputError, ResponseError
 from capa.correctmap import CorrectMap
 from capa.util import convert_files_to_filenames
 from capa.xqueue_interface import dateformat
@@ -864,7 +866,7 @@ class CustomResponseTest(ResponseTest):
         # Message is interpreted as an "overall message"
         self.assertEqual(correct_map.get_overall_message(), 'Message text')
 
-    def test_script_exception(self):
+    def test_script_exception_function(self):
 
         # Construct a script that will raise an exception
         script = textwrap.dedent("""
@@ -875,7 +877,17 @@ class CustomResponseTest(ResponseTest):
         problem = self.build_problem(script=script, cfn="check_func")
 
         # Expect that an exception gets raised when we check the answer
-        with self.assertRaises(Exception):
+        with self.assertRaises(ResponseError):
+            problem.grade_answers({'1_2_1': '42'})
+
+    def test_script_exception_inline(self):
+
+        # Construct a script that will raise an exception
+        script = 'raise Exception("Test")'
+        problem = self.build_problem(answer=script)
+
+        # Expect that an exception gets raised when we check the answer
+        with self.assertRaises(ResponseError):
             problem.grade_answers({'1_2_1': '42'})
 
     def test_invalid_dict_exception(self):
@@ -889,10 +901,70 @@ class CustomResponseTest(ResponseTest):
         problem = self.build_problem(script=script, cfn="check_func")
 
         # Expect that an exception gets raised when we check the answer
-        with self.assertRaises(Exception):
+        with self.assertRaises(ResponseError):
             problem.grade_answers({'1_2_1': '42'})
 
 
+    def test_module_imports_inline(self):
+        '''
+        Check that the correct modules are available to custom
+        response scripts
+        '''
+
+        for module_name in ['random', 'numpy', 'math', 'scipy', 
+                            'calc', 'eia', 'chemcalc', 'chemtools',
+                            'miller', 'draganddrop']:
+
+            # Create a script that checks that the name is defined
+            # If the name is not defined, then the script
+            # will raise an exception
+            script = textwrap.dedent('''
+            correct[0] = 'correct'
+            assert('%s' in globals())''' % module_name)
+             
+            # Create the problem
+            problem = self.build_problem(answer=script)
+
+            # Expect that we can grade an answer without 
+            # getting an exception
+            try:
+                problem.grade_answers({'1_2_1': '42'})
+
+            except ResponseError:
+                self.fail("Could not use name '%s' in custom response" 
+                            % module_name)
+        
+    def test_module_imports_function(self):
+        '''
+        Check that the correct modules are available to custom
+        response scripts
+        '''
+
+        for module_name in ['random', 'numpy', 'math', 'scipy', 
+                            'calc', 'eia', 'chemcalc', 'chemtools',
+                            'miller', 'draganddrop']:
+
+            # Create a script that checks that the name is defined
+            # If the name is not defined, then the script
+            # will raise an exception
+            script = textwrap.dedent('''
+            def check_func(expect, answer_given):
+                assert('%s' in globals())
+                return True''' % module_name)
+             
+            # Create the problem
+            problem = self.build_problem(script=script, cfn="check_func")
+
+            # Expect that we can grade an answer without 
+            # getting an exception
+            try:
+                problem.grade_answers({'1_2_1': '42'})
+
+            except ResponseError:
+                self.fail("Could not use name '%s' in custom response" 
+                            % module_name)
+
+
 class SchematicResponseTest(ResponseTest):
     from response_xml_factory import SchematicResponseXMLFactory
     xml_factory_class = SchematicResponseXMLFactory
@@ -922,6 +994,18 @@ class SchematicResponseTest(ResponseTest):
         # is what we expect)
         self.assertEqual(correct_map.get_correctness('1_2_1'), 'correct')
 
+    def test_script_exception(self):
+
+        # Construct a script that will raise an exception
+        script = "raise Exception('test')"
+        problem = self.build_problem(answer=script)
+
+        # Expect that an exception gets raised when we check the answer
+        with self.assertRaises(ResponseError):
+            submission_dict = {'test': 'test'}
+            input_dict = {'1_2_1': json.dumps(submission_dict)}
+            problem.grade_answers(input_dict)
+
 
 class AnnotationResponseTest(ResponseTest):
     from response_xml_factory import AnnotationResponseXMLFactory

common/lib/xmodule/xmodule/abtest_module.py

@@ -33,7 +33,7 @@ def group_from_value(groups, v):
 
 class ABTestFields(object):
     group_portions = Object(help="What proportions of students should go in each group", default={DEFAULT: 1}, scope=Scope.content)
-    group_assignments = Object(help="What group this user belongs to", scope=Scope.student_preferences, default={})
+    group_assignments = Object(help="What group this user belongs to", scope=Scope.preferences, default={})
     group_content = Object(help="What content to display to each group", scope=Scope.content, default={DEFAULT: []})
     experiment = String(help="Experiment that this A/B test belongs to", scope=Scope.content)
     has_children = True

common/lib/xmodule/xmodule/annotatable_module.py

@@ -20,8 +20,7 @@ class AnnotatableModule(AnnotatableFields, XModule):
                      resource_string(__name__, 'js/src/collapsible.coffee'),
                      resource_string(__name__, 'js/src/html/display.coffee'),
                      resource_string(__name__, 'js/src/annotatable/display.coffee')],
-          'js': []
-         }
+          'js': []}
     js_module_name = "Annotatable"
     css = {'scss': [resource_string(__name__, 'css/annotatable/display.scss')]}
     icon_class = 'annotatable'
@@ -49,11 +48,11 @@ class AnnotatableModule(AnnotatableFields, XModule):
 
         if color is not None:
             if color in self.highlight_colors:
-                cls.append('highlight-'+color)
+                cls.append('highlight-' + color)
             attr['_delete'] = highlight_key
         attr['value'] = ' '.join(cls)
 
-        return { 'class' : attr }
+        return {'class': attr}
 
     def _get_annotation_data_attr(self, index, el):
         """ Returns a dict in which the keys are the HTML data attributes
@@ -73,7 +72,7 @@ class AnnotatableModule(AnnotatableFields, XModule):
             if xml_key in el.attrib:
                 value = el.get(xml_key, '')
                 html_key = attrs_map[xml_key]
-                data_attrs[html_key] = { 'value': value, '_delete': xml_key }
+                data_attrs[html_key] = {'value': value, '_delete': xml_key}
 
         return data_attrs
 
@@ -91,7 +90,6 @@ class AnnotatableModule(AnnotatableFields, XModule):
                 delete_key = attr[key]['_delete']
                 del el.attrib[delete_key]
 
-
     def _render_content(self):
         """ Renders annotatable content with annotation spans and returns HTML. """
         xmltree = etree.fromstring(self.content)
@@ -132,4 +130,3 @@ class AnnotatableDescriptor(AnnotatableFields, RawDescriptor):
     stores_state = True
     template_dir_name = "annotatable"
     mako_template = "widgets/raw-edit.html"
-

common/lib/xmodule/xmodule/capa_module.py

@@ -1,25 +1,24 @@
 import cgi
 import datetime
-import dateutil
-import dateutil.parser
 import hashlib
 import json
 import logging
 import traceback
 import sys
 
-from lxml import etree
 from pkg_resources import resource_string
 
 from capa.capa_problem import LoncapaProblem
-from capa.responsetypes import StudentInputError
+from capa.responsetypes import StudentInputError,\
+    ResponseError, LoncapaProblemError
 from capa.util import convert_files_to_filenames
 from .progress import Progress
 from xmodule.x_module import XModule
 from xmodule.raw_module import RawDescriptor
-from xmodule.exceptions import NotFoundError
-from xblock.core import Integer, Scope, BlockScope, ModelType, String, Boolean, Object, Float
-from .fields import Timedelta
+from xmodule.exceptions import NotFoundError, ProcessingError
+from xblock.core import Integer, Scope, String, Boolean, Object, Float
+from .fields import Timedelta, Date
+from xmodule.util.date_utils import time_to_datetime
 
 log = logging.getLogger("mitx.courseware")
 
@@ -84,20 +83,20 @@ class ComplexEncoder(json.JSONEncoder):
 
 
 class CapaFields(object):
-    attempts = StringyInteger(help="Number of attempts taken by the student on this problem", default=0, scope=Scope.student_state)
+    attempts = StringyInteger(help="Number of attempts taken by the student on this problem", default=0, scope=Scope.user_state)
     max_attempts = StringyInteger(help="Maximum number of attempts that a student is allowed", scope=Scope.settings)
-    due = String(help="Date that this problem is due by", scope=Scope.settings)
+    due = Date(help="Date that this problem is due by", scope=Scope.settings)
     graceperiod = Timedelta(help="Amount of time after the due date that submissions will be accepted", scope=Scope.settings)
     showanswer = String(help="When to show the problem answer to the student", scope=Scope.settings, default="closed")
     force_save_button = Boolean(help="Whether to force the save button to appear on the page", scope=Scope.settings, default=False)
     rerandomize = Randomization(help="When to rerandomize the problem", default="always", scope=Scope.settings)
     data = String(help="XML data for the problem", scope=Scope.content)
-    correct_map = Object(help="Dictionary with the correctness of current student answers", scope=Scope.student_state, default={})
-    input_state = Object(help="Dictionary for maintaining the state of inputtypes", scope=Scope.student_state, default={})
-    student_answers = Object(help="Dictionary with the current student responses", scope=Scope.student_state)
-    done = Boolean(help="Whether the student has answered the problem", scope=Scope.student_state)
+    correct_map = Object(help="Dictionary with the correctness of current student answers", scope=Scope.user_state, default={})
+    input_state = Object(help="Dictionary for maintaining the state of inputtypes", scope=Scope.user_state)
+    student_answers = Object(help="Dictionary with the current student responses", scope=Scope.user_state)
+    done = Boolean(help="Whether the student has answered the problem", scope=Scope.user_state)
     display_name = String(help="Display name for this module", scope=Scope.settings)
-    seed = StringyInteger(help="Random seed for this student", scope=Scope.student_state)
+    seed = StringyInteger(help="Random seed for this student", scope=Scope.user_state)
     weight = StringyFloat(help="How much to weight this problem by", scope=Scope.settings)
     markdown = String(help="Markdown source of this module", scope=Scope.settings)
 
@@ -109,11 +108,10 @@ class CapaModule(CapaFields, XModule):
     '''
     icon_class = 'problem'
 
-
     js = {'coffee': [resource_string(__name__, 'js/src/capa/display.coffee'),
                      resource_string(__name__, 'js/src/collapsible.coffee'),
                      resource_string(__name__, 'js/src/javascript_loader.coffee'),
-                    ],
+                     ],
           'js': [resource_string(__name__, 'js/src/capa/imageinput.js'),
                  resource_string(__name__, 'js/src/capa/schematic.js')
                  ]}
@@ -124,10 +122,7 @@ class CapaModule(CapaFields, XModule):
     def __init__(self, system, location, descriptor, model_data):
         XModule.__init__(self, system, location, descriptor, model_data)
 
-        if self.due:
-            due_date = dateutil.parser.parse(self.due)
-        else:
-            due_date = None
+        due_date = time_to_datetime(self.due)
 
         if self.graceperiod is not None and due_date:
             self.close_date = due_date + self.graceperiod
@@ -150,6 +145,16 @@ class CapaModule(CapaFields, XModule):
             # TODO (vshnayder): move as much as possible of this work and error
             # checking to descriptor load time
             self.lcp = self.new_lcp(self.get_state_for_lcp())
+
+            # At this point, we need to persist the randomization seed
+            # so that when the problem is re-loaded (to check/view/save)
+            # it stays the same.
+            # However, we do not want to write to the database
+            # every time the module is loaded.
+            # So we set the seed ONLY when there is not one set already
+            if self.seed is None:
+                self.seed = self.lcp.seed
+
         except Exception as err:
             msg = 'cannot create LoncapaProblem {loc}: {err}'.format(
                 loc=self.location.url(), err=err)
@@ -361,11 +366,11 @@ class CapaModule(CapaFields, XModule):
             self.set_state_from_lcp()
 
             # Prepend a scary warning to the student
-            warning  = '<div class="capa_reset">'\
-                       '<h2>Warning: The problem has been reset to its initial state!</h2>'\
-                       'The problem\'s state was corrupted by an invalid submission. ' \
-                       'The submission consisted of:'\
-                       '<ul>'
+            warning = '<div class="capa_reset">'\
+                      '<h2>Warning: The problem has been reset to its initial state!</h2>'\
+                      'The problem\'s state was corrupted by an invalid submission. ' \
+                      'The submission consisted of:'\
+                      '<ul>'
             for student_answer in student_answers.values():
                 if student_answer != '':
                     warning += '<li>' + cgi.escape(student_answer) + '</li>'
@@ -382,7 +387,6 @@ class CapaModule(CapaFields, XModule):
 
         return html
 
-
     def get_problem_html(self, encapsulate=True):
         '''Return html for the problem.  Adds check, reset, save buttons
         as necessary based on the problem config and state.'''
@@ -395,7 +399,6 @@ class CapaModule(CapaFields, XModule):
         except Exception, err:
             html = self.handle_problem_html_error(err)
 
-
         # The convention is to pass the name of the check button
         # if we want to show a check button, and False otherwise
         # This works because non-empty strings evaluate to True
@@ -448,18 +451,25 @@ class CapaModule(CapaFields, XModule):
             'score_update': self.update_score,
             'input_ajax': self.handle_input_ajax,
             'ungraded_response': self.handle_ungraded_response
-            }
+        }
 
         if dispatch not in handlers:
             return 'Error'
 
         before = self.get_progress()
-        d = handlers[dispatch](get)
+
+        try:
+            d = handlers[dispatch](get)
+
+        except Exception as err:
+            _, _, traceback_obj = sys.exc_info()
+            raise ProcessingError, err.message, traceback_obj
+
         after = self.get_progress()
         d.update({
             'progress_changed': after != before,
             'progress_status': Progress.to_js_status_str(after),
-            })
+        })
         return json.dumps(d, cls=ComplexEncoder)
 
     def is_past_due(self):
@@ -522,7 +532,6 @@ class CapaModule(CapaFields, XModule):
 
         return False
 
-
     def update_score(self, get):
         """
         Delivers grading response (e.g. from asynchronous code checking) to
@@ -576,7 +585,6 @@ class CapaModule(CapaFields, XModule):
         # save any state changes that may occur
         self.set_state_from_lcp()
         return response
-        
 
     def get_answer(self, get):
         '''
@@ -687,7 +695,6 @@ class CapaModule(CapaFields, XModule):
             'max_value': score['total'],
         })
 
-
     def check_problem(self, get):
         ''' Checks whether answers to a problem are correct, and
             returns a map of correct/incorrect answers:
@@ -725,9 +732,24 @@ class CapaModule(CapaFields, XModule):
         try:
             correct_map = self.lcp.grade_answers(answers)
             self.set_state_from_lcp()
-        except StudentInputError as inst:
-            log.exception("StudentInputError in capa_module:problem_check")
-            return {'success': inst.message}
+
+        except (StudentInputError, ResponseError, LoncapaProblemError) as inst:
+            log.warning("StudentInputError in capa_module:problem_check",
+                        exc_info=True)
+
+            # If the user is a staff member, include
+            # the full exception, including traceback,
+            # in the response
+            if self.system.user_is_staff:
+                msg = "Staff debug info: %s" % traceback.format_exc()
+
+            # Otherwise, display just an error message,
+            # without a stack trace
+            else:
+                msg = "Error: %s" % str(inst.message)
+
+            return {'success': msg}
+
         except Exception, err:
             if self.system.DEBUG:
                 msg = "Error checking problem: " + str(err)
@@ -755,7 +777,7 @@ class CapaModule(CapaFields, XModule):
         self.system.track_function('save_problem_check', event_info)
 
         if hasattr(self.system, 'psychometrics_handler'):  # update PsychometricsData using callback
-            self.system.psychometrics_handler(self.get_instance_state())
+            self.system.psychometrics_handler(self.get_state_for_lcp())
 
         # render problem into HTML
         html = self.get_problem_html(encapsulate=False)
@@ -778,7 +800,7 @@ class CapaModule(CapaFields, XModule):
         event_info['answers'] = answers
 
         # Too late. Cannot submit
-        if self.closed() and not self.max_attempts ==0:
+        if self.closed() and not self.max_attempts == 0:
             event_info['failure'] = 'closed'
             self.system.track_function('save_problem_fail', event_info)
             return {'success': False,
@@ -798,7 +820,7 @@ class CapaModule(CapaFields, XModule):
 
         self.system.track_function('save_problem_success', event_info)
         msg = "Your answers have been saved"
-        if not self.max_attempts ==0:
+        if not self.max_attempts == 0:
             msg += " but not graded. Hit 'Check' to grade them."
         return {'success': True,
                 'msg': msg}

common/lib/xmodule/xmodule/combined_open_ended_module.py

@@ -1,4 +1,3 @@
-import json
 import logging
 from lxml import etree
 
@@ -6,14 +5,16 @@ from pkg_resources import resource_string
 
 from xmodule.raw_module import RawDescriptor
 from .x_module import XModule
-from xblock.core import Integer, Scope, BlockScope, ModelType, String, Boolean, Object, Float, List
+from xblock.core import Integer, Scope, String, Boolean, List
 from xmodule.open_ended_grading_classes.combined_open_ended_modulev1 import CombinedOpenEndedV1Module, CombinedOpenEndedV1Descriptor
 from collections import namedtuple
+from .fields import Date
+from xmodule.open_ended_grading_classes.xblock_field_types import StringyFloat
 
 log = logging.getLogger("mitx.courseware")
 
 V1_SETTINGS_ATTRIBUTES = ["display_name", "attempts", "is_graded", "accept_file_upload",
-                          "skip_spelling_checks", "due", "graceperiod", "max_score"]
+                          "skip_spelling_checks", "due", "graceperiod"]
 
 V1_STUDENT_ATTRIBUTES = ["current_task_number", "task_states", "state",
                          "student_attempts", "ready_to_reset"]
@@ -49,26 +50,26 @@ class VersionInteger(Integer):
 
 class CombinedOpenEndedFields(object):
     display_name = String(help="Display name for this module", default="Open Ended Grading", scope=Scope.settings)
-    current_task_number = Integer(help="Current task that the student is on.", default=0, scope=Scope.student_state)
-    task_states = List(help="List of state dictionaries of each task within this module.", scope=Scope.student_state)
+    current_task_number = Integer(help="Current task that the student is on.", default=0, scope=Scope.user_state)
+    task_states = List(help="List of state dictionaries of each task within this module.", scope=Scope.user_state)
     state = String(help="Which step within the current task that the student is on.", default="initial",
-                   scope=Scope.student_state)
+                   scope=Scope.user_state)
     student_attempts = Integer(help="Number of attempts taken by the student on this problem", default=0,
-                               scope=Scope.student_state)
+                               scope=Scope.user_state)
     ready_to_reset = Boolean(help="If the problem is ready to be reset or not.", default=False,
-                             scope=Scope.student_state)
+                             scope=Scope.user_state)
     attempts = Integer(help="Maximum number of attempts that a student is allowed.", default=1, scope=Scope.settings)
     is_graded = Boolean(help="Whether or not the problem is graded.", default=False, scope=Scope.settings)
     accept_file_upload = Boolean(help="Whether or not the problem accepts file uploads.", default=False,
                                  scope=Scope.settings)
     skip_spelling_checks = Boolean(help="Whether or not to skip initial spelling checks.", default=True,
                                    scope=Scope.settings)
-    due = String(help="Date that this problem is due by", default=None, scope=Scope.settings)
+    due = Date(help="Date that this problem is due by", default=None, scope=Scope.settings)
     graceperiod = String(help="Amount of time after the due date that submissions will be accepted", default=None,
                          scope=Scope.settings)
-    max_score = Integer(help="Maximum score for the problem.", default=1, scope=Scope.settings)
     version = VersionInteger(help="Current version number", default=DEFAULT_VERSION, scope=Scope.settings)
     data = String(help="XML data for the problem", scope=Scope.content)
+    weight = StringyFloat(help="How much to weight this problem by", scope=Scope.settings)
 
 
 class CombinedOpenEndedModule(CombinedOpenEndedFields, XModule):
@@ -104,10 +105,11 @@ class CombinedOpenEndedModule(CombinedOpenEndedFields, XModule):
 
     icon_class = 'problem'
 
-    js = {'coffee': [resource_string(__name__, 'js/src/combinedopenended/display.coffee'),
-                     resource_string(__name__, 'js/src/collapsible.coffee'),
-                     resource_string(__name__, 'js/src/javascript_loader.coffee'),
-    ]}
+    js = {'coffee':
+              [resource_string(__name__, 'js/src/combinedopenended/display.coffee'),
+               resource_string(__name__, 'js/src/collapsible.coffee'),
+               resource_string(__name__, 'js/src/javascript_loader.coffee'),
+              ]}
     js_module_name = "CombinedOpenEnded"
 
     css = {'scss': [resource_string(__name__, 'css/combinedopenended/display.scss')]}
@@ -118,7 +120,7 @@ class CombinedOpenEndedModule(CombinedOpenEndedFields, XModule):
         Definition file should have one or many task blocks, a rubric block, and a prompt block:
 
         Sample file:
-        <combinedopenended attempts="10000" max_score="1">
+        <combinedopenended attempts="10000">
             <rubric>
                 Blah blah rubric.
             </rubric>
@@ -190,8 +192,8 @@ class CombinedOpenEndedModule(CombinedOpenEndedFields, XModule):
     def get_score(self):
         return self.child_module.get_score()
 
-    #def max_score(self):
-    #    return self.child_module.max_score()
+    def max_score(self):
+        return self.child_module.max_score()
 
     def get_progress(self):
         return self.child_module.get_progress()
@@ -217,5 +219,5 @@ class CombinedOpenEndedDescriptor(CombinedOpenEndedFields, RawDescriptor):
 
     stores_state = True
     has_score = True
+    always_recalculate_grades=True
     template_dir_name = "combinedopenended"
-

common/lib/xmodule/xmodule/conditional_module.py

@@ -125,7 +125,8 @@ class ConditionalModule(ConditionalFields, XModule):
         an AJAX call.
         """
         if not self.is_condition_satisfied():
-            message = self.descriptor.xml_attributes.get('message')
+            defmsg = "{link} must be attempted before this will become visible."
+            message = self.descriptor.xml_attributes.get('message', defmsg)
             context = {'module': self,
                        'message': message}
             html = self.system.render_template('conditional_module.html',

common/lib/xmodule/xmodule/course_module.py

@@ -14,6 +14,7 @@ from xmodule.seq_module import SequenceDescriptor, SequenceModule
 from xmodule.timeparse import parse_time
 from xmodule.util.decorators import lazyproperty
 from xmodule.graders import grader_from_conf
+from xmodule.util.date_utils import time_to_datetime
 import json
 
 from xblock.core import Scope, List, String, Object, Boolean
@@ -179,6 +180,7 @@ class CourseFields(object):
     has_children = True
     checklists = List(scope=Scope.settings)
     info_sidebar_name = String(scope=Scope.settings, default='Course Handouts')
+    show_timezone = Boolean(help="True if timezones should be shown on dates in the courseware", scope=Scope.settings, default=True)
 
     # An extra property is used rather than the wiki_slug/number because
     # there are courses that change the number for different runs. This allows
@@ -533,19 +535,17 @@ class CourseDescriptor(CourseFields, SequenceDescriptor):
     def _sorting_dates(self):
         # utility function to get datetime objects for dates used to
         # compute the is_new flag and the sorting_score
-        def to_datetime(timestamp):
-            return datetime(*timestamp[:6])
 
         announcement = self.announcement
         if announcement is not None:
-            announcement = to_datetime(announcement)
+            announcement = time_to_datetime(announcement)
 
         try:
             start = dateutil.parser.parse(self.advertised_start)
         except (ValueError, AttributeError):
-            start = to_datetime(self.start)
+            start = time_to_datetime(self.start)
 
-        now = to_datetime(time.gmtime())
+        now = datetime.utcnow()
 
         return announcement, start, now
 
@@ -653,7 +653,12 @@ class CourseDescriptor(CourseFields, SequenceDescriptor):
 
     @property
     def end_date_text(self):
-        return time.strftime("%b %d, %Y", self.end)
+        """
+        Returns the end date for the course formatted as a string.
+
+        If the course does not have an end date set (course.end is None), an empty string will be returned.
+        """
+        return '' if self.end is None else time.strftime("%b %d, %Y", self.end)
 
     @property
     def forum_posts_allowed(self):

common/lib/xmodule/xmodule/css/annotatable/display.scss

@@ -1,6 +1,16 @@
+/* TODO: move top-level variables to a common _variables.scss. 
+ * NOTE: These variables were only added here because when this was integrated with the CMS,
+ * SASS compilation errors were triggered because the CMS didn't have the same variables defined
+ * that the LMS did, so the quick fix was to localize the LMS variables not shared by the CMS.
+ * -Abarrett and Vshnayder
+ */
 $border-color: #C8C8C8;
 $body-font-size: em(14);
 
+.annotatable-wrapper {
+  position: relative;
+}
+
 .annotatable-header {
   margin-bottom: .5em;
   .annotatable-title {
@@ -55,6 +65,7 @@ $body-font-size: em(14);
   display: inline;
   cursor: pointer;
 
+  $highlight_index: 0;
   @each $highlight in (
     (yellow rgba(255,255,10,0.3) rgba(255,255,10,0.9)),
     (red rgba(178,19,16,0.3) rgba(178,19,16,0.9)),
@@ -62,12 +73,13 @@ $body-font-size: em(14);
     (green rgba(25,255,132,0.3) rgba(25,255,132,0.9)),
     (blue rgba(35,163,255,0.3) rgba(35,163,255,0.9)),
     (purple rgba(115,9,178,0.3) rgba(115,9,178,0.9))) {
-    
+
+    $highlight_index: $highlight_index + 1;
     $marker: nth($highlight,1);
     $color: nth($highlight,2);
     $selected_color: nth($highlight,3);
 
-    @if $marker == yellow {
+    @if $highlight_index == 1 {
       &.highlight {
         background-color: $color;
         &.selected { background-color: $selected_color; }
@@ -127,6 +139,7 @@ $body-font-size: em(14);
     font-weight: 400;
     padding: 0 10px 10px 10px;
     background-color: transparent;
+    border-color: transparent;
   } 
   p { 
       color: inherit; 
@@ -143,6 +156,7 @@ $body-font-size: em(14);
       margin: 0px 0px 10px 0;
       max-height: 225px;
       overflow: auto;
+      line-height: normal;
     }
     .annotatable-reply {
       display: block;
@@ -165,5 +179,3 @@ $body-font-size: em(14);
     border-top-color: rgba(0, 0, 0, .85);
   }
 }
-
-

common/lib/xmodule/xmodule/exceptions.py

@@ -1,6 +1,12 @@
 class InvalidDefinitionError(Exception):
     pass
 
-
 class NotFoundError(Exception):
     pass
+
+class ProcessingError(Exception):
+    '''
+    An error occurred while processing a request to the XModule.
+    For example: if an exception occurs while checking a capa problem.
+    '''
+    pass

common/lib/xmodule/xmodule/foldit_module.py

@@ -1,6 +1,5 @@
 import logging
 from lxml import etree
-from dateutil import parser
 
 from pkg_resources import resource_string
 
@@ -8,6 +7,9 @@ from xmodule.editing_module import EditingDescriptor
 from xmodule.x_module import XModule
 from xmodule.xml_module import XmlDescriptor
 from xblock.core import Scope, Integer, String
+from .fields import Date
+from xmodule.util.date_utils import time_to_datetime
+
 
 log = logging.getLogger(__name__)
 
@@ -16,7 +18,7 @@ class FolditFields(object):
     # default to what Spring_7012x uses
     required_level = Integer(default=4, scope=Scope.settings)
     required_sublevel = Integer(default=5, scope=Scope.settings)
-    due = String(help="Date that this problem is due by", scope=Scope.settings, default='')
+    due = Date(help="Date that this problem is due by", scope=Scope.settings)
 
     show_basic_score = String(scope=Scope.settings, default='false')
     show_leaderboard = String(scope=Scope.settings, default='false')
@@ -36,17 +38,8 @@ class FolditModule(FolditFields, XModule):
             required_sublevel="3"
             show_leaderboard="false"/>
         """
-        def parse_due_date():
-            """
-            Pull out the date, or None
-            """
-            s = self.due
-            if s:
-                return parser.parse(s)
-            else:
-                return None
 
-        self.due_time = parse_due_date()
+        self.due_time = time_to_datetime(self.due)
 
     def is_complete(self):
         """
@@ -178,8 +171,8 @@ class FolditDescriptor(FolditFields, XmlDescriptor, EditingDescriptor):
 
     @classmethod
     def definition_from_xml(cls, xml_object, system):
-        return ({}, [])
+        return {}, []
 
-    def definition_to_xml(self):
+    def definition_to_xml(self, resource_fs):
         xml_object = etree.Element('foldit')
         return xml_object

common/lib/xmodule/xmodule/graders.py

@@ -45,8 +45,9 @@ def invalid_args(func, argdict):
     Given a function and a dictionary of arguments, returns a set of arguments
     from argdict that aren't accepted by func
     """
-    args, varargs, keywords, defaults = inspect.getargspec(func)
-    if keywords: return set()  # All accepted
+    args, _, keywords, _ = inspect.getargspec(func)
+    if keywords:
+        return set()  # All accepted
     return set(argdict) - set(args)
 
 
@@ -119,7 +120,7 @@ class CourseGrader(object):
     that has the matching section format.
 
     The grader outputs a dictionary with the following keys:
-    - percent: Contaisn a float value, which is the final percentage score for the student.
+    - percent: Contains a float value, which is the final percentage score for the student.
     - section_breakdown: This is a list of dictionaries which provide details on sections
     that were graded. These are used for display in a graph or chart. The format for a
     section_breakdown dictionary is explained below.
@@ -150,6 +151,7 @@ class CourseGrader(object):
 
     @abc.abstractmethod
     def grade(self, grade_sheet, generate_random_scores=False):
+        '''Given a grade sheet, return a dict containing grading information'''
         raise NotImplementedError
 
 
@@ -158,7 +160,10 @@ class WeightedSubsectionsGrader(CourseGrader):
     This grader takes a list of tuples containing (grader, category_name, weight) and computes
     a final grade by totalling the contribution of each sub grader and multiplying it by the
     given weight. For example, the sections may be
-    [ (homeworkGrader, "Homework", 0.15), (labGrader, "Labs", 0.15), (midtermGrader, "Midterm", 0.30), (finalGrader, "Final", 0.40) ]
+
+    [ (homeworkGrader, "Homework", 0.15), (labGrader, "Labs", 0.15), (midtermGrader, "Midterm", 0.30),
+      (finalGrader, "Final", 0.40) ]
+
     All items in section_breakdown for each subgrader will be combined. A grade_breakdown will be
     composed using the score from each grader.
 
@@ -177,12 +182,12 @@ class WeightedSubsectionsGrader(CourseGrader):
         for subgrader, category, weight in self.sections:
             subgrade_result = subgrader.grade(grade_sheet, generate_random_scores)
 
-            weightedPercent = subgrade_result['percent'] * weight
-            section_detail = "{0} = {1:.1%} of a possible {2:.0%}".format(category, weightedPercent, weight)
+            weighted_percent = subgrade_result['percent'] * weight
+            section_detail = "{0} = {1:.1%} of a possible {2:.0%}".format(category, weighted_percent, weight)
 
-            total_percent += weightedPercent
+            total_percent += weighted_percent
             section_breakdown += subgrade_result['section_breakdown']
-            grade_breakdown.append({'percent': weightedPercent, 'detail': section_detail, 'category': category})
+            grade_breakdown.append({'percent': weighted_percent, 'detail': section_detail, 'category': category})
 
         return {'percent': total_percent,
                 'section_breakdown': section_breakdown,
@@ -203,32 +208,33 @@ class SingleSectionGrader(CourseGrader):
         self.category = category or name
 
     def grade(self, grade_sheet, generate_random_scores=False):
-        foundScore = None
+        found_score = None
         if self.type in grade_sheet:
             for score in grade_sheet[self.type]:
                 if score.section == self.name:
-                    foundScore = score
+                    found_score = score
                     break
 
-        if foundScore or generate_random_scores:
+        if found_score or generate_random_scores:
             if generate_random_scores:  	# for debugging!
                 earned = random.randint(2, 15)
                 possible = random.randint(earned, 15)
             else:   # We found the score
-                earned = foundScore.earned
-                possible = foundScore.possible
+                earned = found_score.earned
+                possible = found_score.possible
 
             percent = earned / float(possible)
             detail = "{name} - {percent:.0%} ({earned:.3n}/{possible:.3n})".format(name=self.name,
-                                                                        percent=percent,
-                                                                        earned=float(earned),
-                                                                        possible=float(possible))
+                                                                                   percent=percent,
+                                                                                   earned=float(earned),
+                                                                                   possible=float(possible))
 
         else:
             percent = 0.0
             detail = "{name} - 0% (?/?)".format(name=self.name)
 
-        breakdown = [{'percent': percent, 'label': self.short_label, 'detail': detail, 'category': self.category, 'prominent': True}]
+        breakdown = [{'percent': percent, 'label': self.short_label,
+                      'detail': detail, 'category': self.category, 'prominent': True}]
 
         return {'percent': percent,
                 'section_breakdown': breakdown,
@@ -250,6 +256,13 @@ class AssignmentFormatGrader(CourseGrader):
     show_only_average is to suppress the display of each assignment in this grader and instead
     only show the total score of this grader in the breakdown.
 
+    hide_average is to suppress the display of the total score in this grader and instead
+    only show each assignment in this grader in the breakdown.
+
+    If there is only a single assignment in this grader, then it acts like a SingleSectionGrader
+    and returns only one entry for the grader.  Since the assignment and the total are the same,
+    the total is returned but is not labeled as an average.
+
     category should be presentable to the user, but may not appear. When the grade breakdown is
     displayed, scores from the same category will be similar (for example, by color).
 
@@ -263,7 +276,8 @@ class AssignmentFormatGrader(CourseGrader):
     min_count = 2 would produce the labels "Assignment 3", "Assignment 4"
 
     """
-    def __init__(self, type, min_count, drop_count, category=None, section_type=None, short_label=None, show_only_average=False, hide_average=False, starting_index=1):
+    def __init__(self, type, min_count, drop_count, category=None, section_type=None, short_label=None,
+                 show_only_average=False, hide_average=False, starting_index=1):
         self.type = type
         self.min_count = min_count
         self.drop_count = drop_count
@@ -275,7 +289,8 @@ class AssignmentFormatGrader(CourseGrader):
         self.hide_average = hide_average
 
     def grade(self, grade_sheet, generate_random_scores=False):
-        def totalWithDrops(breakdown, drop_count):
+        def total_with_drops(breakdown, drop_count):
+            '''calculates total score for a section while dropping lowest scores'''
             #create an array of tuples with (index, mark), sorted by mark['percent'] descending
             sorted_breakdown = sorted(enumerate(breakdown), key=lambda x: -x[1]['percent'])
             # A list of the indices of the dropped scores
@@ -308,33 +323,50 @@ class AssignmentFormatGrader(CourseGrader):
                     section_name = scores[i].section
 
                 percentage = earned / float(possible)
-                summary = "{section_type} {index} - {name} - {percent:.0%} ({earned:.3n}/{possible:.3n})".format(index=i + self.starting_index,
-                                                                section_type=self.section_type,
-                                                                name=section_name,
-                                                                percent=percentage,
-                                                                earned=float(earned),
-                                                                possible=float(possible))
+                summary_format = "{section_type} {index} - {name} - {percent:.0%} ({earned:.3n}/{possible:.3n})"
+                summary = summary_format.format(index=i + self.starting_index,
+                                                section_type=self.section_type,
+                                                name=section_name,
+                                                percent=percentage,
+                                                earned=float(earned),
+                                                possible=float(possible))
             else:
                 percentage = 0
-                summary = "{section_type} {index} Unreleased - 0% (?/?)".format(index=i + self.starting_index, section_type=self.section_type)
+                summary = "{section_type} {index} Unreleased - 0% (?/?)".format(index=i + self.starting_index,
+                                                                                section_type=self.section_type)
 
-            short_label = "{short_label} {index:02d}".format(index=i + self.starting_index, short_label=self.short_label)
+            short_label = "{short_label} {index:02d}".format(index=i + self.starting_index,
+                                                             short_label=self.short_label)
 
-            breakdown.append({'percent': percentage, 'label': short_label, 'detail': summary, 'category': self.category})
+            breakdown.append({'percent': percentage, 'label': short_label,
+                              'detail': summary, 'category': self.category})
 
-        total_percent, dropped_indices = totalWithDrops(breakdown, self.drop_count)
+        total_percent, dropped_indices = total_with_drops(breakdown, self.drop_count)
 
         for dropped_index in dropped_indices:
-            breakdown[dropped_index]['mark'] = {'detail': "The lowest {drop_count} {section_type} scores are dropped.".format(drop_count=self.drop_count, section_type=self.section_type)}
+            breakdown[dropped_index]['mark'] = {'detail': "The lowest {drop_count} {section_type} scores are dropped."
+                                                .format(drop_count=self.drop_count, section_type=self.section_type)}
 
-        total_detail = "{section_type} Average = {percent:.0%}".format(percent=total_percent, section_type=self.section_type)
-        total_label = "{short_label} Avg".format(short_label=self.short_label)
+        if len(breakdown) == 1:
+            # if there is only one entry in a section, suppress the existing individual entry and the average,
+            # and just display a single entry for the section.  That way it acts automatically like a
+            # SingleSectionGrader.
+            total_detail = "{section_type} = {percent:.0%}".format(percent=total_percent,
+                                                                   section_type=self.section_type)
+            total_label = "{short_label}".format(short_label=self.short_label)
+            breakdown = [{'percent': total_percent, 'label': total_label,
+                          'detail': total_detail, 'category': self.category, 'prominent': True}, ]
+        else:
+            total_detail = "{section_type} Average = {percent:.0%}".format(percent=total_percent,
+                                                                           section_type=self.section_type)
+            total_label = "{short_label} Avg".format(short_label=self.short_label)
 
-        if self.show_only_average:
-            breakdown = []
+            if self.show_only_average:
+                breakdown = []
 
-        if not self.hide_average:
-            breakdown.append({'percent': total_percent, 'label': total_label, 'detail': total_detail, 'category': self.category, 'prominent': True})
+            if not self.hide_average:
+                breakdown.append({'percent': total_percent, 'label': total_label,
+                                  'detail': total_detail, 'category': self.category, 'prominent': True})
 
         return {'percent': total_percent,
                 'section_breakdown': breakdown,

common/lib/xmodule/xmodule/js/src/annotatable/display.coffee

@@ -1,7 +1,8 @@
 class @Annotatable
     _debug: false
 
-    # selectors for the annotatable xmodule 
+    # selectors for the annotatable xmodule
+    wrapperSelector:            '.annotatable-wrapper'
     toggleAnnotationsSelector:  '.annotatable-toggle-annotations'
     toggleInstructionsSelector: '.annotatable-toggle-instructions'
     instructionsSelector:       '.annotatable-instructions'
@@ -61,7 +62,7 @@ class @Annotatable
             my: 'bottom center' # of tooltip
             at: 'top center' # of target
             target: $(el) # where the tooltip was triggered (i.e. the annotation span)
-            container: @$el
+            container: @$(@wrapperSelector)
             adjust:
                 y: -5
         show:
@@ -75,6 +76,7 @@ class @Annotatable
             classes: 'ui-tooltip-annotatable'
         events:
             show: @onShowTip
+            move: @onMoveTip
 
     onClickToggleAnnotations: (e) => @toggleAnnotations()
 
@@ -87,6 +89,55 @@ class @Annotatable
     onShowTip: (event, api) =>
         event.preventDefault() if @annotationsHidden
 
+    onMoveTip: (event, api, position) =>
+        ###
+        This method handles an edge case in which a tooltip is displayed above
+        a non-overlapping span like this:
+
+                             (( TOOLTIP ))
+                                  \/
+        text text text ... text text text ...... <span span span>
+        <span span span>
+
+        The problem is that the tooltip looks disconnected from both spans, so
+        we should re-position the tooltip to appear above the span.
+        ###
+
+        tip = api.elements.tooltip
+        adjust_y = api.options.position?.adjust?.y || 0
+        container = api.options.position?.container || $('body')
+        target = api.elements.target
+
+        rects = $(target).get(0).getClientRects()
+        is_non_overlapping = (rects?.length == 2 and rects[0].left > rects[1].right)
+
+        if is_non_overlapping
+            # we want to choose the largest of the two non-overlapping spans and display
+            # the tooltip above the center of it (see api.options.position settings)
+            focus_rect = (if rects[0].width > rects[1].width then rects[0] else rects[1])
+            rect_center = focus_rect.left + (focus_rect.width / 2)
+            rect_top = focus_rect.top
+            tip_width = $(tip).width()
+            tip_height = $(tip).height()
+
+            # tooltip is positioned relative to its container, so we need to factor in offsets
+            container_offset = $(container).offset()
+            offset_left = -container_offset.left
+            offset_top = $(document).scrollTop() - container_offset.top
+
+            tip_left = offset_left + rect_center - (tip_width / 2)
+            tip_top =  offset_top + rect_top - tip_height + adjust_y
+
+            # make sure the new tip position doesn't clip the edges of the screen
+            win_width = $(window).width()
+            if tip_left < offset_left
+                tip_left = offset_left
+            else if tip_left + tip_width > win_width + offset_left
+                tip_left = win_width + offset_left - tip_width
+
+            # final step: update the position object (used by qtip2 to show the tip after the move event)
+            $.extend position, 'left': tip_left, 'top': tip_top
+
     getSpanForProblemReturn: (el) ->
         problem_id = $(@problemReturnSelector).index(el)
         @$(@spanSelector).filter("[data-problem-id='#{problem_id}']")

common/lib/xmodule/xmodule/modulestore/__init__.py

@@ -10,6 +10,7 @@ from collections import namedtuple
 
 from .exceptions import InvalidLocationError, InsufficientSpecificationError
 from xmodule.errortracker import ErrorLog, make_error_tracker
+from bson.son import SON
 
 log = logging.getLogger('mitx.' + 'modulestore')
 
@@ -457,3 +458,13 @@ class ModuleStoreBase(ModuleStore):
             if c.id == course_id:
                 return c
         return None
+
+
+def namedtuple_to_son(namedtuple, prefix=''):
+    """
+    Converts a namedtuple into a SON object with the same key order
+    """
+    son = SON()
+    for idx, field_name in enumerate(namedtuple._fields):
+        son[prefix + field_name] = namedtuple[idx]
+    return son

common/lib/xmodule/xmodule/modulestore/draft.py

@@ -1,7 +1,9 @@
 from datetime import datetime
 
-from . import ModuleStoreBase, Location
+from . import ModuleStoreBase, Location, namedtuple_to_son
 from .exceptions import ItemNotFoundError
+from .inheritance import own_metadata
+import logging
 
 DRAFT = 'draft'
 
@@ -15,11 +17,11 @@ def as_draft(location):
 
 def wrap_draft(item):
     """
-    Sets `item.cms.is_draft` to `True` if the item is a
+    Sets `item.is_draft` to `True` if the item is a
     draft, and `False` otherwise. Sets the item's location to the
     non-draft location in either case
     """
-    item.cms.is_draft = item.location.revision == DRAFT
+    setattr(item, 'is_draft', item.location.revision == DRAFT)
     item.location = item.location._replace(revision=None)
     return item
 
@@ -55,11 +57,10 @@ class DraftModuleStore(ModuleStoreBase):
             get_children() to cache. None indicates to cache all descendents
         """
 
-        # cdodge: we're forcing depth=0 here as the Draft store is not handling caching well
         try:
-            return wrap_draft(super(DraftModuleStore, self).get_item(as_draft(location), depth=0))
+            return wrap_draft(super(DraftModuleStore, self).get_item(as_draft(location), depth=depth))
         except ItemNotFoundError:
-            return wrap_draft(super(DraftModuleStore, self).get_item(location, depth=0))
+            return wrap_draft(super(DraftModuleStore, self).get_item(location, depth=depth))
 
     def get_instance(self, course_id, location, depth=0):
         """
@@ -67,11 +68,10 @@ class DraftModuleStore(ModuleStoreBase):
         TODO (vshnayder): this may want to live outside the modulestore eventually
         """
 
-        # cdodge: we're forcing depth=0 here as the Draft store is not handling caching well
         try:
-            return wrap_draft(super(DraftModuleStore, self).get_instance(course_id, as_draft(location), depth=0))
+            return wrap_draft(super(DraftModuleStore, self).get_instance(course_id, as_draft(location), depth=depth))
         except ItemNotFoundError:
-            return wrap_draft(super(DraftModuleStore, self).get_instance(course_id, location, depth=0))
+            return wrap_draft(super(DraftModuleStore, self).get_instance(course_id, location, depth=depth))
 
     def get_items(self, location, course_id=None, depth=0):
         """
@@ -88,9 +88,8 @@ class DraftModuleStore(ModuleStoreBase):
         """
         draft_loc = as_draft(location)
 
-        # cdodge: we're forcing depth=0 here as the Draft store is not handling caching well
-        draft_items = super(DraftModuleStore, self).get_items(draft_loc, course_id=course_id, depth=0)
-        items = super(DraftModuleStore, self).get_items(location, course_id=course_id, depth=0)
+        draft_items = super(DraftModuleStore, self).get_items(draft_loc, course_id=course_id, depth=depth)
+        items = super(DraftModuleStore, self).get_items(location, course_id=course_id, depth=depth)
 
         draft_locs_found = set(item.location._replace(revision=None) for item in draft_items)
         non_draft_items = [
@@ -118,7 +117,7 @@ class DraftModuleStore(ModuleStoreBase):
         """
         draft_loc = as_draft(location)
         draft_item = self.get_item(location)
-        if not draft_item.cms.is_draft:
+        if not getattr(draft_item, 'is_draft', False):
             self.clone_item(location, draft_loc)
 
         return super(DraftModuleStore, self).update_item(draft_loc, data)
@@ -133,7 +132,7 @@ class DraftModuleStore(ModuleStoreBase):
         """
         draft_loc = as_draft(location)
         draft_item = self.get_item(location)
-        if not draft_item.cms.is_draft:
+        if not getattr(draft_item, 'is_draft', False):
             self.clone_item(location, draft_loc)
 
         return super(DraftModuleStore, self).update_children(draft_loc, children)
@@ -149,7 +148,7 @@ class DraftModuleStore(ModuleStoreBase):
         draft_loc = as_draft(location)
         draft_item = self.get_item(location)
 
-        if not draft_item.cms.is_draft:
+        if not getattr(draft_item, 'is_draft', False):
             self.clone_item(location, draft_loc)
 
         if 'is_draft' in metadata:
@@ -183,7 +182,7 @@ class DraftModuleStore(ModuleStoreBase):
         draft.cms.published_by = published_by_id
         super(DraftModuleStore, self).update_item(location, draft._model_data._kvs._data)
         super(DraftModuleStore, self).update_children(location, draft._model_data._kvs._children)
-        super(DraftModuleStore, self).update_metadata(location, draft._model_data._kvs._metadata)
+        super(DraftModuleStore, self).update_metadata(location, own_metadata(draft))
         self.delete_item(location)
 
     def unpublish(self, location):
@@ -192,3 +191,36 @@ class DraftModuleStore(ModuleStoreBase):
         """
         super(DraftModuleStore, self).clone_item(location, as_draft(location))
         super(DraftModuleStore, self).delete_item(location)
+
+    def _query_children_for_cache_children(self, items):
+        # first get non-draft in a round-trip
+        queried_children = []
+        to_process_non_drafts = super(DraftModuleStore, self)._query_children_for_cache_children(items)
+
+        to_process_dict = {}
+        for non_draft in to_process_non_drafts:
+            to_process_dict[Location(non_draft["_id"])] = non_draft
+
+        # now query all draft content in another round-trip
+        query = {
+            '_id': {'$in': [namedtuple_to_son(as_draft(Location(item))) for item in items]}
+        }
+        to_process_drafts = list(self.collection.find(query))
+
+        # now we have to go through all drafts and replace the non-draft
+        # with the draft. This is because the semantics of the DraftStore is to
+        # always return the draft - if available
+        for draft in to_process_drafts:
+            draft_loc = Location(draft["_id"])
+            draft_as_non_draft_loc = draft_loc._replace(revision=None)
+
+            # does non-draft exist in the collection
+            # if so, replace it
+            if draft_as_non_draft_loc in to_process_dict:
+                to_process_dict[draft_as_non_draft_loc] = draft
+
+        # convert the dict - which is used for look ups - back into a list
+        for key, value in to_process_dict.iteritems():
+            queried_children.append(value)  
+
+        return queried_children

common/lib/xmodule/xmodule/modulestore/inheritance.py

@@ -8,7 +8,8 @@ INHERITABLE_METADATA = (
     # How many days early to show a course element to beta testers (float)
     # intended to be set per-course, but can be overridden in for specific
     # elements.  Can be a float.
-    'days_early_for_beta'
+    'days_early_for_beta',
+    'giturl'	# for git edit link
 )
 
 def compute_inherited_metadata(descriptor):

common/lib/xmodule/xmodule/modulestore/mongo.py

@@ -3,7 +3,6 @@ import sys
 import logging
 import copy
 
-from bson.son import SON
 from collections import namedtuple
 from fs.osfs import OSFS
 from itertools import repeat
@@ -19,7 +18,7 @@ from xmodule.error_module import ErrorDescriptor
 from xblock.runtime import DbModel, KeyValueStore, InvalidScopeError
 from xblock.core import Scope
 
-from . import ModuleStoreBase, Location
+from . import ModuleStoreBase, Location, namedtuple_to_son
 from .draft import DraftModuleStore
 from .exceptions import (ItemNotFoundError,
                          DuplicateItemError)
@@ -109,7 +108,7 @@ class CachingDescriptorSystem(MakoDescriptorSystem):
     references to metadata_inheritance_tree
     """
     def __init__(self, modulestore, module_data, default_class, resources_fs,
-                 error_tracker, render_template, metadata_cache=None):
+                 error_tracker, render_template, cached_metadata=None):
         """
         modulestore: the module store that can be used to retrieve additional modules
 
@@ -134,7 +133,8 @@ class CachingDescriptorSystem(MakoDescriptorSystem):
         # cdodge: other Systems have a course_id attribute defined. To keep things consistent, let's
         # define an attribute here as well, even though it's None
         self.course_id = None
-        self.metadata_cache = metadata_cache
+        self.cached_metadata = cached_metadata
+
 
     def load_item(self, location):
         """
@@ -170,8 +170,11 @@ class CachingDescriptorSystem(MakoDescriptorSystem):
 
                 model_data = DbModel(kvs, class_, None, MongoUsage(self.course_id, location))
                 module = class_(self, location, model_data)
-                if self.metadata_cache is not None:
-                    metadata_to_inherit = self.metadata_cache.get(metadata_cache_key(location), {}).get('parent_metadata', {}).get(location.url(), {})
+                if self.cached_metadata is not None:
+                    # parent container pointers don't differentiate between draft and non-draft
+                    # so when we do the lookup, we should do so with a non-draft location
+                    non_draft_loc = location._replace(revision=None)
+                    metadata_to_inherit = self.cached_metadata.get(non_draft_loc.url(), {})
                     inherit_metadata(module, metadata_to_inherit)
                 return module
             except:
@@ -201,16 +204,6 @@ def location_to_query(location, wildcard=True):
     return query
 
 
-def namedtuple_to_son(ntuple, prefix=''):
-    """
-    Converts a namedtuple into a SON object with the same key order
-    """
-    son = SON()
-    for idx, field_name in enumerate(ntuple._fields):
-        son[prefix + field_name] = ntuple[idx]
-    return son
-
-
 metadata_cache_key = attrgetter('org', 'course')
 
 
@@ -223,7 +216,8 @@ class MongoModuleStore(ModuleStoreBase):
     def __init__(self, host, db, collection, fs_root, render_template,
                  port=27017, default_class=None,
                  error_tracker=null_error_tracker,
-                 user=None, password=None, **kwargs):
+                 user=None, password=None, request_cache=None, 
+                 metadata_inheritance_cache_subsystem=None, **kwargs):
 
         ModuleStoreBase.__init__(self)
 
@@ -254,19 +248,21 @@ class MongoModuleStore(ModuleStoreBase):
         self.error_tracker = error_tracker
         self.render_template = render_template
         self.ignore_write_events_on_courses = []
+        self.request_cache = request_cache
+        self.metadata_inheritance_cache_subsystem = metadata_inheritance_cache_subsystem
 
-    def get_metadata_inheritance_tree(self, location):
+    def compute_metadata_inheritance_tree(self, location):
         '''
         TODO (cdodge) This method can be deleted when the 'split module store' work has been completed
         '''
 
         # get all collections in the course, this query should not return any leaf nodes
         # note this is a bit ugly as when we add new categories of containers, we have to add it here
-        query = {
-                    '_id.org': location.org,
-                    '_id.course': location.course,
-                    '_id.category': {'$in': ['course', 'chapter', 'sequential', 'vertical']}
-                }
+        query = {'_id.org': location.org,
+                 '_id.course': location.course,
+                 '_id.category': {'$in': ['course', 'chapter', 'sequential', 'vertical',
+                                          'wrapper', 'problemset', 'conditional']}
+                 }
         # we just want the Location, children, and inheritable metadata
         record_filter = {'_id': 1, 'definition.children': 1}
 
@@ -284,6 +280,17 @@ class MongoModuleStore(ModuleStoreBase):
         # now go through the results and order them by the location url
         for result in resultset:
             location = Location(result['_id'])
+            # We need to collate between draft and non-draft
+            # i.e. draft verticals can have children which are not in non-draft versions
+            location = location._replace(revision=None)
+            location_url = location.url()
+            if location_url in results_by_url:
+                existing_children = results_by_url[location_url].get('definition', {}).get('children', [])
+                additional_children = result.get('definition', {}).get('children', [])
+                total_children = existing_children + additional_children
+                if 'definition' not in results_by_url[location_url]:
+                    results_by_url[location_url]['definition'] = {}
+                results_by_url[location_url]['definition']['children'] = total_children
             results_by_url[location.url()] = result
             if location.category == 'course':
                 root = location.url()
@@ -295,17 +302,12 @@ class MongoModuleStore(ModuleStoreBase):
             """
             Helper method for computing inherited metadata for a specific location url
             """
-            my_metadata = {}
             # check for presence of metadata key. Note that a given module may not yet be fully formed.
             # example: update_item -> update_children -> update_metadata sequence on new item create
             # if we get called here without update_metadata called first then 'metadata' hasn't been set
             # as we're not fully transactional at the DB layer. Same comment applies to below key name
             # check
             my_metadata = results_by_url[url].get('metadata', {})
-            for key in my_metadata.keys():
-                if key not in INHERITABLE_METADATA:
-                    del my_metadata[key]
-            results_by_url[url]['metadata'] = my_metadata
 
             # go through all the children and recurse, but only if we have
             # in the result set. Remember results will not contain leaf nodes
@@ -323,32 +325,45 @@ class MongoModuleStore(ModuleStoreBase):
         if root is not None:
             _compute_inherited_metadata(root)
 
-        return {'parent_metadata': metadata_to_inherit,
-            'timestamp': datetime.now()}
+        return metadata_to_inherit
 
-    def get_cached_metadata_inheritance_trees(self, locations, force_refresh=False):
+    def get_cached_metadata_inheritance_tree(self, location, force_refresh=False):
         '''
         TODO (cdodge) This method can be deleted when the 'split module store' work has been completed
         '''
+        key = metadata_cache_key(location)
+        tree = {}
+        
+        if not force_refresh:
+            # see if we are first in the request cache (if present)
+            if self.request_cache is not None and key in self.request_cache.data.get('metadata_inheritance', {}):
+                return self.request_cache.data['metadata_inheritance'][key]
 
-        trees = {}
-        if locations and self.metadata_inheritance_cache is not None and not force_refresh:
-            trees = self.metadata_inheritance_cache.get_many(list(set([metadata_cache_key(loc) for loc in locations])))
-        else:
-            # This is to help guard against an accident prod runtime without a cache
-            logging.warning('Running MongoModuleStore without metadata_inheritance_cache. '
-                            'This should not happen in production!')
+            # then look in any caching subsystem (e.g. memcached)
+            if self.metadata_inheritance_cache_subsystem is not None:
+                tree = self.metadata_inheritance_cache_subsystem.get(key, {})
+            else:
+                logging.warning('Running MongoModuleStore without a metadata_inheritance_cache_subsystem. This is OK in localdev and testing environment. Not OK in production.')
 
-        to_cache = {}
-        for loc in locations:
-            cache_key = metadata_cache_key(loc)
-            if cache_key not in trees:
-                to_cache[cache_key] = trees[cache_key] = self.get_metadata_inheritance_tree(loc)
+        if not tree:
+            # if not in subsystem, or we are on force refresh, then we have to compute
+            tree = self.compute_metadata_inheritance_tree(location)
+            
+            # now write out computed tree to caching subsystem (e.g. memcached), if available
+            if self.metadata_inheritance_cache_subsystem is not None:
+                self.metadata_inheritance_cache_subsystem.set(key, tree)
 
-        if to_cache and self.metadata_inheritance_cache is not None:
-            self.metadata_inheritance_cache.set_many(to_cache)
+        # now populate a request_cache, if available. NOTE, we are outside of the
+        # scope of the above if: statement so that after a memcache hit, it'll get
+        # put into the request_cache
+        if self.request_cache is not None:
+            # we can't assume the 'metadatat_inheritance' part of the request cache dict has been
+            # defined
+            if 'metadata_inheritance' not in self.request_cache.data:
+                self.request_cache.data['metadata_inheritance'] = {}
+            self.request_cache.data['metadata_inheritance'][key] = tree
 
-        return trees
+        return tree
 
     def refresh_cached_metadata_inheritance_tree(self, location):
         """
@@ -357,15 +372,7 @@ class MongoModuleStore(ModuleStoreBase):
         """
         pseudo_course_id = '/'.join([location.org, location.course])
         if pseudo_course_id not in self.ignore_write_events_on_courses:
-            self.get_cached_metadata_inheritance_trees([location], force_refresh=True)
-
-    def clear_cached_metadata_inheritance_tree(self, location):
-        """
-        Delete the cached metadata inheritance tree for the org/course combination
-        for location
-        """
-        if self.metadata_inheritance_cache is not None:
-            self.metadata_inheritance_cache.delete(metadata_cache_key(location))
+            self.get_cached_metadata_inheritance_tree(location, force_refresh=True)
 
     def _clean_item_data(self, item):
         """
@@ -374,6 +381,13 @@ class MongoModuleStore(ModuleStoreBase):
         item['location'] = item['_id']
         del item['_id']
 
+    def _query_children_for_cache_children(self, items):
+        # first get non-draft in a round-trip
+        query = {
+            '_id': {'$in': [namedtuple_to_son(Location(item)) for item in items]}
+        }
+        return list(self.collection.find(query))
+
     def _cache_children(self, items, depth=0):
         """
         Returns a dictionary mapping Location -> item data, populated with json data
@@ -398,31 +412,17 @@ class MongoModuleStore(ModuleStoreBase):
             # Load all children by id. See
             # http://www.mongodb.org/display/DOCS/Advanced+Queries#AdvancedQueries-%24or
             # for or-query syntax
+            to_process = []
             if children:
-                query = {
-                    '_id': {'$in': [namedtuple_to_son(Location(child)) for child in children]}
-                }
-                to_process = self.collection.find(query)
-            else:
-                to_process = []
+                to_process = self._query_children_for_cache_children(children)
+
             # If depth is None, then we just recurse until we hit all the descendents
             if depth is not None:
                 depth -= 1
 
         return data
 
-    def _cache_metadata_inheritance(self, items, depth, force_refresh=False):
-        """
-        Retrieves all course metadata inheritance trees needed to load items
-        """
-
-        locations = [
-            Location(item['location']) for item in items
-            if not (item['location']['category'] == 'course' and depth == 0)
-        ]
-        return self.get_cached_metadata_inheritance_trees(locations, force_refresh=force_refresh)
-
-    def _load_item(self, item, data_cache, metadata_cache):
+    def _load_item(self, item, data_cache, apply_cached_metadata=True):
         """
         Load an XModuleDescriptor from item, using the children stored in data_cache
         """
@@ -434,6 +434,10 @@ class MongoModuleStore(ModuleStoreBase):
 
         resource_fs = OSFS(root)
 
+        cached_metadata = {}
+        if apply_cached_metadata:
+            cached_metadata = self.get_cached_metadata_inheritance_tree(Location(item['location']))
+
         # TODO (cdodge): When the 'split module store' work has been completed, we should remove
         # the 'metadata_inheritance_tree' parameter
         system = CachingDescriptorSystem(
@@ -443,7 +447,7 @@ class MongoModuleStore(ModuleStoreBase):
             resource_fs,
             self.error_tracker,
             self.render_template,
-            metadata_cache,
+            cached_metadata,
         )
         return system.load_item(item['location'])
 
@@ -453,11 +457,11 @@ class MongoModuleStore(ModuleStoreBase):
         to specified depth
         """
         data_cache = self._cache_children(items, depth)
-        inheritance_cache = self._cache_metadata_inheritance(items, depth)
 
         # if we are loading a course object, if we're not prefetching children (depth != 0) then don't
-        # bother with the metadata inheritence
-        return [self._load_item(item, data_cache, inheritance_cache) for item in items]
+        # bother with the metadata inheritance
+        return [self._load_item(item, data_cache,
+            apply_cached_metadata=(item['location']['category']!='course' or depth !=0)) for item in items]
 
     def get_courses(self):
         '''