From e349cc9f2847876e877951eda888f0e46561a3a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=AE=E3=81=B6?= <nobuhiko.kimoto@gmail.com>
Date: Fri, 26 Aug 2022 18:34:07 +0900
Subject: [PATCH 1/6] ref #5640 #5641

---
 src/Eccube/Resource/template/install/step3.twig | 2 +-
 src/Eccube/Resource/template/install/step4.twig | 2 +-
 src/Eccube/Resource/template/install/step5.twig | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Eccube/Resource/template/install/step3.twig b/src/Eccube/Resource/template/install/step3.twig
index 37978c5758c..14ad58974b9 100644
--- a/src/Eccube/Resource/template/install/step3.twig
+++ b/src/Eccube/Resource/template/install/step3.twig
@@ -12,7 +12,7 @@ file that was distributed with this source code.
 
 {% set current = 3 %}
 
-{% form_theme form _self %}
+{% form_theme form '@admin/Form/bootstrap_4_layout.html.twig' %}
 {% block form_row %}
     <div class="form-group{% if not valid %} has-error{% endif %}">
         <label>{{ label }}
diff --git a/src/Eccube/Resource/template/install/step4.twig b/src/Eccube/Resource/template/install/step4.twig
index 94d28cd1b8c..c65307d3bdc 100644
--- a/src/Eccube/Resource/template/install/step4.twig
+++ b/src/Eccube/Resource/template/install/step4.twig
@@ -12,7 +12,7 @@ file that was distributed with this source code.
 
 {% set current = 4 %}
 
-{% form_theme form _self %}
+{% form_theme form '@admin/Form/bootstrap_4_layout.html.twig' %}
 {% block form_row %}
     <div class="form-group{% if not valid %} has-error{% endif %}">
         <label>{{ label }}
diff --git a/src/Eccube/Resource/template/install/step5.twig b/src/Eccube/Resource/template/install/step5.twig
index 71caeebd288..3b8d4ee2839 100644
--- a/src/Eccube/Resource/template/install/step5.twig
+++ b/src/Eccube/Resource/template/install/step5.twig
@@ -12,7 +12,7 @@ file that was distributed with this source code.
 
 {% set current = 5 %}
 
-{% form_theme form _self %}
+{% form_theme form '@admin/Form/bootstrap_4_layout.html.twig' %}
 {% block form_row %}
     <div class="form-group{% if not valid %} has-error{% endif %}">
         <label>{{ label }}

From 278ac6bb01efdcf781b404d412822692f6fe8aee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=AE=E3=81=B6?= <nobuhiko.kimoto@gmail.com>
Date: Wed, 31 Aug 2022 20:25:23 +0900
Subject: [PATCH 2/6] =?UTF-8?q?=E6=8C=87=E6=91=98=E3=81=AE=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../install/bootstrap_4_layout.html.twig      | 25 +++++++++++++++++++
 .../Resource/template/install/step3.twig      |  2 +-
 .../Resource/template/install/step4.twig      |  2 +-
 .../Resource/template/install/step5.twig      |  2 +-
 4 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100644 src/Eccube/Resource/template/install/bootstrap_4_layout.html.twig

diff --git a/src/Eccube/Resource/template/install/bootstrap_4_layout.html.twig b/src/Eccube/Resource/template/install/bootstrap_4_layout.html.twig
new file mode 100644
index 00000000000..25636e4900f
--- /dev/null
+++ b/src/Eccube/Resource/template/install/bootstrap_4_layout.html.twig
@@ -0,0 +1,25 @@
+{#
+This file is part of EC-CUBE
+
+Copyright(c) EC-CUBE CO.,LTD. All Rights Reserved.
+
+http://www.ec-cube.co.jp/
+
+For the full copyright and license information, please view the LICENSE
+file that was distributed with this source code.
+#}
+{%- extends 'bootstrap_5_layout.html.twig' -%}
+
+{% block form_errors -%}
+    {%- if errors|length > 0 -%}
+        <span class="{% if form is not rootform %}invalid-feedback{% else %}alert alert-danger{% endif %} d-block">
+            {%- for error in errors -%}
+                <span class="d-block">
+                    <span class="form-error-icon badge text-uppercase">{{ 'Error'|trans({}, 'validators') }}</span> <span class="form-error-message">{{ error.message }}</span>
+                </span>
+            {%- endfor -%}
+        </span>
+    {%- endif %}
+{%- endblock form_errors %}
+
+
diff --git a/src/Eccube/Resource/template/install/step3.twig b/src/Eccube/Resource/template/install/step3.twig
index 14ad58974b9..4e239219500 100644
--- a/src/Eccube/Resource/template/install/step3.twig
+++ b/src/Eccube/Resource/template/install/step3.twig
@@ -12,7 +12,7 @@ file that was distributed with this source code.
 
 {% set current = 3 %}
 
-{% form_theme form '@admin/Form/bootstrap_4_layout.html.twig' %}
+{% form_theme form '@install/bootstrap_4_layout.html.twig' %}
 {% block form_row %}
     <div class="form-group{% if not valid %} has-error{% endif %}">
         <label>{{ label }}
diff --git a/src/Eccube/Resource/template/install/step4.twig b/src/Eccube/Resource/template/install/step4.twig
index c65307d3bdc..1673d34ab29 100644
--- a/src/Eccube/Resource/template/install/step4.twig
+++ b/src/Eccube/Resource/template/install/step4.twig
@@ -12,7 +12,7 @@ file that was distributed with this source code.
 
 {% set current = 4 %}
 
-{% form_theme form '@admin/Form/bootstrap_4_layout.html.twig' %}
+{% form_theme form '@install/bootstrap_4_layout.html.twig' %}
 {% block form_row %}
     <div class="form-group{% if not valid %} has-error{% endif %}">
         <label>{{ label }}
diff --git a/src/Eccube/Resource/template/install/step5.twig b/src/Eccube/Resource/template/install/step5.twig
index 3b8d4ee2839..650fc63e47c 100644
--- a/src/Eccube/Resource/template/install/step5.twig
+++ b/src/Eccube/Resource/template/install/step5.twig
@@ -12,7 +12,7 @@ file that was distributed with this source code.
 
 {% set current = 5 %}
 
-{% form_theme form '@admin/Form/bootstrap_4_layout.html.twig' %}
+{% form_theme form '@install/bootstrap_4_layout.html.twig' %}
 {% block form_row %}
     <div class="form-group{% if not valid %} has-error{% endif %}">
         <label>{{ label }}

From 65c36ef8ddde793149ac28ef1ac7e6e74fea579f Mon Sep 17 00:00:00 2001
From: Chihiro Adachi <8196725+chihiro-adachi@users.noreply.github.com>
Date: Fri, 2 Sep 2022 15:18:19 +0900
Subject: [PATCH 3/6] =?UTF-8?q?@install=E3=81=AF=E6=9C=AA=E5=AE=9A?=
 =?UTF-8?q?=E7=BE=A9=E3=81=AA=E3=81=AE=E3=81=A7=E3=82=AB=E3=83=AC=E3=83=B3?=
 =?UTF-8?q?=E3=83=88=E3=83=87=E3=82=A3=E3=83=AC=E3=82=AF=E3=83=88=E3=83=AA?=
 =?UTF-8?q?=E3=81=AElayout.twig=E3=82=92=E8=AA=AD=E3=82=80=E3=82=88?=
 =?UTF-8?q?=E3=81=86=E3=81=AB=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Eccube/Resource/template/install/step3.twig | 2 +-
 src/Eccube/Resource/template/install/step4.twig | 2 +-
 src/Eccube/Resource/template/install/step5.twig | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Eccube/Resource/template/install/step3.twig b/src/Eccube/Resource/template/install/step3.twig
index 4e239219500..15c69f71321 100644
--- a/src/Eccube/Resource/template/install/step3.twig
+++ b/src/Eccube/Resource/template/install/step3.twig
@@ -12,7 +12,6 @@ file that was distributed with this source code.
 
 {% set current = 3 %}
 
-{% form_theme form '@install/bootstrap_4_layout.html.twig' %}
 {% block form_row %}
     <div class="form-group{% if not valid %} has-error{% endif %}">
         <label>{{ label }}
@@ -29,6 +28,7 @@ file that was distributed with this source code.
         {{ form_errors(form) }}
     </div>
 {% endblock %}
+{% form_theme form 'bootstrap_4_layout.html.twig' %}
 
 {% block main %}
     <div id="main" class="step4">
diff --git a/src/Eccube/Resource/template/install/step4.twig b/src/Eccube/Resource/template/install/step4.twig
index 1673d34ab29..9f0cd7fc835 100644
--- a/src/Eccube/Resource/template/install/step4.twig
+++ b/src/Eccube/Resource/template/install/step4.twig
@@ -12,7 +12,6 @@ file that was distributed with this source code.
 
 {% set current = 4 %}
 
-{% form_theme form '@install/bootstrap_4_layout.html.twig' %}
 {% block form_row %}
     <div class="form-group{% if not valid %} has-error{% endif %}">
         <label>{{ label }}
@@ -29,6 +28,7 @@ file that was distributed with this source code.
         {{ form_errors(form) }}
     </div>
 {% endblock %}
+{% form_theme form 'bootstrap_4_layout.html.twig' %}
 
 {% block main %}
     <div id="main" class="step5">
diff --git a/src/Eccube/Resource/template/install/step5.twig b/src/Eccube/Resource/template/install/step5.twig
index 650fc63e47c..1799659e16e 100644
--- a/src/Eccube/Resource/template/install/step5.twig
+++ b/src/Eccube/Resource/template/install/step5.twig
@@ -12,7 +12,6 @@ file that was distributed with this source code.
 
 {% set current = 5 %}
 
-{% form_theme form '@install/bootstrap_4_layout.html.twig' %}
 {% block form_row %}
     <div class="form-group{% if not valid %} has-error{% endif %}">
         <label>{{ label }}
@@ -29,6 +28,7 @@ file that was distributed with this source code.
         {{ form_errors(form) }}
     </div>
 {% endblock %}
+{% form_theme form 'bootstrap_4_layout.html.twig' %}
 
 {% block main %}
     <div id="main" class="step6">

From fbd6a434b9fdc66f1821be6432e1a673586978b6 Mon Sep 17 00:00:00 2001
From: Chihiro Adachi <8196725+chihiro-adachi@users.noreply.github.com>
Date: Fri, 2 Sep 2022 15:19:14 +0900
Subject: [PATCH 4/6] =?UTF-8?q?bg-danger=E3=82=92=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Resource/template/install/bootstrap_4_layout.html.twig      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Eccube/Resource/template/install/bootstrap_4_layout.html.twig b/src/Eccube/Resource/template/install/bootstrap_4_layout.html.twig
index 25636e4900f..8517d6fb433 100644
--- a/src/Eccube/Resource/template/install/bootstrap_4_layout.html.twig
+++ b/src/Eccube/Resource/template/install/bootstrap_4_layout.html.twig
@@ -15,7 +15,7 @@ file that was distributed with this source code.
         <span class="{% if form is not rootform %}invalid-feedback{% else %}alert alert-danger{% endif %} d-block">
             {%- for error in errors -%}
                 <span class="d-block">
-                    <span class="form-error-icon badge text-uppercase">{{ 'Error'|trans({}, 'validators') }}</span> <span class="form-error-message">{{ error.message }}</span>
+                    <span class="form-error-icon badge bg-danger text-uppercase">{{ 'Error'|trans({}, 'validators') }}</span> <span class="form-error-message">{{ error.message }}</span>
                 </span>
             {%- endfor -%}
         </span>

From b0c1d0bd5e9a66e088c84a4f6b7eba43966ec7b5 Mon Sep 17 00:00:00 2001
From: Chihiro Adachi <8196725+chihiro-adachi@users.noreply.github.com>
Date: Fri, 2 Sep 2022 15:19:31 +0900
Subject: [PATCH 5/6] =?UTF-8?q?=E4=B8=8D=E8=A6=81=E3=81=AA=E3=83=AC?=
 =?UTF-8?q?=E3=82=A4=E3=82=A2=E3=82=A6=E3=83=88=E3=82=92=E5=89=8A=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Eccube/Resource/template/install/step3.twig | 16 ----------------
 src/Eccube/Resource/template/install/step4.twig | 16 ----------------
 src/Eccube/Resource/template/install/step5.twig | 16 ----------------
 3 files changed, 48 deletions(-)

diff --git a/src/Eccube/Resource/template/install/step3.twig b/src/Eccube/Resource/template/install/step3.twig
index 15c69f71321..c0acf145b7d 100644
--- a/src/Eccube/Resource/template/install/step3.twig
+++ b/src/Eccube/Resource/template/install/step3.twig
@@ -12,22 +12,6 @@ file that was distributed with this source code.
 
 {% set current = 3 %}
 
-{% block form_row %}
-    <div class="form-group{% if not valid %} has-error{% endif %}">
-        <label>{{ label }}
-            {% if required %}<span class="required">*</span>{% endif %}
-        </label>
-        {{ form_widget(form) }}
-        {{ form_errors(form) }}
-    </div>
-{% endblock %}
-
-{% block checkbox_row %}
-    <div class="form-group{% if not valid %} has-error{% endif %}">
-        {{ form_widget(form) }}
-        {{ form_errors(form) }}
-    </div>
-{% endblock %}
 {% form_theme form 'bootstrap_4_layout.html.twig' %}
 
 {% block main %}
diff --git a/src/Eccube/Resource/template/install/step4.twig b/src/Eccube/Resource/template/install/step4.twig
index 9f0cd7fc835..237ba2f47c9 100644
--- a/src/Eccube/Resource/template/install/step4.twig
+++ b/src/Eccube/Resource/template/install/step4.twig
@@ -12,22 +12,6 @@ file that was distributed with this source code.
 
 {% set current = 4 %}
 
-{% block form_row %}
-    <div class="form-group{% if not valid %} has-error{% endif %}">
-        <label>{{ label }}
-            {% if required %}<span class="required">*</span>{% endif %}
-        </label>
-        {{ form_widget(form) }}
-        {{ form_errors(form) }}
-    </div>
-{% endblock %}
-
-{% block checkbox_row %}
-    <div class="form-group{% if not valid %} has-error{% endif %}">
-        {{ form_widget(form) }}
-        {{ form_errors(form) }}
-    </div>
-{% endblock %}
 {% form_theme form 'bootstrap_4_layout.html.twig' %}
 
 {% block main %}
diff --git a/src/Eccube/Resource/template/install/step5.twig b/src/Eccube/Resource/template/install/step5.twig
index 1799659e16e..b1afdc00c54 100644
--- a/src/Eccube/Resource/template/install/step5.twig
+++ b/src/Eccube/Resource/template/install/step5.twig
@@ -12,22 +12,6 @@ file that was distributed with this source code.
 
 {% set current = 5 %}
 
-{% block form_row %}
-    <div class="form-group{% if not valid %} has-error{% endif %}">
-        <label>{{ label }}
-            {% if required %}<span class="required">*</span>{% endif %}
-        </label>
-        {{ form_widget(form) }}
-        {{ form_errors(form) }}
-    </div>
-{% endblock %}
-
-{% block checkbox_row %}
-    <div class="form-group{% if not valid %} has-error{% endif %}">
-        {{ form_widget(form) }}
-        {{ form_errors(form) }}
-    </div>
-{% endblock %}
 {% form_theme form 'bootstrap_4_layout.html.twig' %}
 
 {% block main %}

From 1531312e95704f2f0f2dc2d8f5246b7f4218b825 Mon Sep 17 00:00:00 2001
From: Chihiro Adachi <8196725+chihiro-adachi@users.noreply.github.com>
Date: Fri, 2 Sep 2022 15:28:19 +0900
Subject: [PATCH 6/6] =?UTF-8?q?=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB?=
 =?UTF-8?q?=E5=90=8D=E3=81=8C=E6=B7=B7=E4=B9=B1=E3=81=99=E3=82=8B=E3=81=AE?=
 =?UTF-8?q?=E3=81=A7=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../install/{bootstrap_4_layout.html.twig => layout.html.twig}  | 0
 src/Eccube/Resource/template/install/step3.twig                 | 2 +-
 src/Eccube/Resource/template/install/step4.twig                 | 2 +-
 src/Eccube/Resource/template/install/step5.twig                 | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename src/Eccube/Resource/template/install/{bootstrap_4_layout.html.twig => layout.html.twig} (100%)

diff --git a/src/Eccube/Resource/template/install/bootstrap_4_layout.html.twig b/src/Eccube/Resource/template/install/layout.html.twig
similarity index 100%
rename from src/Eccube/Resource/template/install/bootstrap_4_layout.html.twig
rename to src/Eccube/Resource/template/install/layout.html.twig
diff --git a/src/Eccube/Resource/template/install/step3.twig b/src/Eccube/Resource/template/install/step3.twig
index c0acf145b7d..be5a664d0bd 100644
--- a/src/Eccube/Resource/template/install/step3.twig
+++ b/src/Eccube/Resource/template/install/step3.twig
@@ -12,7 +12,7 @@ file that was distributed with this source code.
 
 {% set current = 3 %}
 
-{% form_theme form 'bootstrap_4_layout.html.twig' %}
+{% form_theme form 'layout.html.twig' %}
 
 {% block main %}
     <div id="main" class="step4">
diff --git a/src/Eccube/Resource/template/install/step4.twig b/src/Eccube/Resource/template/install/step4.twig
index 237ba2f47c9..0c0bf9c247b 100644
--- a/src/Eccube/Resource/template/install/step4.twig
+++ b/src/Eccube/Resource/template/install/step4.twig
@@ -12,7 +12,7 @@ file that was distributed with this source code.
 
 {% set current = 4 %}
 
-{% form_theme form 'bootstrap_4_layout.html.twig' %}
+{% form_theme form 'layout.html.twig' %}
 
 {% block main %}
     <div id="main" class="step5">
diff --git a/src/Eccube/Resource/template/install/step5.twig b/src/Eccube/Resource/template/install/step5.twig
index b1afdc00c54..9957c0e785e 100644
--- a/src/Eccube/Resource/template/install/step5.twig
+++ b/src/Eccube/Resource/template/install/step5.twig
@@ -12,7 +12,7 @@ file that was distributed with this source code.
 
 {% set current = 5 %}
 
-{% form_theme form 'bootstrap_4_layout.html.twig' %}
+{% form_theme form 'layout.html.twig' %}
 
 {% block main %}
     <div id="main" class="step6">