From 2a703ff52230c4e616b17f312e565ab88468156b Mon Sep 17 00:00:00 2001 From: Sviatoslav Mankivskyi Date: Fri, 9 Jan 2015 17:41:37 +0200 Subject: [PATCH 01/60] MAGETWO-26663: Mass Actions "Select all" on Customers page does not select all customers --- .../Grid/Massaction/AbstractMassaction.php | 4 +- .../Block/Widget/Grid/Massaction/Extended.php | 4 +- .../Widget/Grid/Massaction/ExtendedTest.php | 174 ++++++++++++++++++ .../Block/Widget/Grid/MassactionTest.php | 64 ++++++- 4 files changed, 243 insertions(+), 3 deletions(-) create mode 100644 dev/tests/unit/testsuite/Magento/Backend/Block/Widget/Grid/Massaction/ExtendedTest.php diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Massaction/AbstractMassaction.php b/app/code/Magento/Backend/Block/Widget/Grid/Massaction/AbstractMassaction.php index cb95460a476b3..6ef7d2ccb1209 100644 --- a/app/code/Magento/Backend/Block/Widget/Grid/Massaction/AbstractMassaction.php +++ b/app/code/Magento/Backend/Block/Widget/Grid/Massaction/AbstractMassaction.php @@ -259,7 +259,9 @@ public function getGridIdsJson() return ''; } - $gridIds = $this->getParentBlock()->getCollection()->getAllIds(); + /** @var \Magento\Framework\Data\Collection $allIdsCollection */ + $allIdsCollection = clone $this->getParentBlock()->getCollection(); + $gridIds = $allIdsCollection->clear()->setPageSize(0)->getAllIds(); if (!empty($gridIds)) { return join(",", $gridIds); diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Massaction/Extended.php b/app/code/Magento/Backend/Block/Widget/Grid/Massaction/Extended.php index 4cba44195ff16..ce7d10c5bf1d3 100644 --- a/app/code/Magento/Backend/Block/Widget/Grid/Massaction/Extended.php +++ b/app/code/Magento/Backend/Block/Widget/Grid/Massaction/Extended.php @@ -270,7 +270,9 @@ public function getGridIdsJson() return ''; } - $gridIds = $this->getParentBlock()->getCollection()->getAllIds(); + /** @var \Magento\Framework\Data\Collection $allIdsCollection */ + $allIdsCollection = clone $this->getParentBlock()->getCollection(); + $gridIds = $allIdsCollection->clear()->setPageSize(0)->getAllIds(); if (!empty($gridIds)) { return join(",", $gridIds); diff --git a/dev/tests/unit/testsuite/Magento/Backend/Block/Widget/Grid/Massaction/ExtendedTest.php b/dev/tests/unit/testsuite/Magento/Backend/Block/Widget/Grid/Massaction/ExtendedTest.php new file mode 100644 index 0000000000000..2e989d2e25796 --- /dev/null +++ b/dev/tests/unit/testsuite/Magento/Backend/Block/Widget/Grid/Massaction/ExtendedTest.php @@ -0,0 +1,174 @@ +_gridMock = $this->getMock( + 'Magento\Backend\Block\Widget\Grid', + ['getId', 'getCollection'], + [], + '', + false + ); + $this->_gridMock->expects($this->any())->method('getId')->will($this->returnValue('test_grid')); + + $this->_layoutMock = $this->getMock( + 'Magento\Framework\View\Layout', + ['getParentName', 'getBlock', 'helper'], + [], + '', + false, + false + ); + + $this->_layoutMock->expects( + $this->any() + )->method( + 'getParentName' + )->with( + 'test_grid_massaction' + )->will( + $this->returnValue('test_grid') + ); + $this->_layoutMock->expects( + $this->any() + )->method( + 'getBlock' + )->with( + 'test_grid' + )->will( + $this->returnValue($this->_gridMock) + ); + + $this->_requestMock = $this->getMock('Magento\Framework\App\Request\Http', [], [], '', false); + + $this->_urlModelMock = $this->getMock('Magento\Backend\Model\Url', [], [], '', false); + + $arguments = [ + 'layout' => $this->_layoutMock, + 'request' => $this->_requestMock, + 'urlBuilder' => $this->_urlModelMock, + 'data' => ['massaction_id_field' => 'test_id', 'massaction_id_filter' => 'test_id'], + ]; + + $objectManagerHelper = new \Magento\TestFramework\Helper\ObjectManager($this); + $this->_block = $objectManagerHelper->getObject( + 'Magento\Backend\Block\Widget\Grid\Massaction\Extended', + $arguments + ); + $this->_block->setNameInLayout('test_grid_massaction'); + } + + protected function tearDown() + { + unset($this->_layoutMock); + unset($this->_eventManagerMock); + unset($this->_gridMock); + unset($this->_urlModelMock); + unset($this->_block); + } + + public function testUseSelectAll() + { + $this->_block->setUseSelectAll(false); + $this->assertFalse($this->_block->getUseSelectAll()); + + $this->_block->setUseSelectAll(true); + $this->assertTrue($this->_block->getUseSelectAll()); + } + + public function testGetGridIdsJsonWithoutUseSelectAll() + { + $this->_block->setUseSelectAll(false); + $this->assertEmpty($this->_block->getGridIdsJson()); + } + + /** + * @param array $items + * @param string $result + * + * @dataProvider dataProviderGetGridIdsJsonWithUseSelectAll + */ + public function testGetGridIdsJsonWithUseSelectAll(array $items, $result) + { + $this->_block->setUseSelectAll(true); + + $collectionMock = $this->getMockBuilder('Magento\Framework\Data\Collection') + ->disableOriginalConstructor() + ->getMock(); + + $this->_gridMock->expects($this->once()) + ->method('getCollection') + ->willReturn($collectionMock); + + $collectionMock->expects($this->once()) + ->method('clear') + ->willReturnSelf(); + $collectionMock->expects($this->once()) + ->method('setPageSize') + ->with(0) + ->willReturnSelf(); + $collectionMock->expects($this->once()) + ->method('getAllIds') + ->willReturn($items); + + $this->assertEquals($result, $this->_block->getGridIdsJson()); + } + + public function dataProviderGetGridIdsJsonWithUseSelectAll() + { + return [ + [ + [], + '', + ], + [ + [1], + '1', + ], + [ + [1, 2, 3], + '1,2,3', + ], + ]; + } +} diff --git a/dev/tests/unit/testsuite/Magento/Backend/Block/Widget/Grid/MassactionTest.php b/dev/tests/unit/testsuite/Magento/Backend/Block/Widget/Grid/MassactionTest.php index a2add12d3f5a9..949ceb4da11fd 100644 --- a/dev/tests/unit/testsuite/Magento/Backend/Block/Widget/Grid/MassactionTest.php +++ b/dev/tests/unit/testsuite/Magento/Backend/Block/Widget/Grid/MassactionTest.php @@ -42,7 +42,13 @@ class MassactionTest extends \PHPUnit_Framework_TestCase protected function setUp() { - $this->_gridMock = $this->getMock('Magento\Backend\Block\Widget\Grid', ['getId'], [], '', false); + $this->_gridMock = $this->getMock( + 'Magento\Backend\Block\Widget\Grid', + ['getId', 'getCollection'], + [], + '', + false + ); $this->_gridMock->expects($this->any())->method('getId')->will($this->returnValue('test_grid')); $this->_layoutMock = $this->getMock( @@ -213,4 +219,60 @@ public function testUseSelectAll() $this->_block->setUseSelectAll(true); $this->assertTrue($this->_block->getUseSelectAll()); } + + public function testGetGridIdsJsonWithoutUseSelectAll() + { + $this->_block->setUseSelectAll(false); + $this->assertEmpty($this->_block->getGridIdsJson()); + } + + /** + * @param array $items + * @param string $result + * + * @dataProvider dataProviderGetGridIdsJsonWithUseSelectAll + */ + public function testGetGridIdsJsonWithUseSelectAll(array $items, $result) + { + $this->_block->setUseSelectAll(true); + + $collectionMock = $this->getMockBuilder('Magento\Framework\Data\Collection') + ->disableOriginalConstructor() + ->getMock(); + + $this->_gridMock->expects($this->once()) + ->method('getCollection') + ->willReturn($collectionMock); + + $collectionMock->expects($this->once()) + ->method('clear') + ->willReturnSelf(); + $collectionMock->expects($this->once()) + ->method('setPageSize') + ->with(0) + ->willReturnSelf(); + $collectionMock->expects($this->once()) + ->method('getAllIds') + ->willReturn($items); + + $this->assertEquals($result, $this->_block->getGridIdsJson()); + } + + public function dataProviderGetGridIdsJsonWithUseSelectAll() + { + return [ + [ + [], + '', + ], + [ + [1], + '1', + ], + [ + [1, 2, 3], + '1,2,3', + ], + ]; + } } From 3796714a4e7830c37588a6f109d466b15ac8e38e Mon Sep 17 00:00:00 2001 From: Sviatoslav Mankivskyi Date: Tue, 13 Jan 2015 16:37:11 +0200 Subject: [PATCH 02/60] MAGETWO-26663: Mass Actions "Select all" on Customers page does not select all customers --- .../Backend/Block/Widget/Grid/Massaction/ExtendedTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/tests/unit/testsuite/Magento/Backend/Block/Widget/Grid/Massaction/ExtendedTest.php b/dev/tests/unit/testsuite/Magento/Backend/Block/Widget/Grid/Massaction/ExtendedTest.php index 2e989d2e25796..df534a982b6a8 100644 --- a/dev/tests/unit/testsuite/Magento/Backend/Block/Widget/Grid/Massaction/ExtendedTest.php +++ b/dev/tests/unit/testsuite/Magento/Backend/Block/Widget/Grid/Massaction/ExtendedTest.php @@ -6,7 +6,7 @@ /** * Test class for \Magento\Backend\Block\Widget\Grid\Massaction\Extended */ -namespace Magento\Backend\Block\Widget\Grid; +namespace Magento\Backend\Block\Widget\Grid\Massaction; class ExtendedTest extends \PHPUnit_Framework_TestCase { From c9724c5833fa61f55a2ce8c38fd84ec76a2197bf Mon Sep 17 00:00:00 2001 From: Sviatoslav Mankivskyi Date: Tue, 13 Jan 2015 16:42:17 +0200 Subject: [PATCH 03/60] MAGETWO-26663: Mass Actions "Select all" on Customers page does not select all customers --- .../Backend/Block/Widget/Grid/Massaction/ExtendedTest.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dev/tests/unit/testsuite/Magento/Backend/Block/Widget/Grid/Massaction/ExtendedTest.php b/dev/tests/unit/testsuite/Magento/Backend/Block/Widget/Grid/Massaction/ExtendedTest.php index df534a982b6a8..163699c112f9c 100644 --- a/dev/tests/unit/testsuite/Magento/Backend/Block/Widget/Grid/Massaction/ExtendedTest.php +++ b/dev/tests/unit/testsuite/Magento/Backend/Block/Widget/Grid/Massaction/ExtendedTest.php @@ -1,6 +1,7 @@ Date: Thu, 15 Jan 2015 12:28:52 +0200 Subject: [PATCH 04/60] MAGETWO-32575: [Dev] Frontend page resources sorting --- .../View/Page/Config/RendererTest.php | 140 +++++++++++------- .../Magento/Framework/View/Asset/Source.php | 2 +- .../Framework/View/Page/Config/Renderer.php | 62 +++++--- 3 files changed, 129 insertions(+), 75 deletions(-) diff --git a/dev/tests/unit/testsuite/Magento/Framework/View/Page/Config/RendererTest.php b/dev/tests/unit/testsuite/Magento/Framework/View/Page/Config/RendererTest.php index a2178f02c5d00..6576608ff41c8 100644 --- a/dev/tests/unit/testsuite/Magento/Framework/View/Page/Config/RendererTest.php +++ b/dev/tests/unit/testsuite/Magento/Framework/View/Page/Config/RendererTest.php @@ -66,11 +66,6 @@ class RendererTest extends \PHPUnit_Framework_TestCase */ protected $assetsCollection; - /** - * @var \Magento\Framework\View\Asset\PropertyGroup|\PHPUnit_Framework_MockObject_MockObject - */ - protected $propertyGroupMock; - /** * @var \Magento\Framework\View\Page\Title|\PHPUnit_Framework_MockObject_MockObject */ @@ -115,10 +110,6 @@ protected function setUp() ->disableOriginalConstructor() ->getMock(); - $this->propertyGroupMock = $this->getMockBuilder('Magento\Framework\View\Asset\PropertyGroup') - ->disableOriginalConstructor() - ->getMock(); - $this->assetInterfaceMock = $this->getMockForAbstractClass('Magento\Framework\View\Asset\AssetInterface'); $this->titleMock = $this->getMockBuilder('Magento\Framework\View\Page\Title') @@ -259,30 +250,61 @@ public function testPrepareFaviconDefault() } /** - * @param $contentType - * @param $attributes - * @param $ieCondition + * @param $groupOne + * @param $groupTwo * @param $expectedResult - * @dataProvider dataProviderRenderAsset + * @dataProvider dataProviderRenderAssets */ - public function testRenderAsset($contentType, $attributes, $ieCondition, $expectedResult) + public function testRenderAssets($groupOne, $groupTwo, $expectedResult) { $assetUrl = 'url'; $assetNoRoutUrl = 'no_route_url'; $exception = new \Magento\Framework\Exception('my message'); - $assetMock1 = $this->getMock('Magento\Framework\View\Asset\AssetInterface'); - $assetMock1->expects($this->once()) + $assetMockOne = $this->getMock('Magento\Framework\View\Asset\AssetInterface'); + $assetMockOne->expects($this->exactly(2)) ->method('getUrl') ->willReturn($assetUrl); - $assetMock2 = $this->getMock('Magento\Framework\View\Asset\AssetInterface'); - $assetMock2->expects($this->once()) + $groupAssetsOne = [$assetMockOne, $assetMockOne]; + + $groupMockOne = $this->getMockBuilder('Magento\Framework\View\Asset\PropertyGroup') + ->disableOriginalConstructor() + ->getMock(); + $groupMockOne->expects($this->once()) + ->method('getAll') + ->willReturn($groupAssetsOne); + $groupMockOne->expects($this->any()) + ->method('getProperty') + ->willReturnMap([ + [GroupedCollection::PROPERTY_CAN_MERGE, true], + [GroupedCollection::PROPERTY_CONTENT_TYPE, $groupOne['type']], + ['attributes', $groupOne['attributes']], + ['ie_condition', $groupOne['condition']], + ]); + + $assetMockTwo = $this->getMock('Magento\Framework\View\Asset\AssetInterface'); + $assetMockTwo->expects($this->once()) ->method('getUrl') ->willThrowException($exception); - $groupAssets = [$assetMock1, $assetMock2]; + $groupAssetsTwo = [$assetMockTwo]; + + $groupMockTwo = $this->getMockBuilder('Magento\Framework\View\Asset\PropertyGroup') + ->disableOriginalConstructor() + ->getMock(); + $groupMockTwo->expects($this->once()) + ->method('getAll') + ->willReturn($groupAssetsTwo); + $groupMockTwo->expects($this->any()) + ->method('getProperty') + ->willReturnMap([ + [GroupedCollection::PROPERTY_CAN_MERGE, true], + [GroupedCollection::PROPERTY_CONTENT_TYPE, $groupTwo['type']], + ['attributes', $groupTwo['attributes']], + ['ie_condition', $groupTwo['condition']], + ]); $this->pageConfigMock->expects($this->once()) ->method('getAssetCollection') @@ -290,29 +312,14 @@ public function testRenderAsset($contentType, $attributes, $ieCondition, $expect $this->assetsCollection->expects($this->once()) ->method('getGroups') - ->willReturn([$this->propertyGroupMock]); - - $this->propertyGroupMock->expects($this->once()) - ->method('getAll') - ->willReturn($groupAssets); - $this->propertyGroupMock->expects($this->any()) - ->method('getProperty') - ->willReturnMap([ - [GroupedCollection::PROPERTY_CAN_MERGE, true], - [GroupedCollection::PROPERTY_CONTENT_TYPE, $contentType], - ['attributes', $attributes], - ['ie_condition', $ieCondition], - ]); + ->willReturn([$groupMockOne, $groupMockTwo]); - $this->assetMinifyServiceMock - ->expects($this->once()) + $this->assetMinifyServiceMock->expects($this->exactly(2)) ->method('getAssets') - ->with($groupAssets) - ->willReturn($groupAssets); + ->willReturnArgument(0); - $this->assetMergeServiceMock->expects($this->once()) + $this->assetMergeServiceMock->expects($this->exactly(1)) ->method('getMergedAssets') - ->with($groupAssets, $contentType) ->willReturnArgument(0); $this->loggerMock->expects($this->once()) @@ -330,27 +337,46 @@ public function testRenderAsset($contentType, $attributes, $ieCondition, $expect /** * @return array */ - public function dataProviderRenderAsset() + public function dataProviderRenderAssets() { - $css = '' . "\n" - . '' . "\n"; - - $cssWithAttr = '' . "\n" - . '' . "\n"; - - $js = '' . "\n" - . '' . "\n"; - - $jsWithIfIe = '' . "\n"; - return [ - ['css', '', null, $css], - ['css', 'attr="value"', null, $cssWithAttr], - ['js', ['attr' => 'value'], null, $js], - ['js', ['attr' => 'value'], 'lt IE 7', $jsWithIfIe] + [ + ['type' => 'css', 'attributes' => '', 'condition' => null], + ['type' => 'js', 'attributes' => 'attr="value"', 'condition' => null], + '' . "\n" + . '' . "\n" + . '' . "\n" + ], + [ + ['type' => 'js', 'attributes' => ['attr' => 'value'], 'condition' => 'lt IE 7'], + ['type' => 'css', 'attributes' => 'attr="value"', 'condition' => null], + '' . "\n" + . '' . "\n" + ], + [ + ['type' => 'ico', 'attributes' => 'attr="value"', 'condition' => null], + ['type' => 'css', 'attributes' => '', 'condition' => null], + '' . "\n" + . '' . "\n" + . '' . "\n" + ], + [ + ['type' => 'js', 'attributes' => '', 'condition' => null], + ['type' => 'ico', 'attributes' => ['attr' => 'value'], 'condition' => null], + '' . "\n" + . '' . "\n" + . '' . "\n" + ], + [ + ['type' => 'non', 'attributes' => ['attr' => 'value'], 'condition' => null], + ['type' => 'ico', 'attributes' => '', 'condition' => null], + '' . "\n" + . '' . "\n" + . '' . "\n" + ], ]; } } diff --git a/lib/internal/Magento/Framework/View/Asset/Source.php b/lib/internal/Magento/Framework/View/Asset/Source.php index 1529bdd12e18b..71f2230de0647 100644 --- a/lib/internal/Magento/Framework/View/Asset/Source.php +++ b/lib/internal/Magento/Framework/View/Asset/Source.php @@ -165,7 +165,7 @@ private function preProcess(LocalInterface $asset) */ public function getContentType($path) { - return pathinfo($path, PATHINFO_EXTENSION); + return strtolower(pathinfo($path, PATHINFO_EXTENSION)); } /** diff --git a/lib/internal/Magento/Framework/View/Page/Config/Renderer.php b/lib/internal/Magento/Framework/View/Page/Config/Renderer.php index 0e70549ec8c4c..f13f1549030af 100644 --- a/lib/internal/Magento/Framework/View/Page/Config/Renderer.php +++ b/lib/internal/Magento/Framework/View/Page/Config/Renderer.php @@ -14,6 +14,11 @@ */ class Renderer { + /** + * @var array + */ + protected $assetTypeOrder = ['css', 'ico', 'js']; + /** * @var \Magento\Framework\View\Page\Config */ @@ -207,33 +212,56 @@ public function prepareFavicon() } /** + * Returns rendered HTML for all Assets (CSS before) + * * @return string */ public function renderAssets() { $result = ''; + $groups = $this->pageConfig->getAssetCollection()->getGroups(); /** @var $group \Magento\Framework\View\Asset\PropertyGroup */ - foreach ($this->pageConfig->getAssetCollection()->getGroups() as $group) { - $groupAssets = $this->assetMinifyService->getAssets($group->getAll()); - $groupAssets = $this->processMerge($groupAssets, $group); - - $attributes = $this->getGroupAttributes($group); - $attributes = $this->addDefaultAttributes( - $group->getProperty(GroupedCollection::PROPERTY_CONTENT_TYPE), - $attributes - ); - - $groupTemplate = $this->getAssetTemplate( - $group->getProperty(GroupedCollection::PROPERTY_CONTENT_TYPE), - $attributes - ); - $groupHtml = $this->renderAssetHtml($groupTemplate, $groupAssets); - $groupHtml = $this->processIeCondition($groupHtml, $group); - $result .= $groupHtml; + foreach ($this->assetTypeOrder as $contentType) { + foreach ($groups as $group) { + if ($group->getProperty(GroupedCollection::PROPERTY_CONTENT_TYPE) == $contentType) { + $result .= $this->renderAssetGroup($group); + } + } + } + foreach ($groups as $group) { + if (!in_array($group->getProperty(GroupedCollection::PROPERTY_CONTENT_TYPE), $this->assetTypeOrder)) { + $result .= $this->renderAssetGroup($group); + } } return $result; } + /** + * Returns rendered HTML for an Asset Group + * + * @param \Magento\Framework\View\Asset\PropertyGroup $group + * @return string + */ + protected function renderAssetGroup(\Magento\Framework\View\Asset\PropertyGroup $group) + { + $groupAssets = $this->assetMinifyService->getAssets($group->getAll()); + $groupAssets = $this->processMerge($groupAssets, $group); + + $attributes = $this->getGroupAttributes($group); + $attributes = $this->addDefaultAttributes( + $group->getProperty(GroupedCollection::PROPERTY_CONTENT_TYPE), + $attributes + ); + + $groupTemplate = $this->getAssetTemplate( + $group->getProperty(GroupedCollection::PROPERTY_CONTENT_TYPE), + $attributes + ); + $groupHtml = $this->renderAssetHtml($groupTemplate, $groupAssets); + $groupHtml = $this->processIeCondition($groupHtml, $group); + return $groupHtml; + } + /** * @param array $groupAssets * @param \Magento\Framework\View\Asset\PropertyGroup $group From 41e7ab825ba9cbaeeccb3843dd0c29ccf88562d6 Mon Sep 17 00:00:00 2001 From: Sviatoslav Mankivskyi Date: Thu, 15 Jan 2015 13:44:40 +0200 Subject: [PATCH 05/60] MAGETWO-32575: [Dev] Frontend page resources sorting --- .../Framework/View/Page/Config/Renderer.php | 20 +++++++------------ 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/lib/internal/Magento/Framework/View/Page/Config/Renderer.php b/lib/internal/Magento/Framework/View/Page/Config/Renderer.php index f13f1549030af..ca4044678538f 100644 --- a/lib/internal/Magento/Framework/View/Page/Config/Renderer.php +++ b/lib/internal/Magento/Framework/View/Page/Config/Renderer.php @@ -218,22 +218,16 @@ public function prepareFavicon() */ public function renderAssets() { - $result = ''; - $groups = $this->pageConfig->getAssetCollection()->getGroups(); + $resultGroups = array_fill_keys($this->assetTypeOrder, ''); /** @var $group \Magento\Framework\View\Asset\PropertyGroup */ - foreach ($this->assetTypeOrder as $contentType) { - foreach ($groups as $group) { - if ($group->getProperty(GroupedCollection::PROPERTY_CONTENT_TYPE) == $contentType) { - $result .= $this->renderAssetGroup($group); - } + foreach ($this->pageConfig->getAssetCollection()->getGroups() as $group) { + $type = $group->getProperty(GroupedCollection::PROPERTY_CONTENT_TYPE); + if (!isset($resultGroups[$type])) { + $resultGroups[$type] = ''; } + $resultGroups[$type] .= $this->renderAssetGroup($group); } - foreach ($groups as $group) { - if (!in_array($group->getProperty(GroupedCollection::PROPERTY_CONTENT_TYPE), $this->assetTypeOrder)) { - $result .= $this->renderAssetGroup($group); - } - } - return $result; + return implode('', $resultGroups); } /** From 687d92a940c261f435dbe6c7caabc05612aa1c24 Mon Sep 17 00:00:00 2001 From: Maxim Medinskiy Date: Wed, 14 Jan 2015 18:48:41 +0200 Subject: [PATCH 06/60] MAGETWO-32583: [Dev] Magic __call method usages in template engine Conflicts: app/code/Magento/Checkout/view/frontend/templates/total/nominal.phtml --- .../templates/notification/window.phtml | 10 +- .../adminhtml/templates/system/messages.phtml | 14 +- .../templates/system/messages/popup.phtml | 8 +- .../adminhtml/templates/toolbar_entry.phtml | 34 ++-- .../templates/admin/access_denied.phtml | 2 +- .../adminhtml/templates/admin/formkey.phtml | 2 +- .../adminhtml/templates/admin/login.phtml | 10 +- .../templates/admin/login_buttons.phtml | 2 +- .../templates/admin/overlay_popup.phtml | 20 +-- .../view/adminhtml/templates/admin/page.phtml | 40 ++--- .../adminhtml/templates/dashboard/graph.phtml | 10 +- .../templates/dashboard/graph/disabled.phtml | 2 +- .../adminhtml/templates/dashboard/grid.phtml | 52 +++--- .../adminhtml/templates/dashboard/index.phtml | 26 +-- .../templates/dashboard/salebar.phtml | 4 +- .../templates/dashboard/searches.phtml | 4 +- .../templates/dashboard/store/switcher.phtml | 16 +- .../templates/dashboard/totalbar.phtml | 4 +- .../adminhtml/templates/media/uploader.phtml | 18 +- .../view/adminhtml/templates/menu.phtml | 2 +- .../adminhtml/templates/page/footer.phtml | 4 +- .../adminhtml/templates/page/header.phtml | 22 +-- .../templates/page/js/calendar.phtml | 6 +- .../templates/page/js/components.phtml | 4 +- .../templates/page/js/head_scripts.phtml | 2 +- .../templates/page/js/require_js.phtml | 10 +- .../templates/page/js/translate.phtml | 2 +- .../adminhtml/templates/page/locale.phtml | 4 +- .../adminhtml/templates/page/notices.phtml | 4 +- .../page/system/config/robots/reset.phtml | 6 +- .../adminhtml/templates/pageactions.phtml | 6 +- .../adminhtml/templates/store/switcher.phtml | 88 +++++----- .../switcher/form/renderer/fieldset.phtml | 6 +- .../form/renderer/fieldset/element.phtml | 8 +- .../templates/system/autocomplete.phtml | 4 +- .../templates/system/cache/additional.phtml | 6 +- .../templates/system/cache/edit.phtml | 10 +- .../templates/system/config/edit.phtml | 6 +- .../system/config/form/field/array.phtml | 26 +-- .../templates/system/config/js.phtml | 2 +- .../templates/system/config/switcher.phtml | 16 +- .../system/storage/media/synchronize.phtml | 12 +- .../templates/system/config/tabs.phtml | 14 +- .../templates/system/design/edit.phtml | 4 +- .../templates/system/design/index.phtml | 2 +- .../adminhtml/templates/system/search.phtml | 4 +- .../templates/widget/accordion.phtml | 8 +- .../templates/widget/breadcrumbs.phtml | 6 +- .../adminhtml/templates/widget/button.phtml | 10 +- .../templates/widget/button/split.phtml | 28 ++-- .../adminhtml/templates/widget/form.phtml | 6 +- .../templates/widget/form/container.phtml | 18 +- .../templates/widget/form/element.phtml | 4 +- .../widget/form/element/gallery.phtml | 30 ++-- .../widget/form/renderer/element.phtml | 2 +- .../widget/form/renderer/fieldset.phtml | 6 +- .../form/renderer/fieldset/element.phtml | 6 +- .../adminhtml/templates/widget/grid.phtml | 118 ++++++------- .../templates/widget/grid/column_set.phtml | 78 ++++----- .../templates/widget/grid/container.phtml | 6 +- .../widget/grid/container/empty.phtml | 2 +- .../templates/widget/grid/export.phtml | 8 +- .../templates/widget/grid/extended.phtml | 156 +++++++++--------- .../templates/widget/grid/massaction.phtml | 44 ++--- .../widget/grid/massaction_extended.phtml | 42 ++--- .../templates/widget/grid/serializer.phtml | 12 +- .../adminhtml/templates/widget/tabs.phtml | 36 ++-- .../templates/widget/tabshoriz.phtml | 26 +-- .../templates/widget/view/container.phtml | 4 +- .../adminhtml/templates/backup/dialogs.phtml | 8 +- .../adminhtml/templates/backup/list.phtml | 6 +- .../composite/fieldset/options/bundle.phtml | 10 +- .../fieldset/options/type/checkbox.phtml | 18 +- .../fieldset/options/type/multi.phtml | 12 +- .../fieldset/options/type/radio.phtml | 22 +-- .../fieldset/options/type/select.phtml | 20 +-- .../templates/product/edit/bundle.phtml | 16 +- .../product/edit/bundle/option.phtml | 58 +++---- .../product/edit/bundle/option/search.phtml | 4 +- .../edit/bundle/option/selection.phtml | 56 +++---- .../creditmemo/create/items/renderer.phtml | 62 +++---- .../creditmemo/view/items/renderer.phtml | 48 +++--- .../sales/invoice/create/items/renderer.phtml | 56 +++---- .../sales/invoice/view/items/renderer.phtml | 48 +++--- .../sales/order/view/items/renderer.phtml | 62 +++---- .../shipment/create/items/renderer.phtml | 30 ++-- .../sales/shipment/view/items/renderer.phtml | 26 +-- .../templates/product/price/final_price.phtml | 46 +++--- .../product/price/selection/amount.phtml | 4 +- .../templates/product/price/tier_prices.phtml | 6 +- .../catalog/product/view/customize.phtml | 4 +- .../catalog/product/view/summary.phtml | 12 +- .../catalog/product/view/type/bundle.phtml | 8 +- .../view/type/bundle/option/checkbox.phtml | 14 +- .../view/type/bundle/option/multi.phtml | 14 +- .../view/type/bundle/option/radio.phtml | 16 +- .../view/type/bundle/option/select.phtml | 16 +- .../product/view/type/bundle/options.phtml | 12 +- .../order/items/creditmemo/default.phtml | 30 ++-- .../email/order/items/invoice/default.phtml | 30 ++-- .../email/order/items/order/default.phtml | 30 ++-- .../email/order/items/shipment/default.phtml | 22 +-- .../frontend/templates/js/components.phtml | 2 +- .../order/creditmemo/items/renderer.phtml | 64 +++---- .../sales/order/invoice/items/renderer.phtml | 52 +++--- .../sales/order/items/renderer.phtml | 58 +++---- .../sales/order/shipment/items/renderer.phtml | 36 ++-- .../view/adminhtml/templates/default.phtml | 12 +- .../view/frontend/templates/default.phtml | 22 +-- .../frontend/templates/js/components.phtml | 2 +- .../catalog/category/checkboxes/tree.phtml | 24 +-- .../templates/catalog/category/edit.phtml | 2 +- .../catalog/category/edit/form.phtml | 40 ++--- .../templates/catalog/category/tree.phtml | 52 +++--- .../catalog/category/widget/tree.phtml | 34 ++-- .../form/renderer/fieldset/element.phtml | 22 +-- .../adminhtml/templates/catalog/product.phtml | 2 +- .../catalog/product/attribute/form.phtml | 18 +- .../catalog/product/attribute/labels.phtml | 10 +- .../catalog/product/attribute/options.phtml | 24 +-- .../catalog/product/attribute/set/main.phtml | 28 ++-- .../product/attribute/set/toolbar/add.phtml | 4 +- .../product/attribute/set/toolbar/main.phtml | 2 +- .../catalog/product/composite/configure.phtml | 2 +- .../product/composite/fieldset/options.phtml | 10 +- .../fieldset/options/type/date.phtml | 18 +- .../fieldset/options/type/default.phtml | 6 +- .../fieldset/options/type/file.phtml | 12 +- .../fieldset/options/type/select.phtml | 8 +- .../fieldset/options/type/text.phtml | 12 +- .../product/composite/fieldset/qty.phtml | 6 +- .../templates/catalog/product/edit.phtml | 40 ++--- .../product/edit/action/attribute.phtml | 6 +- .../product/edit/action/inventory.phtml | 62 +++---- .../product/edit/action/websites.phtml | 28 ++-- .../catalog/product/edit/attribute_set.phtml | 4 +- .../product/edit/category/new/form.phtml | 8 +- .../catalog/product/edit/options.phtml | 8 +- .../catalog/product/edit/options/option.phtml | 52 +++--- .../product/edit/options/type/date.phtml | 10 +- .../product/edit/options/type/file.phtml | 10 +- .../product/edit/options/type/select.phtml | 14 +- .../product/edit/options/type/text.phtml | 10 +- .../catalog/product/edit/price/group.phtml | 40 ++--- .../catalog/product/edit/price/tier.phtml | 46 +++--- .../catalog/product/edit/serializer.phtml | 4 +- .../catalog/product/edit/websites.phtml | 22 +-- .../catalog/product/helper/gallery.phtml | 44 ++--- .../templates/catalog/product/js.phtml | 8 +- .../templates/catalog/product/tab/alert.phtml | 4 +- .../catalog/product/tab/inventory.phtml | 134 +++++++-------- .../product/widget/chooser/container.phtml | 4 +- .../templates/catalog/wysiwyg/js.phtml | 2 +- .../product/edit/attribute/search.phtml | 14 +- .../templates/product/edit/tabs.phtml | 50 +++--- .../product/grid/massaction_extended.phtml | 42 ++--- .../adminhtml/templates/rss/grid/link.phtml | 6 +- .../product/price/amount/default.phtml | 32 ++-- .../product/price/amount/option.phtml | 4 +- .../product/price/configured_price.phtml | 14 +- .../templates/product/price/default.phtml | 10 +- .../templates/product/price/final_price.phtml | 36 ++-- .../templates/product/price/tier_prices.phtml | 26 +-- .../frontend/templates/category/cms.phtml | 6 +- .../templates/category/description.phtml | 6 +- .../frontend/templates/category/image.phtml | 6 +- .../templates/category/products.phtml | 6 +- .../frontend/templates/category/rss.phtml | 4 +- .../frontend/templates/category/view.phtml | 20 +-- .../category/widget/link/link_block.phtml | 2 +- .../category/widget/link/link_inline.phtml | 2 +- .../frontend/templates/js/components.phtml | 2 +- .../frontend/templates/navigation/left.phtml | 8 +- .../templates/product/compare/link.phtml | 2 +- .../templates/product/compare/list.phtml | 40 ++--- .../templates/product/compare/sidebar.phtml | 4 +- .../frontend/templates/product/gallery.phtml | 18 +- .../frontend/templates/product/image.phtml | 12 +- .../product/image_with_borders.phtml | 12 +- .../frontend/templates/product/list.phtml | 30 ++-- .../templates/product/list/items.phtml | 80 ++++----- .../templates/product/list/toolbar.phtml | 20 +-- .../product/list/toolbar/amount.phtml | 16 +- .../product/list/toolbar/limiter.phtml | 6 +- .../product/list/toolbar/sorter.phtml | 10 +- .../product/list/toolbar/viewmode.phtml | 10 +- .../frontend/templates/product/listing.phtml | 24 +-- .../templates/product/view/additional.phtml | 2 +- .../templates/product/view/addto.phtml | 6 +- .../templates/product/view/addtocart.phtml | 10 +- .../templates/product/view/attribute.phtml | 14 +- .../templates/product/view/attributes.phtml | 10 +- .../templates/product/view/base-image.phtml | 36 ++-- .../templates/product/view/description.phtml | 4 +- .../templates/product/view/details.phtml | 6 +- .../templates/product/view/form.phtml | 24 +-- .../templates/product/view/mailto.phtml | 4 +- .../product/view/opengraph/currency.phtml | 4 +- .../product/view/opengraph/general.phtml | 14 +- .../templates/product/view/options.phtml | 8 +- .../product/view/options/type/date.phtml | 10 +- .../product/view/options/type/default.phtml | 4 +- .../product/view/options/type/file.phtml | 8 +- .../product/view/options/type/select.phtml | 8 +- .../product/view/options/type/text.phtml | 10 +- .../product/view/options/wrapper.phtml | 4 +- .../product/view/options/wrapper/bottom.phtml | 2 +- .../templates/product/view/price_clone.phtml | 6 +- .../templates/product/view/review.phtml | 4 +- .../templates/product/view/type/default.phtml | 6 +- .../product/widget/link/link_block.phtml | 2 +- .../product/widget/link/link_inline.phtml | 2 +- .../widget/new/column/new_default_list.phtml | 18 +- .../widget/new/column/new_images_list.phtml | 10 +- .../widget/new/column/new_names_list.phtml | 8 +- .../product/widget/new/content/new_grid.phtml | 30 ++-- .../product/widget/new/content/new_list.phtml | 34 ++-- .../frontend/templates/qtyincrements.phtml | 6 +- .../templates/stockqty/composite.phtml | 22 +-- .../frontend/templates/stockqty/default.phtml | 8 +- .../adminhtml/templates/promo/fieldset.phtml | 6 +- .../view/adminhtml/templates/promo/form.phtml | 6 +- .../frontend/templates/advanced/form.phtml | 44 ++--- .../frontend/templates/advanced/result.phtml | 20 +-- .../view/frontend/templates/result.phtml | 14 +- .../templates/product/widget/conditions.phtml | 8 +- .../product/widget/content/grid.phtml | 32 ++-- .../templates/authentication/complete.phtml | 4 +- .../templates/authentication/start.phtml | 8 +- .../templates/order/create/abstract.phtml | 6 +- .../adminhtml/templates/validation/form.phtml | 4 +- .../frontend/templates/authentication.phtml | 4 +- .../templates/authentication/complete.phtml | 4 +- .../templates/authentication/start.phtml | 8 +- .../view/frontend/templates/logo.phtml | 6 +- .../view/frontend/templates/button.phtml | 8 +- .../view/frontend/templates/cart.phtml | 8 +- .../templates/cart/additional/info.phtml | 8 +- .../view/frontend/templates/cart/coupon.phtml | 8 +- .../view/frontend/templates/cart/form.phtml | 18 +- .../cart/item/configure/updatecart.phtml | 10 +- .../templates/cart/item/default.phtml | 46 +++--- .../templates/cart/item/price/sidebar.phtml | 4 +- .../frontend/templates/cart/methods.phtml | 8 +- .../frontend/templates/cart/minicart.phtml | 38 ++--- .../templates/cart/minicart/totals.phtml | 4 +- .../frontend/templates/cart/noItems.phtml | 8 +- .../frontend/templates/cart/shipping.phtml | 42 ++--- .../templates/cart/sidebar/default.phtml | 30 ++-- .../frontend/templates/cart/subtotal.phtml | 4 +- .../view/frontend/templates/cart/totals.phtml | 6 +- .../frontend/templates/item/price/row.phtml | 6 +- .../frontend/templates/item/price/unit.phtml | 6 +- .../frontend/templates/js/components.phtml | 2 +- .../view/frontend/templates/onepage.phtml | 8 +- .../frontend/templates/onepage/billing.phtml | 76 ++++----- .../frontend/templates/onepage/failure.phtml | 6 +- .../frontend/templates/onepage/link.phtml | 8 +- .../frontend/templates/onepage/login.phtml | 34 ++-- .../frontend/templates/onepage/payment.phtml | 6 +- .../templates/onepage/payment/methods.phtml | 14 +- .../frontend/templates/onepage/progress.phtml | 32 ++-- .../frontend/templates/onepage/review.phtml | 2 +- .../templates/onepage/review/info.phtml | 18 +- .../templates/onepage/review/item.phtml | 36 ++-- .../review/item/price/row_excl_tax.phtml | 4 +- .../review/item/price/row_incl_tax.phtml | 4 +- .../review/item/price/unit_excl_tax.phtml | 4 +- .../review/item/price/unit_incl_tax.phtml | 4 +- .../templates/onepage/review/totals.phtml | 12 +- .../frontend/templates/onepage/shipping.phtml | 40 ++--- .../templates/onepage/shipping_method.phtml | 2 +- .../onepage/shipping_method/additional.phtml | 4 +- .../onepage/shipping_method/available.phtml | 16 +- .../frontend/templates/shipping/price.phtml | 4 +- .../view/frontend/templates/success.phtml | 14 +- .../frontend/templates/total/default.phtml | 16 +- .../view/frontend/templates/agreements.phtml | 12 +- .../templates/multishipping_agreements.phtml | 12 +- .../adminhtml/templates/browser/content.phtml | 12 +- .../templates/browser/content/files.phtml | 22 +-- .../templates/browser/content/uploader.phtml | 20 +-- .../adminhtml/templates/browser/tree.phtml | 4 +- .../page/edit/form/renderer/content.phtml | 2 +- .../templates/widget/link/link_block.phtml | 4 +- .../templates/widget/link/link_inline.phtml | 4 +- .../widget/static_block/default.phtml | 2 +- .../product/attribute/new/created.phtml | 6 +- .../catalog/product/attribute/set/js.phtml | 6 +- .../composite/fieldset/configurable.phtml | 8 +- .../edit/super/attribute-js-template.phtml | 12 +- .../edit/super/attribute-template.phtml | 32 ++-- .../catalog/product/edit/super/config.phtml | 24 +-- .../product/edit/super/generator.phtml | 12 +- .../catalog/product/edit/super/matrix.phtml | 58 +++---- .../form.phtml | 6 +- .../affected-attribute-set-selector/js.phtml | 12 +- .../configurable/attribute-selector/js.phtml | 4 +- .../frontend/templates/js/components.phtml | 2 +- .../view/type/options/configurable.phtml | 10 +- .../view/frontend/templates/form.phtml | 8 +- .../view/frontend/templates/messages.phtml | 2 +- .../frontend/templates/require_cookie.phtml | 4 +- .../view/frontend/templates/template.phtml | 4 +- .../Core/view/frontend/templates/text.phtml | 8 +- .../view/adminhtml/templates/grid.phtml | 16 +- .../system/currency/rate/matrix.phtml | 16 +- .../system/currency/rate/services.phtml | 4 +- .../templates/system/currency/rates.phtml | 16 +- .../tab/account/form/renderer/group.phtml | 10 +- .../tab/account/form/renderer/sendemail.phtml | 20 +-- .../create/address/form/renderer/vat.phtml | 4 +- .../templates/system/config/validatevat.phtml | 10 +- .../adminhtml/templates/tab/addresses.phtml | 44 ++--- .../view/adminhtml/templates/tab/cart.phtml | 32 ++-- .../adminhtml/templates/tab/newsletter.phtml | 4 +- .../view/adminhtml/templates/tab/view.phtml | 4 +- .../templates/tab/view/personal_info.phtml | 16 +- .../adminhtml/templates/tab/view/sales.phtml | 18 +- .../frontend/templates/account/customer.phtml | 8 +- .../templates/account/dashboard/address.phtml | 12 +- .../templates/account/dashboard/info.phtml | 18 +- .../account/link/authorization.phtml | 10 +- .../templates/account/link/back.phtml | 2 +- .../templates/account/navigation.phtml | 6 +- .../frontend/templates/address/book.phtml | 26 +-- .../frontend/templates/address/edit.phtml | 48 +++--- .../templates/form/confirmation.phtml | 4 +- .../view/frontend/templates/form/edit.phtml | 28 ++-- .../templates/form/forgotpassword.phtml | 10 +- .../view/frontend/templates/form/login.phtml | 14 +- .../frontend/templates/form/newsletter.phtml | 14 +- .../frontend/templates/form/register.phtml | 66 ++++---- .../form/resetforgottenpassword.phtml | 4 +- .../frontend/templates/js/components.phtml | 2 +- .../view/frontend/templates/logout.phtml | 2 +- .../view/frontend/templates/newcustomer.phtml | 6 +- .../view/frontend/templates/widget/dob.phtml | 18 +- .../frontend/templates/widget/gender.phtml | 10 +- .../view/frontend/templates/widget/name.phtml | 128 +++++++------- .../frontend/templates/widget/taxvat.phtml | 6 +- .../view/adminhtml/templates/editor.phtml | 4 +- .../templates/editor/container.phtml | 10 +- .../form/renderer/background-uploader.phtml | 8 +- .../form/renderer/checkbox-utility.phtml | 6 +- .../editor/form/renderer/color-picker.phtml | 6 +- .../editor/form/renderer/composite.phtml | 12 +- .../form/renderer/composite/children.phtml | 4 +- .../form/renderer/composite/wrapper.phtml | 6 +- .../editor/form/renderer/element/input.phtml | 6 +- .../form/renderer/element/wrapper.phtml | 6 +- .../templates/editor/form/renderer/font.phtml | 6 +- .../editor/form/renderer/logo-uploader.phtml | 14 +- .../editor/form/renderer/simple.phtml | 12 +- .../editor/form/renderer/template.phtml | 6 +- .../adminhtml/templates/editor/toolbar.phtml | 4 +- .../templates/editor/toolbar/buttons.phtml | 10 +- .../editor/toolbar/buttons/edit.phtml | 10 +- .../adminhtml/templates/editor/tools.phtml | 8 +- .../templates/editor/tools/block.phtml | 2 +- .../templates/editor/tools/code/css.phtml | 4 +- .../templates/editor/tools/code/custom.phtml | 26 +-- .../editor/tools/code/image-sizing.phtml | 6 +- .../templates/editor/tools/code/js.phtml | 16 +- .../editor/tools/files/content.phtml | 10 +- .../editor/tools/files/content/files.phtml | 16 +- .../editor/tools/files/content/uploader.phtml | 20 +-- .../templates/editor/tools/files/js.phtml | 4 +- .../templates/editor/tools/files/tree.phtml | 6 +- .../editor/tools/quick-styles/form.phtml | 4 +- .../templates/editor/tools/settings.phtml | 2 +- .../templates/editor/tools/tabs.phtml | 10 +- .../templates/editor/tools/tabs/body.phtml | 6 +- .../templates/editor/tools/tabs/handle.phtml | 6 +- .../editor/tools/tabs/super-handle.phtml | 8 +- .../adminhtml/templates/theme/available.phtml | 10 +- .../adminhtml/templates/theme/button.phtml | 10 +- .../templates/theme/customized.phtml | 20 +-- .../templates/theme/list/available.phtml | 8 +- .../templates/theme/list/available_ajax.phtml | 6 +- .../templates/theme/list/customized.phtml | 8 +- .../theme/selector/first_entrance.phtml | 6 +- .../selector/my_customizations_tab.phtml | 6 +- .../templates/theme/selector/storeview.phtml | 6 +- .../templates/theme/selector/theme_edit.phtml | 2 +- .../frontend/templates/translate_inline.phtml | 40 ++--- .../adminhtml/templates/unitofmeasure.phtml | 16 +- .../view/frontend/templates/currency.phtml | 14 +- .../frontend/templates/currency/switch.phtml | 2 +- .../composite/fieldset/downloadable.phtml | 24 +-- .../templates/product/edit/downloadable.phtml | 10 +- .../product/edit/downloadable/links.phtml | 48 +++--- .../product/edit/downloadable/samples.phtml | 22 +-- .../column/downloadable/creditmemo/name.phtml | 20 +-- .../column/downloadable/invoice/name.phtml | 20 +-- .../items/column/downloadable/name.phtml | 20 +-- .../templates/catalog/product/links.phtml | 24 +-- .../templates/catalog/product/samples.phtml | 12 +- .../templates/catalog/product/type.phtml | 6 +- .../checkout/cart/item/default.phtml | 50 +++--- .../frontend/templates/checkout/links.phtml | 6 +- .../frontend/templates/checkout/success.phtml | 4 +- .../templates/customer/products/list.phtml | 28 ++-- .../order/items/creditmemo/downloadable.phtml | 24 +-- .../order/items/invoice/downloadable.phtml | 26 +-- .../order/items/order/downloadable.phtml | 32 ++-- .../frontend/templates/js/components.phtml | 2 +- .../items/renderer/downloadable.phtml | 50 +++--- .../invoice/items/renderer/downloadable.phtml | 46 +++--- .../order/items/renderer/downloadable.phtml | 58 +++---- .../adminhtml/templates/template/edit.phtml | 34 ++-- .../adminhtml/templates/template/list.phtml | 4 +- .../templates/template/preview.phtml | 2 +- .../adminhtml/templates/giftoptionsform.phtml | 2 +- .../view/adminhtml/templates/popup.phtml | 4 +- .../sales/order/create/giftoptions.phtml | 4 +- .../templates/sales/order/create/items.phtml | 10 +- .../sales/order/view/giftoptions.phtml | 4 +- .../templates/sales/order/view/items.phtml | 18 +- .../view/frontend/templates/inline.phtml | 132 +++++++-------- .../view/frontend/templates/code.phtml | 18 +- .../view/frontend/templates/ga.phtml | 8 +- .../view/adminhtml/templates/captcha.phtml | 4 +- .../view/adminhtml/templates/items.phtml | 12 +- .../view/adminhtml/templates/types/edit.phtml | 4 +- .../templates/types/edit/attributes.phtml | 22 +-- .../templates/types/edit/select.phtml | 4 +- .../product/composite/fieldset/grouped.phtml | 24 +-- .../templates/product/grouped/container.phtml | 14 +- .../templates/product/grouped/grouped.phtml | 10 +- .../templates/product/grouped/list.phtml | 6 +- .../templates/product/price/final_price.phtml | 6 +- .../templates/product/view/type/default.phtml | 8 +- .../templates/product/view/type/grouped.phtml | 30 ++-- .../view/adminhtml/templates/busy.phtml | 2 +- .../templates/export/form/after.phtml | 4 +- .../templates/export/form/before.phtml | 2 +- .../templates/import/form/before.phtml | 6 +- .../templates/import/frame/result.phtml | 2 +- .../integration/activate/permissions.phtml | 4 +- .../integration/popup_container.phtml | 12 +- .../integration/tokens_exchange.phtml | 2 +- .../frontend/templates/layer/filter.phtml | 4 +- .../view/frontend/templates/layer/state.phtml | 12 +- .../view/frontend/templates/layer/view.phtml | 16 +- .../adminhtml/templates/customer/status.phtml | 10 +- .../Log/view/adminhtml/templates/online.phtml | 2 +- .../base/templates/product/price/msrp.phtml | 28 ++-- .../Msrp/view/frontend/templates/popup.phtml | 10 +- .../render/item/price_msrp_item.phtml | 12 +- .../render/item/price_msrp_rss.phtml | 6 +- .../templates/checkout/address/select.phtml | 18 +- .../templates/checkout/addresses.phtml | 24 +-- .../frontend/templates/checkout/billing.phtml | 26 +-- .../templates/checkout/billing/items.phtml | 10 +- .../templates/checkout/item/default.phtml | 14 +- .../frontend/templates/checkout/link.phtml | 2 +- .../templates/checkout/overview.phtml | 58 +++---- .../templates/checkout/overview/item.phtml | 30 ++-- .../templates/checkout/shipping.phtml | 42 ++--- .../frontend/templates/checkout/state.phtml | 2 +- .../frontend/templates/checkout/success.phtml | 8 +- .../frontend/templates/js/components.phtml | 2 +- .../multishipping/item/default.phtml | 14 +- .../templates/preview/iframeswitcher.phtml | 6 +- .../adminhtml/templates/preview/store.phtml | 8 +- .../adminhtml/templates/problem/list.phtml | 8 +- .../view/adminhtml/templates/queue/edit.phtml | 28 ++-- .../view/adminhtml/templates/queue/list.phtml | 2 +- .../adminhtml/templates/queue/preview.phtml | 2 +- .../adminhtml/templates/subscriber/list.phtml | 6 +- .../adminhtml/templates/template/edit.phtml | 20 +-- .../adminhtml/templates/template/list.phtml | 2 +- .../templates/template/preview.phtml | 2 +- .../frontend/templates/js/components.phtml | 2 +- .../view/frontend/templates/subscribe.phtml | 2 +- .../templates/form/banktransfer.phtml | 6 +- .../templates/form/cashondelivery.phtml | 10 +- .../adminhtml/templates/form/checkmo.phtml | 10 +- .../templates/form/purchaseorder.phtml | 4 +- .../adminhtml/templates/info/checkmo.phtml | 10 +- .../templates/info/pdf/checkmo.phtml | 12 +- .../templates/info/pdf/purchaseorder.phtml | 2 +- .../templates/info/purchaseorder.phtml | 4 +- .../templates/form/banktransfer.phtml | 4 +- .../templates/form/cashondelivery.phtml | 6 +- .../frontend/templates/form/checkmo.phtml | 12 +- .../templates/form/purchaseorder.phtml | 4 +- .../frontend/templates/info/checkmo.phtml | 12 +- .../templates/info/purchaseorder.phtml | 4 +- .../templates/page_cache_validation.phtml | 2 +- .../view/frontend/templates/javascript.phtml | 4 +- .../frontend/templates/js/components.phtml | 2 +- .../view/adminhtml/templates/form/cc.phtml | 30 ++-- .../adminhtml/templates/info/default.phtml | 10 +- .../templates/info/instructions.phtml | 6 +- .../templates/info/pdf/default.phtml | 8 +- .../templates/info/substitution.phtml | 2 +- .../view/frontend/templates/form/cc.phtml | 30 ++-- .../frontend/templates/info/default.phtml | 12 +- .../templates/info/instructions.phtml | 6 +- .../view/frontend/templates/remember_me.phtml | 6 +- .../view/frontend/templates/email/price.phtml | 18 +- .../view/frontend/templates/email/stock.phtml | 18 +- .../frontend/templates/product/view.phtml | 10 +- .../view/adminhtml/templates/grid.phtml | 80 ++++----- .../templates/report/grid/container.phtml | 6 +- .../templates/report/refresh/statistics.phtml | 4 +- .../adminhtml/templates/report/wishlist.phtml | 14 +- .../adminhtml/templates/store/switcher.phtml | 18 +- .../templates/store/switcher/enhanced.phtml | 20 +-- .../frontend/templates/js/components.phtml | 2 +- .../templates/product/widget/viewed.phtml | 8 +- .../product/widget/viewed/item.phtml | 28 ++-- .../column/compared_default_list.phtml | 16 +- .../column/compared_images_list.phtml | 8 +- .../compared/column/compared_names_list.phtml | 4 +- .../compared/content/compared_grid.phtml | 28 ++-- .../compared/content/compared_list.phtml | 32 ++-- .../viewed/column/viewed_default_list.phtml | 20 +-- .../viewed/column/viewed_images_list.phtml | 12 +- .../viewed/column/viewed_names_list.phtml | 6 +- .../widget/viewed/content/viewed_grid.phtml | 30 ++-- .../widget/viewed/content/viewed_list.phtml | 34 ++-- .../Review/view/adminhtml/templates/add.phtml | 8 +- .../adminhtml/templates/rating/detailed.phtml | 10 +- .../adminhtml/templates/rating/form.phtml | 2 +- .../templates/rating/stars/detailed.phtml | 6 +- .../templates/rating/stars/summary.phtml | 4 +- .../adminhtml/templates/rss/grid/link.phtml | 6 +- .../frontend/templates/customer/list.phtml | 24 +-- .../frontend/templates/customer/recent.phtml | 10 +- .../frontend/templates/customer/view.phtml | 30 ++-- .../view/frontend/templates/detailed.phtml | 2 +- .../Review/view/frontend/templates/form.phtml | 34 ++-- .../frontend/templates/helper/summary.phtml | 12 +- .../templates/helper/summary_short.phtml | 12 +- .../templates/product/view/list.phtml | 18 +- .../templates/product/view/other.phtml | 4 +- .../view/frontend/templates/redirect.phtml | 2 +- .../view/frontend/templates/review.phtml | 4 +- .../Review/view/frontend/templates/view.phtml | 22 +-- .../Rss/view/frontend/templates/feeds.phtml | 2 +- .../templates/items/column/name.phtml | 16 +- .../templates/items/column/qty.phtml | 2 +- .../adminhtml/templates/items/price/row.phtml | 6 +- .../templates/items/price/total.phtml | 6 +- .../templates/items/price/unit.phtml | 6 +- .../templates/items/renderer/default.phtml | 14 +- .../templates/order/address/form.phtml | 4 +- .../templates/order/comments/view.phtml | 14 +- .../templates/order/create/abstract.phtml | 6 +- .../order/create/billing/method/form.phtml | 12 +- .../templates/order/create/comment.phtml | 4 +- .../templates/order/create/coupons/form.phtml | 10 +- .../templates/order/create/data.phtml | 42 ++--- .../templates/order/create/form.phtml | 20 +-- .../templates/order/create/form/account.phtml | 6 +- .../templates/order/create/form/address.phtml | 34 ++-- .../templates/order/create/giftmessage.phtml | 8 +- .../templates/order/create/items.phtml | 6 +- .../templates/order/create/items/grid.phtml | 54 +++--- .../order/create/items/price/row.phtml | 6 +- .../order/create/items/price/total.phtml | 6 +- .../order/create/items/price/unit.phtml | 6 +- .../adminhtml/templates/order/create/js.phtml | 4 +- .../order/create/shipping/method/form.phtml | 34 ++-- .../templates/order/create/sidebar.phtml | 20 +-- .../order/create/sidebar/items.phtml | 52 +++--- .../templates/order/create/store/select.phtml | 18 +- .../templates/order/create/totals.phtml | 10 +- .../order/create/totals/default.phtml | 18 +- .../order/create/totals/grandtotal.phtml | 26 +-- .../order/create/totals/shipping.phtml | 38 ++--- .../order/create/totals/subtotal.phtml | 24 +-- .../templates/order/create/totals/tax.phtml | 20 +-- .../order/creditmemo/create/form.phtml | 26 +-- .../order/creditmemo/create/items.phtml | 28 ++-- .../create/items/renderer/default.phtml | 26 +-- .../create/totals/adjustments.phtml | 6 +- .../order/creditmemo/view/form.phtml | 24 +-- .../order/creditmemo/view/items.phtml | 6 +- .../view/items/renderer/default.phtml | 18 +- .../adminhtml/templates/order/details.phtml | 16 +- .../templates/order/giftoptions.phtml | 4 +- .../templates/order/invoice/create/form.phtml | 32 ++-- .../order/invoice/create/items.phtml | 30 ++-- .../create/items/renderer/default.phtml | 22 +-- .../templates/order/invoice/view/form.phtml | 24 +-- .../templates/order/invoice/view/items.phtml | 6 +- .../invoice/view/items/renderer/default.phtml | 18 +- .../adminhtml/templates/order/totalbar.phtml | 4 +- .../adminhtml/templates/order/totals.phtml | 40 ++--- .../templates/order/totals/discount.phtml | 8 +- .../templates/order/totals/due.phtml | 4 +- .../templates/order/totals/footer.phtml | 2 +- .../templates/order/totals/grand.phtml | 10 +- .../templates/order/totals/item.phtml | 10 +- .../templates/order/totals/main.phtml | 2 +- .../templates/order/totals/paid.phtml | 4 +- .../templates/order/totals/refunded.phtml | 4 +- .../templates/order/totals/shipping.phtml | 6 +- .../templates/order/totals/tax.phtml | 22 +-- .../templates/order/view/giftmessage.phtml | 24 +-- .../templates/order/view/history.phtml | 22 +-- .../adminhtml/templates/order/view/info.phtml | 42 ++--- .../templates/order/view/items.phtml | 8 +- .../order/view/items/renderer/default.phtml | 30 ++-- .../templates/order/view/tab/history.phtml | 16 +- .../templates/order/view/tab/info.phtml | 24 +-- .../templates/page/js/components.phtml | 2 +- .../templates/rss/order/grid/link.phtml | 6 +- .../templates/transactions/detail.phtml | 24 +-- .../templates/email/creditmemo/items.phtml | 8 +- .../templates/email/invoice/items.phtml | 8 +- .../view/frontend/templates/email/items.phtml | 12 +- .../email/items/creditmemo/default.phtml | 18 +- .../email/items/invoice/default.phtml | 18 +- .../templates/email/items/order/default.phtml | 24 +-- .../templates/email/items/price/row.phtml | 4 +- .../email/items/shipment/default.phtml | 14 +- .../templates/email/shipment/items.phtml | 6 +- .../templates/email/shipment/track.phtml | 8 +- .../view/frontend/templates/guest/form.phtml | 2 +- .../frontend/templates/items/price/row.phtml | 8 +- .../items/price/total_after_discount.phtml | 8 +- .../frontend/templates/items/price/unit.phtml | 8 +- .../frontend/templates/js/components.phtml | 2 +- .../frontend/templates/order/comments.phtml | 12 +- .../frontend/templates/order/creditmemo.phtml | 6 +- .../templates/order/creditmemo/items.phtml | 12 +- .../creditmemo/items/renderer/default.phtml | 50 +++--- .../frontend/templates/order/history.phtml | 24 +-- .../view/frontend/templates/order/info.phtml | 8 +- .../templates/order/info/buttons.phtml | 8 +- .../templates/order/info/buttons/rss.phtml | 8 +- .../frontend/templates/order/invoice.phtml | 6 +- .../templates/order/invoice/items.phtml | 12 +- .../invoice/items/renderer/default.phtml | 38 ++--- .../view/frontend/templates/order/items.phtml | 10 +- .../order/items/renderer/default.phtml | 50 +++--- .../templates/order/order_comments.phtml | 8 +- .../frontend/templates/order/order_date.phtml | 2 +- .../templates/order/order_status.phtml | 4 +- .../templates/order/print/creditmemo.phtml | 12 +- .../templates/order/print/invoice.phtml | 12 +- .../templates/order/print/shipment.phtml | 30 ++-- .../frontend/templates/order/recent.phtml | 22 +-- .../shipment/items/renderer/default.phtml | 28 ++-- .../frontend/templates/order/totals.phtml | 18 +- .../view/frontend/templates/order/view.phtml | 16 +- .../frontend/templates/reorder/sidebar.phtml | 12 +- .../templates/widget/guest/form.phtml | 8 +- .../view/frontend/templates/form.mini.phtml | 8 +- .../view/frontend/templates/search_data.phtml | 10 +- .../Search/view/frontend/templates/term.phtml | 8 +- .../view/frontend/templates/send.phtml | 26 +-- .../adminhtml/templates/create/form.phtml | 28 ++-- .../adminhtml/templates/create/items.phtml | 18 +- .../create/items/renderer/default.phtml | 12 +- .../templates/order/Tracking/view.phtml | 20 +-- .../templates/order/packaging/grid.phtml | 10 +- .../templates/order/packaging/packed.phtml | 26 +-- .../templates/order/packaging/popup.phtml | 30 ++-- .../adminhtml/templates/order/tracking.phtml | 8 +- .../adminhtml/templates/order/view/info.phtml | 12 +- .../view/adminhtml/templates/view/form.phtml | 44 ++--- .../view/adminhtml/templates/view/items.phtml | 6 +- .../view/items/renderer/default.phtml | 4 +- .../view/frontend/templates/items.phtml | 18 +- .../frontend/templates/order/shipment.phtml | 6 +- .../frontend/templates/tracking/link.phtml | 10 +- .../frontend/templates/tracking/popup.phtml | 30 ++-- .../frontend/templates/switch/flags.phtml | 8 +- .../frontend/templates/switch/languages.phtml | 18 +- .../frontend/templates/switch/stores.phtml | 16 +- .../adminhtml/templates/class/page/edit.phtml | 12 +- .../adminhtml/templates/items/price/row.phtml | 16 +- .../templates/items/price/total.phtml | 6 +- .../templates/items/price/unit.phtml | 8 +- .../order/create/items/price/row.phtml | 16 +- .../order/create/items/price/total.phtml | 16 +- .../order/create/items/price/unit.phtml | 16 +- .../view/adminhtml/templates/rate/form.phtml | 4 +- .../view/adminhtml/templates/rate/title.phtml | 4 +- .../view/adminhtml/templates/rule/edit.phtml | 12 +- .../adminhtml/templates/rule/rate/form.phtml | 10 +- .../templates/toolbar/class/save.phtml | 6 +- .../templates/toolbar/rate/add.phtml | 2 +- .../templates/toolbar/rule/save.phtml | 8 +- .../base/templates/pricing/adjustment.phtml | 12 +- .../templates/pricing/adjustment/bundle.phtml | 18 +- .../checkout/cart/item/price/sidebar.phtml | 8 +- .../checkout/cart/minicart/totals.phtml | 14 +- .../templates/checkout/grandtotal.phtml | 26 +-- .../templates/checkout/shipping.phtml | 38 ++--- .../templates/checkout/shipping/price.phtml | 14 +- .../templates/checkout/subtotal.phtml | 24 +-- .../frontend/templates/checkout/tax.phtml | 22 +-- .../templates/email/items/price/row.phtml | 12 +- .../frontend/templates/item/price/row.phtml | 16 +- .../item/price/total_after_discount.phtml | 8 +- .../frontend/templates/item/price/unit.phtml | 16 +- .../view/frontend/templates/order/tax.phtml | 24 +-- .../adminhtml/templates/importExport.phtml | 24 +-- .../adminhtml/templates/browser/content.phtml | 12 +- .../templates/browser/content/files.phtml | 8 +- .../templates/browser/content/uploader.phtml | 16 +- .../view/adminhtml/templates/tabs/css.phtml | 6 +- .../templates/tabs/fieldset/js.phtml | 4 +- .../view/adminhtml/templates/tabs/js.phtml | 6 +- .../view/adminhtml/templates/title.phtml | 10 +- .../templates/callouts/left_col.phtml | 12 +- .../templates/callouts/right_col.phtml | 12 +- .../view/frontend/templates/html/block.phtml | 8 +- .../frontend/templates/html/breadcrumbs.phtml | 8 +- .../frontend/templates/html/collapsible.phtml | 10 +- .../frontend/templates/html/container.phtml | 2 +- .../frontend/templates/html/copyright.phtml | 2 +- .../view/frontend/templates/html/footer.phtml | 4 +- .../view/frontend/templates/html/header.phtml | 8 +- .../frontend/templates/html/header/logo.phtml | 12 +- .../frontend/templates/html/notices.phtml | 12 +- .../view/frontend/templates/html/pager.phtml | 62 +++---- .../frontend/templates/html/sections.phtml | 14 +- .../view/frontend/templates/html/skip.phtml | 4 +- .../frontend/templates/html/skiptarget.phtml | 2 +- .../view/frontend/templates/html/title.phtml | 10 +- .../frontend/templates/html/topmenu.phtml | 4 +- .../frontend/templates/js/components.phtml | 2 +- .../view/frontend/templates/js/cookie.phtml | 4 +- .../frontend/templates/js/require_js.phtml | 2 +- .../Theme/view/frontend/templates/link.phtml | 10 +- .../templates/translate_inline.phtml | 10 +- .../view/base/templates/translate.phtml | 4 +- .../frontend/templates/translate_inline.phtml | 10 +- .../view/base/templates/context/default.phtml | 4 +- .../templates/control/button/default.phtml | 10 +- .../base/templates/filter_pool/active.phtml | 6 +- .../base/templates/filter_pool/default.phtml | 6 +- .../Ui/view/base/templates/form/default.phtml | 8 +- .../templates/form/fieldset/default.phtml | 16 +- .../view/base/templates/label/default.phtml | 4 +- .../base/templates/layout/group/default.phtml | 14 +- .../base/templates/layout/tabs/default.phtml | 4 +- .../templates/layout/tabs/nav/default.phtml | 6 +- .../templates/listing/horizontal_grid.phtml | 16 +- .../listingcontainer/massaction/default.phtml | 6 +- .../massaction/page_actions.phtml | 6 +- .../view/base/templates/paging/default.phtml | 6 +- .../view/base/templates/sorting/default.phtml | 4 +- .../system/shipping/carrier_config.phtml | 30 ++-- .../view/adminhtml/templates/categories.phtml | 10 +- .../view/adminhtml/templates/edit.phtml | 8 +- .../view/adminhtml/templates/selector.phtml | 8 +- .../templates/admin/forgotpassword.phtml | 44 ++--- .../admin/resetforgottenpassword.phtml | 42 ++--- .../view/adminhtml/templates/role/edit.phtml | 16 +- .../view/adminhtml/templates/role/info.phtml | 4 +- .../view/adminhtml/templates/role/users.phtml | 2 +- .../templates/role/users_grid_js.phtml | 2 +- .../templates/user/roles_grid_js.phtml | 2 +- .../activate/permissions/tab/webapi.phtml | 10 +- .../adminhtml/templates/resourcetree.phtml | 16 +- .../adminhtml/templates/items/price/row.phtml | 32 ++-- .../templates/items/price/total.phtml | 6 +- .../templates/items/price/unit.phtml | 32 ++-- .../order/create/items/price/row.phtml | 32 ++-- .../order/create/items/price/total.phtml | 36 ++-- .../order/create/items/price/unit.phtml | 32 ++-- .../adminhtml/templates/renderer/tax.phtml | 50 +++--- .../base/templates/pricing/adjustment.phtml | 16 +- .../checkout/cart/item/price/sidebar.phtml | 42 ++--- .../review/item/price/row_excl_tax.phtml | 16 +- .../review/item/price/row_incl_tax.phtml | 16 +- .../review/item/price/unit_excl_tax.phtml | 16 +- .../review/item/price/unit_incl_tax.phtml | 16 +- .../templates/email/items/price/row.phtml | 28 ++-- .../frontend/templates/item/price/row.phtml | 36 ++-- .../item/price/total_after_discount.phtml | 8 +- .../frontend/templates/item/price/unit.phtml | 36 ++-- .../templates/instance/edit/layout.phtml | 56 +++---- .../customer/edit/tab/wishlist.phtml | 12 +- .../frontend/templates/button/share.phtml | 4 +- .../frontend/templates/button/tocart.phtml | 2 +- .../frontend/templates/button/update.phtml | 2 +- .../view/frontend/templates/email/items.phtml | 22 +-- .../templates/item/column/actions.phtml | 6 +- .../frontend/templates/item/column/cart.phtml | 10 +- .../templates/item/column/comment.phtml | 4 +- .../frontend/templates/item/column/edit.phtml | 4 +- .../templates/item/column/image.phtml | 6 +- .../frontend/templates/item/column/name.phtml | 6 +- .../templates/item/column/price.phtml | 4 +- .../templates/item/column/remove.phtml | 2 +- .../templates/item/configure/addto.phtml | 4 +- .../view/frontend/templates/item/list.phtml | 10 +- .../frontend/templates/js/components.phtml | 2 +- .../view/frontend/templates/link.phtml | 6 +- .../frontend/templates/options_list.phtml | 6 +- .../view/frontend/templates/rss/email.phtml | 6 +- .../frontend/templates/rss/wishlist.phtml | 6 +- .../view/frontend/templates/shared.phtml | 36 ++-- .../view/frontend/templates/sharing.phtml | 12 +- .../view/frontend/templates/sidebar.phtml | 30 ++-- .../view/frontend/templates/view.phtml | 26 +-- .../templates/layer/state.phtml | 12 +- .../templates/layer/view.phtml | 16 +- .../View/TemplateEngine/_files/simple.phtml | 6 +- .../Framework/View/TemplateEngine/Php.php | 43 ----- pub/errors/default/page.phtml | 4 +- pub/errors/default/report.phtml | 28 ++-- 812 files changed, 6227 insertions(+), 6270 deletions(-) diff --git a/app/code/Magento/AdminNotification/view/adminhtml/templates/notification/window.phtml b/app/code/Magento/AdminNotification/view/adminhtml/templates/notification/window.phtml index 5fa52b0a6f91b..a9baeb2054039 100644 --- a/app/code/Magento/AdminNotification/view/adminhtml/templates/notification/window.phtml +++ b/app/code/Magento/AdminNotification/view/adminhtml/templates/notification/window.phtml @@ -10,16 +10,16 @@ */ ?>
-
+
-

getHeaderText(); ?>

+

getHeaderText(); ?>

- getSeverityText();?> -

getNoticeMessageText(); ?>

+ getSeverityText();?> +

getNoticeMessageText(); ?>

- getReadDetailsText(); ?> + getReadDetailsText(); ?>
diff --git a/app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages.phtml b/app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages.phtml index 35c967093cf3a..eba5114f20717 100644 --- a/app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages.phtml +++ b/app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages.phtml @@ -4,9 +4,9 @@ * See COPYING.txt for license details. */ ?> - + -getLastCritical();?> +getLastCritical();?>
@@ -18,13 +18,13 @@
System Messages: - getCriticalCount()): ?> - getCriticalCount();?> + getCriticalCount()): ?> + getCriticalCount();?> - getMajorCount()): ?> - getMajorCount();?> + getMajorCount()): ?> + getMajorCount();?>
-
+
diff --git a/app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages/popup.phtml b/app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages/popup.phtml index b3a2c883a963e..e2b17f75f02d7 100644 --- a/app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages/popup.phtml +++ b/app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages/popup.phtml @@ -4,11 +4,11 @@ * See COPYING.txt for license details. */ ?> - -
+ +
    - getUnreadMessages() as $message): ?> -
  • + getUnreadMessages() as $message): ?> +
  • getText();?>
    • diff --git a/app/code/Magento/AdminNotification/view/adminhtml/templates/toolbar_entry.phtml b/app/code/Magento/AdminNotification/view/adminhtml/templates/toolbar_entry.phtml index fe314086d2968..c76e3bbed9268 100644 --- a/app/code/Magento/AdminNotification/view/adminhtml/templates/toolbar_entry.phtml +++ b/app/code/Magento/AdminNotification/view/adminhtml/templates/toolbar_entry.phtml @@ -4,40 +4,40 @@ * See COPYING.txt for license details. */ ?> - -getUnreadNotificationCount(); ?> -
    + +getUnreadNotificationCount(); ?> +
    0) : ?> - + - escapeHtml($notificationCount); ?> + escapeHtml($notificationCount); ?> -
      - getLatestUnreadNotifications() as $notification) : ?> +
        + getLatestUnreadNotifications() as $notification) : ?>
      • - escapeHtml($notification->getTitle()); ?> - escapeHtml($notification->getDescription()); ?> - + escapeHtml($notification->getTitle()); ?> + escapeHtml($notification->getDescription()); ?> +
        - escapeHtml($notification->getTitle()); ?> - escapeHtml($notification->getDescription()); ?> + escapeHtml($notification->getTitle()); ?> + escapeHtml($notification->getDescription()); ?>
        - +
        - +
      • - +
      - + diff --git a/app/code/Magento/Backend/view/adminhtml/templates/admin/access_denied.phtml b/app/code/Magento/Backend/view/adminhtml/templates/admin/access_denied.phtml index 3a92e9f8f9034..f3d8314d230c1 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/admin/access_denied.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/admin/access_denied.phtml @@ -10,7 +10,7 @@ */ ?>

      -hasAvailableResources()): ?> +hasAvailableResources()): ?>


      diff --git a/app/code/Magento/Backend/view/adminhtml/templates/admin/formkey.phtml b/app/code/Magento/Backend/view/adminhtml/templates/admin/formkey.phtml index 2bff8e6ea45e4..cd3ac37adf388 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/admin/formkey.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/admin/formkey.phtml @@ -4,4 +4,4 @@ * See COPYING.txt for license details. */ ?> -

      +
      diff --git a/app/code/Magento/Backend/view/adminhtml/templates/admin/login.phtml b/app/code/Magento/Backend/view/adminhtml/templates/admin/login.phtml index ac8a1dcdc6dc9..115a7054f222f 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/admin/login.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/admin/login.phtml @@ -12,12 +12,12 @@
      - getLayout()->getMessagesBlock()->getGroupedHtml() ?> + getLayout()->getMessagesBlock()->getGroupedHtml() ?>

      - +
      @@ -32,9 +32,9 @@
      - getChildHtml('form.additional.info'); ?> + getChildHtml('form.additional.info'); ?>
      - getChildHtml('form.buttons'); ?> + getChildHtml('form.buttons'); ?>
      @@ -66,7 +66,7 @@
    -
    getChildHtml('copyright');?>
    +
    getChildHtml('copyright');?>
    diff --git a/app/code/Magento/Backend/view/adminhtml/templates/admin/login_buttons.phtml b/app/code/Magento/Backend/view/adminhtml/templates/admin/login_buttons.phtml index da6ad00db3adb..f114e113e47c6 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/admin/login_buttons.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/admin/login_buttons.phtml @@ -5,7 +5,7 @@ */ ?>
    -
    diff --git a/app/code/Magento/Backend/view/adminhtml/templates/admin/overlay_popup.phtml b/app/code/Magento/Backend/view/adminhtml/templates/admin/overlay_popup.phtml index 6ffe241c93bb2..6a966ab64d44a 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/admin/overlay_popup.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/admin/overlay_popup.phtml @@ -7,28 +7,28 @@
    - getChildHtml('left')): ?> -
    + getChildHtml('left')): ?> +
    - getChildHtml('left') ?> + getChildHtml('left') ?>
    -
    getLayout()->getMessagesBlock()->getGroupedHtml() ?>
    - getChildHtml('content') ?> +
    getLayout()->getMessagesBlock()->getGroupedHtml() ?>
    + getChildHtml('content') ?>
    -
    getLayout()->getMessagesBlock()->getGroupedHtml() ?>
    - getChildHtml('content') ?> +
    getLayout()->getMessagesBlock()->getGroupedHtml() ?>
    + getChildHtml('content') ?>
    - getChildHtml('footer')): ?> + getChildHtml('footer')): ?>
    - getChildHtml('footer') ?> + getChildHtml('footer') ?>
    - getChildHtml('js') ?> + getChildHtml('js') ?>
    diff --git a/app/code/Magento/Backend/view/adminhtml/templates/admin/page.phtml b/app/code/Magento/Backend/view/adminhtml/templates/admin/page.phtml index fa4fb1c651c20..03218fc37c22b 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/admin/page.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/admin/page.phtml @@ -4,52 +4,52 @@ * See COPYING.txt for license details. */ ?> - + - + - getChildHtml('head') ?> + getChildHtml('head') ?> -getBodyClass() ? ' class="' . $this->getBodyClass() . '"' : ''; ?> data-container="body" data-mage-init='{"loaderAjax":{},"loader":{}}'> +getBodyClass() ? ' class="' . $block->getBodyClass() . '"' : ''; ?> data-container="body" data-mage-init='{"loaderAjax":{},"loader":{}}'>
    - getChildHtml('notification_window'); ?> - getChildHtml('global_notices') ?> + getChildHtml('notification_window'); ?> + getChildHtml('global_notices') ?>
    - getChildHtml('header') ?> + getChildHtml('header') ?>
    - getChildHtml('menu') ?> - getChildHtml('notifications'); ?> + getChildHtml('menu') ?> + getChildHtml('notifications'); ?>
    - getChildHtml('main-top'); ?> + getChildHtml('main-top'); ?>
    - getLayout()->getMessagesBlock()->getGroupedHtml() ?> + getLayout()->getMessagesBlock()->getGroupedHtml() ?>
    - getChildHtml('page_main_actions'); ?> - getChildHtml('left')): ?> -
    + getChildHtml('page_main_actions'); ?> + getChildHtml('left')): ?> +
    - getChildHtml('content') ?> + getChildHtml('content') ?>
    - getChildHtml('left') ?> + getChildHtml('left') ?>
    - getChildHtml('content') ?> + getChildHtml('content') ?>
    - getChildHtml('js') ?> + getChildHtml('js') ?>
    - getChildHtml('footer') ?> + getChildHtml('footer') ?>
    - getChildHtml('before_body_end') ?> + getChildHtml('before_body_end') ?> diff --git a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/graph.phtml b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/graph.phtml index 5d6dc42114cbf..682829dc1d1db 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/graph.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/graph.phtml @@ -6,19 +6,19 @@ ?>
    - - helper('Magento\Backend\Helper\Dashboard\Data')->getDatePeriods() as $value => $label): ?> - +
    - getCount()): ?> + getCount()): ?>
    - Chart + Chart
    diff --git a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/graph/disabled.phtml b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/graph/disabled.phtml index 8c56aa5c1d845..c89b0dbf6ced8 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/graph/disabled.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/graph/disabled.phtml @@ -6,6 +6,6 @@ ?>

    - here.', $this->getConfigUrl())?> + here.', $block->getConfigUrl())?>

    diff --git a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/grid.phtml b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/grid.phtml index e7c305f92d347..16a15e2eff4dd 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/grid.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/grid.phtml @@ -6,21 +6,21 @@ ?> getColumns()); +$numColumns = sizeof($block->getColumns()); ?> -getCollection()): ?> +getCollection()): ?>
    - +
    tags from the code. */ - /* foreach ($this->getColumns() as $_column): ?> + /* foreach ($block->getColumns() as $_column): ?> getHtmlProperty() ?> /> - getHeadersVisibility() || $this->getFilterVisibility()): ?> + getHeadersVisibility() || $block->getFilterVisibility()): ?> - getHeadersVisibility()): ?> + getHeadersVisibility()): ?> - getColumns() as $_column): ?> + getColumns() as $_column): ?> @@ -28,47 +28,47 @@ $numColumns = sizeof($this->getColumns()); - getCollection()->getSize()>0) && (!$this->getIsCollapsed())): ?> - getCollection() as $_index => $_item): ?> - - getColumns() as $_column): ?> + getCollection()->getSize()>0) && (!$block->getIsCollapsed())): ?> + getCollection() as $_index => $_item): ?> + + getColumns() as $_column): ?> - getEmptyText()): ?> + getEmptyText()): ?> - +
    getHeaderHtmlProperty() ?>>getHeaderHtml() ?>
    getRowField($_item)) != '' ? $_html : ' ') ?>
    getEmptyText() ?>getEmptyText() ?>
    -canDisplayContainer()): ?> +canDisplayContainer()): ?> diff --git a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/totalbar.phtml b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/totalbar.phtml index 222842a2d6109..129caad9680e2 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/totalbar.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/totalbar.phtml @@ -4,10 +4,10 @@ * See COPYING.txt for license details. */ ?> -getTotals()) > 0): ?> +getTotals()) > 0): ?>
      - getTotals() as $_total): ?> + getTotals() as $_total): ?>
    • diff --git a/app/code/Magento/Backend/view/adminhtml/templates/media/uploader.phtml b/app/code/Magento/Backend/view/adminhtml/templates/media/uploader.phtml index 95867fa7188a5..21a0cb384976e 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/media/uploader.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/media/uploader.phtml @@ -4,17 +4,17 @@ * See COPYING.txt for license details. */ -/** @var $this \Magento\Backend\Block\Media\Uploader */ +/** @var $block \Magento\Backend\Block\Media\Uploader */ ?> -
      +
      - +
      -
      +
      {{name}} ({{size}})
      @@ -38,17 +38,17 @@ require([ dropZone: '[data-tab-panel=image-management]', sequentialUploads: true, acceptFileTypes: /(\.|\/)(gif|jpe?g|png)$/i, - maxFileSize: getFileSizeService()->getMaxFileSize() ?>, + maxFileSize: getFileSizeService()->getMaxFileSize() ?>, add: function(e, data) { $.each(data.files, function (index, file) { data.fileId = Math.random().toString(33).substr(2, 18); - var progressTmpl = $('#getHtmlId(); ?>-template').children(':first').clone(); + var progressTmpl = $('#getHtmlId(); ?>-template').children(':first').clone(); progressTmpl.attr('id', data.fileId); var fileInfoHtml = progressTmpl.html().replace('{{size}}', byteConvert(file.size)) .replace('{{name}}', file.name); progressTmpl.html(fileInfoHtml) ; - progressTmpl.appendTo('#getHtmlId() ?>'); + progressTmpl.appendTo('#getHtmlId() ?>'); }); $(this).fileupload('process', data).done(function () { @@ -57,7 +57,7 @@ require([ }, done: function(e, data) { if (data.result && !data.result.error) { - $('#getParentBlock()->getHtmlId() ?>').trigger('addItem', data.result); + $('#getParentBlock()->getHtmlId() ?>').trigger('addItem', data.result); } else { $('#' + data.fileId) .delay(2000) diff --git a/app/code/Magento/Backend/view/adminhtml/templates/menu.phtml b/app/code/Magento/Backend/view/adminhtml/templates/menu.phtml index 8c143444d6488..05b2038bc8aa4 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/menu.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/menu.phtml @@ -5,7 +5,7 @@ */ ?> diff --git a/app/code/Magento/Backend/view/adminhtml/templates/page/footer.phtml b/app/code/Magento/Backend/view/adminhtml/templates/page/footer.phtml index 4ad3c029f28b2..4f5976c6c8860 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/page/footer.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/page/footer.phtml @@ -5,6 +5,6 @@ */ ?> -getBugreportUrl()): ?> - +getBugreportUrl()): ?> + diff --git a/app/code/Magento/Backend/view/adminhtml/templates/page/header.phtml b/app/code/Magento/Backend/view/adminhtml/templates/page/header.phtml index a2fd0aff3c6f6..117061355b14d 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/page/header.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/page/header.phtml @@ -4,32 +4,32 @@ * See COPYING.txt for license details. */ -/** @var $this \Magento\Backend\Block\Page\Header */ +/** @var $block \Magento\Backend\Block\Page\Header */ ?> -getShowPart()): +getShowPart()): case 'logo': ?> - getEdition() ? 'data-edition="' . $this->getEdition() . '"' : ''; ?> - class="logo" title=""> + getEdition() ? 'data-edition="' . $block->getEdition() . '"' : ''; ?> + class="logo" title="">
      -
      - getChildHtml(); ?> + getChildHtml(); ?> diff --git a/app/code/Magento/Backend/view/adminhtml/templates/page/js/calendar.phtml b/app/code/Magento/Backend/view/adminhtml/templates/page/js/calendar.phtml index 0caba04e4790d..13c04dad1f7c7 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/page/js/calendar.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/page/js/calendar.phtml @@ -48,9 +48,9 @@ require([ showTime: false, showHour: false, showMinute: false, - localTimezone: getTimezoneOffsetSeconds() ?>, - serverTimezoneSeconds:getStoreTimestamp() ?>, - yearRange: 'getYearRange() ?>' + localTimezone: getTimezoneOffsetSeconds() ?>, + serverTimezoneSeconds:getStoreTimestamp() ?>, + yearRange: 'getYearRange() ?>' } }); diff --git a/app/code/Magento/Backend/view/adminhtml/templates/page/js/components.phtml b/app/code/Magento/Backend/view/adminhtml/templates/page/js/components.phtml index 478e18e57b011..73ff3cb312c2d 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/page/js/components.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/page/js/components.phtml @@ -11,5 +11,5 @@ */ ?> - -getChildHtml() ?> + +getChildHtml() ?> diff --git a/app/code/Magento/Backend/view/adminhtml/templates/page/js/head_scripts.phtml b/app/code/Magento/Backend/view/adminhtml/templates/page/js/head_scripts.phtml index 418146cfc58cc..33981193f9b72 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/page/js/head_scripts.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/page/js/head_scripts.phtml @@ -10,7 +10,7 @@ Ext.UpdateManager.defaults.disableCaching = true; - + diff --git a/app/code/Magento/Backend/view/adminhtml/templates/page/js/translate.phtml b/app/code/Magento/Backend/view/adminhtml/templates/page/js/translate.phtml index 0bc3b1a7519ac..a3d8c351b1ab2 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/page/js/translate.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/page/js/translate.phtml @@ -7,7 +7,7 @@
      - getLocaleSelect(); ?> + getLocaleSelect(); ?>
      -getButtonHtml() ?> +getButtonHtml() ?> diff --git a/app/code/Magento/Backend/view/adminhtml/templates/pageactions.phtml b/app/code/Magento/Backend/view/adminhtml/templates/pageactions.phtml index 8bc07aba86ec4..1eaa0bdb5cf34 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/pageactions.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/pageactions.phtml @@ -4,8 +4,8 @@ * See COPYING.txt for license details. */ ?> -getChildHtml()):?> -
      getUiId('content-header') ?>> - getChildHtml(); ?> +getChildHtml()):?> +
      getUiId('content-header') ?>> + getChildHtml(); ?>
      diff --git a/app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml b/app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml index 7f2d19abb32d6..0c55ff50e474a 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml @@ -3,44 +3,44 @@ * Copyright © 2015 Magento. All rights reserved. * See COPYING.txt for license details. */ -/* @var $this \Magento\Backend\Block\Store\Switcher */ +/* @var $block \Magento\Backend\Block\Store\Switcher */ ?> -getWebsites()): ?> +getWebsites()): ?>
      getUiId()?> /> + data-role="store-view-id" data-param="getStoreVarName() ?>" + value="escapeHtml($block->getStoreId()) ?>" + onchange="switchScope(this);"getUiId()?> /> getUiId()?> /> + data-role="store-group-id" data-param="getStoreGroupVarName() ?>" + value="escapeHtml($block->getStoreGroupId()) ?>" + onchange="switchScope(this);"getUiId()?> /> getUiId()?> /> + data-role="website-id" data-param="getWebsiteVarName() ?>" + value="escapeHtml($block->getWebsiteId()) ?>" + onchange="switchScope(this);"getUiId()?> />
        - hasDefaultOption()): ?> -
      • getDefaultSelectionName() != $block->getCurrentSelectionName())) { echo "disabled"; -} ?> hasScopeSelected()) { +} ?> hasScopeSelected()) { ?> current"> - getDefaultSelectionName() != $this->getCurrentSelectionName()) { + getDefaultSelectionName() != $block->getCurrentSelectionName()) { ?> - getDefaultSelectionName() ?> + getDefaultSelectionName() ?> - getDefaultSelectionName() ?> + getDefaultSelectionName() ?>
        • @@ -49,75 +49,75 @@ getGroups() as $group): ?> - getStores($group) as $store): ?> + getStores($group) as $store): ?> -
      • isWebsiteSwitchEnabled() && !$block->isWebsiteSelected($website))) { echo "disabled"; -} ?> isWebsiteSelected($website)) { +} ?> isWebsiteSelected($website)) { ?> current"> - isWebsiteSwitchEnabled() && !$this->isWebsiteSelected($website)) { + isWebsiteSwitchEnabled() && !$block->isWebsiteSelected($website)) { ?> - - escapeHtml($website->getName()) ?> + + escapeHtml($website->getName()) ?> - escapeHtml($website->getName()) ?> + escapeHtml($website->getName()) ?>
        • -
      • isStoreGroupSwitchEnabled() && !$block->isStoreGroupSelected($group))) { echo "disabled"; -} ?> isStoreGroupSelected($group)) { +} ?> isStoreGroupSelected($group)) { ?> current"> - isStoreGroupSwitchEnabled() && !$this->isStoreGroupSelected($group)) { + isStoreGroupSwitchEnabled() && !$block->isStoreGroupSelected($group)) { ?> - - escapeHtml($group->getName()) ?> + + escapeHtml($group->getName()) ?> - escapeHtml($group->getName()) ?> + escapeHtml($group->getName()) ?>
        • -
      • isStoreSwitchEnabled() && !$block->isStoreSelected($store))) { echo "disabled"; -} ?> isStoreSelected($store)) { +} ?> isStoreSelected($store)) { ?> current"> - isStoreSwitchEnabled() && !$this->isStoreSelected($store)) { + isStoreSwitchEnabled() && !$block->isStoreSelected($store)) { ?> - - escapeHtml($store->getName()) ?> + + escapeHtml($store->getName()) ?> - escapeHtml($store->getName()) ?> + escapeHtml($store->getName()) ?>
        • - getShowManageStoresLink() && $this->getAuthorization()->isAllowed('Magento_Adminhtml::store')): ?> + getShowManageStoresLink() && $block->getAuthorization()->isAllowed('Magento_Adminhtml::store')): ?>
      • - +
      - getHintHtml() ?> + getHintHtml() ?>
      -getButtonHtml() ?> +getButtonHtml() ?> - Synchronize + Synchronize diff --git a/app/code/Magento/Backend/view/adminhtml/templates/system/config/tabs.phtml b/app/code/Magento/Backend/view/adminhtml/templates/system/config/tabs.phtml index bf03d65e22e67..787f4622583e8 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/system/config/tabs.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/system/config/tabs.phtml @@ -4,16 +4,16 @@ * See COPYING.txt for license details. */ -/** @var $this \Magento\Backend\Block\System\Config\Tabs */ +/** @var $block \Magento\Backend\Block\System\Config\Tabs */ ?> -getTitle()): ?> -

      getTitle() ?>

      +getTitle()): ?> +

      getTitle() ?>

      -getTabs()): ?> -
        +getTabs()): ?> +
          getTabs() as $_tab): + foreach ($block->getTabs() as $_tab): ?>

        • getLabel() ?>

          @@ -23,7 +23,7 @@ /** @var $_section \Magento\Backend\Model\Config\Structure\Element\Section */ foreach ($_tab->getChildren() as $_section): ?>
        • - + getLabel() ?> diff --git a/app/code/Magento/Backend/view/adminhtml/templates/system/design/edit.phtml b/app/code/Magento/Backend/view/adminhtml/templates/system/design/edit.phtml index e2ab8cdcd2e71..23de8e19b5ecd 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/system/design/edit.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/system/design/edit.phtml @@ -4,8 +4,8 @@ * See COPYING.txt for license details. */ ?> -
          - getBlockHtml('formkey')?> + + getBlockHtml('formkey')?>
          diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/breadcrumbs.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/breadcrumbs.phtml index 835df288963c2..b9c503d344b3a 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/widget/breadcrumbs.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/breadcrumbs.phtml @@ -11,12 +11,12 @@
        • - escapeHtml($_link['label']) ?> + escapeHtml($_link['label']) ?> - escapeHtml($_link['label']) ?> + escapeHtml($_link['label']) ?> - escapeHtml($_link['label']) ?> + escapeHtml($_link['label']) ?> » diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/button.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/button.phtml index 4166c496e11b5..b55c1bfdf4d15 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/widget/button.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/button.phtml @@ -6,11 +6,11 @@ ?> -getBeforeHtml(); ?> - -getAfterHtml(); ?> +getAfterHtml(); ?> diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/button/split.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/button/split.phtml index 5a40701deba7c..5895854f023a3 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/widget/button/split.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/button/split.phtml @@ -5,31 +5,31 @@ */ ?> helper('Magento\Core\Helper\Data'); ?> -
          getAttributesHtml(); ?>> - - hasSplit()): ?> - - getDisabled()): ?> -
            getUiId("dropdown-menu"); ?>> - getOptions() as $key => $option): ?> + getDisabled()): ?> +
              getUiId("dropdown-menu"); ?>> + getOptions() as $key => $option): ?>
            • - getOptionAttributesHtml($key, $option); ?>> - escapeHtml($option['label']); ?> + getOptionAttributesHtml($key, $option); ?>> + escapeHtml($option['label']); ?> -
              getUiId('item', $key, 'tooltip'); ?>> - - escapeHtml($option['hint']['label']) ?> +
              getUiId('item', $key, 'tooltip'); ?>> + + escapeHtml($option['hint']['label']) ?>
              diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/form.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/form.phtml index 6c5100e32c172..c8339b6c0f68d 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/widget/form.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/form.phtml @@ -3,10 +3,10 @@ * Copyright © 2015 Magento. All rights reserved. * See COPYING.txt for license details. */ -/** @var $this \Magento\Backend\Block\Widget\Form */ +/** @var $block \Magento\Backend\Block\Widget\Form */ ?>
              - getFormHtml();?> + getFormHtml();?>
              -getChildHtml('form_after');?> +getChildHtml('form_after');?> diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/container.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/container.phtml index 060d9e1ab61ed..ef5b077c405bc 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/container.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/container.phtml @@ -3,16 +3,16 @@ * Copyright © 2015 Magento. All rights reserved. * See COPYING.txt for license details. */ -/** @var $this \Magento\Backend\Block\Widget\Form\Container */ +/** @var $block \Magento\Backend\Block\Widget\Form\Container */ ?> -getFormInitScripts() ?> -getButtonsHtml('header')): ?> -
              getUiId('content-header') ?>>getButtonsHtml('header') ?>
              +getFormInitScripts() ?> +getButtonsHtml('header')): ?> +
              getUiId('content-header') ?>>getButtonsHtml('header') ?>
              -getFormHtml() ?> -hasFooterButtons()): ?> +getFormHtml() ?> +hasFooterButtons()): ?>
              -

              getButtonsHtml('footer') ?>

              +

              getButtonsHtml('footer') ?>

              -getFormScripts() ?> +getFormScripts() ?> diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/element.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/element.phtml index 198ba7eb67a58..0ee09b18418bf 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/element.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/element.phtml @@ -33,7 +33,7 @@ case 'button': case 'password': ?> - getLabel()): ?> + getLabel()): ?> getOnClick() ? 'onClick="' . $element->getOnClick() . '"' : '') ?>/> - + - getChildBlock('grid.js')): ?> - getChildHtml('grid.js'); ?> + getChildBlock('grid.js')): ?> + getChildHtml('grid.js'); ?> diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/column_set.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/column_set.phtml index 0da5cded6680c..08a6801fb1c3b 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/column_set.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/column_set.phtml @@ -7,21 +7,21 @@ getColumns()); +$numColumns = sizeof($block->getColumns()); ?> -getCollection()): ?> +getCollection()): ?> tags from the code. */ - /* foreach ($this->getColumns() as $_column): ?> + /* foreach ($block->getColumns() as $_column): ?> getHtmlProperty() ?> /> - isHeaderVisible() || $this->isFilterVisible()): ?> + isHeaderVisible() || $block->isFilterVisible()): ?> - isHeaderVisible()): ?> + isHeaderVisible()): ?> - getColumns() as $_column): ?> + getColumns() as $_column): ?> getHeaderHtmlProperty() ?>> getHeaderHtml() ?> @@ -29,9 +29,9 @@ $numColumns = sizeof($this->getColumns()); - isFilterVisible()): ?> + isFilterVisible()): ?> - getColumns() as $_column): ?> + getColumns() as $_column): ?> getHeaderHtmlProperty() ?>> getFilterHtml() ?> @@ -42,36 +42,36 @@ $numColumns = sizeof($this->getColumns()); - getCollection()->getSize() > 0 && !$this->getIsCollapsed()): ?> - getCollection() as $_index => $_item): ?> - hasMultipleRows($_item)) :?> - updateItemByFirstMultiRow($_item); ?> - getRowClass($_item)):?> class="" - >getColumns() as $_column): - if ($this->shouldRenderCell($_item, $_column)): - $_rowspan = $this->getRowspan($_item, $_column); + getCollection()->getSize() > 0 && !$block->getIsCollapsed()): ?> + getCollection() as $_index => $_item): ?> + hasMultipleRows($_item)) :?> + updateItemByFirstMultiRow($_item); ?> + getRowClass($_item)):?> class="" + >getColumns() as $_column): + if ($block->shouldRenderCell($_item, $_column)): + $_rowspan = $block->getRowspan($_item, $_column); ?> class="getCssProperty() ?> " > getRowField($_item)) != '' ? $_html : ' ') ?> shouldRenderEmptyCell($_item, $_column)):?> - - getEmptyCellLabel()?> + if ($block->shouldRenderEmptyCell($_item, $_column)):?> + + getEmptyCellLabel()?> - getMultipleRows($_item) as $_i):?> + getMultipleRows($_item) as $_i):?> - getMultipleRowColumns($_i) as $_column): + getMultipleRowColumns($_i) as $_column): ?> @@ -81,36 +81,36 @@ $numColumns = sizeof($this->getColumns()); - shouldRenderSubTotal($_item)): ?> + shouldRenderSubTotal($_item)): ?> - getMultipleRowColumns() as $_column): ?> + getMultipleRowColumns() as $_column): ?> hasSubtotalsLabel() ? $_column->getSubtotalsLabel() - : $_column->getRowField($this->getSubTotals($_item)); + : $_column->getRowField($block->getSubTotals($_item)); ?> - getRowClass($_item)):?> + getRowClass($_item)):?> class="" > - getColumns() as $_column): ?> - shouldRenderCell($_item, $_column)):?> + getColumns() as $_column): ?> + shouldRenderCell($_item, $_column)):?> getRowField($_item)) != '' ? $_html : ' ') ?> - shouldRenderEmptyCell($_item, $_column)):?> + shouldRenderEmptyCell($_item, $_column)):?> - getEmptyCellLabel()?> + getEmptyCellLabel()?> @@ -118,24 +118,24 @@ $numColumns = sizeof($this->getColumns()); - getEmptyText()): ?> + getEmptyText()): ?> - getEmptyText() ?> + >getEmptyText() ?> - shouldRenderTotal()): ?> + shouldRenderTotal()): ?> - getColumns() as $_column): ?> + getColumns() as $_column): ?> hasTotalsLabel()) ? $_column->getTotalsLabel() - : $_column->getRowField($this->getTotals()) ?> + : $_column->getRowField($block->getTotals()) ?> diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/container.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/container.phtml index dca0392fced9e..b00df5408bcec 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/container.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/container.phtml @@ -4,7 +4,7 @@ * See COPYING.txt for license details. */ ?> -getButtonsHtml()): ?> -
              getButtonsHtml() ?>
              +getButtonsHtml()): ?> +
              getButtonsHtml() ?>
              -getGridHtml() ?> +getGridHtml() ?> diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/container/empty.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/container/empty.phtml index 744288619d63e..a15c7d38fe6fb 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/container/empty.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/container/empty.phtml @@ -4,4 +4,4 @@ * See COPYING.txt for license details. */ ?> -getGridHtml() ?> +getGridHtml() ?> diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/export.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/export.phtml index 80c2de13bf2e7..3abef78b602b4 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/export.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/export.phtml @@ -5,12 +5,12 @@ */ ?> -