diff --git a/lms/static/js/spec/student_account/account_settings_factory_spec.js b/lms/static/js/spec/student_account/account_settings_factory_spec.js index fc7483eaa5..44204a5781 100644 --- a/lms/static/js/spec/student_account/account_settings_factory_spec.js +++ b/lms/static/js/spec/student_account/account_settings_factory_spec.js @@ -59,11 +59,6 @@ define(['backbone', 'jquery', 'underscore', 'common/js/spec_helpers/ajax_helpers beforeEach(function () { setFixtures('
'); - TemplateHelpers.installTemplate('templates/fields/field_readonly'); - TemplateHelpers.installTemplate('templates/fields/field_dropdown'); - TemplateHelpers.installTemplate('templates/fields/field_link'); - TemplateHelpers.installTemplate('templates/fields/field_text'); - TemplateHelpers.installTemplate('templates/student_account/account_settings'); }); it("shows loading error when UserAccountModel fails to load", function() { diff --git a/lms/static/js/spec/student_account/account_settings_fields_spec.js b/lms/static/js/spec/student_account/account_settings_fields_spec.js index dd31bfad54..c924872f82 100644 --- a/lms/static/js/spec/student_account/account_settings_fields_spec.js +++ b/lms/static/js/spec/student_account/account_settings_fields_spec.js @@ -15,11 +15,6 @@ define(['backbone', 'jquery', 'underscore', 'common/js/spec_helpers/ajax_helpers timerCallback; beforeEach(function () { - TemplateHelpers.installTemplate('templates/fields/field_readonly'); - TemplateHelpers.installTemplate('templates/fields/field_dropdown'); - TemplateHelpers.installTemplate('templates/fields/field_link'); - TemplateHelpers.installTemplate('templates/fields/field_text'); - timerCallback = jasmine.createSpy('timerCallback'); jasmine.Clock.useMock(); }); diff --git a/lms/static/js/spec/student_account/account_settings_view_spec.js b/lms/static/js/spec/student_account/account_settings_view_spec.js index 740a99b7ae..d1ab101a15 100644 --- a/lms/static/js/spec/student_account/account_settings_view_spec.js +++ b/lms/static/js/spec/student_account/account_settings_view_spec.js @@ -61,11 +61,6 @@ define(['backbone', 'jquery', 'underscore', 'common/js/spec_helpers/ajax_helpers beforeEach(function () { setFixtures('
'); - TemplateHelpers.installTemplate('templates/fields/field_readonly'); - TemplateHelpers.installTemplate('templates/fields/field_dropdown'); - TemplateHelpers.installTemplate('templates/fields/field_link'); - TemplateHelpers.installTemplate('templates/fields/field_text'); - TemplateHelpers.installTemplate('templates/student_account/account_settings'); }); it("shows loading error correctly", function() { diff --git a/lms/static/js/spec/student_profile/learner_profile_factory_spec.js b/lms/static/js/spec/student_profile/learner_profile_factory_spec.js index 08aa1947f8..c6bc477b38 100644 --- a/lms/static/js/spec/student_profile/learner_profile_factory_spec.js +++ b/lms/static/js/spec/student_profile/learner_profile_factory_spec.js @@ -1,4 +1,5 @@ -define(['backbone', 'jquery', 'underscore', 'common/js/spec_helpers/ajax_helpers', 'common/js/spec_helpers/template_helpers', +define(['backbone', 'jquery', 'underscore', 'common/js/spec_helpers/ajax_helpers', + 'common/js/spec_helpers/template_helpers', 'js/spec/student_account/helpers', 'js/spec/student_profile/helpers', 'js/views/fields', @@ -19,12 +20,6 @@ define(['backbone', 'jquery', 'underscore', 'common/js/spec_helpers/ajax_helpers beforeEach(function () { loadFixtures('js/fixtures/student_profile/student_profile.html'); - TemplateHelpers.installTemplate('templates/fields/field_readonly'); - TemplateHelpers.installTemplate('templates/fields/field_dropdown'); - TemplateHelpers.installTemplate('templates/fields/field_textarea'); - TemplateHelpers.installTemplate('templates/fields/field_image'); - TemplateHelpers.installTemplate('templates/fields/message_banner'); - TemplateHelpers.installTemplate('templates/student_profile/learner_profile'); }); var createProfilePage = function(ownProfile, options) { diff --git a/lms/static/js/spec/student_profile/learner_profile_view_spec.js b/lms/static/js/spec/student_profile/learner_profile_view_spec.js index 520ce2cb8f..45cee672da 100644 --- a/lms/static/js/spec/student_profile/learner_profile_view_spec.js +++ b/lms/static/js/spec/student_profile/learner_profile_view_spec.js @@ -123,12 +123,6 @@ define(['backbone', 'jquery', 'underscore', 'common/js/spec_helpers/ajax_helpers beforeEach(function () { loadFixtures('js/fixtures/student_profile/student_profile.html'); - TemplateHelpers.installTemplate('templates/fields/field_readonly'); - TemplateHelpers.installTemplate('templates/fields/field_dropdown'); - TemplateHelpers.installTemplate('templates/fields/field_textarea'); - TemplateHelpers.installTemplate('templates/fields/field_image'); - TemplateHelpers.installTemplate('templates/fields/message_banner'); - TemplateHelpers.installTemplate('templates/student_profile/learner_profile'); }); it("shows loading error correctly", function() { diff --git a/lms/static/js/spec/views/fields_spec.js b/lms/static/js/spec/views/fields_spec.js index 01e79b9afa..b0cfc86059 100644 --- a/lms/static/js/spec/views/fields_spec.js +++ b/lms/static/js/spec/views/fields_spec.js @@ -1,6 +1,5 @@ -define(['backbone', 'jquery', 'underscore', 'common/js/spec_helpers/ajax_helpers', 'common/js/spec_helpers/template_helpers', - 'js/views/fields', - 'js/spec/views/fields_helpers', +define(['backbone', 'jquery', 'underscore', 'common/js/spec_helpers/ajax_helpers', + 'common/js/spec_helpers/template_helpers', 'js/views/fields', 'js/spec/views/fields_helpers', 'string_utils'], function (Backbone, $, _, AjaxHelpers, TemplateHelpers, FieldViews, FieldViewsSpecHelpers) { 'use strict'; @@ -19,16 +18,9 @@ define(['backbone', 'jquery', 'underscore', 'common/js/spec_helpers/ajax_helpers FieldViews.DropdownFieldView, FieldViews.LinkFieldView, FieldViews.TextareaFieldView - ]; beforeEach(function () { - TemplateHelpers.installTemplate('templates/fields/field_readonly'); - TemplateHelpers.installTemplate('templates/fields/field_dropdown'); - TemplateHelpers.installTemplate('templates/fields/field_link'); - TemplateHelpers.installTemplate('templates/fields/field_text'); - TemplateHelpers.installTemplate('templates/fields/field_textarea'); - timerCallback = jasmine.createSpy('timerCallback'); jasmine.Clock.useMock(); }); diff --git a/lms/static/js/student_account/views/account_settings_view.js b/lms/static/js/student_account/views/account_settings_view.js index 15f577f05f..9c7950f61c 100644 --- a/lms/static/js/student_account/views/account_settings_view.js +++ b/lms/static/js/student_account/views/account_settings_view.js @@ -1,18 +1,17 @@ ;(function (define, undefined) { 'use strict'; define([ - 'gettext', 'jquery', 'underscore', 'backbone' - ], function (gettext, $, _, Backbone) { + 'gettext', 'jquery', 'underscore', 'backbone', 'text!templates/student_account/account_settings.underscore' + ], function (gettext, $, _, Backbone, accountSettingsTemplate) { var AccountSettingsView = Backbone.View.extend({ initialize: function () { - this.template = _.template($('#account_settings-tpl').text()); _.bindAll(this, 'render', 'renderFields', 'showLoadingError'); }, render: function () { - this.$el.html(this.template({ + this.$el.html(_.template(accountSettingsTemplate, { sections: this.options.sectionsData })); return this; diff --git a/lms/static/js/student_profile/views/learner_profile_fields.js b/lms/static/js/student_profile/views/learner_profile_fields.js index 8659e457c5..4548c08eae 100644 --- a/lms/static/js/student_profile/views/learner_profile_fields.js +++ b/lms/static/js/student_profile/views/learner_profile_fields.js @@ -1,8 +1,8 @@ ;(function (define, undefined) { 'use strict'; define([ - 'gettext', 'jquery', 'underscore', 'backbone', 'js/views/fields', 'backbone-super' - ], function (gettext, $, _, Backbone, FieldViews) { + 'gettext', 'jquery', 'underscore', 'backbone', 'js/views/fields', 'js/views/image_field', 'backbone-super' + ], function (gettext, $, _, Backbone, FieldViews, ImageFieldView) { var LearnerProfileFieldViews = {}; @@ -42,7 +42,7 @@ } }); - LearnerProfileFieldViews.ProfileImageFieldView = FieldViews.ImageFieldView.extend({ + LearnerProfileFieldViews.ProfileImageFieldView = ImageFieldView.extend({ screenReaderTitle: gettext('Profile Image'), diff --git a/lms/static/js/student_profile/views/learner_profile_view.js b/lms/static/js/student_profile/views/learner_profile_view.js index 9aa6d0e441..cc0c518fe8 100644 --- a/lms/static/js/student_profile/views/learner_profile_view.js +++ b/lms/static/js/student_profile/views/learner_profile_view.js @@ -1,13 +1,12 @@ ;(function (define, undefined) { 'use strict'; define([ - 'gettext', 'jquery', 'underscore', 'backbone' - ], function (gettext, $, _, Backbone) { + 'gettext', 'jquery', 'underscore', 'backbone', 'text!templates/student_profile/learner_profile.underscore'], + function (gettext, $, _, Backbone, learnerProfileTemplate) { var LearnerProfileView = Backbone.View.extend({ initialize: function () { - this.template = _.template($('#learner_profile-tpl').text()); _.bindAll(this, 'showFullProfile', 'render', 'renderFields', 'showLoadingError'); this.listenTo(this.options.preferencesModel, "change:" + 'account_privacy', this.render); }, @@ -22,7 +21,7 @@ }, render: function () { - this.$el.html(this.template({ + this.$el.html(_.template(learnerProfileTemplate, { username: this.options.accountSettingsModel.get('username'), ownProfile: this.options.ownProfile, showFullProfile: this.showFullProfile() diff --git a/lms/static/js/views/fields.js b/lms/static/js/views/fields.js index 0407637ecc..24aa5efb9b 100644 --- a/lms/static/js/views/fields.js +++ b/lms/static/js/views/fields.js @@ -7,15 +7,13 @@ 'text!templates/fields/field_link.underscore', 'text!templates/fields/field_text.underscore', 'text!templates/fields/field_textarea.underscore', - 'text!templates/fields/field_image.underscore', - 'backbone-super', 'jquery.fileupload' + 'backbone-super' ], function (gettext, $, _, Backbone, field_readonly_template, field_dropdown_template, field_link_template, field_text_template, - field_textarea_template, - field_image_template + field_textarea_template ) { var messageRevertDelay = 6000; @@ -577,225 +575,6 @@ } }); - FieldViews.ImageFieldView = FieldViews.FieldView.extend({ - - fieldType: 'image', - - fieldTemplate: field_image_template, - uploadButtonSelector: '.upload-button-input', - - titleAdd: gettext("Upload an image"), - titleEdit: gettext("Change image"), - titleRemove: gettext("Remove"), - - titleUploading: gettext("Uploading"), - titleRemoving: gettext("Removing"), - - titleImageAlt: '', - screenReaderTitle: gettext("Image"), - - iconUpload: '', - iconRemove: '', - iconProgress: '', - - errorMessage: gettext("An error has occurred. Refresh the page, and then try again."), - - events: { - 'click .u-field-upload-button': 'clickedUploadButton', - 'click .u-field-remove-button': 'clickedRemoveButton', - 'click .upload-submit': 'clickedUploadButton', - 'focus .upload-button-input': 'showHoverState', - 'blur .upload-button-input': 'hideHoverState' - }, - - initialize: function (options) { - this._super(options); - _.bindAll(this, 'render', 'imageChangeSucceeded', 'imageChangeFailed', 'fileSelected', - 'watchForPageUnload', 'onBeforeUnload'); - }, - - render: function () { - this.$el.html(this.template({ - id: this.options.valueAttribute, - inputName: (this.options.inputName || 'file'), - imageUrl: _.result(this, 'imageUrl'), - imageAltText: _.result(this, 'imageAltText'), - uploadButtonIcon: _.result(this, 'iconUpload'), - uploadButtonTitle: _.result(this, 'uploadButtonTitle'), - removeButtonIcon: _.result(this, 'iconRemove'), - removeButtonTitle: _.result(this, 'removeButtonTitle'), - screenReaderTitle: _.result(this, 'screenReaderTitle') - })); - this.delegateEvents(); - this.updateButtonsVisibility(); - this.watchForPageUnload(); - return this; - }, - - showHoverState: function () { - this.$('.u-field-upload-button').addClass('button-visible'); - }, - - hideHoverState: function () { - this.$('.u-field-upload-button').removeClass('button-visible'); - }, - - showErrorMessage: function (message) { - return message; - }, - - imageUrl: function () { - return ''; - }, - - uploadButtonTitle: function () { - if (this.isShowingPlaceholder()) { - return _.result(this, 'titleAdd'); - } else { - return _.result(this, 'titleEdit'); - } - }, - - removeButtonTitle: function () { - return this.titleRemove; - }, - - isEditingAllowed: function () { - return true; - }, - - isShowingPlaceholder: function () { - return false; - }, - - setUploadButtonVisibility: function (state) { - this.$('.u-field-upload-button').css('display', state); - }, - - setRemoveButtonVisibility: function (state) { - this.$('.u-field-remove-button').css('display', state); - }, - - updateButtonsVisibility: function () { - if (!this.isEditingAllowed() || !this.options.editable) { - this.setUploadButtonVisibility('none'); - } - - if (this.isShowingPlaceholder() || !this.options.editable) { - this.setRemoveButtonVisibility('none'); - } - }, - - clickedUploadButton: function () { - $(this.uploadButtonSelector).fileupload({ - url: this.options.imageUploadUrl, - type: 'POST', - add: this.fileSelected, - done: this.imageChangeSucceeded, - fail: this.imageChangeFailed - }); - }, - - clickedRemoveButton: function () { - var view = this; - this.setCurrentStatus('removing'); - this.setUploadButtonVisibility('none'); - this.showRemovalInProgressMessage(); - $.ajax({ - type: 'POST', - url: this.options.imageRemoveUrl - }).done(function () { - view.imageChangeSucceeded(); - }).fail(function (jqXHR) { - view.showImageChangeFailedMessage(jqXHR.status, jqXHR.responseText); - }); - }, - - imageChangeSucceeded: function () { - this.render(); - }, - - imageChangeFailed: function (e, data) { - }, - - showImageChangeFailedMessage: function (status, responseText) { - }, - - fileSelected: function (e, data) { - if (_.isUndefined(data.files[0].size) || this.validateImageSize(data.files[0].size)) { - this.setCurrentStatus('uploading'); - this.setRemoveButtonVisibility('none'); - this.showUploadInProgressMessage(); - data.submit(); - } - }, - - validateImageSize: function (imageBytes) { - var humanReadableSize; - if (imageBytes < this.options.imageMinBytes) { - humanReadableSize = this.bytesToHumanReadable(this.options.imageMinBytes); - this.showErrorMessage( - interpolate_text( - gettext("The file must be at least {size} in size."), {size: humanReadableSize} - ) - ); - return false; - } else if (imageBytes > this.options.imageMaxBytes) { - humanReadableSize = this.bytesToHumanReadable(this.options.imageMaxBytes); - this.showErrorMessage( - interpolate_text( - gettext("The file must be smaller than {size} in size."), {size: humanReadableSize} - ) - ); - return false; - } - return true; - }, - - showUploadInProgressMessage: function () { - this.$('.u-field-upload-button').css('opacity', 1); - this.$('.upload-button-icon').html(this.iconProgress); - this.$('.upload-button-title').html(this.titleUploading); - }, - - showRemovalInProgressMessage: function () { - this.$('.u-field-remove-button').css('opacity', 1); - this.$('.remove-button-icon').html(this.iconProgress); - this.$('.remove-button-title').html(this.titleRemoving); - }, - - setCurrentStatus: function (status) { - this.$('.image-wrapper').attr('data-status', status); - }, - - getCurrentStatus: function () { - return this.$('.image-wrapper').attr('data-status'); - }, - - watchForPageUnload: function () { - $(window).on('beforeunload', this.onBeforeUnload); - }, - - onBeforeUnload: function () { - var status = this.getCurrentStatus(); - if (status === 'uploading') { - return gettext("Upload is in progress. To avoid errors, stay on this page until the process is complete."); - } else if (status === 'removing') { - return gettext("Removal is in progress. To avoid errors, stay on this page until the process is complete."); - } - }, - - bytesToHumanReadable: function (size) { - var units = [gettext('bytes'), gettext('KB'), gettext('MB')]; - var i = 0; - while(size >= 1024) { - size /= 1024; - ++i; - } - return size.toFixed(1)*1 + ' ' + units[i]; - } - }); - return FieldViews; }); }).call(this, define || RequireJS.define); diff --git a/lms/static/js/views/image_field.js b/lms/static/js/views/image_field.js new file mode 100644 index 0000000000..5a7282fb98 --- /dev/null +++ b/lms/static/js/views/image_field.js @@ -0,0 +1,230 @@ +;(function (define) { + 'use strict'; + define([ + 'gettext', 'jquery', 'underscore', 'backbone', 'js/views/fields', + 'text!templates/fields/field_image.underscore', + 'backbone-super', 'jquery.fileupload' + ], function (gettext, $, _, Backbone, FieldViews, field_image_template) { + + var ImageFieldView = FieldViews.FieldView.extend({ + + fieldType: 'image', + + fieldTemplate: field_image_template, + uploadButtonSelector: '.upload-button-input', + + titleAdd: gettext("Upload an image"), + titleEdit: gettext("Change image"), + titleRemove: gettext("Remove"), + + titleUploading: gettext("Uploading"), + titleRemoving: gettext("Removing"), + + titleImageAlt: '', + screenReaderTitle: gettext("Image"), + + iconUpload: '', + iconRemove: '', + iconProgress: '', + + errorMessage: gettext("An error has occurred. Refresh the page, and then try again."), + + events: { + 'click .u-field-upload-button': 'clickedUploadButton', + 'click .u-field-remove-button': 'clickedRemoveButton', + 'click .upload-submit': 'clickedUploadButton', + 'focus .upload-button-input': 'showHoverState', + 'blur .upload-button-input': 'hideHoverState' + }, + + initialize: function (options) { + this._super(options); + _.bindAll(this, 'render', 'imageChangeSucceeded', 'imageChangeFailed', 'fileSelected', + 'watchForPageUnload', 'onBeforeUnload'); + }, + + render: function () { + this.$el.html(this.template({ + id: this.options.valueAttribute, + inputName: (this.options.inputName || 'file'), + imageUrl: _.result(this, 'imageUrl'), + imageAltText: _.result(this, 'imageAltText'), + uploadButtonIcon: _.result(this, 'iconUpload'), + uploadButtonTitle: _.result(this, 'uploadButtonTitle'), + removeButtonIcon: _.result(this, 'iconRemove'), + removeButtonTitle: _.result(this, 'removeButtonTitle'), + screenReaderTitle: _.result(this, 'screenReaderTitle') + })); + this.delegateEvents(); + this.updateButtonsVisibility(); + this.watchForPageUnload(); + return this; + }, + + showHoverState: function () { + this.$('.u-field-upload-button').addClass('button-visible'); + }, + + hideHoverState: function () { + this.$('.u-field-upload-button').removeClass('button-visible'); + }, + + showErrorMessage: function (message) { + return message; + }, + + imageUrl: function () { + return ''; + }, + + uploadButtonTitle: function () { + if (this.isShowingPlaceholder()) { + return _.result(this, 'titleAdd'); + } else { + return _.result(this, 'titleEdit'); + } + }, + + removeButtonTitle: function () { + return this.titleRemove; + }, + + isEditingAllowed: function () { + return true; + }, + + isShowingPlaceholder: function () { + return false; + }, + + setUploadButtonVisibility: function (state) { + this.$('.u-field-upload-button').css('display', state); + }, + + setRemoveButtonVisibility: function (state) { + this.$('.u-field-remove-button').css('display', state); + }, + + updateButtonsVisibility: function () { + if (!this.isEditingAllowed() || !this.options.editable) { + this.setUploadButtonVisibility('none'); + } + + if (this.isShowingPlaceholder() || !this.options.editable) { + this.setRemoveButtonVisibility('none'); + } + }, + + clickedUploadButton: function () { + $(this.uploadButtonSelector).fileupload({ + url: this.options.imageUploadUrl, + type: 'POST', + add: this.fileSelected, + done: this.imageChangeSucceeded, + fail: this.imageChangeFailed + }); + }, + + clickedRemoveButton: function () { + var view = this; + this.setCurrentStatus('removing'); + this.setUploadButtonVisibility('none'); + this.showRemovalInProgressMessage(); + $.ajax({ + type: 'POST', + url: this.options.imageRemoveUrl + }).done(function () { + view.imageChangeSucceeded(); + }).fail(function (jqXHR) { + view.showImageChangeFailedMessage(jqXHR.status, jqXHR.responseText); + }); + }, + + imageChangeSucceeded: function () { + this.render(); + }, + + imageChangeFailed: function (e, data) { + }, + + showImageChangeFailedMessage: function (status, responseText) { + }, + + fileSelected: function (e, data) { + if (_.isUndefined(data.files[0].size) || this.validateImageSize(data.files[0].size)) { + this.setCurrentStatus('uploading'); + this.setRemoveButtonVisibility('none'); + this.showUploadInProgressMessage(); + data.submit(); + } + }, + + validateImageSize: function (imageBytes) { + var humanReadableSize; + if (imageBytes < this.options.imageMinBytes) { + humanReadableSize = this.bytesToHumanReadable(this.options.imageMinBytes); + this.showErrorMessage( + interpolate_text( + gettext("The file must be at least {size} in size."), {size: humanReadableSize} + ) + ); + return false; + } else if (imageBytes > this.options.imageMaxBytes) { + humanReadableSize = this.bytesToHumanReadable(this.options.imageMaxBytes); + this.showErrorMessage( + interpolate_text( + gettext("The file must be smaller than {size} in size."), {size: humanReadableSize} + ) + ); + return false; + } + return true; + }, + + showUploadInProgressMessage: function () { + this.$('.u-field-upload-button').css('opacity', 1); + this.$('.upload-button-icon').html(this.iconProgress); + this.$('.upload-button-title').html(this.titleUploading); + }, + + showRemovalInProgressMessage: function () { + this.$('.u-field-remove-button').css('opacity', 1); + this.$('.remove-button-icon').html(this.iconProgress); + this.$('.remove-button-title').html(this.titleRemoving); + }, + + setCurrentStatus: function (status) { + this.$('.image-wrapper').attr('data-status', status); + }, + + getCurrentStatus: function () { + return this.$('.image-wrapper').attr('data-status'); + }, + + watchForPageUnload: function () { + $(window).on('beforeunload', this.onBeforeUnload); + }, + + onBeforeUnload: function () { + var status = this.getCurrentStatus(); + if (status === 'uploading') { + return gettext("Upload is in progress. To avoid errors, stay on this page until the process is complete."); + } else if (status === 'removing') { + return gettext("Removal is in progress. To avoid errors, stay on this page until the process is complete."); + } + }, + + bytesToHumanReadable: function (size) { + var units = [gettext('bytes'), gettext('KB'), gettext('MB')]; + var i = 0; + while(size >= 1024) { + size /= 1024; + ++i; + } + return size.toFixed(1)*1 + ' ' + units[i]; + } + }); + + return ImageFieldView; + }); +}).call(this, define || RequireJS.define); diff --git a/lms/static/js/views/message_banner.js b/lms/static/js/views/message_banner.js index 133adac8eb..867fbbba99 100644 --- a/lms/static/js/views/message_banner.js +++ b/lms/static/js/views/message_banner.js @@ -1,8 +1,8 @@ ;(function (define, undefined) { 'use strict'; define([ - 'gettext', 'jquery', 'underscore', 'backbone' - ], function (gettext, $, _, Backbone) { + 'gettext', 'jquery', 'underscore', 'backbone', 'text!templates/fields/message_banner.underscore' + ], function (gettext, $, _, Backbone, messageBannerTemplate) { var MessageBannerView = Backbone.View.extend({ @@ -11,14 +11,13 @@ options = {}; } this.options = _.defaults(options, {urgency: 'high', type: ''}); - this.template = _.template($('#message_banner-tpl').text()); }, render: function () { if (_.isUndefined(this.message) || _.isNull(this.message)) { this.$el.html(''); } else { - this.$el.html(this.template(_.extend(this.options, { + this.$el.html(_.template(messageBannerTemplate, _.extend(this.options, { message: this.message }))); } diff --git a/lms/templates/dashboard.html b/lms/templates/dashboard.html index f03cb821d4..de055168de 100644 --- a/lms/templates/dashboard.html +++ b/lms/templates/dashboard.html @@ -25,9 +25,6 @@ import json - % endfor % for template_name in ["dashboard_search_item", "dashboard_search_results", "search_loading", "search_error"]: diff --git a/lms/templates/student_account/account_settings.html b/lms/templates/student_account/account_settings.html index e70e13194d..f799f4dbef 100644 --- a/lms/templates/student_account/account_settings.html +++ b/lms/templates/student_account/account_settings.html @@ -14,19 +14,6 @@ from microsite_configuration import microsite <%block name="pagetitle">${_("Account Settings")} <%block name="nav_skip">#u-field-input-username -<%block name="header_extras"> - - - - % for template_name in ["field_dropdown", "field_link", "field_readonly", "field_text"]: - - % endfor - - % if duplicate_provider:
<%include file='/dashboard/_dashboard_third_party_error.html' /> diff --git a/lms/templates/student_profile/learner_profile.html b/lms/templates/student_profile/learner_profile.html index 0539ef2122..5b2a63579a 100644 --- a/lms/templates/student_profile/learner_profile.html +++ b/lms/templates/student_profile/learner_profile.html @@ -12,20 +12,6 @@ from openedx.core.lib.json_utils import EscapedEdxJSONEncoder <%block name="bodyclass">view-profile -<%block name="header_extras"> - % for template_name in ["field_dropdown", "field_image", "field_textarea", "field_readonly", "message_banner"]: - - % endfor - - % for template_name in ["learner_profile"]: - - % endfor - -