From 01e9cb4ff864053739e4472f0699b1720f2bdc0b Mon Sep 17 00:00:00 2001 From: David Alger Date: Tue, 6 Jun 2017 09:54:44 -0500 Subject: [PATCH 1/7] Convert long form tags with echo to short-echo tags Also unify existing short-echo padding. Resolves #107. PR #1563. --- .../adminhtml/templates/system/messages.phtml | 6 +- .../templates/system/messages/popup.phtml | 2 +- .../adminhtml/templates/toolbar_entry.phtml | 2 +- .../templates/dashboard/section.phtml | 14 +- .../templates/directpost/iframe.phtml | 6 +- .../adminhtml/templates/directpost/info.phtml | 30 ++-- .../order/view/info/fraud_details.phtml | 24 ++-- .../adminhtml/templates/admin/login.phtml | 4 +- .../templates/admin/overlay_popup.phtml | 14 +- .../view/adminhtml/templates/admin/page.phtml | 32 ++--- .../adminhtml/templates/dashboard/graph.phtml | 4 +- .../adminhtml/templates/dashboard/grid.phtml | 8 +- .../adminhtml/templates/dashboard/index.phtml | 20 +-- .../templates/dashboard/store/switcher.phtml | 2 +- .../totalbar/refreshstatistics.phtml | 10 +- .../adminhtml/templates/media/uploader.phtml | 4 +- .../adminhtml/templates/page/header.phtml | 16 +-- .../templates/page/js/calendar.phtml | 4 +- .../templates/page/js/components.phtml | 2 +- .../adminhtml/templates/pageactions.phtml | 2 +- .../adminhtml/templates/store/switcher.phtml | 30 ++-- .../switcher/form/renderer/fieldset.phtml | 14 +- .../form/renderer/fieldset/element.phtml | 10 +- .../templates/system/autocomplete.phtml | 4 +- .../templates/system/cache/additional.phtml | 2 +- .../templates/system/cache/edit.phtml | 6 +- .../templates/system/design/edit.phtml | 2 +- .../templates/system/design/index.phtml | 2 +- .../templates/widget/accordion.phtml | 6 +- .../templates/widget/breadcrumbs.phtml | 6 +- .../adminhtml/templates/widget/button.phtml | 4 +- .../templates/widget/button/split.phtml | 16 +-- .../adminhtml/templates/widget/form.phtml | 4 +- .../templates/widget/form/container.phtml | 6 +- .../templates/widget/form/element.phtml | 28 ++-- .../widget/form/element/gallery.phtml | 12 +- .../widget/form/renderer/element.phtml | 4 +- .../widget/form/renderer/fieldset.phtml | 24 ++-- .../form/renderer/fieldset/element.phtml | 8 +- .../adminhtml/templates/widget/grid.phtml | 40 +++--- .../templates/widget/grid/column_set.phtml | 26 ++-- .../templates/widget/grid/container.phtml | 4 +- .../widget/grid/container/empty.phtml | 2 +- .../templates/widget/grid/export.phtml | 2 +- .../templates/widget/grid/extended.phtml | 50 +++---- .../templates/widget/grid/massaction.phtml | 26 ++-- .../widget/grid/massaction_extended.phtml | 26 ++-- .../adminhtml/templates/widget/tabsleft.phtml | 2 +- .../templates/widget/view/container.phtml | 4 +- .../adminhtml/templates/backup/dialogs.phtml | 4 +- .../adminhtml/templates/backup/list.phtml | 6 +- .../view/adminhtml/templates/form/cc.phtml | 20 +-- .../templates/form/paypal/vault.phtml | 14 +- .../view/adminhtml/templates/form/vault.phtml | 20 +-- .../templates/paypal/vault_token.phtml | 18 +-- .../product/edit/tab/attributes/extend.phtml | 14 +- .../composite/fieldset/options/bundle.phtml | 4 +- .../fieldset/options/type/checkbox.phtml | 6 +- .../fieldset/options/type/multi.phtml | 2 +- .../fieldset/options/type/radio.phtml | 6 +- .../fieldset/options/type/select.phtml | 2 +- .../templates/product/edit/bundle.phtml | 4 +- .../product/edit/bundle/option.phtml | 10 +- .../edit/bundle/option/selection.phtml | 10 +- .../creditmemo/create/items/renderer.phtml | 18 +-- .../creditmemo/view/items/renderer.phtml | 18 +-- .../sales/invoice/create/items/renderer.phtml | 18 +-- .../sales/invoice/view/items/renderer.phtml | 18 +-- .../sales/order/view/items/renderer.phtml | 18 +-- .../shipment/create/items/renderer.phtml | 14 +- .../sales/shipment/view/items/renderer.phtml | 12 +- .../catalog/product/view/summary.phtml | 6 +- .../catalog/product/view/type/bundle.phtml | 2 +- .../view/type/bundle/option/checkbox.phtml | 4 +- .../view/type/bundle/option/multi.phtml | 4 +- .../view/type/bundle/option/radio.phtml | 14 +- .../view/type/bundle/option/select.phtml | 4 +- .../product/view/type/bundle/options.phtml | 4 +- .../order/items/creditmemo/default.phtml | 4 +- .../email/order/items/invoice/default.phtml | 4 +- .../email/order/items/order/default.phtml | 12 +- .../email/order/items/shipment/default.phtml | 4 +- .../frontend/templates/js/components.phtml | 2 +- .../order/creditmemo/items/renderer.phtml | 32 ++--- .../sales/order/invoice/items/renderer.phtml | 26 ++-- .../sales/order/items/renderer.phtml | 26 ++-- .../sales/order/shipment/items/renderer.phtml | 18 +-- .../view/adminhtml/templates/default.phtml | 16 +-- .../view/frontend/templates/default.phtml | 22 +-- .../frontend/templates/js/components.phtml | 2 +- .../catalog/category/checkboxes/tree.phtml | 8 +- .../category/edit/assign_products.phtml | 2 +- .../templates/catalog/category/tree.phtml | 14 +- .../catalog/category/widget/tree.phtml | 8 +- .../form/renderer/fieldset/element.phtml | 16 +-- .../adminhtml/templates/catalog/product.phtml | 2 +- .../catalog/product/attribute/form.phtml | 8 +- .../catalog/product/attribute/labels.phtml | 2 +- .../catalog/product/attribute/options.phtml | 28 ++-- .../catalog/product/attribute/set/main.phtml | 16 +-- .../product/attribute/set/toolbar/add.phtml | 2 +- .../product/attribute/set/toolbar/main.phtml | 2 +- .../product/composite/fieldset/options.phtml | 6 +- .../fieldset/options/type/date.phtml | 10 +- .../fieldset/options/type/default.phtml | 2 +- .../fieldset/options/type/file.phtml | 8 +- .../fieldset/options/type/select.phtml | 4 +- .../fieldset/options/type/text.phtml | 6 +- .../product/composite/fieldset/qty.phtml | 2 +- .../templates/catalog/product/edit.phtml | 12 +- .../product/edit/action/attribute.phtml | 2 +- .../product/edit/action/websites.phtml | 12 +- .../product/edit/category/new/form.phtml | 4 +- .../catalog/product/edit/options.phtml | 6 +- .../catalog/product/edit/options/option.phtml | 6 +- .../product/edit/options/type/date.phtml | 2 +- .../product/edit/options/type/file.phtml | 2 +- .../product/edit/options/type/select.phtml | 4 +- .../product/edit/options/type/text.phtml | 2 +- .../catalog/product/edit/price/tier.phtml | 10 +- .../catalog/product/edit/websites.phtml | 10 +- .../catalog/product/helper/gallery.phtml | 22 +-- .../templates/catalog/product/tab/alert.phtml | 4 +- .../product/widget/chooser/container.phtml | 4 +- .../product/edit/attribute/search.phtml | 4 +- .../templates/product/edit/tabs.phtml | 10 +- .../product/edit/tabs/child_tab.phtml | 8 +- .../product/grid/massaction_extended.phtml | 26 ++-- .../view/base/templates/js/components.phtml | 2 +- .../product/price/amount/default.phtml | 6 +- .../templates/product/price/tier_prices.phtml | 2 +- .../frontend/templates/category/cms.phtml | 2 +- .../templates/category/products.phtml | 2 +- .../category/widget/link/link_block.phtml | 2 +- .../category/widget/link/link_inline.phtml | 2 +- .../frontend/templates/navigation/left.phtml | 2 +- .../templates/product/compare/list.phtml | 10 +- .../frontend/templates/product/gallery.phtml | 2 +- .../frontend/templates/product/list.phtml | 26 ++-- .../product/list/addto/compare.phtml | 4 +- .../templates/product/list/items.phtml | 12 +- .../templates/product/list/toolbar.phtml | 2 +- .../product/list/toolbar/sorter.phtml | 2 +- .../frontend/templates/product/listing.phtml | 10 +- .../templates/product/view/addto.phtml | 2 +- .../templates/product/view/addtocart.phtml | 4 +- .../templates/product/view/attributes.phtml | 4 +- .../templates/product/view/form.phtml | 14 +- .../product/view/opengraph/general.phtml | 10 +- .../templates/product/view/options.phtml | 4 +- .../product/view/options/type/date.phtml | 6 +- .../product/view/options/type/default.phtml | 2 +- .../product/view/options/type/file.phtml | 10 +- .../product/view/options/type/select.phtml | 4 +- .../product/view/options/type/text.phtml | 10 +- .../product/view/options/wrapper.phtml | 2 +- .../product/view/options/wrapper/bottom.phtml | 2 +- .../templates/product/view/price_clone.phtml | 2 +- .../templates/product/view/review.phtml | 2 +- .../product/widget/link/link_block.phtml | 2 +- .../product/widget/link/link_inline.phtml | 2 +- .../widget/new/column/new_default_list.phtml | 6 +- .../widget/new/column/new_images_list.phtml | 4 +- .../widget/new/column/new_names_list.phtml | 2 +- .../product/widget/new/content/new_grid.phtml | 12 +- .../product/widget/new/content/new_list.phtml | 16 +-- .../templates/stockqty/composite.phtml | 4 +- .../adminhtml/templates/promo/fieldset.phtml | 6 +- .../view/adminhtml/templates/promo/form.phtml | 2 +- .../frontend/templates/advanced/form.phtml | 24 ++-- .../frontend/templates/advanced/result.phtml | 4 +- .../view/frontend/templates/result.phtml | 6 +- .../templates/product/widget/conditions.phtml | 6 +- .../product/widget/content/grid.phtml | 38 ++--- .../view/frontend/templates/button.phtml | 2 +- .../view/frontend/templates/cart/coupon.phtml | 4 +- .../view/frontend/templates/cart/form.phtml | 24 ++-- .../cart/item/configure/updatecart.phtml | 2 +- .../templates/cart/item/default.phtml | 30 ++-- .../cart/item/renderer/actions/edit.phtml | 2 +- .../cart/item/renderer/actions/remove.phtml | 2 +- .../frontend/templates/cart/minicart.phtml | 2 +- .../frontend/templates/cart/noItems.phtml | 4 +- .../frontend/templates/item/price/row.phtml | 2 +- .../frontend/templates/item/price/unit.phtml | 2 +- .../frontend/templates/js/components.phtml | 2 +- .../frontend/templates/onepage/link.phtml | 2 +- .../templates/onepage/review/item.phtml | 32 ++--- .../view/frontend/templates/success.phtml | 6 +- .../frontend/templates/total/default.phtml | 4 +- .../view/frontend/templates/agreements.phtml | 10 +- .../templates/multishipping_agreements.phtml | 10 +- .../adminhtml/templates/browser/content.phtml | 10 +- .../templates/browser/content/files.phtml | 12 +- .../templates/browser/content/uploader.phtml | 24 ++-- .../adminhtml/templates/browser/tree.phtml | 6 +- .../page/edit/form/renderer/content.phtml | 2 +- .../templates/widget/link/link_block.phtml | 2 +- .../templates/widget/link/link_inline.phtml | 2 +- .../page/system/config/robots/reset.phtml | 2 +- .../templates/system/config/edit.phtml | 4 +- .../system/config/form/field/array.phtml | 2 +- .../templates/system/config/switcher.phtml | 8 +- .../templates/system/config/tabs.phtml | 2 +- .../catalog/product/attribute/set/js.phtml | 6 +- .../attribute/steps/attributes_values.phtml | 28 ++-- .../product/edit/attribute/steps/bulk.phtml | 130 +++++++++--------- .../attribute/steps/select_attributes.phtml | 14 +- .../edit/attribute/steps/summary.phtml | 8 +- .../catalog/product/edit/super/config.phtml | 10 +- .../catalog/product/edit/super/matrix.phtml | 26 ++-- .../product/edit/super/wizard-ajax.phtml | 4 +- .../catalog/product/edit/super/wizard.phtml | 4 +- .../form.phtml | 2 +- .../frontend/templates/js/components.phtml | 2 +- .../view/type/options/configurable.phtml | 2 +- .../view/frontend/templates/form.phtml | 30 ++-- .../frontend/templates/html/notices.phtml | 10 +- .../view/adminhtml/templates/grid.phtml | 6 +- .../system/currency/rate/matrix.phtml | 10 +- .../system/currency/rate/services.phtml | 2 +- .../templates/system/currency/rates.phtml | 12 +- .../create/address/form/renderer/vat.phtml | 14 +- .../templates/system/config/validatevat.phtml | 12 +- .../view/adminhtml/templates/tab/cart.phtml | 26 ++-- .../adminhtml/templates/tab/newsletter.phtml | 4 +- .../templates/tab/view/personal_info.phtml | 40 +++--- .../adminhtml/templates/tab/view/sales.phtml | 32 ++--- .../account/authentication-popup.phtml | 2 +- .../frontend/templates/account/customer.phtml | 4 +- .../templates/account/dashboard/address.phtml | 16 +-- .../templates/account/dashboard/info.phtml | 26 ++-- .../account/link/authorization.phtml | 4 +- .../templates/account/link/back.phtml | 2 +- .../templates/account/navigation.phtml | 4 +- .../frontend/templates/address/book.phtml | 44 +++--- .../frontend/templates/address/edit.phtml | 96 ++++++------- .../templates/form/confirmation.phtml | 12 +- .../view/frontend/templates/form/edit.phtml | 54 ++++---- .../templates/form/forgotpassword.phtml | 16 +-- .../view/frontend/templates/form/login.phtml | 24 ++-- .../frontend/templates/form/newsletter.phtml | 20 +-- .../frontend/templates/form/register.phtml | 96 ++++++------- .../form/resetforgottenpassword.phtml | 18 +-- .../frontend/templates/js/components.phtml | 2 +- .../view/frontend/templates/logout.phtml | 4 +- .../view/frontend/templates/newcustomer.phtml | 6 +- .../frontend/templates/widget/company.phtml | 10 +- .../view/frontend/templates/widget/dob.phtml | 12 +- .../view/frontend/templates/widget/fax.phtml | 10 +- .../frontend/templates/widget/gender.phtml | 6 +- .../view/frontend/templates/widget/name.phtml | 106 +++++++------- .../frontend/templates/widget/taxvat.phtml | 4 +- .../frontend/templates/widget/telephone.phtml | 10 +- .../adminhtml/templates/unitofmeasure.phtml | 8 +- .../view/frontend/templates/currency.phtml | 14 +- .../frontend/templates/currency/switch.phtml | 4 +- .../composite/fieldset/downloadable.phtml | 6 +- .../templates/product/edit/downloadable.phtml | 8 +- .../product/edit/downloadable/links.phtml | 14 +- .../product/edit/downloadable/samples.phtml | 10 +- .../column/downloadable/creditmemo/name.phtml | 8 +- .../column/downloadable/invoice/name.phtml | 8 +- .../items/column/downloadable/name.phtml | 8 +- .../templates/catalog/product/links.phtml | 4 +- .../templates/catalog/product/samples.phtml | 4 +- .../templates/catalog/product/type.phtml | 2 +- .../templates/customer/products/list.phtml | 20 +-- .../order/items/creditmemo/downloadable.phtml | 2 +- .../order/items/invoice/downloadable.phtml | 2 +- .../order/items/order/downloadable.phtml | 10 +- .../frontend/templates/js/components.phtml | 2 +- .../items/renderer/downloadable.phtml | 34 ++--- .../invoice/items/renderer/downloadable.phtml | 30 ++-- .../order/items/renderer/downloadable.phtml | 28 ++-- .../adminhtml/templates/template/edit.phtml | 28 ++-- .../adminhtml/templates/template/list.phtml | 4 +- .../templates/template/preview.phtml | 4 +- .../view/adminhtml/templates/popup.phtml | 2 +- .../templates/sales/order/create/items.phtml | 2 +- .../view/frontend/templates/inline.phtml | 8 +- .../view/frontend/templates/ga.phtml | 4 +- .../product/composite/fieldset/grouped.phtml | 6 +- .../templates/product/grouped/grouped.phtml | 4 +- .../templates/product/grouped/list.phtml | 2 +- .../templates/product/price/final_price.phtml | 2 +- .../templates/product/view/type/grouped.phtml | 8 +- .../integration/activate/permissions.phtml | 2 +- .../adminhtml/templates/resourcetree.phtml | 6 +- .../frontend/templates/layer/filter.phtml | 2 +- .../view/frontend/templates/layer/state.phtml | 8 +- .../view/frontend/templates/layer/view.phtml | 4 +- .../view/adminhtml/templates/index.phtml | 2 +- .../view/adminhtml/templates/partners.phtml | 12 +- .../system/storage/media/synchronize.phtml | 2 +- .../base/templates/product/price/msrp.phtml | 4 +- .../Msrp/view/frontend/templates/popup.phtml | 4 +- .../templates/checkout/address/select.phtml | 2 +- .../templates/checkout/addresses.phtml | 12 +- .../frontend/templates/checkout/billing.phtml | 12 +- .../templates/checkout/billing/items.phtml | 4 +- .../templates/checkout/item/default.phtml | 8 +- .../templates/checkout/overview.phtml | 18 +-- .../templates/checkout/overview/item.phtml | 26 ++-- .../templates/checkout/shipping.phtml | 16 +-- .../frontend/templates/checkout/state.phtml | 2 +- .../frontend/templates/checkout/success.phtml | 14 +- .../frontend/templates/js/components.phtml | 2 +- .../multishipping/item/default.phtml | 8 +- .../templates/preview/iframeswitcher.phtml | 6 +- .../adminhtml/templates/preview/store.phtml | 10 +- .../adminhtml/templates/problem/list.phtml | 6 +- .../view/adminhtml/templates/queue/edit.phtml | 20 +-- .../view/adminhtml/templates/queue/list.phtml | 2 +- .../adminhtml/templates/queue/preview.phtml | 4 +- .../adminhtml/templates/subscriber/list.phtml | 6 +- .../adminhtml/templates/template/edit.phtml | 26 ++-- .../adminhtml/templates/template/list.phtml | 2 +- .../templates/template/preview.phtml | 4 +- .../frontend/templates/js/components.phtml | 2 +- .../view/frontend/templates/subscribe.phtml | 10 +- .../adminhtml/templates/form/checkmo.phtml | 6 +- .../templates/form/purchaseorder.phtml | 6 +- .../adminhtml/templates/info/checkmo.phtml | 6 +- .../templates/info/pdf/checkmo.phtml | 6 +- .../templates/info/pdf/purchaseorder.phtml | 2 +- .../templates/info/purchaseorder.phtml | 6 +- .../frontend/templates/form/checkmo.phtml | 8 +- .../templates/form/purchaseorder.phtml | 6 +- .../frontend/templates/info/checkmo.phtml | 8 +- .../templates/info/purchaseorder.phtml | 6 +- .../frontend/templates/js/components.phtml | 2 +- .../view/adminhtml/templates/form/cc.phtml | 22 +-- .../adminhtml/templates/info/default.phtml | 6 +- .../templates/info/instructions.phtml | 2 +- .../templates/info/pdf/default.phtml | 8 +- .../templates/info/substitution.phtml | 2 +- .../templates/transparent/form.phtml | 40 +++--- .../templates/transparent/iframe.phtml | 6 +- .../templates/transparent/info.phtml | 4 +- .../view/frontend/templates/form/cc.phtml | 28 ++-- .../frontend/templates/info/default.phtml | 4 +- .../templates/info/instructions.phtml | 2 +- .../frontend/templates/info/pdf/default.phtml | 8 +- .../frontend/templates/transparent/form.phtml | 44 +++--- .../templates/transparent/iframe.phtml | 6 +- .../frontend/templates/transparent/info.phtml | 4 +- .../templates/billing/agreement/form.phtml | 10 +- .../billing/agreement/view/tab/info.phtml | 24 ++-- .../templates/payflowpro/vault.phtml | 14 +- .../payment/form/billing/agreement.phtml | 12 +- .../templates/system/config/api_wizard.phtml | 4 +- .../system/config/bml_api_wizard.phtml | 6 +- .../system/config/fieldset/hint.phtml | 6 +- .../system/config/payflowlink/advanced.phtml | 6 +- .../system/config/payflowlink/info.phtml | 6 +- .../templates/transparent/form.phtml | 42 +++--- .../templates/transparent/iframe.phtml | 6 +- .../templates/billing/agreement/view.phtml | 88 ++++++------ .../templates/billing/agreements.phtml | 62 ++++----- .../Paypal/view/frontend/templates/bml.phtml | 4 +- .../checkout/onepage/review/totals.phtml | 2 +- .../onepage/success/billing_agreement.phtml | 6 +- .../express/in-context/shortcut/button.phtml | 6 +- .../frontend/templates/express/review.phtml | 64 ++++----- .../templates/express/review/details.phtml | 14 +- .../express/review/shipping/method.phtml | 12 +- .../frontend/templates/express/shortcut.phtml | 14 +- .../view/frontend/templates/hss/form.phtml | 6 +- .../view/frontend/templates/hss/iframe.phtml | 4 +- .../view/frontend/templates/hss/info.phtml | 4 +- .../templates/hss/review/button.phtml | 4 +- .../frontend/templates/js/components.phtml | 2 +- .../frontend/templates/partner/logo.phtml | 10 +- .../templates/payflowadvanced/form.phtml | 6 +- .../templates/payflowadvanced/info.phtml | 4 +- .../frontend/templates/payflowlink/form.phtml | 6 +- .../frontend/templates/payflowlink/info.phtml | 4 +- .../templates/payflowlink/redirect.phtml | 8 +- .../payment/form/billing/agreement.phtml | 10 +- .../frontend/templates/payment/mark.phtml | 4 +- .../frontend/templates/payment/redirect.phtml | 6 +- .../view/frontend/templates/remember_me.phtml | 8 +- .../view/frontend/templates/email/price.phtml | 2 +- .../view/frontend/templates/email/stock.phtml | 2 +- .../frontend/templates/product/view.phtml | 6 +- .../adminhtml/templates/helper/gallery.phtml | 52 +++---- .../view/adminhtml/templates/grid.phtml | 8 +- .../templates/report/grid/container.phtml | 4 +- .../templates/report/refresh/statistics.phtml | 4 +- .../adminhtml/templates/report/wishlist.phtml | 2 +- .../adminhtml/templates/store/switcher.phtml | 2 +- .../templates/store/switcher/enhanced.phtml | 8 +- .../frontend/templates/js/components.phtml | 2 +- .../product/widget/viewed/item.phtml | 8 +- .../column/compared_default_list.phtml | 4 +- .../column/compared_images_list.phtml | 2 +- .../compared/content/compared_grid.phtml | 12 +- .../compared/content/compared_list.phtml | 14 +- .../viewed/column/viewed_default_list.phtml | 4 +- .../viewed/column/viewed_images_list.phtml | 4 +- .../widget/viewed/content/viewed_grid.phtml | 12 +- .../widget/viewed/content/viewed_list.phtml | 14 +- .../Review/view/adminhtml/templates/add.phtml | 8 +- .../adminhtml/templates/rating/detailed.phtml | 8 +- .../adminhtml/templates/rating/form.phtml | 4 +- .../adminhtml/templates/rating/options.phtml | 8 +- .../templates/rating/stars/detailed.phtml | 4 +- .../templates/rating/stars/summary.phtml | 2 +- .../adminhtml/templates/rss/grid/link.phtml | 2 +- .../frontend/templates/customer/list.phtml | 38 ++--- .../frontend/templates/customer/recent.phtml | 12 +- .../frontend/templates/customer/view.phtml | 22 +-- .../view/frontend/templates/detailed.phtml | 4 +- .../view/frontend/templates/empty.phtml | 2 +- .../Review/view/frontend/templates/form.phtml | 44 +++--- .../frontend/templates/helper/summary.phtml | 16 +-- .../templates/helper/summary_short.phtml | 14 +- .../templates/product/view/count.phtml | 2 +- .../templates/product/view/list.phtml | 26 ++-- .../templates/product/view/other.phtml | 2 +- .../view/frontend/templates/review.phtml | 4 +- .../Review/view/frontend/templates/view.phtml | 26 ++-- .../Rss/view/frontend/templates/feeds.phtml | 14 +- .../Sales/Block/Order/Creditmemo/Totals.php | 12 +- .../templates/items/column/name.phtml | 6 +- .../templates/items/renderer/default.phtml | 8 +- .../templates/order/address/form.phtml | 2 +- .../templates/order/comments/view.phtml | 4 +- .../templates/order/create/abstract.phtml | 4 +- .../order/create/billing/method/form.phtml | 4 +- .../templates/order/create/comment.phtml | 2 +- .../templates/order/create/coupons/form.phtml | 4 +- .../templates/order/create/data.phtml | 28 ++-- .../templates/order/create/form.phtml | 12 +- .../templates/order/create/form/account.phtml | 2 +- .../templates/order/create/form/address.phtml | 10 +- .../templates/order/create/giftmessage.phtml | 2 +- .../templates/order/create/items.phtml | 4 +- .../templates/order/create/items/grid.phtml | 24 ++-- .../order/create/shipping/method/form.phtml | 10 +- .../templates/order/create/sidebar.phtml | 6 +- .../order/create/sidebar/items.phtml | 22 +-- .../templates/order/create/store/select.phtml | 8 +- .../templates/order/create/totals.phtml | 2 +- .../order/create/totals/default.phtml | 2 +- .../order/create/totals/shipping.phtml | 2 +- .../templates/order/create/totals/tax.phtml | 6 +- .../order/creditmemo/create/form.phtml | 12 +- .../order/creditmemo/create/items.phtml | 16 +-- .../create/items/renderer/default.phtml | 10 +- .../order/creditmemo/view/form.phtml | 14 +- .../order/creditmemo/view/items.phtml | 4 +- .../view/items/renderer/default.phtml | 8 +- .../adminhtml/templates/order/details.phtml | 20 +-- .../templates/order/giftoptions.phtml | 2 +- .../templates/order/invoice/create/form.phtml | 16 +-- .../order/invoice/create/items.phtml | 18 +-- .../create/items/renderer/default.phtml | 10 +- .../templates/order/invoice/view/form.phtml | 16 +-- .../templates/order/invoice/view/items.phtml | 4 +- .../invoice/view/items/renderer/default.phtml | 8 +- .../adminhtml/templates/order/totals.phtml | 14 +- .../templates/order/totals/footer.phtml | 2 +- .../templates/order/totals/item.phtml | 2 +- .../templates/order/totals/main.phtml | 2 +- .../templates/order/totals/tax.phtml | 8 +- .../templates/order/view/giftmessage.phtml | 18 +-- .../templates/order/view/history.phtml | 4 +- .../adminhtml/templates/order/view/info.phtml | 32 ++--- .../templates/order/view/items.phtml | 4 +- .../order/view/items/renderer/default.phtml | 2 +- .../templates/order/view/tab/info.phtml | 24 ++-- .../templates/page/js/components.phtml | 2 +- .../templates/transactions/detail.phtml | 22 +-- .../templates/email/creditmemo/items.phtml | 6 +- .../templates/email/invoice/items.phtml | 6 +- .../view/frontend/templates/email/items.phtml | 12 +- .../email/items/creditmemo/default.phtml | 4 +- .../email/items/invoice/default.phtml | 4 +- .../templates/email/items/order/default.phtml | 10 +- .../email/items/shipment/default.phtml | 2 +- .../templates/email/shipment/items.phtml | 4 +- .../frontend/templates/items/price/row.phtml | 2 +- .../frontend/templates/items/price/unit.phtml | 2 +- .../frontend/templates/js/components.phtml | 2 +- .../frontend/templates/order/comments.phtml | 2 +- .../frontend/templates/order/creditmemo.phtml | 2 +- .../templates/order/creditmemo/items.phtml | 6 +- .../creditmemo/items/renderer/default.phtml | 34 ++--- .../frontend/templates/order/history.phtml | 16 +-- .../view/frontend/templates/order/info.phtml | 4 +- .../templates/order/info/buttons.phtml | 2 +- .../frontend/templates/order/invoice.phtml | 2 +- .../templates/order/invoice/items.phtml | 6 +- .../invoice/items/renderer/default.phtml | 26 ++-- .../view/frontend/templates/order/items.phtml | 12 +- .../order/items/renderer/default.phtml | 24 ++-- .../templates/order/order_comments.phtml | 2 +- .../templates/order/print/creditmemo.phtml | 8 +- .../templates/order/print/invoice.phtml | 8 +- .../templates/order/print/shipment.phtml | 14 +- .../frontend/templates/order/recent.phtml | 14 +- .../shipment/items/renderer/default.phtml | 18 +-- .../frontend/templates/order/totals.phtml | 8 +- .../view/frontend/templates/order/view.phtml | 8 +- .../templates/widget/guest/form.phtml | 2 +- .../adminhtml/templates/tab/coupons.phtml | 4 +- .../view/frontend/templates/form.mini.phtml | 4 +- .../Search/view/frontend/templates/term.phtml | 2 +- .../templates/page/activity_link.phtml | 6 +- .../templates/session/activity.phtml | 18 +-- .../view/frontend/templates/send.phtml | 48 +++---- .../adminhtml/templates/create/form.phtml | 14 +- .../adminhtml/templates/create/items.phtml | 10 +- .../create/items/renderer/default.phtml | 4 +- .../templates/order/packaging/grid.phtml | 4 +- .../templates/order/packaging/packed.phtml | 4 +- .../order/packaging/popup_content.phtml | 2 +- .../adminhtml/templates/order/tracking.phtml | 4 +- .../templates/order/tracking/view.phtml | 12 +- .../adminhtml/templates/order/view/info.phtml | 2 +- .../view/adminhtml/templates/view/form.phtml | 16 +-- .../view/adminhtml/templates/view/items.phtml | 4 +- .../view/items/renderer/default.phtml | 2 +- .../view/frontend/templates/items.phtml | 10 +- .../frontend/templates/order/shipment.phtml | 2 +- .../frontend/templates/tracking/details.phtml | 42 +++--- .../frontend/templates/tracking/popup.phtml | 8 +- .../templates/tracking/progress.phtml | 22 +-- .../frontend/templates/switch/flags.phtml | 6 +- .../frontend/templates/switch/languages.phtml | 14 +- .../frontend/templates/switch/stores.phtml | 6 +- .../catalog/product/attribute/text.phtml | 26 ++-- .../catalog/product/attribute/visual.phtml | 34 ++--- .../attribute/steps/attributes_values.phtml | 10 +- .../templates/product/listing/renderer.phtml | 2 +- .../adminhtml/templates/class/page/edit.phtml | 10 +- .../view/adminhtml/templates/rate/form.phtml | 4 +- .../adminhtml/templates/rule/rate/form.phtml | 4 +- .../templates/toolbar/class/save.phtml | 8 +- .../templates/toolbar/rate/add.phtml | 2 +- .../templates/toolbar/rate/save.phtml | 2 +- .../templates/toolbar/rule/save.phtml | 10 +- .../base/templates/pricing/adjustment.phtml | 2 +- .../templates/checkout/grandtotal.phtml | 6 +- .../templates/checkout/shipping.phtml | 10 +- .../templates/checkout/subtotal.phtml | 6 +- .../frontend/templates/checkout/tax.phtml | 10 +- .../frontend/templates/item/price/row.phtml | 4 +- .../frontend/templates/item/price/unit.phtml | 4 +- .../view/frontend/templates/order/tax.phtml | 8 +- .../adminhtml/templates/importExport.phtml | 8 +- .../adminhtml/templates/browser/content.phtml | 6 +- .../templates/browser/content/uploader.phtml | 8 +- .../view/adminhtml/templates/tabs/css.phtml | 2 +- .../view/adminhtml/templates/tabs/js.phtml | 2 +- .../view/adminhtml/templates/title.phtml | 2 +- .../view/frontend/templates/html/block.phtml | 2 +- .../frontend/templates/html/breadcrumbs.phtml | 6 +- .../frontend/templates/html/collapsible.phtml | 2 +- .../frontend/templates/html/container.phtml | 2 +- .../view/frontend/templates/html/footer.phtml | 2 +- .../view/frontend/templates/html/header.phtml | 6 +- .../frontend/templates/html/header/logo.phtml | 6 +- .../view/frontend/templates/html/title.phtml | 2 +- .../frontend/templates/js/components.phtml | 2 +- .../Theme/view/frontend/templates/link.phtml | 6 +- .../templates/translate_inline.phtml | 8 +- .../frontend/templates/translate_inline.phtml | 10 +- .../templates/control/button/default.phtml | 4 +- .../base/templates/control/button/split.phtml | 16 +-- .../Ui/view/base/templates/stepswizard.phtml | 6 +- .../system/shipping/carrier_config.phtml | 2 +- .../view/adminhtml/templates/categories.phtml | 2 +- .../view/adminhtml/templates/edit.phtml | 4 +- .../view/adminhtml/templates/selector.phtml | 4 +- .../templates/admin/forgotpassword.phtml | 2 +- .../view/adminhtml/templates/role/edit.phtml | 6 +- .../view/adminhtml/templates/role/info.phtml | 2 +- .../view/adminhtml/templates/role/users.phtml | 2 +- .../templates/user/roles_grid_js.phtml | 4 +- .../view/adminhtml/templates/form/vault.phtml | 2 +- .../customer_account/credit_card.phtml | 20 +-- .../view/frontend/templates/token_list.phtml | 2 +- .../adminhtml/templates/items/price/row.phtml | 8 +- .../templates/items/price/unit.phtml | 8 +- .../adminhtml/templates/renderer/tax.phtml | 14 +- .../checkout/cart/item/price/sidebar.phtml | 8 +- .../frontend/templates/item/price/row.phtml | 8 +- .../frontend/templates/item/price/unit.phtml | 8 +- .../catalog/category/widget/tree.phtml | 30 ++-- .../templates/instance/edit/layout.phtml | 68 ++++----- .../customer/edit/tab/wishlist.phtml | 12 +- .../frontend/templates/button/share.phtml | 4 +- .../frontend/templates/button/tocart.phtml | 4 +- .../frontend/templates/button/update.phtml | 4 +- .../renderer/actions/move_to_wishlist.phtml | 2 +- .../catalog/product/list/addto/wishlist.phtml | 6 +- .../catalog/product/view/addto/wishlist.phtml | 2 +- .../templates/item/column/actions.phtml | 2 +- .../frontend/templates/item/column/cart.phtml | 18 +-- .../templates/item/column/comment.phtml | 6 +- .../frontend/templates/item/column/edit.phtml | 4 +- .../templates/item/column/image.phtml | 4 +- .../frontend/templates/item/column/name.phtml | 4 +- .../templates/item/column/remove.phtml | 4 +- .../templates/item/configure/addto.phtml | 6 +- .../item/configure/addto/wishlist.phtml | 2 +- .../view/frontend/templates/item/list.phtml | 6 +- .../frontend/templates/js/components.phtml | 2 +- .../view/frontend/templates/link.phtml | 2 +- .../messages/addProductSuccessMessage.phtml | 2 +- .../frontend/templates/options_list.phtml | 6 +- .../view/frontend/templates/rss/email.phtml | 4 +- .../frontend/templates/rss/wishlist.phtml | 4 +- .../view/frontend/templates/shared.phtml | 44 +++--- .../view/frontend/templates/sharing.phtml | 22 +-- .../view/frontend/templates/sidebar.phtml | 18 +-- .../view/frontend/templates/view.phtml | 20 +-- .../templates/layer/state.phtml | 8 +- .../templates/layer/view.phtml | 2 +- .../Utility/_files/xss_safe.phtml | 38 ++--- .../Utility/_files/xss_unsafe.phtml | 24 ++-- pub/errors/default/page.phtml | 4 +- pub/errors/default/report.phtml | 16 +-- setup/view/error/401.phtml | 2 +- setup/view/error/404.phtml | 22 +-- setup/view/error/index.phtml | 20 +-- setup/view/layout/layout.phtml | 18 +-- .../magento/setup/create-admin-account.phtml | 2 +- .../magento/setup/customize-your-store.phtml | 6 +- setup/view/magento/setup/extension-grid.phtml | 4 +- setup/view/magento/setup/index.phtml | 2 +- .../setup/install-extension-grid.phtml | 4 +- setup/view/magento/setup/landing.phtml | 4 +- setup/view/magento/setup/license.phtml | 2 +- .../setup/marketplace-credentials.phtml | 4 +- setup/view/magento/setup/module-grid.phtml | 2 +- .../magento/setup/navigation/header-bar.phtml | 2 +- .../magento/setup/navigation/side-menu.phtml | 2 +- setup/view/magento/setup/popupauth.phtml | 2 +- .../view/magento/setup/readiness-check.phtml | 2 +- setup/view/magento/setup/system-config.phtml | 2 +- .../magento/setup/update-extension-grid.phtml | 4 +- .../view/magento/setup/updater-success.phtml | 2 +- .../magento/setup/web-configuration.phtml | 12 +- 647 files changed, 3277 insertions(+), 3277 deletions(-) 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 4e8be1fee7658..32a33ce2bae30 100644 --- a/app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages.phtml +++ b/app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages.phtml @@ -26,7 +26,7 @@ getCriticalCount()): ?>
- + getCriticalCount();?>
@@ -34,12 +34,12 @@ 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 624f4d35fee1c..862d573d539a2 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 @@ -9,7 +9,7 @@ ?> - 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 e09dc3912cdde..61e231ab589be 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/admin/page.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/admin/page.phtml @@ -12,47 +12,47 @@ - getChildHtml('head') ?> + getChildHtml('head') ?> -getBodyClass() ? ' class="' . $block->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('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 aef3e7f2f5396..9a98b895d2d02 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/graph.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/graph.phtml @@ -9,9 +9,9 @@ ?>
- - getWebsiteCollection() as $_website): ?> diff --git a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/totalbar/refreshstatistics.phtml b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/totalbar/refreshstatistics.phtml index f85baa0fe06cf..d59fa17e6d6dc 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/totalbar/refreshstatistics.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/totalbar/refreshstatistics.phtml @@ -7,20 +7,20 @@
- getChildHtml(); ?> + getChildHtml() ?>
+ value="escapeHtmlAttr($block->getFormKey()) ?>"/>
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 2152fd5fc44d2..3f0989a7eb616 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/media/uploader.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/media/uploader.phtml @@ -9,7 +9,7 @@ /** @var $block \Magento\Backend\Block\Media\Uploader */ ?> - - 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 7278eead4d877..a5ee412db34e9 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 @@ -50,8 +50,8 @@ require([ showTime: false, showHour: false, showMinute: false, - serverTimezoneSeconds: getStoreTimestamp(); ?>, - serverTimezoneOffset: getTimezoneOffsetSeconds(); ?>, + serverTimezoneSeconds: getStoreTimestamp() ?>, + serverTimezoneOffset: getTimezoneOffsetSeconds() ?>, 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 c055c5057b570..c6c7bcc901e7e 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 @@ -15,4 +15,4 @@ ?> -getChildHtml() ?> +getChildHtml() ?> diff --git a/app/code/Magento/Backend/view/adminhtml/templates/pageactions.phtml b/app/code/Magento/Backend/view/adminhtml/templates/pageactions.phtml index bd3070361024f..b2aee70a7c074 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/pageactions.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/pageactions.phtml @@ -9,6 +9,6 @@ ?> getChildHtml()):?>
getUiId('content-header') ?>> - getChildHtml(); ?> + 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 8bfbde8425fe2..cf19f527ed28d 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml @@ -15,15 +15,15 @@
getUiId()?> /> getUiId()?> /> getUiId()?> />
- getHintHtml() ?> + getHintHtml() ?>
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 74edd0848e37c..c76fa6474f771 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/widget/breadcrumbs.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/breadcrumbs.phtml @@ -14,12 +14,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 aa59e44471e09..d7c3156414800 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/widget/button.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/button.phtml @@ -12,8 +12,8 @@ * @var $block \Magento\Backend\Block\Widget\Button */ ?> -getBeforeHtml(); ?> +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 02e5145e569ff..fb5332c6529ea 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 @@ -11,12 +11,12 @@ /** @var $block \Magento\Backend\Block\Widget\Button\SplitButton */ ?> -
    getAttributesHtml(); ?>> - hasSplit()): ?> - @@ -24,13 +24,13 @@
      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']) ?> + + 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 560da9bc80102..dc7d02795a054 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/widget/form.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/form.phtml @@ -12,6 +12,6 @@
      - 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 358e9f430917d..a393efa5f47a4 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 @@ -10,12 +10,12 @@ ?> getFormInitScripts() ?> getButtonsHtml('header')): ?> -
      getUiId('content-header') ?>>getButtonsHtml('header') ?>
      +
      getUiId('content-header') ?>>getButtonsHtml('header') ?>
      -getFormHtml() ?> +getFormHtml() ?> hasFooterButtons()): ?>
      -

      getButtonsHtml('footer') ?>

      +

      getButtonsHtml('footer') ?>

      - +       - - + + diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/element/gallery.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/element/gallery.phtml index ebc423512120d..7a7486bbb31e6 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/element/gallery.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/element/gallery.phtml @@ -22,7 +22,7 @@ -getAddButtonHtml() ?> +getAddButtonHtml() ?> @@ -30,15 +30,15 @@ getValues())): ?> getValues() as $image): $i++; ?> - + getValues()->getAttributeBackend()->getImageTypes() as $type): ?> - - <?php /* @escapeNotVerified */ echo $image->getValue() ?>
      + + <?php /* @escapeNotVerified */ echo $image->getValue() ?>
      - - getDeleteButtonHtml($image->getValueId()) ?> + + getDeleteButtonHtml($image->getValueId()) ?> diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/element.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/element.phtml index d946a335d9933..ae0bcb826a1a3 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/element.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/element.phtml @@ -11,8 +11,8 @@ getNoSpan() !== true): ?> -getLabelHtml() ?> -getElementHtml() ?> +getLabelHtml() ?> +getElementHtml() ?> getNoSpan() !== true): ?> diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset.phtml index 322c33e858a3e..bba1f957e2bbd 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset.phtml @@ -38,7 +38,7 @@ if ($isField) { */ ?> -
      @@ -49,7 +49,7 @@ if ($isField) {
      -
      @@ -66,46 +66,46 @@ if ($isField) {
      getComment() && !$isField): ?> -
      escapeHtml($element->getComment()) ?>
      +
      escapeHtml($element->getComment()) ?>
      - ' : ''; ?> + ' : '' ?> hasHtmlContent() && !$isField): ?> - getHtmlContent(); ?> + getHtmlContent() ?> 1):?>
      - getBasicChildrenHtml(); ?> + getBasicChildrenHtml() ?> - 1) ? '
      ' : '' ?> + 1) ? '
      ' : '' ?> getComment() && $isField): ?> -
      escapeHtml($element->getComment()) ?>
      +
      escapeHtml($element->getComment()) ?>
      hasAdvanced() && !$isField): ?> - getNoContainer() && $advancedAfter) ? '' : ''?> + getNoContainer() && $advancedAfter) ? '' : '' ?>
      - getAdvancedChildrenHtml(); ?> + getAdvancedChildrenHtml() ?>
      hasAdvanced() && $isField): ?>
      - getAdvancedChildrenHtml(); ?> + getAdvancedChildrenHtml() ?>
      - ' : ''; ?> + ' : '' ?> diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset/element.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset/element.phtml index e1e030e1fd6dd..54f12d8de68f6 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset/element.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset/element.phtml @@ -28,15 +28,15 @@ $fieldAttributes = $fieldId . ' class="' . $fieldClass . '" ' getNoDisplay()): ?> getType() == 'hidden'): ?> - getElementHtml() ?> + getElementHtml() ?> > - getElementHtml() ?> - getLabelHtml('', $element->getScopeLabel()) ?> + getElementHtml() ?> + getLabelHtml('', $element->getScopeLabel()) ?> - getLabelHtml('', $element->getScopeLabel()) ?> + getLabelHtml('', $element->getScopeLabel()) ?>
      ' . $element->getElementHtml() . '
      ' : $element->getElementHtml(); ?> diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml index c16955ae071f7..f3e6d1a838f02 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml @@ -24,9 +24,9 @@ $numColumns = sizeof($block->getColumns()); getCollection()): ?> canDisplayContainer()): ?> -
      +
      -getLayout()->getMessagesBlock()->getGroupedHtml() ?> +getLayout()->getMessagesBlock()->getGroupedHtml() ?>
      @@ -34,33 +34,33 @@ $numColumns = sizeof($block->getColumns()); getPagerVisibility() || $block->getExportTypes() || $block->getChildBlock('grid.columnSet')->getFilterVisibility() || $massActionAvailable): ?>
      - getMainButtonsHtml() ? '
      ' . $block->getMainButtonsHtml() . '
      ' : ''; ?> + getMainButtonsHtml() ? '
      ' . $block->getMainButtonsHtml() . '
      ' : '' ?> getChildBlock('grid.export')): ?> - getChildHtml('grid.export'); ?> + getChildHtml('grid.export') ?>
      - getChildHtml('grid.massaction') ?> + getChildHtml('grid.massaction') ?> - getMainButtonsHtml() ? '
      ' . $block->getMainButtonsHtml() . '
      ' : ''; ?> + getMainButtonsHtml() ? '
      ' . $block->getMainButtonsHtml() . '
      ' : '' ?> getCollection()->getSize(); ?>
      - getUiId('total-count') ?>> + getUiId('total-count') ?>> - 0
      getPagerVisibility()): ?>
      -
      getCollection()->getCurPage() ?> @@ -96,13 +96,13 @@ $numColumns = sizeof($block->getColumns()); getUiId('current-page') ?> /> - @@ -122,19 +122,19 @@ $numColumns = sizeof($block->getColumns());
      getGridCssClass()): ?> - +
      - getChildHtml('grid.columnSet'); ?> + getChildHtml('grid.columnSet') ?>
      - +
      - getChildHtml('grid.columnSet'); ?> + getChildHtml('grid.columnSet') ?>
      getChildBlock('grid.bottom.links')): ?> - getChildHtml('grid.bottom.links') ?> + getChildHtml('grid.bottom.links') ?> @@ -154,14 +154,14 @@ $numColumns = sizeof($block->getColumns()); deps.push('mage/adminhtml/grid'); - require(deps, function(getDependencyJsObject() ? 'registry' : '') ?>){ + require(deps, function(getDependencyJsObject() ? 'registry' : '') ?>){ getDependencyJsObject()): ?> registry.get('getDependencyJsObject() ?>', function (getDependencyJsObject() ?>) { - getJsObjectName() ?> = new varienGrid('escapeHtml($block->getId()) ?>', 'getGridUrl() ?>', 'getVarNamePage() ?>', 'getVarNameSort() ?>', 'getVarNameDir() ?>', 'getVarNameFilter() ?>'); + getJsObjectName() ?> = new varienGrid('escapeHtml($block->getId()) ?>', 'getGridUrl() ?>', 'getVarNamePage() ?>', 'getVarNameSort() ?>', 'getVarNameDir() ?>', 'getVarNameFilter() ?>'); getJsObjectName() ?>.useAjax = getUseAjax() ? 'true' : 'false' ?>; getRowClickCallback()): ?> getJsObjectName() ?>.rowClickCallback = getRowClickCallback() ?>; @@ -190,7 +190,7 @@ $numColumns = sizeof($block->getColumns()); getChildBlock('grid.js')): ?> - getChildHtml('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 722218af397be..3105bd4418858 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 @@ -18,7 +18,7 @@ $numColumns = sizeof($block->getColumns()); tags from the code. */ /* foreach ($block->getColumns() as $_column): ?> - getHtmlProperty() ?> /> + getHtmlProperty() ?> /> isHeaderVisible()): ?> @@ -28,9 +28,9 @@ $numColumns = sizeof($block->getColumns()); getHeaderHtml() == ' '):?> getHeaderHtmlProperty() ?>>  + getHeaderHtmlProperty() ?>>  - getHeaderHtml()?> + getHeaderHtml() ?> @@ -38,8 +38,8 @@ $numColumns = sizeof($block->getColumns()); isFilterVisible()): ?> getColumns() as $_column): ?> - getHeaderHtmlProperty() ?>> - getFilterHtml() ?> + getHeaderHtmlProperty() ?>> + getFilterHtml() ?> @@ -59,10 +59,10 @@ $numColumns = sizeof($block->getColumns()); if ($block->shouldRenderCell($_item, $_column)): $_rowspan = $block->getRowspan($_item, $_column); ?> - class="getCssProperty() ?> getId() == 'massaction' ? 'data-grid-checkbox-cell': ''?> " + + class="getCssProperty() ?> getId() == 'massaction' ? 'data-grid-checkbox-cell': ''?> " > - getRowField($_item)) != '' ? $_html : ' ') ?> + getRowField($_item)) != '' ? $_html : ' ') ?> shouldRenderEmptyCell($_item, $_column)):?> @@ -80,9 +80,9 @@ $numColumns = sizeof($block->getColumns()); getMultipleRowColumns($_i) as $_column): ?> - getRowField($_i)) != '' ? $_html : ' ') ?> + getRowField($_i)) != '' ? $_html : ' ') ?> @@ -92,7 +92,7 @@ $numColumns = sizeof($block->getColumns()); getMultipleRowColumns() as $_column): ?> hasSubtotalsLabel() ? $_column->getSubtotalsLabel() : $_column->getRowField($block->getSubTotals($_item)); @@ -108,9 +108,9 @@ $numColumns = sizeof($block->getColumns()); getColumns() as $_column): ?> shouldRenderCell($_item, $_column)):?> - getRowField($_item)) != '' ? $_html : ' ') ?> + getRowField($_item)) != '' ? $_html : ' ') ?> shouldRenderEmptyCell($_item, $_column)):?> 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 2af3cb632357f..700e9749f734b 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 @@ -7,4 +7,4 @@ // @codingStandardsIgnoreFile ?> -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 35f77715e7c32..bc5b744333c50 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 @@ -16,5 +16,5 @@ - getExportButtonHtml() ?> + getExportButtonHtml() ?>
      diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml index 3e347b5cdb2b7..2482cd45d71ed 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml @@ -26,53 +26,53 @@ $numColumns = sizeof($block->getColumns()); getCollection()): ?> canDisplayContainer()): ?> -
      +
      - getLayout()->getMessagesBlock()->getGroupedHtml() ?> + getLayout()->getMessagesBlock()->getGroupedHtml() ?> getMassactionBlock() && $block->getMassactionBlock()->isAvailable() ?> getPagerVisibility() || $block->getExportTypes() || $block->getFilterVisibility() || $massActionAvailable): ?>
      - getMainButtonsHtml() ? '
      ' . $block->getMainButtonsHtml() . '
      ' : ''; ?> + getMainButtonsHtml() ? '
      ' . $block->getMainButtonsHtml() . '
      ' : '' ?> getExportTypes()): ?>
      - getExportTypes() as $_type): ?> - getExportButtonHtml() ?> + getExportButtonHtml() ?>
      -
      +
      - getMassactionBlockHtml() ?> + getMassactionBlockHtml() ?> - getMainButtonsHtml() ? '
      ' . $block->getMainButtonsHtml() . '
      ' : ''; ?> + getMainButtonsHtml() ? '
      ' . $block->getMainButtonsHtml() . '
      ' : '' ?> getCollection()->getSize(); ?>
      - getUiId('total-count') ?>> + getUiId('total-count') ?>> - 0
      getPagerVisibility()): ?>
      -
      @@ -107,12 +107,12 @@ $numColumns = sizeof($block->getColumns()); getUiId('current-page') ?> /> -
      diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/content/new_list.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/content/new_list.phtml index a84c9c2052052..0ac61cd70ea4e 100644 --- a/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/content/new_list.phtml +++ b/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/content/new_list.phtml @@ -45,20 +45,20 @@ if ($exist = ($block->getProductCollection() && $block->getProductCollection()-> ' : '
    • ' ?>
      - getImage($_item, $image)->toHtml(); ?> + getImage($_item, $image)->toHtml() ?>
      - - escapeHtml($_item->getName()) ?> + escapeHtml($_item->getName()) ?> - getProductPriceHtml($_item, $type); ?> + getProductPriceHtml($_item, $type) ?> - getReviewsSummaryHtml($_item, $templateType) ?> + getReviewsSummaryHtml($_item, $templateType) ?> @@ -117,18 +117,18 @@ if ($exist = ($block->getProductCollection() && $block->getProductCollection()->
      productAttribute($_item, $_item->getShortDescription(), 'short_description') ?> -
      - ' : '' ?> + ' : '' ?>
    - getPagerHtml() ?> + getPagerHtml() ?>
    • diff --git a/app/code/Magento/CatalogInventory/view/frontend/templates/stockqty/composite.phtml b/app/code/Magento/CatalogInventory/view/frontend/templates/stockqty/composite.phtml index c77271f2f137a..b1fbbdd684c31 100644 --- a/app/code/Magento/CatalogInventory/view/frontend/templates/stockqty/composite.phtml +++ b/app/code/Magento/CatalogInventory/view/frontend/templates/stockqty/composite.phtml @@ -35,8 +35,8 @@ getProductStockQty($childProduct); ?> 0) : ?> - getName() ?> - + getName() ?> + diff --git a/app/code/Magento/CatalogRule/view/adminhtml/templates/promo/fieldset.phtml b/app/code/Magento/CatalogRule/view/adminhtml/templates/promo/fieldset.phtml index 0f8144dd4629e..27386ce17436e 100644 --- a/app/code/Magento/CatalogRule/view/adminhtml/templates/promo/fieldset.phtml +++ b/app/code/Magento/CatalogRule/view/adminhtml/templates/promo/fieldset.phtml @@ -16,11 +16,11 @@
    getComment()): ?>
    -
    escapeHtml($_element->getComment()) ?>
    +
    escapeHtml($_element->getComment()) ?>
    - getChildrenHtml() ?> + getChildrenHtml() ?>
    @@ -32,7 +32,7 @@ require([ window. = new VarienRulesForm('', 'getNewChildUrl() ?>'); getReadonly()): ?> - getHtmlId() ?>.setReadonly(true); + getHtmlId() ?>.setReadonly(true); }); diff --git a/app/code/Magento/CatalogRule/view/adminhtml/templates/promo/form.phtml b/app/code/Magento/CatalogRule/view/adminhtml/templates/promo/form.phtml index 43f7629b50210..1572c8f0d4e48 100644 --- a/app/code/Magento/CatalogRule/view/adminhtml/templates/promo/form.phtml +++ b/app/code/Magento/CatalogRule/view/adminhtml/templates/promo/form.phtml @@ -8,6 +8,6 @@ ?>
    -getFormHtml() ?> +getFormHtml() ?>
    diff --git a/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/form.phtml b/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/form.phtml index a6564f7cd2fec..dc3586480358c 100644 --- a/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/form.phtml +++ b/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/form.phtml @@ -22,7 +22,7 @@ getAttributeCode() ?>
    getAttributeInputType($_attribute)): @@ -32,9 +32,9 @@
    @@ -44,9 +44,9 @@
    @@ -59,9 +59,9 @@
    @@ -125,7 +125,7 @@
    diff --git a/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/result.phtml b/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/result.phtml index e5ca39f29f1bd..e5df9713550c8 100644 --- a/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/result.phtml +++ b/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/result.phtml @@ -34,7 +34,7 @@
      -
    • escapeHtml(__($criteria['name'])); ?>: escapeHtml($criteria['value']); ?>
      • +
    • escapeHtml(__($criteria['name'])) ?>: escapeHtml($criteria['value']) ?>
    @@ -49,6 +49,6 @@
    getResultCount()): ?> -
    getProductListHtml() ?>
    +
    getProductListHtml() ?>
    getSearchCriterias(); ?> diff --git a/app/code/Magento/CatalogSearch/view/frontend/templates/result.phtml b/app/code/Magento/CatalogSearch/view/frontend/templates/result.phtml index fe5af014cd9b6..97434ea54aa43 100644 --- a/app/code/Magento/CatalogSearch/view/frontend/templates/result.phtml +++ b/app/code/Magento/CatalogSearch/view/frontend/templates/result.phtml @@ -8,7 +8,7 @@ ?> getResultCount()): ?> -getChildHtml('tagged_product_list_rss_link'); ?> +getChildHtml('tagged_product_list_rss_link') ?>
    getNoteMessages()):?>
    @@ -19,14 +19,14 @@
    - getProductListHtml() ?> + getProductListHtml() ?>
    getNoResultText()) ? $block->getNoResultText() : __('Your search returned no results.') ?> - getAdditionalHtml() ?> + getAdditionalHtml() ?> getNoteMessages()):?>
    diff --git a/app/code/Magento/CatalogWidget/view/adminhtml/templates/product/widget/conditions.phtml b/app/code/Magento/CatalogWidget/view/adminhtml/templates/product/widget/conditions.phtml index 7bb4875465dbf..6ce6d83cf0814 100644 --- a/app/code/Magento/CatalogWidget/view/adminhtml/templates/product/widget/conditions.phtml +++ b/app/code/Magento/CatalogWidget/view/adminhtml/templates/product/widget/conditions.phtml @@ -17,11 +17,11 @@ $fieldAttributes = $fieldId . ' class="' . $fieldClass . '" ' . $block->getUiId('form-field', $block->escapeHtmlAttr($element->getId())); ?> > - getLabelHtml() ?> + getLabelHtml() ?>
    - getInputHtml() ?> + getInputHtml() ?>
    @@ -33,6 +33,6 @@ $fieldAttributes = $fieldId . ' class="' . $fieldClass . '" ' "Magento_Rule/rules", "prototype" ], function(VarienRulesForm){ - window.escapeJs($block->getHtmlId()) ?> = new VarienRulesForm('escapeJs($block->getHtmlId()) ?>', 'escapeUrl($block->getNewChildUrl()) ?>'); + window.escapeJs($block->getHtmlId()) ?> = new VarienRulesForm('escapeJs($block->getHtmlId()) ?>', 'escapeUrl($block->getNewChildUrl()) ?>'); }); diff --git a/app/code/Magento/CatalogWidget/view/frontend/templates/product/widget/content/grid.phtml b/app/code/Magento/CatalogWidget/view/frontend/templates/product/widget/content/grid.phtml index 39094d32862d3..88a5b73daf6c0 100644 --- a/app/code/Magento/CatalogWidget/view/frontend/templates/product/widget/content/grid.phtml +++ b/app/code/Magento/CatalogWidget/view/frontend/templates/product/widget/content/grid.phtml @@ -26,7 +26,7 @@
    getTitle()): ?>
    - escapeHtml(__($block->getTitle())); ?> + escapeHtml(__($block->getTitle())) ?>
    @@ -38,15 +38,15 @@
  • - - getImage($_item, $image)->toHtml(); ?> + + getImage($_item, $image)->toHtml() ?>
    - - escapeHtml($_item->getName()) ?> + escapeHtml($_item->getName()) ?> - getReviewsSummaryHtml($_item, $templateType) ?> + getReviewsSummaryHtml($_item, $templateType) ?> @@ -63,23 +63,23 @@
    isSaleable()): ?> getTypeInstance()->hasRequiredOptions($_item)): ?> - helper('Magento\Framework\Data\Helper\PostHelper'); $postData = $postDataHelper->getPostData($block->getAddToCartUrl($_item), ['product' => $_item->getEntityId()]) ?> - getIsSalable()): ?> -
    escapeHtml(__('In stock')) ?>
    +
    escapeHtml(__('In stock')) ?>
    -
    escapeHtml(__('Out of stock')) ?>
    +
    escapeHtml(__('Out of stock')) ?>
    @@ -88,14 +88,14 @@
    helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist): ?> - escapeHtml(__('Add to Wish List')) ?> + data-post='getAddToWishlistParams($_item); ?>' class="action towishlist" data-action="add-to-wishlist" title="escapeHtmlAttr(__('Add to Wish List')) ?>"> + escapeHtml(__('Add to Wish List')) ?> getAddToCompareUrl() && $showCompare): ?> helper('Magento\Catalog\Helper\Product\Compare');?> - - escapeHtml(__('Add to Compare')) ?> + + escapeHtml(__('Add to Compare')) ?>
    @@ -104,11 +104,11 @@
    - ' : '' ?> + ' : '' ?>
    • - getPagerHtml() ?> + getPagerHtml() ?>
    diff --git a/app/code/Magento/Checkout/view/frontend/templates/button.phtml b/app/code/Magento/Checkout/view/frontend/templates/button.phtml index c2526301cf6c0..1ef991e3f6f7c 100644 --- a/app/code/Magento/Checkout/view/frontend/templates/button.phtml +++ b/app/code/Magento/Checkout/view/frontend/templates/button.phtml @@ -11,5 +11,5 @@ getCanViewOrder() && $block->getCanPrintOrder()) :?> Print receipt', $block->getPrintUrl()) ?> - getChildHtml() ?> + getChildHtml() ?> diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/coupon.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/coupon.phtml index 954eb67c81800..fed55824abe7e 100644 --- a/app/code/Magento/Checkout/view/frontend/templates/cart/coupon.phtml +++ b/app/code/Magento/Checkout/view/frontend/templates/cart/coupon.phtml @@ -19,12 +19,12 @@ "removeCouponSelector": "#remove-coupon", "applyButton": "button.action.apply", "cancelButton": "button.action.cancel"}}'> -
    +
    - +
    diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/form.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/form.phtml index 1167e901c8c1b..619ba45630778 100644 --- a/app/code/Magento/Checkout/view/frontend/templates/cart/form.phtml +++ b/app/code/Magento/Checkout/view/frontend/templates/cart/form.phtml @@ -9,16 +9,16 @@ /** @var $block \Magento\Checkout\Block\Cart\Grid */ ?> helper('Magento\Tax\Helper\Data')->displayCartBothPrices() ? 2 : 1); ?> -getChildHtml('form_before') ?> +getChildHtml('form_before') ?>
    - getBlockHtml('formkey'); ?> -
    + getBlockHtml('formkey') ?> +
    getPagerHtml()): ?> -
    getPagerHtml(); ?>
    +
    getPagerHtml() ?>
    getItems() as $_item): ?> - getItemHtml($_item) ?> + getItemHtml($_item) ?>
    getPagerHtml()): ?> -
    getPagerHtml(); ?>
    +
    getPagerHtml() ?>
    getContinueShoppingUrl()): ?> + href="escapeUrl($block->getContinueShoppingUrl()) ?>" + title="escapeHtml(__('Continue Shopping')) ?>"> @@ -53,7 +53,7 @@ name="update_cart_action" data-cart-empty="" value="empty_cart" - title="escapeHtml(__('Clear Shopping Cart')); ?>" + title="escapeHtml(__('Clear Shopping Cart')) ?>" class="action clear" id="empty_cart_button"> @@ -61,13 +61,13 @@ name="update_cart_action" data-cart-item-update="" value="update_qty" - title="escapeHtml(__('Update Shopping Cart')); ?>" + title="escapeHtml(__('Update Shopping Cart')) ?>" class="action update">
    -getChildHtml('checkout.cart.order.actions') ?> -getChildHtml('shopping.cart.table.after'); ?> +getChildHtml('checkout.cart.order.actions') ?> +getChildHtml('shopping.cart.table.after') ?> diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/item/configure/updatecart.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/item/configure/updatecart.phtml index 9e7a3b7366abb..12e56148012bc 100644 --- a/app/code/Magento/Checkout/view/frontend/templates/cart/item/configure/updatecart.phtml +++ b/app/code/Magento/Checkout/view/frontend/templates/cart/item/configure/updatecart.phtml @@ -34,7 +34,7 @@ id="product-updatecart-button"> - getChildHtml('', true) ?> + getChildHtml('', true) ?>
    diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/item/default.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/item/default.phtml index 405adb0c8c67f..00c7a6347da7b 100644 --- a/app/code/Magento/Checkout/view/frontend/templates/cart/item/default.phtml +++ b/app/code/Magento/Checkout/view/frontend/templates/cart/item/default.phtml @@ -17,16 +17,16 @@ $canApplyMsrp = $helper->isShowBeforeOrderConfirm($product) && $helper->isMinima ?> - + hasProductUrl()):?> - getImage($block->getProductForThumbnail(), 'cart_page_product_thumbnail')->toHtml(); ?> + getImage($block->getProductForThumbnail(), 'cart_page_product_thumbnail')->toHtml() ?> hasProductUrl()):?> @@ -35,16 +35,16 @@ $canApplyMsrp = $helper->isShowBeforeOrderConfirm($product) && $helper->isMinima
    hasProductUrl()):?> - escapeHtml($block->getProductName()) ?> + escapeHtml($block->getProductName()) ?> - escapeHtml($block->getProductName()) ?> + escapeHtml($block->getProductName()) ?> getOptionList()):?>
    getFormatedOptionValue($_option) ?> -
    escapeHtml($_option['label']) ?>
    +
    escapeHtml($_option['label']) ?>
    @@ -57,18 +57,18 @@ $canApplyMsrp = $helper->isShowBeforeOrderConfirm($product) && $helper->isMinima getMessages()): ?> -
    escapeHtml($message['text']) ?>
    +
    escapeHtml($message['text']) ?>
    getProductAdditionalInformationBlock(); ?> - setItem($_item)->toHtml() ?> + setItem($_item)->toHtml() ?>
    - + getId(); ?> @@ -78,11 +78,11 @@ $canApplyMsrp = $helper->isShowBeforeOrderConfirm($product) && $helper->isMinima - - getUnitPriceHtml($_item); ?> + + getUnitPriceHtml($_item) ?> - +
    - + -- - getRowTotalHtml($_item); ?> + getRowTotalHtml($_item) ?> diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/item/renderer/actions/edit.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/item/renderer/actions/edit.phtml index fc9b6b5ff941b..a0a5c71de9e1a 100644 --- a/app/code/Magento/Checkout/view/frontend/templates/cart/item/renderer/actions/edit.phtml +++ b/app/code/Magento/Checkout/view/frontend/templates/cart/item/renderer/actions/edit.phtml @@ -11,7 +11,7 @@ isProductVisibleInSiteVisibility()): ?> + title="escapeHtml(__('Edit item parameters')) ?>"> diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/item/renderer/actions/remove.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/item/renderer/actions/remove.phtml index 80ffa1053315d..f8a8a86ef3cd1 100644 --- a/app/code/Magento/Checkout/view/frontend/templates/cart/item/renderer/actions/remove.phtml +++ b/app/code/Magento/Checkout/view/frontend/templates/cart/item/renderer/actions/remove.phtml @@ -9,7 +9,7 @@ /** @var $block \Magento\Checkout\Block\Cart\Item\Renderer\Actions\Remove */ ?> diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/minicart.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/minicart.phtml index 10f6c491349a6..96d87bc330ebb 100644 --- a/app/code/Magento/Checkout/view/frontend/templates/cart/minicart.phtml +++ b/app/code/Magento/Checkout/view/frontend/templates/cart/minicart.phtml @@ -39,7 +39,7 @@
    - getChildHtml('minicart.addons'); ?> + getChildHtml('minicart.addons') ?>
    -getButtonHtml(); ?> +getButtonHtml() ?> diff --git a/app/code/Magento/Config/view/adminhtml/templates/system/config/edit.phtml b/app/code/Magento/Config/view/adminhtml/templates/system/config/edit.phtml index 3dd996db26709..053b54402188f 100644 --- a/app/code/Magento/Config/view/adminhtml/templates/system/config/edit.phtml +++ b/app/code/Magento/Config/view/adminhtml/templates/system/config/edit.phtml @@ -17,9 +17,9 @@ */ ?>
    - getBlockHtml('formkey')?> + getBlockHtml('formkey') ?>
    - getChildHtml('form') ?> + getChildHtml('form') ?>
    -
    diff --git a/app/code/Magento/Customer/view/adminhtml/templates/tab/cart.phtml b/app/code/Magento/Customer/view/adminhtml/templates/tab/cart.phtml index 12a27edb45cf3..76fa53c12548d 100644 --- a/app/code/Magento/Customer/view/adminhtml/templates/tab/cart.phtml +++ b/app/code/Magento/Customer/view/adminhtml/templates/tab/cart.phtml @@ -12,12 +12,12 @@
    - +

    escapeHtml($block->getCartHeader()); ?>

    escapeHtml($block->getCartHeader()) ?>
    -getGridParentHtml() ?> +getGridParentHtml() ?> canDisplayContainer()) : ?> getJsObjectName(); @@ -29,19 +29,19 @@ require([ "Magento_Catalog/catalog/product/composite/configure" ], function(alert, confirm){ -escapeJs($block->getJsObjectName()) ?>cartControl = { +escapeJs($block->getJsObjectName()) ?>cartControl = { reload: function (params) { if (!params) { params = {}; } - escapeJs($block->getJsObjectName()) ?>.reloadParams = params; - escapeJs($block->getJsObjectName()) ?>.reload(); - escapeJs($block->getJsObjectName()) ?>.reloadParams = {}; + escapeJs($block->getJsObjectName()) ?>.reloadParams = params; + escapeJs($block->getJsObjectName()) ?>.reload(); + escapeJs($block->getJsObjectName()) ?>.reloadParams = {}; }, configureItem: function (itemId) { - productConfigure.setOnLoadIFrameCallback('escapeJs($listType) ?>', this.cbOnLoadIframe.bind(this)); - productConfigure.showItemConfiguration('escapeJs($listType) ?>', itemId); + productConfigure.setOnLoadIFrameCallback('escapeJs($listType) ?>', this.cbOnLoadIframe.bind(this)); + productConfigure.showItemConfiguration('escapeJs($listType) ?>', itemId); return false; }, @@ -57,14 +57,14 @@ require([ if (!itemId) { alert({ - content: 'escapeJs(__('No item specified.')) ?>' + content: 'escapeJs(__('No item specified.')) ?>' }); return false; } confirm({ - content: 'escapeJs(__('Are you sure you want to remove this item?')) ?>', + content: 'escapeJs(__('Are you sure you want to remove this item?')) ?>', actions: { confirm: function(){ self.reload({'delete':itemId}); @@ -81,10 +81,10 @@ $params = [ ]; ?> productConfigure.addListType( - 'escapeJs($listType) ?>', + 'escapeJs($listType) ?>', { - urlFetch: 'escapeJs($block->escapeUrl($block->getUrl('customer/cart_product_composite_cart/configure', $params))) ?>', - urlConfirm: 'escapeJs($block->escapeUrl($block->getUrl('customer/cart_product_composite_cart/update', $params))) ?>' + urlFetch: 'escapeJs($block->escapeUrl($block->getUrl('customer/cart_product_composite_cart/configure', $params))) ?>', + urlConfirm: 'escapeJs($block->escapeUrl($block->getUrl('customer/cart_product_composite_cart/update', $params))) ?>' } ); diff --git a/app/code/Magento/Customer/view/adminhtml/templates/tab/newsletter.phtml b/app/code/Magento/Customer/view/adminhtml/templates/tab/newsletter.phtml index 732ce93c6d1ed..30acb16c158d2 100644 --- a/app/code/Magento/Customer/view/adminhtml/templates/tab/newsletter.phtml +++ b/app/code/Magento/Customer/view/adminhtml/templates/tab/newsletter.phtml @@ -8,6 +8,6 @@ ?>
    -getForm()->getHtml() ?> +getForm()->getHtml() ?>
    -getChildHtml('grid') ?> +getChildHtml('grid') ?> diff --git a/app/code/Magento/Customer/view/adminhtml/templates/tab/view/personal_info.phtml b/app/code/Magento/Customer/view/adminhtml/templates/tab/view/personal_info.phtml index 76b757f5a1876..f43cb8ab5f0de 100644 --- a/app/code/Magento/Customer/view/adminhtml/templates/tab/view/personal_info.phtml +++ b/app/code/Magento/Customer/view/adminhtml/templates/tab/view/personal_info.phtml @@ -16,52 +16,52 @@ $createDateStore = $block->getStoreCreateDate(); ?>
    - escapeHtml(__('Personal Information')) ?> + escapeHtml(__('Personal Information')) ?>
    - getChildHtml(); ?> + getChildHtml() ?> - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + +
    escapeHtml(__('Last Logged In:')) ?>escapeHtml($lastLoginDateAdmin) ?> (escapeHtml($block->getCurrentStatus()) ?>)escapeHtml(__('Last Logged In:')) ?>escapeHtml($lastLoginDateAdmin) ?> (escapeHtml($block->getCurrentStatus()) ?>)
    escapeHtml(__('Last Logged In (%1):', $block->getStoreLastLoginDateTimezone())) ?>escapeHtml($lastLoginDateStore) ?> (escapeHtml($block->getCurrentStatus()) ?>)escapeHtml(__('Last Logged In (%1):', $block->getStoreLastLoginDateTimezone())) ?>escapeHtml($lastLoginDateStore) ?> (escapeHtml($block->getCurrentStatus()) ?>)
    escapeHtml(__('Account Lock:')) ?>escapeHtml($block->getAccountLock()) ?>escapeHtml(__('Account Lock:')) ?>escapeHtml($block->getAccountLock()) ?>
    escapeHtml(__('Confirmed email:')) ?>escapeHtml($block->getIsConfirmedStatus()) ?>escapeHtml(__('Confirmed email:')) ?>escapeHtml($block->getIsConfirmedStatus()) ?>
    escapeHtml(__('Account Created:')) ?>escapeHtml($createDateAdmin) ?>escapeHtml(__('Account Created:')) ?>escapeHtml($createDateAdmin) ?>
    escapeHtml(__('Account Created on (%1):', $block->getStoreCreateDateTimezone())) ?>escapeHtml($createDateStore) ?>escapeHtml(__('Account Created on (%1):', $block->getStoreCreateDateTimezone())) ?>escapeHtml($createDateStore) ?>
    escapeHtml(__('Account Created in:')) ?>escapeHtml($block->getCreatedInStore()) ?>escapeHtml(__('Account Created in:')) ?>escapeHtml($block->getCreatedInStore()) ?>
    escapeHtml(__('Customer Group:')) ?>escapeHtml($block->getGroupName()) ?>escapeHtml(__('Customer Group:')) ?>escapeHtml($block->getGroupName()) ?>
    - escapeHtml(__('Default Billing Address')) ?>
    - getBillingAddressHtml() ?> + escapeHtml(__('Default Billing Address')) ?>
    + getBillingAddressHtml() ?>
    diff --git a/app/code/Magento/Customer/view/adminhtml/templates/tab/view/sales.phtml b/app/code/Magento/Customer/view/adminhtml/templates/tab/view/sales.phtml index 720ddcf9261b7..616a93a771a7b 100644 --- a/app/code/Magento/Customer/view/adminhtml/templates/tab/view/sales.phtml +++ b/app/code/Magento/Customer/view/adminhtml/templates/tab/view/sales.phtml @@ -13,27 +13,27 @@ $singleStoreMode = $block->isSingleStoreMode();
    - escapeHtml(__('Sales Statistics')) ?> + escapeHtml(__('Sales Statistics')) ?>
    - - - + + + - - + + - - - + + + @@ -47,24 +47,24 @@ $singleStoreMode = $block->isSingleStoreMode(); getStoreId() == 0): ?> - + - > + > - + - + - + - - + + diff --git a/app/code/Magento/Customer/view/frontend/templates/account/authentication-popup.phtml b/app/code/Magento/Customer/view/frontend/templates/account/authentication-popup.phtml index 79baa6f70885e..4fe821607d68f 100644 --- a/app/code/Magento/Customer/view/frontend/templates/account/authentication-popup.phtml +++ b/app/code/Magento/Customer/view/frontend/templates/account/authentication-popup.phtml @@ -19,7 +19,7 @@ "Magento_Ui/js/core/app": getJsLayout();?> }, "*": { - "Magento_Ui/js/block-loader": "escapeJs($block->escapeUrl($block->getViewFileUrl('images/loader-1.gif'))); ?>" + "Magento_Ui/js/block-loader": "escapeJs($block->escapeUrl($block->getViewFileUrl('images/loader-1.gif'))) ?>" } } diff --git a/app/code/Magento/Customer/view/frontend/templates/account/customer.phtml b/app/code/Magento/Customer/view/frontend/templates/account/customer.phtml index 4ed309bf92a0c..2bdb6ac044a92 100644 --- a/app/code/Magento/Customer/view/frontend/templates/account/customer.phtml +++ b/app/code/Magento/Customer/view/frontend/templates/account/customer.phtml @@ -21,7 +21,7 @@ class="action switch" tabindex="-1" data-action="customer-menu-toggle"> - escapeHtml(__('Change'))?> + escapeHtml(__('Change')) ?>getChildHtml()):?>
    - getChildHtml();?> + getChildHtml() ?>
    diff --git a/app/code/Magento/Customer/view/frontend/templates/account/dashboard/address.phtml b/app/code/Magento/Customer/view/frontend/templates/account/dashboard/address.phtml index 0b2763826064c..8186bae50940c 100644 --- a/app/code/Magento/Customer/view/frontend/templates/account/dashboard/address.phtml +++ b/app/code/Magento/Customer/view/frontend/templates/account/dashboard/address.phtml @@ -10,34 +10,34 @@ ?>
    - escapeHtml(__('Address Book')) ?> - escapeHtml(__('Manage Addresses')) ?> + escapeHtml(__('Address Book')) ?> + escapeHtml(__('Manage Addresses')) ?>
    - escapeHtml(__('Default Billing Address')) ?> + escapeHtml(__('Default Billing Address')) ?>
    - getPrimaryBillingAddressHtml() ?> + getPrimaryBillingAddressHtml() ?>
    - escapeHtml(__('Edit Address')) ?> + escapeHtml(__('Edit Address')) ?>
    - escapeHtml(__('Default Shipping Address')) ?> + escapeHtml(__('Default Shipping Address')) ?>
    - getPrimaryShippingAddressHtml() ?> + getPrimaryShippingAddressHtml() ?>
    - escapeHtml(__('Edit Address')) ?> + escapeHtml(__('Edit Address')) ?>
    diff --git a/app/code/Magento/Customer/view/frontend/templates/account/dashboard/info.phtml b/app/code/Magento/Customer/view/frontend/templates/account/dashboard/info.phtml index da5842d91615a..7881b7e857fd9 100644 --- a/app/code/Magento/Customer/view/frontend/templates/account/dashboard/info.phtml +++ b/app/code/Magento/Customer/view/frontend/templates/account/dashboard/info.phtml @@ -9,45 +9,45 @@ /** @var \Magento\Customer\Block\Account\Dashboard\Info $block */ ?>
    -
    escapeHtml(__('Account Information')) ?>
    +
    escapeHtml(__('Account Information')) ?>
    - escapeHtml(__('Contact Information')) ?> + escapeHtml(__('Contact Information')) ?>

    - escapeHtml($block->getName()) ?>
    - escapeHtml($block->getCustomer()->getEmail()) ?>
    + escapeHtml($block->getName()) ?>
    + escapeHtml($block->getCustomer()->getEmail()) ?>

    - - escapeHtml(__('Edit')) ?> + + escapeHtml(__('Edit')) ?> - - escapeHtml(__('Change Password')) ?> + + escapeHtml(__('Change Password')) ?>
    isNewsletterEnabled()): ?>
    - escapeHtml(__('Newsletters')) ?> + escapeHtml(__('Newsletters')) ?>

    getIsSubscribed()): ?> - escapeHtml(__('You are subscribed to "General Subscription".')) ?> + escapeHtml(__('You are subscribed to "General Subscription".')) ?> - escapeHtml(__('You aren\'t subscribed to our newsletter.')) ?> + escapeHtml(__('You aren\'t subscribed to our newsletter.')) ?>

    - getChildHtml('customer.account.dashboard.info.extra')?> + getChildHtml('customer.account.dashboard.info.extra') ?>
    - escapeHtml(__('Edit')) ?> + escapeHtml(__('Edit')) ?>
    diff --git a/app/code/Magento/Customer/view/frontend/templates/account/link/authorization.phtml b/app/code/Magento/Customer/view/frontend/templates/account/link/authorization.phtml index 1b045a0cc3c15..bd0d7e5e175e7 100644 --- a/app/code/Magento/Customer/view/frontend/templates/account/link/authorization.phtml +++ b/app/code/Magento/Customer/view/frontend/templates/account/link/authorization.phtml @@ -13,8 +13,8 @@ if ($block->isLoggedIn()) { $dataPostParam = sprintf(" data-post='%s'", $block->getPostParams()); } ?> -
  • +
  • getLinkAttributes(); ?>> - escapeHtml($block->getLabel()); ?> + escapeHtml($block->getLabel()) ?>
    • diff --git a/app/code/Magento/Customer/view/frontend/templates/account/link/back.phtml b/app/code/Magento/Customer/view/frontend/templates/account/link/back.phtml index 85b3f181bd73d..20638b798d728 100644 --- a/app/code/Magento/Customer/view/frontend/templates/account/link/back.phtml +++ b/app/code/Magento/Customer/view/frontend/templates/account/link/back.phtml @@ -8,5 +8,5 @@ ?>
    -
    escapeHtml(__('Back')) ?>
    +
    escapeHtml(__('Back')) ?>
    diff --git a/app/code/Magento/Customer/view/frontend/templates/account/navigation.phtml b/app/code/Magento/Customer/view/frontend/templates/account/navigation.phtml index 13311f26db406..b766093d21b3e 100644 --- a/app/code/Magento/Customer/view/frontend/templates/account/navigation.phtml +++ b/app/code/Magento/Customer/view/frontend/templates/account/navigation.phtml @@ -8,12 +8,12 @@ ?>
    escapeHtml(__('Web Site')) ?>escapeHtml(__('Store')) ?>escapeHtml(__('Store View')) ?>escapeHtml(__('Web Site')) ?>escapeHtml(__('Store')) ?>escapeHtml(__('Store View')) ?> escapeHtml(__('Lifetime Sales')) ?>escapeHtml(__('Average Sale')) ?>escapeHtml(__('Lifetime Sales')) ?>escapeHtml(__('Average Sale')) ?>
    escapeHtml(__('All Store Views')) ?>escapeHtml($block->formatCurrency($block->getTotals()->getBaseLifetime())) ?>escapeHtml($block->formatCurrency($block->getTotals()->getAvgsale())) ?>escapeHtml(__('All Store Views')) ?>escapeHtml($block->formatCurrency($block->getTotals()->getBaseLifetime())) ?>escapeHtml($block->formatCurrency($block->getTotals()->getAvgsale())) ?>
    escapeHtml($_row->getStoreName()) ?>escapeHtml($_row->getStoreName()) ?> escapeHtml($_row->getWebsiteName()) ?>escapeHtml($_row->getWebsiteName()) ?> escapeHtml($_row->getGroupName()) ?>escapeHtml($_row->getGroupName()) ?> escapeHtml($_row->getStoreName()) ?>escapeHtml($_row->getStoreName()) ?>
    escapeHtml($block->formatCurrency($_row->getLifetime(), $_row->getWebsiteId())) ?>escapeHtml($block->formatCurrency($_row->getAvgsale(), $_row->getWebsiteId())) ?>escapeHtml($block->formatCurrency($_row->getLifetime(), $_row->getWebsiteId())) ?>escapeHtml($block->formatCurrency($_row->getAvgsale(), $_row->getWebsiteId())) ?>
    escapeHtml( $this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonEncode($block->getAssociatedProducts()) ); ?>"> diff --git a/app/code/Magento/GroupedProduct/view/base/templates/product/price/final_price.phtml b/app/code/Magento/GroupedProduct/view/base/templates/product/price/final_price.phtml index 0f7d60fe3a9f2..32a4a199795e0 100644 --- a/app/code/Magento/GroupedProduct/view/base/templates/product/price/final_price.phtml +++ b/app/code/Magento/GroupedProduct/view/base/templates/product/price/final_price.phtml @@ -29,7 +29,7 @@ if ($minProduct) {
    getZone()): ?>

    - toHtml();?> + toHtml() ?>

    diff --git a/app/code/Magento/GroupedProduct/view/frontend/templates/product/view/type/grouped.phtml b/app/code/Magento/GroupedProduct/view/frontend/templates/product/view/type/grouped.phtml index 3e89cca89251a..df3721d940e3d 100644 --- a/app/code/Magento/GroupedProduct/view/frontend/templates/product/view/type/grouped.phtml +++ b/app/code/Magento/GroupedProduct/view/frontend/templates/product/view/type/grouped.phtml @@ -34,8 +34,8 @@     - isSaleable()): ?> - - - + - - getVirtualQuoteItems() as $_item): ?> - - + + diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/item/default.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/item/default.phtml index 5e279a4dbea06..3bf53d455aee3 100644 --- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/item/default.phtml +++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/item/default.phtml @@ -7,17 +7,17 @@ // @codingStandardsIgnoreFile ?> -escapeHtml($block->getProductName()) ?> +escapeHtml($block->getProductName()) ?> getOptionList()): ?>
    getFormatedOptionValue($_option) ?> -
    escapeHtml($_option['label']) ?>
    +
    escapeHtml($_option['label']) ?>
    class="tooltip wrapper">
    -
    escapeHtml($_option['label']) ?>
    +
    escapeHtml($_option['label']) ?>
    @@ -26,5 +26,5 @@
    getProductAdditionalInformationBlock()): ?> - setItem($block->getItem())->toHtml() ?> + setItem($block->getItem())->toHtml() ?> diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/overview.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/overview.phtml index 051596321a52d..71f3f1032a4a7 100644 --- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/overview.phtml +++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/overview.phtml @@ -9,7 +9,7 @@ /** @var \Magento\Multishipping\Block\Checkout\Overview $block */ ?>
    - getBlockHtml('formkey'); ?> + getBlockHtml('formkey') ?>
    @@ -31,9 +31,9 @@
    - - - getPaymentHtml() ?> + + + getPaymentHtml() ?>
    @@ -64,7 +64,7 @@ getShippingAddressRate($_address)): ?>
    - escapeHtml($_rate->getCarrierTitle()) ?> (escapeHtml($_rate->getMethodTitle()) ?>) + escapeHtml($_rate->getCarrierTitle()) ?> (escapeHtml($_rate->getMethodTitle()) ?>) getShippingPriceExclTax($_address); ?> getShippingPriceInclTax($_address); ?> @@ -98,7 +98,7 @@
    getShippingAddressItems($_address) as $_item): ?> - getRowItemHtml($_item); ?> + getRowItemHtml($_item) ?> @@ -134,7 +134,7 @@ getVirtualItems() as $_item): ?> - getRowItemHtml($_item); ?> + getRowItemHtml($_item) ?> @@ -146,10 +146,10 @@ - getChildHtml('items_after'); ?> + getChildHtml('items_after') ?>
    - getChildHtml('agreements') ?> + getChildHtml('agreements') ?>
    helper('Magento\Checkout\Helper\Data')->formatPrice($block->getTotal()) ?> diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/overview/item.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/overview/item.phtml index e3f77207c1abf..e802e438c65c2 100644 --- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/overview/item.phtml +++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/overview/item.phtml @@ -17,39 +17,39 @@ getItem() ?>
    - - - - + getAddressItems($_address) as $_item): ?> - - + + @@ -111,7 +111,7 @@ - getChildHtml('checkout_billing_items') ?> + getChildHtml('checkout_billing_items') ?>
    diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/state.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/state.phtml index 689640b3830ba..bb720f23d62b5 100644 --- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/state.phtml +++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/state.phtml @@ -16,6 +16,6 @@ ?>
      getSteps() as $_step): ?> -
    1. getLabel() ?>
      2. +
    2. getLabel() ?>
    diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/success.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/success.phtml index 67f70fc961026..a5dee606bf1da 100644 --- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/success.phtml +++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/success.phtml @@ -8,23 +8,23 @@ ?>
    -

    escapeHtml(__('Thank you for your purchase!')) ?>

    -

    escapeHtml(__('Thanks for your order. We\'ll email you order details and tracking information.')) ?>

    +

    escapeHtml(__('Thank you for your purchase!')) ?>

    +

    escapeHtml(__('Thanks for your order. We\'ll email you order details and tracking information.')) ?>

    getOrderIds()): ?>

    1): ?> - escapeHtml(__('Your order numbers are: ')) ?> + escapeHtml(__('Your order numbers are: ')) ?> - escapeHtml(__('Your order number is: ')) ?> + escapeHtml(__('Your order number is: ')) ?> - $incrementId): ?> + $incrementId): ?>

    - getChildHtml() ?> + getChildHtml() ?>
    - escapeHtml(__('Continue Shopping')) ?> + escapeHtml(__('Continue Shopping')) ?>
    diff --git a/app/code/Magento/Multishipping/view/frontend/templates/js/components.phtml b/app/code/Magento/Multishipping/view/frontend/templates/js/components.phtml index e71938935b8f3..bad5acc209b5f 100644 --- a/app/code/Magento/Multishipping/view/frontend/templates/js/components.phtml +++ b/app/code/Magento/Multishipping/view/frontend/templates/js/components.phtml @@ -7,4 +7,4 @@ // @codingStandardsIgnoreFile ?> -getChildHtml() ?> +getChildHtml() ?> diff --git a/app/code/Magento/Multishipping/view/frontend/templates/multishipping/item/default.phtml b/app/code/Magento/Multishipping/view/frontend/templates/multishipping/item/default.phtml index 11c2ec77a8f50..efc51792216b3 100644 --- a/app/code/Magento/Multishipping/view/frontend/templates/multishipping/item/default.phtml +++ b/app/code/Magento/Multishipping/view/frontend/templates/multishipping/item/default.phtml @@ -8,17 +8,17 @@ ?>
    - escapeHtml($block->getProductName()) ?> + escapeHtml($block->getProductName()) ?> getOptionList()): ?>
    getFormatedOptionValue($_option) ?> -
    escapeHtml($_option['label']) ?>
    +
    escapeHtml($_option['label']) ?>
    class="tooltip wrapper">
    -
    escapeHtml($_option['label']) ?>
    +
    escapeHtml($_option['label']) ?>
    @@ -27,6 +27,6 @@
    getProductAdditionalInformationBlock()): ?> - setItem($block->getItem())->toHtml() ?> + setItem($block->getItem())->toHtml() ?>
    diff --git a/app/code/Magento/Newsletter/view/adminhtml/templates/preview/iframeswitcher.phtml b/app/code/Magento/Newsletter/view/adminhtml/templates/preview/iframeswitcher.phtml index 310824ce8ac4f..a64185ce67958 100644 --- a/app/code/Magento/Newsletter/view/adminhtml/templates/preview/iframeswitcher.phtml +++ b/app/code/Magento/Newsletter/view/adminhtml/templates/preview/iframeswitcher.phtml @@ -12,12 +12,12 @@
    isSingleStoreMode()) :?>
    - getChildHtml('store_switcher') ?> + getChildHtml('store_switcher') ?>
    - - getChildHtml('preview_form'); ?> + + getChildHtml('preview_form') ?>
    - escapeHtml(__("Rating isn't Available")) ?> + escapeHtml(__("Rating isn't Available")) ?> diff --git a/app/code/Magento/Review/view/adminhtml/templates/rating/form.phtml b/app/code/Magento/Review/view/adminhtml/templates/rating/form.phtml index 726a13f1cb3e1..0779d0fcbea3e 100644 --- a/app/code/Magento/Review/view/adminhtml/templates/rating/form.phtml +++ b/app/code/Magento/Review/view/adminhtml/templates/rating/form.phtml @@ -10,8 +10,8 @@ ?>
    -
    escapeHtml(__('Please specify a rating title for a store, or we\'ll just use the default value.')); ?>
    +
    escapeHtml(__('Please specify a rating title for a store, or we\'ll just use the default value.')) ?>
    -getFormHtml() ?> +getFormHtml() ?> diff --git a/app/code/Magento/Review/view/adminhtml/templates/rating/options.phtml b/app/code/Magento/Review/view/adminhtml/templates/rating/options.phtml index 4b30a3ad9ed2c..acf11decf4cdd 100644 --- a/app/code/Magento/Review/view/adminhtml/templates/rating/options.phtml +++ b/app/code/Magento/Review/view/adminhtml/templates/rating/options.phtml @@ -8,21 +8,21 @@ // @deprecated ?>
    -

    escapeHtml(__('Assigned Options')) ?>

    +

    escapeHtml(__('Assigned Options')) ?>

    - + getSize() > 0): ?> getItems() as $_item): ?> - - + + diff --git a/app/code/Magento/Review/view/adminhtml/templates/rating/stars/detailed.phtml b/app/code/Magento/Review/view/adminhtml/templates/rating/stars/detailed.phtml index 17ce6c641c20b..a73570c9b1463 100644 --- a/app/code/Magento/Review/view/adminhtml/templates/rating/stars/detailed.phtml +++ b/app/code/Magento/Review/view/adminhtml/templates/rating/stars/detailed.phtml @@ -12,7 +12,7 @@ getRating() as $_rating): ?> getPercent()): ?>
    - escapeHtml($_rating->getRatingCode()) ?> + escapeHtml($_rating->getRatingCode()) ?>
    @@ -21,5 +21,5 @@
    - escapeHtml(__("Rating isn't Available")) ?> + escapeHtml(__("Rating isn't Available")) ?> diff --git a/app/code/Magento/Review/view/adminhtml/templates/rating/stars/summary.phtml b/app/code/Magento/Review/view/adminhtml/templates/rating/stars/summary.phtml index 33b90512224fb..4a50ff9e1a8ba 100644 --- a/app/code/Magento/Review/view/adminhtml/templates/rating/stars/summary.phtml +++ b/app/code/Magento/Review/view/adminhtml/templates/rating/stars/summary.phtml @@ -13,5 +13,5 @@
    - escapeHtml(__("Rating isn't Available")) ?> + escapeHtml(__("Rating isn't Available")) ?> diff --git a/app/code/Magento/Review/view/adminhtml/templates/rss/grid/link.phtml b/app/code/Magento/Review/view/adminhtml/templates/rss/grid/link.phtml index 4f01668942a0c..375e983b267e4 100644 --- a/app/code/Magento/Review/view/adminhtml/templates/rss/grid/link.phtml +++ b/app/code/Magento/Review/view/adminhtml/templates/rss/grid/link.phtml @@ -9,5 +9,5 @@ /** @var $block \Magento\Review\Block\Adminhtml\Grid\Rss\Link */ ?> isRssAllowed() && $block->getLink()): ?> -escapeHtml($block->getLabel()) ?> +escapeHtml($block->getLabel()) ?> diff --git a/app/code/Magento/Review/view/frontend/templates/customer/list.phtml b/app/code/Magento/Review/view/frontend/templates/customer/list.phtml index fdb2623b3731f..a08c6a87d264c 100644 --- a/app/code/Magento/Review/view/frontend/templates/customer/list.phtml +++ b/app/code/Magento/Review/view/frontend/templates/customer/list.phtml @@ -11,41 +11,41 @@ getReviews() && count($block->getReviews())): ?>
    - escapeHtml($_item->getName()) ?> + + escapeHtml($_item->getName()) ?> getCanShowProductPrice($_product)): ?> getCanShowProductPrice($_item)): ?> getProductPrice($_item) ?> @@ -43,7 +43,7 @@ + isSaleable()) : ?>
    - getProductPriceHtml( + getProductPriceHtml( $_item, \Magento\Catalog\Pricing\Price\TierPrice::PRICE_CODE ) ?> diff --git a/app/code/Magento/Integration/view/adminhtml/templates/integration/activate/permissions.phtml b/app/code/Magento/Integration/view/adminhtml/templates/integration/activate/permissions.phtml index 523e825842e18..d687d55e65aa0 100644 --- a/app/code/Magento/Integration/view/adminhtml/templates/integration/activate/permissions.phtml +++ b/app/code/Magento/Integration/view/adminhtml/templates/integration/activate/permissions.phtml @@ -12,6 +12,6 @@ ?>

    - getChildHtml('tabs'); ?> + getChildHtml('tabs') ?>
    diff --git a/app/code/Magento/Integration/view/adminhtml/templates/resourcetree.phtml b/app/code/Magento/Integration/view/adminhtml/templates/resourcetree.phtml index b22e91bffe487..5c4b1dc282582 100644 --- a/app/code/Magento/Integration/view/adminhtml/templates/resourcetree.phtml +++ b/app/code/Magento/Integration/view/adminhtml/templates/resourcetree.phtml @@ -12,7 +12,7 @@ /** @var $block \Magento\Integration\Block\Adminhtml\Integration\Edit\Tab\Webapi */ ?> -getChildHtml(); ?> +getChildHtml() ?>
    @@ -24,8 +24,8 @@
    diff --git a/app/code/Magento/LayeredNavigation/view/frontend/templates/layer/filter.phtml b/app/code/Magento/LayeredNavigation/view/frontend/templates/layer/filter.phtml index 84570da5a58c7..411e17af4df65 100644 --- a/app/code/Magento/LayeredNavigation/view/frontend/templates/layer/filter.phtml +++ b/app/code/Magento/LayeredNavigation/view/frontend/templates/layer/filter.phtml @@ -19,7 +19,7 @@
  • getCount() > 0): ?> - + getLabel() ?> helper('\Magento\Catalog\Helper\Data')->shouldDisplayProductCountOnLayer()): ?> getCount()?> diff --git a/app/code/Magento/LayeredNavigation/view/frontend/templates/layer/state.phtml b/app/code/Magento/LayeredNavigation/view/frontend/templates/layer/state.phtml index e33449c365d78..705ebdf3dab71 100644 --- a/app/code/Magento/LayeredNavigation/view/frontend/templates/layer/state.phtml +++ b/app/code/Magento/LayeredNavigation/view/frontend/templates/layer/state.phtml @@ -20,11 +20,11 @@ + data-count="">
    1. - escapeHtml(__($_filter->getName())); ?> + escapeHtml(__($_filter->getName())) ?> stripTags($_filter->getLabel()) ?> getClearLinkUrl(); @@ -36,9 +36,9 @@ - escapeHtml($_filter->getFilter()->getClearLinkText()) ?> + escapeHtml($_filter->getFilter()->getClearLinkText()) ?>
      - getChildHtml('state') ?> + getChildHtml('state') ?> getLayer()->getState()->getFilters()): ?>
      @@ -36,7 +36,7 @@
      getItemsCount()): ?> -
      escapeHtml(__($filter->getName())) ?>
      +
      escapeHtml(__($filter->getName())) ?>
      getChildBlock('renderer')->render($filter); ?>
      diff --git a/app/code/Magento/Marketplace/view/adminhtml/templates/index.phtml b/app/code/Magento/Marketplace/view/adminhtml/templates/index.phtml index f0c2bdf23134b..388cea82db55a 100644 --- a/app/code/Magento/Marketplace/view/adminhtml/templates/index.phtml +++ b/app/code/Magento/Marketplace/view/adminhtml/templates/index.phtml @@ -73,7 +73,7 @@ { "*": { "Magento_Marketplace/default": { - "url": "getUrl('marketplace/partners/index', + "url": "getUrl('marketplace/partners/index', ['_current' => true, 'block' => '', 'period' => '']) ?>" } } diff --git a/app/code/Magento/Marketplace/view/adminhtml/templates/partners.phtml b/app/code/Magento/Marketplace/view/adminhtml/templates/partners.phtml index 6c011330b9798..059d0946a3837 100644 --- a/app/code/Magento/Marketplace/view/adminhtml/templates/partners.phtml +++ b/app/code/Magento/Marketplace/view/adminhtml/templates/partners.phtml @@ -15,17 +15,17 @@ $partners = $block->getPartners();
      <?php echo $block->escapeHtml($partner['title']);?> -

      escapeHtml($partner['title']);?>

      + src="escapeHtml($partner['img']) ?>" + alt="escapeHtml($partner['title']) ?>"/> +

      escapeHtml($partner['title']) ?>

      - escapeHtml($partner['description']);?> + escapeHtml($partner['description']) ?>
      -       +
      - +

      diff --git a/app/code/Magento/MediaStorage/view/adminhtml/templates/system/config/system/storage/media/synchronize.phtml b/app/code/Magento/MediaStorage/view/adminhtml/templates/system/config/system/storage/media/synchronize.phtml index ea37507adc2ad..755b6598e522e 100644 --- a/app/code/Magento/MediaStorage/view/adminhtml/templates/system/config/system/storage/media/synchronize.phtml +++ b/app/code/Magento/MediaStorage/view/adminhtml/templates/system/config/system/storage/media/synchronize.phtml @@ -177,7 +177,7 @@ require([ }); -getButtonHtml() ?> +getButtonHtml() ?> Synchronize diff --git a/app/code/Magento/Msrp/view/base/templates/product/price/msrp.phtml b/app/code/Magento/Msrp/view/base/templates/product/price/msrp.phtml index 9755772fbdeb5..7b3cc38ea9639 100644 --- a/app/code/Magento/Msrp/view/base/templates/product/price/msrp.phtml +++ b/app/code/Magento/Msrp/view/base/templates/product/price/msrp.phtml @@ -80,7 +80,7 @@ if ($product->isSaleable()) { jsonEncode($data)?>'> + data-mage-init='helper('Magento\Framework\Json\Helper\Data')->jsonEncode($data) ?>'> @@ -95,7 +95,7 @@ if ($product->isSaleable()) { class="action map-show-info" data-mage-init='{"addToCart":{"origin": "info", "helpLinkId": "#", - "productName": "escapeJs($block->escapeHtml($product->getName())) ?>", + "productName": "escapeJs($block->escapeHtml($product->getName())) ?>", "closeButtonId": "#map-popup-close"}}'> diff --git a/app/code/Magento/Msrp/view/frontend/templates/popup.phtml b/app/code/Magento/Msrp/view/frontend/templates/popup.phtml index 3f135f0bd0049..db25bf9f3ce5b 100644 --- a/app/code/Magento/Msrp/view/frontend/templates/popup.phtml +++ b/app/code/Magento/Msrp/view/frontend/templates/popup.phtml @@ -33,13 +33,13 @@
      - getChildHtml(); ?> + getChildHtml() ?>
      diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/address/select.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/address/select.phtml index 990d6bd6186c8..3bc6e69ba1c4b 100644 --- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/address/select.phtml +++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/address/select.phtml @@ -14,7 +14,7 @@
      - getAddressAsHtml($_address) ?> + getAddressAsHtml($_address) ?> isAddressDefaultBilling($_address)): ?>
      diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/addresses.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/addresses.phtml index 21bb27fc138db..7ee75bd2eaa2d 100644 --- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/addresses.phtml +++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/addresses.phtml @@ -35,18 +35,18 @@ getItems() as $_index => $_item): ?> getQuoteItem()) : ?>
    • getItemHtml($_item->getQuoteItem()) ?> + getItemHtml($_item->getQuoteItem()) ?>
    - +
    		+ getProduct()->getIsVirtual()): ?>
    @@ -55,12 +55,12 @@
    - getAddressesHtmlSelect($_item, $_index); ?> + getAddressesHtmlSelect($_item, $_index) ?>
    		+ diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing.phtml index 40aa947bb75f4..2d935fad1ce07 100644 --- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing.phtml +++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing.phtml @@ -31,7 +31,7 @@

    - getChildHtml('payment_methods_before') ?> + getChildHtml('payment_methods_before') ?>
    getCode() ?>
    1): ?> - getSelectedMethodCode() == $_code): ?> checked="checked" class="radio"/> + getSelectedMethodCode() == $_code): ?> checked="checked" class="radio"/> - +
    getChildHtml('payment.method.' . $_code)) : ?>
    @@ -54,8 +54,8 @@
    - getChildHtml('payment_methods_after') ?> - getChildHtml('checkout_billing_items') ?> + getChildHtml('payment_methods_after') ?> + getChildHtml('checkout_billing_items') ?>
    @@ -75,7 +75,7 @@ require(['jquery', 'mage/mage'], function(jQuery){ var addtocartForm = jQuery('#multishipping-billing-form'); addtocartForm.mage('payment', { - checkoutPrice: getQuoteBaseGrandTotal(); ?> + checkoutPrice: getQuoteBaseGrandTotal() ?> }); addtocartForm.mage('validation', { errorPlacement: function(error, element) { diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing/items.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing/items.phtml index 10f5fbe729839..de22d44bc63b5 100644 --- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing/items.phtml +++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing/items.phtml @@ -27,8 +27,8 @@
    getItemHtml($_item) ?>getQty() ?>getItemHtml($_item) ?>getQty() ?>
    - getRenderedBlock()->getItemHtml($_item) ?> + + getRenderedBlock()->getItemHtml($_item) ?> + helper('Magento\Tax\Helper\Data')->displayCartPriceInclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?> - - getUnitPriceInclTaxHtml($_item); ?> + + getUnitPriceInclTaxHtml($_item) ?> helper('Magento\Tax\Helper\Data')->displayCartPriceExclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?> - - getUnitPriceExclTaxHtml($_item); ?> + + getUnitPriceExclTaxHtml($_item) ?> getQty()*1 ?> + getQty()*1 ?> helper('Magento\Tax\Helper\Data')->displayCartPriceInclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?> - - getRowTotalInclTaxHtml($_item); ?> + + getRowTotalInclTaxHtml($_item) ?> helper('Magento\Tax\Helper\Data')->displayCartPriceExclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?> - - getRowTotalExclTaxHtml($_item); ?> + + getRowTotalExclTaxHtml($_item) ?> diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/shipping.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/shipping.phtml index f97626fee6f56..cf2fa56e2e18b 100644 --- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/shipping.phtml +++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/shipping.phtml @@ -38,25 +38,25 @@
    $_rates): ?> -
    escapeHtml($block->getCarrierName($code)) ?>
    +
    escapeHtml($block->getCarrierName($code)) ?>
    - escapeHtml($block->getCarrierName($code)) ?> + escapeHtml($block->getCarrierName($code)) ?>
    getErrorMessage()): ?> - escapeHtml($_rate->getCarrierTitle()) ?>: escapeHtml($_rate->getErrorMessage()) ?> + escapeHtml($_rate->getCarrierTitle()) ?>: escapeHtml($_rate->getErrorMessage()) ?>
    - + getCode()===$block->getAddressShippingMethod($_address)) echo ' checked="checked"' ?> class="radio" />
    -
    getItemHtml($_item->getQuoteItem()) ?>getQty() ?>getItemHtml($_item->getQuoteItem()) ?>getQty() ?>
    - + - - - - + + + + getReviews() as $_review): ?> - - + - - - @@ -55,16 +55,16 @@ getToolbarHtml()): ?>
    - getToolbarHtml() ?> + getToolbarHtml() ?>
    -
    escapeHtml(__('You have submitted no reviews.')) ?>
    +
    escapeHtml(__('You have submitted no reviews.')) ?>
    - - escapeHtml(__('Back')) ?> + + escapeHtml(__('Back')) ?>
    diff --git a/app/code/Magento/Review/view/frontend/templates/customer/recent.phtml b/app/code/Magento/Review/view/frontend/templates/customer/recent.phtml index 4f87c335e05ef..ed58e3832577b 100644 --- a/app/code/Magento/Review/view/frontend/templates/customer/recent.phtml +++ b/app/code/Magento/Review/view/frontend/templates/customer/recent.phtml @@ -11,20 +11,20 @@ getReviews() && count($block->getReviews())): ?>
    - escapeHtml(__('My Recent Reviews')) ?> - escapeHtml(__('View All')) ?> + escapeHtml(__('My Recent Reviews')) ?> + escapeHtml(__('View All')) ?>
      getReviews() as $_review): ?>
    1. - escapeHtml($_review->getName()) ?> + escapeHtml($_review->getName()) ?> getSum()): ?> getSum() / $_review->getCount() ?>
      - escapeHtml(__('Rating')) ?>: -
      - escapeHtml($rating); ?>% + escapeHtml(__('Rating')) ?>: +
      + escapeHtml($rating) ?>%
      diff --git a/app/code/Magento/Review/view/frontend/templates/customer/view.phtml b/app/code/Magento/Review/view/frontend/templates/customer/view.phtml index 8b61933484c38..30a0e174c8cbb 100644 --- a/app/code/Magento/Review/view/frontend/templates/customer/view.phtml +++ b/app/code/Magento/Review/view/frontend/templates/customer/view.phtml @@ -14,16 +14,16 @@ $product = $block->getProductData();
      - + - getImage($block->getProductData(), 'customer_account_product_review_page')->toHtml() ?> + getImage($block->getProductData(), 'customer_account_product_review_page')->toHtml() ?>
      -

      escapeHtml($product->getName()) ?>

      +

      escapeHtml($product->getName()) ?>

      getRating() && $block->getRating()->getSize()): ?> - escapeHtml(__('Average Customer Rating:')) ?> - getReviewsSummaryHtml($product) ?> + escapeHtml(__('Average Customer Rating:')) ?> + getReviewsSummaryHtml($product) ?>
      @@ -31,14 +31,14 @@ $product = $block->getProductData();
      getRating() && $block->getRating()->getSize()): ?>
      - escapeHtml(__('Your Review')); ?> + escapeHtml(__('Your Review')) ?>
      getRating() as $_rating): ?> getPercent()): ?> getPercent()) ?>
      - escapeHtml($_rating->getRatingCode()) ?> + escapeHtml($_rating->getRatingCode()) ?>
      % @@ -50,16 +50,16 @@ $product = $block->getProductData();
      -
      escapeHtml($block->getReviewData()->getTitle()) ?>
      -
      escapeHtml($block->getReviewData()->getDetail())) ?>
      +
      escapeHtml($block->getReviewData()->getTitle()) ?>
      +
      escapeHtml($block->getReviewData()->getDetail())) ?>
      - escapeHtml(__('Submitted on %1', ''), ['time']) ?> + escapeHtml(__('Submitted on %1', ''), ['time']) ?>
      - escapeHtml(__('Back to My Reviews')) ?> + escapeHtml(__('Back to My Reviews')) ?>
      diff --git a/app/code/Magento/Review/view/frontend/templates/detailed.phtml b/app/code/Magento/Review/view/frontend/templates/detailed.phtml index f468ffecf384f..905d24a3e4fa6 100644 --- a/app/code/Magento/Review/view/frontend/templates/detailed.phtml +++ b/app/code/Magento/Review/view/frontend/templates/detailed.phtml @@ -11,12 +11,12 @@ getSize()): ?>
    escapeHtml(__('Product Reviews')) ?>escapeHtml(__('Product Reviews')) ?>
    escapeHtml(__('Created')) ?>escapeHtml(__('Product Name')) ?>escapeHtml(__('Rating')) ?>escapeHtml(__('Review')) ?>escapeHtml(__('Created')) ?>escapeHtml(__('Product Name')) ?>escapeHtml(__('Rating')) ?>escapeHtml(__('Review')) ?>  
    escapeHtml($block->dateFormat($_review->getReviewCreatedAt())); ?> + escapeHtml($block->dateFormat($_review->getReviewCreatedAt())) ?> - escapeHtml($_review->getName()) ?> + escapeHtml($_review->getName()) ?> + getSum()): ?>
    - escapeHtml(__('Rating')) ?>: + escapeHtml(__('Rating')) ?>:
    getSum() / (int)$_review->getCount()) ?>%
    		- helper('Magento\Review\Helper\Data')->getDetailHtml($_review->getDetail()) ?> + + helper('Magento\Review\Helper\Data')->getDetailHtml($_review->getDetail()) ?> - - escapeHtml(__('See Details')) ?> + + + escapeHtml(__('See Details')) ?>
    - + getSummary()): ?> - + - getItemHtml($_item) ?> - getItemExtraInfoHtml($_item->getOrderItem()) ?> + getItemHtml($_item) ?> + getItemExtraInfoHtml($_item->getOrderItem()) ?>
    escapeHtml(__('Ratings Review Summary')); ?>escapeHtml(__('Ratings Review Summary')) ?>
    escapeHtml(__($_rating->getRatingCode())) ?>escapeHtml(__($_rating->getRatingCode())) ?>
    diff --git a/app/code/Magento/Review/view/frontend/templates/empty.phtml b/app/code/Magento/Review/view/frontend/templates/empty.phtml index 483867186aea1..4328a135a98f3 100644 --- a/app/code/Magento/Review/view/frontend/templates/empty.phtml +++ b/app/code/Magento/Review/view/frontend/templates/empty.phtml @@ -8,4 +8,4 @@ /** @var \Magento\Review\Block\Rating\Entity\Detailed $block */ ?> -

    escapeHtml(__('Be the first to review this product')) ?>

    +

    escapeHtml(__('Be the first to review this product')) ?>

    diff --git a/app/code/Magento/Review/view/frontend/templates/form.phtml b/app/code/Magento/Review/view/frontend/templates/form.phtml index b646817897934..20e6d36148b50 100644 --- a/app/code/Magento/Review/view/frontend/templates/form.phtml +++ b/app/code/Magento/Review/view/frontend/templates/form.phtml @@ -9,40 +9,40 @@ /** @var \Magento\Review\Block\Form $block */ ?>
    -
    escapeHtml(__('Write Your Own Review')) ?>
    +
    escapeHtml(__('Write Your Own Review')) ?>
    getAllowWriteReviewFlag()): ?> - - getBlockHtml('formkey'); ?> - getChildHtml('form_fields_before')?> -
    - escapeHtml(__("You're reviewing:")); ?>escapeHtml($block->getProductInfo()->getName()) ?>
    + + getBlockHtml('formkey') ?> + getChildHtml('form_fields_before') ?> +
    + escapeHtml(__("You're reviewing:")) ?>escapeHtml($block->getProductInfo()->getName()) ?>
    getRatings() && $block->getRatings()->getSize()): ?>
    - escapeHtml(__('Your Rating')) ?>
    + escapeHtml(__('Your Rating')) ?>
    getRatings() as $_rating): ?>
    - +
    getOptions();?> + aria-labelledby="escapeHtmlAttr($_rating->getRatingCode()) ?>_rating_label escapeHtmlAttr($_rating->getRatingCode()) ?>_escapeHtmlAttr($_option->getValue()) ?>_label" /> @@ -55,19 +55,19 @@
    - +
    - +
    - +
    @@ -75,7 +75,7 @@
    - +
    @@ -92,7 +92,7 @@
    - escapeHtml(__('Only registered users can write reviews. Please Sign in or create an account', $block->getLoginLink(), $block->getRegisterUrl()), ['a']) ?> + escapeHtml(__('Only registered users can write reviews. Please Sign in or create an account', $block->getLoginLink(), $block->getRegisterUrl()), ['a']) ?>
    diff --git a/app/code/Magento/Review/view/frontend/templates/helper/summary.phtml b/app/code/Magento/Review/view/frontend/templates/helper/summary.phtml index 0749dbbd320f1..bf40127ff1f12 100644 --- a/app/code/Magento/Review/view/frontend/templates/helper/summary.phtml +++ b/app/code/Magento/Review/view/frontend/templates/helper/summary.phtml @@ -13,25 +13,25 @@ $urlForm = $block->getReviewsUrl() . '#review-form'; ?> getReviewsCount()): ?> getRatingSummary(); ?> -
    +
    - escapeHtml(__('Rating')) ?>: -
    - escapeHtml($rating); ?>% of 100 + escapeHtml(__('Rating')) ?>: +
    + escapeHtml($rating) ?>% of 100
    - escapeHtml($block->getReviewsCount()) ?> getReviewsCount() == 1) ? $block->escapeHtml(__('Review')) : $block->escapeHtml(__('Reviews')) ?> - escapeHtml(__('Add Your Review')) ?> + escapeHtml($block->getReviewsCount()) ?> getReviewsCount() == 1) ? $block->escapeHtml(__('Review')) : $block->escapeHtml(__('Reviews')) ?> + escapeHtml(__('Add Your Review')) ?>
    getDisplayIfEmpty()): ?>
    - - escapeHtml(__('Be the first to review this product')) ?> + + escapeHtml(__('Be the first to review this product')) ?>
    diff --git a/app/code/Magento/Review/view/frontend/templates/helper/summary_short.phtml b/app/code/Magento/Review/view/frontend/templates/helper/summary_short.phtml index 318dca5ea21fa..c3eb11f03fd7d 100644 --- a/app/code/Magento/Review/view/frontend/templates/helper/summary_short.phtml +++ b/app/code/Magento/Review/view/frontend/templates/helper/summary_short.phtml @@ -13,24 +13,24 @@ $urlForm = $block->getReviewsUrl() . '#review-form'; ?> getReviewsCount()): ?> getRatingSummary(); ?> -
    +
    - escapeHtml(__('Rating')) ?>: -
    - escapeHtml($rating); ?>% + escapeHtml(__('Rating')) ?>: +
    + escapeHtml($rating) ?>%
    - escapeHtml($block->getReviewsCount()) ?> getReviewsCount() == 1) ? $block->escapeHtml(__('Review')) : $block->escapeHtml(__('Reviews')) ?> + escapeHtml($block->getReviewsCount()) ?> getReviewsCount() == 1) ? $block->escapeHtml(__('Review')) : $block->escapeHtml(__('Reviews')) ?>
    getDisplayIfEmpty()): ?>
    - - escapeHtml(__('Be the first to review this product')) ?> + + escapeHtml(__('Be the first to review this product')) ?>
    diff --git a/app/code/Magento/Review/view/frontend/templates/product/view/count.phtml b/app/code/Magento/Review/view/frontend/templates/product/view/count.phtml index a3de87f572375..bff1c48508e11 100644 --- a/app/code/Magento/Review/view/frontend/templates/product/view/count.phtml +++ b/app/code/Magento/Review/view/frontend/templates/product/view/count.phtml @@ -8,5 +8,5 @@ // @deprecated ?> - escapeHtml(__('%1 Review(s)', $count)) ?> + escapeHtml(__('%1 Review(s)', $count)) ?> diff --git a/app/code/Magento/Review/view/frontend/templates/product/view/list.phtml b/app/code/Magento/Review/view/frontend/templates/product/view/list.phtml index 9d87c6f349618..dc02853e77b18 100644 --- a/app/code/Magento/Review/view/frontend/templates/product/view/list.phtml +++ b/app/code/Magento/Review/view/frontend/templates/product/view/list.phtml @@ -14,26 +14,26 @@ $format = $block->getDateFormat() ?: \IntlDateFormatter::SHORT;
    - escapeHtml(__('Customer Reviews')) ?> + escapeHtml(__('Customer Reviews')) ?>
    - getChildHtml('toolbar') ?> + getChildHtml('toolbar') ?>
    1. -
      escapeHtml($_review->getTitle()) ?>
      +
      escapeHtml($_review->getTitle()) ?>
      getRatingVotes())): ?>
      getRatingVotes() as $_vote): ?>
      - escapeHtml($_vote->getRatingCode()) ?> -
      + escapeHtml($_vote->getRatingCode()) ?> +
      - - escapeHtml($_vote->getPercent()) ?>% + + escapeHtml($_vote->getPercent()) ?>%
      @@ -41,23 +41,23 @@ $format = $block->getDateFormat() ?: \IntlDateFormatter::SHORT;
      - escapeHtml($_review->getDetail())) ?> + escapeHtml($_review->getDetail())) ?>

      - escapeHtml(__('Review by'))?> - + escapeHtml(__('Review by')) ?> +

      - escapeHtml(__('Posted on')) ?> - + escapeHtml(__('Posted on')) ?> +

    - getChildHtml('toolbar') ?> + getChildHtml('toolbar') ?>
    diff --git a/app/code/Magento/Review/view/frontend/templates/product/view/other.phtml b/app/code/Magento/Review/view/frontend/templates/product/view/other.phtml index d5800d1266e07..48d668ca85a0d 100644 --- a/app/code/Magento/Review/view/frontend/templates/product/view/other.phtml +++ b/app/code/Magento/Review/view/frontend/templates/product/view/other.phtml @@ -10,5 +10,5 @@ ?> getProduct(); ?>
    - escapeHtml(__('Back to Main Product Info')) ?> + escapeHtml(__('Back to Main Product Info')) ?>
    diff --git a/app/code/Magento/Review/view/frontend/templates/review.phtml b/app/code/Magento/Review/view/frontend/templates/review.phtml index 50ed70e210d35..ea4b4bc42a1ed 100644 --- a/app/code/Magento/Review/view/frontend/templates/review.phtml +++ b/app/code/Magento/Review/view/frontend/templates/review.phtml @@ -7,13 +7,13 @@ /** @var \Magento\Review\Block\Product\Review $block */ ?>
    -getChildHtml(); ?> +getChildHtml() ?> -
    + class="form send friend" data-hasRequired="escapeHtmlAttr(__('* Required Fields')) ?>">
    - getBlockHtml('formkey')?> - escapeHtml(__('Sender')) ?> + getBlockHtml('formkey') ?> + escapeHtml(__('Sender')) ?>
    - +
    -
    - +
    + data-validate="{required:true}">escapeHtml($block->getMessage()) ?>
    - getBlockHtml('formkey')?> - escapeHtml(__('Invitee')) ?> + getBlockHtml('formkey') ?> + escapeHtml(__('Invitee')) ?>
    getMaxRecipients()): ?>
    getMaxRecipients()): ?> + escapeHtml(__('Add Invitee')) ?>
    @@ -109,10 +109,10 @@
    + escapeHtml(__('Send Email')) ?>
    - escapeHtml(__('Back')) ?> + escapeHtml(__('Back')) ?>
    diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/create/form.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/create/form.phtml index 2c7335c8e5001..3807a4dc8f842 100644 --- a/app/code/Magento/Shipping/view/adminhtml/templates/create/form.phtml +++ b/app/code/Magento/Shipping/view/adminhtml/templates/create/form.phtml @@ -8,9 +8,9 @@ ?>
    - getBlockHtml('formkey')?> + getBlockHtml('formkey') ?> getShipment()->getOrder() ?> - getChildHtml('order_info') ?> + getChildHtml('order_info') ?>
    @@ -22,7 +22,7 @@
    -
    getPaymentHtml() ?>
    +
    getPaymentHtml() ?>
    getOrderCurrencyCode()) ?>
    @@ -32,7 +32,7 @@
    -
    escapeHtml($_order->getShippingDescription()) ?>
    +
    escapeHtml($_order->getShippingDescription()) ?>
    : @@ -48,12 +48,12 @@
    -
    getChildHtml('shipment_tracking') ?>
    +
    getChildHtml('shipment_tracking') ?>
    - getItemsHtml() ?> + getItemsHtml() ?>
    -getChildHtml('shipment_packaging'); +getChildHtml('shipment_packaging'); diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/create/items.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/create/items.phtml index 899af5a842ca6..f2ee227e208ca 100644 --- a/app/code/Magento/Shipping/view/adminhtml/templates/create/items.phtml +++ b/app/code/Magento/Shipping/view/adminhtml/templates/create/items.phtml @@ -29,8 +29,8 @@ getShipment()->getAllItems() ?> getOrderItem()->getIsVirtual() || $_item->getOrderItem()->getParentItem()): continue; endif; $_i++ ?>
    @@ -104,10 +104,10 @@
    - getChildHtml('submit_before') ?> + getChildHtml('submit_before') ?>
    - getChildHtml('submit_button') ?> - getChildHtml('submit_after') ?> + getChildHtml('submit_button') ?> + getChildHtml('submit_after') ?>
    diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/create/items/renderer/default.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/create/items/renderer/default.phtml index a245c9172c73d..c13292cb1e3d0 100644 --- a/app/code/Magento/Shipping/view/adminhtml/templates/create/items/renderer/default.phtml +++ b/app/code/Magento/Shipping/view/adminhtml/templates/create/items/renderer/default.phtml @@ -9,8 +9,8 @@ ?> getItem() ?> - getColumnHtml($_item, 'name') ?> - getColumnHtml($_item, 'qty') ?> + getColumnHtml($_item, 'name') ?> + getColumnHtml($_item, 'qty') ?> canShipPartiallyItem()): ?> - displayCustomsValue() ? '' : 'style="display: none;"' ?>> + displayCustomsValue() ? '' : 'style="display: none;"' ?>> @@ -44,7 +44,7 @@ || (!$_orderItem->isShipSeparately() && ($_orderItem->getParentItemId() || $_orderItem->getParentItem()))): ?> - + getId() ? $item->getId() : $item->getOrderItemId(); ?>
    @@ -39,7 +39,7 @@

    - escapeHtml($_order->getShippingDescription()) ?> + escapeHtml($_order->getShippingDescription()) ?>
    : @@ -67,9 +67,9 @@

    - getChildHtml('shipment_tracking') ?> + getChildHtml('shipment_tracking') ?> - getChildHtml('shipment_packaging') ?> + getChildHtml('shipment_packaging') ?> -
    +
    + data-mage-init='{"translateInline":{"ajaxUrl":"escapeJs($block->escapeUrl($block->getAjaxUrl())) ?>"},"loader":{}}'>
    diff --git a/app/code/Magento/UrlRewrite/view/adminhtml/templates/selector.phtml b/app/code/Magento/UrlRewrite/view/adminhtml/templates/selector.phtml index 13fa80077a039..1cc0203d8fbfe 100644 --- a/app/code/Magento/UrlRewrite/view/adminhtml/templates/selector.phtml +++ b/app/code/Magento/UrlRewrite/view/adminhtml/templates/selector.phtml @@ -12,12 +12,12 @@
    diff --git a/app/code/Magento/User/view/adminhtml/templates/admin/forgotpassword.phtml b/app/code/Magento/User/view/adminhtml/templates/admin/forgotpassword.phtml index efb70200bca0b..2f7e49ef56b77 100644 --- a/app/code/Magento/User/view/adminhtml/templates/admin/forgotpassword.phtml +++ b/app/code/Magento/User/view/adminhtml/templates/admin/forgotpassword.phtml @@ -18,7 +18,7 @@
    - getChildHtml('form.additional.info'); ?> + getChildHtml('form.additional.info') ?>
    diff --git a/app/code/Magento/User/view/adminhtml/templates/role/edit.phtml b/app/code/Magento/User/view/adminhtml/templates/role/edit.phtml index 7c35eacc1594e..e288862d45ff4 100644 --- a/app/code/Magento/User/view/adminhtml/templates/role/edit.phtml +++ b/app/code/Magento/User/view/adminhtml/templates/role/edit.phtml @@ -12,7 +12,7 @@ /** @var $block \Magento\User\Block\Role\Tab\Edit */ ?> -getChildHtml(); ?> +getChildHtml() ?>
    @@ -24,8 +24,8 @@
    diff --git a/app/code/Magento/User/view/adminhtml/templates/role/info.phtml b/app/code/Magento/User/view/adminhtml/templates/role/info.phtml index e726cea0111f3..3ea29ebb45866 100644 --- a/app/code/Magento/User/view/adminhtml/templates/role/info.phtml +++ b/app/code/Magento/User/view/adminhtml/templates/role/info.phtml @@ -5,7 +5,7 @@ */ ?>
    - getBlockHtml('formkey')?> + getBlockHtml('formkey') ?>
    diff --git a/app/code/Magento/Weee/view/frontend/templates/checkout/cart/item/price/sidebar.phtml b/app/code/Magento/Weee/view/frontend/templates/checkout/cart/item/price/sidebar.phtml index 79140880aceaa..e3728c767c398 100644 --- a/app/code/Magento/Weee/view/frontend/templates/checkout/cart/item/price/sidebar.phtml +++ b/app/code/Magento/Weee/view/frontend/templates/checkout/cart/item/price/sidebar.phtml @@ -16,7 +16,7 @@ $block->setZone(\Magento\Framework\Pricing\Render::ZONE_CART); ?> displayPriceInclTax() || $block->displayBothPrices()): ?> - + displayPriceWithWeeeDetails()): ?> @@ -37,7 +37,7 @@ $block->setZone(\Magento\Framework\Pricing\Render::ZONE_CART); displayFinalPrice()): ?> - + formatPrice($block->getFinalUnitDisplayPriceInclTax()); ?> @@ -48,7 +48,7 @@ $block->setZone(\Magento\Framework\Pricing\Render::ZONE_CART); displayPriceExclTax() || $block->displayBothPrices()): ?> - + displayPriceWithWeeeDetails()): ?> @@ -69,7 +69,7 @@ $block->setZone(\Magento\Framework\Pricing\Render::ZONE_CART); displayFinalPrice()): ?> - + formatPrice($block->getFinalUnitDisplayPriceExclTax()); ?> diff --git a/app/code/Magento/Weee/view/frontend/templates/item/price/row.phtml b/app/code/Magento/Weee/view/frontend/templates/item/price/row.phtml index a01bfc8b5a691..c162a623f3339 100644 --- a/app/code/Magento/Weee/view/frontend/templates/item/price/row.phtml +++ b/app/code/Magento/Weee/view/frontend/templates/item/price/row.phtml @@ -11,7 +11,7 @@ $item = $block->getItem(); ?> displayPriceInclTax() || $block->displayBothPrices()) && !$item->getNoSubtotal()): ?> - + displayPriceWithWeeeDetails()): ?> @@ -33,7 +33,7 @@ $item = $block->getItem(); displayFinalPrice()): ?> - + formatPrice($block->getFinalRowDisplayPriceInclTax()); ?> @@ -43,7 +43,7 @@ $item = $block->getItem(); displayPriceExclTax() || $block->displayBothPrices()): ?> - + displayPriceWithWeeeDetails()): ?> @@ -66,7 +66,7 @@ $item = $block->getItem(); displayFinalPrice()): ?> - + formatPrice($block->getFinalRowDisplayPriceExclTax()); ?> diff --git a/app/code/Magento/Weee/view/frontend/templates/item/price/unit.phtml b/app/code/Magento/Weee/view/frontend/templates/item/price/unit.phtml index 05e23bbfaed0e..687e4f344bbf3 100644 --- a/app/code/Magento/Weee/view/frontend/templates/item/price/unit.phtml +++ b/app/code/Magento/Weee/view/frontend/templates/item/price/unit.phtml @@ -11,7 +11,7 @@ $item = $block->getItem(); ?> displayPriceInclTax() || $block->displayBothPrices()): ?> - + displayPriceWithWeeeDetails()): ?> @@ -33,7 +33,7 @@ $item = $block->getItem(); displayFinalPrice()): ?> - + formatPrice($block->getFinalUnitDisplayPriceInclTax()); ?> @@ -43,7 +43,7 @@ $item = $block->getItem(); displayPriceExclTax() || $block->displayBothPrices()): ?> - + displayPriceWithWeeeDetails()): ?> @@ -66,7 +66,7 @@ $item = $block->getItem(); displayFinalPrice()): ?> - + formatPrice($block->getFinalUnitDisplayPriceExclTax()); ?> diff --git a/app/code/Magento/Widget/view/adminhtml/templates/catalog/category/widget/tree.phtml b/app/code/Magento/Widget/view/adminhtml/templates/catalog/category/widget/tree.phtml index 0a6a0073a315d..fd79689595e2a 100644 --- a/app/code/Magento/Widget/view/adminhtml/templates/catalog/category/widget/tree.phtml +++ b/app/code/Magento/Widget/view/adminhtml/templates/catalog/category/widget/tree.phtml @@ -10,12 +10,12 @@ ?> getId() ?> -
    +
    @@ -32,33 +32,33 @@ require([ var pageGroupTemplate = '
    '+ '
    '+ ''+ - 'getDisplayOnSelectHtml(); ?>'+ + 'getDisplayOnSelectHtml() ?>'+ '
    '+ helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getRemoveLayoutButtonHtml()) ?> + '
    '+ '
    '+ '
    '+ getDisplayOnContainers() as $container): ?> - '
    '+ - ''+ - ''+ - ''+ + '
    '+ + ''+ + ''+ + ''+ ''+ ''+ ''+ ''+ - ''+ - ''+ - ''+ + ''+ + ''+ + ''+ ''+ ''+ ''+ ''+ ''+ ''+ ''+ - ''+ - ''+ + ''+ + ''+ ''+ ''+ ''+ @@ -128,9 +128,9 @@ var pageGroupTemplate = '
    '+ '
    '+ ''+ - ''+ - ''+ - ''+ + ''+ + ''+ + ''+ ''+ ''+ ''+ @@ -159,9 +159,9 @@ var pageGroupTemplate = '
    '+ '
    '+ ''+ - ''+ - ''+ - ''+ + ''+ + ''+ + ''+ ''+ ''+ ''+ @@ -334,10 +334,10 @@ var WidgetInstance = { additional = {}; } if (type == 'categories') { - additional.url = 'escapeUrl($block->getCategoriesChooserUrl()) ?>'; + additional.url = 'escapeUrl($block->getCategoriesChooserUrl()) ?>'; additional.post_parameters = $H({'is_anchor_only':$(chooser).down('input.is_anchor_only').value}); } else if (type == 'products') { - additional.url = 'escapeUrl($block->getProductsChooserUrl()) ?>'; + additional.url = 'escapeUrl($block->getProductsChooserUrl()) ?>'; additional.post_parameters = $H({'product_type_id':$(chooser).down('input.product_type_id').value}); } if (chooser && additional) { @@ -443,13 +443,13 @@ var WidgetInstance = { selected = ''; parameters = {}; if (type == 'block_reference') { - url = 'escapeUrl($block->getBlockChooserUrl()) ?>'; + url = 'escapeUrl($block->getBlockChooserUrl()) ?>'; if (additional.selectedBlock) { selected = additional.selectedBlock; } parameters.layout = value; } else if (type == 'block_template') { - url = 'escapeUrl($block->getTemplateChooserUrl()) ?>'; + url = 'escapeUrl($block->getTemplateChooserUrl()) ?>'; if (additional.selectedTemplate) { selected = additional.selectedTemplate; } diff --git a/app/code/Magento/Wishlist/view/adminhtml/templates/customer/edit/tab/wishlist.phtml b/app/code/Magento/Wishlist/view/adminhtml/templates/customer/edit/tab/wishlist.phtml index 55ac3dc81ec29..a2c27193f98da 100644 --- a/app/code/Magento/Wishlist/view/adminhtml/templates/customer/edit/tab/wishlist.phtml +++ b/app/code/Magento/Wishlist/view/adminhtml/templates/customer/edit/tab/wishlist.phtml @@ -21,13 +21,13 @@ if (!urlParams) { urlParams = ''; } - var url = escapeJs($block->escapeUrl($block->getJsObjectName())) ?>.url + '?ajax=true' + urlParams; + var url = escapeJs($block->escapeUrl($block->getJsObjectName())) ?>.url + '?ajax=true' + urlParams; new Ajax.Updater( - escapeJs($block->escapeHtml($block->getJsObjectName())) ?>.containerId, + escapeJs($block->escapeHtml($block->getJsObjectName())) ?>.containerId, url, { parameters: {form_key: FORM_KEY}, - onComplete: escapeJs($block->escapeHtml($block->getJsObjectName())) ?>.initGrid.bind(escapeJs($block->escapeHtml($block->getJsObjectName())) ?>), + onComplete: escapeJs($block->escapeHtml($block->getJsObjectName())) ?>.initGrid.bind(escapeJs($block->escapeHtml($block->getJsObjectName())) ?>), evalScripts:true } ); @@ -50,7 +50,7 @@ var self = this; confirm({ - content: 'escapeJs($block->escapeHtml(__('Are you sure you want to remove this item?'))) ?>', + content: 'escapeJs($block->escapeHtml(__('Are you sure you want to remove this item?'))) ?>', actions: { confirm: function () { self.reload('&delete=' + itemId); @@ -63,8 +63,8 @@ productConfigure.addListType( 'wishlist', { - urlFetch: 'escapeJs($block->escapeUrl($block->getUrl('customer/wishlist_product_composite_wishlist/configure'))) ?>', - urlConfirm: 'escapeJs($block->escapeUrl($block->getUrl('customer/wishlist_product_composite_wishlist/update'))) ?>' + urlFetch: 'escapeJs($block->escapeUrl($block->getUrl('customer/wishlist_product_composite_wishlist/configure'))) ?>', + urlConfirm: 'escapeJs($block->escapeUrl($block->getUrl('customer/wishlist_product_composite_wishlist/update'))) ?>' } ); //--> diff --git a/app/code/Magento/Wishlist/view/frontend/templates/button/share.phtml b/app/code/Magento/Wishlist/view/frontend/templates/button/share.phtml index 48f0f481719e1..fc54a90758780 100644 --- a/app/code/Magento/Wishlist/view/frontend/templates/button/share.phtml +++ b/app/code/Magento/Wishlist/view/frontend/templates/button/share.phtml @@ -9,7 +9,7 @@ /** @var \Magento\Wishlist\Block\Customer\Wishlist\Button $block */ ?> getWishlist()->getItemsCount() && $block->getWishlist()->getShared() < $block->getConfig()->getSharingEmailLimit()): ?> - diff --git a/app/code/Magento/Wishlist/view/frontend/templates/button/tocart.phtml b/app/code/Magento/Wishlist/view/frontend/templates/button/tocart.phtml index 04902b27c14db..6f901cac1a633 100644 --- a/app/code/Magento/Wishlist/view/frontend/templates/button/tocart.phtml +++ b/app/code/Magento/Wishlist/view/frontend/templates/button/tocart.phtml @@ -10,7 +10,7 @@ ?> getWishlist()->getItemsCount() && $block->getWishlist()->isSalable()): ?> - diff --git a/app/code/Magento/Wishlist/view/frontend/templates/button/update.phtml b/app/code/Magento/Wishlist/view/frontend/templates/button/update.phtml index d8ac809cd27f4..d19a5c2968ff4 100644 --- a/app/code/Magento/Wishlist/view/frontend/templates/button/update.phtml +++ b/app/code/Magento/Wishlist/view/frontend/templates/button/update.phtml @@ -10,7 +10,7 @@ ?> getWishlist()->getItemsCount()): ?> - diff --git a/app/code/Magento/Wishlist/view/frontend/templates/cart/item/renderer/actions/move_to_wishlist.phtml b/app/code/Magento/Wishlist/view/frontend/templates/cart/item/renderer/actions/move_to_wishlist.phtml index c452c9aa05cd8..3367e088835a6 100644 --- a/app/code/Magento/Wishlist/view/frontend/templates/cart/item/renderer/actions/move_to_wishlist.phtml +++ b/app/code/Magento/Wishlist/view/frontend/templates/cart/item/renderer/actions/move_to_wishlist.phtml @@ -12,6 +12,6 @@ - escapeHtml(__('Move to Wishlist')); ?> + escapeHtml(__('Move to Wishlist')) ?> diff --git a/app/code/Magento/Wishlist/view/frontend/templates/catalog/product/list/addto/wishlist.phtml b/app/code/Magento/Wishlist/view/frontend/templates/catalog/product/list/addto/wishlist.phtml index c1dbf923106f7..399fdea9ee7a9 100644 --- a/app/code/Magento/Wishlist/view/frontend/templates/catalog/product/list/addto/wishlist.phtml +++ b/app/code/Magento/Wishlist/view/frontend/templates/catalog/product/list/addto/wishlist.phtml @@ -11,11 +11,11 @@ getWishlistHelper()->isAllow()): ?> - escapeHtml(__('Add to Wish List')) ?> + escapeHtml(__('Add to Wish List')) ?> diff --git a/app/code/Magento/Wishlist/view/frontend/templates/catalog/product/view/addto/wishlist.phtml b/app/code/Magento/Wishlist/view/frontend/templates/catalog/product/view/addto/wishlist.phtml index b8fa5395ce848..a9886441693ee 100644 --- a/app/code/Magento/Wishlist/view/frontend/templates/catalog/product/view/addto/wishlist.phtml +++ b/app/code/Magento/Wishlist/view/frontend/templates/catalog/product/view/addto/wishlist.phtml @@ -12,7 +12,7 @@ escapeHtml(__('Add to Wish List')) ?> + data-action="add-to-wishlist">escapeHtml(__('Add to Wish List')) ?>
    - +

    Welcome to Magento Admin, your online store headquarters.
    diff --git a/setup/view/error/404.phtml b/setup/view/error/404.phtml index c2d00115d126e..dd4a7d79a82bd 100644 --- a/setup/view/error/404.phtml +++ b/setup/view/error/404.phtml @@ -8,7 +8,7 @@ ?>

    - +

    A 404 error occurred

    @@ -37,7 +37,7 @@ } ?> -

    +

    @@ -45,7 +45,7 @@
    Controller:
    -
    escapeHtml( $this->controller ) ?> +
    escapeHtml( $this->controller ) ?> controller_class ) && $this->controller_class @@ -64,21 +64,21 @@ exception ) && $this->exception instanceof Exception ): ?>

    Additional information:

    -

    exception ); ?>

    +

    exception ) ?>

    File:
    - 
    exception->getFile() ?>:exception->getLine() ?>
    + 
    exception->getFile() ?>:exception->getLine() ?>
    Message:
    - 
    exception->getMessage() ?>
    + 
    exception->getMessage() ?>
    Stack trace:
    - 
    exception->getTraceAsString() ?>
    + 
    exception->getTraceAsString() ?>
  • -

    +

    File:
    - 
    getFile() ?>:getLine() ?>
    + 
    getFile() ?>:getLine() ?>
    Message:
    - 
    getMessage() ?>
    + 
    getMessage() ?>
    Stack trace:
    - 
    getTraceAsString() ?>
    + 
    getTraceAsString() ?>
    • diff --git a/setup/view/error/index.phtml b/setup/view/error/index.phtml index a2e7129e3e2e3..40f8bd4968b4e 100644 --- a/setup/view/error/index.phtml +++ b/setup/view/error/index.phtml @@ -8,32 +8,32 @@ ?>
    - +

    An error occurred

    -

    message ?>

    +

    message ?>

    display_exceptions ) && $this->display_exceptions ): ?> exception ) && $this->exception instanceof Exception ): ?>

    Additional information:

    -

    exception ); ?>

    +

    exception ) ?>

    File:
    - 
    exception->getFile() ?>:exception->getLine() ?>
    + 
    exception->getFile() ?>:exception->getLine() ?>
    Message:
    - 
    escapeHtml( $this->exception->getMessage() ) ?>
    + 
    escapeHtml( $this->exception->getMessage() ) ?>
    Stack trace:
    - 
    escapeHtml( $this->exception->getTraceAsString() ) ?>
    + 
    escapeHtml( $this->exception->getTraceAsString() ) ?>
  • -

    +

    File:
    - 
    getFile() ?>:getLine() ?>
    + 
    getFile() ?>:getLine() ?>
    Message:
    - 
    escapeHtml( $e->getMessage() ) ?>
    + 
    escapeHtml( $e->getMessage() ) ?>
    Stack trace:
    - 
    escapeHtml( $e->getTraceAsString() ) ?>
    + 
    escapeHtml( $e->getTraceAsString() ) ?>
    • diff --git a/setup/view/layout/layout.phtml b/setup/view/layout/layout.phtml index 7ea76c3de4efb..613ff391a8fff 100644 --- a/setup/view/layout/layout.phtml +++ b/setup/view/layout/layout.phtml @@ -4,7 +4,7 @@ * See COPYING.txt for license details. */ ?> -doctype(); ?> +doctype() ?> @@ -14,10 +14,10 @@ {{$state.current.title}} - headLink() + headLink() ->appendStylesheet($this->basePath() . '/pub/styles/setup.css'); ?> - headScript() + headScript() ->appendFile($this->basePath() . '/pub/angular/angular.min.js') ->appendFile($this->basePath() . '/pub/angular-ng-storage/angular-ng-storage.min.js') ->appendFile($this->basePath() . '/pub/angular-ng-dialog/angular-ng-dialog.min.js') @@ -54,24 +54,24 @@ - inlineScript() ?> + inlineScript() ?> -content; ?> +content ?> diff --git a/setup/view/magento/setup/create-admin-account.phtml b/setup/view/magento/setup/create-admin-account.phtml index 6c1942f71d025..5c55bd729d770 100644 --- a/setup/view/magento/setup/create-admin-account.phtml +++ b/setup/view/magento/setup/create-admin-account.phtml @@ -153,7 +153,7 @@ $passwordWizard = sprintf( class="form-el-input" ng-change="passwordStatusChange()" tooltip-placement="right" - tooltip-html-unsafe="" + tooltip-html-unsafe="" tooltip-trigger="focus" tooltip-append-to-body="true" type="password" diff --git a/setup/view/magento/setup/customize-your-store.phtml b/setup/view/magento/setup/customize-your-store.phtml index 3efcdc4d05050..15cd53ca26cfd 100644 --- a/setup/view/magento/setup/customize-your-store.phtml +++ b/setup/view/magento/setup/customize-your-store.phtml @@ -69,7 +69,7 @@ tooltip-trigger="focus" tooltip-append-to-body="true"> timezone as $value => $label ): ?> - " . $label . ""; ?> + " . $label . "" ?> @@ -93,7 +93,7 @@ tooltip-trigger="focus" tooltip-append-to-body="true"> currency as $value => $label ): ?> - " . $label . ""; ?> + " . $label . "" ?> @@ -117,7 +117,7 @@ tooltip-trigger="focus" tooltip-append-to-body="true"> language as $value => $label ): ?> - " . $label . ""; ?> + " . $label . "" ?> diff --git a/setup/view/magento/setup/extension-grid.phtml b/setup/view/magento/setup/extension-grid.phtml index be9930bff3276..47e5f7eec309b 100644 --- a/setup/view/magento/setup/extension-grid.phtml +++ b/setup/view/magento/setup/extension-grid.phtml @@ -81,7 +81,7 @@ {{total}} extensions
    + ng-include="'basePath() ?>/pub/magento/setup/view/pagination.html'">
    @@ -170,7 +170,7 @@ (!$root.extensionsProcessed)" class="loading-mask ng-scope" data-role="loader">
    - Loading... + Loading... Please wait...
    diff --git a/setup/view/magento/setup/index.phtml b/setup/view/magento/setup/index.phtml index fa95356ae0a89..648345beec7f7 100644 --- a/setup/view/magento/setup/index.phtml +++ b/setup/view/magento/setup/index.phtml @@ -8,7 +8,7 @@
    - render('navigation/menu.phtml');?> + render('navigation/menu.phtml') ?>
    + ng-include="'basePath() ?>/pub/magento/setup/view/pagination.html'">
    @@ -138,7 +138,7 @@
    - Loading... + Loading... Please wait...
    diff --git a/setup/view/magento/setup/landing.phtml b/setup/view/magento/setup/landing.phtml index 03014df505234..581be20df937b 100644 --- a/setup/view/magento/setup/landing.phtml +++ b/setup/view/magento/setup/landing.phtml @@ -8,9 +8,9 @@ ?>
    - +

    - version; ?> + version ?>

    Welcome to Magento Admin, your online store headquarters. diff --git a/setup/view/magento/setup/license.phtml b/setup/view/magento/setup/license.phtml index e7fbe27140838..6adaa49001a5c 100644 --- a/setup/view/magento/setup/license.phtml +++ b/setup/view/magento/setup/license.phtml @@ -8,7 +8,7 @@

    - license, ENT_COMPAT, 'UTF-8')); ?> + license, ENT_COMPAT, 'UTF-8')) ?>
    diff --git a/setup/view/magento/setup/marketplace-credentials.phtml b/setup/view/magento/setup/marketplace-credentials.phtml index 22ad4b6558f33..3116a0264039f 100644 --- a/setup/view/magento/setup/marketplace-credentials.phtml +++ b/setup/view/magento/setup/marketplace-credentials.phtml @@ -7,7 +7,7 @@
    diff --git a/setup/view/magento/setup/navigation/header-bar.phtml b/setup/view/magento/setup/navigation/header-bar.phtml index bd23e4ada6cf7..03fb55d46cc4e 100644 --- a/setup/view/magento/setup/navigation/header-bar.phtml +++ b/setup/view/magento/setup/navigation/header-bar.phtml @@ -8,7 +8,7 @@ ?>
    diff --git a/setup/view/magento/setup/navigation/side-menu.phtml b/setup/view/magento/setup/navigation/side-menu.phtml index 49206ced5ab71..d41b306a75fca 100644 --- a/setup/view/magento/setup/navigation/side-menu.phtml +++ b/setup/view/magento/setup/navigation/side-menu.phtml @@ -17,7 +17,7 @@ ?>
    @@ -146,7 +146,7 @@
    - Loading... + Loading... Please wait...
    diff --git a/setup/view/magento/setup/updater-success.phtml b/setup/view/magento/setup/updater-success.phtml index 05eb41cb55879..0e4c108d8495c 100644 --- a/setup/view/magento/setup/updater-success.phtml +++ b/setup/view/magento/setup/updater-success.phtml @@ -30,7 +30,7 @@
    - Loading... + Loading... Please wait...
    diff --git a/setup/view/magento/setup/web-configuration.phtml b/setup/view/magento/setup/web-configuration.phtml index 589431bc2dc0c..d0307a71e4a37 100644 --- a/setup/view/magento/setup/web-configuration.phtml +++ b/setup/view/magento/setup/web-configuration.phtml @@ -72,12 +72,12 @@ $hints = [ name="base_url" ng-model="config.address.base_url" ng-class="{'invalid': webconfig.base_url.$invalid && webconfig.submitted}" - ng-init="config.address.auto_base_url = 'autoBaseUrl ?>'; fillBaseURL();" + ng-init="config.address.auto_base_url = 'autoBaseUrl ?>'; fillBaseURL();" ng-blur="addSlash()" ng-change="populateHttps()" ng-pattern="/^(https?:\/\/).*$/" tooltip-placement="right" - tooltip-html-unsafe="" + tooltip-html-unsafe="" tooltip-trigger="focus" tooltip-append-to-body="true" > @@ -115,10 +115,10 @@ $hints = [ ng-pattern="/^[a-zA-Z0-9_]+$/" ng-model="config.address.admin" ng-class="{'invalid' : webconfig.admin.$invalid && webconfig.submitted }" - ng-init="config.address.admin = 'autoAdminPath ?>';" + ng-init="config.address.admin = 'autoAdminPath ?>';" required tooltip-placement="right" - tooltip-html-unsafe="" + tooltip-html-unsafe="" tooltip-trigger="focus" tooltip-append-to-body="true" > @@ -279,7 +279,7 @@ $hints = [ ng-model="config.encrypt.key" ng-class="{'invalid': webconfig.key.$invalid && webconfig.submitted}" tooltip-placement="right" - tooltip-html-unsafe="" + tooltip-html-unsafe="" tooltip-trigger="focus" tooltip-append-to-body="true" ng-minlength="4" @@ -316,7 +316,7 @@ $hints = [ tooltip-append-to-body="true" > sessionSave as $value):?> - " . ucfirst($value) . ""; ?> + " . ucfirst($value) . "" ?>
    From 702a9284bc42781391bc20842013c069869dfe3e Mon Sep 17 00:00:00 2001 From: David Alger Date: Tue, 6 Jun 2017 11:58:15 -0500 Subject: [PATCH 2/7] Added static test to enforce short-echo tags --- .../Sniffs/EchoTags/ShortEchoSyntaxSniff.php | 43 ++++++++++ .../EchoTags/ShortEchoSyntaxSniffTest.php | 82 +++++++++++++++++++ .../EchoTags/_files/correct_echotag.phtml | 6 ++ .../EchoTags/_files/correct_noecho.phtml | 6 ++ .../EchoTags/_files/incorrect_echotag.phtml | 6 ++ 5 files changed, 143 insertions(+) create mode 100644 dev/tests/static/framework/Magento/Sniffs/EchoTags/ShortEchoSyntaxSniff.php create mode 100644 dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/EchoTags/ShortEchoSyntaxSniffTest.php create mode 100644 dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/EchoTags/_files/correct_echotag.phtml create mode 100644 dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/EchoTags/_files/correct_noecho.phtml create mode 100644 dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/EchoTags/_files/incorrect_echotag.phtml diff --git a/dev/tests/static/framework/Magento/Sniffs/EchoTags/ShortEchoSyntaxSniff.php b/dev/tests/static/framework/Magento/Sniffs/EchoTags/ShortEchoSyntaxSniff.php new file mode 100644 index 0000000000000..de869982d54cf --- /dev/null +++ b/dev/tests/static/framework/Magento/Sniffs/EchoTags/ShortEchoSyntaxSniff.php @@ -0,0 +1,43 @@ +getTokens(); + $openTag = $tokens[$stackPtr]; + + // HHVM Will classify findNext(PHP_CodeSniffer_Tokens::$emptyTokens, ($stackPtr + 1), null, true); + if ($tokens[$nextToken]['code'] == T_ECHO) { + $phpcsFile->addError( + 'Short echo tag syntax must be used; expected "fileMock = $this->getMock(\PHP_CodeSniffer_File::class, [], [], '', false); + $this->shortEchoUsageSniff = new ShortEchoSyntaxSniff(); + } + + /** + * @param string $file + * @param int $incorrectUsages + * @dataProvider processDataProvider + */ + public function testEchoTagSniff($file, $stackPtr, $incorrectUsages) + { + $fileContent = file_get_contents(__DIR__ . '/_files/' . $file); + $tokens = $this->tokenizeString($fileContent); + + $this->fileMock->expects($this->any()) + ->method('findNext') + ->with([T_WHITESPACE, T_COMMENT, T_DOC_COMMENT], $stackPtr + 1, null, true) + ->willReturn($stackPtr + 1); + + $this->fileMock->expects($this->once()) + ->method('getTokens') + ->willReturn($tokens); + + $this->fileMock->expects($this->exactly($incorrectUsages)) + ->method('addError') + ->with('Short echo tag syntax must be used; expected "shortEchoUsageSniff->process($this->fileMock, $stackPtr); + } + + /** + * Get tokens for a string + * + * @param string $fileContent + * @return array + */ + private function tokenizeString($fileContent) + { + $tokens = token_get_all($fileContent); + $snifferTokens = []; + for ($i = 0; $i < count($tokens); $i++) { + $code = is_array($tokens[$i]) ? $tokens[$i][0] : $tokens[$i]; + $content = is_array($tokens[$i]) ? $tokens[$i][1] : $tokens[$i]; + $snifferTokens[$i]['code'] = $code; + $snifferTokens[$i]['content'] = $content; + } + return $snifferTokens; + } + + /** + * @return array + */ + public function processDataProvider() + { + return [ + ['incorrect_echotag.phtml', 1, 1], + ['correct_noecho.phtml', 1, 0], + ['correct_echotag.phtml', 1, 0] + ]; + } +} diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/EchoTags/_files/correct_echotag.phtml b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/EchoTags/_files/correct_echotag.phtml new file mode 100644 index 0000000000000..fd8027e1e23e6 --- /dev/null +++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/EchoTags/_files/correct_echotag.phtml @@ -0,0 +1,6 @@ +/** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ + + diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/EchoTags/_files/correct_noecho.phtml b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/EchoTags/_files/correct_noecho.phtml new file mode 100644 index 0000000000000..5b003e1e5cfba --- /dev/null +++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/EchoTags/_files/correct_noecho.phtml @@ -0,0 +1,6 @@ +/** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ + + diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/EchoTags/_files/incorrect_echotag.phtml b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/EchoTags/_files/incorrect_echotag.phtml new file mode 100644 index 0000000000000..84d72334bf850 --- /dev/null +++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/EchoTags/_files/incorrect_echotag.phtml @@ -0,0 +1,6 @@ +/** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ + + From 8688e99ec6d0fb3bf83f2007ed1178e96a3c57eb Mon Sep 17 00:00:00 2001 From: David Alger Date: Tue, 6 Jun 2017 13:04:29 -0500 Subject: [PATCH 3/7] Renamed test mock files to use extension not matched by convert-tags script --- .../Magento/Sniffs/EchoTags/ShortEchoSyntaxSniffTest.php | 6 +++--- .../_files/{correct_echotag.phtml => correct_echotag.txt} | 0 .../_files/{correct_noecho.phtml => correct_noecho.txt} | 0 .../{incorrect_echotag.phtml => incorrect_echotag.txt} | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/EchoTags/_files/{correct_echotag.phtml => correct_echotag.txt} (100%) rename dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/EchoTags/_files/{correct_noecho.phtml => correct_noecho.txt} (100%) rename dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/EchoTags/_files/{incorrect_echotag.phtml => incorrect_echotag.txt} (100%) diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/EchoTags/ShortEchoSyntaxSniffTest.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/EchoTags/ShortEchoSyntaxSniffTest.php index 7c3092b6ecd79..310bff9bf9779 100644 --- a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/EchoTags/ShortEchoSyntaxSniffTest.php +++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/EchoTags/ShortEchoSyntaxSniffTest.php @@ -74,9 +74,9 @@ private function tokenizeString($fileContent) public function processDataProvider() { return [ - ['incorrect_echotag.phtml', 1, 1], - ['correct_noecho.phtml', 1, 0], - ['correct_echotag.phtml', 1, 0] + ['incorrect_echotag.txt', 1, 1], + ['correct_noecho.txt', 1, 0], + ['correct_echotag.txt', 1, 0] ]; } } diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/EchoTags/_files/correct_echotag.phtml b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/EchoTags/_files/correct_echotag.txt similarity index 100% rename from dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/EchoTags/_files/correct_echotag.phtml rename to dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/EchoTags/_files/correct_echotag.txt diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/EchoTags/_files/correct_noecho.phtml b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/EchoTags/_files/correct_noecho.txt similarity index 100% rename from dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/EchoTags/_files/correct_noecho.phtml rename to dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/EchoTags/_files/correct_noecho.txt diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/EchoTags/_files/incorrect_echotag.phtml b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/EchoTags/_files/incorrect_echotag.txt similarity index 100% rename from dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/EchoTags/_files/incorrect_echotag.phtml rename to dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/EchoTags/_files/incorrect_echotag.txt From 69b55271daaf6049dc95b42812478699663b7a96 Mon Sep 17 00:00:00 2001 From: David Alger Date: Tue, 6 Jun 2017 13:33:45 -0500 Subject: [PATCH 4/7] Convert long form tags with echo to use short-echo tags #1563 Updated usages which contained the /* @escapeNotVerified */ comment --- .../templates/notification/window.phtml | 6 +- .../adminhtml/templates/system/messages.phtml | 8 +- .../templates/system/messages/popup.phtml | 4 +- .../adminhtml/templates/toolbar_entry.phtml | 30 ++-- .../templates/admin/access_denied.phtml | 8 +- .../adminhtml/templates/admin/formkey.phtml | 2 +- .../adminhtml/templates/admin/login.phtml | 12 +- .../templates/admin/login_buttons.phtml | 2 +- .../templates/admin/overlay_popup.phtml | 2 +- .../view/adminhtml/templates/admin/page.phtml | 4 +- .../adminhtml/templates/dashboard/graph.phtml | 10 +- .../templates/dashboard/graph/disabled.phtml | 2 +- .../adminhtml/templates/dashboard/grid.phtml | 24 +-- .../adminhtml/templates/dashboard/index.phtml | 10 +- .../templates/dashboard/salebar.phtml | 6 +- .../templates/dashboard/searches.phtml | 4 +- .../templates/dashboard/store/switcher.phtml | 14 +- .../templates/dashboard/totalbar.phtml | 6 +- .../adminhtml/templates/media/uploader.phtml | 12 +- .../view/adminhtml/templates/menu.phtml | 2 +- .../adminhtml/templates/page/copyright.phtml | 4 +- .../adminhtml/templates/page/footer.phtml | 4 +- .../adminhtml/templates/page/header.phtml | 22 +-- .../templates/page/js/calendar.phtml | 32 ++-- .../templates/page/js/require_js.phtml | 6 +- .../adminhtml/templates/page/notices.phtml | 6 +- .../adminhtml/templates/page/report.phtml | 2 +- .../adminhtml/templates/pageactions.phtml | 2 +- .../adminhtml/templates/store/switcher.phtml | 26 +-- .../switcher/form/renderer/fieldset.phtml | 8 +- .../form/renderer/fieldset/element.phtml | 8 +- .../templates/system/autocomplete.phtml | 6 +- .../templates/system/cache/additional.phtml | 20 +-- .../templates/system/cache/edit.phtml | 16 +- .../templates/system/design/edit.phtml | 2 +- .../adminhtml/templates/system/search.phtml | 12 +- .../templates/widget/accordion.phtml | 2 +- .../templates/widget/breadcrumbs.phtml | 2 +- .../adminhtml/templates/widget/button.phtml | 4 +- .../templates/widget/button/split.phtml | 4 +- .../templates/widget/form/container.phtml | 8 +- .../templates/widget/form/element.phtml | 38 ++--- .../widget/form/element/gallery.phtml | 34 ++-- .../widget/form/renderer/fieldset.phtml | 30 ++-- .../form/renderer/fieldset/element.phtml | 8 +- .../adminhtml/templates/widget/grid.phtml | 60 +++---- .../templates/widget/grid/column_set.phtml | 48 +++--- .../templates/widget/grid/export.phtml | 8 +- .../templates/widget/grid/extended.phtml | 92 +++++------ .../templates/widget/grid/massaction.phtml | 30 ++-- .../widget/grid/massaction_extended.phtml | 26 +-- .../templates/widget/grid/serializer.phtml | 12 +- .../adminhtml/templates/widget/tabs.phtml | 36 ++--- .../templates/widget/tabshoriz.phtml | 24 +-- .../adminhtml/templates/widget/tabsleft.phtml | 14 +- .../adminhtml/templates/backup/dialogs.phtml | 46 +++--- .../adminhtml/templates/backup/left.phtml | 2 +- .../composite/fieldset/options/bundle.phtml | 4 +- .../fieldset/options/type/checkbox.phtml | 26 +-- .../fieldset/options/type/multi.phtml | 18 +-- .../fieldset/options/type/radio.phtml | 36 ++--- .../fieldset/options/type/select.phtml | 28 ++-- .../templates/product/edit/bundle.phtml | 8 +- .../product/edit/bundle/option.phtml | 52 +++--- .../edit/bundle/option/selection.phtml | 52 +++--- .../creditmemo/create/items/renderer.phtml | 56 +++---- .../creditmemo/view/items/renderer.phtml | 22 +-- .../sales/invoice/create/items/renderer.phtml | 54 +++---- .../sales/invoice/view/items/renderer.phtml | 22 +-- .../sales/order/view/items/renderer.phtml | 56 +++---- .../shipment/create/items/renderer.phtml | 20 +-- .../sales/shipment/view/items/renderer.phtml | 20 +-- .../product/price/selection/amount.phtml | 2 +- .../templates/product/price/tier_prices.phtml | 2 +- .../catalog/product/view/backbutton.phtml | 2 +- .../catalog/product/view/customize.phtml | 2 +- .../catalog/product/view/options/notice.phtml | 2 +- .../catalog/product/view/summary.phtml | 14 +- .../catalog/product/view/type/bundle.phtml | 8 +- .../view/type/bundle/option/checkbox.phtml | 24 +-- .../view/type/bundle/option/multi.phtml | 22 +-- .../view/type/bundle/option/radio.phtml | 38 ++--- .../view/type/bundle/option/select.phtml | 36 ++--- .../product/view/type/bundle/options.phtml | 6 +- .../order/creditmemo/items/renderer.phtml | 12 +- .../sales/order/invoice/items/renderer.phtml | 10 +- .../sales/order/items/renderer.phtml | 30 ++-- .../sales/order/shipment/items/renderer.phtml | 12 +- .../catalog/category/checkboxes/tree.phtml | 18 +-- .../templates/catalog/category/edit.phtml | 4 +- .../category/edit/assign_products.phtml | 4 +- .../templates/catalog/category/tree.phtml | 34 ++-- .../catalog/category/widget/tree.phtml | 30 ++-- .../form/renderer/fieldset/element.phtml | 14 +- .../catalog/product/attribute/form.phtml | 8 +- .../catalog/product/attribute/js.phtml | 4 +- .../catalog/product/attribute/labels.phtml | 6 +- .../catalog/product/attribute/set/main.phtml | 28 ++-- .../product/attribute/set/toolbar/add.phtml | 2 +- .../catalog/product/composite/configure.phtml | 2 +- .../product/composite/fieldset/options.phtml | 2 +- .../fieldset/options/type/date.phtml | 16 +- .../fieldset/options/type/file.phtml | 28 ++-- .../fieldset/options/type/select.phtml | 2 +- .../fieldset/options/type/text.phtml | 8 +- .../product/composite/fieldset/qty.phtml | 4 +- .../templates/catalog/product/edit.phtml | 22 +-- .../product/edit/action/attribute.phtml | 4 +- .../product/edit/action/inventory.phtml | 152 +++++++++--------- .../product/edit/action/websites.phtml | 18 +-- .../catalog/product/edit/attribute_set.phtml | 2 +- .../product/edit/category/new/form.phtml | 2 +- .../catalog/product/edit/options.phtml | 4 +- .../catalog/product/edit/options/option.phtml | 40 ++--- .../product/edit/options/type/date.phtml | 6 +- .../product/edit/options/type/file.phtml | 12 +- .../product/edit/options/type/select.phtml | 12 +- .../product/edit/options/type/text.phtml | 8 +- .../catalog/product/edit/price/tier.phtml | 52 +++--- .../catalog/product/edit/serializer.phtml | 2 +- .../catalog/product/edit/websites.phtml | 12 +- .../catalog/product/helper/gallery.phtml | 60 +++---- .../templates/catalog/product/js.phtml | 8 +- .../templates/catalog/product/tab/alert.phtml | 2 +- .../catalog/product/tab/inventory.phtml | 134 +++++++-------- .../templates/catalog/wysiwyg/js.phtml | 4 +- .../product/edit/attribute/search.phtml | 10 +- .../templates/product/edit/tabs.phtml | 46 +++--- .../product/grid/massaction_extended.phtml | 26 +-- .../adminhtml/templates/rss/grid/link.phtml | 2 +- .../product/price/amount/default.phtml | 18 +-- .../templates/product/price/final_price.phtml | 6 +- .../templates/product/price/tier_prices.phtml | 12 +- .../templates/category/description.phtml | 2 +- .../frontend/templates/category/rss.phtml | 2 +- .../category/widget/link/link_block.phtml | 2 +- .../category/widget/link/link_inline.phtml | 2 +- .../frontend/templates/navigation/left.phtml | 10 +- .../templates/product/compare/link.phtml | 6 +- .../templates/product/compare/list.phtml | 40 ++--- .../templates/product/compare/sidebar.phtml | 14 +- .../frontend/templates/product/gallery.phtml | 18 +-- .../frontend/templates/product/image.phtml | 10 +- .../product/image_with_borders.phtml | 14 +- .../frontend/templates/product/list.phtml | 32 ++-- .../product/list/addto/compare.phtml | 4 +- .../templates/product/list/items.phtml | 48 +++--- .../templates/product/list/toolbar.phtml | 2 +- .../product/list/toolbar/limiter.phtml | 8 +- .../product/list/toolbar/sorter.phtml | 12 +- .../product/list/toolbar/viewmode.phtml | 22 +-- .../frontend/templates/product/listing.phtml | 10 +- .../templates/product/view/additional.phtml | 2 +- .../product/view/addto/compare.phtml | 4 +- .../templates/product/view/addtocart.phtml | 10 +- .../templates/product/view/attribute.phtml | 6 +- .../templates/product/view/attributes.phtml | 4 +- .../templates/product/view/description.phtml | 2 +- .../templates/product/view/details.phtml | 14 +- .../templates/product/view/form.phtml | 6 +- .../templates/product/view/gallery.phtml | 60 +++---- .../templates/product/view/mailto.phtml | 4 +- .../product/view/opengraph/currency.phtml | 2 +- .../product/view/opengraph/general.phtml | 2 +- .../templates/product/view/options.phtml | 2 +- .../product/view/options/type/date.phtml | 18 +-- .../product/view/options/type/file.phtml | 30 ++-- .../product/view/options/type/select.phtml | 6 +- .../product/view/options/type/text.phtml | 22 +-- .../product/view/options/wrapper.phtml | 2 +- .../templates/product/view/type/default.phtml | 8 +- .../product/widget/link/link_block.phtml | 2 +- .../product/widget/link/link_inline.phtml | 2 +- .../widget/new/column/new_default_list.phtml | 38 ++--- .../widget/new/column/new_images_list.phtml | 8 +- .../widget/new/column/new_names_list.phtml | 10 +- .../product/widget/new/content/new_grid.phtml | 44 ++--- .../product/widget/new/content/new_list.phtml | 50 +++--- .../frontend/templates/qtyincrements.phtml | 2 +- .../templates/stockqty/composite.phtml | 20 +-- .../frontend/templates/stockqty/default.phtml | 4 +- .../adminhtml/templates/promo/fieldset.phtml | 6 +- .../frontend/templates/advanced/form.phtml | 62 +++---- .../frontend/templates/advanced/link.phtml | 4 +- .../frontend/templates/advanced/result.phtml | 10 +- .../view/frontend/templates/result.phtml | 6 +- .../view/frontend/templates/button.phtml | 2 +- .../view/frontend/templates/cart/coupon.phtml | 12 +- .../view/frontend/templates/cart/form.phtml | 18 +-- .../cart/item/configure/updatecart.phtml | 8 +- .../templates/cart/item/default.phtml | 30 ++-- .../templates/cart/item/price/sidebar.phtml | 4 +- .../cart/item/renderer/actions/edit.phtml | 4 +- .../cart/item/renderer/actions/remove.phtml | 4 +- .../frontend/templates/cart/methods.phtml | 2 +- .../frontend/templates/cart/minicart.phtml | 10 +- .../frontend/templates/cart/noItems.phtml | 2 +- .../frontend/templates/cart/shipping.phtml | 10 +- .../view/frontend/templates/cart/totals.phtml | 2 +- .../frontend/templates/item/price/row.phtml | 2 +- .../frontend/templates/item/price/unit.phtml | 2 +- .../view/frontend/templates/onepage.phtml | 12 +- .../frontend/templates/onepage/failure.phtml | 6 +- .../frontend/templates/onepage/link.phtml | 6 +- .../templates/onepage/review/item.phtml | 6 +- .../review/item/price/row_excl_tax.phtml | 2 +- .../review/item/price/row_incl_tax.phtml | 2 +- .../review/item/price/unit_excl_tax.phtml | 2 +- .../review/item/price/unit_incl_tax.phtml | 2 +- .../frontend/templates/registration.phtml | 4 +- .../frontend/templates/shipping/price.phtml | 2 +- .../view/frontend/templates/success.phtml | 4 +- .../frontend/templates/total/default.phtml | 6 +- .../view/frontend/templates/agreements.phtml | 12 +- .../templates/multishipping_agreements.phtml | 12 +- .../templates/system/config/edit.phtml | 2 +- .../system/config/form/field/array.phtml | 32 ++-- .../templates/system/config/js.phtml | 2 +- .../templates/system/config/switcher.phtml | 8 +- .../templates/system/config/tabs.phtml | 14 +- .../product/attribute/new/created.phtml | 2 +- .../composite/fieldset/configurable.phtml | 10 +- .../product/edit/attribute/steps/bulk.phtml | 2 +- .../catalog/product/edit/super/config.phtml | 2 +- .../catalog/product/edit/super/matrix.phtml | 2 +- .../affected-attribute-set-selector/js.phtml | 12 +- .../templates/product/price/final_price.phtml | 6 +- .../view/type/options/configurable.phtml | 12 +- .../view/adminhtml/templates/grid.phtml | 20 +-- .../system/currency/rate/matrix.phtml | 16 +- .../system/currency/rate/services.phtml | 2 +- .../templates/system/currency/rates.phtml | 2 +- .../composite/fieldset/downloadable.phtml | 22 +-- .../templates/product/edit/downloadable.phtml | 4 +- .../product/edit/downloadable/links.phtml | 74 ++++----- .../product/edit/downloadable/samples.phtml | 14 +- .../column/downloadable/creditmemo/name.phtml | 18 +-- .../column/downloadable/invoice/name.phtml | 20 +-- .../items/column/downloadable/name.phtml | 20 +-- .../templates/catalog/product/links.phtml | 24 +-- .../templates/catalog/product/samples.phtml | 4 +- .../templates/catalog/product/type.phtml | 8 +- .../frontend/templates/checkout/success.phtml | 2 +- .../templates/customer/products/list.phtml | 28 ++-- .../items/renderer/downloadable.phtml | 14 +- .../invoice/items/renderer/downloadable.phtml | 12 +- .../order/items/renderer/downloadable.phtml | 26 +-- .../adminhtml/templates/giftoptionsform.phtml | 6 +- .../view/adminhtml/templates/popup.phtml | 4 +- .../sales/order/create/giftoptions.phtml | 8 +- .../templates/sales/order/create/items.phtml | 6 +- .../sales/order/view/giftoptions.phtml | 8 +- .../templates/sales/order/view/items.phtml | 16 +- .../templates/cart/gift_options.phtml | 4 +- .../item/renderer/actions/gift_options.phtml | 8 +- .../view/frontend/templates/inline.phtml | 148 ++++++++--------- .../view/frontend/templates/code.phtml | 16 +- .../view/frontend/templates/ga.phtml | 6 +- .../product/composite/fieldset/grouped.phtml | 34 ++-- .../templates/product/grouped/grouped.phtml | 4 +- .../templates/product/grouped/list.phtml | 8 +- .../templates/product/price/final_price.phtml | 2 +- .../templates/product/view/type/default.phtml | 8 +- .../templates/product/view/type/grouped.phtml | 22 +-- .../view/adminhtml/templates/busy.phtml | 4 +- .../templates/export/form/after.phtml | 6 +- .../templates/export/form/before.phtml | 2 +- .../templates/import/form/after.phtml | 2 +- .../templates/import/form/before.phtml | 8 +- .../templates/import/frame/result.phtml | 2 +- .../integration/activate/permissions.phtml | 2 +- .../activate/permissions/tab/webapi.phtml | 6 +- .../integration/popup_container.phtml | 14 +- .../integration/tokens_exchange.phtml | 2 +- .../adminhtml/templates/resourcetree.phtml | 10 +- .../frontend/templates/layer/filter.phtml | 12 +- .../view/frontend/templates/layer/state.phtml | 18 +-- .../view/frontend/templates/layer/view.phtml | 8 +- .../view/adminhtml/templates/index.phtml | 12 +- .../view/adminhtml/templates/partners.phtml | 6 +- .../system/storage/media/synchronize.phtml | 14 +- .../base/templates/product/price/msrp.phtml | 16 +- .../frontend/templates/cart/subtotal.phtml | 2 +- .../view/frontend/templates/cart/totals.phtml | 2 +- .../Msrp/view/frontend/templates/popup.phtml | 10 +- .../render/item/price_msrp_item.phtml | 20 +-- .../render/item/price_msrp_rss.phtml | 2 +- .../templates/checkout/address/select.phtml | 14 +- .../templates/checkout/addresses.phtml | 36 ++--- .../frontend/templates/checkout/billing.phtml | 22 +-- .../templates/checkout/billing/items.phtml | 14 +- .../templates/checkout/item/default.phtml | 6 +- .../frontend/templates/checkout/link.phtml | 2 +- .../templates/checkout/overview.phtml | 80 ++++----- .../templates/checkout/overview/item.phtml | 2 +- .../templates/checkout/shipping.phtml | 46 +++--- .../frontend/templates/checkout/state.phtml | 2 +- .../frontend/templates/checkout/success.phtml | 4 +- .../multishipping/item/default.phtml | 6 +- .../view/frontend/templates/subscribe.phtml | 2 +- .../checkout/onepage/review/totals.phtml | 10 +- .../adminhtml/templates/helper/gallery.phtml | 80 ++++----- .../templates/product/edit/base_image.phtml | 28 ++-- .../product/edit/slideout/form.phtml | 14 +- .../templates/product/view/gallery.phtml | 4 +- .../view/adminhtml/templates/grid.phtml | 62 +++---- .../templates/report/grid/container.phtml | 2 +- .../adminhtml/templates/store/switcher.phtml | 14 +- .../templates/store/switcher/enhanced.phtml | 12 +- .../templates/product/widget/viewed.phtml | 6 +- .../product/widget/viewed/item.phtml | 32 ++-- .../column/compared_default_list.phtml | 34 ++-- .../column/compared_images_list.phtml | 8 +- .../compared/column/compared_names_list.phtml | 8 +- .../compared/content/compared_grid.phtml | 44 ++--- .../compared/content/compared_list.phtml | 50 +++--- .../viewed/column/viewed_default_list.phtml | 32 ++-- .../viewed/column/viewed_images_list.phtml | 8 +- .../viewed/column/viewed_names_list.phtml | 8 +- .../widget/viewed/content/viewed_grid.phtml | 44 ++--- .../widget/viewed/content/viewed_list.phtml | 50 +++--- .../templates/items/column/name.phtml | 20 +-- .../templates/items/column/qty.phtml | 20 +-- .../adminhtml/templates/items/price/row.phtml | 2 +- .../templates/items/price/total.phtml | 2 +- .../templates/items/price/unit.phtml | 2 +- .../templates/items/renderer/default.phtml | 6 +- .../templates/order/address/form.phtml | 4 +- .../templates/order/comments/view.phtml | 14 +- .../templates/order/create/abstract.phtml | 2 +- .../order/create/billing/method/form.phtml | 14 +- .../templates/order/create/comment.phtml | 4 +- .../templates/order/create/coupons/form.phtml | 6 +- .../templates/order/create/data.phtml | 16 +- .../templates/order/create/form.phtml | 8 +- .../templates/order/create/form/account.phtml | 4 +- .../templates/order/create/form/address.phtml | 38 ++--- .../templates/order/create/giftmessage.phtml | 4 +- .../templates/order/create/items.phtml | 2 +- .../templates/order/create/items/grid.phtml | 94 +++++------ .../order/create/items/price/row.phtml | 2 +- .../order/create/items/price/total.phtml | 2 +- .../order/create/items/price/unit.phtml | 2 +- .../adminhtml/templates/order/create/js.phtml | 4 +- .../order/create/newsletter/form.phtml | 2 +- .../order/create/shipping/method/form.phtml | 22 +-- .../templates/order/create/sidebar.phtml | 12 +- .../order/create/sidebar/items.phtml | 48 +++--- .../templates/order/create/store/select.phtml | 4 +- .../templates/order/create/totals.phtml | 10 +- .../order/create/totals/default.phtml | 8 +- .../order/create/totals/grandtotal.phtml | 26 +-- .../order/create/totals/shipping.phtml | 30 ++-- .../order/create/totals/subtotal.phtml | 24 +-- .../templates/order/create/totals/tax.phtml | 18 +-- .../order/creditmemo/create/form.phtml | 16 +- .../order/creditmemo/create/items.phtml | 40 ++--- .../create/items/renderer/default.phtml | 12 +- .../create/totals/adjustments.phtml | 14 +- .../order/creditmemo/view/form.phtml | 24 +-- .../order/creditmemo/view/items.phtml | 18 +-- .../view/items/renderer/default.phtml | 6 +- .../adminhtml/templates/order/details.phtml | 40 ++--- .../templates/order/giftoptions.phtml | 2 +- .../templates/order/invoice/create/form.phtml | 22 +-- .../order/invoice/create/items.phtml | 46 +++--- .../create/items/renderer/default.phtml | 10 +- .../templates/order/invoice/view/form.phtml | 22 +-- .../templates/order/invoice/view/items.phtml | 16 +- .../invoice/view/items/renderer/default.phtml | 6 +- .../adminhtml/templates/order/totalbar.phtml | 4 +- .../adminhtml/templates/order/totals.phtml | 20 +-- .../templates/order/totals/discount.phtml | 6 +- .../templates/order/totals/due.phtml | 4 +- .../templates/order/totals/grand.phtml | 6 +- .../templates/order/totals/item.phtml | 4 +- .../templates/order/totals/paid.phtml | 4 +- .../templates/order/totals/refunded.phtml | 4 +- .../templates/order/totals/shipping.phtml | 4 +- .../templates/order/totals/tax.phtml | 14 +- .../templates/order/view/giftmessage.phtml | 26 +-- .../templates/order/view/history.phtml | 22 +-- .../adminhtml/templates/order/view/info.phtml | 58 +++---- .../order/view/items/renderer/default.phtml | 2 +- .../templates/order/view/tab/history.phtml | 24 +-- .../templates/order/view/tab/info.phtml | 16 +- .../templates/rss/order/grid/link.phtml | 2 +- .../templates/transactions/detail.phtml | 20 +-- .../view/frontend/templates/guest/form.phtml | 22 +-- .../frontend/templates/items/price/row.phtml | 2 +- .../items/price/total_after_discount.phtml | 2 +- .../frontend/templates/items/price/unit.phtml | 2 +- .../frontend/templates/order/comments.phtml | 4 +- .../frontend/templates/order/creditmemo.phtml | 4 +- .../templates/order/creditmemo/items.phtml | 28 ++-- .../creditmemo/items/renderer/default.phtml | 14 +- .../frontend/templates/order/history.phtml | 30 ++-- .../view/frontend/templates/order/info.phtml | 16 +- .../templates/order/info/buttons.phtml | 6 +- .../templates/order/info/buttons/rss.phtml | 4 +- .../frontend/templates/order/invoice.phtml | 4 +- .../templates/order/invoice/items.phtml | 24 +-- .../invoice/items/renderer/default.phtml | 10 +- .../view/frontend/templates/order/items.phtml | 38 ++--- .../order/items/renderer/default.phtml | 24 +-- .../templates/order/order_comments.phtml | 4 +- .../frontend/templates/order/order_date.phtml | 2 +- .../templates/order/order_status.phtml | 2 +- .../templates/order/print/creditmemo.phtml | 34 ++-- .../templates/order/print/invoice.phtml | 32 ++-- .../templates/order/print/shipment.phtml | 22 +-- .../frontend/templates/order/recent.phtml | 36 ++--- .../shipment/items/renderer/default.phtml | 10 +- .../frontend/templates/order/totals.phtml | 10 +- .../view/frontend/templates/order/view.phtml | 14 +- .../frontend/templates/reorder/sidebar.phtml | 18 +-- .../templates/widget/guest/form.phtml | 20 +-- .../view/frontend/templates/form.mini.phtml | 18 +-- .../Search/view/frontend/templates/term.phtml | 6 +- .../adminhtml/templates/create/form.phtml | 16 +- .../adminhtml/templates/create/items.phtml | 30 ++-- .../create/items/renderer/default.phtml | 10 +- .../templates/order/packaging/grid.phtml | 32 ++-- .../templates/order/packaging/packed.phtml | 64 ++++---- .../templates/order/packaging/popup.phtml | 12 +- .../order/packaging/popup_content.phtml | 70 ++++---- .../adminhtml/templates/order/tracking.phtml | 12 +- .../templates/order/tracking/view.phtml | 20 +-- .../adminhtml/templates/order/view/info.phtml | 10 +- .../view/adminhtml/templates/view/form.phtml | 28 ++-- .../view/adminhtml/templates/view/items.phtml | 6 +- .../view/items/renderer/default.phtml | 2 +- .../view/frontend/templates/items.phtml | 32 ++-- .../frontend/templates/order/shipment.phtml | 4 +- .../frontend/templates/tracking/link.phtml | 6 +- .../frontend/templates/swagger-ui/index.phtml | 2 +- .../catalog/product/attribute/js.phtml | 2 +- .../catalog/product/attribute/text.phtml | 2 +- .../templates/product/layered/renderer.phtml | 46 +++--- .../templates/product/listing/renderer.phtml | 12 +- .../templates/product/view/renderer.phtml | 4 +- .../adminhtml/templates/class/page/edit.phtml | 2 +- .../adminhtml/templates/items/price/row.phtml | 8 +- .../templates/items/price/total.phtml | 2 +- .../templates/items/price/unit.phtml | 8 +- .../order/create/items/price/row.phtml | 8 +- .../order/create/items/price/total.phtml | 8 +- .../order/create/items/price/unit.phtml | 8 +- .../view/adminhtml/templates/rate/js.phtml | 2 +- .../view/adminhtml/templates/rate/title.phtml | 10 +- .../view/adminhtml/templates/rule/edit.phtml | 30 ++-- .../adminhtml/templates/rule/rate/form.phtml | 2 +- .../templates/toolbar/class/add.phtml | 4 +- .../templates/toolbar/class/save.phtml | 2 +- .../templates/toolbar/rate/save.phtml | 2 +- .../templates/toolbar/rule/add.phtml | 4 +- .../templates/toolbar/rule/save.phtml | 2 +- .../base/templates/pricing/adjustment.phtml | 6 +- .../templates/pricing/adjustment/bundle.phtml | 8 +- .../checkout/cart/item/price/sidebar.phtml | 8 +- .../templates/checkout/grandtotal.phtml | 26 +-- .../templates/checkout/shipping.phtml | 30 ++-- .../templates/checkout/shipping/price.phtml | 8 +- .../templates/checkout/subtotal.phtml | 24 +-- .../frontend/templates/checkout/tax.phtml | 20 +-- .../frontend/templates/item/price/row.phtml | 4 +- .../item/price/total_after_discount.phtml | 2 +- .../frontend/templates/item/price/unit.phtml | 4 +- .../view/frontend/templates/order/tax.phtml | 18 +-- .../adminhtml/templates/importExport.phtml | 8 +- .../templates/browser/content/files.phtml | 8 +- .../templates/browser/content/uploader.phtml | 8 +- .../templates/design/config/edit/scope.phtml | 4 +- .../view/adminhtml/templates/tabs/css.phtml | 2 +- .../templates/tabs/fieldset/js.phtml | 4 +- .../view/adminhtml/templates/tabs/js.phtml | 2 +- .../view/adminhtml/templates/title.phtml | 4 +- .../Theme/view/base/templates/root.phtml | 14 +- .../templates/callouts/left_col.phtml | 6 +- .../templates/callouts/right_col.phtml | 6 +- .../view/frontend/templates/html/block.phtml | 6 +- .../frontend/templates/html/breadcrumbs.phtml | 4 +- .../frontend/templates/html/bugreport.phtml | 4 +- .../frontend/templates/html/collapsible.phtml | 8 +- .../frontend/templates/html/copyright.phtml | 2 +- .../view/frontend/templates/html/footer.phtml | 6 +- .../frontend/templates/html/header/logo.phtml | 8 +- .../frontend/templates/html/notices.phtml | 10 +- .../view/frontend/templates/html/pager.phtml | 52 +++--- .../frontend/templates/html/sections.phtml | 10 +- .../view/frontend/templates/html/skip.phtml | 2 +- .../frontend/templates/html/skiptarget.phtml | 2 +- .../view/frontend/templates/html/title.phtml | 8 +- .../frontend/templates/html/topmenu.phtml | 4 +- .../view/frontend/templates/js/calendar.phtml | 30 ++-- .../view/frontend/templates/js/cookie.phtml | 6 +- .../templates/page/js/require_js.phtml | 2 +- .../templates/control/button/default.phtml | 4 +- .../base/templates/control/button/split.phtml | 4 +- .../Ui/view/base/templates/form/default.phtml | 4 +- .../view/base/templates/label/default.phtml | 2 +- .../base/templates/layout/tabs/default.phtml | 2 +- .../templates/layout/tabs/nav/default.phtml | 2 +- .../Ui/view/base/templates/logger.phtml | 2 +- .../templates/admin/forgotpassword.phtml | 14 +- .../templates/admin/forgotpassword_url.phtml | 2 +- .../admin/resetforgottenpassword.phtml | 14 +- .../view/adminhtml/templates/role/edit.phtml | 10 +- .../view/adminhtml/templates/role/info.phtml | 2 +- .../view/adminhtml/templates/role/users.phtml | 2 +- .../templates/role/users_grid_js.phtml | 24 +-- .../templates/user/roles_grid_js.phtml | 14 +- .../adminhtml/templates/items/price/row.phtml | 12 +- .../templates/items/price/total.phtml | 2 +- .../templates/items/price/unit.phtml | 12 +- .../order/create/items/price/row.phtml | 20 +-- .../order/create/items/price/total.phtml | 20 +-- .../order/create/items/price/unit.phtml | 20 +-- .../adminhtml/templates/renderer/tax.phtml | 38 ++--- .../base/templates/pricing/adjustment.phtml | 20 +-- .../checkout/cart/item/price/sidebar.phtml | 16 +- .../review/item/price/row_excl_tax.phtml | 14 +- .../review/item/price/row_incl_tax.phtml | 14 +- .../review/item/price/unit_excl_tax.phtml | 14 +- .../review/item/price/unit_incl_tax.phtml | 14 +- .../frontend/templates/item/price/row.phtml | 28 ++-- .../item/price/total_after_discount.phtml | 2 +- .../frontend/templates/item/price/unit.phtml | 28 ++-- .../templates/layer/state.phtml | 18 +-- .../templates/layer/view.phtml | 12 +- .../Utility/_files/xss_safe.phtml | 2 +- 531 files changed, 3940 insertions(+), 3940 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 c6b8bda208410..3f79e803ccca2 100644 --- a/app/code/Magento/AdminNotification/view/adminhtml/templates/notification/window.phtml +++ b/app/code/Magento/AdminNotification/view/adminhtml/templates/notification/window.phtml @@ -19,11 +19,11 @@ "autoOpen": true, "buttons": false, "modalClass": "modal-system-messages", - "title": "getHeaderText(); ?>" + "title": "getHeaderText() ?>" } }'>
  • - getNoticeMessageText(); ?>
    - getReadDetailsText(); ?> + getNoticeMessageText() ?>
    + 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 32a33ce2bae30..01d6fdcb29571 100644 --- a/app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages.phtml +++ b/app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages.phtml @@ -15,19 +15,19 @@
    • - getText();?> + getText() ?>
    - + getCriticalCount()): ?>
    - getCriticalCount();?> + getCriticalCount() ?>
    @@ -35,7 +35,7 @@ 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 862d573d539a2..a97293547e132 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 @@ -12,8 +12,8 @@
    '+ - ' '+ - '
    '+ - ' '+ - ''+ + ' '+ + '
    '+ + ' '+ + ''+ '    		'+ '
    '+ @@ -73,16 +73,16 @@ var pageGroupTemplate = '
    '+ - ''+ - ''+ + '
    '+ + ''+ + ''+ '

    ' + - ' ' + - '' + - '<?php echo $block->escapeJs(__('Open Chooser')); ?>' + + ' ' + + '' + + '<?= $block->escapeJs(__('Open Chooser')) ?>' + ' ' + - '' + - '<?php echo $block->escapeJs(__('Apply')); ?>' + + '' + + '<?= $block->escapeJs(__('Apply')) ?>' + '' + '

    '+ '
    '+ @@ -98,8 +98,8 @@ var pageGroupTemplate = '
    '+ '
     
    +
    tags from the code. */ /* foreach ($block->getColumns() as $_column): ?> @@ -34,9 +34,9 @@ $numColumns = sizeof($block->getColumns()); getIsCollapsed()): ?> getCollection() as $_index => $_item): ?> - + getColumns() as $_column): ?> - + @@ -44,7 +44,7 @@ $numColumns = sizeof($block->getColumns());
    getRowField($_item)) != '' ? $_html : ' ') ?>getRowField($_item)) != '' ? $_html : ' ') ?>
    -
    getEmptyText() ?>
    +
    getEmptyText() ?>
    canDisplayContainer()): ?> @@ -65,23 +65,23 @@ require(deps, function(getDependencyJsObject() ? 'registry' : '') ? getDependencyJsObject()): ?> - registry.get('getDependencyJsObject() ?>', function (getDependencyJsObject() ?>) { + registry.get('getDependencyJsObject() ?>', function (getDependencyJsObject() ?>) { - getJsObjectName() ?> = new varienGrid('getId() ?>', 'getGridUrl() ?>', 'getVarNamePage() ?>', 'getVarNameSort() ?>', 'getVarNameDir() ?>', 'getVarNameFilter() ?>'); - getJsObjectName() ?>.useAjax = 'getUseAjax() ?>'; + getJsObjectName() ?> = new varienGrid('getId() ?>', 'getGridUrl() ?>', 'getVarNamePage() ?>', 'getVarNameSort() ?>', 'getVarNameDir() ?>', 'getVarNameFilter() ?>'); + getJsObjectName() ?>.useAjax = 'getUseAjax() ?>'; getRowClickCallback()): ?> - getJsObjectName() ?>.rowClickCallback = getRowClickCallback() ?>; + getJsObjectName() ?>.rowClickCallback = getRowClickCallback() ?>; getCheckboxCheckCallback()): ?> - getJsObjectName() ?>.checkboxCheckCallback = getCheckboxCheckCallback() ?>; + getJsObjectName() ?>.checkboxCheckCallback = getCheckboxCheckCallback() ?>; getRowInitCallback()): ?> - getJsObjectName() ?>.initRowCallback = getRowInitCallback() ?>; - getJsObjectName() ?>.rows.each(function(row){getRowInitCallback() ?>(getJsObjectName() ?>, row)}); + getJsObjectName() ?>.initRowCallback = getRowInitCallback() ?>; + getJsObjectName() ?>.rows.each(function(row){getRowInitCallback() ?>(getJsObjectName() ?>, row)}); getMassactionBlock()->isAvailable()): ?> - getMassactionBlock()->getJavaScript() ?> + getMassactionBlock()->getJavaScript() ?> getDependencyJsObject()): ?> diff --git a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/index.phtml b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/index.phtml index 9d7fe843fe4b5..865e0fac38314 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/index.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/index.phtml @@ -18,12 +18,12 @@ require([ window.changeDiagramsPeriod = function(periodObj) { periodParam = periodObj.value ? 'period/' + periodObj.value + '/' : ''; getChildBlock('diagrams')->getTabsIds() as $tabId): ?> - ajaxBlockParam = 'block/tab_/'; + ajaxBlockParam = 'block/tab_/'; ajaxBlockUrl = 'getUrl('adminhtml/*/ajaxBlock', ['_current' => true, 'block' => '', 'period' => '']) ?>' + ajaxBlockParam + periodParam; new Ajax.Request(ajaxBlockUrl, { parameters: {isAjax: 'true', form_key: FORM_KEY}, onSuccess: function(transport) { - tabContentElementId = 'getChildBlock('diagrams')->getId() ?>__content'; + tabContentElementId = 'getChildBlock('diagrams')->getId() ?>__content'; try { if (transport.responseText.isJSON()) { var response = transport.responseText.evalJSON() @@ -93,15 +93,15 @@ window.changeDiagramsPeriod = function(periodObj) {
    getChildHtml('sales') ?>
    -
    +
    getChildHtml('lastOrders') ?>
    -
    +
    getChildHtml('lastSearches') ?>
    -
    +
    getChildHtml('topSearches') ?>
    diff --git a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/salebar.phtml b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/salebar.phtml index d7e6854d86e27..450a2c89b50da 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/salebar.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/salebar.phtml @@ -10,11 +10,11 @@ getTotals()) > 0): ?> getTotals() as $_total): ?>
    -
    +
    - - + +
    diff --git a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/searches.phtml b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/searches.phtml index 58862882d6735..f6e837fd54ede 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/searches.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/searches.phtml @@ -10,9 +10,9 @@ getCollection()->getItems()) > 0): ?>
    getCollection()->getItems() as $item): ?> - getQueryText() ?>
    + getQueryText() ?>
    -
    +
    diff --git a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/store/switcher.phtml b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/store/switcher.phtml index 8a26397e5fdc1..bf9ae27f17b48 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/store/switcher.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/store/switcher.phtml @@ -7,10 +7,10 @@ // @codingStandardsIgnoreFile ?> -

    +

    getHintHtml() ?> + +

    diff --git a/app/code/Magento/Backend/view/adminhtml/templates/page/js/require_js.phtml b/app/code/Magento/Backend/view/adminhtml/templates/page/js/require_js.phtml index 0b46d49febda3..9cb2cec091939 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/page/js/require_js.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/page/js/require_js.phtml @@ -5,9 +5,9 @@ */ ?> diff --git a/app/code/Magento/Backend/view/adminhtml/templates/page/notices.phtml b/app/code/Magento/Backend/view/adminhtml/templates/page/notices.phtml index b45a2ae6cb1c1..5418ad58b9519 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/page/notices.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/page/notices.phtml @@ -16,8 +16,8 @@ @@ -25,7 +25,7 @@ displayDemoNotice()): ?>
    - +
    diff --git a/app/code/Magento/Backend/view/adminhtml/templates/page/report.phtml b/app/code/Magento/Backend/view/adminhtml/templates/page/report.phtml index 902aee61a480f..3a3dbd99bfba9 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/page/report.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/page/report.phtml @@ -8,5 +8,5 @@ ?> getBugreportUrl()): ?> - + diff --git a/app/code/Magento/Backend/view/adminhtml/templates/pageactions.phtml b/app/code/Magento/Backend/view/adminhtml/templates/pageactions.phtml index b2aee70a7c074..69d545f12d075 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/pageactions.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/pageactions.phtml @@ -8,7 +8,7 @@ ?> getChildHtml()):?> -
    getUiId('content-header') ?>> +
    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 cf19f527ed28d..bb968c57610be 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml @@ -11,20 +11,20 @@ getWebsites()): ?>
    - +
    getUiId()?> /> + onchange="switchScope(this);"getUiId() ?> /> getUiId()?> /> + onchange="switchScope(this);"getUiId() ?> /> getUiId()?> /> + onchange="switchScope(this);"getUiId() ?> />
      hasDefaultOption()): ?> @@ -44,12 +44,12 @@ getDefaultSelectionName() != $block->getCurrentSelectionName()) { ?> - getDefaultSelectionName() ?> + getDefaultSelectionName() ?> - getDefaultSelectionName() ?> + getDefaultSelectionName() ?> @@ -121,7 +121,7 @@ getShowManageStoresLink() && $block->getAuthorization()->isAllowed('Magento_Backend::store')): ?>
    • - +
    @@ -176,7 +176,7 @@ require([ getUseConfirm()): ?> confirm({ - content: "", + content: "", actions: { confirm: function() { reload(); @@ -194,7 +194,7 @@ require([ function reload() { isUsingIframe()): ?> - var url = 'getSwitchUrl() ?>' + scopeParams; + var url = 'getSwitchUrl() ?>' + scopeParams; setLocation(url); jQuery('#preview_selected_store').val(scopeId); diff --git a/app/code/Magento/Backend/view/adminhtml/templates/store/switcher/form/renderer/fieldset.phtml b/app/code/Magento/Backend/view/adminhtml/templates/store/switcher/form/renderer/fieldset.phtml index 204fbe0952352..49a2c681285bf 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/store/switcher/form/renderer/fieldset.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/store/switcher/form/renderer/fieldset.phtml @@ -9,19 +9,19 @@ ?> getElement() ?> getFieldsetContainerId()): ?> -
    789 +
    789 getNoContainer()): ?> -
    +
    getLegend()): ?> - getLegend() ?> + getLegend() ?> getHintHtml() ?>
    - getHeaderBar() ?> + getHeaderBar() ?> getHintHtml() ?> diff --git a/app/code/Magento/Backend/view/adminhtml/templates/store/switcher/form/renderer/fieldset/element.phtml b/app/code/Magento/Backend/view/adminhtml/templates/store/switcher/form/renderer/fieldset/element.phtml index 693ee2b5c7cf2..e25c9d22ca40a 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/store/switcher/form/renderer/fieldset/element.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/store/switcher/form/renderer/fieldset/element.phtml @@ -28,17 +28,17 @@ $fieldAttributes = $fieldId . ' class="' . $fieldClass . '" ' getType() == 'hidden'): ?> getElementHtml() ?> - > + > getElementHtml() ?> getLabelHtml('', $element->getScopeLabel()) ?> - + getLabelHtml('', $element->getScopeLabel()) ?>
    - ' . $element->getElementHtml() . '
    ' : $element->getElementHtml(); ?> + ' . $element->getElementHtml() . '
    ' : $element->getElementHtml() ?> getHintHtml() ?> - +
    diff --git a/app/code/Magento/Backend/view/adminhtml/templates/system/autocomplete.phtml b/app/code/Magento/Backend/view/adminhtml/templates/system/autocomplete.phtml index b0cbe538f9737..22d93241f43f2 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/system/autocomplete.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/system/autocomplete.phtml @@ -9,9 +9,9 @@ ?>
      -
    • - escapeHtml($item['name']) ?> -
      +
    • + escapeHtml($item['name']) ?> +
      escapeHtml($item['description']) ?>
      • diff --git a/app/code/Magento/Backend/view/adminhtml/templates/system/cache/additional.phtml b/app/code/Magento/Backend/view/adminhtml/templates/system/cache/additional.phtml index bcaed16eab573..84bbc4ea601ef 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/system/cache/additional.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/system/cache/additional.phtml @@ -8,28 +8,28 @@ ?>

      - +

      - - +

      - - +

      isInProductionMode()): ?>

      - - +

      getSaveButtonHtml() ?>
      - + 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 c76fa6474f771..74cd4eb7f2c9d 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/widget/breadcrumbs.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/breadcrumbs.phtml @@ -19,7 +19,7 @@ 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 d7c3156414800..d3376745afe39 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/widget/button.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/button.phtml @@ -13,7 +13,7 @@ */ ?> getBeforeHtml() ?> - 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 fb5332c6529ea..27127e54e5be2 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 @@ -21,14 +21,14 @@ getDisabled()): ?> -
        getUiId("dropdown-menu"); ?>> +
          getUiId("dropdown-menu") ?>> getOptions() as $key => $option): ?>
        • getOptionAttributesHtml($key, $option) ?>> escapeHtml($option['label']) ?> -
          getUiId('item', $key, 'tooltip'); ?>> +
          getUiId('item', $key, 'tooltip') ?>> escapeHtml($option['hint']['label']) ?> 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 a393efa5f47a4..6f81ba2a275b4 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 @@ -8,9 +8,9 @@ /** @var $block \Magento\Backend\Block\Widget\Form\Container */ ?> -getFormInitScripts() ?> +getFormInitScripts() ?> getButtonsHtml('header')): ?> -
          getUiId('content-header') ?>>getButtonsHtml('header') ?>
          +
          getUiId('content-header') ?>>getButtonsHtml('header') ?>
          getFormHtml() ?> hasFooterButtons()): ?> @@ -27,7 +27,7 @@ require([ $('#edit_form').form() .validation({ - validationUrl: 'getValidationUrl() ?>', + validationUrl: 'getValidationUrl() ?>', highlight: function(element) { var detailsElement = $(element).closest('details'); if (detailsElement.length && detailsElement.is('.details')) { @@ -42,4 +42,4 @@ require([ }); -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 c02c975e503c7..66a61ee9e8462 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 @@ -11,23 +11,23 @@ case 'fieldset': ?>
          - getLegend() ?>
          + getLegend() ?>
          getElements() as $_element): ?> - drawElement($_element) ?> + drawElement($_element) ?>
          - + - getLabel()): ?> - getValues() as $_value): ?> - + @@ -36,30 +36,30 @@ case 'button': case 'password': ?> - getLabel()): ?> - getOnClick() ? 'onClick="' . $element->getOnClick() . '"' : '') ?>/> + getLabel()): ?> + getOnClick() ? 'onClick="' . $element->getOnClick() . '"' : '') ?>/> - getLabel()): ?> - + getLabel()): ?> + - + - + getRadios() as $_radio): ?> - getValue() == $element->getChecked()) ? 'checked="true"' : '' ?> > getLabel() ?> + getValue() == $element->getChecked()) ? 'checked="true"' : '' ?> > getLabel() ?> - + - + - - + + @@ -104,6 +104,6 @@ } ?> getScript()): ?> diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/element/gallery.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/element/gallery.phtml index 7a7486bbb31e6..4f8d9a56a38a3 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/element/gallery.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/element/gallery.phtml @@ -9,14 +9,14 @@ ?> - + - - - - + + + + @@ -30,15 +30,15 @@ getValues())): ?> getValues() as $image): $i++; ?> - + getValues()->getAttributeBackend()->getImageTypes() as $type): ?> + + <?= /* @escapeNotVerified */ $image->getValue() ?>
          + - - + + @@ -56,7 +56,7 @@ require([ 'prototype' ], function () { id = 0; -num_of_images = ; +num_of_images = ; window.addNewImage = function() { @@ -65,17 +65,17 @@ window.addNewImage = function() id--; num_of_images++; - new_file_input = ''; + new_file_input = ''; // Sort order input var new_row_input = document.createElement( 'input' ); new_row_input.type = 'text'; - new_row_input.name = 'getElement()->getParentName() ?>[position]['+id+']'; + new_row_input.name = 'getElement()->getParentName() ?>[position]['+id+']'; new_row_input.size = '3'; new_row_input.value = '0'; // Delete button - new_row_button = helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getDeleteButtonHtml("this")) ?>; + new_row_button = helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getDeleteButtonHtml("this")) ?>; table = document.getElementById( "gallery" ); @@ -114,8 +114,8 @@ window.deleteImage = function(image) document.getElementById("gallery_thead").style.visibility="hidden"; } if (image>0) { - document.getElementById('getElement()->getName() ?>_delete_'+image).value=image; - document.getElementById('getElement()->getName() ?>_tr_'+image).style.display='none'; + document.getElementById('getElement()->getName() ?>_delete_'+image).value=image; + document.getElementById('getElement()->getName() ?>_tr_'+image).style.display='none'; } else { image.parentNode.parentNode.parentNode.removeChild( image.parentNode.parentNode ); } diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset.phtml index bba1f957e2bbd..aaf1cb5ff550e 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset.phtml @@ -39,26 +39,26 @@ if ($isField) {
          + id="" + data-role="-wrapper">
          > - getLegend() ?> + getLegend() ?> - +
          + id="-content" + data-role="-content"> getNoContainer()): ?> -
          +
          getLegend() && !$isWrapped): ?> - - getLegend() ?> + + getLegend() ?>
          @@ -78,7 +78,7 @@ if ($isField) { 1):?> -
          +
          getBasicChildrenHtml() ?> @@ -91,16 +91,16 @@ if ($isField) { hasAdvanced() && !$isField): ?> getNoContainer() && $advancedAfter) ? '
          ' : '' ?> -
          - - +
          + + -
          +
          getAdvancedChildrenHtml() ?>
          hasAdvanced() && $isField): ?> -
          +
          getAdvancedChildrenHtml() ?>
          diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset/element.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset/element.phtml index 54f12d8de68f6..3608ed7662e49 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset/element.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset/element.phtml @@ -30,16 +30,16 @@ $fieldAttributes = $fieldId . ' class="' . $fieldClass . '" ' getType() == 'hidden'): ?> getElementHtml() ?> - > + > getElementHtml() ?> getLabelHtml('', $element->getScopeLabel()) ?> - + getLabelHtml('', $element->getScopeLabel()) ?>
          - ' . $element->getElementHtml() . '
          ' : $element->getElementHtml(); ?> - + ' . $element->getElementHtml() . '
          ' : $element->getElementHtml() ?> +
          diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml index f3e6d1a838f02..3c44f629cd8af 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml @@ -50,18 +50,18 @@ $numColumns = sizeof($block->getColumns()); getCollection()->getSize(); ?>
          - getUiId('total-count') ?>> - + getUiId('total-count') ?>> + - + 0 + class="mass-select-info _empty">0
          getPagerVisibility()): ?>
          - + class="admin__control-support-text">
          getCollection()->getCurPage() ?> getCollection()->getLastPageNumber() ?> @@ -88,32 +88,32 @@ $numColumns = sizeof($block->getColumns()); 1): ?> - + getUiId('current-page') ?> /> + onkeypress="getJsObjectName() ?>.inputPage(event, '')" getUiId('current-page') ?> /> - - +
          @@ -122,7 +122,7 @@ $numColumns = sizeof($block->getColumns());
          getGridCssClass()): ?> -
          +
          getChildHtml('grid.columnSet') ?>
          @@ -158,29 +158,29 @@ $numColumns = sizeof($block->getColumns()); getDependencyJsObject()): ?> - registry.get('getDependencyJsObject() ?>', function (getDependencyJsObject() ?>) { + registry.get('getDependencyJsObject() ?>', function (getDependencyJsObject() ?>) { - getJsObjectName() ?> = new varienGrid('escapeHtml($block->getId()) ?>', 'getGridUrl() ?>', 'getVarNamePage() ?>', 'getVarNameSort() ?>', 'getVarNameDir() ?>', 'getVarNameFilter() ?>'); - getJsObjectName() ?>.useAjax = getUseAjax() ? 'true' : 'false' ?>; + getJsObjectName() ?> = new varienGrid('escapeHtml($block->getId()) ?>', 'getGridUrl() ?>', 'getVarNamePage() ?>', 'getVarNameSort() ?>', 'getVarNameDir() ?>', 'getVarNameFilter() ?>'); + getJsObjectName() ?>.useAjax = getUseAjax() ? 'true' : 'false' ?>; getRowClickCallback()): ?> - getJsObjectName() ?>.rowClickCallback = getRowClickCallback() ?>; + getJsObjectName() ?>.rowClickCallback = getRowClickCallback() ?>; getCheckboxCheckCallback()): ?> - getJsObjectName() ?>.checkboxCheckCallback = getCheckboxCheckCallback() ?>; + getJsObjectName() ?>.checkboxCheckCallback = getCheckboxCheckCallback() ?>; getSortableUpdateCallback()): ?> - getJsObjectName() ?>.sortableUpdateCallback = getSortableUpdateCallback()?>; + getJsObjectName() ?>.sortableUpdateCallback = getSortableUpdateCallback() ?>; - getJsObjectName() ?>.bindSortable(); + getJsObjectName() ?>.bindSortable(); getRowInitCallback()): ?> - getJsObjectName() ?>.initRowCallback = getRowInitCallback() ?>; - getJsObjectName() ?>.initGridRows(); + getJsObjectName() ?>.initRowCallback = getRowInitCallback() ?>; + getJsObjectName() ?>.initGridRows(); getChildBlock('grid.massaction') && $block->getChildBlock('grid.massaction')->isAvailable()): ?> - getChildBlock('grid.massaction')->getJavaScript() ?> + getChildBlock('grid.massaction')->getJavaScript() ?> - getAdditionalJavaScript(); ?> + getAdditionalJavaScript() ?> getDependencyJsObject()): ?> }); 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 3105bd4418858..5ff9cfbd96f2c 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 @@ -27,7 +27,7 @@ $numColumns = sizeof($block->getColumns()); getColumns() as $_column): ?> getHeaderHtml() == ' '):?> - getHeaderHtmlProperty() ?>>  getHeaderHtml() ?> @@ -38,7 +38,7 @@ $numColumns = sizeof($block->getColumns()); isFilterVisible()): ?> getColumns() as $_column): ?> - getHeaderHtmlProperty() ?>> + getHeaderHtmlProperty() ?>> getFilterHtml() ?> @@ -53,20 +53,20 @@ $numColumns = sizeof($block->getColumns()); getCollection() as $_index => $_item): ?> hasMultipleRows($_item)) :?> updateItemByFirstMultiRow($_item); ?> - getRowClass($_item)):?> class="" + getRowClass($_item)):?> class="" >getColumns() as $_column): if ($block->shouldRenderCell($_item, $_column)): $_rowspan = $block->getRowspan($_item, $_column); - ?> - class="getCssProperty() ?> getId() == 'massaction' ? 'data-grid-checkbox-cell': ''?> " + class="getCssProperty() ?> getId() == 'massaction' ? 'data-grid-checkbox-cell': '' ?> " > getRowField($_item)) != '' ? $_html : ' ') ?> shouldRenderEmptyCell($_item, $_column)):?> - - getEmptyCellLabel()?> + + getEmptyCellLabel() ?> getColumns()); getMultipleRowColumns($_i) as $_column): - ?> getRowField($_i)) != '' ? $_html : ' ') ?> getColumns()); shouldRenderSubTotal($_item)): ?> getMultipleRowColumns() as $_column): ?> - hasSubtotalsLabel() ? $_column->getSubtotalsLabel() : $_column->getRowField($block->getSubTotals($_item)); @@ -102,22 +102,22 @@ $numColumns = sizeof($block->getColumns()); - getRowClass($_item)):?> - class="" + getRowClass($_item)):?> + class="" > getColumns() as $_column): ?> shouldRenderCell($_item, $_column)):?> - getRowField($_item)) != '' ? $_html : ' ') ?> shouldRenderEmptyCell($_item, $_column)):?> - - getEmptyCellLabel()?> + getEmptyCellLabel() ?> @@ -127,8 +127,8 @@ $numColumns = sizeof($block->getColumns()); getEmptyText()): ?> - getEmptyText() ?> + getEmptyText() ?> @@ -137,8 +137,8 @@ $numColumns = sizeof($block->getColumns()); getColumns() as $_column): ?> - hasTotalsLabel()) ? $_column->getTotalsLabel() : $_column->getRowField($block->getTotals()) ?> 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 bc5b744333c50..35be61dad7f73 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 @@ -8,12 +8,12 @@ ?>
          -