Merge remote-tracking branch 'origin/MAGETWO-44895-web-setup-wizard-missing-title' into PR_Branch

Ivan Gavryshko · Ivan Gavryshko · commit 10bcfb058617 · 2015-11-04T19:05:39.000-06:00
diff --git a/setup/config/states.home.config.php b/setup/config/states.home.config.php
@@ -16,6 +16,7 @@
         [
             'id'          => 'root.home',
             'url'         => 'home',
+            'title'       => 'Setup Wizard',
             'templateUrl' => "$base/home",
             'header'      => 'Home',
             'nav'         => false,
@@ -27,7 +28,7 @@
             'id'          => 'root.update',
             'url'         => 'component-grid',
             'templateUrl' => "$base/component-grid",
-            'title'       => "Component Manager",
+            'title'       => 'Component Manager',
             'controller'  => 'componentGridController',
             'nav'         => false,
             'noMenu'      => true,
@@ -50,7 +51,7 @@
             'id'          => 'root.upgrade',
             'url'         => 'select-version',
             'templateUrl' => "$base/select-version",
-            'title'       => 'Select Version',
+            'title'       => 'System Upgrade',
             'controller'  => 'selectVersionController',
             'header'      => 'Step 1: Select Version',
             'order'       => 1,
diff --git a/setup/config/states.install.config.php b/setup/config/states.install.config.php
@@ -30,7 +30,7 @@
             'id'          => 'root.landing-install',
             'url'         => 'landing-install',
             'templateUrl' => "$base/landing-installer",
-            'title'       => 'Landing',
+            'title'       => 'Installation',
             'controller'  => 'landingController',
             'main'        => true,
             'default'     => true,
@@ -120,6 +120,7 @@
             'id'          => 'root.success',
             'url'         => 'success',
             'templateUrl' => "{$base}/success",
+            'title'       => 'Success',
             'controller'  => 'successController',
             'main'        => true,
             'order'       => 8,
diff --git a/setup/view/layout/layout.phtml b/setup/view/layout/layout.phtml
@@ -13,6 +13,7 @@
 <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>{{$state.current.title}}</title>
     <?php echo $this->headLink()
         ->appendStylesheet($this->basePath() . '/pub/styles/setup.css');
     ?>
@@ -67,6 +68,11 @@
         href="<?php echo $this->basePath() ?>/pub/images/favicon/favicon-16x16.png"
         sizes="16x16">
     <?php echo $this->inlineScript() ?>
+    <style>
+        a.white-space-pre-line {
+            white-space: pre-line;
+        }
+    </style>
 </head>
 <body>
 <?php echo $this->content; ?>
diff --git a/setup/view/magento/setup/navigation/menu.phtml b/setup/view/magento/setup/navigation/menu.phtml
@@ -7,16 +7,6 @@
 // @codingStandardsIgnoreFile
 
 ?>
-<head>
-<title>{{$state.current.title}}</title>
-<style>
-    a.white-space-pre-line {
-        white-space: pre-line;
-    }
-</style>
-
-</head>
-
 
 <nav ng-controller="navigationController" id="menu" class="nav ng-scope show"
          ng-hide="$state.current.noMenu || $state.current.main || $state.current.default">
