Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

インストール画面もform_themeを設定 #5642

Merged
merged 6 commits into from
Sep 2, 2022
Merged

インストール画面もform_themeを設定 #5642

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e349cc9
ref #5640 #5641
nobuhiko Aug 26, 2022
278ac6b
指摘の修正
nobuhiko Aug 31, 2022
65c36ef
@installは未定義なのでカレントディレクトリのlayout.twigを読むように修正
chihiro-adachi Sep 2, 2022
fbd6a43
bg-dangerを追加
chihiro-adachi Sep 2, 2022
b0c1d0b
不要なレイアウトを削除
chihiro-adachi Sep 2, 2022
1531312
ファイル名が混乱するので変更
chihiro-adachi Sep 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions src/Eccube/Resource/template/install/layout.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 bg-danger text-uppercase">{{ 'Error'|trans({}, 'validators') }}</span> <span class="form-error-message">{{ error.message }}</span>
</span>
{%- endfor -%}
</span>
{%- endif %}
{%- endblock form_errors %}


18 changes: 1 addition & 17 deletions src/Eccube/Resource/template/install/step3.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,7 @@ file that was distributed with this source code.

{% set current = 3 %}

{% form_theme form _self %}
{% 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 'layout.html.twig' %}

{% block main %}
<div id="main" class="step4">
Expand Down
18 changes: 1 addition & 17 deletions src/Eccube/Resource/template/install/step4.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,7 @@ file that was distributed with this source code.

{% set current = 4 %}

{% form_theme form _self %}
{% 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 'layout.html.twig' %}

{% block main %}
<div id="main" class="step5">
Expand Down
18 changes: 1 addition & 17 deletions src/Eccube/Resource/template/install/step5.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,7 @@ file that was distributed with this source code.

{% set current = 5 %}

{% form_theme form _self %}
{% 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 'layout.html.twig' %}

{% block main %}
<div id="main" class="step6">
Expand Down