Skip to content

Commit cc9f0a6

Browse files
shiftedrealityshiftedreality
committed
MAGETWO-46317: Support Multiple Updates on the WebSetup
1 parent 4bf92ba commit cc9f0a6

File tree

6 files changed

+17
-17
lines changed

6 files changed

+17
-17
lines changed

‎setup/config/states.extensionManager.config.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
'templateUrl' => "$base/start-updater",
6666
'controller' => 'startUpdaterController',
6767
'title' => "Component \n Install",
68-
'header' => 'Step 3: Component Install',
68+
'header' => 'Step 3: Install',
6969
'nav' => true,
7070
'order' => 6,
7171
'type' => 'install',

‎setup/view/magento/setup/extension-grid.phtml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
</li>
3232
<li class="item col-m-4">
3333
<div class="item-number">{{countOfInstall}}</div>
34-
<div class="item-title">Products<br />Ready to Install</div>
34+
<div class="item-title">Extensions<br />Ready to Install</div>
3535
<div class="item-install">
3636
<button ui-sref="root.install" href="#install-extension-grid"
3737
ng-class="{'disabled' : !enabledInstall, 'goInstall' : enabledInstall}"
@@ -77,8 +77,8 @@
7777
<div class="admin__data-grid-header">
7878
<div class="admin__data-grid-header-row row row-gutter">
7979
<div class="col-xs-3 module-summary">
80-
<span class="module-summary-title">Installed Products</span>
81-
<span class="module-summary-count">{{total}} products</span>
80+
<span class="module-summary-title">Installed Extensions</span>
81+
<span class="module-summary-count">{{total}} extensions</span>
8282
</div>
8383
<div class="col-xs-9 admin__data-grid-pager-wrap"
8484
ng-include="'<?php echo $this->basePath();?>/pub/magento/setup/view/pagination.html'">
@@ -93,7 +93,7 @@
9393
ng-class="{'_ascend' : predicate === 'name' && !reverse,
9494
'_descend' : predicate === 'name' && reverse}"
9595
class="data-grid-th _sortable">
96-
<span>Product Name</span>
96+
<span>Extension Name</span>
9797
</th>
9898
<th ng-click="order('type')"
9999
ng-class="{'_ascend' : predicate === 'type' && !reverse,

‎setup/view/magento/setup/install-extension-grid.phtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<div class="col-xs-3">
2020
<button type="button" class="btn" ng-click="installAll()">Install</button>
2121
<div class="admin__control-support-text">
22-
<span>{{total}}</span> products
22+
<span>{{total}}</span> extensions
2323
</div>
2424
</div>
2525
<div class="col-xs-9 admin__data-grid-pager-wrap"
@@ -65,7 +65,7 @@
6565
</th>
6666
<th ng-click="order('name')" ng-class="{'_ascend' : predicate === 'name'
6767
&& !reverse,'_descend' : predicate === 'name' && reverse}" class="data-grid-th _sortable">
68-
<span>Product Name</span>
68+
<span>Extension Name</span>
6969
</th>
7070
<th ng-click="order('type')" ng-class="{'_ascend' : predicate === 'type' &&
7171
!reverse,'_descend' : predicate === 'type' && reverse}" class="data-grid-th _sortable">

‎setup/view/magento/setup/module-grid.phtml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,10 @@
8282
</div>
8383
<div class="product-modules-block" ng-show="item.requiredBy.length > 0 && showDependencies">
8484
<div class="product-modules-title">
85-
Products currently using module
85+
Packages currently using module
8686
</div>
8787
<div class="product-modules-descriprion">
88-
Product Name
88+
Module Name
8989
</div>
9090
<ul class="product-modules-list">
9191
<li ng-repeat="product in item.requiredBy">
@@ -106,7 +106,7 @@
106106
&nbsp;
107107
</div>
108108
<div class="product-modules-descriprion">
109-
Product Type
109+
Module Type
110110
</div>
111111
<ul class="product-modules-list">
112112
<li ng-repeat="product in item.requiredBy">

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -557,14 +557,14 @@
557557
</header>
558558
<div class="modal-content" data-role="content">
559559
<div class="delete-modal-wrap">
560-
<h3>Remove Product</h3>
560+
<h3>Remove Extension</h3>
561561

562562
<p>Are you sure you want to remove “{{extensionToRemove}}” from
563563
the list?</p>
564564
<p>
565-
Please be aware that removing this product will remove it from the current
566-
update wizard flow. You can update this product at a later time by selecting
567-
the product in the update grid.
565+
Please be aware that removing this extension will remove it from the current
566+
update wizard flow. You can update this extension at a later time by selecting
567+
the extension in the update grid.
568568
</p>
569569
<div class="actions">
570570
<button ng-click="removeExtension(extensionToRemove)" class="btn btn-large btn-prime">
@@ -579,4 +579,4 @@
579579
</div>
580580
</aside>
581581
</div>
582-
</script>
582+
</script>

‎setup/view/magento/setup/update-extension-grid.phtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<div class="col-xs-3">
2020
<button type="button" class="btn" ng-click="updateAll()">Update</button>
2121
<div class="admin__control-support-text">
22-
<span>{{total}}</span> products
22+
<span>{{total}}</span> extensions
2323
</div>
2424
</div>
2525
<div class="col-xs-9 admin__data-grid-pager-wrap"
@@ -66,7 +66,7 @@
6666
</th>
6767
<th ng-click="order('name')" ng-class="{'_ascend' : predicate === 'name'
6868
&& !reverse,'_descend' : predicate === 'name' && reverse}" class="data-grid-th _sortable">
69-
<span>Product Name</span>
69+
<span>Extension Name</span>
7070
</th>
7171
<th ng-click="order('type')" ng-class="{'_ascend' : predicate === 'type' &&
7272
!reverse,'_descend' : predicate === 'type' && reverse}" class="data-grid-th _sortable">

0 commit comments

Comments
 (0)