Skip to content

Commit d143bbc

Browse files
author
Natalia Momotenko
committed
MAGETWO-32210: [UI] Assistance with Installation wizard
1 parent 58d4e29 commit d143bbc

File tree

11 files changed

+250
-211
lines changed

11 files changed

+250
-211
lines changed

‎setup/pub/styles/setup.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎setup/src/Magento/Setup/Model/WebLogger.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public function __construct(Filesystem $filesystem, $logFile = null)
6363
public function logSuccess($message)
6464
{
6565
$this->terminateLine();
66-
$this->writeToFile('<span class="text-success">[SUCCESS] ' . $message . '</span><br/>');
66+
$this->writeToFile('<span class="text-success">[SUCCESS] ' . $message . '</span><br>');
6767
}
6868

6969
/**
@@ -72,7 +72,7 @@ public function logSuccess($message)
7272
public function logError(\Exception $e)
7373
{
7474
$this->terminateLine();
75-
$this->writeToFile('<span class="text-danger">[ERROR] ' . $e . '<span><br/>');
75+
$this->writeToFile('<span class="text-danger">[ERROR] ' . $e . '<span><br>');
7676
}
7777

7878
/**
@@ -81,7 +81,7 @@ public function logError(\Exception $e)
8181
public function log($message)
8282
{
8383
$this->terminateLine();
84-
$this->writeToFile('<span class="text-info">' . $message . '</span><br/>');
84+
$this->writeToFile('<span class="text-info">' . $message . '</span><br>');
8585
}
8686

8787
/**
@@ -99,7 +99,7 @@ public function logInline($message)
9999
public function logMeta($message)
100100
{
101101
$this->terminateLine();
102-
$this->writeToFile('<span class="hidden">' . $message . '</span><br/>');
102+
$this->writeToFile('<span class="hidden">' . $message . '</span><br>');
103103
}
104104

105105
/**
@@ -145,7 +145,7 @@ private function terminateLine()
145145
{
146146
if ($this->isInline) {
147147
$this->isInline = false;
148-
$this->writeToFile('</br>');
148+
$this->writeToFile('<br>');
149149
}
150150
}
151151
}

‎setup/view/magento/setup/customize-your-store.phtml

Lines changed: 175 additions & 160 deletions
Original file line numberDiff line numberDiff line change
@@ -21,176 +21,191 @@
2121
<h2 class="page-title">{{$state.current.header}}</h2>
2222

2323
<form class="customize-your-store" name="customizeStore" role="form">
24-
25-
<div class="row form-row">
26-
<div class="col-m-3">
27-
<label class="form-label">Sample Data</label>
28-
</div>
29-
<div class="col-m-6">
30-
<p>
31-
Select “Use Sample Data" to create a sample store with sample products, customers, and payment settings. Our <a target="_blank" href="http://devdocs.magento.com/guides/v1.0/install-gde/install/sample-data.html">Guide to Using Sample Data</a> can help you get started.
32-
</p>
33-
<input
34-
id="useSampleData"
35-
class="form-el-checkbox"
36-
type="checkbox"
37-
ng-model="store.useSampleData"
38-
<?php echo $this->isSampledataEnabled ? '' : 'disabled' ?>
39-
>
40-
<label class="form-label" for="useSampleData">
41-
Use Sample Data
42-
</label>
24+
<fieldset class="form-fieldset customize-your-store-default">
25+
<legend class="legend">
26+
Customize Your Store
27+
</legend>
28+
<div class="row form-row">
29+
<div class="col-m-3">
30+
<label class="form-label">Sample Data</label>
31+
</div>
32+
<div class="col-m-6">
33+
<p>
34+
Select “Use Sample Data" to create a sample store with sample products, customers, and payment settings. Our <a target="_blank" href="http://devdocs.magento.com/guides/v1.0/install-gde/install/sample-data.html">Guide to Using Sample Data</a> can help you get started.
35+
</p>
36+
<input
37+
id="useSampleData"
38+
class="form-el-checkbox"
39+
type="checkbox"
40+
ng-model="store.useSampleData"
41+
<?php echo $this->isSampledataEnabled ? '' : 'disabled' ?>
42+
>
43+
<label class="form-label" for="useSampleData">
44+
Use Sample Data
45+
</label>
46+
</div>
4347
</div>
44-
</div>
4548

46-
<div class="row form-row">
47-
<div class="col-m-3">
48-
<label class="form-label required" for="storeTimezone">Store Default Time Zone</label>
49-
</div>
50-
<div class="col-m-4">
51-
<label class="form-select-label" for="storeTimezone">
52-
<select
53-
id="storeTimezone"
54-
class="form-el-select"
55-
ng-model="store.timezone"
56-
tooltip-placement="right"
57-
tooltip-html-unsafe="The time zone in which your online store operates. You can change this later in Magento Admin."
58-
tooltip-trigger="focus"
59-
tooltip-append-to-body="true">
60-
<?php foreach ( $this->timezone as $value => $label ): ?>
61-
<?php echo "<option value=\"" . $value . "\">" . $label . "</option>"; ?>
62-
<?php endforeach; ?>
63-
</select>
64-
</label>
49+
<div class="row form-row">
50+
<div class="col-m-3">
51+
<label class="form-label required" for="storeTimezone">Store Default Time Zone</label>
52+
</div>
53+
<div class="col-m-4">
54+
<label class="form-select-label" for="storeTimezone">
55+
<select
56+
id="storeTimezone"
57+
class="form-el-select"
58+
ng-model="store.timezone"
59+
tooltip-placement="right"
60+
tooltip-html-unsafe="The time zone in which your online store operates. You can change this later in Magento Admin."
61+
tooltip-trigger="focus"
62+
tooltip-append-to-body="true">
63+
<?php foreach ( $this->timezone as $value => $label ): ?>
64+
<?php echo "<option value=\"" . $value . "\">" . $label . "</option>"; ?>
65+
<?php endforeach; ?>
66+
</select>
67+
</label>
68+
</div>
6569
</div>
66-
</div>
6770

68-
<div class="row form-row">
69-
<div class="col-m-3">
70-
<label class="form-label required" for="storeCurrency">
71-
Store Default Currency
72-
</label>
73-
</div>
74-
<div class="col-m-4">
75-
<label class="form-select-label" for="storeCurrency">
76-
<select
77-
id="storeCurrency"
78-
class="form-el-select"
79-
ng-model="store.currency"
80-
tooltip-placement="right"
81-
tooltip-html-unsafe="The currency your store uses for price labeling, checkout, returns, credit and gift cards. You can change this later in Magento Admin."
82-
tooltip-trigger="focus"
83-
tooltip-append-to-body="true">
84-
<?php foreach ( $this->currency as $value => $label ): ?>
85-
<?php echo "<option value=\"" . $value . "\">" . $label . "</option>"; ?>
86-
<?php endforeach; ?>
87-
</select>
88-
</label>
89-
</label>
71+
<div class="row form-row">
72+
<div class="col-m-3">
73+
<label class="form-label required" for="storeCurrency">
74+
Store Default Currency
75+
</label>
76+
</div>
77+
<div class="col-m-4">
78+
<label class="form-select-label" for="storeCurrency">
79+
<select
80+
id="storeCurrency"
81+
class="form-el-select"
82+
ng-model="store.currency"
83+
tooltip-placement="right"
84+
tooltip-html-unsafe="The currency your store uses for price labeling, checkout, returns, credit and gift cards. You can change this later in Magento Admin."
85+
tooltip-trigger="focus"
86+
tooltip-append-to-body="true">
87+
<?php foreach ( $this->currency as $value => $label ): ?>
88+
<?php echo "<option value=\"" . $value . "\">" . $label . "</option>"; ?>
89+
<?php endforeach; ?>
90+
</select>
91+
</label>
92+
</label>
93+
</div>
9094
</div>
91-
</div>
9295

93-
<div class="row form-row">
94-
<div class="col-m-3">
95-
<label class="form-label required" for="storeLanguage">
96-
Store Default Language
97-
</label>
98-
</div>
99-
<div class="col-m-4">
100-
<label class="form-select-label" for="storeLanguage">
101-
<select
102-
id="storeLanguage"
103-
class="form-el-select"
104-
ng-model="store.language"
105-
tooltip-placement="right"
106-
tooltip-html-unsafe="The language customers will see in your store. You can change this later in Magento Set Up Tool."
107-
tooltip-trigger="focus"
108-
tooltip-append-to-body="true">
109-
<?php foreach ( $this->language as $value => $label ): ?>
110-
<?php echo "<option value=\"" . $value . "\">" . $label . "</option>"; ?>
111-
<?php endforeach; ?>
112-
</select>
113-
</label>
96+
<div class="row form-row">
97+
<div class="col-m-3">
98+
<label class="form-label required" for="storeLanguage">
99+
Store Default Language
100+
</label>
101+
</div>
102+
<div class="col-m-4">
103+
<label class="form-select-label" for="storeLanguage">
104+
<select
105+
id="storeLanguage"
106+
class="form-el-select"
107+
ng-model="store.language"
108+
tooltip-placement="right"
109+
tooltip-html-unsafe="The language customers will see in your store. You can change this later in Magento Set Up Tool."
110+
tooltip-trigger="focus"
111+
tooltip-append-to-body="true">
112+
<?php foreach ( $this->language as $value => $label ): ?>
113+
<?php echo "<option value=\"" . $value . "\">" . $label . "</option>"; ?>
114+
<?php endforeach; ?>
115+
</select>
116+
</label>
117+
</div>
114118
</div>
115-
</div>
119+
</fieldset>
116120

117-
<legend
118-
class="form-legend-expand"
119-
ng-click="updateOnExpand(store.advanced)"
120-
ng-class="{'expanded' : store.advanced.expanded}"
121-
>
122-
Advanced Modules Configurations
123-
</legend>
124-
<div ng-show="store.advanced.expanded" class="form-group">
125-
<div
126-
class="alert-info"
127-
ng-show="store.errorMessage !== ''&& store.errorMessage !== false"
121+
<fieldset class="form-fieldset customize-your-store-advanced">
122+
<legend
123+
class="form-legend-expand"
124+
ng-click="updateOnExpand(store.advanced)"
125+
ng-class="{'expanded' : store.advanced.expanded}"
128126
>
129-
<span class="alert-text">
130-
<input
131-
id="skipDependency"
132-
class="form-el-checkbox"
133-
type="checkbox"
134-
ng-model="store.force"
135-
ng-click="toggleForce()"
127+
Advanced Modules Configurations
128+
</legend>
129+
130+
<div ng-show="store.advanced.expanded">
131+
132+
<div
133+
class="alert alert-info"
134+
ng-show="store.errorMessage !== ''&& store.errorMessage !== false"
136135
>
137-
<label class="form-label" for="skipDependency">
138-
Skip dependency check for individual modules
136+
<span class="alert-icon icon-failed-round"></span>
137+
<div class="alert-text">
138+
<p>
139+
An error has occurred.
140+
<a href="#"
141+
ng-click="expandError()"
142+
ng-class="{'expanded' : store.errorFlag}"
143+
>
144+
{{store.errorFlag ? 'Hide' : 'Show';}} details
145+
</a>
146+
</p>
147+
<p ng-show="store.errorMessage !== '' && store.errorFlag === true"
148+
ng-bind-html="store.errorMessage">
149+
</p>
150+
<p class="advanced-modules-skip">
151+
<input id="skipDependency"
152+
class="form-el-checkbox"
153+
type="checkbox"
154+
ng-model="store.force"
155+
ng-click="toggleForce()"
156+
>
157+
<label class="form-label" for="skipDependency">
158+
Skip dependency check for individual modules
159+
</label>
160+
</p>
161+
</div>
162+
</div>
163+
164+
<div class="alert alert-info" ng-show="loading">
165+
<span class="spinner">
166+
<span></span><span></span><span></span><span></span>
167+
<span></span><span></span><span></span><span></span>
168+
</span>
169+
<p class="alert-text">Validating Constraints for enabling/disabling modules...</p>
170+
</div>
171+
172+
<p class="advanced-modules-select">
173+
<input id="selectAll" type="checkbox"
174+
class="form-el-checkbox"
175+
ng-model="store.selectAll"
176+
ng-click="toggleAllModules()">
177+
<label class="form-label" for="selectAll">
178+
Select All
139179
</label>
140-
</span>
141-
<span class="icon-failed-round"></span>
142-
<span
143-
class="form-legend-expand"
144-
ng-click="expandError()"
145-
ng-class="{'expanded' : store.errorFlag}">
146-
An error has occurred. {{store.errorFlag ? 'Hide' : 'Show';}} details.
147-
</span>
148-
<span class="alert-text"
149-
ng-show="store.errorMessage !== '' && store.errorFlag === true"
150-
ng-bind-html="store.errorMessage">
151-
</span>
152-
</div>
153-
<div class="alert alert-info" ng-show="loading">
154-
<span class="spinner">
155-
<span></span><span></span><span></span><span></span>
156-
<span></span><span></span><span></span><span></span>
157-
</span>
158-
<p class="alert-text">Validating Constraints for enabling/disabling modules...
159180
</p>
181+
182+
<div class="multiselect multiselect-custom">
183+
<ul>
184+
<li ng-repeat="module in store.allModules"
185+
class="item"
186+
ng-class="store.selectedModules.indexOf(module) > -1 ? 'selected' : 'notSelected'; "
187+
>
188+
<input
189+
class="form-el-checkbox"
190+
type="checkbox"
191+
ng-click="toggleModule(module)"
192+
ng-disabled="store.disabledModules.indexOf(module) > -1"
193+
ng-checked="store.selectedModules.indexOf(module) > -1"
194+
id="{{module}}"
195+
>
196+
<label class="form-label"
197+
for="{{module}}"
198+
>
199+
{{module}}
200+
</label>
201+
</li>
202+
</ul>
203+
</div>
204+
205+
<p class="advanced-modules-count">
206+
{{store.selectedModules.length}} out of {{store.allModules.length}} selected
207+
</p>
208+
160209
</div>
161-
<div>&nbsp;</div>
162-
<div class="form-label">
163-
<input id="selectAll" type="checkbox"
164-
class="form-el-checkbox"
165-
ng-model="store.selectAll"
166-
ng-click="toggleAllModules()">
167-
<label class="form-label" for="selectAll">
168-
Select All
169-
</label>
170-
</div>
171-
<div>&nbsp;</div>
172-
<div class="multiSelect">
173-
<label class="custom" ng-repeat="module in store.allModules" >
174-
<div ng-class="store.selectedModules.indexOf(module) > -1 ? 'selected' : 'notSelected'; ">
175-
<input
176-
class="form-el-checkbox"
177-
type="checkbox"
178-
ng-click="toggleModule(module)"
179-
ng-disabled="store.disabledModules.indexOf(module) > -1"
180-
ng-checked="store.selectedModules.indexOf(module) > -1"
181-
id="{{module}}"
182-
>
183-
<label class="form-label"
184-
for="{{module}}"
185-
>
186-
{{module}}
187-
</label>
188-
</div>
189-
</label>
190-
</div>
191-
<div>&nbsp;</div>
192-
<div class="form-group">
193-
{{store.selectedModules.length}} out of {{store.allModules.length}} selected.
194-
</div>
195-
</div>
196-
</form>
210+
</fieldset>
211+
</form>

0 commit comments

Comments
 (0)