Skip to content

Commit adc9d0b

Browse files
mazhalaimazhalai
committed
MAGETWO-33669: Contribution of Sprint 23 Work to Mainline
- merging new look and other merge conflict.
1 parent be754a8 commit adc9d0b

File tree

5 files changed

+309
-152
lines changed

5 files changed

+309
-152
lines changed

‎app/code/Magento/Weee/composer.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
"magento/framework": "0.42.0-beta7",
1717
"magento/magento-composer-installer": "*"
1818
},
19-
"conflict": {"magento/module-usps": "0.42.0-beta7"},
2019
"type": "magento2-module",
2120
"version": "0.42.0-beta7",
2221
"license": [

‎setup/module/Magento/Setup/styles/pages/_customize-your-store.less

Lines changed: 35 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -3,42 +3,47 @@
33
// * See COPYING.txt for license details.
44
// */
55

6-
.uncheckedClass {
7-
padding: 5px 5px 5px 5px;
8-
width:480px;
9-
font-weight: normal;
6+
.multiSelect {
7+
.selected {
8+
width: 430px;
9+
background-color: #d9edf7;
10+
padding: 5px;
11+
}
12+
.notSelected{
13+
width: 430px;
14+
padding: 5px;
15+
}
16+
.form-label {
17+
font-size: 1.8rem;
18+
}
1019
}
1120

12-
.checkedClass {
13-
padding: 5px 5px 5px 5px;
14-
background-color:#d9edf7;
15-
width:480px;
16-
font-weight: normal;
21+
.form-legend-expand {
22+
margin: 1px;
1723
}
1824

19-
.disabledClass {
20-
padding: 5px 5px 5px 5px;
21-
color: #707070;
22-
width:480px;
23-
font-weight: normal;
25+
.alert-text {
26+
margin: 5px;
27+
display: block;
2428
}
2529

26-
.multiSelect{
27-
padding : 10px;
28-
border-radius: 4px;
29-
border: 1px solid #ccc;
30-
overflow-y: scroll;
31-
width:500px;
32-
height:300px;
30+
.alert-info {
31+
.form-legend-expand {
32+
margin: 5px;
33+
font-size: 1.4rem;
34+
display: inline;
35+
}
3336
}
3437

35-
::-webkit-scrollbar {
36-
-webkit-appearance: none;
37-
width: 8px;
38+
.icon-failed-round{
39+
margin: 2px;
40+
position: relative;
41+
}
42+
.multiSelect {
43+
padding-left: 10px;
44+
border-radius: 4px;
45+
border: 1px solid #ccc;
46+
overflow-y: scroll;
47+
width: 450px;
48+
height: 300px;
3849
}
39-
40-
::-webkit-scrollbar-thumb {
41-
border-radius: 4px;
42-
background-color: rgba(0,0,0,.5);
43-
-webkit-box-shadow: 0 0 1px rgba(255,255,255,.5);
44-
}

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,6 @@ public function __construct(ServiceLocatorInterface $serviceLocator, DeploymentC
5151
public function get()
5252
{
5353
if (null === $this->objectManager) {
54-
// if (!$this->deploymentConfig->isAvailable()) {
55-
// throw new \Magento\Setup\Exception(
56-
// "Can't instantiate object manager due to absence of deployment configuration. "
57-
// . "Please, install the deployment configuration first"
58-
// );
59-
// }
6054
$initParams = $this->serviceLocator->get(InitParamListener::BOOTSTRAP_PARAM);
6155
$factory = Bootstrap::createObjectManagerFactory(BP, $initParams);
6256
$this->objectManager = $factory->create($initParams);

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

Lines changed: 62 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
<h2 class="page-title">{{$state.current.header}}</h2>
2222

23-
<form role="form">
23+
<form name="customizeStore" role="form">
2424

2525
<div class="row form-row">
2626
<div class="col-m-3">
@@ -121,27 +121,74 @@
121121
>
122122
Advanced Modules Configurations
123123
</legend>
124-
125124
<div ng-show="store.advanced.expanded" class="form-group">
126-
<div ng-show="store.errorMessage !== '' && store.errorMessage !== false " class="col-sm-10 error-container">
127-
<input type="checkbox" ng-model="store.force" ng-click="toggleForce()">&nbsp; Skip dependency check for individual modules
128-
</div>
129-
<div ng-show="store.errorMessage !== '' && store.errorMessage !== false " class="col-sm-10 error-container animate-show text-danger glyphicon glyphicon-remove-sign"> An error has occurred. <a href="#" class="text-danger" style="text-decoration: none;" ng-click="expandError()">Click to see detailed error.</a><span class="caret"></span>
130-
</div>
131-
<div ng-show="store.errorMessage !== '' && store.errorFlag === true" class="col-sm-10 error-container animate-show text-danger glyphicon glyphicon-remove-sign" ng-bind-html="store.errorMessage">
125+
<div
126+
class="alert-info"
127+
ng-show="store.errorMessage !== ''&& store.errorMessage !== false"
128+
>
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()"
136+
>
137+
<label class="form-label" for="skipDependency">
138+
Skip dependency check for individual modules
139+
</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...
159+
</p>
132160
</div>
133-
<div class="col-sm-8" ng-show="loading"><p style="color:blue">Validating Constraints for enabling/disabling modules...<img src="pub/images/ajax-loader.gif"/></div>
134161
<div>&nbsp;</div>
135-
<div class="col-sm-10 form-group">
136-
<input type="checkbox"
162+
<div class="form-label">
163+
<input id="selectAll" type="checkbox"
164+
class="form-el-checkbox"
137165
ng-model="store.selectAll"
138-
ng-click="toggleAllModules()">&nbsp;Select All
166+
ng-click="toggleAllModules()">
167+
<label class="form-label" for="selectAll">
168+
Select All
169+
</label>
139170
</div>
140-
<div class="form-group multiSelect">
141-
<label class="col-md-7 uncheckedClass" ng-repeat="module in store.allModules" ng-class="{'disabledClass': (store.disabledModules.indexOf(module) > -1) && (store.selectedModules.indexOf(module) > -1), 'checkedClass': (store.selectedModules.indexOf(module) > -1)}">
142-
<input class="moduleCheckbox" type="checkbox" ng-click="toggleModule(module)" ng-disabled="store.disabledModules.indexOf(module) > -1" ng-checked="store.selectedModules.indexOf(module) > -1" name="{{module}}"> {{module}}<br/>
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>
143189
</label>
144190
</div>
191+
<div>&nbsp;</div>
145192
<div class="form-group">
146193
{{store.selectedModules.length}} out of {{store.allModules.length}} selected.
147194
</div>

0 commit comments

Comments
 (0)