Changeset 21169


Ignore:
Timestamp:
2011/08/09 18:52:41 (13 years ago)
Author:
nanasess
bzr:base-revision:
svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_11-dev:21168
bzr:committer:
Kentaro Ohkouchi <ohkouchi@loop-az.jp>
bzr:file-ids:

data/Smarty/templates/sphone/frontparts/bloc/navi_header.tpl 21050@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fversion-2_11-dev%2Fdata%2FSmarty%2Ftemplates%2Fsphone%2Ffrontparts%2Fbloc%2Fnavi_header.tpl
data/Smarty/templates/sphone/mypage/delivery.tpl delivery.tpl-20101209134550-lsv02w9wikfx9cj3-16
data/Smarty/templates/sphone/mypage/favorite.tpl favorite.tpl-20101209134550-lsv02w9wikfx9cj3-19
data/Smarty/templates/sphone/shopping/confirm.tpl confirm.tpl-20101209134550-lsv02w9wikfx9cj3-35
data/Smarty/templates/sphone/shopping/deliv.tpl deliv.tpl-20101209134550-lsv02w9wikfx9cj3-37
data/Smarty/templates/sphone/shopping/payment.tpl payment.tpl-20101209134550-lsv02w9wikfx9cj3-40
data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_NaviHeader.php 21042@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fversion-2_11-dev%2Fdata%2Fclass%2Fpages%2Ffrontparts%2Fbloc%2FLC_Page_FrontParts_Bloc_NaviHeader.php
html/user_data/packages/sphone/css/common.css 19839@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fversion-2_5-dev%2Fhtml%2Fuser_data%2Fpackages%2Fsphone%2Fcss%2Fcommon.css
html/user_data/packages/sphone/css/contents.css 21052@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fversion-2_11-dev%2Fhtml%2Fuser_data%2Fpackages%2Fsphone%2Fcss%2Fcontents.css
bzr:mapping-version:
v4
bzr:merge:

ohkouchi@loop-az.jp-20110809094821-16ktnlm8jeoga9ft
bzr:repository-uuid:
1e3b908f-19a9-db11-a64c-001125224ba8
bzr:revision-id:
ohkouchi@loop-az.jp-20110809095238-ji3ibe2z04u0lb0p
bzr:revno:
3872
bzr:revprop:branch-nick:
branches/version-2_11-dev
bzr:root:
branches/version-2_11-dev
bzr:testament:

bazaar-ng testament short form 2.1
revision-id: ohkouchi@loop-az.jp-20110809095238-ji3ibe2z04u0lb0p
sha1: 8a668bcd9d0f4384d673dd90ae82193b762eecd4
bzr:text-parents:

data/Smarty/templates/sphone/frontparts/bloc/navi_header.tpl ohkouchi@loop-az.jp-20110808131714-fekw8oo39uqbn2x5
data/Smarty/templates/sphone/mypage/delivery.tpl svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_11-dev:21107
data/Smarty/templates/sphone/mypage/favorite.tpl ohkouchi@loop-az.jp-20110804121602-8bnaips8h02f50m9
data/Smarty/templates/sphone/shopping/confirm.tpl svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_11-dev:21148
data/Smarty/templates/sphone/shopping/payment.tpl ohkouchi@loop-az.jp-20110809023828-x8jlls90u1ekhaya
data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_NaviHeader.php svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_11-dev:21112
html/user_data/packages/sphone/css/common.css ohkouchi@loop-az.jp-20110809071539-56bzemay7ku31tuc
bzr:timestamp:
2011-08-09 18:52:38.288000107 +0900
bzr:user-agent:
bzr2.3.1+bzr-svn1.1.0dev0
Message:

#1413 レイアウト微調整

Location:
branches/version-2_11-dev
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • branches/version-2_11-dev/data/Smarty/templates/sphone/frontparts/bloc/navi_header.tpl

    r21154 r21169  
    4646    <h2><a rel="external" href="<!--{$smarty.const.CART_URLPATH|h}-->">カートの中</a></h2> 
    4747    <!--{foreach from=$arrCartList item=key}--> 
    48         <div class="normal_item"> 
     48        <div class="product_type"> 
     49            <!--{if count($arrCartList) > 1}--> 
    4950            <p><span class="product_type">[<!--{$key.productTypeName|h}-->]</span></p> 
     51            <!--{/if}--> 
    5052            <p><span class="mini">商品数:</span><span class="quantity"><!--{$key.quantity|number_format}--></span>点<br /> 
    5153                <span class="mini">合計:</span><span class="money"><!--{$key.totalInctax|number_format}--></span>円(税込)</p> 
    5254            <hr class="dashed" /> 
    53             <!--{if $freeRule > 0 && $key.productTypeName|h == "通常商品"}--> 
     55            <!--{if $freeRule > 0 && $key.productTypeId|h != $smarty.const.PRODUCT_TYPE_DOWNLOAD}--> 
    5456                <!--{if $key.delivFree > 0}--> 
    55                     <p class="attention free_money_area">あと<span class="free_money"><!--{$key.delivFree|number_format}--></span>円で送料無料！</p> 
     57                    <p class="attention free_money_area">あと<span class="free_money"><!--{$key.delivFree|number_format}--></span>円で送料無料</p> 
    5658                <!--{else}--> 
    57                     <p class="attention free_money_area">現在、送料無料です！</p> 
     59                    <p class="attention free_money_area">現在、送料無料です</p> 
    5860                <!--{/if}--> 
    5961            <!--{/if}--> 

  • branches/version-2_11-dev/data/Smarty/templates/sphone/mypage/delivery.tpl

    r21107 r21169  
    3030    <!--★インフォメーション★--> 
    3131    <div class="information"> 
    32         <p><span class="attention">※</span>は必須入力項目です。<p> 
    33         <p>最大<span class="attention"><!--{$smarty.const.DELIV_ADDR_MAX|h}-->件</span>まで登録できます。</p>   
     32        <p>登録住所一覧です。<p> 
     33        <p>最大<!--{$smarty.const.DELIV_ADDR_MAX|h}-->件まで登録できます。</p>   
    3434    </div> 
    3535    <!--{if $tpl_linemax < $smarty.const.DELIV_ADDR_MAX}--> 

  • branches/version-2_11-dev/data/Smarty/templates/sphone/mypage/favorite.tpl

    r21128 r21169  
    3737      <div class="information"> 
    3838           <p><span class="attention"><span id="productscount"><!--{$tpl_linemax}--></span>件</span>のお気に入りがあります。</p> 
    39            <p>最大20件まで登録できます。</p>   
    4039      </div> 
    4140 

  • branches/version-2_11-dev/data/Smarty/templates/sphone/shopping/confirm.tpl

    r21148 r21169  
    199199    <!--{/if}--> 
    200200          </dl> 
    201 <!--▼カートの中の商品一覧 --> 
     201  <!--{if $is_multiple}--> 
     202  <!--▼カートの中の商品一覧 --> 
    202203     <div class="cartcartconfirmarea"> 
    203204  <!--{foreach item=item from=$shippingItem.shipment_item}--> 
    … …  
    230231</div> 
    231232<!--▲カートの中の商品一覧ここまで --> 
     233<!--{/if}--> 
    232234 
    233235</div><!--▲formBox --> 

  • branches/version-2_11-dev/data/Smarty/templates/sphone/shopping/deliv.tpl

    r21168 r21169  
    8989</div><!--▲formBox --> 
    9090 
    91  
    92  
    9391<ul class="btn_btm"> 
    9492 <li><a rel="external" href="javascript:void(document.form1.submit());" class="btn">選択したお届け先に送る</a></li> 

  • branches/version-2_11-dev/data/Smarty/templates/sphone/shopping/payment.tpl

    r21157 r21169  
    6060                                .text(data.arrPayment[i].payment_method); 
    6161                            // 行 
    62                             var tr = $('<tr />') 
     62                            var li = $('<li />') 
    6363                                .append($('<td />') 
    6464                                        .addClass('centertd') 
    65                                         .append(radio)) 
    66                                 .append($('<td />').append(label)); 
    67  
    68                             // 支払方法の画像が登録されている場合は表示 
    69                             if (data.img_show) { 
    70                                 var payment_image = data.arrPayment[i].payment_image; 
    71                                 $('th#payment_method').attr('colspan', 3); 
    72                                 if (payment_image) { 
    73                                     var img = $('<img />').attr('src', '<!--{$smarty.const.IMAGE_SAVE_URLPATH}-->' + payment_image); 
    74                                     tr.append($('<td />').append(img)); 
    75                                 } else { 
    76                                     tr.append($('<td />')); 
    77                                 } 
    78                             } else { 
    79                                 $('th#payment_method').attr('colspan', 2); 
    80                             } 
    81  
    82                             tr.appendTo(payment); 
     65                                        .append(radio) 
     66                                        .append(label)); 
     67 
     68                            li.appendTo(payment); 
    8369                        } 
    8470                        // お届け時間を生成 
    … …  
    171157    <p class="attention"><!--{$arrErr[$key]}--></p> 
    172158  <!--{/if}--> 
     159  <p class="non-select-msg information">まずはじめに、配送方法を選択ください。</p> 
    173160  <ul id="payment"> 
    174161  <!--{section name=cnt loop=$arrPayment}--> 
    … …  
    197184  
    198185 <!--▼フォームボックスここから --> 
     186 <!--{if $is_multiple}--> 
    199187  <div class="formBox"> 
    200  
    201188    <div class="box_header"> 
    202189      お届け先<!--{$smarty.foreach.shippingItem.iteration}--> 
    203         </div> 
    204  
    205   <!--{if $is_multiple}--> 
     190    </div> 
     191 
    206192     <div class="innerBox"> 
    207193       <!--{$shippingItem.shipping_name01}--><!--{$shippingItem.shipping_name02}--><br /> 
    208194        <span class="mini"><!--{$arrPref[$shippingItem.shipping_pref]}--><!--{$shippingItem.shipping_addr01}--><!--{$shippingItem.shipping_addr02}--></span> 
    209           </div> 
    210   <!--{/if}--> 
     195     </div> 
     196 <!--{else}--> 
     197   <div class="time_select"> 
     198 <!--{/if}--> 
    211199       <div class="btn_area_btm"> 
    212200       <!--★お届け日★--> 

  • branches/version-2_11-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_NaviHeader.php

    r21112 r21169  
    100100            $cartList[$key]['totalTax'] = $objCart->getAllProductsTax($key); //消費税合計 
    101101            $cartList[$key]['quantity'] = $objCart->getTotalQuantity($key); //商品数量合計 
     102            $cartList[$key]['productTypeId'] = $key; // 商品種別ID 
    102103        } 
    103104         

  • branches/version-2_11-dev/html/user_data/packages/sphone/css/common.css

    r21164 r21169  
    466466-moz-border-radius: 5px; 
    467467} 
     468.popup_cart .product_type { 
     469margin-bottom: 5px; 
     470} 
     471.popup_cart div:last-child { 
     472margin-bottom: 0; 
     473} 
    468474.popup_mypage a,.popup_cart a{ 
    469475text-decoration:underline; 

  • branches/version-2_11-dev/html/user_data/packages/sphone/css/contents.css

    r21168 r21169  
    338338margin-bottom:6px; 
    339339} 
     340.pay_area .attention, 
     341.pay_area2 .attention { 
     342margin-left: 10px; 
     343} 
    340344.pay_area02 select:first-child{ 
    341345margin-bottom:12px; 
    … …  
    358362width:95%; 
    359363} 
    360  
     364.non-select-msg { 
     365margin: 20px 0; 
     366border: none; 
     367} 
     368.time_select { 
     369margin-top:5px; 
     370margin-bottom:15px; 
     371} 
    361372/* ----------------------------------------------- 
    362373ご注文内容のご確認 
    … …  
    464475} 
    465476 
    466 /* 
    467477.deliv_confirm dd:last-child{ 
    468478border-bottom:none; 
    469 }*/ 
     479} 
    470480 
    471481.deliv_confirm dd p.deliv_name{ 
Note: See TracChangeset for help on using the changeset viewer.