Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/export-draft-modules

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

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

@@ -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

@@ -51,6 +51,11 @@ def edit_the_value_of_a_policy_key(step):
     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"}')
@@ -96,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 ###############

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

@@ -18,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 ####################

cms/djangoapps/contentstore/features/section.py

@@ -38,7 +38,7 @@ 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):
     set_date_and_time('input.start-date.date.hasDatepicker', '12/25/2013',
-        'input.start-time.time.ui-timepicker-input', '12:00am')
+        'input.start-time.time.ui-timepicker-input', '00:00')
     world.browser.click_link_by_text('Save')
 
 
@@ -105,7 +105,7 @@ def the_section_release_date_picker_not_visible(step):
 def the_section_release_date_is_updated(step):
     css = 'span.published-status'
     status_text = world.css_text(css)
-    assert_equal(status_text, 'Will Release: 12/25/2013 at 12:00am')
+    assert_equal(status_text, 'Will Release: 12/25/2013 at 00:00 UTC')
 
 
 ############ HELPER METHODS ###################

cms/djangoapps/contentstore/features/subsection.py

@@ -57,18 +57,18 @@ def i_see_complete_subsection_name_with_quote_in_editor(step):
 
 @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')
+    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', '4:00am')
+    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('3:00am', world.css_find('input#start_time').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('4:00am', world.css_find('input#due_time').first.value)
+    assert_equal('04:00', world.css_find('input#due_time').first.value)
 
 
 @step('I mark it as Homework$')

cms/djangoapps/contentstore/tests/test_contentstore.py

@@ -93,6 +93,69 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase):
 
         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'])
 
@@ -609,6 +672,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/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/js/base.js

@@ -37,11 +37,11 @@ $(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){
@@ -89,6 +89,9 @@ $(document).ready(function () {
     // 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 () {
         if ($('.courseware-section').length > 0) {
@@ -470,6 +473,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');
@@ -796,7 +826,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({

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,7 +22,7 @@ body, input {
 a {
   text-decoration: none;
   color: $blue;
-  @include transition(color .15s);
+  @include transition(color 0.25s ease-in-out);
 
   &:hover {
     color: #cb9c40;
@@ -52,7 +52,6 @@ h1 {
 
 // layout - basic page header
 .wrapper-mast {
-  margin: 0;
   padding: 0 $baseline;
   position: relative;
   
@@ -63,7 +62,7 @@ h1 {
     max-width: $fg-max-width;
     min-width: $fg-min-width;
     width: flex-grid(12);
-    margin: 0 auto $baseline auto;
+    margin: ($baseline*1.5) auto $baseline auto;
     color: $gray-d2;
   }
 
@@ -272,19 +271,17 @@ 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 {
@@ -351,7 +348,7 @@ h1 {
 // layout - grandfathered
 .main-wrapper {
   position: relative;
-  margin: 40px;
+  margin: 0 ($baseline*2);
 }
 
 .inner-wrapper {

cms/static/sass/_cms_mixins.scss

 // studio - utilities - mixins and extends
 // ====================
 
+// mixins - utility
 @mixin clearfix {
 	&:after {
 		content: '';
@@ -11,6 +12,7 @@
 	}
 }
 
+// mixins - grandfathered
 @mixin button {
 	display: inline-block;
 	padding: 4px 20px 6px;
@@ -110,6 +112,21 @@
 	}
 }
 
+@mixin gray-button {
+	@include button;
+	border: 1px solid $gray-d1;
+	border-radius: 3px;
+	@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: $gray-d3;
+		color: $white;
+	}
+}
+
 @mixin green-button {
 	@include button;
 	border: 1px solid $darkGreen;
@@ -279,20 +296,97 @@
 	}
 }
 
-@mixin sr-text {
-  border: 0; 
-  clip: rect(0 0 0 0); 
-  height: 1px; 
-  margin: -1px; 
-  overflow: hidden; 
-  padding: 0; 
-  position: absolute; 
-  width: 1px;
-}
-
 @mixin active {
 	@include linear-gradient(top, rgba(255, 255, 255, .4), rgba(255, 255, 255, 0));
 	background-color: rgba(255, 255, 255, .3);
 	@include box-shadow(0 -1px 0 rgba(0, 0, 0, .2) inset, 0 1px 0 #fff inset);
 	text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
-}
+}
\ No newline at end of file
+
+// ====================
+
+// 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; }
\ No newline at end of file

cms/static/sass/_reset.scss

 // 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

@@ -57,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%);
@@ -148,7 +152,7 @@ $shadow-l1: rgba(0,0,0,0.1);
 $shadow-d1: rgba(0,0,0,0.4);
 
 // colors - inherited 
-$baseFontColor: #3c3c3c;
+$baseFontColor: $gray-d2;
 $offBlack: #3c3c3c;
 $green: #108614;
 $lightGrey: #edf1f5;
@@ -163,4 +167,4 @@ $disabledGreen: rgb(124, 206, 153);
 $darkGreen: rgb(52, 133, 76);
 $lightBluishGrey: rgb(197, 207, 223);
 $lightBluishGrey2: rgb(213, 220, 228);
-$error-red: rgb(253, 87, 87);
+$error-red: rgb(253, 87, 87);
\ No newline at end of file

cms/static/sass/base-style.scss

@@ -21,9 +21,13 @@
 @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';

cms/static/sass/elements/_controls.scss

+// 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,7 +2,7 @@
 // ====================
 
 .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));

cms/static/sass/elements/_icons.scss

+// studio - elements - icons
+// ====================
+
+.icon {
+
+}
+
+.ss-icon {
+  
+}
+
+.icon-inline {
+  display: inline-block;
+  vertical-align: middle;
+  margin-right: ($baseline/4);
+}
\ No newline at end of file

cms/static/sass/elements/_sock.scss

+// 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;
+    }
+  }
+}
\ No newline at end of file

cms/static/sass/elements/_typography.scss

+// 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;
+}
\ No newline at end of file

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

@@ -604,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 {
       }
     }
   }
-}
+}
\ No newline at end of file

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;
     }
   }
-}
+}
\ No newline at end of file

cms/templates/base.html

@@ -29,9 +29,7 @@
   </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>
@@ -55,7 +53,14 @@
           document.location.protocol + '//www.youtube.com/player_api">\x3C/script>');
     </script>
 
+    <%include file="widgets/header.html" />
+    
     <%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="jsextra"></%block>
@@ -63,5 +68,3 @@
 
   <%include file="widgets/qualaroo.html" />
 </html>
-
-

cms/templates/course_info.html

@@ -80,5 +80,4 @@
       </div>
     </div>
   </div>
-  </div>
 </%block>
\ No newline at end of file

cms/templates/edit_subsection.html

@@ -33,17 +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">
-          <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 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_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} –
-                ${get_time_struct_display(parent_item.lms.start, '%m/%d/%Y at %I:%M %p')}.
+                ${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
@@ -56,14 +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">
+        <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"/>
-          <a href="#" class="remove-date">Remove due date</a>
-        </p>
+        </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

@@ -69,7 +69,7 @@
       <article class="my-classes">
         % if user.is_active:
         <ul class="class-list">
-          %for course, url, lms_link in sorted(courses, key=lambda s: s[0].lower()):
+          %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

@@ -104,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">
@@ -162,13 +148,13 @@
               <div class="section-published-date">
                 <%
                   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')
+                  start_time_str = get_time_struct_display(section.lms.start, '%H:%M')
                 %>
                 %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>
@@ -216,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))}";

cms/templates/widgets/footer.html

 <%! 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,15 +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>
         % if user.is_authenticated():
         <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>
+          <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
+        % endif    
       </ol>
     </nav>
   </footer>

cms/templates/widgets/sock.html

+<%! 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>

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/xmodule/xmodule/course_module.py

@@ -180,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

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

@@ -2,7 +2,7 @@ from datetime import datetime
 
 from . import ModuleStoreBase, Location, namedtuple_to_son
 from .exceptions import ItemNotFoundError
-import logging
+from .inheritance import own_metadata
 
 DRAFT = 'draft'
 
@@ -118,7 +118,7 @@ class DraftModuleStore(ModuleStoreBase):
         try:
             draft_item = self.get_item(location)
             if not getattr(draft_item, 'is_draft', False):
-               self.clone_item(location, draft_loc)
+                self.clone_item(location, draft_loc)
         except ItemNotFoundError, e:
             if not allow_not_found:
                 raise e
@@ -167,7 +167,6 @@ class DraftModuleStore(ModuleStoreBase):
         """
         return super(DraftModuleStore, self).delete_item(as_draft(location))
 
-
     def get_parent_locations(self, location, course_id):
         '''Find all locations that are the parents of this location.  Needed
         for path_to_location().
@@ -186,8 +185,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):
@@ -226,6 +224,6 @@ class DraftModuleStore(ModuleStoreBase):
 
         # 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)  
+            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

@@ -171,7 +171,10 @@ class CachingDescriptorSystem(MakoDescriptorSystem):
                 model_data = DbModel(kvs, class_, None, MongoUsage(self.course_id, location))
                 module = class_(self, location, model_data)
                 if self.cached_metadata is not None:
-                    metadata_to_inherit = self.cached_metadata.get(location.url(), {})
+                    # 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:
@@ -255,11 +258,11 @@ class MongoModuleStore(ModuleStoreBase):
 
         # 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}
 
@@ -277,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()
@@ -288,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

common/lib/xmodule/xmodule/tests/test_date_utils.py

@@ -5,6 +5,7 @@ from xmodule.util import date_utils
 import datetime
 import time
 
+
 def test_get_time_struct_display():
     assert_equals("", date_utils.get_time_struct_display(None, ""))
     test_time = time.struct_time((1992, 3, 12, 15, 3, 30, 1, 71, 0))
@@ -15,12 +16,20 @@ def test_get_time_struct_display():
 def test_get_default_time_display():
     assert_equals("", date_utils.get_default_time_display(None))
     test_time = time.struct_time((1992, 3, 12, 15, 3, 30, 1, 71, 0))
-    assert_equals("Mar 12, 1992 at 03:03 PM",
+    assert_equals(
+        "Mar 12, 1992 at 15:03 UTC",
         date_utils.get_default_time_display(test_time))
+    assert_equals(
+        "Mar 12, 1992 at 15:03 UTC",
+        date_utils.get_default_time_display(test_time, True))
+    assert_equals(
+        "Mar 12, 1992 at 15:03",
+        date_utils.get_default_time_display(test_time, False))
 
 
 def test_time_to_datetime():
     assert_equals(None, date_utils.time_to_datetime(None))
     test_time = time.struct_time((1992, 3, 12, 15, 3, 30, 1, 71, 0))
-    assert_equals(datetime.datetime(1992, 3, 12, 15, 3, 30),
+    assert_equals(
+        datetime.datetime(1992, 3, 12, 15, 3, 30),
         date_utils.time_to_datetime(test_time))

common/lib/xmodule/xmodule/util/date_utils.py

@@ -2,15 +2,18 @@ import time
 import datetime
 
 
-def get_default_time_display(time_struct):
+def get_default_time_display(time_struct, show_timezone=True):
     """
     Converts a time struct to a string representation. This is the default
     representation used in Studio and LMS.
-    It is of the form "Apr 09, 2013 at 04:00 PM".
+    It is of the form "Apr 09, 2013 at 16:00" or "Apr 09, 2013 at 16:00 UTC",
+    depending on the value of show_timezone.
 
-    If None is passed in, an empty string will be returned.
+    If None is passed in for time_struct, an empty string will be returned.
+    The default value of show_timezone is True.
     """
-    return get_time_struct_display(time_struct, "%b %d, %Y at %I:%M %p")
+    timezone = "" if time_struct is None or not show_timezone else " UTC"
+    return get_time_struct_display(time_struct, "%b %d, %Y at %H:%M") + timezone
 
 
 def get_time_struct_display(time_struct, format):

common/lib/xmodule/xmodule/xml_module.py

@@ -102,6 +102,7 @@ class XmlDescriptor(XModuleDescriptor):
         'start', 'due', 'graded', 'display_name', 'url_name', 'hide_from_toc',
         'ispublic', 	# if True, then course is listed for all users; see
         'xqa_key',  	# for xqaa server access
+        'giturl',	# url of git server for origin of file
         # information about testcenter exams is a dict (of dicts), not a string,
         # so it cannot be easily exportable as a course element's attribute.
         'testcenter_info',
@@ -221,6 +222,7 @@ class XmlDescriptor(XModuleDescriptor):
         definition, children = cls.definition_from_xml(definition_xml, system)
         if definition_metadata:
             definition['definition_metadata'] = definition_metadata
+        definition['filename'] = [ filepath, filename ]     
 
         return definition, children
 
@@ -314,6 +316,7 @@ class XmlDescriptor(XModuleDescriptor):
         model_data['children'] = children
 
         model_data['xml_attributes'] = {}
+        model_data['xml_attributes']['filename'] = definition.get('filename', ['', None]) # for git link
         for key, value in metadata.items():
             if key not in set(f.name for f in cls.fields + cls.lms.fields):
                 model_data['xml_attributes'][key] = value

common/static/js/vendor/timepicker/datepair.js

@@ -24,7 +24,7 @@ $(function() {
 
 	$('.datepair input.time').each(function() {
 		var $this = $(this);
-		var opts = { 'showDuration': true, 'timeFormat': 'g:ia', 'scrollDefaultNow': true };
+		var opts = { 'showDuration': true, 'timeFormat': 'H:i', 'scrollDefaultNow': true };
 
 		if ($this.hasClass('start') || $this.hasClass('end')) {
 			opts.onSelect = doDatepair;

common/test/data/simple/course.xml

@@ -12,13 +12,20 @@
       </sequential>
     </section>
   </chapter>
-  <chapter name="Chapter 2">
+  <chapter name="Chapter 2" url_name='chapter_2'>
     <section name="Problem Set 1">
       <sequential>
         <problem type="lecture" showanswer="attempted" rerandomize="true" display_name="A simple coding problem" name="Simple coding problem" filename="ps01-simple" url_name="ps01-simple"/>
       </sequential>
     </section>
     <video name="Lost Video" youtube="1.0:TBvX7HzxexQ"/>
+    <sequential format="Lecture Sequence" url_name='test_sequence'>
+        <vertical url_name='test_vertical'>
+            <html url_name='test_html'>
+                Foobar
+            </html>
+        </vertical>
+    </sequential>
   </chapter>
 
 </course>

lms/djangoapps/courseware/views.py

@@ -12,7 +12,6 @@ from django.contrib.auth.decorators import login_required
 from django.http import Http404, HttpResponse, HttpResponseRedirect
 from django.shortcuts import redirect
 from mitxmako.shortcuts import render_to_response, render_to_string
-#from django.views.decorators.csrf import ensure_csrf_cookie
 from django_future.csrf import ensure_csrf_cookie
 from django.views.decorators.cache import cache_control
 
@@ -67,9 +66,9 @@ def user_groups(user):
 @ensure_csrf_cookie
 @cache_if_anonymous
 def courses(request):
-    '''
+    """
     Render "find courses" page.  The course selection work is done in courseware.courses.
-    '''
+    """
     courses = get_courses(request.user, request.META.get('HTTP_HOST'))
     courses = sort_by_announcement(courses)
 
@@ -77,14 +76,16 @@ def courses(request):
 
 
 def render_accordion(request, course, chapter, section, model_data_cache):
-    ''' Draws navigation bar. Takes current position in accordion as
-        parameter.
+    """
+    Draws navigation bar. Takes current position in accordion as
+    parameter.
 
-        If chapter and section are '' or None, renders a default accordion.
+    If chapter and section are '' or None, renders a default accordion.
 
-        course, chapter, and section are the url_names.
+    course, chapter, and section are the url_names.
 
-        Returns the html string'''
+    Returns the html string
+    """
 
     # grab the table of contents
     user = User.objects.prefetch_related("groups").get(id=request.user.id)
@@ -92,7 +93,8 @@ def render_accordion(request, course, chapter, section, model_data_cache):
 
     context = dict([('toc', toc),
                     ('course_id', course.id),
-                    ('csrf', csrf(request)['csrf_token'])] + template_imports.items())
+                    ('csrf', csrf(request)['csrf_token']),
+                    ('show_timezone', course.show_timezone)] + template_imports.items())
     return render_to_string('courseware/accordion.html', context)
 
 
@@ -166,10 +168,10 @@ def save_child_position(seq_module, child_name):
 
 
 def check_for_active_timelimit_module(request, course_id, course):
-    '''
+    """
     Looks for a timing module for the given user and course that is currently active.
     If found, returns a context dict with timer-related values to enable display of time remaining.
-    '''
+    """
     context = {}
 
     # TODO (cpennington): Once we can query the course structure, replace this with such a query
@@ -201,11 +203,11 @@ def check_for_active_timelimit_module(request, course_id, course):
 
 
 def update_timelimit_module(user, course_id, model_data_cache, timelimit_descriptor, timelimit_module):
-    '''
+    """
     Updates the state of the provided timing module, starting it if it hasn't begun.
     Returns dict with timer-related values to enable display of time remaining.
     Returns 'timer_expiration_duration' in dict if timer is still active, and not if timer has expired.
-    '''
+    """
     context = {}
     # determine where to go when the exam ends:
     if timelimit_descriptor.time_expired_redirect_url is None:
@@ -391,14 +393,14 @@ def index(request, course_id, chapter=None, section=None,
 
 @ensure_csrf_cookie
 def jump_to(request, course_id, location):
-    '''
+    """
     Show the page that contains a specific location.
 
     If the location is invalid or not in any class, return a 404.
 
     Otherwise, delegates to the index view to figure out whether this user
     has access, and what they should see.
-    '''
+    """
     # Complain if the location isn't valid
     try:
         location = Location(location)
@@ -486,7 +488,9 @@ def syllabus(request, course_id):
 
 
 def registered_for_course(course, user):
-    '''Return CourseEnrollment if user is registered for course, else False'''
+    """
+    Return CourseEnrollment if user is registered for course, else False
+    """
     if user is None:
         return False
     if user.is_authenticated():

lms/djangoapps/instructor/views.py

@@ -93,13 +93,13 @@ def instructor_dashboard(request, course_id):
     data += compute_course_stats(course).items()
     if request.user.is_staff:
         for field in course.fields:
-            if getattr(field.scope, 'student', False):
+            if getattr(field.scope, 'user', False):
                 continue
 
             data.append([field.name, json.dumps(field.read_json(course))])
         for namespace in course.namespaces:
             for field in getattr(course, namespace).fields:
-                if getattr(field.scope, 'student', False):
+                if getattr(field.scope, 'user', False):
                     continue
 
                 data.append(["{}.{}".format(namespace, field.name), json.dumps(field.read_json(course))])
@@ -1157,7 +1157,7 @@ def dump_grading_context(course):
         msg += "--> Section %s:\n" % (gs)
         for sec in gsvals:
             s = sec['section_descriptor']
-            format = getattr(s, 'format', None)
+            format = getattr(s.lms, 'format', None)
             aname = ''
             if format in graders:
                 g = graders[format]

lms/templates/courseware/accordion.html

@@ -11,7 +11,7 @@
           <li class="${'active' if 'active' in section and section['active'] else ''} ${'graded'  if 'graded' in section and section['graded'] else ''}">
             <a href="${reverse('courseware_section', args=[course_id, chapter['url_name'], section['url_name']])}">
               <p>${section['display_name']}</p>
-              <p class="subtitle">${section['format']} ${"due " + get_default_time_display(section['due']) if section.get('due') is not None else ''}</p>
+              <p class="subtitle">${section['format']} ${"due " + get_default_time_display(section['due'], show_timezone) if section.get('due') is not None else ''}</p>
             </a>
           </li>
       % endfor

lms/templates/courseware/progress.html

@@ -64,7 +64,7 @@ ${progress_graph.body(grade_summary, course.grade_cutoffs, "grade-detail-graph",
 
                 %if section.get('due') is not None:
                   <em>
-                  due ${get_default_time_display(section['due'])}
+                  due ${get_default_time_display(section['due'], course.show_timezone)}
                   </em>
                 %endif
               </p>

lms/templates/staff_problem_info.html

 ## The JS for this is defined in xqa_interface.html
 ${module_content}
-%if location.category in ['problem','video','html']:
+%if location.category in ['problem','video','html','combinedopenended']:
 %  if edit_link:
 <div>
-	<a href="${edit_link}">Edit</a> /
-	<a href="#${element_id}_xqa-modal" onclick="javascript:getlog('${element_id}', {
+    <a href="${edit_link}">Edit</a>
+    % if xqa_key:
+        / <a href="#${element_id}_xqa-modal" onclick="javascript:getlog('${element_id}', {
         'location': '${location}',
         'xqa_key': '${xqa_key}',
         'category': '${category}',
         'user': '${user}'
      })" id="${element_id}_xqa_log">QA</a>
+    % endif
 </div>
 %  endif
 <div><a href="#${element_id}_debug" id="${element_id}_trig">Staff Debug Info</a></div>
@@ -61,6 +63,12 @@ location = ${location | h}
   <tr><td>${name}</td><td><pre style="display:inline-block; margin: 0;">${field | h}</pre></td></tr>
   %endfor
 </table>
+<table>
+  <tr><th>XML attributes</th></tr>
+  %for name, field in xml_attributes.items():
+  <tr><td>${name}</td><td><pre style="display:inline-block; margin: 0;">${field | h}</pre></td></tr>
+  %endfor
+</table>
 category = ${category | h}
     </div>
     %if render_histogram:

lms/templates/static_templates/jobs.html

@@ -75,8 +75,8 @@
       
       <article id="director-of-education-services" class="job">
         <div class="inner-wrapper">
-          <h3><strong>DIRECTOR OF EDUCATIONAL SERVICES</strong></h3>
-          <p>The edX Director of Education Services reporting to the VP of Engineering and Educational Services is responsible for:</p>
+          <h3><strong>VICE PRESIDENT/DIRECTOR OF EDUCATIONAL SERVICES</strong></h3>
+          <p>The edX VP/Director of Education Services reporting to the VP of Engineering and Educational Services is responsible for:</p>
           <ol>
             <li>Delivering 20 new courses in 2013 in collaboration with the partner Universities
               <ul>
@@ -419,13 +419,76 @@
         </div>
       </article>
       
+       <article id="sales-engineer" class="job">
+         <div class="inner-wrapper">
+             <h3><strong>SALES ENGINEER, BUSINESS DEVELOPMENT TEAM</strong></h3>
+           <p>A great relationship with edX begins long before the first student signs up. We are
+looking for some talented, self-motivated people to help set a solid foundation for
+our emerging corporate customers, NGO’s, and governmental partners. As the Sales
+Engineer you will be expected to provide oversight if requested over more junior
+staff. This may include skills development, knowledge transfer, sharing technical
+expertise, and review of demos prior to presentation. The Sales Engineer should
+have familiarity with instructional design and competency in that area is a plus.</p>
+
+<p>Experience teaching and mentoring, needs assessment and prior management
+responsibility, and LMS experience, also a plus. This is a team atmosphere with
+many constituencies working to develop a new global perspective regarding higher
+education and online learning. Respect and patience, along with knowledge and
+understanding of the development process is critical to success in order to maintain
+strong bonds between development teams, sales team, and prospect/client
+implementation teams. In addition the Sales Engineer may also work with our
+xUniversity partners and the affiliated professors joining the edX movement. This
+position requires customer facing skills, comfort in demonstrating the product, and
+ability to code ‘demos’ as required. Additionally you will be contributing to
+proposals, so clear documentation and writing skills are critical. The job will
+require travel to client sites around the US upon occasion, and possibly
+internationally as well. Job also requires good speaking skills, and a willingness and
+ability to communicate clearly and respond quickly to prospect and customer
+requests. This is a salaried position and will on occasion require work and
+responsiveness to both the edX team and customers ‘after hours’. This position
+reports to the VP, Business Development and will be dotted lined to the
+development and program management teams.</p>
+           <p><strong>Responsibilities:</strong></p>
+           <ul>
+               <li>Can code demos and evaluate demos of others</li>
+               <li>Prepare and deliver standard and custom demonstrations</li>
+               <li>Handle all pre-sales technical issues professionally and efficiently</li>
+               <li>Maintain in-depth knowledge of products and pending new releases</li>
+               <li>Maintain a working knowledge of documentation and training</li>
+               <li>Maintain a working knowledge of workflow systems</li>
+               <li>Respond to technical questions from universities looking to expand their on-line offerings</li>
+               <li>Provide feedback to Product Development regarding new features, improving product performance, and eliminating bugs in the product</li>
+               <li>Prepare Professional Services for efficient onboarding – professionally managing the transition from pre-sales to post-sales</li>
+               <li>Deliver high-level presentation and associated ‘click-thru’ demonstrations</li>
+               <li>and be able to customize to prospect’s requirements</li>
+               <li>Understand and articulate the underlying technology concepts</li>
+               <li>Understand and articulate how all products components fit together technically as well as how they integrate and work with external technologies and cross functional applications found within clients organizations.</li>
+               <li>Build relationships with our prospects and universities, to be viewed as a trusted training partner.</li>
+           </ul>
+           <p><strong>Qualifications:</strong></p>
+           <ul>
+               <li>Minimum of 5 years of experience working closely with relationship based sales organizations, preferably in an educational technology organization.</li>
+               <li>Excellent interpersonal skills including proven presentation and facilitation skills.</li>
+               <li>Strong oral and written communication skills.</li>
+               <li>Flexibility to work on a variety of initiatives; prior startup experience preferred.</li>
+               <li>Outstanding work ethic, results-oriented, and creative/innovative style.</li>
+               <li>Proactive, optimistic approach to problem solving.</li>
+               <li>Commitment to constant personal and organizational improvement.</li>
+               <li>Willingness to travel to partner sites as needed.</li>
+               <li>Lean and Agile thinking and training. Experienced in Scrum or kanban.</li>
+               <li>Bachelors or Master’s in Education, organizational learning, or other related field preferred. But we're all about education, so let us know how you gained what you need to succeed in this role: projects after completing 6.00x or CS50x, Xbox cheevos, on-line guilds led, large scale innovations championed.</li>
+           </ul>
+           
+           <p>If you are interested in this position, please send an email to <a href="mailto:jobs@edx.org">jobs@edx.org</a>.</p>
+         </div>
+       </article>
 
     </section>
 
     <section class="jobs-sidebar">
       <h2>Positions</h2>
       <nav>
-        <a href="#director-of-education-services">Director of Education Services</a>
+        <a href="#director-of-education-services">Vice President/Director of Education Services</a>
         <a href="#manager-of-training-services">Manager of Training Services</a>
 	<a href="#trainer">Trainer</a>
         <a href="#instructional-designer">Instructional Designer</a>
@@ -435,6 +498,7 @@
         <a href="#software-engineer">Software Engineer</a>
         <a href="#devops-engineer-systems-administrator">Devops Engineer - Systems Administrator</a>
         <a href="#learning-sciences-engineer">Learning Sciences Engineer</a>
+        <a href="#sales-engineer">Sales Engineer, Business Development Team</a>
       </nav>
       <h2>How to Apply</h2>
       <p>E-mail your resume, cover letter and any other materials to <a href="mailto:jobs@edx.org">jobs@edx.org</a></p>

lms/xmodule_namespace.py

@@ -52,7 +52,8 @@ class LmsNamespace(Namespace):
 
     start = Date(help="Start time when this module is visible", scope=Scope.settings)
     due = Date(help="Date that this problem is due by", scope=Scope.settings)
-    source_file = String(help="DO NOT USE", scope=Scope.settings)
+    source_file = String(help="source file name (eg for latex)", scope=Scope.settings)
+    giturl = String(help="url root for course data git repository", scope=Scope.settings)
     xqa_key = String(help="DO NOT USE", scope=Scope.settings)
     ispublic = Boolean(help="Whether this course is open to the public, or only to admins", scope=Scope.settings)
     graceperiod = Timedelta(