Merge remote-tracking branch 'origin/release-freeze' into release-can…

…didate
edx · Apr 12, 2019 · 813ba2d · 813ba2d
2 parents ae427e3 + a768d38
commit 813ba2d
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 14 deletions.
diff --git a/lms/static/scorm/ssla/config_override.js b/lms/static/scorm/ssla/config_override.js
@@ -21,9 +21,7 @@ var sslaConfig = {
     popupMainContentMessageAfterOpen: function() {
         return '';
     },
-    popupMainContentMessageFailed: function() {
-        return '<div style="background-color:rgb(250,250,250); width: 100%; height: 100%; display: table;"> <p style="font-family: \'Open Sans\', Arial, sans-serif; font-size: 14px; color: #000000; padding-top: 54px;">It looks like your browser settings has pop-ups disabled. <br>The content takes place in a new window.</p> <br><br> <button onclick="parent.ssla.ssla.popupManually();" style="background-color: #3385C7; color: white; padding: 1rem 2rem; font-family: \'Open Sans\', Arial, sans-serif; font-size: 14px; border-width: 0; font-weight: 700; border-color: #2s6a9f; border-radius: 5px;">Launch pop-up to continue</button></div>';
-    },
+    popupMainContentMessageFailed: getPopupLaunchFailedMessage,
     popupWindowParams: "status=1,toolbar=1,scrollbars=yes,resizable=yes,alwaysRaised=1"
 };
 
@@ -159,3 +157,20 @@ function closePopupMultiSco() {
 function handlePopupClosed() {
     parent.document.handleScormPopupClosed()
 }
+
+function getPopupLaunchFailedMessage() {
+  const firstMessageText = parent.gettext('It looks like your browser settings has pop-ups disabled.');
+  const secondMessageText = parent.gettext('The content takes place in a new window.');
+  const buttonTitle = parent.gettext('Launch pop-up to continue');
+  const baseHTML = '<div style="background-color:rgb(250,250,250); width: 100%; height: 100%; display: table;"> <p style="font-family: \'Open Sans\', Arial, sans-serif; font-size: 14px; color: #000000; padding-top: 54px;">' + firstMessageText + ' <br>' + secondMessageText + '</p> <br><br> '
+
+  if (parent.$("body").hasClass("new-theme")) {
+    const primaryColor = parent.getComputedStyle(parent.document.body).getPropertyValue('--primary');
+    var background_color =  primaryColor ? primaryColor : '#1c3bce';
+    const newUIStyle = '.new-theme.button {\nfont-weight: 600;\nfont-size: 12px;\nheight: 40px;\nborder-radius: 2px;\ntext-transform: uppercase;\nline-height: 1.83;\nletter-spacing: 0.5px;\ntext-align: center;\npadding: 0 20px;\nbackground-color:' + background_color + ';\nborder: 1px solid ' + background_color + ';\ntransition: .35s;\ncolor: white;cursor:pointer\n}\n.button:hover {\nbox-shadow:  inset 0 0 0 3em rgba(0,0,0,0.2);\ncolor: white;\n}\n}';
+    return '<head><style>' + newUIStyle + '</style></head><body>'+ baseHTML + '<button onclick="parent.ssla.ssla.popupManually();" style="" class="new-theme button">' + buttonTitle + '</button></div></body>';
+  }
+  else {
+    return baseHTML + '<button onclick="parent.ssla.ssla.popupManually();" style="background-color: #3385C7; color: white; padding: 1rem 2rem; font-family: \'Open Sans\', Arial, sans-serif; font-size: 14px; border-width: 0; font-weight: 700; border-color: #2s6a9f; border-radius: 5px;">' + buttonTitle + '</button></div>';
+  }
+}
diff --git a/requirements/edx/custom.txt b/requirements/edx/custom.txt
@@ -5,31 +5,30 @@
 -e git+https://github.com/edx-solutions/xblock-image-explorer.git@v1.1.3#egg=xblock-image-explorer==1.1.3
 -e git+https://github.com/edx-solutions/xblock-drag-and-drop.git@92ee2055a16899090a073e1df81e35d5293ad767#egg=xblock-drag-and-drop
 # FIXME: temp hash, until a proper solution is findout (ref ticket: https://edx-wiki.atlassian.net/browse/MCKIN-8249)
--e git+https://github.com/edx-solutions/xblock-drag-and-drop-v2.git@15d0d797c8bf8590ca39dec88fcc3f315058d565#egg=xblock-drag-and-drop-v2==2.2.1
+-e git+https://github.com/edx-solutions/xblock-drag-and-drop-v2.git@28c82e3d63f011029343115cb1b07e27afaeeb3e#egg=xblock-drag-and-drop-v2==2.2.2
 # This is required for A2E courses that were created with the temporary (xblock-drag-and-drop-v2-new) DnDv2 branch to continue to work.
 # FIXME: bump version to 2.1.6 when https://github.com/edx-solutions/xblock-drag-and-drop-v2/pull/154 merged and tagged
 -e git+https://github.com/open-craft/xblock-drag-and-drop-v2.git@82c9dc5e16d10793e8b79e60661e1a78893fce25#egg=xblock-drag-and-drop-v2-new
--e git+https://github.com/edx-solutions/xblock-ooyala.git@v2.0.22#egg=xblock-ooyala==2.0.22
-git+https://github.com/edx-solutions/xblock-group-project.git@0.1.1#egg=xblock-group-project==0.1.1
--e git+https://github.com/edx-solutions/xblock-adventure.git@7bdeb62b1055377dc04a7b503f7eea8264f5847b#egg=xblock-adventure
--e git+https://github.com/open-craft/xblock-poll.git@1.8.2#egg=xblock-poll==1.8.2
+-e git+https://github.com/edx-solutions/xblock-ooyala.git@v2.0.23#egg=xblock-ooyala==2.0.23
+git+https://github.com/edx-solutions/xblock-group-project.git@0.1.2#egg=xblock-group-project==0.1.2
+-e git+https://github.com/edx-solutions/xblock-adventure.git@v0.1.1#egg=xblock-adventure==0.1.1
+-e git+https://github.com/open-craft/xblock-poll.git@1.8.3#egg=xblock-poll==1.8.3
 -e git+https://github.com/open-craft/edx-notifications.git@9930a7069dd496e3229145d0dee8f750c9d1d7cc#egg=edx-notifications==0.8.4
--e git+https://github.com/open-craft/problem-builder.git@v3.3.2#egg=xblock-problem-builder==3.3.2
+-e git+https://github.com/open-craft/problem-builder.git@v3.3.3#egg=xblock-problem-builder==3.3.3
 -e git+https://github.com/OfficeDev/xblock-officemix.git@86238f5968a08db005717dbddc346808f1ed3716#egg=xblock-officemix
 -e git+https://github.com/open-craft/xblock-chat.git@v0.2.3#egg=xblock-chat==0.2.3
 -e git+https://github.com/open-craft/xblock-eoc-journal.git@53c6b6e4e8764627ed352e30fe2c60755e91d262#egg=xblock-eoc-journal
--e git+https://github.com/mckinseyacademy/xblock-scorm.git@v2.0.24#egg=xblock-scorm==2.0.24
+-e git+https://github.com/mckinseyacademy/xblock-scorm.git@v2.0.25#egg=xblock-scorm==2.0.25
 -e git+https://github.com/mckinseyacademy/xblock-diagnosticfeedback.git@v0.2.4#egg=xblock-diagnostic-feedback==0.2.4
 -e git+https://github.com/open-craft/xblock-group-project-v2.git@0.4.14#egg=xblock-group-project-v2==0.4.14
 -e git+https://github.com/open-craft/xblock-virtualreality.git@v0.1.1#egg=xblock-virtualreality==0.1.1
-# temp branch - remove once issues are resolved
-git+https://github.com/edx-solutions/api-integration.git@rc-branch#egg=api-integration==2.7.0
+git+https://github.com/edx-solutions/api-integration.git@v2.7.3#egg=api-integration==2.7.3
 git+https://github.com/edx-solutions/organizations-edx-platform-extensions.git@v1.2.7#egg=organizations-edx-platform-extensions==1.2.7
 git+https://github.com/edx-solutions/gradebook-edx-platform-extensions.git@1.1.14#egg=gradebook-edx-platform-extensions==1.1.14
-git+https://github.com/edx-solutions/projects-edx-platform-extensions.git@v1.1.8#egg=projects-edx-platform-extensions==1.1.8
+git+https://github.com/edx-solutions/projects-edx-platform-extensions.git@v1.1.9#egg=projects-edx-platform-extensions==1.1.9
 git+https://github.com/edx-solutions/discussion-edx-platform-extensions.git@v1.2.13#egg=discussion-edx-platform-extensions==1.2.13
 git+https://github.com/edx-solutions/course-edx-platform-extensions.git@v1.1.1#egg=course-edx-platform-extensions==1.1.1
 git+https://github.com/edx-solutions/mobileapps-edx-platform-extensions.git@v1.3.0#egg=mobileapps-edx-platform-extensions==1.3.0
 git+https://github.com/edx-solutions/progress-edx-platform-extensions.git@1.0.8#egg=progress-edx-platform-extensions==1.0.8
-openedx-completion-aggregator==1.5.21
+openedx-completion-aggregator==1.5.22
 git+https://github.com/mckinseyacademy/openedx-user-manager-api@v1.1.0#egg=openedx-user-manager-api==1.1.0