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

// Improving delivery option list render

Browse Source
This commit is contained in:
mDeflotte committed 2012-01-25 08:23:28 +00:00
1 parent 262bba848b
commit 40691d2799
3 files changed
+53 -44
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

themes/default/css/global.css
+45 -40
View File
@@ -961,12 +961,11 @@ table#cart_summary .cart_total_price .total_price_container {
/* step 4 - paiement ************************************************************************** */ /* step 4 - paiement ************************************************************************** */
/* #################### CSS MAXENCE ######################## .delivery_options {
#order .delivery_options_address, #order-opc .delivery_options_address { border: 1px solid #BDC2C9;
width: 541px; border-top: 0;
margin-left: 7px;
} }
*/
#order .delivery_options_address h3, #order-opc .delivery_options_address h3 { #order .delivery_options_address h3, #order-opc .delivery_options_address h3 {
/*background: url("../img/table_header.gif") no-repeat; /*background: url("../img/table_header.gif") no-repeat;
color: #374853; color: #374853;
@@ -974,23 +973,24 @@ font-weight: bold;
height: 14px; height: 14px;
padding: 5px 10px; padding: 5px 10px;
margin: 10px 0 0 0;*/ margin: 10px 0 0 0;*/
padding: 6px 11px; padding: 6px 11px;
font-size: 12px; font-size: 12px;
color: #fff; color: #fff;
text-shadow: 0 1px 0 #000; text-shadow: 0 1px 0 #000;
text-transform: uppercase; text-transform: uppercase;
background: none repeat scroll 0 0 #383838; background: none repeat scroll 0 0 #383838;
} }
#order .delivery_option_radio, #order-opc .delivery_option_radio { #order .delivery_option_radio, #order-opc .delivery_option_radio {
float: left; float: left;
margin: 12px; margin: 21px 12px;
} }
#order .delivery_option label, #order-opc .delivery_option label { #order .delivery_option label, #order-opc .delivery_option label {
display: block; display: block;
padding-bottom: 5px; padding-bottom: 5px;
padding-top: 5px;
} }
#order .delivery_option label > table.resume, #order-opc .delivery_option label > table.resume { #order .delivery_option label > table.resume, #order-opc .delivery_option label > table.resume {
height: 40px; height: 46px;
width: 685px; width: 685px;
} }
#order .delivery_option.item, #order-opc .delivery_option.item { #order .delivery_option.item, #order-opc .delivery_option.item {
@@ -1019,15 +1019,9 @@ margin: 10px 0 0 0;*/
width: 160px; width: 160px;
} }
#order .delivery_options_address .delivery_option_logo img, #order-opc .delivery_options_address .delivery_option_logo img { /*height: 40px;*/ } #order .delivery_options_address .delivery_option_logo img, #order-opc .delivery_options_address .delivery_option_logo img { /*height: 40px;*/ }
#order-opc .delivery_option_carrier {
margin: 0 0 0 45px;
padding: 5px;
width: 680px;
background: white;
}
#order .delivery_option_carrier .first_item, #order-opc .delivery_option_carrier .first_item { #order .delivery_option_carrier .first_item, #order-opc .delivery_option_carrier .first_item {
padding:0 0 0 5px; padding: 3px 5px 3px 12px;
background:url(../img/arrow_right_2.png) no-repeat 0 2px background:url(../img/arrow_right_2.png) no-repeat 3px 7px
} }
.order_carrier_content { .order_carrier_content {
@@ -1089,20 +1083,25 @@ margin: 10px 0 0 0;*/
a.iframe {font-weight:bold} a.iframe {font-weight:bold}
.hook_extracarrier {
margin-top: 5px;
padding: 5px;
}
/* step 5 - paiement ************************************************************************** */ /* step 5 - paiement ************************************************************************** */
.paiement_block { .paiement_block {
padding:15px; padding:15px;
border:1px solid #ccc; border:1px solid #ccc;
font-size:12px; font-size:12px;
color:#000; color:#000;
background:#f8f8f8 background:#f8f8f8
} }
.payment_module { .payment_module {
position:relative; position:relative;
padding-top:20px; padding-top:20px;
border-top:1px dotted #ccc; border-top:1px dotted #ccc;
text-transform:uppercase; text-transform:uppercase;
} }
.payment_module a {display:block;} .payment_module a {display:block;}
.payment_module img { .payment_module img {
@@ -1117,10 +1116,10 @@ a.iframe {font-weight:bold}
.payment_module:before, .payment_module:before,
.payment_module:after { .payment_module:after {
content: "."; content: ".";
display: block; display: block;
height: 0; height: 0;
overflow: hidden overflow: hidden
} }
.payment_module:after {clear: both} .payment_module:after {clear: both}
.payment_module {zoom: 1} .payment_module {zoom: 1}
@@ -1169,20 +1168,26 @@ a.iframe {font-weight:bold}
#order-opc #opc_payment_methods {margin-bottom:20px} #order-opc #opc_payment_methods {margin-bottom:20px}
#order-opc #opc_payment_methods #opc_payment_methods-content p{margin:0} #order-opc #opc_payment_methods #opc_payment_methods-content p{margin:0}
#order-opc .delivery_option_carrier td {width:200px} .delivery_option_carrier td {width:200px}
#order-opc .delivery_option_carrier td + td {width:280px;} .delivery_option_carrier td + td {width:280px;}
#order-opc .delivery_option_carrier td + td + td {width:200px} .delivery_option_carrier td + td + td {width:200px}
#order-opc .delivery_option_carrier { .delivery_option_carrier {
margin: 0 0 0 45px; margin: 5px 0 0 45px;
padding: 5px; width: 670px;
width: 680px;
background: white;
display: none; display: none;
} }
#order-opc .delivery_option_carrier.selected { .delivery_option_carrier tr td {
padding: 5px;
}
.delivery_option_carrier.selected {
display: table; display: table;
} }
#order-opc .delivery_option_carrier .first_item {padding:0 0 0 5px} .delivery_option_carrier.not-displayable {
display: none;
}
.delivery_option_title {
font-weight: bold;
}
/* ************************************************************************************************ /* ************************************************************************************************
themes/default/js/cart-summary.js
+2 -1
View File
@@ -616,7 +616,8 @@ function refreshDeliveryOptions()
$.each($('.delivery_option_radio'), function() { $.each($('.delivery_option_radio'), function() {
if ($(this).attr('checked')) if ($(this).attr('checked'))
{ {
$(this).parent().find('.delivery_option_carrier').show(); if ($(this).parent().find('.delivery_option_carrier.not-displayable').length == 0)
$(this).parent().find('.delivery_option_carrier').show();
var carrier_id_list = $(this).val().split(','); var carrier_id_list = $(this).val().split(',');
carrier_id_list.pop(); carrier_id_list.pop();
var it = this; var it = this;
themes/default/order-carrier.tpl
+6 -3
View File
@@ -135,8 +135,11 @@
<td> <td>
{if $option.unique_carrier} {if $option.unique_carrier}
{foreach $option.carrier_list as $carrier} {foreach $option.carrier_list as $carrier}
{$carrier.instance->name} <div class="delivery_option_title">{$carrier.instance->name}</div>
{/foreach} {/foreach}
{if isset($carrier.instance->delay[$cookie->id_lang])}
<div class="delivery_option_delay">{$carrier.instance->delay[$cookie->id_lang]}</div>
{/if}
{/if} {/if}
{if count($option_list) > 1} {if count($option_list) > 1}
{if $option.is_best_grade} {if $option.is_best_grade}
@@ -167,7 +170,7 @@
</td> </td>
</tr> </tr>
</table> </table>
<table class="delivery_option_carrier {if $delivery_option[$id_address] == $key}selected{/if}"> <table class="delivery_option_carrier {if $delivery_option[$id_address] == $key}selected{/if} {if $option.unique_carrier}not-displayable{/if}">
{foreach $option.carrier_list as $carrier} {foreach $option.carrier_list as $carrier}
<tr> <tr>
{if !$option.unique_carrier} {if !$option.unique_carrier}
@@ -194,7 +197,7 @@
</div> </div>
{/foreach} {/foreach}
</div> </div>
<div id="HOOK_EXTRACARRIER_{$id_address}">{$HOOK_EXTRACARRIER_ADDR.$id_address}</div> <div class="hook_extracarrier" id="HOOK_EXTRACARRIER_{$id_address}">{$HOOK_EXTRACARRIER_ADDR.$id_address}</div>
{foreachelse} {foreachelse}
<p class="warning" id="noCarrierWarning"> <p class="warning" id="noCarrierWarning">
{if $cart->isMultiAddressDelivery()} {if $cart->isMultiAddressDelivery()}