Skip to content

Commit 46053bc

Browse files
author
Cari Spruiell
committed
Merge remote-tracking branch 'ogre/MAGETWO-45084-wrong-title' into MAGETWO-45350-Inline-Translation
2 parents 53f15f2 + f396b77 commit 46053bc

File tree

2 files changed

+31
-28
lines changed

2 files changed

+31
-28
lines changed

setup/view/error/401.phtml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
// @codingStandardsIgnoreFile
88

99
?>
10+
<script>
11+
document.title = 'Magento Setup - 401 Unauthorized Access';
12+
</script>
1013
<section class="page-landing">
1114
<img class="logo" src="<?php echo $this->basePath() ?>/pub/images/magento-logo.svg" alt="Magento"/>
1215
<p class="text-welcome">

setup/view/layout/layout.phtml

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -18,34 +18,34 @@
1818
->appendStylesheet($this->basePath() . '/pub/styles/setup.css');
1919
?>
2020
<?php echo $this->headScript()
21-
->appendFile('pub/angular/angular.min.js')
22-
->appendFile('pub/angular-ng-storage/angular-ng-storage.min.js')
23-
->appendFile('pub/angular-ng-dialog/angular-ng-dialog.min.js')
24-
->appendFile('pub/angular-clickout/angular-clickout.min.js')
25-
->appendFile('pub/angular-ui-router/angular-ui-router.min.js')
26-
->appendFile('pub/angular-ui-bootstrap/angular-ui-bootstrap.min.js')
27-
->appendFile('pub/angular-sanitize/angular-sanitize.min.js')
28-
->appendFile('pub/magento/setup/app.js')
29-
->appendFile('pub/magento/setup/main.js')
30-
->appendFile('pub/magento/setup/landing.js')
31-
->appendFile('pub/magento/setup/component-grid.js')
32-
->appendFile('pub/magento/setup/readiness-check.js')
33-
->appendFile('pub/magento/setup/add-database.js')
34-
->appendFile('pub/magento/setup/web-configuration.js')
35-
->appendFile('pub/magento/setup/customize-your-store.js')
36-
->appendFile('pub/magento/setup/create-admin-account.js')
37-
->appendFile('pub/magento/setup/install.js')
38-
->appendFile('pub/magento/setup/success.js')
39-
->appendFile('pub/magento/setup/create-backup.js')
40-
->appendFile('pub/magento/setup/complete-backup.js')
41-
->appendFile('pub/magento/setup/data-option.js')
42-
->appendFile('pub/magento/setup/start-updater.js')
43-
->appendFile('pub/magento/setup/updater-success.js')
44-
->appendFile('pub/magento/setup/select-version.js')
45-
->appendFile('pub/magento/setup/home.js')
46-
->appendFile('pub/magento/setup/auth-dialog.js')
47-
->appendFile('pub/magento/setup/system-config.js')
48-
->appendFile('pub/magento/setup/install-extension-grid.js');
21+
->appendFile($this->basePath() . '/pub/angular/angular.min.js')
22+
->appendFile($this->basePath() . '/pub/angular-ng-storage/angular-ng-storage.min.js')
23+
->appendFile($this->basePath() . '/pub/angular-ng-dialog/angular-ng-dialog.min.js')
24+
->appendFile($this->basePath() . '/pub/angular-clickout/angular-clickout.min.js')
25+
->appendFile($this->basePath() . '/pub/angular-ui-router/angular-ui-router.min.js')
26+
->appendFile($this->basePath() . '/pub/angular-ui-bootstrap/angular-ui-bootstrap.min.js')
27+
->appendFile($this->basePath() . '/pub/angular-sanitize/angular-sanitize.min.js')
28+
->appendFile($this->basePath() . '/pub/magento/setup/app.js')
29+
->appendFile($this->basePath() . '/pub/magento/setup/main.js')
30+
->appendFile($this->basePath() . '/pub/magento/setup/landing.js')
31+
->appendFile($this->basePath() . '/pub/magento/setup/component-grid.js')
32+
->appendFile($this->basePath() . '/pub/magento/setup/readiness-check.js')
33+
->appendFile($this->basePath() . '/pub/magento/setup/add-database.js')
34+
->appendFile($this->basePath() . '/pub/magento/setup/web-configuration.js')
35+
->appendFile($this->basePath() . '/pub/magento/setup/customize-your-store.js')
36+
->appendFile($this->basePath() . '/pub/magento/setup/create-admin-account.js')
37+
->appendFile($this->basePath() . '/pub/magento/setup/install.js')
38+
->appendFile($this->basePath() . '/pub/magento/setup/success.js')
39+
->appendFile($this->basePath() . '/pub/magento/setup/create-backup.js')
40+
->appendFile($this->basePath() . '/pub/magento/setup/complete-backup.js')
41+
->appendFile($this->basePath() . '/pub/magento/setup/data-option.js')
42+
->appendFile($this->basePath() . '/pub/magento/setup/start-updater.js')
43+
->appendFile($this->basePath() . '/pub/magento/setup/updater-success.js')
44+
->appendFile($this->basePath() . '/pub/magento/setup/select-version.js')
45+
->appendFile($this->basePath() . '/pub/magento/setup/home.js')
46+
->appendFile($this->basePath() . '/pub/magento/setup/auth-dialog.js')
47+
->appendFile($this->basePath() . '/pub/magento/setup/system-config.js')
48+
->appendFile($this->basePath() . '/pub/magento/setup/install-extension-grid.js');
4949
?>
5050
<link
5151
rel="icon"

0 commit comments

Comments
 (0)