UI fixes

src/controllers/ajax/GameAjaxController.php

@@ -64,7 +64,6 @@ protected function getActions(): array<string> {
             if (!$check_answered) {
               return Utils::ok_response('Double score for you! SIKE!', 'game');
             }
-            MultiTeam::invalidateMCRecords();
             return Utils::ok_response('Success', 'game');
           } else {
             await FailureLog::genLogFailedScore(

src/controllers/modals/ActionModalController.php

@@ -358,7 +358,7 @@ class="fb-cta cta--yellowe">
 
         $content =
           <div class="action-main">
-            {tr('Change your team name.')}
+            {tr('Change your team name.')} (Max 20 characters)
             <form class="fb-form-no-padding team-name-form">
               <input name="set_team_name" type="hidden" value="" />
               <div class="form-el el--text">

src/controllers/modals/TutorialModalController.php

@@ -48,52 +48,7 @@ private function getStep(
               </svg>{tr(' are owned by others.')}
             </p>
           </div>;
-        return tuple($step, tr('Captures'), 'zoom', $header, $content);
-      case 'zoom':
-        $header =
-          <div class="header-graphic">
-            <svg class="icon--country-group--europe">
-              <use href="#icon--country-group--europe"></use>
-            </svg>
-            <svg class="icon--tutorial--zoom">
-              <use href="#icon--tutorial--zoom"></use>
-            </svg>
-          </div>;
-        $content =
-          <div class="main-text">
-            <p>{tr('Tap Plus[+] to Zoom In. Tap Minus[-] to Zoom Out.')}</p>
-            <p>{tr('Click and Drag to move left, right, up and down.')}</p>
-          </div>;
-        return tuple($step, tr('Zoom'), 'command-lines', $header, $content);
-      case 'command-lines':
-        $header =
-          <div class="header-graphic">
-            <div class="fb-column-container tutorial-graphic--command-lines">
-              <span class="indicator">/atk</span>
-              <ul>
-                <li>United_Arab_Emirates</li>
-                <li>United_Kingdom</li>
-                <li class="highlighted">United_States</li>
-                <li>Uruguay</li>
-                <li>Uzbekistan</li>
-              </ul>
-            </div>
-          </div>;
-        $content =
-          <div class="main-text">
-            <p>
-              {tr(
-                'Tap Forward Slash [/] to activate computer commands. A list of commands can be found under "Rules".',
-              )}
-            </p>
-          </div>;
-        return tuple(
-          $step,
-          tr('Command_Line'),
-          'navigation',
-          $header,
-          $content,
-        );
+        return tuple($step, tr('Captures'), 'navigation', $header, $content);
       case 'navigation':
         $content =
           <div class="main-text">

src/models/Control.php

@@ -72,6 +72,7 @@ class Control extends Model {
       HintLog::genResetHints(), // Clear hints log
       FailureLog::genResetFailures(), // Clear failures log
       self::genResetBases(), // Clear bases log
+      Control::genFlushMemcached(), // Flush Memcached
       self::genClearScriptLog(),
       Configuration::genUpdate('registration', '0'), // Disable registration
       Configuration::genUpdate('login', '1'), // Enable login

src/models/Team.php

@@ -418,7 +418,7 @@ public static function regenerateHash(string $password_hash): bool {
 
     $team_name = trim($team_name);
 
-    if ($team_name === '') {
+    if ($team_name === '' || strlen($team_name) > 20) {
       return false;
     }
 

src/static/css/scss/_modals.scss

@@ -90,7 +90,7 @@
 
     .col dt, .col dd {
       width: auto;
-      display: inline-block;
+      display: block;
     }
 
     .country-capture-stats {

src/static/css/scss/_typography.scss

@@ -521,7 +521,7 @@ dt {
   font-size: .9em;
 }
 
-.country-window dd {
+dd {
   font-size: 1.1em;
 
   &.country-owner {
@@ -544,8 +544,7 @@ dt {
   }
 
   & + dt {
-    margin-top: 5%;
-    margin-left: 10%;
+    margin-top: 1em;
   }
 }
 

src/static/js/app.js

@@ -53,10 +53,6 @@ $(document).ready(function() {
   var page_location = window.location.pathname + window.location.search;
   if (window.innerWidth < 960 && page_location != '/index.php?page=mobile') {
   window.location = '/index.php?page=mobile';
-  } else if (window.innerWidth < 960 && page_location == '/index.php?page=mobile') {
-    setTimeout(function() {
-      window.location = '/index.php';
-    }, 2000);
   } else if (window.innerWidth >= 960 && page_location === '/index.php?page=mobile') {
     window.location = '/index.php';
   }

src/static/js/fb-ctf.js

@@ -917,6 +917,7 @@ function setupInputListeners() {
             var responseData = JSON.parse(data);
             if (responseData.result === 'OK') {
               console.log('OK');
+              $('.js-trigger-score').unbind('click');
               $($container).on('keypress', function(e) {
               if (e.keyCode == 13) {
                   e.preventDefault();
@@ -1753,7 +1754,7 @@ function setupInputListeners() {
       }
 
       var firstTutorial = 'tool-bars',
-          tutorialSteps = 8,
+          tutorialSteps = 6,
           currStepIndex = 1;
 
       var tutorialPath = 'p=tutorial&modal=';
@@ -1773,6 +1774,7 @@ function setupInputListeners() {
             currStepIndex++;
             Utils.loadComponent('#fb-modal', loadPath, buildTutorial);
           } else {
+            currStepIndex = 1;
             closeTutorial();
           }
         });