From c3fe9e3afb36a899ce2606318caa93c8655b13f2 Mon Sep 17 00:00:00 2001 From: Seasoft Date: Tue, 26 Nov 2024 17:34:39 +0900 Subject: [PATCH 01/11] =?UTF-8?q?default=20=E3=83=86=E3=83=B3=E3=83=97?= =?UTF-8?q?=E3=83=AC=E3=83=BC=E3=83=88=E3=82=92=E3=83=AC=E3=82=B9=E3=83=9D?= =?UTF-8?q?=E3=83=B3=E3=82=B7=E3=83=96Web=E3=83=87=E3=82=B6=E3=82=A4?= =?UTF-8?q?=E3=83=B3=E5=AF=BE=E5=BF=9C=E3=81=99=E3=82=8B=20#1065?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @bluestylejp-toya 氏提供のテンプレートを取り込み。 - data/class/SC_Display.php data/Smarty/templates/admin/design/subnavi.tpl の対応に関しては、議論が必要と認識している。 - #804 適用前でブランチを切った。master マージに辺り、#804 の再適用が必要。 --- .../Smarty/templates/admin/design/subnavi.tpl | 12 - data/Smarty/templates/default/site_frame.tpl | 4 + data/Smarty/templates/default/site_main.tpl | 42 +- data/class/SC_Display.php | 4 +- .../user_data/packages/default/css/common.css | 83 ++-- .../packages/default/css/contents.css | 385 ++++++++++++++++-- .../user_data/packages/default/css/import.css | 2 +- html/user_data/packages/default/css/popup.css | 21 + 8 files changed, 462 insertions(+), 91 deletions(-) diff --git a/data/Smarty/templates/admin/design/subnavi.tpl b/data/Smarty/templates/admin/design/subnavi.tpl index 35a04634a1..c88c6aaaf9 100644 --- a/data/Smarty/templates/admin/design/subnavi.tpl +++ b/data/Smarty/templates/admin/design/subnavi.tpl @@ -35,16 +35,4 @@ class="on" id="navi-design-add-">テンプレート追加 -
  • -
    スマートフォン
    - -
    • diff --git a/data/Smarty/templates/default/site_frame.tpl b/data/Smarty/templates/default/site_frame.tpl index df9bc2bfc2..d78edcc446 100644 --- a/data/Smarty/templates/default/site_frame.tpl +++ b/data/Smarty/templates/default/site_frame.tpl @@ -23,6 +23,7 @@ + <!--{$arrSiteInfo.shop_name|h}--><!--{if $tpl_subtitle|strlen >= 1}--> / <!--{$tpl_subtitle|h}--><!--{elseif $tpl_title|strlen >= 1}--> / <!--{$tpl_title|h}--><!--{/if}--> @@ -75,6 +76,9 @@ + + + diff --git a/data/Smarty/templates/default/site_main.tpl b/data/Smarty/templates/default/site_main.tpl index 7b251e1c7e..ef7e8edd55 100755 --- a/data/Smarty/templates/default/site_main.tpl +++ b/data/Smarty/templates/default/site_main.tpl @@ -73,27 +73,10 @@ - - -
    - - - --> - - - - - - --> - - -
    - - - +
    - class="colnum + class="colnum_order colnum leftright @@ -133,9 +116,27 @@
    + + +
    + + + --> + + + + + + --> + + +
    + + + -
    +
    --> @@ -150,6 +151,7 @@
    +
    diff --git a/data/class/SC_Display.php b/data/class/SC_Display.php index 86ae9e918c..841e51b8c4 100644 --- a/data/class/SC_Display.php +++ b/data/class/SC_Display.php @@ -119,7 +119,7 @@ public function setDevice($device = DEVICE_TYPE_PC) $this->setView(new SC_MobileView_Ex()); break; case DEVICE_TYPE_SMARTPHONE: - $this->setView(new SC_SmartphoneView_Ex()); + $this->setView(new SC_SiteView_Ex()); break; case DEVICE_TYPE_PC: $this->setView(new SC_SiteView_Ex()); @@ -155,7 +155,7 @@ public static function detectDevice($reset = FALSE) //$nu = new Net_UserAgent_Mobile(); $su = new SC_SmartphoneUserAgent_Ex(); if ($su->isSmartphone()) { - SC_Display_Ex::$device = DEVICE_TYPE_SMARTPHONE; + SC_Display_Ex::$device = DEVICE_TYPE_PC; } else { SC_Display_Ex::$device = DEVICE_TYPE_PC; } diff --git a/html/user_data/packages/default/css/common.css b/html/user_data/packages/default/css/common.css index c5826efc01..e1d7e79fff 100644 --- a/html/user_data/packages/default/css/common.css +++ b/html/user_data/packages/default/css/common.css @@ -16,6 +16,9 @@ body { img.picture { border: 1px solid #ccc; } +img { + max-width: 100%; +} /* ============================================== @@ -44,6 +47,22 @@ img.picture { /* メイン部 ----------------------------------------------- */ +@media screen and (min-width: 768px) { +#main_column_frame { + display: flex; + display: -webkit-flex; + display: -ms-flexbox; + -webkit-box-pack: justify; + -ms-flex-pack: justify; + justify-content: space-between; + -webkit-justify-content: space-between; + flex-direction: row; +} +#main_column_frame .colnum_order:nth-child(1) { order: 2; } +#main_column_frame .colnum_order:nth-child(2) { order: 1; } +#main_column_frame .colnum_order:nth-child(3) { order: 3; } +} + #main_column { padding: 10px 0 0; } @@ -62,20 +81,17 @@ img.picture { /* 2カラム時 (メイン部が左) */ #main_column.colnum2.left { padding-left: 1.5%; - float: left; } /* 2カラム時 (メイン部が右) */ #main_column.colnum2.right { padding-right: 1.5%; - float: right; } /* 3カラム時 */ #main_column.colnum3 { padding-left: 0.5%; width: 59%; - float: left; } /* サイドカラム @@ -84,11 +100,9 @@ img.picture { padding: 10px 0 0; } #leftcolumn { - float: left; width: 20%; } #rightcolumn { - float: right; width: 20%; } @@ -300,10 +314,16 @@ div#undercolumn_login .login_area h4 { #header { margin: auto; width: 980px; + display: flex; + display: -webkit-flex; + display: -ms-flexbox; + -webkit-box-pack: justify; + -ms-flex-pack: justify; + justify-content: space-between; + -webkit-justify-content: space-between; } #header_utility { - float: right; - width: 580px; + width: 60%; } #errorHeader { color: #F00; @@ -319,8 +339,7 @@ div#undercolumn_login .login_area h4 { ----------------------------------------------- */ #logo_area { padding-left: 10px; - float: left; - width: 390px; + width: 40%px; text-align: left; } #site_description { @@ -330,17 +349,22 @@ div#undercolumn_login .login_area h4 { /* ヘッダーナビ ----------------------------------------------- */ -div#header_navi { - float: right; - width: 409px; +#header_navi ul { + width: 100%; height: 38px; -} -div#header_navi ul li { + display: flex; + display: -webkit-flex; + display: -ms-flexbox; + -webkit-box-pack: justify; + -ms-flex-pack: justify; + justify-content: flex-end; + -webkit-justify-content: flex-end; +} +#header_navi ul li { display: block; - float: left; } -div#header_navi ul li.mypage, -div#header_navi ul li.entry { +#header_navi ul li.mypage, +#header_navi ul li.entry { margin-top: 6px; } @@ -362,12 +386,13 @@ div#header_navi ul li.entry { } #pagetop { width: 210px; - float: right; text-align: right; + position: fixed; + bottom: 40px; + right: 12px; } #copyright { width: 740px; - float: left; text-align: left; font-size: 97%; } @@ -379,14 +404,26 @@ div#header_navi ul li.entry { /* ボタン ----------------------------------------------- */ .btn_area { - margin-top: 10px; - width: 100%; - text-align: center; + margin: 10px auto; + width: 80%; +} +.btn_area ul { + display: flex; + display: -webkit-flex; + display: -ms-flexbox; + -webkit-box-pack: justify; + -ms-flex-pack: justify; + justify-content: flex-end; + -webkit-justify-content: flex-end; } .btn_area li { padding-right: 10px; - display: inline; + -webkit-flex-grow: 1; + flex-grow: 1; + -webkit-box-sizing: border-box; + box-sizing: border-box; + text-align: center; } diff --git a/html/user_data/packages/default/css/contents.css b/html/user_data/packages/default/css/contents.css index 63ace223f9..b59448c6dd 100644 --- a/html/user_data/packages/default/css/contents.css +++ b/html/user_data/packages/default/css/contents.css @@ -60,11 +60,19 @@ div#mycontents_area { div#mynavi_area .mynavi_list { margin-bottom: 20px; width: 100%; + display: flex; + display: -webkit-flex; + display: -ms-flexbox; + -webkit-box-pack: justify; + -ms-flex-pack: justify; + justify-content: space-between; + -webkit-justify-content: space-between; + -webkit-flex-wrap: wrap; + flex-wrap: wrap; } div#mynavi_area .mynavi_list li { margin: 0 15px 5px 0; padding-left: 15px; - float: left; background: url('../img/icon/ico_arrow_01.gif') no-repeat left ; font-size: 120%; } @@ -102,12 +110,10 @@ div#mycontents_area div.mycondition_area { background: #f9f9f9; } div#mycontents_area div.mycondition_area p { - float: left; } div#mycontents_area div.mycondition_area .btn { width: 160px; margin-top: 15px; - float: right; } .add_address { margin-bottom: 20px; @@ -203,13 +209,13 @@ div#undercolumn_error .message_area .error { } .pagenumber_area .navi { width: 100%; - text-align: left; + text-align: center; + margin: 16px auto; } .pagenumber_area .navi li { display: inline; } .pagenumber_area .change { - float: right; text-align: right; white-space: nowrap; } @@ -221,27 +227,30 @@ div.list_area { padding: 0 0 30px 0; width: 100%; overflow: auto; + display: flex; + display: -webkit-flex; + display: -ms-flexbox; + -webkit-box-pack: justify; + -ms-flex-pack: justify; + justify-content: space-between; + -webkit-justify-content: space-between; } div.listphoto { - float: left; } /* メインカラム用 1カラム時*/ #main_column.colnum1 div.listrightbloc { - float: right; width: 74%; } /* メインカラム用 2カラム時*/ #main_column.colnum2 div.listrightbloc { - float: right; width: 80%; } /* メインカラム用 3カラム時*/ #main_column.colnum3 div.listrightbloc { - float: right; width: 74%; } @@ -252,10 +261,16 @@ div.listphoto { div.listrightbloc ul.status_icon { margin-bottom: 10px; width: 100%; + display: flex; + display: -webkit-flex; + display: -ms-flexbox; + -webkit-box-pack: justify; + -ms-flex-pack: justify; + justify-content: flex-start; + -webkit-justify-content: flex-start; } div.listrightbloc ul.status_icon li { margin-right: 5px; - float: left; } /* 商品名 */ @@ -312,20 +327,33 @@ div.listrightbloc dd p.attention { /* カゴに入れる */ div.listrightbloc .cartin { margin: 0; - float :right; + display: flex; + display: -webkit-flex; + display: -ms-flexbox; + -webkit-box-pack: justify; + -ms-flex-pack: justify; + justify-content: space-between; + -webkit-justify-content: space-between; } div.listrightbloc .cartin .quantity { padding: 3px 10px 0 0; width: 150px; - float :left; text-align: right; + display: flex; + display: -webkit-flex; + display: -ms-flexbox; + -webkit-box-pack: justify; + -ms-flex-pack: justify; + justify-content: flex-start; + -webkit-justify-content: flex-start; + width: 40%; + padding: 0 4% 0 0; } div.listrightbloc .cartin .quantity .box { width: 70px; } div.listrightbloc .cartin_btn { width: 160px; - float :left; } @@ -348,22 +376,45 @@ div.listrightbloc .cartin_btn { /* レイアウト ----------------------------------------------- */ +#detailarea { + display: flex; + display: -webkit-flex; + display: -ms-flexbox; + -webkit-box-pack: justify; + -ms-flex-pack: justify; + justify-content: space-between; + -webkit-justify-content: space-between; +} +#main_column h3 { + -webkit-flex-grow: 1; + flex-grow: 1; + -webkit-box-sizing: border-box; + box-sizing: border-box; +} +#main_column div.subtext { + -webkit-flex-grow: 2; + flex-grow: 2; + -webkit-box-sizing: border-box; + box-sizing: border-box; +} +#main_column div.subphotoimg { + -webkit-flex-grow: 2; + flex-grow: 2; + -webkit-box-sizing: border-box; + box-sizing: border-box; +} /* 1カラム用 */ #main_column.colnum1 div#detailphotobloc { width: 37%; - float: left; } #main_column.colnum1 #detailrightbloc { width: 63%; - float: right; } #main_column.colnum1 div.subtext { margin-bottom: 20px; - float: left; width: 69%; } #main_column.colnum1 div.subphotoimg { - float: right; width: 25%; text-align: right; } @@ -373,46 +424,41 @@ div.listrightbloc .cartin_btn { /* 2カラム用 */ #main_column.colnum2 div#detailphotobloc { - float: left; width: 37%; } #main_column.colnum2 #detailrightbloc { - float: right; width: 63%; } +#main_column.colnum2 h3 { + width: 100%; +} #main_column.colnum2 div.subtext { margin-bottom: 20px; - float: left; width: 73%; } #main_column.colnum2 p.subtext { margin-bottom: 20px; } #main_column.colnum2 div.subphotoimg { - float: right; width: 25%; text-align: right; } /* 3カラム用 */ #main_column.colnum3 div#detailphotobloc { - float: left; width: 49%; } #main_column.colnum3 #detailrightbloc { - float: right; width: 50%; } #main_column.colnum3 div.subtext { margin-bottom: 20px; - float: left; width: 63%; } #main_column.colnum3 p.subtext { margin-bottom: 20px; } #main_column.colnum3 div.subphotoimg { - float: right; width: 35%; text-align: right; } @@ -447,11 +493,17 @@ div.listrightbloc .cartin_btn { #detailrightbloc ul.status_icon { margin-bottom: 10px; width: 100%; + display: flex; + display: -webkit-flex; + display: -ms-flexbox; + -webkit-box-pack: justify; + -ms-flex-pack: justify; + justify-content: flex-start; + -webkit-justify-content: flex-start; } #detailrightbloc ul.status_icon li { margin-right: 5px; margin-bottom: 3px; - float: left; } /* 通常価格 */ @@ -488,7 +540,6 @@ div.listrightbloc .cartin_btn { } #detailrightbloc ul li { vertical-align: top; - float: left; } /* メーカー */ @@ -513,6 +564,26 @@ div.listrightbloc .cartin_btn { padding: 10px; background-color: #ecf5ff; border: 1px solid #cef0f4; + display: flex; + display: -webkit-flex; + display: -ms-flexbox; + -webkit-box-pack: justify; + -ms-flex-pack: justify; + justify-content: space-between; + -webkit-justify-content: space-between; + -webkit-flex-wrap: wrap; + flex-wrap: wrap; +} +#detailrightbloc .cart_area .quantity { + display: flex; + display: -webkit-flex; + display: -ms-flexbox; + -webkit-box-pack: justify; + -ms-flex-pack: justify; + justify-content: flex-start; + -webkit-justify-content: flex-start; + padding-top: 4px; + width: 50%; } #detailrightbloc .quantity dt, #detailrightbloc .quantity dd { @@ -520,13 +591,26 @@ div.listrightbloc .cartin_btn { } #detailrightbloc .cartin { text-align: center; + width: 50%; } #detailrightbloc .cartin_btn { - text-align: center; + text-align: right; } #detailrightbloc .favorite_btn { - text-align: center; + text-align: right; margin-top: 10px; + width: 100%; +} +.sub_area { + display: flex; + display: -webkit-flex; + display: -ms-flexbox; + -webkit-box-pack: justify; + -ms-flex-pack: justify; + justify-content: space-between; + -webkit-justify-content: space-between; + -webkit-flex-wrap: wrap; + flex-wrap: wrap; } @@ -553,11 +637,9 @@ div#customervoice_area .review_bloc { div#customervoice_area .review_bloc p { padding-top: 3px; margin-right: 10px; - float: left; } div#customervoice_area .review_bloc .review_btn { - float: right; width: 160px; } @@ -687,11 +769,17 @@ div#undercolumn_shopping .point_area .point_announce li { #address_area { margin-bottom: 10px; width: 100%; + display: flex; + display: -webkit-flex; + display: -ms-flexbox; + -webkit-box-pack: justify; + -ms-flex-pack: justify; + justify-content: space-between; + -webkit-justify-content: space-between; } #address_area .information { width: 65%; - float: left; } #undercolumn_shopping .information { @@ -701,7 +789,6 @@ div#undercolumn_shopping .point_area .point_announce li { #address_area .add_multiple { padding: 15px 10px; border: 1px solid #ffcc62; - float: right; width: 30%; color: #555; background: #fffaf0; @@ -729,3 +816,235 @@ p.condition_area { width: 566px; } + + +/* ============================================== +▼スマートフォン +=============================================== */ +@media screen and (max-width: 768px) { +#container { + margin: 0 auto; + padding: 0 0 30px; + width: 100%; + background: #fff; + text-align: left; +} + +#main_column_frame { + padding: 0 4%; +} + +/* 1カラム時 */ +#main_column.colnum1 { + margin: 0 auto; + width: 100%; +} + +/* 2カラム時 (共通) */ +#main_column.colnum2 { + width: 100%; +} + +/* 2カラム時 (メイン部が左) */ +#main_column.colnum2.left { + padding-left: 0; +} + +/* 2カラム時 (メイン部が右) */ +#main_column.colnum2.right { + padding-right: 0; +} + +/* 3カラム時 */ +#main_column.colnum3 { + padding-left: 0; + width: 100%; +} + + +.box40 { + width: 18%; +} +.box60 { + width: 24%; +} +.box100, +.box120 { + width: 32%; +} +.box140, +.box145, +.box150, +.box240, +.box300, +.box320, +.box350, +.box380 { + width: 96%; +} +input, +textarea, +select, +button { + max-width: 100%; +} +#footer_wrap, +#footer, +#copyright, +#rightcolumn, +#leftcolumn { + width: 100%; + padding-top: 0; +} +#headerInternalColumn { + width: 100%; + padding-top: 0; + height: auto; + max-height: 35px; +} + +#container .side_column .block_outer { + padding: 0; + margin: 8px auto; +} + +#header { + display: block; + width: 100%; +} +#header_utility { + width: 100%; +} +#logo_area { + width: 100%; + padding-left: 0; +} +#header_navi ul { + width: 100%; +} +#main_column #recommend_area .product_item, +#whobought_area .product_item { + width: 100%; +} +#calender_area .block_body { + display: flex; + display: -webkit-flex; + display: -ms-flexbox; + -webkit-box-pack: justify; + -ms-flex-pack: justify; + justify-content: space-between; + -webkit-justify-content: space-between; + -webkit-flex-wrap: wrap; + flex-wrap: wrap; +} +#calender_area table { + width: 48%; + -webkit-flex-grow: 1; + flex-grow: 1; + -webkit-box-sizing: border-box; + box-sizing: border-box; + margin: 0 1%; +} +#main_column.colnum2 div.listrightbloc { + width: 72%; +} +div.listphoto { + width: 24%; + margin-right: 4%; +} +div.listrightbloc .detail_btn { + text-align: right; +} +div.listrightbloc .cartin { + width: 100%; +} +div.listrightbloc .cartin .quantity .box { + width: 40%; +} +div.listrightbloc .cartin_btn { + width: 60%; +} + +#main_column.colnum1 div.subtext, +#main_column.colnum2 div.subtext, +#main_column.colnum3 div.subtext, +#main_column.colnum1 div.subphotoimg, +#main_column.colnum2 div.subphotoimg, +#main_column.colnum3 div.subphotoimg { + width: 100%; +} +#detailarea, +.sub_area { + display: block; +} +#main_column div.subphotoimg img, +#undercolumn_cart .form_area tbody td img, +#main_column div#detailphotobloc img { + width: auto !important; + height: auto !important; + max-width: 100% !important; + max-height: 100% !important; +} +#main_column.colnum1 div#detailphotobloc, +#main_column.colnum2 div#detailphotobloc, +#main_column.colnum3 div#detailphotobloc { + width: 100%; + text-align: center; + margin-bottom: 16px; +} +#main_column.colnum1 #detailrightbloc, +#main_column.colnum2 #detailrightbloc, +#main_column.colnum3 #detailrightbloc { + width: 100%; +} +#detailrightbloc .cart_area .quantity dt { + width: 40%; + text-align: right; +} +#detailrightbloc .cart_area .quantity .box60 { + width: 60%; +} +div#customervoice_area .review_bloc .review_btn { + margin: 8px auto; +} +#detailrightbloc .favorite_btn { + margin: 8px auto 0; +} + +div#mynavi_area .mynavi_list li { + width: 40%; + margin-right: 0; +} + +#undercolumn_cart .form_area tbody th:nth-child(2), +#undercolumn_cart .form_area tbody td:nth-child(2) { + padding: 4px 0; + width: 16%; +} +#undercolumn_cart .form_area tbody th:nth-child(3), +#undercolumn_cart .form_area tbody td:nth-child(3) { + width: 20%; +} +#undercolumn_cart .form_area tbody th:nth-child(4), +#undercolumn_cart .form_area tbody td:nth-child(4) { + width: 16%; +} +#undercolumn_cart .form_area tbody th:nth-child(5), +#undercolumn_cart .form_area tbody td:nth-child(5) { + width: 20%; +} +#undercolumn_cart .form_area tbody th:nth-child(6), +#undercolumn_cart .form_area tbody td:nth-child(6) { + width: 16%; +} +#undercolumn_cart .form_area tbody td .box3 { + width: 20%; +} +#address_area .add_multiple { + width: 84%; + padding: 12px 8%; +} +#address_area { + display: block; +} +} \ No newline at end of file diff --git a/html/user_data/packages/default/css/import.css b/html/user_data/packages/default/css/import.css index 074fa3e4df..c3fa7ad0dc 100644 --- a/html/user_data/packages/default/css/import.css +++ b/html/user_data/packages/default/css/import.css @@ -5,10 +5,10 @@ ************************************************ */ @import url("./reset.css"); @import url("./common.css"); -@import url("./contents.css"); @import url("./table.css"); @import url("./bloc.css"); @import url("./bloc_alpha.css"); @import url("./popup.css"); +@import url("./contents.css"); @import url("./print.css"); diff --git a/html/user_data/packages/default/css/popup.css b/html/user_data/packages/default/css/popup.css index 7d1d5ac207..74d5087308 100644 --- a/html/user_data/packages/default/css/popup.css +++ b/html/user_data/packages/default/css/popup.css @@ -109,3 +109,24 @@ div#zipsearch_area #completebox p { text-align: center; } +@media screen and (max-width: 768px) { + div#window_area, + div#window_area table, + div#windowcolumn { + width: 100%; + margin: 0; + } + div#window_area #forgot, + div#window_area p, + div#window_area table { + width: 92%; + margin: 0 auto 16px; + } + div#window_area #forgot { + padding: 20px 0; + } + #completebox .box300, + div#window_area #forgot .box300 { + width: 60%; + } +} From 22df4a760617ea6056001b0529acd3ba2ec3ad3f Mon Sep 17 00:00:00 2001 From: Seasoft Date: Wed, 27 Nov 2024 12:50:59 +0900 Subject: [PATCH 02/11] =?UTF-8?q?=E3=83=97=E3=83=AA=E3=83=B3=E3=83=88?= =?UTF-8?q?=E3=81=8C=E4=B9=B1=E3=82=8C=E3=82=8B=E3=81=AE=E3=82=92=E5=9B=9E?= =?UTF-8?q?=E9=81=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ついでに、Media Queries Level 4 を使う。 --- html/user_data/packages/default/style.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/html/user_data/packages/default/style.css b/html/user_data/packages/default/style.css index 5c9b0e56a9..4aa8acc8d0 100644 --- a/html/user_data/packages/default/style.css +++ b/html/user_data/packages/default/style.css @@ -150,7 +150,7 @@ img { /* メイン部 ----------------------------------------------- */ -@media screen and (min-width: 768px) { +@media (width > 768px), not screen { #main_column_frame { display: flex; display: -webkit-flex; @@ -2293,7 +2293,7 @@ ul.button_like li { /* ============================================== ▼スマートフォン =============================================== */ -@media screen and (max-width: 768px) { +@media screen and (width <= 768px) { #container { margin: 0 auto; padding: 0 0 30px; From e99ca9c07b971b3de187ab7c7cc0e082c4d6dcb6 Mon Sep 17 00:00:00 2001 From: Seasoft Date: Wed, 27 Nov 2024 13:25:19 +0900 Subject: [PATCH 03/11] =?UTF-8?q?=E9=9D=9E=E6=A8=99=E6=BA=96=E3=81=AE=20CS?= =?UTF-8?q?S=20=E3=82=92=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 必要なものは、復元して、ソースコメント書いてください。 --- html/user_data/packages/default/style.css | 92 ----------------------- 1 file changed, 92 deletions(-) diff --git a/html/user_data/packages/default/style.css b/html/user_data/packages/default/style.css index 4aa8acc8d0..887413836e 100644 --- a/html/user_data/packages/default/style.css +++ b/html/user_data/packages/default/style.css @@ -153,12 +153,7 @@ img { @media (width > 768px), not screen { #main_column_frame { display: flex; - display: -webkit-flex; - display: -ms-flexbox; - -webkit-box-pack: justify; - -ms-flex-pack: justify; justify-content: space-between; - -webkit-justify-content: space-between; flex-direction: row; .colnum_order { @@ -459,12 +454,7 @@ h2.title { margin: auto; width: 980px; display: flex; - display: -webkit-flex; - display: -ms-flexbox; - -webkit-box-pack: justify; - -ms-flex-pack: justify; justify-content: space-between; - -webkit-justify-content: space-between; } #header_utility { @@ -499,12 +489,7 @@ h2.title { width: 100%; height: 38px; display: flex; - display: -webkit-flex; - display: -ms-flexbox; - -webkit-box-pack: justify; - -ms-flex-pack: justify; justify-content: flex-end; - -webkit-justify-content: flex-end; li { display: block; @@ -560,19 +545,12 @@ h2.title { ul { display: flex; - display: -webkit-flex; - display: -ms-flexbox; - -webkit-box-pack: justify; - -ms-flex-pack: justify; justify-content: flex-end; - -webkit-justify-content: flex-end; } li { padding-right: 10px; - -webkit-flex-grow: 1; flex-grow: 1; - -webkit-box-sizing: border-box; box-sizing: border-box; text-align: center; } @@ -665,13 +643,7 @@ h2.title { margin-bottom: 20px; width: 100%; display: flex; - display: -webkit-flex; - display: -ms-flexbox; - -webkit-box-pack: justify; - -ms-flex-pack: justify; justify-content: space-between; - -webkit-justify-content: space-between; - -webkit-flex-wrap: wrap; flex-wrap: wrap; li { @@ -846,12 +818,7 @@ div.list_area { width: 100%; overflow: auto; display: flex; - display: -webkit-flex; - display: -ms-flexbox; - -webkit-box-pack: justify; - -ms-flex-pack: justify; justify-content: space-between; - -webkit-justify-content: space-between; } div.listphoto { @@ -884,12 +851,7 @@ div.listphoto { margin-bottom: 10px; width: 100%; display: flex; - display: -webkit-flex; - display: -ms-flexbox; - -webkit-box-pack: justify; - -ms-flex-pack: justify; justify-content: flex-start; - -webkit-justify-content: flex-start; li { margin-right: 5px; @@ -955,24 +917,14 @@ div.listphoto { .cartin { margin: 0; display: flex; - display: -webkit-flex; - display: -ms-flexbox; - -webkit-box-pack: justify; - -ms-flex-pack: justify; justify-content: space-between; - -webkit-justify-content: space-between; .quantity { padding: 3px 10px 0 0; width: 150px; text-align: right; display: flex; - display: -webkit-flex; - display: -ms-flexbox; - -webkit-box-pack: justify; - -ms-flex-pack: justify; justify-content: flex-start; - -webkit-justify-content: flex-start; width: 40%; padding: 0 4% 0 0; @@ -1008,19 +960,12 @@ div.listphoto { ----------------------------------------------- */ #detailarea { display: flex; - display: -webkit-flex; - display: -ms-flexbox; - -webkit-box-pack: justify; - -ms-flex-pack: justify; justify-content: space-between; - -webkit-justify-content: space-between; } #main_column { h3 { - -webkit-flex-grow: 1; flex-grow: 1; - -webkit-box-sizing: border-box; box-sizing: border-box; } @@ -1028,9 +973,7 @@ div.listphoto { div { &.subtext, &.subphotoimg { - -webkit-flex-grow: 2; flex-grow: 2; - -webkit-box-sizing: border-box; box-sizing: border-box; } } @@ -1154,12 +1097,7 @@ div.listphoto { margin-bottom: 10px; width: 100%; display: flex; - display: -webkit-flex; - display: -ms-flexbox; - -webkit-box-pack: justify; - -ms-flex-pack: justify; justify-content: flex-start; - -webkit-justify-content: flex-start; li { margin-right: 5px; @@ -1244,23 +1182,12 @@ div.listphoto { background-color: #ecf5ff; border: 1px solid #cef0f4; display: flex; - display: -webkit-flex; - display: -ms-flexbox; - -webkit-box-pack: justify; - -ms-flex-pack: justify; justify-content: space-between; - -webkit-justify-content: space-between; - -webkit-flex-wrap: wrap; flex-wrap: wrap; .quantity { display: flex; - display: -webkit-flex; - display: -ms-flexbox; - -webkit-box-pack: justify; - -ms-flex-pack: justify; justify-content: flex-start; - -webkit-justify-content: flex-start; padding-top: 4px; width: 50%; } @@ -1293,13 +1220,7 @@ div.listphoto { .LC_Page_Products_Detail { .sub_area { display: flex; - display: -webkit-flex; - display: -ms-flexbox; - -webkit-box-pack: justify; - -ms-flex-pack: justify; justify-content: space-between; - -webkit-justify-content: space-between; - -webkit-flex-wrap: wrap; flex-wrap: wrap; } } @@ -1464,12 +1385,7 @@ div.form_area { margin-bottom: 10px; width: 100%; display: flex; - display: -webkit-flex; - display: -ms-flexbox; - -webkit-box-pack: justify; - -ms-flex-pack: justify; justify-content: space-between; - -webkit-justify-content: space-between; .information { width: 65%; @@ -2422,21 +2338,13 @@ ul.button_like li { #calender_area { .block_body { display: flex; - display: -webkit-flex; - display: -ms-flexbox; - -webkit-box-pack: justify; - -ms-flex-pack: justify; justify-content: space-between; - -webkit-justify-content: space-between; - -webkit-flex-wrap: wrap; flex-wrap: wrap; } table { width: 48%; - -webkit-flex-grow: 1; flex-grow: 1; - -webkit-box-sizing: border-box; box-sizing: border-box; margin: 0 1%; } From 72e3c9a3418959298b6d7c96b718a2ed921ee1b8 Mon Sep 17 00:00:00 2001 From: Seasoft Date: Tue, 17 Dec 2024 19:00:09 +0900 Subject: [PATCH 04/11] =?UTF-8?q?default=20=E3=83=86=E3=83=B3=E3=83=97?= =?UTF-8?q?=E3=83=AC=E3=83=BC=E3=83=88=E3=82=92=E3=83=AC=E3=82=B9=E3=83=9D?= =?UTF-8?q?=E3=83=B3=E3=82=B7=E3=83=96Web=E3=83=87=E3=82=B6=E3=82=A4?= =?UTF-8?q?=E3=83=B3=E5=AF=BE=E5=BF=9C=E3=81=99=E3=82=8B=20#1065?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit テンプレートをPC・スマートフォンで別々に設定できる仕組みと互換性がない変更を差し戻す。 git restore --source=88f072123af8464ba0181f4ddfa29bf75846d198 data/class/SC_Display.php data/Smarty/templates/admin/design/subnavi.tpl --- data/Smarty/templates/admin/design/subnavi.tpl | 12 ++++++++++++ data/class/SC_Display.php | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/data/Smarty/templates/admin/design/subnavi.tpl b/data/Smarty/templates/admin/design/subnavi.tpl index c88c6aaaf9..35a04634a1 100644 --- a/data/Smarty/templates/admin/design/subnavi.tpl +++ b/data/Smarty/templates/admin/design/subnavi.tpl @@ -35,4 +35,16 @@ class="on" id="navi-design-add-">テンプレート追加 +
  • +
    スマートフォン
    + +
    • diff --git a/data/class/SC_Display.php b/data/class/SC_Display.php index b14e71cf4b..17e0c7a128 100644 --- a/data/class/SC_Display.php +++ b/data/class/SC_Display.php @@ -120,7 +120,7 @@ public function setDevice($device = DEVICE_TYPE_PC) $this->setView(new SC_MobileView_Ex()); break; case DEVICE_TYPE_SMARTPHONE: - $this->setView(new SC_SiteView_Ex()); + $this->setView(new SC_SmartphoneView_Ex()); break; case DEVICE_TYPE_PC: $this->setView(new SC_SiteView_Ex()); @@ -158,7 +158,7 @@ public static function detectDevice($reset = false) // $nu = new Net_UserAgent_Mobile(); $su = new SC_SmartphoneUserAgent_Ex(); if ($su->isSmartphone()) { - SC_Display_Ex::$device = DEVICE_TYPE_PC; + SC_Display_Ex::$device = DEVICE_TYPE_SMARTPHONE; } else { SC_Display_Ex::$device = DEVICE_TYPE_PC; } From 8f643f06219a0c1bd97472a13713393755420fe9 Mon Sep 17 00:00:00 2001 From: Seasoft Date: Tue, 17 Dec 2024 19:54:22 +0900 Subject: [PATCH 05/11] =?UTF-8?q?default=20=E3=83=86=E3=83=B3=E3=83=97?= =?UTF-8?q?=E3=83=AC=E3=83=BC=E3=83=88=E3=82=92=E3=83=AC=E3=82=B9=E3=83=9D?= =?UTF-8?q?=E3=83=B3=E3=82=B7=E3=83=96Web=E3=83=87=E3=82=B6=E3=82=A4?= =?UTF-8?q?=E3=83=B3=E5=AF=BE=E5=BF=9C=E3=81=99=E3=82=8B=20#1065?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PC・スマートフォンで同一テンプレートを設定すると、スマートフォンでもPCのレイアウト情報を読み込む。 --- data/Smarty/templates/admin/design/subnavi.tpl | 12 +++++++----- data/class/helper/SC_Helper_PageLayout.php | 10 ++++++++++ data/class/pages/LC_Page.php | 14 ++++++++++++-- data/class/pages/admin/LC_Page_Admin.php | 4 ++++ .../admin/design/LC_Page_Admin_Design_Template.php | 1 + html/install/sql/create_table_pgsql.sql | 2 +- html/install/sql/insert_data.sql | 1 + 7 files changed, 36 insertions(+), 8 deletions(-) diff --git a/data/Smarty/templates/admin/design/subnavi.tpl b/data/Smarty/templates/admin/design/subnavi.tpl index 35a04634a1..043ac1b15d 100644 --- a/data/Smarty/templates/admin/design/subnavi.tpl +++ b/data/Smarty/templates/admin/design/subnavi.tpl @@ -38,11 +38,13 @@
  • スマートフォン
    diff --git a/data/class/helper/SC_Helper_PageLayout.php b/data/class/helper/SC_Helper_PageLayout.php index 45bc56d964..5a0499b7db 100644 --- a/data/class/helper/SC_Helper_PageLayout.php +++ b/data/class/helper/SC_Helper_PageLayout.php @@ -388,4 +388,14 @@ public function getColumnNum($arrPageLayout) return $col_num; } + + /** + * レスポンシブWebデザイン表示か + * + * @return boolean + */ + public static function isResponsive() + { + return SMARTPHONE_TEMPLATE_NAME === TEMPLATE_NAME; + } } diff --git a/data/class/pages/LC_Page.php b/data/class/pages/LC_Page.php index 7b3e030455..71f77b4b5d 100644 --- a/data/class/pages/LC_Page.php +++ b/data/class/pages/LC_Page.php @@ -308,8 +308,18 @@ public function init() if (!$this->skip_load_page_layout) { $layout = new SC_Helper_PageLayout_Ex(); - $layout->sfGetPageLayout($this, false, $_SERVER['SCRIPT_NAME'], - $this->objDisplay->detectDevice()); + + $device_type_id = $this->objDisplay->detectDevice(); + + // スマートフォン端末アクセス時、レスポンシブWebデザイン表示の場合、PCの情報を取得する。 + // @see https://github.com/EC-CUBE/ec-cube2/issues/1065 + if ($device_type_id == DEVICE_TYPE_SMARTPHONE + && SC_Helper_PageLayout_Ex::isResponsive() + ) { + $device_type_id = DEVICE_TYPE_PC; + } + + $layout->sfGetPageLayout($this, false, $_SERVER['SCRIPT_NAME'], $device_type_id); } // スーパーフックポイントを実行. diff --git a/data/class/pages/admin/LC_Page_Admin.php b/data/class/pages/admin/LC_Page_Admin.php index 1625f75cf7..fd93e3f00d 100644 --- a/data/class/pages/admin/LC_Page_Admin.php +++ b/data/class/pages/admin/LC_Page_Admin.php @@ -132,6 +132,8 @@ class LC_Page_Admin extends LC_Page_Ex public $arrTitle; /** @var int */ public $tpl_pagemax; + /** @var bool */ + public $tpl_is_responsive; /** * Page を初期化する. @@ -183,6 +185,8 @@ public function init() if ($class_name != $parent_class_name) { $objPlugin->doAction($class_name.'_action_before', [$this]); } + + $this->tpl_is_responsive = SC_Helper_PageLayout_Ex::isResponsive(); } /** diff --git a/data/class/pages/admin/design/LC_Page_Admin_Design_Template.php b/data/class/pages/admin/design/LC_Page_Admin_Design_Template.php index 55c326eb2b..f802790050 100644 --- a/data/class/pages/admin/design/LC_Page_Admin_Design_Template.php +++ b/data/class/pages/admin/design/LC_Page_Admin_Design_Template.php @@ -88,6 +88,7 @@ public function action() $this->arrErr = $objFormParam->checkError(); if (SC_Utils_Ex::isBlank($this->arrErr)) { if ($this->doRegister($template_code, $this->device_type_id)) { + // FIXME: PRGする。(レスポンシブWebデザインの有効・無効が変わった場合の操作可能メニューが即時反映されない不具合を抱えている。) $this->tpl_select = $template_code; $this->tpl_onload = "alert('登録が完了しました。');"; } diff --git a/html/install/sql/create_table_pgsql.sql b/html/install/sql/create_table_pgsql.sql index 1f0eb7af97..aa7fb888b5 100644 --- a/html/install/sql/create_table_pgsql.sql +++ b/html/install/sql/create_table_pgsql.sql @@ -826,7 +826,7 @@ CREATE TABLE dtb_templates ( template_name text, create_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, update_date timestamp NOT NULL, - PRIMARY KEY (template_code) + PRIMARY KEY (template_code, device_type_id) ); CREATE TABLE dtb_maker ( diff --git a/html/install/sql/insert_data.sql b/html/install/sql/insert_data.sql index b377320466..d434184e9b 100644 --- a/html/install/sql/insert_data.sql +++ b/html/install/sql/insert_data.sql @@ -727,6 +727,7 @@ INSERT INTO dtb_best_products (best_id, category_id, rank, product_id, title, co INSERT INTO dtb_templates (template_code, device_type_id, template_name, create_date, update_date) VALUES ('default', 10, 'デフォルト', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP); INSERT INTO dtb_templates (template_code, device_type_id, template_name, create_date, update_date) VALUES ('mobile', 1, 'モバイル', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP); INSERT INTO dtb_templates (template_code, device_type_id, template_name, create_date, update_date) VALUES ('sphone', 2, 'スマートフォン', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP); +INSERT INTO dtb_templates (template_code, device_type_id, template_name, create_date, update_date) VALUES ('default', 2, 'PCデフォルト (レスポンシブWebデザイン)', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP); INSERT INTO mtb_allowed_tag (id, name, rank) VALUES (0, 'table', 0); INSERT INTO mtb_allowed_tag (id, name, rank) VALUES (1, 'tr', 1); From 4e03f6974813e933a7189e2cd1018c930b600930 Mon Sep 17 00:00:00 2001 From: Seasoft Date: Wed, 18 Dec 2024 09:10:31 +0900 Subject: [PATCH 06/11] =?UTF-8?q?default=20=E3=83=86=E3=83=B3=E3=83=97?= =?UTF-8?q?=E3=83=AC=E3=83=BC=E3=83=88=E3=82=92=E3=83=AC=E3=82=B9=E3=83=9D?= =?UTF-8?q?=E3=83=B3=E3=82=B7=E3=83=96Web=E3=83=87=E3=82=B6=E3=82=A4?= =?UTF-8?q?=E3=83=B3=E5=AF=BE=E5=BF=9C=E3=81=99=E3=82=8B=20#1065?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MySQL 漏れ修正 --- html/install/sql/create_table_mysqli.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/install/sql/create_table_mysqli.sql b/html/install/sql/create_table_mysqli.sql index b93ade0111..df898f0c23 100644 --- a/html/install/sql/create_table_mysqli.sql +++ b/html/install/sql/create_table_mysqli.sql @@ -826,7 +826,7 @@ CREATE TABLE dtb_templates ( template_name text, create_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, update_date timestamp NOT NULL, - PRIMARY KEY (template_code(255)) + PRIMARY KEY (template_code(255), device_type_id) ); CREATE TABLE dtb_maker ( From 993d24989541546f45fc78f22dc3327846c17662 Mon Sep 17 00:00:00 2001 From: Seasoft Date: Wed, 18 Dec 2024 11:05:53 +0900 Subject: [PATCH 07/11] =?UTF-8?q?default=20=E3=83=86=E3=83=B3=E3=83=97?= =?UTF-8?q?=E3=83=AC=E3=83=BC=E3=83=88=E3=82=92=E3=83=AC=E3=82=B9=E3=83=9D?= =?UTF-8?q?=E3=83=B3=E3=82=B7=E3=83=96Web=E3=83=87=E3=82=B6=E3=82=A4?= =?UTF-8?q?=E3=83=B3=E5=AF=BE=E5=BF=9C=E3=81=99=E3=82=8B=20#1065?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit テストを調整する。 --- e2e-tests/test/front_login/contact.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e2e-tests/test/front_login/contact.test.ts b/e2e-tests/test/front_login/contact.test.ts index dcd3c3d72a..7849a51646 100644 --- a/e2e-tests/test/front_login/contact.test.ts +++ b/e2e-tests/test/front_login/contact.test.ts @@ -137,7 +137,7 @@ test.describe.serial('お問い合わせページのテストをします', () = await page.goto(PlaywrightConfig?.use?.baseURL ?? '/'); // ログアウトしてしまう場合があるので一旦トップへ遷移する await page.goto(url); await page.click('input[name=confirm]'); - await expect(page.locator('span.attention >> nth=13')).toContainText('※ お問い合わせ内容が入力されていません。'); + await expect(page.locator('table[summary="お問い合わせ"] span.attention >> nth=12')).toContainText('※ お問い合わせ内容が入力されていません。'); await expect(page.locator('textarea[name=contents]')).toHaveAttribute('style', 'background-color:#ffe8e8; ime-mode: active;'); }); }); From 3e7477cff44fc62229de53fc99d8aca5dde77372 Mon Sep 17 00:00:00 2001 From: Seasoft Date: Tue, 17 Dec 2024 19:18:25 +0900 Subject: [PATCH 08/11] =?UTF-8?q?eccube=5Finstall.sh=20SQL=E3=82=A8?= =?UTF-8?q?=E3=83=A9=E3=83=BC=E3=81=A7=E5=81=9C=E6=AD=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- eccube_install.sh | 16 +-- html/install/sql/drop_table.sql | 196 ++++++++++++++++---------------- 2 files changed, 106 insertions(+), 106 deletions(-) diff --git a/eccube_install.sh b/eccube_install.sh index 81290dd605..36bd35ce7a 100755 --- a/eccube_install.sh +++ b/eccube_install.sh @@ -232,29 +232,29 @@ case "${DBTYPE}" in "heroku" ) # PostgreSQL echo "create table..." - ${PSQL} -h ${DBSERVER} -U ${DBUSER} -p ${DBPORT} -f ${SQL_DIR}/create_table_pgsql.sql ${DBNAME} + ${PSQL} -h ${DBSERVER} -U ${DBUSER} -p ${DBPORT} -v ON_ERROR_STOP=1 -f ${SQL_DIR}/create_table_pgsql.sql ${DBNAME} echo "insert data..." - ${PSQL} -h ${DBSERVER} -U ${DBUSER} -p ${DBPORT} -f ${SQL_DIR}/insert_data.sql ${DBNAME} + ${PSQL} -h ${DBSERVER} -U ${DBUSER} -p ${DBPORT} -v ON_ERROR_STOP=1 -f ${SQL_DIR}/insert_data.sql ${DBNAME} echo "create sequence table..." create_sequence_tables echo "execute optional SQL..." - get_optional_sql | ${PSQL} -h ${DBSERVER} -U ${DBUSER} -p ${DBPORT} ${DBNAME} + get_optional_sql | ${PSQL} -h ${DBSERVER} -U ${DBUSER} -p ${DBPORT} -v ON_ERROR_STOP=1 ${DBNAME} DBTYPE="pgsql" ;; "appveyor" | "pgsql" ) # PostgreSQL echo "dropdb..." - ${PSQL} -h ${DBSERVER} -U ${DBUSER} -p ${DBPORT} -c "DROP DATABASE IF EXISTS ${DBNAME};" template1 + ${PSQL} -h ${DBSERVER} -U ${DBUSER} -p ${DBPORT} -v ON_ERROR_STOP=1 -c "DROP DATABASE IF EXISTS ${DBNAME};" template1 echo "createdb..." - ${PSQL} -h ${DBSERVER} -U ${DBUSER} -p ${DBPORT} -c "CREATE DATABASE ${DBNAME};" template1 + ${PSQL} -h ${DBSERVER} -U ${DBUSER} -p ${DBPORT} -v ON_ERROR_STOP=1 -c "CREATE DATABASE ${DBNAME};" template1 echo "create table..." - ${PSQL} -h ${DBSERVER} -U ${DBUSER} -p ${DBPORT} -f ${SQL_DIR}/create_table_pgsql.sql ${DBNAME} + ${PSQL} -h ${DBSERVER} -U ${DBUSER} -p ${DBPORT} -v ON_ERROR_STOP=1 -f ${SQL_DIR}/create_table_pgsql.sql ${DBNAME} echo "insert data..." - ${PSQL} -h ${DBSERVER} -U ${DBUSER} -p ${DBPORT} -f ${SQL_DIR}/insert_data.sql ${DBNAME} + ${PSQL} -h ${DBSERVER} -U ${DBUSER} -p ${DBPORT} -v ON_ERROR_STOP=1 -f ${SQL_DIR}/insert_data.sql ${DBNAME} echo "create sequence table..." create_sequence_tables echo "execute optional SQL..." - get_optional_sql | ${PSQL} -h ${DBSERVER} -U ${DBUSER} -p ${DBPORT} ${DBNAME} + get_optional_sql | ${PSQL} -h ${DBSERVER} -U ${DBUSER} -p ${DBPORT} -v ON_ERROR_STOP=1 ${DBNAME} DBTYPE="pgsql" ;; "mysql" ) diff --git a/html/install/sql/drop_table.sql b/html/install/sql/drop_table.sql index 8d8166a684..ee04753a38 100644 --- a/html/install/sql/drop_table.sql +++ b/html/install/sql/drop_table.sql @@ -1,98 +1,98 @@ -DROP TABLE dtb_kiyaku; -DROP TABLE mtb_zip; -DROP TABLE dtb_update; -DROP TABLE dtb_baseinfo; -DROP TABLE dtb_deliv; -DROP TABLE dtb_delivtime; -DROP TABLE dtb_delivfee; -DROP TABLE dtb_payment; -DROP TABLE dtb_mailtemplate; -DROP TABLE dtb_send_history; -DROP TABLE dtb_send_customer; -DROP TABLE dtb_product_categories; -DROP TABLE dtb_products_class; -DROP TABLE dtb_products; -DROP TABLE dtb_product_status; -DROP TABLE dtb_class; -DROP TABLE dtb_classcategory; -DROP TABLE dtb_category; -DROP TABLE dtb_recommend_products; -DROP TABLE dtb_review; -DROP TABLE dtb_category_count; -DROP TABLE dtb_category_total_count; -DROP TABLE dtb_customer_reading; -DROP TABLE mtb_customer_status; -DROP TABLE dtb_news; -DROP TABLE dtb_best_products; -DROP TABLE dtb_mail_history; -DROP TABLE dtb_customer; -DROP TABLE dtb_order; -DROP TABLE dtb_order_temp; -DROP TABLE dtb_shipping; -DROP TABLE dtb_shipment_item; -DROP TABLE dtb_other_deliv; -DROP TABLE dtb_order_detail; -DROP TABLE mtb_pref; -DROP TABLE dtb_member; -DROP TABLE dtb_pagelayout; -DROP TABLE dtb_bloc; -DROP TABLE dtb_blocposition; -DROP TABLE dtb_csv; -DROP TABLE dtb_csv_sql; -DROP TABLE dtb_templates; -DROP TABLE dtb_ownersstore_settings; -DROP TABLE dtb_module_update_logs; -DROP TABLE mtb_work; -DROP TABLE mtb_wday; -DROP TABLE mtb_taxrule; -DROP TABLE mtb_target; -DROP TABLE mtb_status_image; -DROP TABLE mtb_status; -DROP TABLE mtb_sex; -DROP TABLE mtb_review_deny_url; -DROP TABLE mtb_reminder; -DROP TABLE mtb_recommend; -DROP TABLE mtb_product_status_color; -DROP TABLE mtb_product_list_max; -DROP TABLE mtb_permission; -DROP TABLE mtb_page_max; -DROP TABLE mtb_order_status_color; -DROP TABLE mtb_order_status; -DROP TABLE mtb_customer_order_status; -DROP TABLE mtb_mail_type; -DROP TABLE mtb_mail_tpl_path; -DROP TABLE mtb_mail_template; -DROP TABLE mtb_mail_magazine_type; -DROP TABLE mtb_magazine_type; -DROP TABLE mtb_mobile_domain; -DROP TABLE mtb_job; -DROP TABLE mtb_disp; -DROP TABLE mtb_disable_logout; -DROP TABLE mtb_delivery_date; -DROP TABLE mtb_db; -DROP TABLE mtb_convenience; -DROP TABLE mtb_conveni_message; -DROP TABLE mtb_constants; -DROP TABLE mtb_authority; -DROP TABLE mtb_allowed_tag; -DROP TABLE mtb_ownersstore_err; -DROP TABLE dtb_maker; -DROP TABLE dtb_maker_count; -DROP TABLE dtb_holiday; -DROP TABLE dtb_customer_favorite_products; -DROP TABLE mtb_product_type; -DROP TABLE mtb_device_type; -DROP TABLE dtb_module; -DROP TABLE dtb_session; -DROP TABLE dtb_mobile_ext_session_id; -DROP TABLE dtb_bkup; -DROP TABLE dtb_plugin; -DROP TABLE dtb_index_list; -DROP TABLE dtb_payment_options; -DROP TABLE dtb_mailmaga_template; -DROP TABLE mtb_auth_excludes; -DROP TABLE dtb_plugin_hookpoint; -DROP TABLE dtb_api_config; -DROP TABLE dtb_api_account; -DROP TABLE dtb_tax_rule; -DROP TABLE mtb_country; +DROP TABLE IF EXISTS dtb_kiyaku; +DROP TABLE IF EXISTS mtb_zip; +DROP TABLE IF EXISTS dtb_update; +DROP TABLE IF EXISTS dtb_baseinfo; +DROP TABLE IF EXISTS dtb_deliv; +DROP TABLE IF EXISTS dtb_delivtime; +DROP TABLE IF EXISTS dtb_delivfee; +DROP TABLE IF EXISTS dtb_payment; +DROP TABLE IF EXISTS dtb_mailtemplate; +DROP TABLE IF EXISTS dtb_send_history; +DROP TABLE IF EXISTS dtb_send_customer; +DROP TABLE IF EXISTS dtb_product_categories; +DROP TABLE IF EXISTS dtb_products_class; +DROP TABLE IF EXISTS dtb_products; +DROP TABLE IF EXISTS dtb_product_status; +DROP TABLE IF EXISTS dtb_class; +DROP TABLE IF EXISTS dtb_classcategory; +DROP TABLE IF EXISTS dtb_category; +DROP TABLE IF EXISTS dtb_recommend_products; +DROP TABLE IF EXISTS dtb_review; +DROP TABLE IF EXISTS dtb_category_count; +DROP TABLE IF EXISTS dtb_category_total_count; +DROP TABLE IF EXISTS dtb_customer_reading; +DROP TABLE IF EXISTS mtb_customer_status; +DROP TABLE IF EXISTS dtb_news; +DROP TABLE IF EXISTS dtb_best_products; +DROP TABLE IF EXISTS dtb_mail_history; +DROP TABLE IF EXISTS dtb_customer; +DROP TABLE IF EXISTS dtb_order; +DROP TABLE IF EXISTS dtb_order_temp; +DROP TABLE IF EXISTS dtb_shipping; +DROP TABLE IF EXISTS dtb_shipment_item; +DROP TABLE IF EXISTS dtb_other_deliv; +DROP TABLE IF EXISTS dtb_order_detail; +DROP TABLE IF EXISTS mtb_pref; +DROP TABLE IF EXISTS dtb_member; +DROP TABLE IF EXISTS dtb_pagelayout; +DROP TABLE IF EXISTS dtb_bloc; +DROP TABLE IF EXISTS dtb_blocposition; +DROP TABLE IF EXISTS dtb_csv; +DROP TABLE IF EXISTS dtb_csv_sql; +DROP TABLE IF EXISTS dtb_templates; +DROP TABLE IF EXISTS dtb_ownersstore_settings; +DROP TABLE IF EXISTS dtb_module_update_logs; +DROP TABLE IF EXISTS mtb_work; +DROP TABLE IF EXISTS mtb_wday; +DROP TABLE IF EXISTS mtb_taxrule; +DROP TABLE IF EXISTS mtb_target; +DROP TABLE IF EXISTS mtb_status_image; +DROP TABLE IF EXISTS mtb_status; +DROP TABLE IF EXISTS mtb_sex; +DROP TABLE IF EXISTS mtb_review_deny_url; +DROP TABLE IF EXISTS mtb_reminder; +DROP TABLE IF EXISTS mtb_recommend; +DROP TABLE IF EXISTS mtb_product_status_color; +DROP TABLE IF EXISTS mtb_product_list_max; +DROP TABLE IF EXISTS mtb_permission; +DROP TABLE IF EXISTS mtb_page_max; +DROP TABLE IF EXISTS mtb_order_status_color; +DROP TABLE IF EXISTS mtb_order_status; +DROP TABLE IF EXISTS mtb_customer_order_status; +DROP TABLE IF EXISTS mtb_mail_type; +DROP TABLE IF EXISTS mtb_mail_tpl_path; +DROP TABLE IF EXISTS mtb_mail_template; +DROP TABLE IF EXISTS mtb_mail_magazine_type; +DROP TABLE IF EXISTS mtb_magazine_type; +DROP TABLE IF EXISTS mtb_mobile_domain; +DROP TABLE IF EXISTS mtb_job; +DROP TABLE IF EXISTS mtb_disp; +DROP TABLE IF EXISTS mtb_disable_logout; +DROP TABLE IF EXISTS mtb_delivery_date; +DROP TABLE IF EXISTS mtb_db; +DROP TABLE IF EXISTS mtb_convenience; +DROP TABLE IF EXISTS mtb_conveni_message; +DROP TABLE IF EXISTS mtb_constants; +DROP TABLE IF EXISTS mtb_authority; +DROP TABLE IF EXISTS mtb_allowed_tag; +DROP TABLE IF EXISTS mtb_ownersstore_err; +DROP TABLE IF EXISTS dtb_maker; +DROP TABLE IF EXISTS dtb_maker_count; +DROP TABLE IF EXISTS dtb_holiday; +DROP TABLE IF EXISTS dtb_customer_favorite_products; +DROP TABLE IF EXISTS mtb_product_type; +DROP TABLE IF EXISTS mtb_device_type; +DROP TABLE IF EXISTS dtb_module; +DROP TABLE IF EXISTS dtb_session; +DROP TABLE IF EXISTS dtb_mobile_ext_session_id; +DROP TABLE IF EXISTS dtb_bkup; +DROP TABLE IF EXISTS dtb_plugin; +DROP TABLE IF EXISTS dtb_index_list; +DROP TABLE IF EXISTS dtb_payment_options; +DROP TABLE IF EXISTS dtb_mailmaga_template; +DROP TABLE IF EXISTS mtb_auth_excludes; +DROP TABLE IF EXISTS dtb_plugin_hookpoint; +DROP TABLE IF EXISTS dtb_api_config; +DROP TABLE IF EXISTS dtb_api_account; +DROP TABLE IF EXISTS dtb_tax_rule; +DROP TABLE IF EXISTS mtb_country; From a84787d0c36e88ea2aacd088150f4c98d63da0f9 Mon Sep 17 00:00:00 2001 From: Seasoft Date: Mon, 30 Dec 2024 23:07:40 +0900 Subject: [PATCH 09/11] =?UTF-8?q?=E9=87=8D=E8=A4=87=E8=A9=95=E4=BE=A1?= =?UTF-8?q?=E3=82=92=E8=A7=A3=E6=B6=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 本質的には、7403a62 の実装誤り。本来、片方は `ob_get_length()` を評価すべきだが、7403a62 以前の実装内容や必要性に疑義があるため、無駄の解消に留めた。 --- html/define.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/define.php b/html/define.php index 46c57a6edc..24b2daa322 100644 --- a/html/define.php +++ b/html/define.php @@ -20,7 +20,7 @@ require_once $autoload; // bufferを初期化する -while (ob_get_level() > 0 && ob_get_level() > 0) { +while (ob_get_level() > 0) { ob_end_clean(); } From ffc27e350e40ca7c8110693cfa0e52620eb0f921 Mon Sep 17 00:00:00 2001 From: Seasoft Date: Tue, 7 Jan 2025 20:17:01 +0900 Subject: [PATCH 10/11] php-cs-fixer --- data/class/helper/SC_Helper_PageLayout.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/class/helper/SC_Helper_PageLayout.php b/data/class/helper/SC_Helper_PageLayout.php index 5a0499b7db..5330a83cd1 100644 --- a/data/class/helper/SC_Helper_PageLayout.php +++ b/data/class/helper/SC_Helper_PageLayout.php @@ -392,7 +392,7 @@ public function getColumnNum($arrPageLayout) /** * レスポンシブWebデザイン表示か * - * @return boolean + * @return bool */ public static function isResponsive() { From 44d5881fb52bb5b2fda8a018ff6c44f45b6e1a13 Mon Sep 17 00:00:00 2001 From: Seasoft Date: Sat, 4 Jan 2025 14:50:18 +0900 Subject: [PATCH 11/11] =?UTF-8?q?default=20=E3=83=86=E3=83=B3=E3=83=97?= =?UTF-8?q?=E3=83=AC=E3=83=BC=E3=83=88=E3=82=92=E3=83=AC=E3=82=B9=E3=83=9D?= =?UTF-8?q?=E3=83=B3=E3=82=B7=E3=83=96Web=E3=83=87=E3=82=B6=E3=82=A4?= =?UTF-8?q?=E3=83=B3=E5=AF=BE=E5=BF=9C=E3=81=99=E3=82=8B=20#1065?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit add SC_Helper_PageLayoutTest --- tests/class/helper/SC_Helper_PageLayoutTest.php | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 tests/class/helper/SC_Helper_PageLayoutTest.php diff --git a/tests/class/helper/SC_Helper_PageLayoutTest.php b/tests/class/helper/SC_Helper_PageLayoutTest.php new file mode 100644 index 0000000000..c3b9ff8390 --- /dev/null +++ b/tests/class/helper/SC_Helper_PageLayoutTest.php @@ -0,0 +1,9 @@ +assertFalse(SC_Helper_PageLayout::isResponsive()); + } +}