diff --git a/README b/README deleted file mode 100644 index 2ed50ba063..0000000000 --- a/README +++ /dev/null @@ -1 +0,0 @@ -See doc/ for documentation. diff --git a/README.md b/README.md new file mode 100644 index 0000000000..ec17d7c9a4 --- /dev/null +++ b/README.md @@ -0,0 +1,148 @@ +This is edX, a platform for online course delivery. The project is primarily +written in [Python](http://python.org/), using the +[Django](https://www.djangoproject.com/) framework. We also use some +[Ruby](http://www.ruby-lang.org/) and some [NodeJS](http://nodejs.org/). + +Installation +============ +The installation process is a bit messy at the moment. Here's a high-level +overview of what you should do to get started. + +**TLDR:** There is a `create-dev-env.sh` script that will attempt to set all +of this up for you. If you're in a hurry, run that script. Otherwise, I suggest +that you understand what the script is doing, and why, by reading this document. + +Directory Hierarchy +------------------- +This code assumes that it is checked out in a directory that has three sibling +directories: `data` (used for XML course data), `db` (used to hold a +[sqlite](https://sqlite.org/) database), and `log` (used to hold logs). If you +clone the repository into a directory called `edx` inside of a directory +called `dev`, here's an example of how the directory hierarchy should look: + + * dev + \ + * data + * db + * log + * edx + \ + README.md + +Language Runtimes +----------------- +You'll need to be sure that you have Python 2.7, Ruby 1.9.3, and NodeJS +(latest stable) installed on your system. Some of these you can install +using your system's package manager: [homebrew](http://mxcl.github.io/homebrew/) +for Mac, [apt](http://wiki.debian.org/Apt) for Debian-based systems +(including Ubuntu), [rpm](http://www.rpm.org/) or [yum](http://yum.baseurl.org/) +for Red Hat based systems (including CentOS). + +If your system's package manager gives you the wrong version of a language +runtime, then you'll need to use a versioning tool to install the correct version. +Usually, you'll need to do this for Ruby: you can use +[`rbenv`](https://github.com/sstephenson/rbenv) or [`rvm`](https://rvm.io/), but +typically `rbenv` is simpler. For Python, you can use +[`pythonz`](http://saghul.github.io/pythonz/), +and for Node, you can use [`nvm`](https://github.com/creationix/nvm). + +Virtual Environments +-------------------- +Often, different projects will have conflicting dependencies: for example, two +projects depending on two different, incompatible versions of a library. Clearly, +you can't have both versions installed and used on your machine simultaneously. +Virtual environments were created to solve this problem: by installing libraries +into an isolated environment, only projects that live inside the environment +will be able to see and use those libraries. Got incompatible dependencies? Use +different virtual environments, and your problem is solved. + +Remember, each language has a different implementation. Python has +[`virtualenv`](http://www.virtualenv.org/), Ruby has +[`bundler`](http://gembundler.com/), and Node's virtual environment support +is built into [`npm`](https://npmjs.org/), its library management tool. +For each language, decide if you want to use a virtual environment, or if you +want to install all the language dependencies globally (and risk conflicts). +I suggest you start with installing things globally until and unless things +break; you can always switch over to a virtual environment later on. + +Language Packages +----------------- +The Python libraries we use are listed in `requirements.txt`. The Ruby libraries +we use are listed in `Gemfile`. The Node libraries we use are listed in +`packages.json`. Python has a library installer called +[`pip`](http://www.pip-installer.org/), Ruby has a library installer called +[`gem`](https://rubygems.org/) (or `bundle` if you're using a virtual +environment), and Node has a library installer called +[`npm`](https://npmjs.org/). +Once you've got your languages and virtual environments set up, install +the libraries like so: + + $ pip install -r pre-requirements.txt + $ pip install -r requirements.txt + $ bundle install + $ npm install + +Other Dependencies +------------------ +You'll also need to install [MongoDB](http://www.mongodb.org/), since our +application uses it in addition to sqlite. You can install it through your +system package manager, and I suggest that you configure it to start +automatically when you boot up your system, so that you never have to worry +about it again. For Mac, use +[`launchd`](https://developer.apple.com/library/mac/documentation/Darwin/Reference/ManPages/man8/launchd.8.html) +(running `brew info mongodb` will give you some commands you can copy-paste.) +For Linux, you can use [`upstart`](http://upstart.ubuntu.com/), `chkconfig`, +or any other process management tool. + +Configuring Your Project +------------------------ +We use [`rake`](http://rake.rubyforge.org/) to execute common tasks in our +project. The `rake` tasks are defined in the `rakefile`, or you can run `rake -T` +to view a summary. + +Before you run your project, you need to create a sqlite database, create +tables in that database, run database migrations, and populate templates for +CMS templates. Fortunately, `rake` will do all of this for you! Just run: + + $ rake django-admin[syncdb] + $ rake django-admin[migrate] + $ rake django-admin[update_templates] + +If you are running these commands using the [`zsh`](http://www.zsh.org/) shell, +zsh will assume that you are doing +[shell globbing](https://en.wikipedia.org/wiki/Glob_(programming)), search for +a file in your directory named `django-adminsyncdb` or `django-adminmigrate`, +and fail. To fix this, just surround the argument with quotation marks, so that +you're running `rake "django-admin[syncdb]"`. + +Run Your Project +---------------- +edX has two components: Studio, the course authoring system; and the LMS +(learning management system) used by students. These two systems communicate +through the MongoDB database, which stores course information. + +To run Studio, run: + + $ rake cms + +To run the LMS, run: + + $ rake lms[cms.dev] + +Studio runs on port 8001, while LMS runs on port 8000, so you can run both of +these commands simultaneously, using two different terminal windows. To view +Studio, visit `127.0.0.1:8001` in your web browser; to view the LMS, visit +`127.0.0.1:8000`. + +There's also an older version of the LMS that saves its information in XML files +in the `data` directory, instead of in Mongo. To run this older version, run: + +$ rake lms + +Further Documentation +===================== +Once you've got your project up and running, you can check out the `docs` +directory to see more documentation about how edX is structured. + + + diff --git a/cms/djangoapps/contentstore/module_info_model.py b/cms/djangoapps/contentstore/module_info_model.py index 91f722a699..f7d1bbd8fe 100644 --- a/cms/djangoapps/contentstore/module_info_model.py +++ b/cms/djangoapps/contentstore/module_info_model.py @@ -75,11 +75,7 @@ def set_module_info(store, location, post_data): # IMPORTANT NOTE: if the client passed pack 'null' (None) for a piece of metadata that means 'remove it' for metadata_key, value in posted_metadata.items(): - # let's strip out any metadata fields from the postback which have been identified as system metadata - # and therefore should not be user-editable, so we should accept them back from the client - if metadata_key in module.system_metadata_fields: - del posted_metadata[metadata_key] - elif posted_metadata[metadata_key] is None: + if posted_metadata[metadata_key] is None: # remove both from passed in collection as well as the collection read in from the modulestore if metadata_key in module._model_data: del module._model_data[metadata_key] diff --git a/cms/djangoapps/contentstore/views.py b/cms/djangoapps/contentstore/views.py index caf3901e03..824d2119f1 100644 --- a/cms/djangoapps/contentstore/views.py +++ b/cms/djangoapps/contentstore/views.py @@ -676,11 +676,7 @@ def save_item(request): # IMPORTANT NOTE: if the client passed pack 'null' (None) for a piece of metadata that means 'remove it' for metadata_key, value in posted_metadata.items(): - # let's strip out any metadata fields from the postback which have been identified as system metadata - # and therefore should not be user-editable, so we should accept them back from the client - if metadata_key in existing_item.system_metadata_fields: - del posted_metadata[metadata_key] - elif posted_metadata[metadata_key] is None: + if posted_metadata[metadata_key] is None: # remove both from passed in collection as well as the collection read in from the modulestore if metadata_key in existing_item._model_data: del existing_item._model_data[metadata_key] diff --git a/cms/djangoapps/models/settings/course_metadata.py b/cms/djangoapps/models/settings/course_metadata.py index 4429e35692..708e79f0a3 100644 --- a/cms/djangoapps/models/settings/course_metadata.py +++ b/cms/djangoapps/models/settings/course_metadata.py @@ -14,13 +14,14 @@ class CourseMetadata(object): The objects have no predefined attrs but instead are obj encodings of the editable metadata. ''' - FILTERED_LIST = XModuleDescriptor.system_metadata_fields + ['start', - 'end', - 'enrollment_start', - 'enrollment_end', - 'tabs', - 'graceperiod', - 'checklists'] + FILTERED_LIST = ['xml_attributes', + 'start', + 'end', + 'enrollment_start', + 'enrollment_end', + 'tabs', + 'graceperiod', + 'checklists'] @classmethod def fetch(cls, course_location): diff --git a/cms/static/coffee/spec/views/module_edit_spec.coffee b/cms/static/coffee/spec/views/module_edit_spec.coffee index 5e83ecb42d..baf9ee9c20 100644 --- a/cms/static/coffee/spec/views/module_edit_spec.coffee +++ b/cms/static/coffee/spec/views/module_edit_spec.coffee @@ -72,3 +72,14 @@ describe "CMS.Views.ModuleEdit", -> it "loads the .xmodule-display inside the module editor", -> expect(XModule.loadModule).toHaveBeenCalled() expect(XModule.loadModule.mostRecentCall.args[0]).toBe($('.xmodule_display')) + + describe "changedMetadata", -> + it "returns empty if no metadata loaded", -> + expect(@moduleEdit.changedMetadata()).toEqual({}) + + it "returns only changed values", -> + @moduleEdit.originalMetadata = {'foo', 'bar'} + spyOn(@moduleEdit, 'metadata').andReturn({'a': '', 'b': 'before', 'c': ''}) + @moduleEdit.loadEdit() + @moduleEdit.metadata.andReturn({'a': '', 'b': 'after', 'd': 'only_after'}) + expect(@moduleEdit.changedMetadata()).toEqual({'b' : 'after', 'd' : 'only_after'}) diff --git a/cms/static/coffee/src/views/module_edit.coffee b/cms/static/coffee/src/views/module_edit.coffee index 3cb3b1703f..bf56807f66 100644 --- a/cms/static/coffee/src/views/module_edit.coffee +++ b/cms/static/coffee/src/views/module_edit.coffee @@ -20,6 +20,7 @@ class CMS.Views.ModuleEdit extends Backbone.View loadEdit: -> if not @module @module = XModule.loadModule(@$el.find('.xmodule_edit')) + @originalMetadata = @metadata() metadata: -> # cdodge: package up metadata which is separated into a number of input fields @@ -35,6 +36,14 @@ class CMS.Views.ModuleEdit extends Backbone.View return _metadata + changedMetadata: -> + currentMetadata = @metadata() + changedMetadata = {} + for key of currentMetadata + if currentMetadata[key] != @originalMetadata[key] + changedMetadata[key] = currentMetadata[key] + return changedMetadata + cloneTemplate: (parent, template) -> $.post("/clone_item", { parent_location: parent @@ -60,7 +69,7 @@ class CMS.Views.ModuleEdit extends Backbone.View course: course_location_analytics id: _this.model.id - data.metadata = _.extend(data.metadata || {}, @metadata()) + data.metadata = _.extend(data.metadata || {}, @changedMetadata()) @hideModal() @model.save(data).done( => # # showToastMessage("Your changes have been saved.", null, 3) diff --git a/cms/static/js/base.js b/cms/static/js/base.js index 3a51d797ec..c8371fcf64 100644 --- a/cms/static/js/base.js +++ b/cms/static/js/base.js @@ -10,7 +10,7 @@ var $newComponentTypePicker; var $newComponentTemplatePickers; var $newComponentButton; -$(document).ready(function () { +$(document).ready(function() { $body = $('body'); $modal = $('.history-modal'); $modalCover = $('
'); @@ -35,7 +35,7 @@ $(document).ready(function () { $('.uploads .upload-button').bind('click', showUploadModal); $('.upload-modal .close-button').bind('click', hideModal); - $body.on('click', '.embeddable-xml-input', function () { + $body.on('click', '.embeddable-xml-input', function() { $(this).select(); }); @@ -45,8 +45,11 @@ $(document).ready(function () { $('.new-unit-item').bind('click', createNewUnit); // lean/simple modal - $('a[rel*=modal]').leanModal({overlay : 0.80, closeButton: '.action-modal-close' }); - $('a.action-modal-close').click(function(e){ + $('a[rel*=modal]').leanModal({ + overlay: 0.80, + closeButton: '.action-modal-close' + }); + $('a.action-modal-close').click(function(e) { (e).preventDefault(); }); @@ -55,12 +58,12 @@ $(document).ready(function () { $('.action-notification-close').bind('click', hideNotification); // nav - dropdown related - $body.click(function (e) { + $body.click(function(e) { $('.nav-dropdown .nav-item .wrapper-nav-sub').removeClass('is-shown'); $('.nav-dropdown .nav-item .title').removeClass('is-selected'); }); - $('.nav-dropdown .nav-item .title').click(function (e) { + $('.nav-dropdown .nav-item .title').click(function(e) { $subnav = $(this).parent().find('.wrapper-nav-sub'); $title = $(this).parent().find('.title'); @@ -70,9 +73,7 @@ $(document).ready(function () { if ($subnav.hasClass('is-shown')) { $subnav.removeClass('is-shown'); $title.removeClass('is-selected'); - } - - else { + } else { $('.nav-dropdown .nav-item .title').removeClass('is-selected'); $('.nav-dropdown .nav-item .wrapper-nav-sub').removeClass('is-shown'); $title.addClass('is-selected'); @@ -84,8 +85,11 @@ $(document).ready(function () { $('a[rel="external"]').attr('title', 'This link will open in a new browser window/tab').bind('click', linkNewWindow); // general link management - lean modal window - $('a[rel="modal"]').attr('title', 'This link will open in a modal window').leanModal({overlay: 0.50, closeButton: '.action-modal-close' }); - $('.action-modal-close').click(function (e) { + $('a[rel="modal"]').attr('title', 'This link will open in a modal window').leanModal({ + overlay: 0.50, + closeButton: '.action-modal-close' + }); + $('.action-modal-close').click(function(e) { (e).preventDefault(); }); @@ -99,7 +103,7 @@ $(document).ready(function () { $('.cta-show-sock').bind('click', toggleSock); // toggling overview section details - $(function () { + $(function() { if ($('.courseware-section').length > 0) { $('.toggle-button-sections').addClass('is-shown'); } @@ -108,7 +112,7 @@ $(document).ready(function () { // autosave when leaving input field $body.on('change', '.subsection-display-name-input', saveSubsection); - $('.subsection-display-name-input').each(function () { + $('.subsection-display-name-input').each(function() { this.val = $(this).val(); }); $("#start_date, #start_time, #due_date, #due_time").bind('change', autosaveInput); @@ -129,7 +133,7 @@ $(document).ready(function () { // import form setup $('.import .file-input').bind('change', showImportSubmit); - $('.import .choose-file-button, .import .choose-file-button-inline').bind('click', function (e) { + $('.import .choose-file-button, .import .choose-file-button-inline').bind('click', function(e) { e.preventDefault(); $('.import .file-input').click(); }); @@ -152,12 +156,12 @@ $(document).ready(function () { $body.on('click', '.section-published-date .schedule-button', editSectionPublishDate); $body.on('click', '.edit-subsection-publish-settings .save-button', saveSetSectionScheduleDate); $body.on('click', '.edit-subsection-publish-settings .cancel-button', hideModal); - $body.on('change', '.edit-subsection-publish-settings .start-date', function () { + $body.on('change', '.edit-subsection-publish-settings .start-date', function() { if ($('.edit-subsection-publish-settings').find('.start-time').val() == '') { $('.edit-subsection-publish-settings').find('.start-time').val('12:00am'); } }); - $('.edit-subsection-publish-settings').on('change', '.start-date, .start-time', function () { + $('.edit-subsection-publish-settings').on('change', '.start-date, .start-time', function() { $('.edit-subsection-publish-settings').find('.save-button').show(); }); }); @@ -177,7 +181,7 @@ function smoothScrollLink(e) { // On AWS instances, this base.js gets wrapped in a separate scope as part of Django static // pipelining (note, this doesn't happen on local runtimes). So if we set it on window, // when we can access it from other scopes (namely Course Advanced Settings). -window.CmsUtils.smoothScrollTop = function (e) { +window.CmsUtils.smoothScrollTop = function(e) { (e).preventDefault(); $.smoothScroll({ @@ -260,8 +264,7 @@ function getEdxTimeFromDateTimeVals(date_val, time_val) { var edxTimeStr = null; if (date_val != '') { - if (time_val == '') - time_val = '00:00'; + if (time_val == '') time_val = '00:00'; // 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); @@ -284,7 +287,7 @@ function autosaveInput(e) { clearTimeout(this.saveTimer); } - this.saveTimer = setTimeout(function () { + this.saveTimer = setTimeout(function() { $changedInput = $(e.target); saveSubsection(); self.saveTimer = null; @@ -324,12 +327,15 @@ function saveSubsection() { type: "POST", dataType: "json", contentType: "application/json", - data: JSON.stringify({ 'id': id, 'metadata': metadata}), - success: function () { + data: JSON.stringify({ + 'id': id, + 'metadata': metadata + }), + success: function() { $spinner.delay(500).fadeOut(150); $changedInput = null; }, - error: function () { + error: function() { showToastMessage('There has been an error while saving your changes.'); } }); @@ -348,15 +354,16 @@ function createNewUnit(e) { }); - $.post('/clone_item', - {'parent_location': parent, - 'template': template, - 'display_name': 'New Unit' - }, - function (data) { - // redirect to the edit page - window.location = "/edit/" + data['id']; - }); + $.post('/clone_item', { + 'parent_location': parent, + 'template': template, + 'display_name': 'New Unit' + }, + + function(data) { + // redirect to the edit page + window.location = "/edit/" + data['id']; + }); } function deleteUnit(e) { @@ -375,8 +382,7 @@ function deleteSection(e) { } function _deleteItem($el) { - if (!confirm('Are you sure you wish to delete this item. It cannot be reversed!')) - return; + if (!confirm('Are you sure you wish to delete this item. It cannot be reversed!')) return; var id = $el.data('id'); @@ -386,11 +392,15 @@ function _deleteItem($el) { }); - $.post('/delete_item', - {'id': id, 'delete_children': true, 'delete_all_versions': true}, - function (data) { - $el.remove(); - }); + $.post('/delete_item', { + 'id': id, + 'delete_children': true, + 'delete_all_versions': true + }, + + function(data) { + $el.remove(); + }); } function showUploadModal(e) { @@ -492,18 +502,16 @@ function toggleSock(e) { $sockContent.toggle('fast'); $.smoothScroll({ - offset: -200, - easing: 'swing', - speed: 1000, - scrollElement: null, - scrollTarget: $sock + offset: -200, + easing: 'swing', + speed: 1000, + scrollElement: null, + scrollTarget: $sock }); - if($sock.hasClass('is-shown')) { + if ($sock.hasClass('is-shown')) { $btnLabel.text(gettext('Hide Studio Help')); - } - - else { + } else { $btnLabel.text(gettext('Looking for Help with Studio?')); } } @@ -549,7 +557,7 @@ function removeDateSetter(e) { function hideNotification(e) { (e).preventDefault(); - $(this).closest('.wrapper-notification').removeClass('is-shown').addClass('is-hiding').attr('aria-hidden','true'); + $(this).closest('.wrapper-notification').removeClass('is-shown').addClass('is-hiding').attr('aria-hidden', 'true'); } function hideAlert(e) { @@ -580,7 +588,7 @@ function showToastMessage(message, $button, lifespan) { $toast.fadeIn(200); if (lifespan) { - $toast.timer = setTimeout(function () { + $toast.timer = setTimeout(function() { $toast.fadeOut(300); }, lifespan * 1000); } @@ -602,7 +610,9 @@ function addNewSection(e, isTemplate) { $newSection.find('.new-section-name').focus().select(); $newSection.find('.section-name-form').bind('submit', saveNewSection); $cancelButton.bind('click', cancelNewSection); - $body.bind('keyup', { $cancelButton: $cancelButton }, checkForCancel); + $body.bind('keyup', { + $cancelButton: $cancelButton + }, checkForCancel); } function checkForCancel(e) { @@ -627,15 +637,14 @@ function saveNewSection(e) { }); $.post('/clone_item', { - 'parent_location': parent, - 'template': template, - 'display_name': display_name, - }, - function (data) { - if (data.id != undefined) - location.reload(); - } - ); + 'parent_location': parent, + 'template': template, + 'display_name': display_name, + }, + + function(data) { + if (data.id != undefined) location.reload(); + }); } function cancelNewSection(e) { @@ -654,7 +663,9 @@ function addNewCourse(e) { $newCourse.find('.new-course-name').focus().select(); $newCourse.find('form').bind('submit', saveNewCourse); $cancelButton.bind('click', cancelNewCourse); - $body.bind('keyup', { $cancelButton: $cancelButton }, checkForCancel); + $body.bind('keyup', { + $cancelButton: $cancelButton + }, checkForCancel); } function saveNewCourse(e) { @@ -678,18 +689,19 @@ function saveNewCourse(e) { }); $.post('/create_new_course', { - 'template': template, - 'org': org, - 'number': number, - 'display_name': display_name - }, - function (data) { - if (data.id != undefined) { - window.location = '/' + data.id.replace(/.*:\/\//, ''); - } else if (data.ErrMsg != undefined) { - alert(data.ErrMsg); - } - }); + 'template': template, + 'org': org, + 'number': number, + 'display_name': display_name + }, + + function(data) { + if (data.id != undefined) { + window.location = '/' + data.id.replace(/.*:\/\//, ''); + } else if (data.ErrMsg != undefined) { + alert(data.ErrMsg); + } + }); } function cancelNewCourse(e) { @@ -715,7 +727,9 @@ function addNewSubsection(e) { $newSubsection.find('.new-subsection-form').bind('submit', saveNewSubsection); $cancelButton.bind('click', cancelNewSubsection); - $body.bind('keyup', { $cancelButton: $cancelButton }, checkForCancel); + $body.bind('keyup', { + $cancelButton: $cancelButton + }, checkForCancel); } function saveNewSubsection(e) { @@ -732,16 +746,16 @@ function saveNewSubsection(e) { $.post('/clone_item', { - 'parent_location': parent, - 'template': template, - 'display_name': display_name - }, - function (data) { - if (data.id != undefined) { - location.reload(); - } + 'parent_location': parent, + 'template': template, + 'display_name': display_name + }, + + function(data) { + if (data.id != undefined) { + location.reload(); } - ); + }); } function cancelNewSubsection(e) { @@ -757,7 +771,9 @@ function editSectionName(e) { $(this).children('.section-name-span').hide(); $(this).find('.section-name-edit').bind('submit', saveEditSectionName); $(this).find('.edit-section-name-cancel').bind('click', cancelNewSection); - $body.bind('keyup', { $cancelButton: $(this).find('.edit-section-name-cancel') }, checkForCancel); + $body.bind('keyup', { + $cancelButton: $(this).find('.edit-section-name-cancel') + }, checkForCancel); } function cancelEditSectionName(e) { @@ -798,14 +814,19 @@ function saveEditSectionName(e) { type: "POST", dataType: "json", contentType: "application/json", - data: JSON.stringify({ 'id': id, 'metadata': {'display_name': display_name}}) - }).success(function () { - $spinner.delay(250).fadeOut(250); - $_this.closest('h3').find('.section-name-span').html(display_name).show(); - $_this.hide(); - $_this.closest('.section-name').bind('click', editSectionName); - e.stopPropagation(); - }); + data: JSON.stringify({ + 'id': id, + 'metadata': { + 'display_name': display_name + } + }) + }).success(function() { + $spinner.delay(250).fadeOut(250); + $_this.closest('h3').find('.section-name-span').html(display_name).show(); + $_this.hide(); + $_this.closest('.section-name').bind('click', editSectionName); + e.stopPropagation(); + }); } function setSectionScheduleDate(e) { @@ -842,28 +863,36 @@ function saveSetSectionScheduleDate(e) { type: "POST", dataType: "json", contentType: "application/json", - data: JSON.stringify({ 'id': id, 'metadata': {'start': start}}) - }).success(function () { - var $thisSection = $('.courseware-section[data-id="' + id + '"]'); - var format = gettext('Will Release: %(date)s at $(time)s UTC'); - var willReleaseAt = interpolate(format, [input_date, input_time], true); - $thisSection.find('.section-published-date').html( - '' + willReleaseAt + '' + - '' + - gettext('Edit') + ''); - $thisSection.find('.section-published-date').animate({ - 'background-color': 'rgb(182,37,104)' - }, 300).animate({ - 'background-color': '#edf1f5' - }, 300).animate({ - 'background-color': 'rgb(182,37,104)' - }, 300).animate({ - 'background-color': '#edf1f5' - }, 300); + data: JSON.stringify({ + 'id': id, + 'metadata': { + 'start': start + } + }) + }).success(function() { + var $thisSection = $('.courseware-section[data-id="' + id + '"]'); + var format = gettext('Will Release: %(date)s at %(time)s UTC'); + var willReleaseAt = interpolate(format, { + 'date': input_date, + 'time': input_time + }, + true); + $thisSection.find('.section-published-date').html( + '' + willReleaseAt + '' + + '' + gettext('Edit') + ''); + $thisSection.find('.section-published-date').animate({ + 'background-color': 'rgb(182,37,104)' + }, 300).animate({ + 'background-color': '#edf1f5' + }, 300).animate({ + 'background-color': 'rgb(182,37,104)' + }, 300).animate({ + 'background-color': '#edf1f5' + }, 300); - hideModal(); - }); + hideModal(); + }); } diff --git a/cms/static/js/hesitate.js b/cms/static/js/hesitate.js index c5848a6c0c..8609562220 100644 --- a/cms/static/js/hesitate.js +++ b/cms/static/js/hesitate.js @@ -2,13 +2,13 @@ * Create a HesitateEvent and assign it as the event to execute: * $(el).on('mouseEnter', CMS.HesitateEvent( expand, 'mouseLeave').trigger); * It calls the executeOnTimeOut function with the event.currentTarget after the configurable timeout IFF the cancelSelector event - * did not occur on the event.currentTarget. - * - * More specifically, when trigger is called (triggered by the event you bound it to), it starts a timer + * did not occur on the event.currentTarget. + * + * More specifically, when trigger is called (triggered by the event you bound it to), it starts a timer * which the cancelSelector event will cancel or if the timer finished, it executes the executeOnTimeOut function * passing it the original event (whose currentTarget s/b the specific ele). It never accumulates events; however, it doesn't hurt for your * code to minimize invocations of trigger by binding to mouseEnter v mouseOver and such. - * + * * NOTE: if something outside of this wants to cancel the event, invoke cachedhesitation.untrigger(null | anything); */ @@ -25,7 +25,7 @@ CMS.HesitateEvent.DURATION = 800; CMS.HesitateEvent.prototype.trigger = function(event) { if (event.data.timeoutEventId == null) { event.data.timeoutEventId = window.setTimeout( - function() { event.data.fireEvent(event); }, + function() { event.data.fireEvent(event); }, CMS.HesitateEvent.DURATION); event.data.originalEvent = event; $(event.data.originalEvent.delegateTarget).on(event.data.cancelSelector, event.data, event.data.untrigger); @@ -45,4 +45,4 @@ CMS.HesitateEvent.prototype.untrigger = function(event) { $(event.data.originalEvent.delegateTarget).off(event.data.cancelSelector, event.data.untrigger); } event.data.timeoutEventId = null; -}; \ No newline at end of file +}; diff --git a/cms/static/js/main.js b/cms/static/js/main.js index 4a9b5d2374..2d72edc4bf 100644 --- a/cms/static/js/main.js +++ b/cms/static/js/main.js @@ -80,6 +80,6 @@ $(document).ready(function(){ $('section.problem-edit').show(); return false; }); - + }); diff --git a/cms/static/js/models/course_info.js b/cms/static/js/models/course_info.js index 8cb5a654cb..3bd7ffa97a 100644 --- a/cms/static/js/models/course_info.js +++ b/cms/static/js/models/course_info.js @@ -1,17 +1,17 @@ -// single per course holds the updates and handouts +// single per course holds the updates and handouts CMS.Models.CourseInfo = Backbone.Model.extend({ // This model class is not suited for restful operations and is considered just a server side initialized container url: '', - + defaults: { "courseId": "", // the location url "updates" : null, // UpdateCollection "handouts": null // HandoutCollection }, - + idAttribute : "courseId" }); - + // course update -- biggest kludge here is the lack of a real id to map updates to originals CMS.Models.CourseUpdate = Backbone.Model.extend({ defaults: { @@ -26,11 +26,11 @@ CMS.Models.CourseUpdate = Backbone.Model.extend({ */ CMS.Models.CourseUpdateCollection = Backbone.Collection.extend({ url : function() {return this.urlbase + "course_info/updates/";}, - + model : CMS.Models.CourseUpdate }); - - - \ No newline at end of file + + + diff --git a/cms/static/js/models/course_relative.js b/cms/static/js/models/course_relative.js index 99bb1c6d77..6608f92a4f 100644 --- a/cms/static/js/models/course_relative.js +++ b/cms/static/js/models/course_relative.js @@ -16,7 +16,7 @@ CMS.Models.Location = Backbone.Model.extend({ }, _tagPattern : /[^:]+/g, _fieldPattern : new RegExp('[^/]+','g'), - + parse: function(payload) { if (_.isArray(payload)) { return { @@ -25,7 +25,7 @@ CMS.Models.Location = Backbone.Model.extend({ course: payload[2], category: payload[3], name: payload[4] - } + }; } else if (_.isString(payload)) { this._tagPattern.lastIndex = 0; // odd regex behavior requires this to be reset sometimes @@ -65,4 +65,4 @@ CMS.Models.CourseRelative = Backbone.Model.extend({ CMS.Models.CourseRelativeCollection = Backbone.Collection.extend({ model : CMS.Models.CourseRelative -}); \ No newline at end of file +}); diff --git a/cms/static/js/models/module_info.js b/cms/static/js/models/module_info.js index 6a593372c4..529d155aba 100644 --- a/cms/static/js/models/module_info.js +++ b/cms/static/js/models/module_info.js @@ -6,5 +6,5 @@ CMS.Models.ModuleInfo = Backbone.Model.extend({ "data": null, "metadata" : null, "children" : null - }, -}); \ No newline at end of file + } +}); diff --git a/cms/static/js/models/settings/advanced.js b/cms/static/js/models/settings/advanced.js index adc259239d..c074b12067 100644 --- a/cms/static/js/models/settings/advanced.js +++ b/cms/static/js/models/settings/advanced.js @@ -11,7 +11,7 @@ CMS.Models.Settings.Advanced = Backbone.Model.extend({ validate: function (attrs) { // Keys can no longer be edited. We are currently not validating values. }, - + save : function (attrs, options) { // wraps the save call w/ the deletion of the removed keys after we know the saved ones worked options = options ? _.clone(options) : {}; @@ -23,7 +23,7 @@ CMS.Models.Settings.Advanced = Backbone.Model.extend({ }; Backbone.Model.prototype.save.call(this, attrs, options); }, - + afterSave : function(self) { // remove deleted attrs if (!_.isEmpty(self.deleteKeys)) { diff --git a/cms/static/js/models/settings/course_details.js b/cms/static/js/models/settings/course_details.js index d41545cca9..b71b4e2ab2 100644 --- a/cms/static/js/models/settings/course_details.js +++ b/cms/static/js/models/settings/course_details.js @@ -66,7 +66,7 @@ CMS.Models.Settings.CourseDetails = Backbone.Model.extend({ save_videosource: function(newsource) { // newsource either is