' + gettext('There has been a failure to export your course to XML. Unfortunately, we do not have specific enough information to assist you in identifying the failed component. It is recommended that you inspect your courseware to identify any components in error and try again.') + '
' + gettext('The raw error message is:') + '
' + errMsg; + dialog = new PromptView({ + title: gettext('There has been an error with your export.'), + message: msg, + intent: 'error', + actions: { + primary: { + text: gettext('Yes, take me to the main course page'), + click: function(view) { + view.hide(); + document.location = courseHomeUrl; + } + }, + secondary: { + text: gettext('Cancel'), + click: function(view) { + view.hide(); + } + } + } + }); + } + + // The CSS animation for the dialog relies on the 'js' class + // being on the body. This happens after this JavaScript is executed, + // causing a 'bouncing' of the dialog after it is initially shown. + // As a workaround, add this class first. + $('body').addClass('js'); + dialog.show(); + }; +}); diff --git a/cms/static/js/factories/group_configurations.js b/cms/static/js/factories/group_configurations.js new file mode 100644 index 0000000000..559c4344ee --- /dev/null +++ b/cms/static/js/factories/group_configurations.js @@ -0,0 +1,16 @@ +define([ + 'js/collections/group_configuration', 'js/views/pages/group_configurations' +], function(GroupConfigurationCollection, GroupConfigurationsPage) { + 'use strict'; + return function (configurations, groupConfigurationUrl, courseOutlineUrl) { + var collection = new GroupConfigurationCollection(configurations, { parse: true }), + configurationsPage; + + collection.url = groupConfigurationUrl; + collection.outlineUrl = courseOutlineUrl; + configurationsPage = new GroupConfigurationsPage({ + el: $('#content'), + collection: collection + }).render(); + }; +}); diff --git a/cms/static/js/factories/import.js b/cms/static/js/factories/import.js new file mode 100644 index 0000000000..2577844e42 --- /dev/null +++ b/cms/static/js/factories/import.js @@ -0,0 +1,107 @@ +define([ + 'js/views/import', 'jquery', 'gettext', 'jquery.fileupload', 'jquery.cookie' +], function(CourseImport, $, gettext) { + 'use strict'; + return function (feedbackUrl) { + var bar = $('.progress-bar'), + fill = $('.progress-fill'), + submitBtn = $('.submit-button'), + chooseBtn = $('.choose-file-button'), + defaults = [ + gettext('There was an error during the upload process.') + '\n', + gettext('There was an error while unpacking the file.') + '\n', + gettext('There was an error while verifying the file you submitted.') + '\n', + gettext('There was an error while importing the new course to our database.') + '\n' + ], + // Display the status of last file upload on page load + lastFileUpload = $.cookie('lastfileupload'), + file; + + if (lastFileUpload){ + CourseImport.getAndStartUploadFeedback(feedbackUrl.replace('fillerName', lastFileUpload), lastFileUpload); + } + + $('#fileupload').fileupload({ + dataType: 'json', + type: 'POST', + maxChunkSize: 20 * 1000000, // 20 MB + autoUpload: false, + add: function(e, data) { + CourseImport.clearImportDisplay(); + submitBtn.unbind('click'); + file = data.files[0]; + if (file.name.match(/tar\.gz$/)) { + submitBtn.click(function(event){ + event.preventDefault(); + $.cookie('lastfileupload', file.name); + submitBtn.hide(); + CourseImport.startUploadFeedback(); + data.submit().complete(function(result, textStatus, xhr) { + window.onbeforeunload = null; + if (xhr.status != 200) { + var serverMsg, errMsg, stage; + try{ + serverMsg = $.parseJSON(result.responseText); + } catch (e) { + return; + } + errMsg = serverMsg.hasOwnProperty('ErrMsg') ? serverMsg.ErrMsg : '' ; + if (serverMsg.hasOwnProperty('Stage')) { + stage = Math.abs(serverMsg.Stage); + CourseImport.stageError(stage, defaults[stage] + errMsg); + } + else { + alert(gettext('Your import has failed.') + '\n\n' + errMsg); + } + chooseBtn.html(gettext('Choose new file')).show(); + bar.hide(); + } + CourseImport.stopGetStatus = true; + chooseBtn.html(gettext('Choose new file')).show(); + bar.hide(); + }); + }); + } else { + data.files = []; + } + }, + + progressall: function(e, data){ + var percentInt = data.loaded / data.total * 100, + percentVal = parseInt(percentInt, 10) + '%', + doneAt; + // Firefox makes ProgressEvent.loaded equal ProgressEvent.total only + // after receiving a response from the server (see Mozilla bug 637002), + // so for Firefox we jump the gun a little. + if (navigator.userAgent.toLowerCase().indexOf('firefox') > -1) { + doneAt = 95; + } else { + doneAt = 99; + } + if (percentInt >= doneAt) { + bar.hide(); + // Start feedback with delay so that current stage of import properly updates in session + setTimeout( + function () { CourseImport.startServerFeedback(feedbackUrl.replace('fillerName', file.name));}, + 3000 + ); + } else { + bar.show(); + fill.width(percentVal).html(percentVal); + } + }, + done: function(event, data){ + bar.hide(); + window.onbeforeunload = null; + CourseImport.displayFinishedImport(); + }, + start: function(event) { + window.onbeforeunload = function() { + return gettext('Your import is in progress; navigating away will abort it.'); + }; + }, + sequentialUploads: true, + notifyOnError: false + }); + }; +}); diff --git a/cms/static/js/factories/index.js b/cms/static/js/factories/index.js new file mode 100644 index 0000000000..15ee2ec501 --- /dev/null +++ b/cms/static/js/factories/index.js @@ -0,0 +1,40 @@ +define(['jquery.form', 'js/index'], function() { + 'use strict'; + return function () { + // showing/hiding creation rights UI + $('.show-creationrights').click(function(e) { + e.preventDefault(); + $(this) + .closest('.wrapper-creationrights') + .toggleClass('is-shown') + .find('.ui-toggle-control') + .toggleClass('current'); + }); + + var reloadPage = function () { + location.reload(); + }; + + var showError = function () { + $('#request-coursecreator-submit') + .toggleClass('has-error') + .find('.label') + .text('Sorry, there was error with your request'); + $('#request-coursecreator-submit') + .find('.icon-cog') + .toggleClass('icon-spin'); + }; + + $('#request-coursecreator').ajaxForm({ + error: showError, + success: reloadPage + }); + + $('#request-coursecreator-submit').click(function(event){ + $(this) + .toggleClass('is-disabled is-submitting') + .find('.label') + .text('Submitting Your Request'); + }); + }; +}); diff --git a/cms/static/js/factories/login.js b/cms/static/js/factories/login.js new file mode 100644 index 0000000000..5115406044 --- /dev/null +++ b/cms/static/js/factories/login.js @@ -0,0 +1,43 @@ +define(['jquery.cookie', 'utility'], function() { + 'use strict'; + return function (homepageURL) { + function postJSON(url, data, callback) { + $.ajax({ + type:'POST', + url: url, + dataType: 'json', + data: data, + success: callback, + headers : {'X-CSRFToken':$.cookie('csrftoken')} + }); + } + + $('form#login_form').submit(function(event) { + event.preventDefault(); + var submit_data = $('#login_form').serialize(); + + postJSON('/login_post', submit_data, function(json) { + if(json.success) { + var next = /next=([^&]*)/g.exec(decodeURIComponent(window.location.search)); + if (next && next.length > 1 && !isExternal(next[1])) { + location.href = next[1]; + } else { + location.href = homepageURL; + } + } else if($('#login_error').length === 0) { + $('#login_form').prepend( + '' + ); + $('#login_error').addClass('is-shown'); + } else { + $('#login_error') + .stop() + .addClass('is-shown') + .html(json.value); + } + }); + }); + }; +}); diff --git a/cms/static/js/factories/manage_users.js b/cms/static/js/factories/manage_users.js new file mode 100644 index 0000000000..42272a859d --- /dev/null +++ b/cms/static/js/factories/manage_users.js @@ -0,0 +1,203 @@ +define(['jquery', 'underscore', 'gettext', 'js/views/feedback_prompt'], function($, _, gettext, PromptView) { + 'use strict'; + return function (staffEmails, tplUserURL) { + var unknownErrorMessage = gettext('Unknown'), + $createUserForm = $('#create-user-form'), + $createUserFormWrapper = $createUserForm.closest('.wrapper-create-user'), + $cancelButton; + + $createUserForm.bind('submit', function(event) { + event.preventDefault(); + var email = $('#user-email-input').val().trim(), + url, msg; + + if(!email) { + msg = new PromptView.Error({ + title: gettext('A valid email address is required'), + message: gettext('You must enter a valid email address in order to add a new team member'), + actions: { + primary: { + text: gettext('Return and add email address'), + click: function(view) { + view.hide(); + $('#user-email-input').focus(); + } + } + } + }); + msg.show(); + } + + if(_.contains(staffEmails, email)) { + msg = new PromptView.Warning({ + title: gettext('Already a course team member'), + message: _.template( + gettext("{email} is already on the “{course}” team. If you're trying to add a new member, please double-check the email address you provided."), { + email: email, + course: course.escape('name') + }, {interpolate: /\{(.+?)\}/g} + ), + actions: { + primary: { + text: gettext('Return to team listing'), + click: function(view) { + view.hide(); + $('#user-email-input').focus(); + } + } + } + }); + msg.show(); + } + + url = tplUserURL.replace('@@EMAIL@@', $('#user-email-input').val().trim()); + $.ajax({ + url: url, + type: 'POST', + dataType: 'json', + contentType: 'application/json', + notifyOnError: false, + data: JSON.stringify({role: 'staff'}), + success: function(data) {location.reload();}, + error: function(jqXHR, textStatus, errorThrown) { + var message, prompt; + try { + message = JSON.parse(jqXHR.responseText).error || unknownErrorMessage; + } catch (e) { + message = unknownErrorMessage; + } + prompt = new PromptView.Error({ + title: gettext('Error adding user'), + message: message, + actions: { + primary: { + text: gettext('OK'), + click: function(view) { + view.hide(); + $('#user-email-input').focus(); + } + } + } + }); + prompt.show(); + } + }); + }); + + $cancelButton = $createUserForm.find('.action-cancel'); + $cancelButton.bind('click', function(event) { + event.preventDefault(); + $('.create-user-button').toggleClass('is-disabled'); + $createUserFormWrapper.toggleClass('is-shown'); + $('#user-email-input').val(''); + }); + + $('.create-user-button').bind('click', function(event) { + event.preventDefault(); + $('.create-user-button').toggleClass('is-disabled'); + $createUserFormWrapper.toggleClass('is-shown'); + $createUserForm.find('#user-email-input').focus(); + }); + + $('body').bind('keyup', function(event) { + if(event.which == 27) { + $cancelButton.click(); + } + }); + + $('.remove-user').click(function() { + var email = $(this).data('id'), + msg = new PromptView.Warning({ + title: gettext('Are you sure?'), + message: _.template(gettext('Are you sure you want to delete {email} from the course team for “{course}”?'), {email: email, course: course.get('name')}, {interpolate: /\{(.+?)\}/g}), + actions: { + primary: { + text: gettext('Delete'), + click: function(view) { + var url = tplUserURL.replace('@@EMAIL@@', email); + view.hide(); + $.ajax({ + url: url, + type: 'DELETE', + dataType: 'json', + contentType: 'application/json', + notifyOnError: false, + success: function(data) {location.reload();}, + error: function(jqXHR, textStatus, errorThrown) { + var message; + try { + message = JSON.parse(jqXHR.responseText).error || unknownErrorMessage; + } catch (e) { + message = unknownErrorMessage; + } + var prompt = new PromptView.Error({ + title: gettext('Error removing user'), + message: message, + actions: { + primary: { + text: gettext('OK'), + click: function(view) { + view.hide(); + } + } + } + }); + prompt.show(); + } + }); + } + }, + secondary: { + text: gettext('Cancel'), + click: function(view) { + view.hide(); + } + } + } + }); + msg.show(); + }); + + $('.toggle-admin-role').click(function(event) { + event.preventDefault(); + var type, url, role; + if($(this).hasClass('add-admin-role')) { + role = 'instructor'; + } else { + role = 'staff'; + } + + url = $(this).closest('li[data-url]').data('url'); + $.ajax({ + url: url, + type: 'POST', + dataType: 'json', + contentType: 'application/json', + notifyOnError: false, + data: JSON.stringify({role: role}), + success: function(data) {location.reload();}, + error: function(jqXHR, textStatus, errorThrown) { + var message, prompt; + try { + message = JSON.parse(jqXHR.responseText).error || unknownErrorMessage; + } catch (e) { + message = unknownErrorMessage; + } + prompt = new PromptView.Error({ + title: gettext("There was an error changing the user's role"), + message: message, + actions: { + primary: { + text: gettext('Try Again'), + click: function(view) { + view.hide(); + } + } + } + }); + prompt.show(); + } + }); + }); + }; +}); diff --git a/cms/static/js/factories/outline.js b/cms/static/js/factories/outline.js new file mode 100644 index 0000000000..a0b6cb25e5 --- /dev/null +++ b/cms/static/js/factories/outline.js @@ -0,0 +1,14 @@ +define([ + 'js/views/pages/course_outline', 'js/models/xblock_outline_info' +], function(CourseOutlinePage, XBlockOutlineInfo) { + 'use strict'; + return function (XBlockOutlineInfoJson, initialStateJson) { + var courseXBlock = new XBlockOutlineInfo(XBlockOutlineInfoJson, {parse: true}), + view = new CourseOutlinePage({ + el: $('#content'), + model: courseXBlock, + initialState: initialStateJson + }); + view.render(); + }; +}); diff --git a/cms/static/js/factories/register.js b/cms/static/js/factories/register.js new file mode 100644 index 0000000000..5f0fe5aaf6 --- /dev/null +++ b/cms/static/js/factories/register.js @@ -0,0 +1,33 @@ +define(['jquery', 'jquery.cookie'], function($) { + 'use strict'; + return function () { + $('form :input') + .focus(function() { + $('label[for="' + this.id + '"]').addClass('is-focused'); + }) + .blur(function() { + $('label').removeClass('is-focused'); + }); + + $('form#register_form').submit(function(event) { + event.preventDefault(); + var submit_data = $('#register_form').serialize(); + + $.ajax({ + url: '/create_account', + type: 'POST', + dataType: 'json', + headers: {'X-CSRFToken': $.cookie('csrftoken')}, + notifyOnError: false, + data: submit_data, + success: function(json) { + location.href = '/course/'; + }, + error: function(jqXHR, textStatus, errorThrown) { + var json = $.parseJSON(jqXHR.responseText); + $('#register_error').html(json.value).stop().addClass('is-shown'); + } + }); + }); + }; +}); diff --git a/cms/static/js/factories/settings.js b/cms/static/js/factories/settings.js new file mode 100644 index 0000000000..09ec56c0e8 --- /dev/null +++ b/cms/static/js/factories/settings.js @@ -0,0 +1,29 @@ +define([ + 'jquery', 'js/models/settings/course_details', 'js/views/settings/main' +], function($, CourseDetailsModel, MainView) { + 'use strict'; + return function (detailsUrl) { + var model; + // highlighting labels when fields are focused in + $('form :input') + .focus(function() { + $('label[for="' + this.id + '"]').addClass('is-focused'); + }) + .blur(function() { + $('label').removeClass('is-focused'); + }); + + model = new CourseDetailsModel(); + model.urlRoot = detailsUrl; + model.fetch({ + success: function(model) { + var editor = new MainView({ + el: $('.settings-details'), + model: model + }); + editor.render(); + }, + reset: true + }); + }; +}); diff --git a/cms/static/js/factories/settings_advanced.js b/cms/static/js/factories/settings_advanced.js new file mode 100644 index 0000000000..b12c0cb147 --- /dev/null +++ b/cms/static/js/factories/settings_advanced.js @@ -0,0 +1,44 @@ +define([ + 'jquery', 'gettext', 'js/models/settings/advanced', 'js/views/settings/advanced' +], function($, gettext, AdvancedSettingsModel, AdvancedSettingsView) { + 'use strict'; + return function (advancedDict, advancedSettingsUrl) { + var advancedModel, editor; + + $('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 + advancedModel = new AdvancedSettingsModel(advancedDict, {parse: true}); + advancedModel.url = advancedSettingsUrl; + + editor = new AdvancedSettingsView({ + el: $('.settings-advanced'), + model: advancedModel + }); + editor.render(); + + $('#deprecated-settings').click(function() { + var wrapperDeprecatedSetting = $('.wrapper-deprecated-setting'), + deprecatedSettingsLabel = $('.deprecated-settings-label'); + + if ($(this).is(':checked')) { + wrapperDeprecatedSetting.addClass('is-set'); + deprecatedSettingsLabel.text(gettext('Hide Deprecated Settings')); + editor.render_deprecated = true; + } + else { + wrapperDeprecatedSetting.removeClass('is-set'); + deprecatedSettingsLabel.text(gettext('Show Deprecated Settings')); + editor.render_deprecated = false; + } + + editor.render(); + }); + }; +}); diff --git a/cms/static/js/factories/settings_graders.js b/cms/static/js/factories/settings_graders.js new file mode 100644 index 0000000000..4ed4e02df9 --- /dev/null +++ b/cms/static/js/factories/settings_graders.js @@ -0,0 +1,24 @@ +define([ + 'jquery', 'js/views/settings/grading', 'js/models/settings/course_grading_policy' +], function($, GradingView, CourseGradingPolicyModel) { + 'use strict'; + return function (courseDetails, gradingUrl) { + var model, editor; + + $('form :input') + .focus(function() { + $('label[for="' + this.id + '"]').addClass('is-focused'); + }) + .blur(function() { + $('label').removeClass('is-focused'); + }); + + model = new CourseGradingPolicyModel(courseDetails,{parse:true}); + model.urlRoot = gradingUrl; + editor = new GradingView({ + el: $('.settings-grading'), + model : model + }); + editor.render(); + }; +}); diff --git a/cms/static/js/factories/textbooks.js b/cms/static/js/factories/textbooks.js new file mode 100644 index 0000000000..fc0c301e1d --- /dev/null +++ b/cms/static/js/factories/textbooks.js @@ -0,0 +1,20 @@ +define([ + 'gettext', 'js/models/section', 'js/collections/textbook', 'js/views/list_textbooks' +], function(gettext, Section, TextbookCollection, ListTextbooksView) { + 'use strict'; + return function (textbooksJson) { + var textbooks = new TextbookCollection(textbooksJson, {parse: true}), + tbView = new ListTextbooksView({collection: textbooks}); + + $('.content-primary').append(tbView.render().el); + $('.nav-actions .new-button').click(function(event) { + tbView.addOne(event); + }); + $(window).on('beforeunload', function() { + var dirty = textbooks.find(function(textbook) { return textbook.isDirty(); }); + if(dirty) { + return gettext('You have unsaved changes. Do you really want to leave this page?'); + } + }); + }; +}); diff --git a/cms/static/js_test.yml b/cms/static/js_test.yml index 339d050015..02c1979e93 100644 --- a/cms/static/js_test.yml +++ b/cms/static/js_test.yml @@ -68,6 +68,7 @@ src_paths: - coffee/src - js - js/common_helpers + - js/factories # Paths to spec (test) JavaScript files spec_paths: diff --git a/cms/static/require-config.js b/cms/static/require-config.js new file mode 100644 index 0000000000..bbfd8a5908 --- /dev/null +++ b/cms/static/require-config.js @@ -0,0 +1,266 @@ +require.config({ + // NOTE: baseUrl has been previously set in cms/static/templates/base.html + waitSeconds: 60, + paths: { + "domReady": "js/vendor/domReady", + "gettext": "/i18n", + "mustache": "js/vendor/mustache", + "codemirror": "js/vendor/codemirror-compressed", + "codemirror/stex": "js/vendor/CodeMirror/stex", + "jquery": "js/vendor/jquery.min", + "jquery.ui": "js/vendor/jquery-ui.min", + "jquery.form": "js/vendor/jquery.form", + "jquery.markitup": "js/vendor/markitup/jquery.markitup", + "jquery.leanModal": "js/vendor/jquery.leanModal.min", + "jquery.ajaxQueue": "js/vendor/jquery.ajaxQueue", + "jquery.smoothScroll": "js/vendor/jquery.smooth-scroll.min", + "jquery.timepicker": "js/vendor/timepicker/jquery.timepicker", + "jquery.cookie": "js/vendor/jquery.cookie", + "jquery.qtip": "js/vendor/jquery.qtip.min", + "jquery.scrollTo": "js/vendor/jquery.scrollTo-1.4.2-min", + "jquery.flot": "js/vendor/flot/jquery.flot.min", + "jquery.fileupload": "js/vendor/jQuery-File-Upload/js/jquery.fileupload", + "jquery.iframe-transport": "js/vendor/jQuery-File-Upload/js/jquery.iframe-transport", + "jquery.inputnumber": "js/vendor/html5-input-polyfills/number-polyfill", + "jquery.immediateDescendents": "coffee/src/jquery.immediateDescendents", + "datepair": "js/vendor/timepicker/datepair", + "date": "js/vendor/date", + "underscore": "js/vendor/underscore-min", + "underscore.string": "js/vendor/underscore.string.min", + "backbone": "js/vendor/backbone-min", + "backbone.associations": "js/vendor/backbone-associations-min", + "backbone.paginator": "js/vendor/backbone.paginator.min", + "tinymce": "js/vendor/tinymce/js/tinymce/tinymce.full.min", + "jquery.tinymce": "js/vendor/tinymce/js/tinymce/jquery.tinymce.min", + "xmodule": "/xmodule/xmodule", + "xblock": "coffee/src/xblock", + "utility": "js/src/utility", + "accessibility": "js/src/accessibility_tools", + "draggabilly": "js/vendor/draggabilly.pkgd", + "URI": "js/vendor/URI.min", + "ieshim": "js/src/ie_shim", + "tooltip_manager": "js/src/tooltip_manager", + + // Files needed for Annotations feature + "annotator": "js/vendor/ova/annotator-full", + "annotator-harvardx": "js/vendor/ova/annotator-full-firebase-auth", + "video.dev": "js/vendor/ova/video.dev", + "vjs.youtube": 'js/vendor/ova/vjs.youtube', + "rangeslider": 'js/vendor/ova/rangeslider', + "share-annotator": 'js/vendor/ova/share-annotator', + "richText-annotator": 'js/vendor/ova/richText-annotator', + "reply-annotator": 'js/vendor/ova/reply-annotator', + "grouping-annotator": 'js/vendor/ova/grouping-annotator', + "tags-annotator": 'js/vendor/ova/tags-annotator', + "diacritic-annotator": 'js/vendor/ova/diacritic-annotator', + "flagging-annotator": 'js/vendor/ova/flagging-annotator', + "jquery-Watch": 'js/vendor/ova/jquery-Watch', + "openseadragon": 'js/vendor/ova/openseadragon', + "osda": 'js/vendor/ova/OpenSeaDragonAnnotation', + "ova": 'js/vendor/ova/ova', + "catch": 'js/vendor/ova/catch/js/catch', + "handlebars": 'js/vendor/ova/catch/js/handlebars-1.1.2', + // end of Annotation tool files + + // externally hosted files + "tender": [ + "//edxedge.tenderapp.com/tender_widget", + // if tender fails to load, fallback on a local file + // so that require doesn't fall over + "js/src/tender_fallback" + ], + "mathjax": "//edx-static.s3.amazonaws.com/mathjax-MathJax-727332c/MathJax.js?config=TeX-MML-AM_HTMLorMML-full&delayStartupUntil=configured", + "youtube": [ + // youtube URL does not end in ".js". We add "?noext" to the path so + // that require.js adds the ".js" to the query component of the URL, + // and leaves the path component intact. + "//www.youtube.com/player_api?noext", + // if youtube fails to load, fallback on a local file + // so that require doesn't fall over + "js/src/youtube_fallback" + ] + }, + shim: { + "gettext": { + exports: "gettext" + }, + "date": { + exports: "Date" + }, + "jquery.ui": { + deps: ["jquery"], + exports: "jQuery.ui" + }, + "jquery.form": { + deps: ["jquery"], + exports: "jQuery.fn.ajaxForm" + }, + "jquery.markitup": { + deps: ["jquery"], + exports: "jQuery.fn.markitup" + }, + "jquery.leanmodal": { + deps: ["jquery"], + exports: "jQuery.fn.leanModal" + }, + "jquery.ajaxQueue": { + deps: ["jquery"], + exports: "jQuery.fn.ajaxQueue" + }, + "jquery.smoothScroll": { + deps: ["jquery"], + exports: "jQuery.fn.smoothScroll" + }, + "jquery.cookie": { + deps: ["jquery"], + exports: "jQuery.fn.cookie" + }, + "jquery.qtip": { + deps: ["jquery"], + exports: "jQuery.fn.qtip" + }, + "jquery.scrollTo": { + deps: ["jquery"], + exports: "jQuery.fn.scrollTo", + }, + "jquery.flot": { + deps: ["jquery"], + exports: "jQuery.fn.plot" + }, + "jquery.fileupload": { + deps: ["jquery.iframe-transport"], + exports: "jQuery.fn.fileupload" + }, + "jquery.inputnumber": { + deps: ["jquery"], + exports: "jQuery.fn.inputNumber" + }, + "jquery.tinymce": { + deps: ["jquery", "tinymce"], + exports: "jQuery.fn.tinymce" + }, + "datepair": { + deps: ["jquery.ui", "jquery.timepicker"] + }, + "underscore": { + exports: "_" + }, + "backbone": { + deps: ["underscore", "jquery"], + exports: "Backbone" + }, + "backbone.associations": { + deps: ["backbone"], + exports: "Backbone.Associations" + }, + "backbone.paginator": { + deps: ["backbone"], + exports: "Backbone.Paginator" + }, + "tender": { + exports: 'Tender' + }, + "youtube": { + exports: "YT" + }, + "codemirror": { + exports: "CodeMirror" + }, + "codemirror/stex": { + deps: ["codemirror"] + }, + "tinymce": { + exports: "tinymce" + }, + "mathjax": { + exports: "MathJax", + init: function() { + MathJax.Hub.Config({ + tex2jax: { + inlineMath: [ + ["\\(","\\)"], + ['[mathjaxinline]','[/mathjaxinline]'] + ], + displayMath: [ + ["\\[","\\]"], + ['[mathjax]','[/mathjax]'] + ] + } + }); + MathJax.Hub.Configured(); + } + }, + "URI": { + exports: "URI" + }, + "tooltip_manager": { + deps: ["jquery", "underscore"] + }, + "jquery.immediateDescendents": { + deps: ["jquery"] + }, + "xblock/core": { + exports: "XBlock", + deps: ["jquery", "jquery.immediateDescendents"] + }, + "xblock/runtime.v1": { + exports: "XBlock", + deps: ["xblock/core"] + }, + + "coffee/src/main": { + deps: ["coffee/src/ajax_prefix"] + }, + "coffee/src/logger": { + exports: "Logger", + deps: ["coffee/src/ajax_prefix"] + }, + + // the following are all needed for annotation tools + "video.dev": { + exports:"videojs" + }, + "vjs.youtube": { + deps: ["video.dev"] + }, + "rangeslider": { + deps: ["video.dev"] + }, + "annotator": { + exports: "Annotator" + }, + "annotator-harvardx":{ + deps: ["annotator"] + }, + "share-annotator": { + deps: ["annotator"] + }, + "richText-annotator": { + deps: ["annotator", "tinymce"] + }, + "reply-annotator": { + deps: ["annotator"] + }, + "tags-annotator": { + deps: ["annotator"] + }, + "diacritic-annotator": { + deps: ["annotator"] + }, + "flagging-annotator": { + deps: ["annotator"] + }, + "grouping-annotator": { + deps: ["annotator"] + }, + "ova":{ + exports: "ova", + deps: ["annotator", "annotator-harvardx", "video.dev", "vjs.youtube", "rangeslider", "share-annotator", "richText-annotator", "reply-annotator", "tags-annotator", "flagging-annotator", "grouping-annotator", "diacritic-annotator", "jquery-Watch", "catch", "handlebars", "URI"] + }, + "osda":{ + exports: "osda", + deps: ["annotator", "annotator-harvardx", "video.dev", "vjs.youtube", "rangeslider", "share-annotator", "richText-annotator", "reply-annotator", "tags-annotator", "flagging-annotator", "grouping-annotator", "diacritic-annotator", "openseadragon", "jquery-Watch", "catch", "handlebars", "URI"] + }, + // end of annotation tool files + } +}); diff --git a/cms/static/sass/elements/_header.scss b/cms/static/sass/elements/_header.scss index 3bfafc7d28..afc4eabaaa 100644 --- a/cms/static/sass/elements/_header.scss +++ b/cms/static/sass/elements/_header.scss @@ -201,7 +201,7 @@ > .label { display: inline-block; - max-width: 85%; + max-width: 84%; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; diff --git a/cms/templates/asset_index.html b/cms/templates/asset_index.html index ab36424574..7e886b7241 100644 --- a/cms/templates/asset_index.html +++ b/cms/templates/asset_index.html @@ -17,18 +17,10 @@ % endfor -<%block name="jsextra"> - +<%block name="requirejs"> + require(["js/factories/asset_index"], function (AssetIndexFactory) { + AssetIndexFactory("${asset_callback_url}"); + }); <%block name="content"> @@ -72,9 +64,9 @@${_("Use the {em_start}Embed URL{em_end} value to link to the file or image from a component, a course update, or a course handout.").format(em_start='', em_end="")}
- +${_("Use the {em_start}External URL{em_end} value to reference the file or image only from outside of your course.").format(em_start='', em_end="")}
${_("Click in the Embed URL or External URL column to select the value, then copy it.")}