From 24dcb91572ed6b4e7068ad2371dc6ec769b16c77 Mon Sep 17 00:00:00 2001
From: Magento EngCom Team <magento-engcom-team@magento.com>
Date: Tue, 23 Jan 2018 10:59:34 -0600
Subject: [PATCH] :arrow_double_up: Forwardport of magento/magento2#12031 to
 2.3-develop branch

Applied pull request patch https://github.com/magento/magento2/pull/12031.patch (created by @enriquei4) based on commit(s):
  1. bce7d568c1894e8bdc9480d5face2369761b2cb5

Fixed GitHub Issues in 2.3-develop branch:
  - magento/magento2#6661: XHTML templates Don't Use Schema URNs (reported by @astorm)
---
 .../Ui/view/base/ui_component/templates/container/default.xhtml | 2 +-
 .../Ui/view/base/ui_component/templates/export/button.xhtml     | 2 +-
 .../Ui/view/base/ui_component/templates/form/collapsible.xhtml  | 2 +-
 .../Ui/view/base/ui_component/templates/form/default.xhtml      | 2 +-
 .../Ui/view/base/ui_component/templates/listing/default.xhtml   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/Ui/view/base/ui_component/templates/container/default.xhtml b/app/code/Magento/Ui/view/base/ui_component/templates/container/default.xhtml
index dd4a2038a53c4..5bbf252c8a787 100644
--- a/app/code/Magento/Ui/view/base/ui_component/templates/container/default.xhtml
+++ b/app/code/Magento/Ui/view/base/ui_component/templates/container/default.xhtml
@@ -5,7 +5,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<div xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../Ui/etc/ui_template.xsd">
+<div xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_template.xsd">
     <div data-bind="scope: '{{getName()}}.areas'" class="entry-edit form-inline">
         <!-- ko template: getTemplate() --><!-- /ko -->
     </div>
diff --git a/app/code/Magento/Ui/view/base/ui_component/templates/export/button.xhtml b/app/code/Magento/Ui/view/base/ui_component/templates/export/button.xhtml
index 6dc91cf6b3d5b..977ea8374dfa8 100644
--- a/app/code/Magento/Ui/view/base/ui_component/templates/export/button.xhtml
+++ b/app/code/Magento/Ui/view/base/ui_component/templates/export/button.xhtml
@@ -5,7 +5,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<div xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../Ui/etc/ui_template.xsd">
+<div xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_template.xsd">
     <div data-bind="scope: '{{getName()}}.areas'">
         <!-- ko template: getTemplate() --><!-- /ko -->
     </div>
diff --git a/app/code/Magento/Ui/view/base/ui_component/templates/form/collapsible.xhtml b/app/code/Magento/Ui/view/base/ui_component/templates/form/collapsible.xhtml
index baab52111aebe..aedf18961a719 100644
--- a/app/code/Magento/Ui/view/base/ui_component/templates/form/collapsible.xhtml
+++ b/app/code/Magento/Ui/view/base/ui_component/templates/form/collapsible.xhtml
@@ -5,7 +5,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<div xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../Ui/etc/ui_template.xsd">
+<div xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_template.xsd">
     <div data-role="spinner" data-component="{{getName()}}.{{getName()}}" class="admin__form-loading-mask">
         <div class="spinner">
             <span/><span/><span/><span/><span/><span/><span/><span/>
diff --git a/app/code/Magento/Ui/view/base/ui_component/templates/form/default.xhtml b/app/code/Magento/Ui/view/base/ui_component/templates/form/default.xhtml
index 5e0d699ed3edc..9d7715db905ab 100644
--- a/app/code/Magento/Ui/view/base/ui_component/templates/form/default.xhtml
+++ b/app/code/Magento/Ui/view/base/ui_component/templates/form/default.xhtml
@@ -5,7 +5,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<div xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../Ui/etc/ui_template.xsd">
+<div xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_template.xsd">
     <div data-role="spinner" data-component="{{getName()}}.areas" class="admin__data-grid-loading-mask">
         <div class="spinner">
             <span/><span/><span/><span/><span/><span/><span/><span/>
diff --git a/app/code/Magento/Ui/view/base/ui_component/templates/listing/default.xhtml b/app/code/Magento/Ui/view/base/ui_component/templates/listing/default.xhtml
index 88a8e42e2966b..661c7c0c23dfb 100644
--- a/app/code/Magento/Ui/view/base/ui_component/templates/listing/default.xhtml
+++ b/app/code/Magento/Ui/view/base/ui_component/templates/listing/default.xhtml
@@ -9,7 +9,7 @@
     class="admin__data-grid-outer-wrap"
     data-bind="scope: '{{getName()}}.{{getName()}}'"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="../../../../../../Ui/etc/ui_template.xsd">
+    xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_template.xsd">
     <div data-role="spinner" data-component="{{getName()}}.{{getName()}}.{{spinner}}" class="admin__data-grid-loading-mask">
         <div class="spinner">
             <span/><span/><span/><span/><span/><span/><span/><span/>