Merge branch 'master' of github.com:MITx/mitx into feature/cdodge/auto-forum-provision

2013-04-05 13:19:10 -04:00
parent 02f97858f6 aca6cdbade
commit 3d7f893259
152 changed files with 6856 additions and 4861 deletions
--- a/cms/djangoapps/contentstore/features/common.py
+++ b/cms/djangoapps/contentstore/features/common.py
@@ -9,6 +9,9 @@ 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__)

@@ -140,3 +143,14 @@ def add_subsection(name='Subsection One'):
    save_css = 'input.new-subsection-name-save'
    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))    
--- a/cms/djangoapps/contentstore/features/section.py
+++ b/cms/djangoapps/contentstore/features/section.py
@@ -4,8 +4,6 @@
 from lettuce import world, step
 from common import *
 from nose.tools import assert_equal
-from selenium.webdriver.common.keys import Keys
-import time

 ############### ACTIONS ####################

@@ -39,16 +37,8 @@ def i_click_the_edit_link_for_the_release_date(step):

@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'
-    world.css_fill(date_css, '12/25/2013')
-    # 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, '12:00am')
-    e = world.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', '12:00am')
    world.browser.click_link_by_text('Save')


--- a/cms/djangoapps/contentstore/features/subsection.feature
+++ b/cms/djangoapps/contentstore/features/subsection.feature
@@ -25,6 +25,13 @@ Feature: Create Subsection
    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
@@ -33,3 +40,5 @@ Feature: Create Subsection
    When I press the "subsection" delete icon
    And I confirm the alert
    Then the subsection does not exist
+   
+
--- a/cms/djangoapps/contentstore/features/subsection.py
+++ b/cms/djangoapps/contentstore/features/subsection.py
@@ -16,6 +16,18 @@ def i_have_opened_a_new_course_section(step):
    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):
    world.css_click('a.new-subsection-item')
@@ -43,9 +55,20 @@ def i_see_complete_subsection_name_with_quote_in_editor(step):
    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', '3:00am')
+    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', '4:00am')
+
+
+@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('3:00am', world.css_find('input#start_time').first.value)
+    assert_equal('01/02/2012', world.css_find('input#due_date').first.value)
+    assert_equal('4:00am', world.css_find('input#due_time').first.value)


@step('I mark it as Homework$')
--- a/cms/djangoapps/contentstore/management/commands/check_course.py
+++ b/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())
+
--- a/cms/djangoapps/contentstore/tests/test_contentstore.py
+++ b/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,43 @@ 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_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 +160,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'])

--- a/cms/djangoapps/contentstore/tests/utils.py
+++ b/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()


--- a/cms/djangoapps/contentstore/utils.py
+++ b/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
--- a/cms/djangoapps/contentstore/views.py
+++ b/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
@@ -43,17 +42,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, \
@@ -74,7 +75,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'

@@ -189,7 +191,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', {
@@ -209,19 +211,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':
@@ -278,19 +275,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)

@@ -375,7 +366,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,
@@ -449,9 +440,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
@@ -831,7 +829,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'
@@ -1274,15 +1272,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
@@ -1403,7 +1434,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)
--- a/cms/djangoapps/models/settings/course_metadata.py
+++ b/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:
--- a/cms/envs/aws.py
+++ b/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),
--- a/cms/envs/common.py
+++ b/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

--- a/cms/envs/dev.py
+++ b/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'
--- a/cms/envs/test.py
+++ b/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***'
--- a/cms/static/coffee/src/views/module_edit.coffee
+++ b/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( =>
--- a/cms/static/coffee/src/views/tabs.coffee
+++ b/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')
    }, =>
--- a/cms/static/coffee/src/views/unit.coffee
+++ b/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: =>
--- a/cms/static/js/base.js
+++ b/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');
@@ -83,6 +86,8 @@ $(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 overview section details
    $(function () {
@@ -160,6 +165,18 @@ function smoothScrollLink(e) {
    });
 }

+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 +245,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 +254,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 +305,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 +328,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 +369,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 +438,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() {
@@ -543,6 +572,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 +622,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 +674,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 +735,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 +781,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",
--- a/cms/static/js/views/checklists_view.js
+++ b/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
            });
--- a/cms/static/js/views/course_info_edit.js
+++ b/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) {
--- a/cms/static/js/views/settings/advanced_view.js
+++ b/cms/static/js/views/settings/advanced_view.js
@@ -137,6 +137,10 @@ 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
        });
--- a/cms/static/sass/_base.scss
+++ b/cms/static/sass/_base.scss
@@ -644,7 +644,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);
--- a/cms/static/sass/_variables.scss
+++ b/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);
--- a/cms/static/sass/base-style.scss
+++ b/cms/static/sass/base-style.scss
@@ -27,7 +27,8 @@
@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';
--- a/cms/static/sass/elements/_header.scss
+++ b/cms/static/sass/elements/_header.scss
@@ -132,7 +132,7 @@

 // specific elements - course nav
 .nav-course {
-  width: 335px;
+  width: 285px;
  margin-top: -($baseline/4);
  @include font-size(14);

--- a/cms/static/sass/elements/_tender-widget.scss
+++ b/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;
+}
--- a/cms/static/sass/elements/_jquery-ui-calendar.scss
+++ b/cms/static/sass/elements/_jquery-ui-calendar.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;
 }
--- a/cms/static/sass/views/_outline.scss
+++ b/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;

--- a/cms/templates/base.html
+++ b/cms/templates/base.html
@@ -23,6 +23,8 @@
    <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>

@@ -55,9 +57,11 @@

    <%block name="content"></%block>
    <%include file="widgets/footer.html" />
-
+    <%include file="widgets/tender.html" />
    <%block name="jsextra"></%block>
  </body>
+
+  <%include file="widgets/qualaroo.html" />
 </html>


--- a/cms/templates/edit_subsection.html
+++ b/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">
@@ -38,18 +35,15 @@
      <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"/>
+          <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"/>
+          <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>
        % 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 %I:%M %p')}.
            % endif
            <a href="#" class="sync-date no-spinner">Sync to ${parent_item.display_name_with_default}.</a></p>
        % endif
@@ -66,12 +60,8 @@
      <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"/>
+          <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"/>
+          <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"/>
          <a href="#" class="remove-date">Remove due date</a>
        </p>
      </div>
--- a/cms/templates/index.html
+++ b/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()):
          <li>
            <a class="class-link" href="${url}" class="class-name">
              <span class="class-name">${course}</span>
--- a/cms/templates/overview.html
+++ b/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>
@@ -163,11 +161,10 @@
              </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, '%I:%M %p')
                %>
-                %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:
--- a/cms/templates/unit.html
+++ b/cms/templates/unit.html
@@ -28,6 +28,7 @@
      });
    });

+    var unit_location_analytics = '${unit_location}';
  </script>

 </%block>
--- a/cms/templates/widgets/footer.html
+++ b/cms/templates/widgets/footer.html
@@ -14,15 +14,14 @@
        <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 -->
+        <li class="nav-item nav-peripheral-feedback">
+          <a class="show-tender" href="http://help.edge.edx.org/discussion/new" title="Use our feedback tool, Tender, to share your feedback">Contact Us</a>
+        </li>
        % endif
      </ol>
    </nav>
--- a/cms/templates/widgets/header.html
+++ b/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 ">
--- a/cms/templates/widgets/qualaroo.html
+++ b/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
--- a/cms/templates/widgets/segment-io.html
+++ b/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
--- a/cms/templates/widgets/tender.html
+++ b/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
--- a/cms/xmodule_namespace.py
+++ b/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)