dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[-] FO : Wordwrap on prices in history

Browse Source
This commit is contained in:
gRoussac
2013-11-12 19:17:12 +01:00
parent 75df12dd94
commit c8dfe1c174
3 changed files with 15 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
themes/default/css/history.css
+9 -21
View File
@@ -6,7 +6,7 @@
padding:15px 20px; padding:15px 20px;
background:#ccc background:#ccc
} }
#history #center_column .title_block input { #history #center_column .title_block input {
position: relative; position: relative;
top: -8px; top: -8px;
float:right; float:right;
@@ -21,7 +21,6 @@
top:2px; top:2px;
left:0 left:0
} }
#order-list { #order-list {
margin-bottom:20px; margin-bottom:20px;
width:100%; width:100%;
@@ -36,7 +35,7 @@
background:url(../img/bg_table_th.png) repeat-x 0 0 #999 background:url(../img/bg_table_th.png) repeat-x 0 0 #999
} }
#order-list tr.alternate_item {background-color: #f3f3f3} #order-list tr.alternate_item {background-color: #f3f3f3}
#order-list td { #order-list td {
padding:12px; padding:12px;
border-right:1px solid #e9e9e9; border-right:1px solid #e9e9e9;
border-bottom:1px solid #e9e9e9; border-bottom:1px solid #e9e9e9;
@@ -44,12 +43,15 @@
font-size:12px; font-size:12px;
vertical-align:top vertical-align:top
} }
#order-list td.history_detail {border-right:none;} #order-list td .price, #order-detail-content tbody .price {
white-space: nowrap;
}
#order-list td.history_detail {border-right:none;}
#order-list .last_item td {border-bottom:1px solid #999} #order-list .last_item td {border-bottom:1px solid #999}
.adresses_bloc {margin-bottom:20px} .adresses_bloc {margin-bottom:20px}
.adresses_bloc .item {margin-right:60px} .adresses_bloc .item {margin-right:60px}
.detail_step_by_step {width:100%} .detail_step_by_step {width:100%}
.detail_step_by_step tr.last_item td {border-bottom:1px solid #999} .detail_step_by_step tr.last_item td {border-bottom:1px solid #999}
@@ -66,18 +68,4 @@
#sendOrderMessage .textarea textarea { #sendOrderMessage .textarea textarea {
width:100%; width:100%;
border:1px solid #999 border:1px solid #999
} }
themes/default/modules/productcomments/productcomments.tpl
+2 -1
View File
@@ -98,6 +98,7 @@ var moderation_active = {$moderation_active};
<div id="new_comment_form"> <div id="new_comment_form">
<form id="id_new_comment_form" action="#"> <form id="id_new_comment_form" action="#">
<h2 class="title">{l s='Write your review' mod='productcomments'}</h2> <h2 class="title">{l s='Write your review' mod='productcomments'}</h2>
{if isset($product) && $product}
<div class="product clearfix"> <div class="product clearfix">
<img src="{$link->getImageLink($product->link_rewrite, $productcomment_cover, 'home_default')|escape:'html'}" height="{$homeSize.height}" width="{$homeSize.width}" alt="{$product->name|escape:html:'UTF-8'}" /> <img src="{$link->getImageLink($product->link_rewrite, $productcomment_cover, 'home_default')|escape:'html'}" height="{$homeSize.height}" width="{$homeSize.width}" alt="{$product->name|escape:html:'UTF-8'}" />
<div class="product_desc"> <div class="product_desc">
@@ -105,7 +106,7 @@ var moderation_active = {$moderation_active};
{$product->description_short} {$product->description_short}
</div> </div>
</div> </div>
{/if}
<div class="new_comment_form_content"> <div class="new_comment_form_content">
<h2>{l s='Write your review' mod='productcomments'}</h2> <h2>{l s='Write your review' mod='productcomments'}</h2>
themes/default/order-detail.tpl
+4 -4
View File
@@ -186,7 +186,7 @@
</td> </td>
{/if} {/if}
<td> <td>
<label for="cb_{$product.id_order_detail|intval}"> <label class="price" for="cb_{$product.id_order_detail|intval}">
{if $group_use_tax} {if $group_use_tax}
{convertPriceWithCurrency price=$product.unit_price_tax_incl currency=$currency} {convertPriceWithCurrency price=$product.unit_price_tax_incl currency=$currency}
{else} {else}
@@ -195,7 +195,7 @@
</label> </label>
</td> </td>
<td> <td>
<label for="cb_{$product.id_order_detail|intval}"> <label class="price" for="cb_{$product.id_order_detail|intval}">
{if isset($customizedDatas.$productId.$productAttributeId)} {if isset($customizedDatas.$productId.$productAttributeId)}
{if $group_use_tax} {if $group_use_tax}
{convertPriceWithCurrency price=$product.total_customization_wt currency=$currency} {convertPriceWithCurrency price=$product.total_customization_wt currency=$currency}
@@ -274,7 +274,7 @@
</td> </td>
{/if} {/if}
<td> <td>
<label for="cb_{$product.id_order_detail|intval}"> <label class="price" for="cb_{$product.id_order_detail|intval}">
{if $group_use_tax} {if $group_use_tax}
{convertPriceWithCurrency price=$product.unit_price_tax_incl currency=$currency} {convertPriceWithCurrency price=$product.unit_price_tax_incl currency=$currency}
{else} {else}
@@ -283,7 +283,7 @@
</label> </label>
</td> </td>
<td> <td>
<label for="cb_{$product.id_order_detail|intval}"> <label class="price" for="cb_{$product.id_order_detail|intval}">
{if $group_use_tax} {if $group_use_tax}
{convertPriceWithCurrency price=$product.total_price_tax_incl currency=$currency} {convertPriceWithCurrency price=$product.total_price_tax_incl currency=$currency}
{else} {else}