diff --git a/codeception/_support/Page/Admin/NewsManagePage.php b/codeception/_support/Page/Admin/NewsManagePage.php index adc1b260ce6..e086edc7afa 100644 --- a/codeception/_support/Page/Admin/NewsManagePage.php +++ b/codeception/_support/Page/Admin/NewsManagePage.php @@ -46,7 +46,7 @@ public function 新規登録() public function 一覧_編集($rowNum) { - $this->tester->click(".c-contentsArea .list-group > li:nth-child(${rowNum}) a[title=編集]"); + $this->tester->click(".c-contentsArea .list-group > li:nth-child(${rowNum}) a[data-bs-original-title=編集]"); return $this; } @@ -66,7 +66,7 @@ public function 一覧_下へ($rowNum) public function 一覧_削除($rowNum) { - $this->tester->click(".c-contentsArea .list-group > li:nth-child(${rowNum}) [title=削除] a"); + $this->tester->click(".c-contentsArea .list-group > li:nth-child(${rowNum}) [data-bs-original-title=削除] a"); return $this; } diff --git a/codeception/_support/Page/Admin/SystemMemberManagePage.php b/codeception/_support/Page/Admin/SystemMemberManagePage.php index d765d61748e..1453d597b8e 100644 --- a/codeception/_support/Page/Admin/SystemMemberManagePage.php +++ b/codeception/_support/Page/Admin/SystemMemberManagePage.php @@ -24,14 +24,14 @@ public static function go($I) public function 編集($name) { - $this->tester->click("//*[@id='form1']//tr/td[1][contains(text(), '{$name}')]/parent::tr//*[@data-original-title='編集']"); + $this->tester->click("//*[@id='form1']//tr/td[1][contains(text(), '{$name}')]/parent::tr//*[@data-bs-original-title='編集']"); return $this; } public function 削除($name) { - $this->tester->click("//*[@id='form1']//tr/td[1][contains(text(), '{$name}')]/parent::tr//*[@data-original-title='削除']/a"); + $this->tester->click("//*[@id='form1']//tr/td[1][contains(text(), '{$name}')]/parent::tr//*[@data-bs-original-title='削除']/a"); $this->tester->wait(1); $this->tester->click('.modal .btn-ec-delete'); diff --git a/html/template/admin/assets/js/function.js b/html/template/admin/assets/js/function.js index ff217d75972..e6c822e93c9 100644 --- a/html/template/admin/assets/js/function.js +++ b/html/template/admin/assets/js/function.js @@ -25,25 +25,26 @@ var mainNavArea = function() { mainNavArea(); //Bootstrap ツールチップ +var tooltipTriggerList = [].slice.call(document.querySelectorAll('[data-bs-toggle="tooltip"]')) +var tooltipList = tooltipTriggerList.map(function (tooltipTriggerEl) { + return new bootstrap.Tooltip(tooltipTriggerEl) +}); + +/** @deprecated プラグイン等の後方互換用 */ var toolTip = function() { $(function() { $('[data-tooltip="true"]').tooltip(); }) }; - toolTip(); -//popover ポップオーバー -// header -var popoverHeader = function() { - $(function() { - $('.c-headerBar__userMenu').popover({ - container: 'body' - }) - }) -}; -popoverHeader(); -// all page +// popover ポップオーバー +var popoverTriggerList = [].slice.call(document.querySelectorAll('[data-bs-toggle="popover"]')) +var popoverList = popoverTriggerList.map(function (popoverTriggerEl) { + return new bootstrap.Popover(popoverTriggerEl) +}); + +/** @deprecated プラグイン等の後方互換用 */ var popoverAll = function() { $(function() { $('[data-toggle="popover"]').popover(); diff --git a/src/Eccube/Resource/template/admin/Content/block.twig b/src/Eccube/Resource/template/admin/Content/block.twig index 48c47dcfd81..e71fd07bd32 100644 --- a/src/Eccube/Resource/template/admin/Content/block.twig +++ b/src/Eccube/Resource/template/admin/Content/block.twig @@ -79,14 +79,14 @@ file that was distributed with this source code.
+ class="btn btn-ec-actionIcon mr-3" data-bs-toggle="tooltip" + data-bs-placement="top" title="{{ 'admin.common.edit'|trans }}">
{% if Block.deletable %}
-
+
diff --git a/src/Eccube/Resource/template/admin/Content/block_edit.twig b/src/Eccube/Resource/template/admin/Content/block_edit.twig index 5164743b81b..57706a09a30 100644 --- a/src/Eccube/Resource/template/admin/Content/block_edit.twig +++ b/src/Eccube/Resource/template/admin/Content/block_edit.twig @@ -76,7 +76,7 @@ file that was distributed with this source code.
-
+
{{ 'admin.content.block_name'|trans }}
{{ 'admin.common.required'|trans }} @@ -88,7 +88,7 @@ file that was distributed with this source code.
-
+
{{ 'admin.content.block_file_name'|trans }}
{{ 'admin.common.required'|trans }} @@ -107,7 +107,7 @@ file that was distributed with this source code.
-
+
{{ 'admin.content.block_source_code'|trans }}
{{ 'admin.common.required'|trans }} diff --git a/src/Eccube/Resource/template/admin/Content/css.twig b/src/Eccube/Resource/template/admin/Content/css.twig index 9cf78fa1b59..d6eddee8329 100644 --- a/src/Eccube/Resource/template/admin/Content/css.twig +++ b/src/Eccube/Resource/template/admin/Content/css.twig @@ -91,7 +91,7 @@
-
+
{{ 'admin.content.page_source_code'|trans }}
{{ 'admin.common.required'|trans }} diff --git a/src/Eccube/Resource/template/admin/Content/file.twig b/src/Eccube/Resource/template/admin/Content/file.twig index c1133ac9385..af14d6e6dd5 100644 --- a/src/Eccube/Resource/template/admin/Content/file.twig +++ b/src/Eccube/Resource/template/admin/Content/file.twig @@ -112,7 +112,7 @@ file that was distributed with this source code.
{{ 'admin.content.file.add_file__card_title'|trans }}
-
{{ 'admin.content.file.add_file'|trans }}
+
{{ 'admin.content.file.add_file'|trans }}
{{ form_widget(form.file) }}{# TODO input type="file" の装飾 #} @@ -206,7 +206,7 @@ file that was distributed with this source code.
-
+
@@ -238,22 +238,22 @@ file that was distributed with this source code.
- +
- +
- +
-
+
diff --git a/src/Eccube/Resource/template/admin/Content/js.twig b/src/Eccube/Resource/template/admin/Content/js.twig index ee77b90f9cd..75de9b64e27 100644 --- a/src/Eccube/Resource/template/admin/Content/js.twig +++ b/src/Eccube/Resource/template/admin/Content/js.twig @@ -88,7 +88,7 @@
-
+
{{ 'admin.content.page_source_code'|trans }}
{{ 'admin.common.required'|trans }} diff --git a/src/Eccube/Resource/template/admin/Content/layout.twig b/src/Eccube/Resource/template/admin/Content/layout.twig index 33c2c2bdc77..763d2950679 100644 --- a/src/Eccube/Resource/template/admin/Content/layout.twig +++ b/src/Eccube/Resource/template/admin/Content/layout.twig @@ -239,7 +239,7 @@ file that was distributed with this source code.
-
{{ 'admin.content.layout_edit__card_title'|trans }}
+
{{ 'admin.content.layout_edit__card_title'|trans }}
diff --git a/src/Eccube/Resource/template/admin/Content/news.twig b/src/Eccube/Resource/template/admin/Content/news.twig index 2366e291529..81460e8d288 100644 --- a/src/Eccube/Resource/template/admin/Content/news.twig +++ b/src/Eccube/Resource/template/admin/Content/news.twig @@ -58,13 +58,13 @@ file that was distributed with this source code.
+ data-bs-placement="top" title="{{ 'admin.common.delete'|trans }}">
-
+
{{ 'admin.content.news.url'|trans }}
@@ -74,7 +74,7 @@ file that was distributed with this source code.
-
+
{{ 'admin.content.news.body'|trans }}
diff --git a/src/Eccube/Resource/template/admin/Content/page.twig b/src/Eccube/Resource/template/admin/Content/page.twig index a63eb41bd7d..e76434337bd 100644 --- a/src/Eccube/Resource/template/admin/Content/page.twig +++ b/src/Eccube/Resource/template/admin/Content/page.twig @@ -93,7 +93,7 @@ file that was distributed with this source code.
{% if Page.edit_type == constant('Eccube\\Entity\\Page::EDIT_TYPE_USER') %} -
+
diff --git a/src/Eccube/Resource/template/admin/Content/page_edit.twig b/src/Eccube/Resource/template/admin/Content/page_edit.twig index e45d78df2cf..e3e1cf837be 100644 --- a/src/Eccube/Resource/template/admin/Content/page_edit.twig +++ b/src/Eccube/Resource/template/admin/Content/page_edit.twig @@ -114,7 +114,7 @@ file that was distributed with this source code.
-
+
{{ 'admin.content.page_file_name'|trans }}
{{ 'admin.common.required'|trans }} @@ -140,7 +140,7 @@ file that was distributed with this source code.
-
+
{{ 'admin.content.page_source_code'|trans }}
{{ 'admin.common.required'|trans }} @@ -175,7 +175,7 @@ file that was distributed with this source code.
-
{{ 'admin.content.page_layout__card_title'|trans }} @@ -216,7 +216,7 @@ file that was distributed with this source code.
-
+
{{ 'admin.content.page_meta__card_title'|trans }}
@@ -265,7 +265,7 @@ file that was distributed with this source code.
-
+
{{ 'admin.content.page_meta_metatag'|trans }}
diff --git a/src/Eccube/Resource/template/admin/Customer/edit.twig b/src/Eccube/Resource/template/admin/Customer/edit.twig index 878d56cdd72..79744b26da7 100644 --- a/src/Eccube/Resource/template/admin/Customer/edit.twig +++ b/src/Eccube/Resource/template/admin/Customer/edit.twig @@ -49,7 +49,7 @@ file that was distributed with this source code. {% if Customer.id %}
-
{{ 'admin.customer.customer_id'|trans }} @@ -258,7 +258,7 @@ file that was distributed with this source code.
-
{{ 'admin.customer.customer_address'|trans }} @@ -299,7 +299,7 @@ file that was distributed with this source code. {{ CustomerAddress.phone_number }} -
+
-
{{ 'admin.customer.purchase_history'|trans }} @@ -432,7 +432,7 @@ file that was distributed with this source code.
-
{{ 'admin.common.shop_memo'|trans }} diff --git a/src/Eccube/Resource/template/admin/Customer/index.twig b/src/Eccube/Resource/template/admin/Customer/index.twig index 9c7119854a4..1e847c4829a 100644 --- a/src/Eccube/Resource/template/admin/Customer/index.twig +++ b/src/Eccube/Resource/template/admin/Customer/index.twig @@ -25,7 +25,7 @@ file that was distributed with this source code.
- + {{ form_widget(searchForm.multi) }} {{ form_errors(searchForm.multi) }}
@@ -281,7 +281,7 @@ file that was distributed with this source code.
{% if Customer.Status.id == constant('Eccube\\Entity\\Master\\CustomerStatus::PROVISIONAL') %} -
+
@@ -309,7 +309,7 @@ file that was distributed with this source code.
{% endif %} -
+
diff --git a/src/Eccube/Resource/template/admin/Order/csv_shipping.twig b/src/Eccube/Resource/template/admin/Order/csv_shipping.twig index 6f0f1a36399..75948cd4d79 100644 --- a/src/Eccube/Resource/template/admin/Order/csv_shipping.twig +++ b/src/Eccube/Resource/template/admin/Order/csv_shipping.twig @@ -67,7 +67,7 @@ file that was distributed with this source code.
-
+
{{'admin.common.csv_upload'|trans}}
@@ -102,7 +102,7 @@ file that was distributed with this source code.
-
+
{{ 'admin.common.csv_format'|trans }}
diff --git a/src/Eccube/Resource/template/admin/Order/edit.twig b/src/Eccube/Resource/template/admin/Order/edit.twig index 85c4640f194..39b7f9a1340 100644 --- a/src/Eccube/Resource/template/admin/Order/edit.twig +++ b/src/Eccube/Resource/template/admin/Order/edit.twig @@ -259,7 +259,7 @@ file that was distributed with this source code.
-
{{ 'admin.order.order_info'|trans }}
+
{{ 'admin.order.order_info'|trans }}
@@ -269,11 +269,11 @@ file that was distributed with this source code.
-
{{ 'admin.order.order_no'|trans }}
+
{{ 'admin.order.order_no'|trans }}
{{ Order.order_no }}
- +
{% if Order.id is not empty %} {{ form_widget(form.OrderStatus) }} @@ -386,7 +386,7 @@ file that was distributed with this source code.
- +

{% if form.Customer.vars.value is empty %}{{ 'admin.order.non_member'|trans }}{% else %}{{ form.Customer.vars.value }}{% endif %}

{{ form_widget(form.Customer) }} @@ -494,7 +494,7 @@ file that was distributed with this source code.
-
{{ 'admin.order.shipping_info'|trans }}
+
{{ 'admin.order.shipping_info'|trans }}
@@ -619,21 +619,21 @@ file that was distributed with this source code.
- +
{{ form_widget(form.Shipping.tracking_number) }} {{ form_errors(form.Shipping.tracking_number) }}
- +
{{ form_widget(form.Shipping.Delivery) }} {{ form_errors(form.Shipping.Delivery) }}
- +
{{ form_widget(form.Shipping.note) }} {{ form_errors(form.Shipping.note) }} @@ -665,7 +665,7 @@ file that was distributed with this source code.
-
{{ 'admin.order.product_info'|trans }}
+
{{ 'admin.order.product_info'|trans }}
@@ -832,8 +832,8 @@ file that was distributed with this source code. {# 複数配送の場合は商品を削除できない #} {% if (Order.isMultiple and OrderItem.isProduct) or OrderItem.isPoint %}
-
+
@@ -841,8 +841,8 @@ file that was distributed with this source code.
{% else %}
-
+
@@ -954,7 +954,7 @@ file that was distributed with this source code.
-
{{ 'admin.common.shop_memo'|trans }}
+
{{ 'admin.common.shop_memo'|trans }}
@@ -971,7 +971,7 @@ file that was distributed with this source code.
-
{{ 'admin.order.mail_history'|trans }}
+
{{ 'admin.order.mail_history'|trans }}
diff --git a/src/Eccube/Resource/template/admin/Order/index.twig b/src/Eccube/Resource/template/admin/Order/index.twig index be94d03ef28..15319f01ee9 100644 --- a/src/Eccube/Resource/template/admin/Order/index.twig +++ b/src/Eccube/Resource/template/admin/Order/index.twig @@ -149,13 +149,13 @@ file that was distributed with this source code.
{{ form_widget(searchForm._token) }}
- + {{ form_widget(searchForm.multi) }} {{ form_errors(searchForm.multi) }}
- +
{% set statusForm = searchForm.status %} @@ -397,7 +397,7 @@ file that was distributed with this source code.
- + @@ -509,11 +509,11 @@ file that was distributed with this source code. {% if Order.message is not empty %} - + {% elseif Order.note is not empty %} - + {% endif %} @@ -532,7 +532,7 @@ file that was distributed with this source code. {% endif %} {% if Shipping.mail_send_date %} {% set send_mail_date = Shipping.mail_send_date|date_min %} - + {% endif %} @@ -556,12 +556,12 @@ file that was distributed with this source code. data-type="mail" data-bulk-update="false" data-preview-notify-mail-url="{{ url('admin_shipping_preview_notify_mail', { id: Shipping.id}) }}" data-notify-mail-url="{{ url('admin_shipping_notify_mail', { id: Shipping.id}) }}" - data-tooltip="true" data-placement="top" title="{{ 'admin.order.shipping_mail_send'|trans }}"> + data-bs-toggle="tooltip" data-bs-placement="top" title="{{ 'admin.order.shipping_mail_send'|trans }}">
- +
@@ -571,7 +571,7 @@ file that was distributed with this source code. data-update-status-id="{{ constant('Eccube\\Entity\\Master\\OrderStatus::DELIVERED') }}" data-update-status-url="{{ url('admin_shipping_update_order_status', { id: Shipping.id}) }}" data-preview-notify-mail-url="{{ url('admin_shipping_preview_notify_mail', { id: Shipping.id}) }}" - data-tooltip="true" data-placement="top" title data-original-title="{{ 'admin.order.to_shipped'|trans }}"> + data-bs-toggle="tooltip" data-bs-placement="top" title="{{ 'admin.order.to_shipped'|trans }}">
diff --git a/src/Eccube/Resource/template/admin/Order/mail.twig b/src/Eccube/Resource/template/admin/Order/mail.twig index 5cb01b2d7c7..f3c9ebfe770 100644 --- a/src/Eccube/Resource/template/admin/Order/mail.twig +++ b/src/Eccube/Resource/template/admin/Order/mail.twig @@ -53,7 +53,7 @@ $(function() {
-
{{ 'admin.order.mail_destination_info'|trans }}
+
{{ 'admin.order.mail_destination_info'|trans }}
@@ -102,7 +102,7 @@ $(function() {
-
+
{{ 'admin.order.mail_template'|trans }}
@@ -113,7 +113,7 @@ $(function() {
-
+
{{ 'admin.order.mail_subject'|trans }}
{{ 'admin.common.required'|trans }} diff --git a/src/Eccube/Resource/template/admin/Order/shipping.twig b/src/Eccube/Resource/template/admin/Order/shipping.twig index 08ad8a18aad..f95460690e2 100644 --- a/src/Eccube/Resource/template/admin/Order/shipping.twig +++ b/src/Eccube/Resource/template/admin/Order/shipping.twig @@ -244,7 +244,7 @@ file that was distributed with this source code.
{% if form.shippings|length > 1 %} - + {{ 'admin.order.delete_shipping'|trans }} @@ -478,7 +478,7 @@ file that was distributed with this source code. data-update-status-id="{{ constant('Eccube\\Entity\\Master\\OrderStatus::DELIVERED') }}" data-update-status-url="{{ url('admin_shipping_update_order_status', { id: shippingForm.vars.value.id}) }}" data-preview-notify-mail-url="{{ url('admin_shipping_preview_notify_mail', { id: shippingForm.vars.value.id}) }}" - data-tooltip="true" data-placement="top" title data-original-title="{{ 'admin.order.to_shipped'|trans }}"> + data-bs-toggle="tooltip" data-bs-placement="top" title="{{ 'admin.order.to_shipped'|trans }}"> {{ 'admin.order.to_shipped'|trans }} @@ -615,8 +615,8 @@ file that was distributed with this source code.
-
+
diff --git a/src/Eccube/Resource/template/admin/Product/category.twig b/src/Eccube/Resource/template/admin/Product/category.twig index 4820b97f59f..5a013830f94 100644 --- a/src/Eccube/Resource/template/admin/Product/category.twig +++ b/src/Eccube/Resource/template/admin/Product/category.twig @@ -235,22 +235,22 @@ file that was distributed with this source code.
-
{{ ClassCategory.id }}
{{ ClassCategory.name }} ［{{ 'admin.product.class_category__backend_name'|trans }}{{ 'admin.common.separator__colon'|trans }}{{ ClassCategory.backend_name }}］
- + - + - + -
+
diff --git a/src/Eccube/Resource/template/admin/Product/class_name.twig b/src/Eccube/Resource/template/admin/Product/class_name.twig index fc30117706e..d1f389a87a6 100644 --- a/src/Eccube/Resource/template/admin/Product/class_name.twig +++ b/src/Eccube/Resource/template/admin/Product/class_name.twig @@ -151,7 +151,7 @@ file that was distributed with this source code. {{ form_widget(form.name) }} {{ form_errors(form.name) }}
-
+
{{ 'admin.product.class_name__backend_name'|trans }}
@@ -180,17 +180,17 @@ file that was distributed with this source code. {{ ClassName.name }}［{{ 'admin.product.class_name__backend_name'|trans }}{{ 'admin.common.separator__colon'|trans }}{{ ClassName.backend_name }}］ ({{ ClassName.ClassCategories|length }})
- + - + - + -
+
{% set classCategories = ClassName.ClassCategories|length %}
-
{{ 'admin.common.csv_upload'|trans }}
+
{{ 'admin.common.csv_upload'|trans }}
@@ -94,7 +94,7 @@ file that was distributed with this source code.
-
{{ 'admin.common.csv_format'|trans }}
+
{{ 'admin.common.csv_format'|trans }}
{{ 'admin.common.csv_skeleton_download'|trans }} diff --git a/src/Eccube/Resource/template/admin/Product/csv_product.twig b/src/Eccube/Resource/template/admin/Product/csv_product.twig index 64397d0d879..a84227622f8 100644 --- a/src/Eccube/Resource/template/admin/Product/csv_product.twig +++ b/src/Eccube/Resource/template/admin/Product/csv_product.twig @@ -196,7 +196,7 @@ file that was distributed with this source code.
-
{{ 'admin.common.csv_upload'|trans }}
+
{{ 'admin.common.csv_upload'|trans }}
@@ -223,7 +223,7 @@ file that was distributed with this source code.
-
{{ 'admin.common.csv_format'|trans }}
+
{{ 'admin.common.csv_format'|trans }}
{{ 'admin.common.csv_skeleton_download'|trans }} diff --git a/src/Eccube/Resource/template/admin/Product/index.twig b/src/Eccube/Resource/template/admin/Product/index.twig index cceb7c9bb1b..12b5d687ca6 100644 --- a/src/Eccube/Resource/template/admin/Product/index.twig +++ b/src/Eccube/Resource/template/admin/Product/index.twig @@ -151,7 +151,7 @@ file that was distributed with this source code.
- + {{ form_widget(searchForm.id) }} {{ form_errors(searchForm.id) }}
@@ -384,15 +384,15 @@ file that was distributed with this source code.
-
-
-
+
{{ 'admin.product.product_id'|trans }}
@@ -283,7 +283,7 @@ file that was distributed with this source code. {% if has_class == false %}
-
+
{{ 'admin.product.sale_type'|trans }} @@ -298,7 +298,7 @@ file that was distributed with this source code. {% endif %}
-
+
{{ 'admin.product.image'|trans }}
{{ 'admin.product.image_size'|trans }} @@ -316,7 +316,7 @@ file that was distributed with this source code.
-
{{ 'admin.product.description_detail'|trans }} @@ -339,7 +339,7 @@ file that was distributed with this source code.
-
{{ 'admin.product.description_list'|trans }} @@ -372,7 +372,7 @@ file that was distributed with this source code.
-
{{ 'admin.product.normal_price'|trans }} @@ -417,7 +417,7 @@ file that was distributed with this source code. {% endif %}
-
{{ 'admin.product.search_word'|trans }} @@ -434,7 +434,7 @@ file that was distributed with this source code. {% if has_class == false %}
-
{{ 'admin.product.product_code'|trans }} @@ -449,7 +449,7 @@ file that was distributed with this source code.
-
{{ 'admin.product.sale_limit'|trans }} @@ -464,7 +464,7 @@ file that was distributed with this source code.
-
{{ 'admin.product.delivery_duration'|trans }} @@ -559,7 +559,7 @@ file that was distributed with this source code.
-
{{ 'admin.product.product_class__card_title'|trans }} @@ -616,7 +616,7 @@ file that was distributed with this source code.
-
{{ 'admin.product.free_area__card_title'|trans }} @@ -844,7 +844,7 @@ file that was distributed with this source code.
-
{{ 'admin.common.shop_memo'|trans }} diff --git a/src/Eccube/Resource/template/admin/Product/tag.twig b/src/Eccube/Resource/template/admin/Product/tag.twig index 11f432050f3..1500a11c0be 100644 --- a/src/Eccube/Resource/template/admin/Product/tag.twig +++ b/src/Eccube/Resource/template/admin/Product/tag.twig @@ -182,17 +182,17 @@ file that was distributed with this source code.
{{ Tag.name }}
- + - + - + -
+
diff --git a/src/Eccube/Resource/template/admin/Setting/Shop/calendar.twig b/src/Eccube/Resource/template/admin/Setting/Shop/calendar.twig index 566832a639a..524d5c7796d 100644 --- a/src/Eccube/Resource/template/admin/Setting/Shop/calendar.twig +++ b/src/Eccube/Resource/template/admin/Setting/Shop/calendar.twig @@ -59,7 +59,7 @@ file that was distributed with this source code.
-
+
{{ 'admin.setting.shop.calendar_setting'|trans }}
@@ -138,13 +138,13 @@ file that was distributed with this source code.
- +
-
diff --git a/src/Eccube/Resource/template/admin/Setting/Shop/csv.twig b/src/Eccube/Resource/template/admin/Setting/Shop/csv.twig index f2025008bdc..7db4dc01700 100644 --- a/src/Eccube/Resource/template/admin/Setting/Shop/csv.twig +++ b/src/Eccube/Resource/template/admin/Setting/Shop/csv.twig @@ -78,14 +78,14 @@ file that was distributed with this source code.
-
+
{{ 'admin.setting.shop.csv.csv_columns'|trans }}
-
+
{{ 'admin.setting.shop.csv.csv_type'|trans }}
diff --git a/src/Eccube/Resource/template/admin/Setting/Shop/delivery.twig b/src/Eccube/Resource/template/admin/Setting/Shop/delivery.twig index 7f14085d490..f9bbf38ea8f 100644 --- a/src/Eccube/Resource/template/admin/Setting/Shop/delivery.twig +++ b/src/Eccube/Resource/template/admin/Setting/Shop/delivery.twig @@ -125,18 +125,18 @@ file that was distributed with this source code.
- + - + -
{% endblock javascript %} @@ -240,7 +238,7 @@ file that was distributed with this source code.
-
{{ 'admin.setting.shop.delivery.tracking_number_url'|trans }}
@@ -252,7 +250,7 @@ file that was distributed with this source code.
-
{{ 'admin.setting.shop.delivery.sale_type'|trans }} @@ -320,8 +318,8 @@ file that was distributed with this source code.
  • -
    {{ 'admin.setting.shop.delivery.apply_to_pref__title'|trans }}
    @@ -358,7 +356,7 @@ file that was distributed with this source code.
    -
    {{ 'admin.common.shop_memo'|trans }}
    diff --git a/src/Eccube/Resource/template/admin/Setting/Shop/delivery_time_prototype.twig b/src/Eccube/Resource/template/admin/Setting/Shop/delivery_time_prototype.twig index 5b1042b63f5..0e12633b6e8 100644 --- a/src/Eccube/Resource/template/admin/Setting/Shop/delivery_time_prototype.twig +++ b/src/Eccube/Resource/template/admin/Setting/Shop/delivery_time_prototype.twig @@ -18,31 +18,31 @@ file that was distributed with this source code. {% if DeliveryTime is empty %}__value__{% else %}{{ DeliveryTime }}{% endif %}
    - + - + - + {% if DeliveryTime is empty %} - + {% else %} - + {% endif %} - +
    diff --git a/src/Eccube/Resource/template/admin/Setting/Shop/mail.twig b/src/Eccube/Resource/template/admin/Setting/Shop/mail.twig index 097b473f17e..d78f3791d91 100644 --- a/src/Eccube/Resource/template/admin/Setting/Shop/mail.twig +++ b/src/Eccube/Resource/template/admin/Setting/Shop/mail.twig @@ -129,7 +129,7 @@ file that was distributed with this source code.
    -
    +
    {{ 'admin.setting.shop.mail.mail_template'|trans }}
    diff --git a/src/Eccube/Resource/template/admin/Setting/Shop/order_status.twig b/src/Eccube/Resource/template/admin/Setting/Shop/order_status.twig index 905eac39f9f..c83ead71ff8 100644 --- a/src/Eccube/Resource/template/admin/Setting/Shop/order_status.twig +++ b/src/Eccube/Resource/template/admin/Setting/Shop/order_status.twig @@ -26,7 +26,7 @@ file that was distributed with this source code. {{ form_widget(form._token) }}
    -
    +
    {{ 'admin.setting.shop.order_status.order_status'|trans }}
    @@ -38,7 +38,7 @@ file that was distributed with this source code. {{ 'admin.setting.shop.order_status.id'|trans }} -
    +
    {{ 'admin.setting.shop.order_status.customer_order_status_name'|trans }}
    @@ -46,12 +46,12 @@ file that was distributed with this source code. {{ 'admin.setting.shop.order_status.admin_order_status_name'|trans }} -
    +
    {{ 'admin.setting.shop.order_status.color'|trans }}
    -
    +
    {{ 'admin.setting.shop.order_status.display_order_count'|trans }}
    diff --git a/src/Eccube/Resource/template/admin/Setting/Shop/payment.twig b/src/Eccube/Resource/template/admin/Setting/Shop/payment.twig index 56ad9a2486b..2bc82875d06 100644 --- a/src/Eccube/Resource/template/admin/Setting/Shop/payment.twig +++ b/src/Eccube/Resource/template/admin/Setting/Shop/payment.twig @@ -169,18 +169,18 @@ file that was distributed with this source code.
    - + - + -
    -
    +
    {{ 'admin.setting.shop.payment.terms_of_use'|trans }}
    @@ -147,7 +147,7 @@ file that was distributed with this source code.
    -
    +
    {{ 'admin.setting.shop.payment.logo_image'|trans }}
    {{ 'admin.setting.shop.payment.logo_image_size'|trans }}
    diff --git a/src/Eccube/Resource/template/admin/Setting/Shop/shop_master.twig b/src/Eccube/Resource/template/admin/Setting/Shop/shop_master.twig index 79d2658d0d2..53be91128c5 100644 --- a/src/Eccube/Resource/template/admin/Setting/Shop/shop_master.twig +++ b/src/Eccube/Resource/template/admin/Setting/Shop/shop_master.twig @@ -114,7 +114,7 @@ file that was distributed with this source code.
    -
    {{ 'admin.setting.shop.shop.email_from'|trans }}
    +
    {{ 'admin.setting.shop.shop.email_from'|trans }}
    {{ 'admin.common.required'|trans }}
    @@ -124,7 +124,7 @@ file that was distributed with this source code.
    -
    {{ 'admin.setting.shop.shop.email_for_inquiries'|trans }}
    +
    {{ 'admin.setting.shop.shop.email_for_inquiries'|trans }}
    {{ 'admin.common.required'|trans }}
    @@ -134,7 +134,7 @@ file that was distributed with this source code.
    -
    {{ 'admin.setting.shop.shop.email_reply_to'|trans }}
    +
    {{ 'admin.setting.shop.shop.email_reply_to'|trans }}
    {{ 'admin.common.required'|trans }}
    @@ -144,7 +144,7 @@ file that was distributed with this source code.
    -
    {{ 'admin.setting.shop.shop.email_return_path'|trans }}
    +
    {{ 'admin.setting.shop.shop.email_return_path'|trans }}
    {{ 'admin.common.required'|trans }}
    @@ -154,7 +154,7 @@ file that was distributed with this source code.
    -
    {{ 'admin.setting.shop.shop.good_traded'|trans }}
    +
    {{ 'admin.setting.shop.shop.good_traded'|trans }}
    {{ form_widget(form.good_traded) }} @@ -163,7 +163,7 @@ file that was distributed with this source code.
    -
    {{ 'admin.setting.shop.shop.message'|trans }}
    +
    {{ 'admin.setting.shop.shop.message'|trans }}
    {{ form_widget(form.message) }} @@ -192,7 +192,7 @@ file that was distributed with this source code.
    -
    {{ 'admin.setting.shop.shop.option_delivery_fee_free_amount'|trans }}
    +
    {{ 'admin.setting.shop.shop.option_delivery_fee_free_amount'|trans }}
    {{ form_widget(form.delivery_free_amount) }} @@ -202,7 +202,7 @@ file that was distributed with this source code.
    -
    {{ 'admin.setting.shop.shop.option_delivery_fee_free_quantity'|trans }}
    +
    {{ 'admin.setting.shop.shop.option_delivery_fee_free_quantity'|trans }}
    {{ form_widget(form.delivery_free_quantity) }} @@ -212,7 +212,7 @@ file that was distributed with this source code.
    -
    {{ 'admin.setting.shop.shop.option_delivery_fee_by_product'|trans }}
    +
    {{ 'admin.setting.shop.shop.option_delivery_fee_by_product'|trans }}
    {{ form_widget(form.option_product_delivery_fee) }} @@ -226,7 +226,7 @@ file that was distributed with this source code.
    -
    {{ 'admin.setting.shop.shop.option_customer_activate'|trans }}
    +
    {{ 'admin.setting.shop.shop.option_customer_activate'|trans }}
    {{ form_widget(form.option_customer_activate) }} @@ -244,7 +244,7 @@ file that was distributed with this source code.
    -
    {{ 'admin.setting.shop.shop.option_favorite_product'|trans }}
    +
    {{ 'admin.setting.shop.shop.option_favorite_product'|trans }}
    {{ form_widget(form.option_favorite_product) }} @@ -253,7 +253,7 @@ file that was distributed with this source code.
    -
    {{ 'admin.setting.shop.shop.option_remember_me'|trans }}
    +
    {{ 'admin.setting.shop.shop.option_remember_me'|trans }}
    {{ form_widget(form.option_remember_me) }} @@ -279,7 +279,7 @@ file that was distributed with this source code.
    -
    {{ 'admin.setting.shop.shop.option_invoice_registration_number'|trans }}
    +
    {{ 'admin.setting.shop.shop.option_invoice_registration_number'|trans }}
    {{ form_widget(form.invoice_registration_number) }} @@ -288,7 +288,7 @@ file that was distributed with this source code.
    -
    {{ 'admin.setting.shop.shop.option_product_tax'|trans }}
    +
    {{ 'admin.setting.shop.shop.option_product_tax'|trans }}
    {{ form_widget(form.option_product_tax_rule) }} @@ -302,7 +302,7 @@ file that was distributed with this source code.
    -
    {{ 'admin.setting.shop.shop.option_point_enabled'|trans }}
    +
    {{ 'admin.setting.shop.shop.option_point_enabled'|trans }}
    {{ form_widget(form.option_point) }} @@ -311,7 +311,7 @@ file that was distributed with this source code.
    -
    {{ 'admin.setting.shop.shop.option_point_rate'|trans }}
    +
    {{ 'admin.setting.shop.shop.option_point_rate'|trans }}
    @@ -327,7 +327,7 @@ file that was distributed with this source code.
    -
    {{ 'admin.setting.shop.shop.option_point_conversion_rate'|trans }}
    +
    {{ 'admin.setting.shop.shop.option_point_conversion_rate'|trans }}
    diff --git a/src/Eccube/Resource/template/admin/Setting/Shop/tax_rule.twig b/src/Eccube/Resource/template/admin/Setting/Shop/tax_rule.twig index 150f4484e50..27f2de9d6dc 100644 --- a/src/Eccube/Resource/template/admin/Setting/Shop/tax_rule.twig +++ b/src/Eccube/Resource/template/admin/Setting/Shop/tax_rule.twig @@ -59,7 +59,7 @@ file that was distributed with this source code.
    -
    +
    {{ 'admin.setting.shop.tax_setting'|trans }}
    @@ -167,11 +167,11 @@ file that was distributed with this source code.
    -
    +
    {% if not TaxRule.default_tax_rule %} -
    diff --git a/src/Eccube/Resource/template/admin/Setting/System/log.twig b/src/Eccube/Resource/template/admin/Setting/System/log.twig index 9e4fdd8ce51..310a8f235d3 100644 --- a/src/Eccube/Resource/template/admin/Setting/System/log.twig +++ b/src/Eccube/Resource/template/admin/Setting/System/log.twig @@ -21,7 +21,7 @@ file that was distributed with this source code.
    -
    +
    {{ 'admin.setting.system.log_display'|trans }}
    diff --git a/src/Eccube/Resource/template/admin/Setting/System/login_history.twig b/src/Eccube/Resource/template/admin/Setting/System/login_history.twig index 3c3370f4069..c81b4ab02fb 100644 --- a/src/Eccube/Resource/template/admin/Setting/System/login_history.twig +++ b/src/Eccube/Resource/template/admin/Setting/System/login_history.twig @@ -26,7 +26,7 @@ file that was distributed with this source code.
    - + {{ form_widget(searchForm.multi) }} {{ form_errors(searchForm.multi) }}
    diff --git a/src/Eccube/Resource/template/admin/Setting/System/masterdata.twig b/src/Eccube/Resource/template/admin/Setting/System/masterdata.twig index b23c8ebc9a5..bbbe9e4201c 100644 --- a/src/Eccube/Resource/template/admin/Setting/System/masterdata.twig +++ b/src/Eccube/Resource/template/admin/Setting/System/masterdata.twig @@ -24,7 +24,7 @@ file that was distributed with this source code. {{ form_widget(form._token) }}
    -
    +
    {{ 'admin.setting.system.master_data_management'|trans }}
    diff --git a/src/Eccube/Resource/template/admin/Setting/System/member.twig b/src/Eccube/Resource/template/admin/Setting/System/member.twig index 81d653c5175..bb619516479 100644 --- a/src/Eccube/Resource/template/admin/Setting/System/member.twig +++ b/src/Eccube/Resource/template/admin/Setting/System/member.twig @@ -93,7 +93,7 @@ file that was distributed with this source code. {% if Member.two_factor_auth_enabled %} {{ 'common.enabled'|trans }} - + data-bs-toggle="tooltip" + data-bs-placement="top" + title="{{ 'admin.common.edit'|trans }}">
    + data-bs-placement="top" + title="{{ 'admin.common.up'|trans }}">
    + data-bs-placement="top" + title="{{ 'admin.common.down'|trans }}">
    {% if Member.id == app.user.id %} {% else %} -
    -
    +
    {{ 'admin.common.authority'|trans }}
    @@ -126,7 +126,7 @@ file that was distributed with this source code.
    -
    +
    {{ 'admin.setting.system.member.work'|trans }}
    @@ -139,7 +139,7 @@ file that was distributed with this source code.
    -
    +
    {{ 'admin.setting.system.member.two_factor_auth_enabled'|trans }}
    diff --git a/src/Eccube/Resource/template/admin/Setting/System/security.twig b/src/Eccube/Resource/template/admin/Setting/System/security.twig index d9acab0f474..a7189e999f9 100644 --- a/src/Eccube/Resource/template/admin/Setting/System/security.twig +++ b/src/Eccube/Resource/template/admin/Setting/System/security.twig @@ -51,7 +51,7 @@ file that was distributed with this source code.
    -
    +
    {{ 'admin.setting.system.security.admin_url'|trans }}
    @@ -63,7 +63,7 @@ file that was distributed with this source code.
    -
    +
    {{ 'admin.setting.system.security.ip_limit'|trans }}
    @@ -76,7 +76,7 @@ file that was distributed with this source code.
    -
    +
    {{ 'admin.setting.system.security.ip_limit_deny'|trans }}
    @@ -89,7 +89,7 @@ file that was distributed with this source code.
    -
    +
    {{ 'admin.setting.system.security.force_ssl'|trans }}
    @@ -107,7 +107,7 @@ file that was distributed with this source code.
    -
    +
    {{ 'admin.setting.system.security.trusted_hosts'|trans }}
    diff --git a/src/Eccube/Resource/template/admin/Setting/System/system.twig b/src/Eccube/Resource/template/admin/Setting/System/system.twig index abf7ec1f328..a0c59167246 100644 --- a/src/Eccube/Resource/template/admin/Setting/System/system.twig +++ b/src/Eccube/Resource/template/admin/Setting/System/system.twig @@ -24,7 +24,7 @@ file that was distributed with this source code.
    -
    +
    {{ 'admin.setting.system.system_info'|trans }}
    @@ -63,7 +63,7 @@ file that was distributed with this source code.
    -
    +
    {{ 'admin.setting.system.system.php_info'|trans }}
    diff --git a/src/Eccube/Resource/template/admin/Setting/System/two_factor_auth_edit.twig b/src/Eccube/Resource/template/admin/Setting/System/two_factor_auth_edit.twig index 7cb9ed8b7d0..cd4c24c7c03 100644 --- a/src/Eccube/Resource/template/admin/Setting/System/two_factor_auth_edit.twig +++ b/src/Eccube/Resource/template/admin/Setting/System/two_factor_auth_edit.twig @@ -75,7 +75,7 @@ $(function () {
    -
    +
    {{ form.device_token.vars.label|trans }} {{ 'admin.common.required'|trans }} diff --git a/src/Eccube/Resource/template/admin/Store/authentication_setting.twig b/src/Eccube/Resource/template/admin/Store/authentication_setting.twig index 7f981ea8fed..37ce28a5e2f 100644 --- a/src/Eccube/Resource/template/admin/Store/authentication_setting.twig +++ b/src/Eccube/Resource/template/admin/Store/authentication_setting.twig @@ -128,7 +128,7 @@ file that was distributed with this source code.
    {{ form.authentication_key.vars.label|trans }} - +
    diff --git a/src/Eccube/Resource/template/admin/Store/plugin_table.twig b/src/Eccube/Resource/template/admin/Store/plugin_table.twig index d6d14d20ad3..ab4022728b7 100644 --- a/src/Eccube/Resource/template/admin/Store/plugin_table.twig +++ b/src/Eccube/Resource/template/admin/Store/plugin_table.twig @@ -78,7 +78,7 @@ $(function() { data-bs-toggle="modal" data-bs-target="#localPluginDeleteModal" data-delete-url="{{ url('admin_store_plugin_uninstall', { id : Plugin.id }) }}"> - +
    {% endif %} @@ -87,7 +87,7 @@ $(function() { - +
    {% else %} @@ -95,7 +95,7 @@ $(function() { - +
    {% endif %} @@ -103,8 +103,8 @@ $(function() {
    - +
    {% endif %}
    diff --git a/src/Eccube/Resource/template/admin/Store/plugin_table_official.twig b/src/Eccube/Resource/template/admin/Store/plugin_table_official.twig index f56eb9580ee..6a7b72c497e 100644 --- a/src/Eccube/Resource/template/admin/Store/plugin_table_official.twig +++ b/src/Eccube/Resource/template/admin/Store/plugin_table_official.twig @@ -125,7 +125,7 @@ $(function() { data-name="{{ Plugin.name }}" data-version="{{ Plugin.version }}" class="btn btn-ec-actionIcon"> - + {% endif %} @@ -135,23 +135,23 @@ $(function() { - + {% else %}     - + {% endif %}
    {% if configPages[Plugin.code] is defined %} - + {% endif %}
    diff --git a/src/Eccube/Resource/template/admin/Store/template.twig b/src/Eccube/Resource/template/admin/Store/template.twig index 2237b046585..7d3adf5541f 100644 --- a/src/Eccube/Resource/template/admin/Store/template.twig +++ b/src/Eccube/Resource/template/admin/Store/template.twig @@ -66,13 +66,13 @@ file that was distributed with this source code.
    -
    +
    diff --git a/src/Eccube/Resource/template/admin/Store/template_add.twig b/src/Eccube/Resource/template/admin/Store/template_add.twig index d22775d1633..c16440b5af4 100644 --- a/src/Eccube/Resource/template/admin/Store/template_add.twig +++ b/src/Eccube/Resource/template/admin/Store/template_add.twig @@ -28,7 +28,7 @@ file that was distributed with this source code.
    -
    {{ 'admin.store.template.template_code'|trans }} @@ -42,7 +42,7 @@ file that was distributed with this source code.
    -
    {{ 'admin.store.template.template_name'|trans }} @@ -56,7 +56,7 @@ file that was distributed with this source code.
    -
    {{ 'admin.store.template.template_file'|trans }} diff --git a/src/Eccube/Resource/template/admin/default_frame.twig b/src/Eccube/Resource/template/admin/default_frame.twig index d2c13a126a9..71fdf0c2ec2 100644 --- a/src/Eccube/Resource/template/admin/default_frame.twig +++ b/src/Eccube/Resource/template/admin/default_frame.twig @@ -46,7 +46,7 @@ file that was distributed with this source code. {{ 'admin.header.user_name'|trans({'%name%':app.user.name}) }}