From 5ddc818fe4825bbda0f70a208ae67a7751d4b6f4 Mon Sep 17 00:00:00 2001 From: Ali-D-Akbar Date: Tue, 15 Sep 2020 01:28:50 +0500 Subject: [PATCH 1/7] PROD-2112 --- cms/templates/js/group-configuration-details.underscore | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cms/templates/js/group-configuration-details.underscore b/cms/templates/js/group-configuration-details.underscore index 8310a2a657..f3fd779718 100644 --- a/cms/templates/js/group-configuration-details.underscore +++ b/cms/templates/js/group-configuration-details.underscore @@ -31,9 +31,9 @@ <% if(showGroups) { %> <% allocation = Math.floor(100 / groups.length) %> -
    +
      <% groups.each(function(group, groupIndex) { %> -
    1. +
    2. <%- group.get('name') %> <%- allocation %>%
    3. From cdd3fe53dc24728cb1c58f65967fa47b298fdb22 Mon Sep 17 00:00:00 2001 From: Ali-D-Akbar Date: Tue, 15 Sep 2020 01:29:01 +0500 Subject: [PATCH 2/7] PROD-2113 --- cms/templates/js/publish-editor.underscore | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cms/templates/js/publish-editor.underscore b/cms/templates/js/publish-editor.underscore index 27c4ce2902..519564f721 100644 --- a/cms/templates/js/publish-editor.underscore +++ b/cms/templates/js/publish-editor.underscore @@ -6,13 +6,13 @@ <% _.each(xblockInfo.get('child_info').children, function(subsection) { %> <% if (subsection.isPublishable()) { %>
    4. -

      <%= subsection.get('display_name') %>

      +

      <%- subsection.get('display_name') %>

        <% _.each(subsection.get('child_info').children, function(unit) { %> <% if (unit.isPublishable()) { %>
      1. - <%= unit.get('display_name') %> + <%- unit.get('display_name') %>
      2. <% } %> <% }); %> @@ -27,7 +27,7 @@ <% _.each(xblockInfo.get('child_info').children, function(unit) { %> <% if (unit.isPublishable()) { %>
      3. - <%= unit.get('display_name') %> + <%- unit.get('display_name') %>
      4. <% } %> <% }); %> From cba81270e2154bb99ab154bab75d37feec32e41d Mon Sep 17 00:00:00 2001 From: Ali-D-Akbar Date: Thu, 17 Sep 2020 16:41:41 +0500 Subject: [PATCH 3/7] PROD-2120 --- .../js/maintenance/force-published-course-response.underscore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cms/templates/js/maintenance/force-published-course-response.underscore b/cms/templates/js/maintenance/force-published-course-response.underscore index d77059ca53..7441413dd4 100644 --- a/cms/templates/js/maintenance/force-published-course-response.underscore +++ b/cms/templates/js/maintenance/force-published-course-response.underscore @@ -3,7 +3,7 @@ <%- gettext('You have done a dry run of force publishing the course. Nothing has changed. Had you run it, the following course versions would have been change.') %>
      - <%= StringUtils.interpolate( + <%- StringUtils.interpolate( gettext('The published branch version, {published}, was reset to the draft branch version, {draft}.'), { published: current_versions['published-branch'], From e085de2230658d363992c338271e72a1c4773ead Mon Sep 17 00:00:00 2001 From: Ali-D-Akbar Date: Thu, 17 Sep 2020 16:42:20 +0500 Subject: [PATCH 4/7] PROD-2115 --- cms/templates/js/unit-outline.underscore | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/cms/templates/js/unit-outline.underscore b/cms/templates/js/unit-outline.underscore index b5e48f72fd..8ea1ddf109 100644 --- a/cms/templates/js/unit-outline.underscore +++ b/cms/templates/js/unit-outline.underscore @@ -1,23 +1,23 @@ <% if (parentInfo) { %> -
    5. -
      -

      - - <%- xblockInfo.get('display_name') %> +
    6. + <% } %> -
      -
        +
        +
        <% if (childType) { %> -
        - - <%= addChildLabel %> + <% } %> From dbdecb150182c112777f941c278f964ba023382e Mon Sep 17 00:00:00 2001 From: Ali-D-Akbar Date: Thu, 17 Sep 2020 16:42:51 +0500 Subject: [PATCH 5/7] PROD-2121 --- cms/templates/js/mock/mock-xmodule-editor.underscore | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cms/templates/js/mock/mock-xmodule-editor.underscore b/cms/templates/js/mock/mock-xmodule-editor.underscore index cb9a59c6f5..d65921f389 100644 --- a/cms/templates/js/mock/mock-xmodule-editor.underscore +++ b/cms/templates/js/mock/mock-xmodule-editor.underscore @@ -16,13 +16,13 @@ From a0147c269b9b4e0e615f40f803f16818befa099b Mon Sep 17 00:00:00 2001 From: SaadYousaf Date: Mon, 28 Sep 2020 16:11:42 +0500 Subject: [PATCH 6/7] PROD-2119 --- cms/templates/js/xblock-validation-messages.underscore | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cms/templates/js/xblock-validation-messages.underscore b/cms/templates/js/xblock-validation-messages.underscore index fc1cc142bd..c3f0bcc023 100644 --- a/cms/templates/js/xblock-validation-messages.underscore +++ b/cms/templates/js/xblock-validation-messages.underscore @@ -3,7 +3,7 @@ var summaryMessage = validation.get("summary"); var aggregateMessageType = summaryMessage.type; var aggregateValidationClass = aggregateMessageType === "error"? "has-errors" : "has-warnings"; %> -
        +

        <%- summaryMessage.text %> <% if (summaryMessage.action_class) { %> @@ -25,7 +25,7 @@ var aggregateValidationClass = aggregateMessageType === "error"? "has-errors" : var messageType = message.type var messageTypeDisplayName = getDisplayName(messageType) %> -

      1. +
      2. <% if (messageTypeDisplayName) { %> <%- messageTypeDisplayName %>: From c08006723a65ab30db597cf8a915d92f4378ed46 Mon Sep 17 00:00:00 2001 From: SaadYousaf Date: Mon, 28 Sep 2020 16:13:00 +0500 Subject: [PATCH 7/7] PROD-2124 --- cms/templates/js/video/transcripts/file-upload.underscore | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cms/templates/js/video/transcripts/file-upload.underscore b/cms/templates/js/video/transcripts/file-upload.underscore index 925b846c01..fea4f5eec9 100644 --- a/cms/templates/js/video/transcripts/file-upload.underscore +++ b/cms/templates/js/video/transcripts/file-upload.underscore @@ -4,6 +4,6 @@
        - + accept="<%- _.map(ext, function(val){ return '.' + val; }).join(', ') %>"> +