From 7ef4e311b072f85910f7110fdf82b577835fed7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A9=8D=E6=9C=A8=20=E8=A3=95=E8=8A=B1?= Date: Fri, 8 Jul 2022 20:25:04 +0900 Subject: [PATCH 01/15] =?UTF-8?q?=E5=91=BD=E5=90=8D=E8=A6=8F=E5=89=87?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/assets/scss/library/_variable.scss | 4 ++ .../template/admin/Content/block.twig | 8 +-- .../template/admin/Content/block_edit.twig | 8 +-- .../Resource/template/admin/Content/css.twig | 4 +- .../Resource/template/admin/Content/file.twig | 18 +++--- .../Resource/template/admin/Content/js.twig | 4 +- .../template/admin/Content/layout.twig | 10 +-- .../template/admin/Content/layout_block.twig | 2 +- .../template/admin/Content/layout_list.twig | 2 +- .../Resource/template/admin/Content/news.twig | 4 +- .../template/admin/Content/news_edit.twig | 2 +- .../Resource/template/admin/Content/page.twig | 6 +- .../template/admin/Content/page_edit.twig | 18 +++--- .../admin/Customer/delivery_edit.twig | 8 +-- .../template/admin/Customer/edit.twig | 26 ++++---- .../template/admin/Customer/index.twig | 32 +++++----- .../template/admin/Order/csv_shipping.twig | 4 +- .../Resource/template/admin/Order/edit.twig | 64 +++++++++---------- .../Resource/template/admin/Order/index.twig | 34 +++++----- .../Resource/template/admin/Order/mail.twig | 6 +- .../template/admin/Order/mail_confirm.twig | 6 +- .../template/admin/Order/order_item_type.twig | 2 +- .../template/admin/Order/order_pdf.twig | 2 +- .../template/admin/Order/search_product.twig | 8 +-- .../template/admin/Order/shipping.twig | 28 ++++---- .../template/admin/Product/category.twig | 14 ++-- .../admin/Product/class_category.twig | 10 +-- .../template/admin/Product/class_name.twig | 12 ++-- .../template/admin/Product/csv_category.twig | 4 +- .../template/admin/Product/csv_product.twig | 8 +-- .../template/admin/Product/index.twig | 26 ++++---- .../template/admin/Product/product.twig | 24 +++---- .../template/admin/Product/product_class.twig | 16 ++--- .../Resource/template/admin/Product/tag.twig | 10 +-- .../template/admin/Setting/Shop/calendar.twig | 4 +- .../template/admin/Setting/Shop/delivery.twig | 6 +- .../admin/Setting/Shop/delivery_edit.twig | 4 +- .../Setting/Shop/delivery_time_prototype.twig | 4 +- .../template/admin/Setting/Shop/mail.twig | 4 +- .../template/admin/Setting/Shop/payment.twig | 6 +- .../admin/Setting/Shop/shop_master.twig | 10 +-- .../template/admin/Setting/Shop/tax_rule.twig | 12 ++-- .../admin/Setting/System/login_history.twig | 6 +- .../template/admin/Setting/System/member.twig | 6 +- .../admin/Setting/System/member_edit.twig | 16 ++--- .../admin/Setting/System/security.twig | 2 +- .../template/admin/Setting/System/system.twig | 2 +- .../Setting/System/two_factor_auth_edit.twig | 4 +- .../admin/Store/authentication_setting.twig | 2 +- .../template/admin/Store/plugin_confirm.twig | 4 +- .../admin/Store/plugin_confirm_uninstall.twig | 2 +- .../admin/Store/plugin_detail_modal.twig | 2 +- .../template/admin/Store/plugin_search.twig | 2 +- .../admin/Store/plugin_search_panel.twig | 2 +- .../template/admin/Store/plugin_table.twig | 4 +- .../admin/Store/plugin_table_official.twig | 4 +- .../template/admin/Store/template.twig | 4 +- .../template/admin/change_password.twig | 2 +- src/Eccube/Resource/template/admin/index.twig | 4 +- .../template/admin/two_factor_auth.twig | 2 +- .../template/admin/two_factor_auth_set.twig | 6 +- 61 files changed, 282 insertions(+), 278 deletions(-) diff --git a/html/template/admin/assets/scss/library/_variable.scss b/html/template/admin/assets/scss/library/_variable.scss index 15078f92462..fc898d69af8 100755 --- a/html/template/admin/assets/scss/library/_variable.scss +++ b/html/template/admin/assets/scss/library/_variable.scss @@ -47,3 +47,7 @@ $blueBayou: #586878; $seaShell: #f0f0f0; $wildSand: #f3f4f6; $gothic: #8090a0; + +// link +$link-decoration:none; +$link-hover-decoration:underline; \ No newline at end of file diff --git a/src/Eccube/Resource/template/admin/Content/block.twig b/src/Eccube/Resource/template/admin/Content/block.twig index 998b255d5ba..3028352edcf 100644 --- a/src/Eccube/Resource/template/admin/Content/block.twig +++ b/src/Eccube/Resource/template/admin/Content/block.twig @@ -41,7 +41,7 @@ file that was distributed with this source code. {{ 'admin.common.create__new'|trans }}
-
+
@@ -77,7 +77,7 @@ file that was distributed with this source code.
-
+
@@ -102,8 +102,8 @@ file that was distributed with this source code.
-
-

{{ 'admin.common.delete_modal__message'|trans({ '%name%' : Block.name }) }}

+
+

{{ 'admin.common.delete_modal__message'|trans({ '%name%' : Block.name }) }}

diff --git a/src/Eccube/Resource/template/admin/Content/block_edit.twig b/src/Eccube/Resource/template/admin/Content/block_edit.twig index 8caf0efe95e..1ff919d3629 100644 --- a/src/Eccube/Resource/template/admin/Content/block_edit.twig +++ b/src/Eccube/Resource/template/admin/Content/block_edit.twig @@ -65,7 +65,7 @@ file that was distributed with this source code.
{{ 'admin.content.block__card_title'|trans }}
-
+
@@ -79,7 +79,7 @@ file that was distributed with this source code.
{{ 'admin.content.block_name'|trans }}
- {{ 'admin.common.required'|trans }} + {{ 'admin.common.required'|trans }}
{{ form_widget(form.name) }} @@ -91,7 +91,7 @@ file that was distributed with this source code.
{{ 'admin.content.block_file_name'|trans }}
- {{ 'admin.common.required'|trans }} + {{ 'admin.common.required'|trans }}
{% if deletable %} @@ -110,7 +110,7 @@ file that was distributed with this source code.
{{ 'admin.content.block_source_code'|trans }}
- {{ 'admin.common.required'|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 773ec8deba5..9cf78fa1b59 100644 --- a/src/Eccube/Resource/template/admin/Content/css.twig +++ b/src/Eccube/Resource/template/admin/Content/css.twig @@ -79,7 +79,7 @@
{{ 'admin.content.css__card_title'|trans }}
-
+
@@ -94,7 +94,7 @@
{{ 'admin.content.page_source_code'|trans }}
- {{ 'admin.common.required'|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 ca9b78d0630..b1819e12119 100644 --- a/src/Eccube/Resource/template/admin/Content/file.twig +++ b/src/Eccube/Resource/template/admin/Content/file.twig @@ -125,7 +125,7 @@ file that was distributed with this source code.
{{ 'admin.content.file.add_directory'|trans }}
-
+
{{ form_widget(form.create_file, {attr: {placeholder: 'admin.content.file.directory_name'}}) }}
@@ -148,7 +148,7 @@ file that was distributed with this source code.
{{ 'admin.content.file.file_list__card_title'|trans }}
-
+
@@ -204,7 +204,7 @@ file that was distributed with this source code. {% if file.is_dir %} -
+
{{ 'admin.common.delete_modal__title'|trans }}
-
-

{{ 'admin.common.delete_modal__message'|trans({ '%name%': file.file_name }) }}

+
+

{{ 'admin.common.delete_modal__message'|trans({ '%name%': file.file_name }) }}

@@ -236,7 +236,7 @@ file that was distributed with this source code. {% else %} -
+
@@ -265,8 +265,8 @@ file that was distributed with this source code.
{{ 'admin.common.delete_modal__title'|trans }}
-
-

{{ 'admin.common.delete_modal__message'|trans({ '%name%': file.file_name }) }}

+
+

{{ 'admin.common.delete_modal__message'|trans({ '%name%': file.file_name }) }}

@@ -297,7 +297,7 @@ file that was distributed with this source code.
{{ 'admin.content.file.directory_tree'|trans }}
-
+
diff --git a/src/Eccube/Resource/template/admin/Content/js.twig b/src/Eccube/Resource/template/admin/Content/js.twig index 462e5fd111b..ee77b90f9cd 100644 --- a/src/Eccube/Resource/template/admin/Content/js.twig +++ b/src/Eccube/Resource/template/admin/Content/js.twig @@ -76,7 +76,7 @@
{{ 'admin.content.js__card_title'|trans }}
-
+
@@ -91,7 +91,7 @@
{{ 'admin.content.page_source_code'|trans }}
- {{ 'admin.common.required'|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 8eff820ad84..13e126068d0 100644 --- a/src/Eccube/Resource/template/admin/Content/layout.twig +++ b/src/Eccube/Resource/template/admin/Content/layout.twig @@ -191,13 +191,13 @@ file that was distributed with this source code.
{{ 'admin.content.layout__card_title'|trans }}
-
+
-
{{ 'admin.content.layout_name'|trans }}{{ 'admin.common.required'|trans }}
+
{{ 'admin.content.layout_name'|trans }}{{ 'admin.common.required'|trans }}
{{ form_widget(form.name) }} {{ form_errors(form.name) }} @@ -241,7 +241,7 @@ file that was distributed with this source code.
{{ 'admin.content.layout_edit__card_title'|trans }}
-
+
@@ -426,7 +426,7 @@ file that was distributed with this source code.

{{ 'admin.content.layout_section__unused'|trans }}

-
+
@@ -450,7 +450,7 @@ file that was distributed with this source code. title="{{ UnusedBlock.name }}" >{{ UnusedBlock.name }}
-
+
diff --git a/src/Eccube/Resource/template/admin/Content/layout_block.twig b/src/Eccube/Resource/template/admin/Content/layout_block.twig index 75b101c0085..302ed316638 100644 --- a/src/Eccube/Resource/template/admin/Content/layout_block.twig +++ b/src/Eccube/Resource/template/admin/Content/layout_block.twig @@ -19,7 +19,7 @@ file that was distributed with this source code. title="{{ BlockPosition.Block.name }}" >{{ BlockPosition.Block.name }}
-
+
diff --git a/src/Eccube/Resource/template/admin/Content/layout_list.twig b/src/Eccube/Resource/template/admin/Content/layout_list.twig index 673f42965bf..a1da3dfedae 100644 --- a/src/Eccube/Resource/template/admin/Content/layout_list.twig +++ b/src/Eccube/Resource/template/admin/Content/layout_list.twig @@ -53,7 +53,7 @@ file that was distributed with this source code. {{ Layout.name }}
-
+
{% if Layout.isDefault() == false %}
-
-

{{ 'admin.common.delete_modal__message'|trans({'%name%': News.title}) }}

+
+

{{ 'admin.common.delete_modal__message'|trans({'%name%': News.title}) }}

-
+
@@ -108,8 +108,8 @@ file that was distributed with this source code.
-
-

{{ 'admin.common.delete_modal__message'|trans({ '%name%' : Page.name }) }}

+
+

{{ 'admin.common.delete_modal__message'|trans({ '%name%' : Page.name }) }}

diff --git a/src/Eccube/Resource/template/admin/Content/page_edit.twig b/src/Eccube/Resource/template/admin/Content/page_edit.twig index fe5f54c6011..38185239d16 100644 --- a/src/Eccube/Resource/template/admin/Content/page_edit.twig +++ b/src/Eccube/Resource/template/admin/Content/page_edit.twig @@ -72,7 +72,7 @@ file that was distributed with this source code.
{{ 'admin.content.page__card_title'|trans }}
-
+
@@ -85,7 +85,7 @@ file that was distributed with this source code.
{{ 'admin.content.page_name'|trans }} - {{ 'admin.common.required'|trans }} + {{ 'admin.common.required'|trans }}
{{ form_widget(form.name) }} @@ -96,10 +96,10 @@ file that was distributed with this source code.
{{ 'admin.content.page_url'|trans }} - {{ 'admin.common.required'|trans }} + {{ 'admin.common.required'|trans }}
-
+
{% if is_user_data_page %}
{{ url('homepage') }}{{ eccube_config.eccube_user_data_route }}/
{{ form_widget(form.url) }}
@@ -117,10 +117,10 @@ file that was distributed with this source code.
{{ 'admin.content.page_file_name'|trans }}
- {{ 'admin.common.required'|trans }} + {{ 'admin.common.required'|trans }}
-
+
{% if is_user_data_page %}
{{ template_path }}/
@@ -143,7 +143,7 @@ file that was distributed with this source code.
{{ 'admin.content.page_source_code'|trans }}
- {{ 'admin.common.required'|trans }} + {{ 'admin.common.required'|trans }}
@@ -183,7 +183,7 @@ file that was distributed with this source code.
-
+
@@ -221,7 +221,7 @@ file that was distributed with this source code.
-
+
diff --git a/src/Eccube/Resource/template/admin/Customer/delivery_edit.twig b/src/Eccube/Resource/template/admin/Customer/delivery_edit.twig index 529515e13af..063310c3b6f 100644 --- a/src/Eccube/Resource/template/admin/Customer/delivery_edit.twig +++ b/src/Eccube/Resource/template/admin/Customer/delivery_edit.twig @@ -54,7 +54,7 @@ file that was distributed with this source code.
{{ 'admin.common.name'|trans }} - {{ 'admin.common.required'|trans }} + {{ 'admin.common.required'|trans }}
@@ -73,7 +73,7 @@ file that was distributed with this source code.
{{ 'admin.common.kana'|trans }} - {{ 'admin.common.required'|trans }} + {{ 'admin.common.required'|trans }}
@@ -102,7 +102,7 @@ file that was distributed with this source code.
{{ 'admin.common.address'|trans }} - {{ 'admin.common.required'|trans }} + {{ 'admin.common.required'|trans }}
@@ -148,7 +148,7 @@ file that was distributed with this source code.
{{ 'admin.common.phone_number'|trans }} - {{ 'admin.common.required'|trans }} + {{ 'admin.common.required'|trans }}
{{ form_widget(form.phone_number) }} diff --git a/src/Eccube/Resource/template/admin/Customer/edit.twig b/src/Eccube/Resource/template/admin/Customer/edit.twig index 2905f509755..00dfc072d86 100644 --- a/src/Eccube/Resource/template/admin/Customer/edit.twig +++ b/src/Eccube/Resource/template/admin/Customer/edit.twig @@ -36,7 +36,7 @@ file that was distributed with this source code.
{{ 'admin.customer.customer_info'|trans }}
-
+
diff --git a/src/Eccube/Resource/template/admin/Order/index.twig b/src/Eccube/Resource/template/admin/Order/index.twig index 36df49f8308..ffd6ff8030d 100644 --- a/src/Eccube/Resource/template/admin/Order/index.twig +++ b/src/Eccube/Resource/template/admin/Order/index.twig @@ -154,7 +154,7 @@ file that was distributed with this source code. {{ form_widget(searchForm.multi) }} {{ form_errors(searchForm.multi) }}
-
+
@@ -195,7 +195,7 @@ file that was distributed with this source code. {{ form_errors(searchForm.name) }}
-
+

{{ 'admin.common.payment_method'|trans }}

{{ form_widget(searchForm.payment, { 'label_attr': { 'class': 'checkbox-inline'}}) }} @@ -212,7 +212,7 @@ file that was distributed with this source code.
-
+
{{ form_widget(searchForm.order_datetime_start) }} {{ form_errors(searchForm.order_datetime_start) }} @@ -233,7 +233,7 @@ file that was distributed with this source code.
-
+
{{ form_widget(searchForm.payment_datetime_start) }} {{ form_errors(searchForm.payment_datetime_start) }} @@ -254,7 +254,7 @@ file that was distributed with this source code.
-
+
{{ form_widget(searchForm.update_datetime_start) }} {{ form_errors(searchForm.update_datetime_start) }} @@ -275,7 +275,7 @@ file that was distributed with this source code.
-
+
{{ form_widget(searchForm.shipping_delivery_datetime_start) }} @@ -300,7 +300,7 @@ file that was distributed with this source code.
-
+
{{ form_widget(searchForm.payment_total_start) }} @@ -319,7 +319,7 @@ file that was distributed with this source code.
-
+

{{ 'admin.order.tracking_number'|trans }}

{{ form_widget(searchForm.tracking_number) }} @@ -336,7 +336,7 @@ file that was distributed with this source code.
-
+

{{ 'admin.order.shipping_mail'|trans }}

{{ form_widget(searchForm.shipping_mail, { 'label_attr': { 'class': 'checkbox-inline' }}) }} @@ -407,7 +407,7 @@ file that was distributed with this source code.
- {% for status in OrderStatuses %} @@ -420,9 +420,9 @@ file that was distributed with this source code.
-
+
- {% for pageMax in pageMaxis %}