Merge branch 'master' into automatic_rudolph

.codecov.yml

@@ -6,15 +6,8 @@ coverage:
     patch:
       default:
         target: 90%
-
-comment:
-  layout: "reach, diff, flags, files"
-  behavior: new
-  require_changes: false
-  require_base: no
-  require_head: yes
-  branches:
-    - "!master"
+
+comment: false
 
 ignore:
   - "game/tests/*.py"

game/static/game/css/game_screen.css

@@ -349,6 +349,12 @@ button > svg {
   padding-right: 10px;
 }
 
+.navigation_button_portal_secondary.long_button span {
+  text-align: left;
+  margin: 0;
+  width: 100%;
+}
+
 .long_button img + span {
   line-height: 30px;
   margin-left: 2px;

game/static/game/js/drawing.js

@@ -1103,11 +1103,20 @@ ocargo.Drawing.startPopup = function (
     tryAgainButton.removeClass().addClass("navigation_button_portal long_button rapid-router-welcome")
     buttonDiv.append(tryAgainButton)
 
+    let editButton = $("#edit_button")
+    editButton.removeClass().addClass("navigation_button_portal long_button rapid-router-welcome")
+    buttonDiv.append(editButton)
+
     let nextLevelButton = $("#next_level_button")
     nextLevelButton.removeClass().addClass("navigation_button_portal_secondary long_button rapid-router-welcome button--icon")
     nextLevelButton.append(icons[2])
     buttonDiv.append(nextLevelButton)
 
+    let playButton = $("#play_button")
+    playButton.removeClass().addClass("navigation_button_portal_secondary long_button rapid-router-welcome button--icon")
+    playButton.append(icons[2])
+    buttonDiv.append(playButton)
+
     $("#modal-buttons").html(buttonDiv)
   } else {
     $('#modal-buttons').html(
@@ -1141,24 +1150,6 @@ ocargo.Drawing.startYesNoPopup = function (
   $('#modal-noBtn').click(noFunction)
 }
 
-// This provides a pop-up with 2 options
-ocargo.Drawing.startOptionsPopup = function (
-  title,
-  subtitle,
-  message,
-  optionAFunction,
-  optionBFunction,
-  optionAText,
-  optionBText,
-  mascot
-) {
-  let buttonHtml =
-    '<button id="modal-optionABtn" class="navigation_button long_button">' + optionAText + '</button> <button id="modal-optionBBtn" class="navigation_button long_button">' + optionBText + '</button>'
-  ocargo.Drawing.startPopup(title, subtitle, message, mascot, buttonHtml)
-  $('#modal-optionABtn').click(optionAFunction)
-  $('#modal-optionBBtn').click(optionBFunction)
-}
-
 // This is the function that starts the pop-up when there is no internet connection while playing the game
 ocargo.Drawing.startInternetDownPopup = function () {
   ocargo.Drawing.startPopup(

game/static/game/js/level_editor.js

@@ -2727,7 +2727,6 @@ ocargo.LevelEditor = function(levelId) {
 /******************/
 
 $(function() {
-    var editor = new ocargo.LevelEditor(LEVEL);
     var subtitle = interpolate(
         gettext('Click %(help_icon)s%(help_label)s for clues on getting started.'), {
             help_icon: ocargo.jsElements.image(ocargo.Drawing.imageDir + 'icons/help.svg', 'popupHelp'),
@@ -2738,24 +2737,16 @@ $(function() {
     if (LEVEL === null){
         ocargo.Drawing.startPopup(gettext('Welcome to the Level editor!'), subtitle, '');
     } else {
-        var optionAFunc = function(){
-            $(".ocargo-modal").hide();
-            $(".modal-overlay").hide();
-        };
-
-        var optionBFunc = function(){
-            window.location.replace("/rapidrouter/custom/"+LEVEL+"/");
-        };
+        let buttons = '';
+        buttons += ocargo.button.dismissButtonHtml("edit_button", "Edit");
+        buttons += ocargo.button.redirectButtonHtml("play_button", Urls.levels() + "custom/" + LEVEL,"Play");
 
-        ocargo.Drawing.startOptionsPopup(
+        ocargo.Drawing.startPopup(
             gettext('Welcome back!'),
             gettext('Would you like to edit or play with your design?'),
             '',
-            optionAFunc,
-            optionBFunc,
-            "Edit",
-            "Play",
-            ''
+            false,
+            buttons,
           );
     }