diff --git a/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Js.php b/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Js.php
index 8ac79a0aa0d4..fd5deeb30a66 100644
--- a/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Js.php
+++ b/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Js.php
@@ -17,8 +17,7 @@ class Js extends \Magento\Backend\Block\Template
*
* @var string
*/
-
- protected $_template = 'attribute/edit/js.phtml';
+ protected $_template = 'Magento_Eav::attribute/edit/js.phtml';
/**
* @var \Magento\Eav\Model\Adminhtml\System\Config\Source\Inputtype
diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Problem.php b/app/code/Magento/Newsletter/Block/Adminhtml/Problem.php
index c5f4dc68d4dd..61a17d7ad5e5 100644
--- a/app/code/Magento/Newsletter/Block/Adminhtml/Problem.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Problem.php
@@ -19,7 +19,7 @@ class Problem extends \Magento\Backend\Block\Template
/**
* @var string
*/
- protected $_template = 'problem/list.phtml';
+ protected $_template = 'Magento_Newsletter::problem/list.phtml';
/**
* @var \Magento\Newsletter\Model\ResourceModel\Problem\Collection
diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Edit.php b/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Edit.php
index f085b0f6c9c8..ca90b5d84a10 100644
--- a/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Edit.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Edit.php
@@ -19,7 +19,7 @@ class Edit extends \Magento\Backend\Block\Template
/**
* @var string
*/
- protected $_template = 'queue/edit.phtml';
+ protected $_template = 'Magento_Newsletter::queue/edit.phtml';
/**
* Core registry
diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Subscriber.php b/app/code/Magento/Newsletter/Block/Adminhtml/Subscriber.php
index 86e7e7ee4756..4d5165db6873 100644
--- a/app/code/Magento/Newsletter/Block/Adminhtml/Subscriber.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Subscriber.php
@@ -29,7 +29,7 @@ class Subscriber extends \Magento\Backend\Block\Template
/**
* @var string
*/
- protected $_template = 'subscriber/list.phtml';
+ protected $_template = 'Magento_Newsletter::subscriber/list.phtml';
/**
* @var \Magento\Newsletter\Model\ResourceModel\Queue\CollectionFactory
diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Template.php b/app/code/Magento/Newsletter/Block/Adminhtml/Template.php
index 02b60e049f25..92ae6e6c3db0 100644
--- a/app/code/Magento/Newsletter/Block/Adminhtml/Template.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Template.php
@@ -16,7 +16,7 @@ class Template extends \Magento\Backend\Block\Template
/**
* @var string
*/
- protected $_template = 'template/list.phtml';
+ protected $_template = 'Magento_Newsletter::template/list.phtml';
/**
* @return $this
diff --git a/app/code/Magento/OfflinePayments/Block/Form/Banktransfer.php b/app/code/Magento/OfflinePayments/Block/Form/Banktransfer.php
index c4fe10c38664..d60348d9dc1c 100644
--- a/app/code/Magento/OfflinePayments/Block/Form/Banktransfer.php
+++ b/app/code/Magento/OfflinePayments/Block/Form/Banktransfer.php
@@ -15,5 +15,5 @@ class Banktransfer extends \Magento\OfflinePayments\Block\Form\AbstractInstructi
*
* @var string
*/
- protected $_template = 'form/banktransfer.phtml';
+ protected $_template = 'Magento_OfflinePayments::form/banktransfer.phtml';
}
diff --git a/app/code/Magento/OfflinePayments/Block/Form/Cashondelivery.php b/app/code/Magento/OfflinePayments/Block/Form/Cashondelivery.php
index 4e0f7d48ce09..de0f7a57bae6 100644
--- a/app/code/Magento/OfflinePayments/Block/Form/Cashondelivery.php
+++ b/app/code/Magento/OfflinePayments/Block/Form/Cashondelivery.php
@@ -15,5 +15,5 @@ class Cashondelivery extends \Magento\OfflinePayments\Block\Form\AbstractInstruc
*
* @var string
*/
- protected $_template = 'form/cashondelivery.phtml';
+ protected $_template = 'Magento_OfflinePayments::form/cashondelivery.phtml';
}
diff --git a/app/code/Magento/Payment/Block/Info/Instructions.php b/app/code/Magento/Payment/Block/Info/Instructions.php
index e3c74e020f8f..687c6b54a2f4 100644
--- a/app/code/Magento/Payment/Block/Info/Instructions.php
+++ b/app/code/Magento/Payment/Block/Info/Instructions.php
@@ -23,7 +23,7 @@ class Instructions extends \Magento\Payment\Block\Info
/**
* @var string
*/
- protected $_template = 'info/instructions.phtml';
+ protected $_template = 'Magento_Payment::info/instructions.phtml';
/**
* Get instructions text from order payment
diff --git a/app/code/Magento/Paypal/Block/Adminhtml/Billing/Agreement/View/Form.php b/app/code/Magento/Paypal/Block/Adminhtml/Billing/Agreement/View/Form.php
index 31b3e0c1d6b6..396c66d4e748 100644
--- a/app/code/Magento/Paypal/Block/Adminhtml/Billing/Agreement/View/Form.php
+++ b/app/code/Magento/Paypal/Block/Adminhtml/Billing/Agreement/View/Form.php
@@ -13,5 +13,5 @@ class Form extends \Magento\Backend\Block\Template
/**
* @var string
*/
- protected $_template = 'billing/agreement/view/form.phtml';
+ protected $_template = 'Magento_Paypal::billing/agreement/view/form.phtml';
}
diff --git a/app/code/Magento/Paypal/Block/Adminhtml/Billing/Agreement/View/Tab/Info.php b/app/code/Magento/Paypal/Block/Adminhtml/Billing/Agreement/View/Tab/Info.php
index d133d19f9c20..39373017fa09 100644
--- a/app/code/Magento/Paypal/Block/Adminhtml/Billing/Agreement/View/Tab/Info.php
+++ b/app/code/Magento/Paypal/Block/Adminhtml/Billing/Agreement/View/Tab/Info.php
@@ -15,7 +15,7 @@ class Info extends \Magento\Backend\Block\Template implements \Magento\Backend\B
/**
* @var string
*/
- protected $_template = 'billing/agreement/view/tab/info.phtml';
+ protected $_template = 'Magento_Paypal::billing/agreement/view/tab/info.phtml';
/**
* Core registry
diff --git a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/ApiWizard.php b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/ApiWizard.php
index a1cfabd48440..afa80892487a 100644
--- a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/ApiWizard.php
+++ b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/ApiWizard.php
@@ -13,7 +13,7 @@ class ApiWizard extends \Magento\Config\Block\System\Config\Form\Field
/**
* Path to block template
*/
- const WIZARD_TEMPLATE = 'system/config/api_wizard.phtml';
+ const WIZARD_TEMPLATE = 'Magento_Paypal::system/config/api_wizard.phtml';
/**
* Set template to itself
diff --git a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/BmlApiWizard.php b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/BmlApiWizard.php
index bdca98e089e7..c481871e1fb0 100644
--- a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/BmlApiWizard.php
+++ b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/BmlApiWizard.php
@@ -11,7 +11,7 @@ class BmlApiWizard extends ApiWizard
/**
* Path to block template
*/
- const WIZARD_TEMPLATE = 'system/config/bml_api_wizard.phtml';
+ const WIZARD_TEMPLATE = 'Magento_Paypal::system/config/bml_api_wizard.phtml';
/**
* Get the button and scripts contents
diff --git a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Payflowlink/Advanced.php b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Payflowlink/Advanced.php
index fe4f6ee1f675..793fad152bc7 100644
--- a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Payflowlink/Advanced.php
+++ b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Payflowlink/Advanced.php
@@ -16,5 +16,5 @@ class Advanced extends \Magento\Paypal\Block\Adminhtml\System\Config\Payflowlink
*
* @var string
*/
- protected $_template = 'system/config/payflowlink/advanced.phtml';
+ protected $_template = 'Magento_Paypal::system/config/payflowlink/advanced.phtml';
}
diff --git a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Payflowlink/Info.php b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Payflowlink/Info.php
index 30119063f5b5..405de1ec0318 100644
--- a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Payflowlink/Info.php
+++ b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Payflowlink/Info.php
@@ -16,7 +16,7 @@ class Info extends \Magento\Config\Block\System\Config\Form\Field
*
* @var string
*/
- protected $_template = 'system/config/payflowlink/info.phtml';
+ protected $_template = 'Magento_Paypal::system/config/payflowlink/info.phtml';
/**
* Render fieldset html
diff --git a/app/code/Magento/Paypal/Block/Hosted/Pro/Form.php b/app/code/Magento/Paypal/Block/Hosted/Pro/Form.php
index 92281d3058ee..70eff8f83ba9 100644
--- a/app/code/Magento/Paypal/Block/Hosted/Pro/Form.php
+++ b/app/code/Magento/Paypal/Block/Hosted/Pro/Form.php
@@ -15,5 +15,5 @@ class Form extends \Magento\Payment\Block\Form
/**
* @var string
*/
- protected $_template = 'hss/info.phtml';
+ protected $_template = 'Magento_Paypal::hss/info.phtml';
}
diff --git a/app/code/Magento/Paypal/Block/Iframe.php b/app/code/Magento/Paypal/Block/Iframe.php
index d6edb1ed2523..e37d9c5ca48a 100644
--- a/app/code/Magento/Paypal/Block/Iframe.php
+++ b/app/code/Magento/Paypal/Block/Iframe.php
@@ -44,7 +44,7 @@ class Iframe extends \Magento\Payment\Block\Form
/**
* @var string
*/
- protected $_template = 'hss/js.phtml';
+ protected $_template = 'Magento_Paypal::hss/js.phtml';
/**
* @var \Magento\Sales\Model\OrderFactory
@@ -116,7 +116,7 @@ protected function _construct()
if ($file && $directory->isExist($directory->getRelativePath($file))) {
$this->setTemplate($templateFile);
} else {
- $this->setTemplate('hss/iframe.phtml');
+ $this->setTemplate('Magento_Paypal::hss/iframe.phtml');
}
}
}
diff --git a/app/code/Magento/Paypal/Block/Payflow/Advanced/Form.php b/app/code/Magento/Paypal/Block/Payflow/Advanced/Form.php
index d777279ad47a..159abd4e2f1b 100644
--- a/app/code/Magento/Paypal/Block/Payflow/Advanced/Form.php
+++ b/app/code/Magento/Paypal/Block/Payflow/Advanced/Form.php
@@ -15,7 +15,7 @@ class Form extends \Magento\Paypal\Block\Payflow\Link\Form
/**
* @var string
*/
- protected $_template = 'payflowadvanced/info.phtml';
+ protected $_template = 'Magento_Paypal::payflowadvanced/info.phtml';
/**
* Get frame action URL
diff --git a/app/code/Magento/Paypal/Block/Payflow/Link/Form.php b/app/code/Magento/Paypal/Block/Payflow/Link/Form.php
index f414a63d6904..fc880f494c85 100644
--- a/app/code/Magento/Paypal/Block/Payflow/Link/Form.php
+++ b/app/code/Magento/Paypal/Block/Payflow/Link/Form.php
@@ -15,7 +15,7 @@ class Form extends \Magento\Payment\Block\Form
/**
* @var string
*/
- protected $_template = 'payflowlink/info.phtml';
+ protected $_template = 'Magento_Paypal::payflowlink/info.phtml';
/**
* Get frame action URL
diff --git a/app/code/Magento/ProductAlert/Block/Email/Price.php b/app/code/Magento/ProductAlert/Block/Email/Price.php
index 982b0f7f6337..0430a21dc8bf 100644
--- a/app/code/Magento/ProductAlert/Block/Email/Price.php
+++ b/app/code/Magento/ProductAlert/Block/Email/Price.php
@@ -15,7 +15,7 @@ class Price extends \Magento\ProductAlert\Block\Email\AbstractEmail
/**
* @var string
*/
- protected $_template = 'email/price.phtml';
+ protected $_template = 'Magento_ProductAlert::email/price.phtml';
/**
* Retrieve unsubscribe url for product
diff --git a/app/code/Magento/ProductAlert/Block/Email/Stock.php b/app/code/Magento/ProductAlert/Block/Email/Stock.php
index f424e7d7125c..d01960b8eb85 100644
--- a/app/code/Magento/ProductAlert/Block/Email/Stock.php
+++ b/app/code/Magento/ProductAlert/Block/Email/Stock.php
@@ -15,7 +15,7 @@ class Stock extends \Magento\ProductAlert\Block\Email\AbstractEmail
/**
* @var string
*/
- protected $_template = 'email/stock.phtml';
+ protected $_template = 'Magento_ProductAlert::email/stock.phtml';
/**
* Retrieve unsubscribe url for product
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Product/Viewed.php b/app/code/Magento/Reports/Block/Adminhtml/Product/Viewed.php
index fc4cffbdca40..f901b32d8b12 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Product/Viewed.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Product/Viewed.php
@@ -17,7 +17,7 @@ class Viewed extends \Magento\Backend\Block\Widget\Grid\Container
/**
* @var string
*/
- protected $_template = 'report/grid/container.phtml';
+ protected $_template = 'Magento_Reports::report/grid/container.phtml';
/**
* @return void
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Sales/Bestsellers.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Bestsellers.php
index d70930d2395a..b773184408a7 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Sales/Bestsellers.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Bestsellers.php
@@ -19,7 +19,7 @@ class Bestsellers extends \Magento\Backend\Block\Widget\Grid\Container
*
* @var string
*/
- protected $_template = 'report/grid/container.phtml';
+ protected $_template = 'Magento_Reports::report/grid/container.phtml';
/**
* {@inheritdoc}
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Sales/Coupons.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Coupons.php
index b8f71158877b..fe85af58b34f 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Sales/Coupons.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Coupons.php
@@ -19,7 +19,7 @@ class Coupons extends \Magento\Backend\Block\Widget\Grid\Container
*
* @var string
*/
- protected $_template = 'report/grid/container.phtml';
+ protected $_template = 'Magento_Reports::report/grid/container.phtml';
/**
* {@inheritdoc}
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Sales/Invoiced.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Invoiced.php
index c96483e33ebe..57594a11bd99 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Sales/Invoiced.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Invoiced.php
@@ -19,7 +19,7 @@ class Invoiced extends \Magento\Backend\Block\Widget\Grid\Container
*
* @var string
*/
- protected $_template = 'report/grid/container.phtml';
+ protected $_template = 'Magento_Reports::report/grid/container.phtml';
/**
* {@inheritdoc}
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Sales/Refunded.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Refunded.php
index 7ff80f62f6be..994b29e6eb0d 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Sales/Refunded.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Refunded.php
@@ -19,7 +19,7 @@ class Refunded extends \Magento\Backend\Block\Widget\Grid\Container
*
* @var string
*/
- protected $_template = 'report/grid/container.phtml';
+ protected $_template = 'Magento_Reports::report/grid/container.phtml';
/**
* {@inheritdoc}
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Sales/Sales.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Sales.php
index 5abea45e657d..64375ace3e94 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Sales/Sales.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Sales.php
@@ -19,7 +19,7 @@ class Sales extends \Magento\Backend\Block\Widget\Grid\Container
*
* @var string
*/
- protected $_template = 'report/grid/container.phtml';
+ protected $_template = 'Magento_Reports::report/grid/container.phtml';
/**
* {@inheritdoc}
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Sales/Shipping.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Shipping.php
index 44dd4521c7bb..e4dbdc273774 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Sales/Shipping.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Shipping.php
@@ -19,7 +19,7 @@ class Shipping extends \Magento\Backend\Block\Widget\Grid\Container
*
* @var string
*/
- protected $_template = 'report/grid/container.phtml';
+ protected $_template = 'Magento_Reports::report/grid/container.phtml';
/**
* {@inheritdoc}
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Sales/Tax.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Tax.php
index 38de08314d25..fa9e63745a87 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Sales/Tax.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Tax.php
@@ -19,7 +19,7 @@ class Tax extends \Magento\Backend\Block\Widget\Grid\Container
*
* @var string
*/
- protected $_template = 'report/grid/container.phtml';
+ protected $_template = 'Magento_Reports::report/grid/container.phtml';
/**
* {@inheritdoc}
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Wishlist.php b/app/code/Magento/Reports/Block/Adminhtml/Wishlist.php
index 28f2011de336..1ca76cb1cf95 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Wishlist.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Wishlist.php
@@ -18,7 +18,7 @@ class Wishlist extends \Magento\Backend\Block\Template
*
* @var string
*/
- protected $_template = 'report/wishlist.phtml';
+ protected $_template = 'Magento_Reports::report/wishlist.phtml';
/**
* Reports wishlist collection factory
diff --git a/app/code/Magento/Review/Block/Adminhtml/Rating/Edit/Tab/Form.php b/app/code/Magento/Review/Block/Adminhtml/Rating/Edit/Tab/Form.php
index 084138825290..dbf0a79bc42f 100644
--- a/app/code/Magento/Review/Block/Adminhtml/Rating/Edit/Tab/Form.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Rating/Edit/Tab/Form.php
@@ -17,7 +17,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
/**
* @var string
*/
- protected $_template = 'rating/form.phtml';
+ protected $_template = 'Magento_Review::rating/form.phtml';
/**
* Session
diff --git a/app/code/Magento/Review/Block/Adminhtml/Rss/Grid/Link.php b/app/code/Magento/Review/Block/Adminhtml/Rss/Grid/Link.php
index 5d2ec9fc186c..def0e896fc95 100644
--- a/app/code/Magento/Review/Block/Adminhtml/Rss/Grid/Link.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Rss/Grid/Link.php
@@ -16,7 +16,7 @@ class Link extends \Magento\Framework\View\Element\Template
/**
* @var string
*/
- protected $_template = 'rss/grid/link.phtml';
+ protected $_template = 'Magento_Review::rss/grid/link.phtml';
/**
* @var \Magento\Framework\App\Rss\UrlBuilderInterface
diff --git a/app/code/Magento/Review/Block/Customer/Recent.php b/app/code/Magento/Review/Block/Customer/Recent.php
index 8f593f569581..5c7f1ec2c0da 100644
--- a/app/code/Magento/Review/Block/Customer/Recent.php
+++ b/app/code/Magento/Review/Block/Customer/Recent.php
@@ -20,7 +20,7 @@ class Recent extends \Magento\Framework\View\Element\Template
*
* @var string
*/
- protected $_template = 'customer/list.phtml';
+ protected $_template = 'Magento_Review::customer/list.phtml';
/**
* Product reviews collection
diff --git a/app/code/Magento/Review/Block/Customer/View.php b/app/code/Magento/Review/Block/Customer/View.php
index b7dfd4b969a9..237b972f1657 100644
--- a/app/code/Magento/Review/Block/Customer/View.php
+++ b/app/code/Magento/Review/Block/Customer/View.php
@@ -23,7 +23,7 @@ class View extends \Magento\Catalog\Block\Product\AbstractProduct
*
* @var string
*/
- protected $_template = 'customer/view.phtml';
+ protected $_template = 'Magento_Review::customer/view.phtml';
/**
* Catalog product model
diff --git a/app/code/Magento/Review/Block/Form.php b/app/code/Magento/Review/Block/Form.php
index 440e13deb583..c6dfad8265ac 100644
--- a/app/code/Magento/Review/Block/Form.php
+++ b/app/code/Magento/Review/Block/Form.php
@@ -139,7 +139,7 @@ protected function _construct()
);
}
- $this->setTemplate('form.phtml');
+ $this->setTemplate('Magento_Review::form.phtml');
}
/**
diff --git a/app/code/Magento/Review/Block/Rating/Entity/Detailed.php b/app/code/Magento/Review/Block/Rating/Entity/Detailed.php
index de871d906142..eee00483ace6 100644
--- a/app/code/Magento/Review/Block/Rating/Entity/Detailed.php
+++ b/app/code/Magento/Review/Block/Rating/Entity/Detailed.php
@@ -15,7 +15,7 @@ class Detailed extends \Magento\Framework\View\Element\Template
/**
* @var string
*/
- protected $_template = 'detailed.phtml';
+ protected $_template = 'Magento_Review::detailed.phtml';
/**
* @var \Magento\Review\Model\RatingFactory
@@ -49,7 +49,7 @@ protected function _toHtml()
$reviewsCount = $this->_ratingFactory->create()->getTotalReviews($entityId, true);
if ($reviewsCount == 0) {
#return __('Be the first to review this product');
- $this->setTemplate('empty.phtml');
+ $this->setTemplate('Magento_Review::empty.phtml');
return parent::_toHtml();
}
diff --git a/app/code/Magento/Review/Block/View.php b/app/code/Magento/Review/Block/View.php
index e2d035567168..95b7176b48c4 100644
--- a/app/code/Magento/Review/Block/View.php
+++ b/app/code/Magento/Review/Block/View.php
@@ -19,7 +19,7 @@ class View extends \Magento\Catalog\Block\Product\AbstractProduct
*
* @var string
*/
- protected $_template = 'view.phtml';
+ protected $_template = 'Magento_Review::view.phtml';
/**
* Rating option model
diff --git a/app/code/Magento/Rss/Block/Feeds.php b/app/code/Magento/Rss/Block/Feeds.php
index 2e88d25c0289..86998f87f5c1 100644
--- a/app/code/Magento/Rss/Block/Feeds.php
+++ b/app/code/Magento/Rss/Block/Feeds.php
@@ -16,7 +16,7 @@ class Feeds extends \Magento\Framework\View\Element\Template
/**
* @var string
*/
- protected $_template = 'feeds.phtml';
+ protected $_template = 'Magento_Rss::feeds.phtml';
/**
* @var \Magento\Framework\App\Rss\RssManagerInterface
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Address/Form.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Address/Form.php
index f2b454260dc2..6cab109b44db 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Address/Form.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Address/Form.php
@@ -19,7 +19,7 @@ class Form extends \Magento\Sales\Block\Adminhtml\Order\Create\Form\Address
*
* @var string
*/
- protected $_template = 'order/address/form.phtml';
+ protected $_template = 'Magento_Sales::order/address/form.phtml';
/**
* Core registry
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Grandtotal.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Grandtotal.php
index eb437915ad66..cf9f8a44dee2 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Grandtotal.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Grandtotal.php
@@ -20,7 +20,7 @@ class Grandtotal extends \Magento\Sales\Block\Adminhtml\Order\Create\Totals\Defa
*
* @var string
*/
- protected $_template = 'order/create/totals/grandtotal.phtml';
+ protected $_template = 'Magento_Sales::order/create/totals/grandtotal.phtml';
/**
* Tax config
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Shipping.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Shipping.php
index 9225d8c2e5f6..34a9ed8070e2 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Shipping.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Shipping.php
@@ -20,7 +20,7 @@ class Shipping extends \Magento\Sales\Block\Adminhtml\Order\Create\Totals\Defaul
*
* @var string
*/
- protected $_template = 'order/create/totals/shipping.phtml';
+ protected $_template = 'Magento_Sales::order/create/totals/shipping.phtml';
/**
* Tax config
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Subtotal.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Subtotal.php
index cfdd73de9d8b..166f3c9637eb 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Subtotal.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Subtotal.php
@@ -20,7 +20,7 @@ class Subtotal extends \Magento\Sales\Block\Adminhtml\Order\Create\Totals\Defaul
*
* @var string
*/
- protected $_template = 'order/create/totals/subtotal.phtml';
+ protected $_template = 'Magento_Sales::order/create/totals/subtotal.phtml';
/**
* Tax config
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Tax.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Tax.php
index d3da37c3f1bf..207a4eca6021 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Tax.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Tax.php
@@ -18,5 +18,5 @@ class Tax extends \Magento\Sales\Block\Adminhtml\Order\Create\Totals\DefaultTota
*
* @var string
*/
- protected $_template = 'order/create/totals/tax.phtml';
+ protected $_template = 'Magento_Sales::order/create/totals/tax.phtml';
}
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Details.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Details.php
index 5c3a7fce805c..261f4b0cfd12 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Details.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Details.php
@@ -14,5 +14,5 @@ class Details extends \Magento\Framework\View\Element\Template
/**
* @var string
*/
- protected $_template = 'order/details.phtml';
+ protected $_template = 'Magento_Sales::order/details.phtml';
}
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Form.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Form.php
index 82c3effcab62..6c06e9d624c8 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Form.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Form.php
@@ -17,5 +17,5 @@ class Form extends \Magento\Backend\Block\Template
*
* @var string
*/
- protected $_template = 'order/view/form.phtml';
+ protected $_template = 'Magento_Sales::order/view/form.phtml';
}
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/History.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/History.php
index 5489a0b2e513..64b53d10d4af 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/History.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/History.php
@@ -18,7 +18,7 @@ class History extends \Magento\Backend\Block\Template implements \Magento\Backen
*
* @var string
*/
- protected $_template = 'order/view/tab/history.phtml';
+ protected $_template = 'Magento_Sales::order/view/tab/history.phtml';
/**
* Core registry
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Rss/Order/Grid/Link.php b/app/code/Magento/Sales/Block/Adminhtml/Rss/Order/Grid/Link.php
index fbb78970a4de..512539824da2 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Rss/Order/Grid/Link.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Rss/Order/Grid/Link.php
@@ -14,7 +14,7 @@ class Link extends \Magento\Framework\View\Element\Template
/**
* @var string
*/
- protected $_template = 'rss/order/grid/link.phtml';
+ protected $_template = 'Magento_Sales::rss/order/grid/link.phtml';
/**
* @var \Magento\Framework\App\Rss\UrlBuilderInterface
diff --git a/app/code/Magento/Sales/Block/Order/Info/Buttons.php b/app/code/Magento/Sales/Block/Order/Info/Buttons.php
index a27b55cd8543..18e79f6a76ec 100644
--- a/app/code/Magento/Sales/Block/Order/Info/Buttons.php
+++ b/app/code/Magento/Sales/Block/Order/Info/Buttons.php
@@ -20,7 +20,7 @@ class Buttons extends \Magento\Framework\View\Element\Template
/**
* @var string
*/
- protected $_template = 'order/info/buttons.phtml';
+ protected $_template = 'Magento_Sales::order/info/buttons.phtml';
/**
* Core registry
diff --git a/app/code/Magento/Sales/Block/Order/Info/Buttons/Rss.php b/app/code/Magento/Sales/Block/Order/Info/Buttons/Rss.php
index 77e20eaa8d07..2b84b8f1444b 100644
--- a/app/code/Magento/Sales/Block/Order/Info/Buttons/Rss.php
+++ b/app/code/Magento/Sales/Block/Order/Info/Buttons/Rss.php
@@ -16,7 +16,7 @@ class Rss extends \Magento\Framework\View\Element\Template
/**
* @var string
*/
- protected $_template = 'order/info/buttons/rss.phtml';
+ protected $_template = 'Magento_Sales::order/info/buttons/rss.phtml';
/**
* @var \Magento\Sales\Model\OrderFactory
diff --git a/app/code/Magento/Sales/Block/Order/Invoice.php b/app/code/Magento/Sales/Block/Order/Invoice.php
index 2d8448ea5bc9..24ddf4bac769 100644
--- a/app/code/Magento/Sales/Block/Order/Invoice.php
+++ b/app/code/Magento/Sales/Block/Order/Invoice.php
@@ -18,7 +18,7 @@ class Invoice extends \Magento\Sales\Block\Order\Invoice\Items
/**
* @var string
*/
- protected $_template = 'order/invoice.phtml';
+ protected $_template = 'Magento_Sales::order/invoice.phtml';
/**
* @var \Magento\Framework\App\Http\Context
diff --git a/app/code/Magento/Sales/Block/Order/View.php b/app/code/Magento/Sales/Block/Order/View.php
index 870e2e15ab7b..03d1340e0f69 100644
--- a/app/code/Magento/Sales/Block/Order/View.php
+++ b/app/code/Magento/Sales/Block/Order/View.php
@@ -18,7 +18,7 @@ class View extends \Magento\Framework\View\Element\Template
/**
* @var string
*/
- protected $_template = 'order/view.phtml';
+ protected $_template = 'Magento_Sales::order/view.phtml';
/**
* Core registry
diff --git a/app/code/Magento/Shipping/Block/Adminhtml/Order/Packaging/Grid.php b/app/code/Magento/Shipping/Block/Adminhtml/Order/Packaging/Grid.php
index 9e340cc31ff1..1d3f6ad1ee5a 100644
--- a/app/code/Magento/Shipping/Block/Adminhtml/Order/Packaging/Grid.php
+++ b/app/code/Magento/Shipping/Block/Adminhtml/Order/Packaging/Grid.php
@@ -10,7 +10,7 @@ class Grid extends \Magento\Backend\Block\Template
/**
* @var string
*/
- protected $_template = 'order/packaging/grid.phtml';
+ protected $_template = 'Magento_Shipping::order/packaging/grid.phtml';
/**
* Core registry
diff --git a/app/code/Magento/Shipping/Block/Order/Shipment.php b/app/code/Magento/Shipping/Block/Order/Shipment.php
index 653fb357f0b1..21e960985d6b 100644
--- a/app/code/Magento/Shipping/Block/Order/Shipment.php
+++ b/app/code/Magento/Shipping/Block/Order/Shipment.php
@@ -18,7 +18,7 @@ class Shipment extends \Magento\Framework\View\Element\Template
/**
* @var string
*/
- protected $_template = 'order/shipment.phtml';
+ protected $_template = 'Magento_Shipping::order/shipment.phtml';
/**
* Core registry
diff --git a/app/code/Magento/Signifyd/Block/Fingerprint.php b/app/code/Magento/Signifyd/Block/Fingerprint.php
index db76fc6c9446..f43bffce1fc1 100644
--- a/app/code/Magento/Signifyd/Block/Fingerprint.php
+++ b/app/code/Magento/Signifyd/Block/Fingerprint.php
@@ -42,7 +42,7 @@ class Fingerprint extends Template
* @var string
* @since 100.2.0
*/
- protected $_template = 'fingerprint.phtml';
+ protected $_template = 'Magento_Signifyd::fingerprint.phtml';
/**
* @param Context $context
diff --git a/app/code/Magento/Tax/Block/Adminhtml/Rate/Form.php b/app/code/Magento/Tax/Block/Adminhtml/Rate/Form.php
index 96fc9a40d53d..450203486f36 100644
--- a/app/code/Magento/Tax/Block/Adminhtml/Rate/Form.php
+++ b/app/code/Magento/Tax/Block/Adminhtml/Rate/Form.php
@@ -31,7 +31,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
/**
* @var string
*/
- protected $_template = 'rate/form.phtml';
+ protected $_template = 'Magento_Tax::rate/form.phtml';
/**
* Tax data
diff --git a/app/code/Magento/Tax/Block/Adminhtml/Rate/Title.php b/app/code/Magento/Tax/Block/Adminhtml/Rate/Title.php
index e1e866c06571..9612b57f8d5d 100644
--- a/app/code/Magento/Tax/Block/Adminhtml/Rate/Title.php
+++ b/app/code/Magento/Tax/Block/Adminhtml/Rate/Title.php
@@ -23,7 +23,7 @@ class Title extends \Magento\Framework\View\Element\Template
/**
* @var string
*/
- protected $_template = 'rate/title.phtml';
+ protected $_template = 'Magento_Tax::rate/title.phtml';
/**
* @var \Magento\Store\Model\StoreFactory
diff --git a/app/code/Magento/Tax/Block/Adminhtml/Rate/Toolbar/Add.php b/app/code/Magento/Tax/Block/Adminhtml/Rate/Toolbar/Add.php
index 9cf96bc21e96..16d828542c5b 100644
--- a/app/code/Magento/Tax/Block/Adminhtml/Rate/Toolbar/Add.php
+++ b/app/code/Magento/Tax/Block/Adminhtml/Rate/Toolbar/Add.php
@@ -20,7 +20,7 @@ class Add extends \Magento\Backend\Block\Template implements \Magento\Backend\Bl
/**
* @var string
*/
- protected $_template = 'toolbar/rate/add.phtml';
+ protected $_template = 'Magento_Tax::toolbar/rate/add.phtml';
/**
* @var \Magento\Backend\Block\Widget\Button\ButtonList
diff --git a/app/code/Magento/Tax/Block/Adminhtml/Rate/Toolbar/Save.php b/app/code/Magento/Tax/Block/Adminhtml/Rate/Toolbar/Save.php
index 19c5fab72ac4..4eaaa3be8a8f 100644
--- a/app/code/Magento/Tax/Block/Adminhtml/Rate/Toolbar/Save.php
+++ b/app/code/Magento/Tax/Block/Adminhtml/Rate/Toolbar/Save.php
@@ -16,7 +16,7 @@ class Save extends \Magento\Backend\Block\Template implements \Magento\Backend\B
/**
* @var string
*/
- protected $_template = 'toolbar/rate/save.phtml';
+ protected $_template = 'Magento_Tax::toolbar/rate/save.phtml';
/**
* @var \Magento\Backend\Block\Widget\Button\ButtonList
diff --git a/app/code/Magento/Tax/Block/Checkout/Grandtotal.php b/app/code/Magento/Tax/Block/Checkout/Grandtotal.php
index 68de4cb24a48..77af1ad99ea2 100644
--- a/app/code/Magento/Tax/Block/Checkout/Grandtotal.php
+++ b/app/code/Magento/Tax/Block/Checkout/Grandtotal.php
@@ -15,7 +15,7 @@ class Grandtotal extends \Magento\Checkout\Block\Total\DefaultTotal
*
* @var string
*/
- protected $_template = 'checkout/grandtotal.phtml';
+ protected $_template = 'Magento_Tax::checkout/grandtotal.phtml';
/**
* @var \Magento\Tax\Model\Config
diff --git a/app/code/Magento/Tax/Block/Checkout/Shipping.php b/app/code/Magento/Tax/Block/Checkout/Shipping.php
index e9098035053b..299c586fd224 100644
--- a/app/code/Magento/Tax/Block/Checkout/Shipping.php
+++ b/app/code/Magento/Tax/Block/Checkout/Shipping.php
@@ -15,7 +15,7 @@ class Shipping extends \Magento\Checkout\Block\Total\DefaultTotal
*
* @var string
*/
- protected $_template = 'checkout/shipping.phtml';
+ protected $_template = 'Magento_Tax::checkout/shipping.phtml';
/**
* @var \Magento\Tax\Model\Config
diff --git a/app/code/Magento/Tax/Block/Checkout/Subtotal.php b/app/code/Magento/Tax/Block/Checkout/Subtotal.php
index 7a9059df08ba..22da07954159 100644
--- a/app/code/Magento/Tax/Block/Checkout/Subtotal.php
+++ b/app/code/Magento/Tax/Block/Checkout/Subtotal.php
@@ -15,7 +15,7 @@ class Subtotal extends \Magento\Checkout\Block\Total\DefaultTotal
*
* @var string
*/
- protected $_template = 'checkout/subtotal.phtml';
+ protected $_template = 'Magento_Tax::checkout/subtotal.phtml';
/**
* @var \Magento\Tax\Model\Config
diff --git a/app/code/Magento/Tax/Block/Checkout/Tax.php b/app/code/Magento/Tax/Block/Checkout/Tax.php
index f741e64019de..0a86c0312ab1 100644
--- a/app/code/Magento/Tax/Block/Checkout/Tax.php
+++ b/app/code/Magento/Tax/Block/Checkout/Tax.php
@@ -14,5 +14,5 @@ class Tax extends \Magento\Checkout\Block\Total\DefaultTotal
/**
* @var string
*/
- protected $_template = 'checkout/tax.phtml';
+ protected $_template = 'Magento_Tax::checkout/tax.phtml';
}
diff --git a/app/code/Magento/Tax/Plugin/Checkout/CustomerData/Cart.php b/app/code/Magento/Tax/Plugin/Checkout/CustomerData/Cart.php
index 87f65ef311ac..fb6c5e7b431e 100644
--- a/app/code/Magento/Tax/Plugin/Checkout/CustomerData/Cart.php
+++ b/app/code/Magento/Tax/Plugin/Checkout/CustomerData/Cart.php
@@ -66,7 +66,7 @@ public function afterGetSectionData(\Magento\Checkout\CustomerData\Cart $subject
foreach ($result['items'] as $key => $itemAsArray) {
if ($item = $this->findItemById($itemAsArray['item_id'], $items)) {
$this->itemPriceRenderer->setItem($item);
- $this->itemPriceRenderer->setTemplate('checkout/cart/item/price/sidebar.phtml');
+ $this->itemPriceRenderer->setTemplate('Magento_Tax::checkout/cart/item/price/sidebar.phtml');
$result['items'][$key]['product_price']=$this->itemPriceRenderer->toHtml();
}
}
diff --git a/app/code/Magento/TaxImportExport/Block/Adminhtml/Rate/ImportExport.php b/app/code/Magento/TaxImportExport/Block/Adminhtml/Rate/ImportExport.php
index a42877b3ecf8..ab64567f4fe2 100644
--- a/app/code/Magento/TaxImportExport/Block/Adminhtml/Rate/ImportExport.php
+++ b/app/code/Magento/TaxImportExport/Block/Adminhtml/Rate/ImportExport.php
@@ -14,7 +14,7 @@ class ImportExport extends \Magento\Backend\Block\Widget
/**
* @var string
*/
- protected $_template = 'importExport.phtml';
+ protected $_template = 'Magento_TaxImportExport::importExport.phtml';
/**
* @param \Magento\Backend\Block\Template\Context $context
diff --git a/app/code/Magento/TaxImportExport/Block/Adminhtml/Rate/ImportExportHeader.php b/app/code/Magento/TaxImportExport/Block/Adminhtml/Rate/ImportExportHeader.php
index 8897e9b2083e..e223adc3adb1 100644
--- a/app/code/Magento/TaxImportExport/Block/Adminhtml/Rate/ImportExportHeader.php
+++ b/app/code/Magento/TaxImportExport/Block/Adminhtml/Rate/ImportExportHeader.php
@@ -16,5 +16,5 @@ class ImportExportHeader extends \Magento\Backend\Block\Widget
*
* @var string
*/
- protected $_template = 'importExportHeader.phtml';
+ protected $_template = 'Magento_TaxImportExport::importExportHeader.phtml';
}
diff --git a/app/code/Magento/Theme/Block/Adminhtml/Wysiwyg/Files/Content/Uploader.php b/app/code/Magento/Theme/Block/Adminhtml/Wysiwyg/Files/Content/Uploader.php
index 8e7f4c9cc680..e99500dbd069 100644
--- a/app/code/Magento/Theme/Block/Adminhtml/Wysiwyg/Files/Content/Uploader.php
+++ b/app/code/Magento/Theme/Block/Adminhtml/Wysiwyg/Files/Content/Uploader.php
@@ -19,7 +19,7 @@ class Uploader extends \Magento\Backend\Block\Media\Uploader
*
* @var string
*/
- protected $_template = 'browser/content/uploader.phtml';
+ protected $_template = 'Magento_Theme::browser/content/uploader.phtml';
/**
* @var \Magento\Theme\Helper\Storage
diff --git a/app/code/Magento/Theme/Block/Html/Breadcrumbs.php b/app/code/Magento/Theme/Block/Html/Breadcrumbs.php
index c1f8ea620ef4..cff87fc8726b 100644
--- a/app/code/Magento/Theme/Block/Html/Breadcrumbs.php
+++ b/app/code/Magento/Theme/Block/Html/Breadcrumbs.php
@@ -21,7 +21,7 @@ class Breadcrumbs extends \Magento\Framework\View\Element\Template
*
* @var string
*/
- protected $_template = 'html/breadcrumbs.phtml';
+ protected $_template = 'Magento_Theme::html/breadcrumbs.phtml';
/**
* List of available breadcrumb properties
diff --git a/app/code/Magento/Theme/Block/Html/Header.php b/app/code/Magento/Theme/Block/Html/Header.php
index f597b4034da9..2663a4da1501 100644
--- a/app/code/Magento/Theme/Block/Html/Header.php
+++ b/app/code/Magento/Theme/Block/Html/Header.php
@@ -19,7 +19,7 @@ class Header extends \Magento\Framework\View\Element\Template
*
* @var string
*/
- protected $_template = 'html/header.phtml';
+ protected $_template = 'Magento_Theme::html/header.phtml';
/**
* Retrieve welcome text
diff --git a/app/code/Magento/Theme/Block/Html/Header/Logo.php b/app/code/Magento/Theme/Block/Html/Header/Logo.php
index 5b0c2eaf04c4..0a0e71f44ba3 100644
--- a/app/code/Magento/Theme/Block/Html/Header/Logo.php
+++ b/app/code/Magento/Theme/Block/Html/Header/Logo.php
@@ -19,7 +19,7 @@ class Logo extends \Magento\Framework\View\Element\Template
*
* @var string
*/
- protected $_template = 'html/header/logo.phtml';
+ protected $_template = 'Magento_Theme::html/header/logo.phtml';
/**
* @var \Magento\MediaStorage\Helper\File\Storage\Database
diff --git a/app/code/Magento/UrlRewrite/Block/Catalog/Category/Tree.php b/app/code/Magento/UrlRewrite/Block/Catalog/Category/Tree.php
index 64a775b01593..e34d4773c271 100644
--- a/app/code/Magento/UrlRewrite/Block/Catalog/Category/Tree.php
+++ b/app/code/Magento/UrlRewrite/Block/Catalog/Category/Tree.php
@@ -27,7 +27,7 @@ class Tree extends \Magento\Catalog\Block\Adminhtml\Category\AbstractCategory
/**
* @var string
*/
- protected $_template = 'categories.phtml';
+ protected $_template = 'Magento_UrlRewrite::categories.phtml';
/**
* Adminhtml data
diff --git a/app/code/Magento/UrlRewrite/Block/Edit.php b/app/code/Magento/UrlRewrite/Block/Edit.php
index baee8af89308..210ed5189eb4 100644
--- a/app/code/Magento/UrlRewrite/Block/Edit.php
+++ b/app/code/Magento/UrlRewrite/Block/Edit.php
@@ -65,7 +65,7 @@ public function __construct(
*/
protected function _prepareLayout()
{
- $this->setTemplate('edit.phtml');
+ $this->setTemplate('Magento_UrlRewrite::edit.phtml');
$this->_addBackButton();
$this->_prepareLayoutFeatures();
diff --git a/app/code/Magento/UrlRewrite/Block/Selector.php b/app/code/Magento/UrlRewrite/Block/Selector.php
index 0a28ba215de5..75266fd2f977 100644
--- a/app/code/Magento/UrlRewrite/Block/Selector.php
+++ b/app/code/Magento/UrlRewrite/Block/Selector.php
@@ -18,7 +18,7 @@ class Selector extends \Magento\Backend\Block\Template
/**
* @var string
*/
- protected $_template = 'selector.phtml';
+ protected $_template = 'Magento_UrlRewrite::selector.phtml';
/**
* Set block template and get available modes
diff --git a/app/code/Magento/User/Block/Role/Tab/Edit.php b/app/code/Magento/User/Block/Role/Tab/Edit.php
index 45d725c61bd5..5fe6a1b2a2e8 100644
--- a/app/code/Magento/User/Block/Role/Tab/Edit.php
+++ b/app/code/Magento/User/Block/Role/Tab/Edit.php
@@ -19,7 +19,7 @@ class Edit extends \Magento\Backend\Block\Widget\Form implements \Magento\Backen
/**
* @var string
*/
- protected $_template = 'role/edit.phtml';
+ protected $_template = 'Magento_User::role/edit.phtml';
/**
* Root ACL Resource
diff --git a/app/code/Magento/User/Block/Role/Tab/Users.php b/app/code/Magento/User/Block/Role/Tab/Users.php
index 27604c9aed29..ff6349d7ee25 100644
--- a/app/code/Magento/User/Block/Role/Tab/Users.php
+++ b/app/code/Magento/User/Block/Role/Tab/Users.php
@@ -45,7 +45,9 @@ protected function _construct()
$roleId = $this->getRequest()->getParam('rid', false);
/** @var \Magento\User\Model\ResourceModel\User\Collection $users */
$users = $this->_userCollectionFactory->create()->load();
- $this->setTemplate('role/users.phtml')->assign('users', $users->getItems())->assign('roleId', $roleId);
+ $this->setTemplate('Magento_User::role/users.phtml')
+ ->assign('users', $users->getItems())
+ ->assign('roleId', $roleId);
}
/**
diff --git a/app/code/Magento/Weee/Block/Renderer/Weee/Tax.php b/app/code/Magento/Weee/Block/Renderer/Weee/Tax.php
index ab6710fddcac..94a6faf72aa9 100644
--- a/app/code/Magento/Weee/Block/Renderer/Weee/Tax.php
+++ b/app/code/Magento/Weee/Block/Renderer/Weee/Tax.php
@@ -32,7 +32,7 @@ class Tax extends \Magento\Backend\Block\Widget implements
/**
* @var string
*/
- protected $_template = 'renderer/tax.phtml';
+ protected $_template = 'Magento_Weee::renderer/tax.phtml';
/**
* Core registry
diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main/Layout.php b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main/Layout.php
index 49345f29afd5..c48bf9e7e4c7 100644
--- a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main/Layout.php
+++ b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main/Layout.php
@@ -27,7 +27,7 @@ class Layout extends Template implements RendererInterface
/**
* @var string
*/
- protected $_template = 'instance/edit/layout.phtml';
+ protected $_template = 'Magento_Widget::instance/edit/layout.phtml';
/**
* @var \Magento\Catalog\Model\Product\Type
diff --git a/app/code/Magento/Wishlist/Block/Share/Email/Items.php b/app/code/Magento/Wishlist/Block/Share/Email/Items.php
index bc84f6a43df3..d4e6587fd651 100644
--- a/app/code/Magento/Wishlist/Block/Share/Email/Items.php
+++ b/app/code/Magento/Wishlist/Block/Share/Email/Items.php
@@ -20,7 +20,7 @@ class Items extends \Magento\Wishlist\Block\AbstractBlock
/**
* @var string
*/
- protected $_template = 'email/items.phtml';
+ protected $_template = 'Magento_Wishlist::email/items.phtml';
/**
* Retrieve Product View URL