Skip to content

Commit

Permalink
Merge pull request #6066 from dotani1111/features/fix_required_badge
Browse files Browse the repository at this point in the history 
fix:必須バッチの追加と周りの修正
  • Loading branch information
@ji-eunsoo
ji-eunsoo authored Jan 24, 2024
2 parents 1f5df6e + c0c9cba commit 503055e
Show file tree
Hide file tree
Showing 5 changed files with 36 additions and 6 deletions.
15 changes: 13 additions & 2 deletions src/Eccube/Resource/template/admin/Content/news_edit.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,26 @@ file that was distributed with this source code.
<div class="ec-cardCollapse collapse show" id="newsForm" style="">
<div class="card-body">
<div class="row">
<div class="col-3"><span>{{ 'admin.content.news.publish_date'|trans }}</span></div>
<div class="col-3">
<span>{{ 'admin.content.news.publish_date'|trans }}</span>
<span class="badge bg-primary ms-1">
{{ 'admin.common.required'|trans }}
</span>
</div>

<div class="col mb-2">
{{ form_widget(form.publish_date) }}
{{ form_errors(form.publish_date) }}
</div>
</div>

<div class="row">
<div class="col-3"><span>{{ 'admin.content.news.title'|trans }}</span></div>
<div class="col-3">
<span>{{ 'admin.content.news.title'|trans }}</span>
<span class="badge bg-primary ms-1">
{{ 'admin.common.required'|trans }}
</span>
</div>
<div class="col mb-2">
{{ form_widget(form.title) }}
{{ form_errors(form.title) }}
Expand Down
5 changes: 4 additions & 1 deletion src/Eccube/Resource/template/admin/Product/class_category.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,10 @@ file that was distributed with this source code.
<ul class="list-group list-group-flush sortable-container">
<li class="list-group-item">
<form role="form" class="row" name="form1" id="form1" method="post" action="{{ url('admin_product_class_category', {'class_name_id': ClassName.id}) }}">
<div class="col-auto align-self-center"><span>{{ 'admin.product.class_category_name__short'|trans }}</span></div>
<div class="col-auto align-self-center">
<span>{{ 'admin.product.class_category_name__short'|trans }}</span>
<span class="badge bg-primary ms-1">{{ 'admin.common.required'|trans }}</span>
</div>
<div class="col-3 me-2">
{{ form_widget(form._token) }}
{{ form_widget(form.name) }}
Expand Down
5 changes: 4 additions & 1 deletion src/Eccube/Resource/template/admin/Product/class_name.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,10 @@ file that was distributed with this source code.
<ul class="list-group list-group-flush sortable-container">
<li class="list-group-item">
<form role="form" class="row" name="form1" id="form1" method="post" action="{{ url('admin_product_class_name') }}">
<div class="col-auto align-self-center"><span>{{ 'admin.product.class_name'|trans }}</span></div>
<div class="col-auto align-self-center">
<span>{{ 'admin.product.class_name'|trans }}</span>
<span class="badge bg-primary ms-1">{{ 'admin.common.required'|trans }}</span>
</div>
<div class="col-3 me-2">
{{ form_widget(form._token) }}
{{ form_widget(form.name) }}
Expand Down
14 changes: 12 additions & 2 deletions src/Eccube/Resource/template/admin/Product/product_class.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -253,10 +253,20 @@ file that was distributed with this source code.
<th class="pt-2 pb-2">{{ ClassName1 ? ClassName1.name }}</th>
<th class="pt-2 pb-2">{{ ClassName2 ? ClassName2.name }}</th>
<th class="pt-2 pb-2">{{ 'admin.product.product_code__short'|trans }}</th>
<th class="pt-2 pb-2">{{ 'admin.product.stock__short'|trans }}</th>
<th class="pt-2 pb-2">
{{ 'admin.product.stock__short'|trans }}
<span class="badge bg-primary ms-1">
{{ 'admin.common.required'|trans }}
</span>
</th>
<th class="pt-2 pb-2">{{ 'admin.product.sale_limit'|trans }}</th>
<th class="pt-2 pb-2">{{ 'admin.product.normal_price'|trans }}</th>
<th class="pt-2 pb-2">{{ 'admin.product.sale_price'|trans }}</th>
<th class="pt-2 pb-2">
{{ 'admin.product.sale_price'|trans }}
<span class="badge bg-primary ms-1">
{{ 'admin.common.required'|trans }}
</span>
</th>
{% if BaseInfo.option_product_delivery_fee %}
<th class="pt-2 pb-2">{{ 'admin.product.delivery_fee'|trans }}</th>
{% endif %}
Expand Down
3 changes: 3 additions & 0 deletions src/Eccube/Resource/template/admin/change_password.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ file that was distributed with this source code.
<div class="col-3">
<div class="d-inline-block">
<span>{{ 'admin.change_password.current_password'|trans }}</span>
<span class="badge bg-primary ms-1">{{ 'admin.common.required'|trans }}</span>
</div>
</div>
<div class="col">
Expand All @@ -53,6 +54,7 @@ file that was distributed with this source code.
<div class="col-3">
<div class="d-inline-block">
<span>{{ 'admin.change_password.new_password'|trans }}</span>
<span class="badge bg-primary ms-1">{{ 'admin.common.required'|trans }}</span>
</div>
</div>
<div class="col">
Expand All @@ -65,6 +67,7 @@ file that was distributed with this source code.
<div class="col-3">
<div class="d-inline-block">
<span>{{ 'admin.change_password.new_password_confirm'|trans }}</span>
<span class="badge bg-primary ms-1">{{ 'admin.common.required'|trans }}</span>
</div>
</div>
<div class="col">
Expand Down

0 comments on commit 503055e

Please sign in to comment.