Changeset 21133 for branches

Timestamp:

2011/08/05 18:12:03 (13 years ago)

Author:

nanasess

bzr:base-revision:

ohkouchi@loop-az.jp-20110805070448-b3ytu1oigu5z16sp

bzr:committer:

Kentaro Ohkouchi <ohkouchi@loop-az.jp>

bzr:file-ids:

data/Smarty/templates/sphone/mypage/history.tpl history.tpl-20101209134550-lsv02w9wikfx9cj3-20
html/user_data/packages/sphone/css/mypage.css 21052@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fversion-2_11-dev%2Fhtml%2Fuser_data%2Fpackages%2Fsphone%2Fcss%2Fmypage.css

bzr:mapping-version:

v4

bzr:merge:

ohkouchi@loop-az.jp-20110805090841-wwg1195wzjsebgwb

bzr:repository-uuid:

1e3b908f-19a9-db11-a64c-001125224ba8

bzr:revision-id:

ohkouchi@loop-az.jp-20110805091200-879che28azsuco3t

bzr:revno:

3836

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-20110805091200-879che28azsuco3t
sha1: fc35ba92cbd90d58aa35eca507c1dc2ac977d06b

bzr:text-parents:

data/Smarty/templates/sphone/mypage/history.tpl svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_11-dev:21107
html/user_data/packages/sphone/css/mypage.css ohkouchi@loop-az.jp-20110804124503-7j3sw9sn2u4myhwv

bzr:timestamp:

2011-08-05 18:12:00.523000002 +0900

bzr:user-agent:

bzr2.3.1+bzr-svn1.1.0dev0

Message:

#1413 購入履歴のレイアウト調整

Location:

branches/version-2_11-dev

Files:

• data/Smarty/templates/sphone/mypage/history.tpl (modified) (1 diff)
• html/user_data/packages/sphone/css/mypage.css (modified) (1 diff)

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

@@ -55 +55 @@
       <!--▼商品 -->
       <!--{foreach from=$tpl_arrOrderDetail item=orderDetail}-->
-        <div class="cartitemBox">
-          <!--{if $item.productsClass.main_image|strlen >= 1}--><a href="<!--{$smarty.const.IMAGE_SAVE_URLPATH}--><!--{$item.productsClass.main_image|sfNoImageMainList|h}-->" rel="external">
-              <img src="<!--{$smarty.const.ROOT_URLPATH}-->resize_image.php?image=<!--{$orderDetail.main_list_image|sfNoImageMainList|h}-->&amp;width=80&amp;height=80" alt="<!--{$orderDetail.product_name|h}-->" class="photoL" /></a>
-          <!--{else}-->
-              <img src="<!--{$smarty.const.ROOT_URLPATH}-->resize_image.php?image=<!--{$orderDetail.main_list_image|sfNoImageMainList|h}-->&amp;width=80&amp;height=80" alt="<!--{$orderDetail.product_name|h}-->" class="photoL" />
-          <!--{/if}-->
+        <div>
+            <img src="<!--{$smarty.const.ROOT_URLPATH}-->resize_image.php?image=<!--{$orderDetail.main_list_image|sfNoImageMainList|h}-->&amp;width=80&amp;height=80" alt="<!--{$orderDetail.product_name|h}-->" class="photoL" />
         <div class="cartinContents">
                                 <div>
            <p><em><!--→商品名--><a<!--{if $orderDetail.enable}--> href="<!--{$smarty.const.P_DETAIL_URLPATH}--><!--{$orderDetail.product_id|u}-->"<!--{/if}--> rel="external"><!--{$orderDetail.product_name|h}--></a><!--←商品名--></em></p>
-                                            <p>
-              <!--→商品種別-->
-              <!--{if $orderDetail.product_type_id == $smarty.const.PRODUCT_TYPE_DOWNLOAD}-->
-                  <!--{if $orderDetail.is_downloadable}-->
-                      <a target="_self" href="<!--{$smarty.const.ROOT_URLPATH}-->mypage/download.php?order_id=<!--{$tpl_arrOrderData.order_id}-->&amp;product_id=<!--{$orderDetail.product_id}-->&amp;product_class_id=<!--{$orderDetail.product_class_id}-->" rel="external">ダウンロードする</a><br />
-                  <!--{else}-->
-                     <!--{if $orderDetail.payment_date == "" && $orderDetail.effective == "0"}-->
-                         <!--{$arrProductType[$orderDetail.product_type_id]}--><BR />（入金確認中）
-                     <!--{else}-->
-                         <!--{$arrProductType[$orderDetail.product_type_id]}--><BR />（期限切れ）
-                     <!--{/if}-->
-                  <!--{/if}-->
-              <!--{else}-->
-                  <!--{$arrProductType[$orderDetail.product_type_id]}-->
-              <!--{/if}-->
-              <!--←商品種別--><br />
+           <p>
               <!--→金額-->
               <!--{assign var=price value=`$orderDetail.price`}-->
               <!--{assign var=quantity value=`$orderDetail.quantity`}--><span class="mini">価格:</span><!--{$price|number_format|h}-->円<!--←金額-->
-              <span class="mini"><!--{$item.productsClass.name|h}--><br />
-              <!--{if $item.productsClass.classcategory_name1 != ""}-->
-                  <span class="mini"><!--{$item.productsClass.class_name1}-->：<!--{$item.productsClass.classcategory_name1}--></span><br />
-              <!--{/if}-->
-              <!--{if $item.productsClass.classcategory_name2 != ""}-->
-                  <span class="mini"><!--{$item.productsClass.class_name2}-->：<!--{$item.productsClass.classcategory_name2}--></span>
+           </p>
+          <!--→商品種別-->
+          <!--{if $orderDetail.product_type_id == $smarty.const.PRODUCT_TYPE_DOWNLOAD}-->
+          <p id="downloadable">
+              <!--{if $orderDetail.is_downloadable}-->
+                  <a target="_self" href="<!--{$smarty.const.ROOT_URLPATH}-->mypage/download.php?order_id=<!--{$tpl_arrOrderData.order_id}-->&amp;product_id=<!--{$orderDetail.product_id}-->&amp;product_class_id=<!--{$orderDetail.product_class_id}-->" rel="external">ダウンロード</a><br />
+              <!--{else}-->
+                 <!--{if $orderDetail.payment_date == "" && $orderDetail.effective == "0"}-->
+                     <!--{$arrProductType[$orderDetail.product_type_id]}--><br />（入金確認中）
+                 <!--{else}-->
+                     <!--{$arrProductType[$orderDetail.product_type_id]}--><br />（期限切れ）
+                 <!--{/if}-->
               <!--{/if}-->
           </p>
+          <!--{/if}-->
+         <!--←商品種別-->
+
                                         </div>
       <ul>

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

@@ -134 +134 @@
 min-height:65px;
 }
-
+#mypagecolumn .cartinContents p#downloadable {
+    margin-top: 0.8em;
+}
 #mypagecolumn .cartinContents ul li.result{
 padding-top:0!important;