Skip to content

Commit

Permalink
Merge branch 'master' into fix/typo
Browse files Browse the repository at this point in the history
  • Loading branch information
@nanasess
nanasess authored Sep 1, 2024
2 parents f267ac4 + d5c198a commit 6aa869c
Show file tree
Hide file tree
Showing 41 changed files with 107 additions and 108 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ RUN apt-get update \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*

RUN docker-php-ext-configure gd ${GD_OPTIONS} && docker-php-ext-install ${EXT_INSTALL_ARGS}
RUN docker-php-ext-configure gd ${GD_OPTIONS} && docker-php-ext-install -j$(nproc) ${EXT_INSTALL_ARGS}
RUN if [[ ${APCU} ]]; then pecl install ${APCU} && docker-php-ext-enable apcu; fi

# composer
Expand Down
10 changes: 5 additions & 5 deletions composer.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion data/Smarty/templates/default/entry/kiyaku.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
</a>
</li>
<li>
<a href="<!--{$smarty.const.ENTRY_URL}-->">
<a href="<!--{$smarty.const.ENTRY_URL}-->" rel="nofollow">
<img class="hover_change_image" src="<!--{$TPL_URLPATH}-->img/button/btn_entry_agree.jpg" alt="同意して会員登録へ" />
</a>
</li>
Expand Down
2 changes: 1 addition & 1 deletion data/Smarty/templates/sphone/abouts/index.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@

<!--{if strlen($arrSiteInfo.email02)}-->
<dt>メールアドレス</dt>
<dd><a href="mailto:<!--{$arrSiteInfo.email02|escape:'hex'}-->" rel="external"><!--{$arrSiteInfo.email02|escape:'hexentity'}--></a></dd>
<dd><a href="mailto:<!--{$arrSiteInfo.email02|escape:'hex'}-->"><!--{$arrSiteInfo.email02|escape:'hexentity'}--></a></dd>
<!--{/if}-->

<!--{if strlen($arrSiteInfo.business_hour)}-->
Expand Down
4 changes: 2 additions & 2 deletions data/Smarty/templates/sphone/cart/index.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
<!--{if $arrInfo.free_rule > 0}-->
<div class="bubbleBox">
<div class="bubble_announce clearfix">
<p><a rel="external" href="<!--{$tpl_prev_url|h}-->">
<p><a href="<!--{$tpl_prev_url|h}-->">
<!--{if !$arrData[$key].is_deliv_free}-->
あと「<span class="price"><!--{$tpl_deliv_free[$key]|n2s}-->円</span>」で<span class="price">送料無料！！</span>
<!--{else}-->
Expand Down Expand Up @@ -157,7 +157,7 @@
<p class="empty"><em>※ 現在カート内に商品はございません。</em></p>
<!--{/if}-->

<p><a rel="external" href="<!--{$smarty.const.TOP_URL}-->" class="btn_sub">お買い物を続ける</a></p>
<p><a href="<!--{$smarty.const.TOP_URL}-->" class="btn_sub">お買い物を続ける</a></p>

</div><!-- /.form_area -->

Expand Down
2 changes: 1 addition & 1 deletion data/Smarty/templates/sphone/entry/complete.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<hr>
<div id="completetext">
<p>今後ともご愛顧賜りますよう、よろしくお願い申し上げます。</p>
<a rel="external" class="btn_s btn_sub" href="<!--{$smarty.const.TOP_URL}-->">トップページへ</a>
<a class="btn_s btn_sub" href="<!--{$smarty.const.TOP_URL}-->">トップページへ</a>
</div>
</section>

Expand Down
8 changes: 4 additions & 4 deletions data/Smarty/templates/sphone/entry/kiyaku.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,17 @@

<div class="btn_area">
<ul>
<li><a href="<!--{$smarty.const.ENTRY_URL}-->" class="btn" rel="external">同意して会員登録へ</a></li>
<li><a href="<!--{$smarty.const.TOP_URL}-->" class="btn_back" rel="external">同意しない</a></li>
<li><a href="<!--{$smarty.const.ENTRY_URL}-->" class="btn" rel="nofollow">同意して会員登録へ</a></li>
<li><a href="<!--{$smarty.const.TOP_URL}-->" class="btn_back">同意しない</a></li>
</ul>
</div>

<div id="kiyaku_text"><!--{$tpl_kiyaku_text|nl2br}--></div>

<div class="btn_area">
<ul class="btn_btm">
<li><a href="<!--{$smarty.const.ENTRY_URL}-->" class="btn" rel="external">同意して会員登録へ</a></li>
<li><a href="<!--{$smarty.const.TOP_URL}-->" class="btn_back" rel="external">同意しない</a></li>
<li><a href="<!--{$smarty.const.ENTRY_URL}-->" class="btn" rel="nofollow">同意して会員登録へ</a></li>
<li><a href="<!--{$smarty.const.TOP_URL}-->" class="btn_back">同意しない</a></li>
</ul>
</div>
</section>
Expand Down
8 changes: 4 additions & 4 deletions data/Smarty/templates/sphone/footer.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@

<nav class="guide_area">
<p>
<a rel="external" href="<!--{$smarty.const.HTTP_URL}-->abouts/<!--{$smarty.const.DIR_INDEX_PATH|h}-->">当サイトについて</a>
<a rel="external" href="<!--{$smarty.const.HTTPS_URL}-->contact/<!--{$smarty.const.DIR_INDEX_PATH|h}-->">お問い合わせ</a><br />
<a rel="external" href="<!--{$smarty.const.HTTP_URL}-->order/<!--{$smarty.const.DIR_INDEX_PATH|h}-->">特定商取引法に基づく表記</a>
<a rel="external" href="<!--{$smarty.const.HTTP_URL}-->guide/privacy.php">プライバシーポリシー</a>
<a href="<!--{$smarty.const.HTTP_URL}-->abouts/<!--{$smarty.const.DIR_INDEX_PATH|h}-->">当サイトについて</a>
<a href="<!--{$smarty.const.HTTPS_URL}-->contact/<!--{$smarty.const.DIR_INDEX_PATH|h}-->">お問い合わせ</a><br />
<a href="<!--{$smarty.const.HTTP_URL}-->order/<!--{$smarty.const.DIR_INDEX_PATH|h}-->">特定商取引法に基づく表記</a>
<a href="<!--{$smarty.const.HTTP_URL}-->guide/privacy.php">プライバシーポリシー</a>
</p>
</nav>

Expand Down
2 changes: 1 addition & 1 deletion data/Smarty/templates/sphone/forgot/complete.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
</div>

<div class="btn_area">
<p><a rel="external" href="<!--{$smarty.const.HTTPS_URL}-->mypage/login.php" class="btn_sub btn_close">ログイン画面へ</a></p>
<p><a href="<!--{$smarty.const.HTTPS_URL}-->mypage/login.php" class="btn_sub btn_close">ログイン画面へ</a></p>
</div>
</form>
</section>
2 changes: 1 addition & 1 deletion data/Smarty/templates/sphone/frontparts/bloc/category_tree_fork.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<ul <!--{if $treeID != ""}-->id="<!--{$treeID}-->"<!--{/if}--> style="<!--{if $level > 5 || !$display}-->display: none;<!--{/if}-->">
<!--{foreach from=$children item=child}-->
<li class="level<!--{$child.level}--><!--{if in_array($child.category_id, $tpl_category_id)}--> onmark<!--{/if}-->">
<span class="category_header"></span><span class="category_body"><a rel="external" href="<!--{$smarty.const.ROOT_URLPATH}-->products/list.php?category_id=<!--{$child.category_id}-->"<!--{if in_array($child.category_id, $tpl_category_id)}--> class="onlink"<!--{/if}-->><!--{$child.category_name|h}-->(<!--{$child.product_count|default:0}-->)</a></span>
<span class="category_header"></span><span class="category_body"><a href="<!--{$smarty.const.ROOT_URLPATH}-->products/list.php?category_id=<!--{$child.category_id}-->"<!--{if in_array($child.category_id, $tpl_category_id)}--> class="onlink"<!--{/if}-->><!--{$child.category_name|h}-->(<!--{$child.product_count|default:0}-->)</a></span>
<!--{if in_array($child.category_id, $arrParentID)}-->
<!--{assign var=disp_child value=1}-->
<!--{else}-->
Expand Down
8 changes: 4 additions & 4 deletions data/Smarty/templates/sphone/frontparts/bloc/login.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@
<nav class="top_menu clearfix">
<!--{if $tpl_login}-->
<ul>
<li><a rel="external" href="javascript:void(document.login_form_bloc.submit())"><img src="<!--{$TPL_URLPATH}-->img/icon/ico_login.png" width="22" height="21" alt="ログアウト" />ログアウト</a></li>
<li><a rel="external" href="<!--{$smarty.const.HTTPS_URL}-->mypage/login.php" data-transition="slideup"><img src="<!--{$TPL_URLPATH}-->img/icon/ico_mypage.png" width="22" height="21" alt="MYページ" />MYページ</a></li>
<li><a rel="external" href="<!--{$smarty.const.CART_URL|h}-->"><img src="<!--{$TPL_URLPATH}-->img/icon/ico_cart.png" width="22" height="21" alt="カートを見る" />カートを見る</a></li>
<li><a href="javascript:void(document.login_form_bloc.submit())"><img src="<!--{$TPL_URLPATH}-->img/icon/ico_login.png" width="22" height="21" alt="ログアウト" />ログアウト</a></li>
<li><a href="<!--{$smarty.const.HTTPS_URL}-->mypage/login.php" data-transition="slideup"><img src="<!--{$TPL_URLPATH}-->img/icon/ico_mypage.png" width="22" height="21" alt="MYページ" />MYページ</a></li>
<li><a href="<!--{$smarty.const.CART_URL|h}-->"><img src="<!--{$TPL_URLPATH}-->img/icon/ico_cart.png" width="22" height="21" alt="カートを見る" />カートを見る</a></li>
</ul>
<!--{else}-->
<ul>
<li><a href="<!--{$smarty.const.HTTPS_URL}-->mypage/login.php" data-transition="slideup"><img src="<!--{$TPL_URLPATH}-->img/icon/ico_login.png" width="22" height="21" alt="ログイン" />ログイン</a></li>
<li><a href="<!--{$smarty.const.HTTPS_URL}-->mypage/login.php" data-transition="slideup"><img src="<!--{$TPL_URLPATH}-->img/icon/ico_mypage.png" width="22" height="21" alt="MYページ" />MYページ</a></li>
<li><a rel="external" href="<!--{$smarty.const.CART_URL|h}-->"><img src="<!--{$TPL_URLPATH}-->img/icon/ico_cart.png" width="22" height="21" alt="カートを見る" />カートを見る</a></li>
<li><a href="<!--{$smarty.const.CART_URL|h}-->"><img src="<!--{$TPL_URLPATH}-->img/icon/ico_cart.png" width="22" height="21" alt="カートを見る" />カートを見る</a></li>
</ul>
<!--{/if}-->
</nav>
Expand Down
6 changes: 3 additions & 3 deletions data/Smarty/templates/sphone/frontparts/bloc/login_footer.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@
<input type="hidden" name="mode" value="logout" />
<input type="hidden" name="url" value="<!--{$smarty.server.SCRIPT_NAME|h}-->" />
</form>
<p>ようこそ <a rel="external" href="<!--{$smarty.const.HTTPS_URL}-->mypage/login.php" data-transition="slideup"><!--{$tpl_name1|h}--> <!--{$tpl_name2|h}-->さん</a></p>
<p>ようこそ <a href="<!--{$smarty.const.HTTPS_URL}-->mypage/login.php" data-transition="slideup"><!--{$tpl_name1|h}--> <!--{$tpl_name2|h}-->さん</a></p>
<!--{if $smarty.const.USE_POINT !== false}-->
<p>所持ポイント<!--{$tpl_user_point|n2s|default:0}-->pt</p>
<!--{/if}-->
<p><a rel="external" href="javascript:void(document.login_form_footer.submit())" class="btn_btm">ログアウト</a></p>
<p><a href="javascript:void(document.login_form_footer.submit())" class="btn_btm">ログアウト</a></p>
<!--{else}-->
<p>ようこそ ゲストさん</p>
<p><a rel="external" href="<!--{$smarty.const.HTTPS_URL}-->entry/kiyaku.php" class="btn_btm">新規会員登録</a></p>
<p><a href="<!--{$smarty.const.HTTPS_URL}-->entry/kiyaku.php" class="btn_btm">新規会員登録</a></p>
<!--{/if}-->
</section>
4 changes: 2 additions & 2 deletions data/Smarty/templates/sphone/frontparts/bloc/login_header.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@

<nav class="header_navi">
<!--{if $tpl_login}-->
<p class="guest">ようこそ <a href="<!--{$smarty.const.HTTPS_URL}-->mypage/login.php" rel="external"><!--{$tpl_name1|h}--> <!--{$tpl_name2|h}-->さん</a></p>
<p class="guest">ようこそ <a href="<!--{$smarty.const.HTTPS_URL}-->mypage/login.php"><!--{$tpl_name1|h}--> <!--{$tpl_name2|h}-->さん</a></p>
<!--{if $smarty.const.USE_POINT !== false}-->
<p>所持ポイント<!--{$tpl_user_point|n2s|default:0}-->pt</p>
<!--{/if}-->
<!--{else}-->
<p class="guest">ようこそ ゲストさん</p>
<p><a rel="external" href="<!--{$smarty.const.HTTPS_URL}-->entry/kiyaku.php">新規会員登録</a></p>
<p><a href="<!--{$smarty.const.HTTPS_URL}-->entry/kiyaku.php">新規会員登録</a></p>
<!--{/if}-->
</nav>
8 changes: 4 additions & 4 deletions data/Smarty/templates/sphone/frontparts/bloc/navi_footer.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@

<ul class="footer_navi">
<!--{if $tpl_login}-->
<li><a rel="external" href="<!--{$smarty.const.HTTPS_URL}-->mypage/login.php"><img src="<!--{$TPL_URLPATH}-->img/button/btn_footer_mypage_off.png" alt="MYページ" width="75" height="50" /></a></li>
<li><a href="<!--{$smarty.const.HTTPS_URL}-->mypage/login.php"><img src="<!--{$TPL_URLPATH}-->img/button/btn_footer_mypage_off.png" alt="MYページ" width="75" height="50" /></a></li>
<!--{if $smarty.const.OPTION_FAVORITE_PRODUCT == 1}-->
<li><a rel="external" href="<!--{$smarty.const.HTTPS_URL}-->mypage/favorite.php"><img src="<!--{$TPL_URLPATH}-->img/button/btn_footer_favorite_off.png" alt="お気に入り" width="75" height="50" /></a></li>
<li><a href="<!--{$smarty.const.HTTPS_URL}-->mypage/favorite.php"><img src="<!--{$TPL_URLPATH}-->img/button/btn_footer_favorite_off.png" alt="お気に入り" width="75" height="50" /></a></li>
<!--{/if}-->
<!--{else}-->
<li><a data-transition="slideup" href="<!--{$smarty.const.HTTPS_URL}-->mypage/login.php"><img src="<!--{$TPL_URLPATH}-->img/button/btn_footer_mypage_off.png" alt="MYページ" width="75" height="50" /></a></li>
<li><a data-transition="slideup" href="<!--{$smarty.const.HTTPS_URL}-->mypage/login.php"><img src="<!--{$TPL_URLPATH}-->img/button/btn_footer_favorite_off.png" alt="お気に入り" width="75" height="50" /></a></li>
<!--{/if}-->
<li><a rel="external" href="<!--{$smarty.const.CART_URL|h}-->"><img src="<!--{$TPL_URLPATH}-->img/button/btn_footer_cart_off.png" alt="カゴの中を見る" width="75" height="50" /></a></li>
<li><a rel="external" href="<!--{$smarty.const.TOP_URL}-->"><img src="<!--{$TPL_URLPATH}-->img/button/btn_footer_toppage_off.png" alt="トップページへ" width="75" height="50" /></a></li>
<li><a href="<!--{$smarty.const.CART_URL|h}-->"><img src="<!--{$TPL_URLPATH}-->img/button/btn_footer_cart_off.png" alt="カゴの中を見る" width="75" height="50" /></a></li>
<li><a href="<!--{$smarty.const.TOP_URL}-->"><img src="<!--{$TPL_URLPATH}-->img/button/btn_footer_toppage_off.png" alt="トップページへ" width="75" height="50" /></a></li>
</ul>
6 changes: 3 additions & 3 deletions data/Smarty/templates/sphone/frontparts/bloc/navi_header.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,20 +30,20 @@
<div class="popup_mypage">
<!--{if $tpl_login}-->
<p><span class="mini">ようこそ</span><br />
<a href="<!--{$smarty.const.HTTPS_URL}-->mypage/login.php" rel="external"><!--{$tpl_name1|h}--> <!--{$tpl_name2|h}-->さん</a></p>
<a href="<!--{$smarty.const.HTTPS_URL}-->mypage/login.php"><!--{$tpl_name1|h}--> <!--{$tpl_name2|h}-->さん</a></p>
<!--{if $smarty.const.USE_POINT !== false}-->
<p>所持ポイント<!--{$tpl_user_point|n2s|default:0}-->pt</p>
<!--{/if}-->
<!--{else}-->
<p>ようこそ<br />
ゲストさん</p>
<p><a href="<!--{$smarty.const.HTTPS_URL}-->mypage/login.php" rel="external">ログイン</a></p>
<p><a href="<!--{$smarty.const.HTTPS_URL}-->mypage/login.php">ログイン</a></p>
<!--{/if}-->
</div>

<div class="popup_cart">
<!--{if !empty($arrCartList)}-->
<h2><a rel="external" href="<!--{$smarty.const.CART_URL|h}-->">カートの中</a></h2>
<h2><a href="<!--{$smarty.const.CART_URL|h}-->">カートの中</a></h2>
<!--{foreach from=$arrCartList item=key}-->
<div class="product_type">
<!--{if count($arrCartList) > 1}-->
Expand Down
2 changes: 1 addition & 1 deletion data/Smarty/templates/sphone/frontparts/bloc/recommend.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<div class="recommendblock clearfix">
<img src="<!--{$smarty.const.IMAGE_SAVE_URLPATH}--><!--{$arrBestProducts[cnt].main_list_image|sfNoImageMainList|h}-->" style="max-width: 80px;max-height: 80px;" alt="<!--{$arrBestProducts[cnt].name|h}-->" />
<div class="productContents">
<h3><a rel="external" href="<!--{$smarty.const.P_DETAIL_URLPATH}--><!--{$arrBestProducts[cnt].product_id|u}-->"><!--{$arrBestProducts[cnt].name|h}--></a></h3>
<h3><a href="<!--{$smarty.const.P_DETAIL_URLPATH}--><!--{$arrBestProducts[cnt].product_id|u}-->"><!--{$arrBestProducts[cnt].name|h}--></a></h3>
<p class="mini comment"><!--{$arrBestProducts[cnt].comment|h|nl2br}--></p>
<p class="sale_price">
<span class="mini"><!--{$smarty.const.SALE_PRICE_TITLE|h}-->(税込):</span><span class="price"><!--{$arrBestProducts[cnt].price02_min_inctax|n2s}--> 円</span>
Expand Down
2 changes: 1 addition & 1 deletion data/Smarty/templates/sphone/header.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<!--{strip}-->
<header class="global_header clearfix">
<div id="logo_area">
<a rel="external" href="<!--{$smarty.const.TOP_URL}-->"><img src="<!--{$TPL_URLPATH}-->img/header/logo.png" width="150" height="25" alt="<!--{$arrSiteInfo.shop_name|h}-->" /></a>
<a href="<!--{$smarty.const.TOP_URL}-->"><img src="<!--{$TPL_URLPATH}-->img/header/logo.png" width="150" height="25" alt="<!--{$arrSiteInfo.shop_name|h}-->" /></a>
</div>
<div class="header_utility">
<!--{* ▼HeaderInternal COLUMN *}-->
Expand Down
2 changes: 1 addition & 1 deletion data/Smarty/templates/sphone/mypage/change_confirm.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
<div class="btn_area">
<ul class="btn_btm">
<li><input type="submit" value="完了ページへ" class="btn data-role-none" name="complete" id="complete" /></li>
<li><a class="btn_back" href="Javascript:eccube.setModeAndSubmit('return', '', '');" rel="external">戻る</a></li>
<li><a class="btn_back" href="Javascript:eccube.setModeAndSubmit('return', '', '');">戻る</a></li>
</ul>
</div>
</form>
Expand Down
Loading

0 comments on commit 6aa869c

Please sign in to comment.