From a68dee9743b8ae8c4e0ed1ab513ee8eb28a11ff7 Mon Sep 17 00:00:00 2001 From: Don Mitchell Date: Tue, 27 Nov 2012 16:38:21 -0500 Subject: [PATCH] Got rid of datepair as it was generating a jquery bug but also not doing what we wanted. --- cms/static/js/views/settings/main_settings_view.js | 7 +++++-- cms/templates/settings.html | 8 ++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/cms/static/js/views/settings/main_settings_view.js b/cms/static/js/views/settings/main_settings_view.js index a023f40232..b80cc3f48e 100644 --- a/cms/static/js/views/settings/main_settings_view.js +++ b/cms/static/js/views/settings/main_settings_view.js @@ -126,13 +126,16 @@ CMS.Views.Settings.Details = Backbone.View.extend({ var div = this.$el.find(elementName); var datefield = $(div).find(".date"); var timefield = $(div).find(".time"); - var savefield = function(event) { + var savefield = function() { cacheModel.save(fieldName, new Date(datefield.datepicker('getDate').getTime() + timefield.timepicker("getSecondsFromMidnight") * 1000)); }; + // instrument as date and time pickers + timefield.timepicker(); + // FIXME being called 2x on each change. Was trapping datepicker onSelect b4 but change to datepair broke that - datefield.on('change', savefield); + datefield.datepicker({ onSelect : savefield }); timefield.on('changeTime', savefield); datefield.datepicker('setDate', this.model.get(fieldName)); diff --git a/cms/templates/settings.html b/cms/templates/settings.html index 8487c314e0..4d62bf6c1f 100644 --- a/cms/templates/settings.html +++ b/cms/templates/settings.html @@ -216,20 +216,20 @@ from contentstore import utils Important steps and segments of your course -
+

Course Dates:

- + First day the course begins
- + (UTC/GMT -5 hours)
@@ -252,7 +252,7 @@ from contentstore import utils
-
+

Enrollment Dates: