MAGETWO-44043: Wording error in readiness check

- renamed installer to install
- moved localstorage reset to navigationService from main

Author: mazhalai

setup/config/states.installer.config.php renamed to setup/config/states.install.config.php

@@ -8,7 +8,7 @@
 
 return [
     'navInstallerTitles' => [
-        'installer'    => 'Magento Installer',
+        'install'    => 'Magento Installer',
     ],
     'navInstaller' => [
         [
@@ -24,39 +24,39 @@
             'main'        => true,
             'nav'         => false,
             'order'       => -1,
-            'type'        => 'installer'
+            'type'        => 'install'
         ],
         [
-            'id'          => 'root.landing-installer',
-            'url'         => 'landing-installer',
+            'id'          => 'root.landing-install',
+            'url'         => 'landing-install',
             'templateUrl' => "$base/landing-installer",
             'title'       => 'Landing',
             'controller'  => 'landingController',
             'main'        => true,
             'default'     => true,
             'order'       => 0,
-            'type'        => 'installer'
+            'type'        => 'install'
         ],
         [
-            'id'          => 'root.readiness-check-installer',
-            'url'         => 'readiness-check-installer',
+            'id'          => 'root.readiness-check-install',
+            'url'         => 'readiness-check-install',
             'templateUrl' => "{$base}/readiness-check-installer",
             'title'       => "Readiness \n Check",
             'header'      => 'Step 1: Readiness Check',
             'nav'         => true,
             'order'       => 1,
-            'type'        => 'installer'
+            'type'        => 'install'
         ],
         [
-            'id'          => 'root.readiness-check-installer.progress',
-            'url'         => 'readiness-check-installer/progress',
+            'id'          => 'root.readiness-check-install.progress',
+            'url'         => 'readiness-check-install/progress',
             'templateUrl' => "{$base}/readiness-check-installer/progress",
             'title'       => 'Readiness Check',
             'header'      => 'Step 1: Readiness Check',
             'controller'  => 'readinessCheckController',
             'nav'         => false,
             'order'       => 2,
-            'type'        => 'installer'
+            'type'        => 'install'
         ],
         [
             'id'          => 'root.add-database',
@@ -68,7 +68,7 @@
             'nav'         => true,
             'validate'    => true,
             'order'       => 3,
-            'type'        => 'installer'
+            'type'        => 'install'
         ],
         [
             'id'          => 'root.web-configuration',
@@ -80,7 +80,7 @@
             'nav'         => true,
             'validate'    => true,
             'order'       => 4,
-            'type'        => 'installer'
+            'type'        => 'install'
         ],
         [
             'id'          => 'root.customize-your-store',
@@ -91,7 +91,7 @@
             'controller'  => 'customizeYourStoreController',
             'nav'         => true,
             'order'       => 5,
-            'type'        => 'installer'
+            'type'        => 'install'
         ],
         [
             'id'          => 'root.create-admin-account',
@@ -103,7 +103,7 @@
             'nav'         => true,
             'validate'    => true,
             'order'       => 6,
-            'type'        => 'installer'
+            'type'        => 'install'
         ],
         [
             'id'          => 'root.install',
@@ -114,7 +114,7 @@
             'controller'  => 'installController',
             'nav'         => true,
             'order'       => 7,
-            'type'        => 'installer'
+            'type'        => 'install'
         ],
         [
             'id'          => 'root.success',
@@ -123,7 +123,7 @@
             'controller'  => 'successController',
             'main'        => true,
             'order'       => 8,
-            'type'        => 'installer'
+            'type'        => 'install'
         ],
     ],
 ];

setup/pub/magento/setup/landing.js

@@ -10,7 +10,6 @@ angular.module('landing', ['ngStorage'])
         '$location',
         '$localStorage',
         function ($scope, $location, $localStorage) {
-            $localStorage.$reset();
             $scope.selectLanguage = function () {
                 $localStorage.lang = $scope.modelLanguage;
                 window.location = 'index.php/' + $scope.modelLanguage + '/index';

setup/pub/magento/setup/main.js

@@ -83,8 +83,8 @@ main.controller('navigationController',
         }
 
         $scope.goToStart = function() {
-            if ($state.current.type === 'installer') {
-                $state.go('root.landing-installer');
+            if ($state.current.type === 'install') {
+                $state.go('root.landing-install');
             } else if ($state.current.type === 'upgrade') {
                 $state.go('root.upgrade');
             } else {
@@ -103,6 +103,7 @@ main.controller('navigationController',
         mainState: {},
         states: [],
         load: function () {
+            $localStorage.$reset();
             var self = this;
             return $http.get('index.php/navigation').success(function (data) {
                 var currentState = $location.path().replace('/', '');

setup/src/Magento/Setup/Module.php

@@ -62,7 +62,7 @@ public function getConfig()
             include __DIR__ . '/../../../config/module.config.php',
             include __DIR__ . '/../../../config/router.config.php',
             include __DIR__ . '/../../../config/di.config.php',
-            include __DIR__ . '/../../../config/states.installer.config.php',
+            include __DIR__ . '/../../../config/states.install.config.php',
             include __DIR__ . '/../../../config/states.update.config.php',
             include __DIR__ . '/../../../config/states.home.config.php',
             include __DIR__ . '/../../../config/states.extensionManager.config.php',

setup/view/magento/setup/index.phtml

@@ -5,7 +5,7 @@
  */
 ?>
 <div ng-include="'index.php/navigation/side-menu'" style="display: inline-block"></div>
-<div class="{{$state.current.type == 'installer' ? 'container' : 'page-wrapper'}}">
+<div class="{{$state.current.type == 'install' ? 'container' : 'page-wrapper'}}">
     <div ng-include="'index.php/navigation/header-bar'"></div>
     <main id="anchor-content" class="page-content">
         <?php echo $this->render('navigation/menu.phtml');?>

setup/view/magento/setup/readiness-check/progress.phtml

@@ -31,7 +31,7 @@
             <span></span><span></span><span></span><span></span>
         </span>
         <span class="message-text">We're making sure your server environment is ready for
-        {{typeOf(moduleName) !== 'undefined' ? moduleName : title[$state.current.type]}}
+        {{moduleName ? moduleName : ($state.current.type === 'install'? 'Magento' : titles[$state.current.type])}}
             to be {{$state.current.type}}{{endsWith($state.current.type, 'e') ? 'd' : 'ed'}}.</span>
     </div>