' + gettext('The combined length of the organization and library code fields cannot be more than 65 characters.') + '
');
+ $(selectors.save).addClass(classes.disabled);
+ }
+ else {
+ $(selectors.errorWrapper).removeClass(classes.shown).addClass(classes.hiding);
+ }
+ };
+
+ setNewLibraryFieldInErr = function (el, msg) {
+ if (msg) {
+ el.addClass(classes.error);
+ el.children(selectors.tipError).addClass(classes.showing).removeClass(classes.hiding).text(msg);
+ $(selectors.save).addClass(classes.disabled);
+ }
+ else {
+ el.removeClass(classes.error);
+ el.children(selectors.tipError).addClass(classes.hiding).removeClass(classes.showing);
+ // One "error" div is always present, but hidden or shown
+ if ($(selectors.error).length === 1) {
+ $(selectors.save).removeClass(classes.disabled);
+ }
+ }
+ };
+
+ // One final check for empty values
+ hasInvalidRequiredFields = function () {
+ return _.reduce(
+ [selectors.name, selectors.org, selectors.number],
+ function (acc, ele) {
+ var $ele = $(ele);
+ var error = validateRequiredField($ele.val());
+ setNewLibraryFieldInErr($ele.parent(), error);
+ return error ? true : acc;
+ },
+ false
+ );
+ };
+
+ createLibrary = function (libraryInfo, errorHandler) {
+ $.postJSON(
+ '/library/',
+ libraryInfo,
+ function (data) {
+ if (data.url !== undefined) {
+ ViewUtils.redirect(data.url);
+ } else if (data.ErrMsg !== undefined) {
+ errorHandler(data.ErrMsg);
+ }
+ }
+ );
+ };
+
+ // Ensure that all fields are not empty
+ validateFilledFields = function () {
+ return _.reduce(
+ [selectors.org, selectors.number, selectors.name],
+ function (acc, ele) {
+ var $ele = $(ele);
+ return $ele.val().length !== 0 ? acc : false;
+ },
+ true
+ );
+ };
+
+ // Handle validation asynchronously
+ configureHandlers = function () {
+ _.each(
+ [selectors.org, selectors.number],
+ function (ele) {
+ var $ele = $(ele);
+ $ele.on('keyup', function (event) {
+ // Don't bother showing "required field" error when
+ // the user tabs into a new field; this is distracting
+ // and unnecessary
+ if (event.keyCode === 9) {
+ return;
+ }
+ var error = validateURLItemEncoding($ele.val(), $(selectors.allowUnicode).val() === 'True');
+ setNewLibraryFieldInErr($ele.parent(), error);
+ validateTotalKeyLength();
+ if (!validateFilledFields()) {
+ $(selectors.save).addClass(classes.disabled);
+ }
+ });
+ }
+ );
+ var $name = $(selectors.name);
+ $name.on('keyup', function () {
+ var error = validateRequiredField($name.val());
+ setNewLibraryFieldInErr($name.parent(), error);
+ validateTotalKeyLength();
+ if (!validateFilledFields()) {
+ $(selectors.save).addClass(classes.disabled);
+ }
+ });
+ };
+
+ return {
+ validateTotalKeyLength: validateTotalKeyLength,
+ setNewLibraryFieldInErr: setNewLibraryFieldInErr,
+ hasInvalidRequiredFields: hasInvalidRequiredFields,
+ createLibrary: createLibrary,
+ validateFilledFields: validateFilledFields,
+ configureHandlers: configureHandlers
+ };
+ };
+ });
diff --git a/cms/static/js/views/utils/view_utils.js b/cms/static/js/views/utils/view_utils.js
index 27d969f523f7..69f05712b357 100644
--- a/cms/static/js/views/utils/view_utils.js
+++ b/cms/static/js/views/utils/view_utils.js
@@ -5,7 +5,8 @@ define(["jquery", "underscore", "gettext", "js/views/feedback_notification", "js
function ($, _, gettext, NotificationView, PromptView) {
var toggleExpandCollapse, showLoadingIndicator, hideLoadingIndicator, confirmThenRunOperation,
runOperationShowingMessage, disableElementWhileRunning, getScrollOffset, setScrollOffset,
- setScrollTop, redirect, reload, hasChangedAttributes, deleteNotificationHandler;
+ setScrollTop, redirect, reload, hasChangedAttributes, deleteNotificationHandler,
+ validateRequiredField=1, validateURLItemEncoding=2;
/**
* Toggles the expanded state of the current element.
@@ -173,6 +174,35 @@ define(["jquery", "underscore", "gettext", "js/views/feedback_notification", "js
return false;
};
+ /**
+ * Helper method for course/library creation - verifies a required field is not blank.
+ */
+ validateRequiredField = function (msg) {
+ return msg.length === 0 ? gettext('Required field.') : '';
+ };
+
+ /**
+ * Helper method for course/library creation.
+ * Check that a course (org, number, run) doesn't use any special characters
+ */
+ validateURLItemEncoding = function (item, allowUnicode) {
+ var required = validateRequiredField(item);
+ if (required) {
+ return required;
+ }
+ if (allowUnicode) {
+ if (/\s/g.test(item)) {
+ return gettext('Please do not use any spaces in this field.');
+ }
+ }
+ else {
+ if (item !== encodeURIComponent(item)) {
+ return gettext('Please do not use any spaces or special characters in this field.');
+ }
+ }
+ return '';
+ };
+
return {
'toggleExpandCollapse': toggleExpandCollapse,
'showLoadingIndicator': showLoadingIndicator,
@@ -186,6 +216,8 @@ define(["jquery", "underscore", "gettext", "js/views/feedback_notification", "js
'setScrollOffset': setScrollOffset,
'redirect': redirect,
'reload': reload,
- 'hasChangedAttributes': hasChangedAttributes
+ 'hasChangedAttributes': hasChangedAttributes,
+ 'validateRequiredField': validateRequiredField,
+ 'validateURLItemEncoding': validateURLItemEncoding
};
});
diff --git a/cms/templates/base.html b/cms/templates/base.html
index 11c9d320aa04..a0382e462833 100644
--- a/cms/templates/base.html
+++ b/cms/templates/base.html
@@ -16,6 +16,8 @@
% if context_course:
<% ctx_loc = context_course.location %>
${context_course.display_name_with_default | h} |
+ % elif context_library:
+ ${context_library.display_name_with_default | h} |
% endif
edX Studio
diff --git a/cms/templates/index.html b/cms/templates/index.html
index 7a60b85fe33f..a558b0a7d30a 100644
--- a/cms/templates/index.html
+++ b/cms/templates/index.html
@@ -45,6 +45,10 @@
+
Content Libraries
+
${_("Warning: Content Libraries are currently a beta feature, and may be subject to backwards-incompatible changes.")}
+
${_("Here are all of the libraries you currently have access to in Studio:")}
+