From 44549d650f58258beee0dbc815ee4d8f30246599 Mon Sep 17 00:00:00 2001 From: TMMeilleur Date: Wed, 27 Nov 2013 14:02:26 +0200 Subject: [PATCH] fixes 27.11.2013 --- themes/default-bootstrap/css/comparator.css | 5 + themes/default-bootstrap/css/global.css | 37 ++--- themes/default-bootstrap/css/product.css | 3 + .../default-bootstrap/img/addcartloader.gif | Bin 0 -> 6000 bytes .../js/jquery/jquery.uniform-modify.js | 7 + themes/default-bootstrap/lang/en.php | 14 +- .../bankwire/views/templates/hook/payment.tpl | 2 +- .../cheque/views/templates/hook/payment.tpl | 2 +- .../views/templates/hook/my-account.tpl | 2 +- .../productcomments/products-comparison.tpl | 131 ++++++++++++++++++ themes/default-bootstrap/product-list.tpl | 4 +- themes/default-bootstrap/product.tpl | 2 +- .../default-bootstrap/products-comparison.tpl | 2 +- themes/default-bootstrap/sass/comparator.scss | 5 + themes/default-bootstrap/sass/global.scss | 23 +-- themes/default-bootstrap/sass/product.scss | 5 + themes/default-bootstrap/scenes.tpl | 2 +- 17 files changed, 213 insertions(+), 33 deletions(-) create mode 100644 themes/default-bootstrap/img/addcartloader.gif create mode 100644 themes/default-bootstrap/modules/productcomments/products-comparison.tpl diff --git a/themes/default-bootstrap/css/comparator.css b/themes/default-bootstrap/css/comparator.css index 8c5666779..955159f16 100644 --- a/themes/default-bootstrap/css/comparator.css +++ b/themes/default-bootstrap/css/comparator.css @@ -81,6 +81,11 @@ table#product_comparison .comparison_unit_price { color: #333333; font-style: italic; } +table#product_comparison .product-rating { + width: 80px; + margin: 0 auto; + overflow: hidden; +} .ie8 table#product_comparison .product-image-block .product_image img { width: auto; diff --git a/themes/default-bootstrap/css/global.css b/themes/default-bootstrap/css/global.css index 6030df04c..09df5efba 100644 --- a/themes/default-bootstrap/css/global.css +++ b/themes/default-bootstrap/css/global.css @@ -686,7 +686,7 @@ table.table_block td { right: -5px; } -.new { +.new-label { font: 700 15px/18px Arial, Helvetica, sans-serif; color: white; background: #6ad4ff; @@ -706,7 +706,7 @@ table.table_block td { top: 6px; z-index: 1; } -.new:before { +.new-label:before { position: absolute; bottom: -3px; right: 5px; @@ -723,7 +723,7 @@ table.table_block td { -o-transform: rotate(225deg); transform: rotate(225deg); } -.new:after { +.new-label:after { position: absolute; bottom: -3px; left: 4px; @@ -741,7 +741,7 @@ table.table_block td { transform: rotate(145deg); } -.sale { +.sale-label { font: 700 15px/18px Arial, Helvetica, sans-serif; color: white; background: #f13340; @@ -761,7 +761,7 @@ table.table_block td { top: 6px; z-index: 1; } -.sale:before { +.sale-label:before { position: absolute; bottom: -3px; right: 4px; @@ -778,7 +778,7 @@ table.table_block td { -o-transform: rotate(225deg); transform: rotate(225deg); } -.sale:after { +.sale-label:after { position: absolute; bottom: -3px; left: 5px; @@ -796,28 +796,28 @@ table.table_block td { transform: rotate(136deg); } -.ie8 .new { +.ie8 .new-label { left: 0px; top: 0px; width: auto; padding: 5px 15px; } -.ie8 .new:after { +.ie8 .new-label:after { display: none; } -.ie8 .new:before { +.ie8 .new-label:before { display: none; } -.ie8 .sale { +.ie8 .sale-label { right: 0px; top: 0px; width: auto; padding: 5px 15px; } -.ie8 .sale:after { +.ie8 .sale-label:after { display: none; } -.ie8 .sale:before { +.ie8 .sale-label:before { display: none; } .ie8 .new-box { @@ -927,7 +927,7 @@ table.table_block td { } @media (min-width: 768px) { #home-page-tabs > li.active a, #home-page-tabs > li a:hover { - margin: -10px 0; + margin: -9px 0; } } @@ -2365,13 +2365,11 @@ a.price_discount_delete:hover { #cart_summary tbody td.cart_product { padding: 19px; + width: 137px; } #cart_summary tbody td.cart_product img { border: 1px solid #d6d4d4; } -#cart_summary tbody td.cart_unit { - text-align: center; -} #cart_summary tbody td.cart_unit .price span { display: block; } @@ -2382,6 +2380,9 @@ a.price_discount_delete:hover { #cart_summary tbody td.cart_unit .price span.old-price { text-decoration: line-through; } +#cart_summary tbody td.cart_description { + width: 480px; +} #cart_summary tbody td.cart_description small { display: block; padding: 5px 0 0 0; @@ -2683,6 +2684,10 @@ p.payment_module a.cheque:after, p.payment_module a.bankwire:after { p.payment_module a:hover { background-color: #f6f6f6; } +p.payment_module a span { + font-weight: bold; + color: #777777; +} .payment_module.box { margin-top: 20px; diff --git a/themes/default-bootstrap/css/product.css b/themes/default-bootstrap/css/product.css index ca2fb2372..e3b5d8e73 100644 --- a/themes/default-bootstrap/css/product.css +++ b/themes/default-bootstrap/css/product.css @@ -569,6 +569,9 @@ span.view_scroll_spacer { display: none; } } +.box-info-product .exclusive.disabled:before { + content: ""; +} .box-info-product .exclusive:after { background: url(../img/border-1.gif) repeat-y 0 0; position: absolute; diff --git a/themes/default-bootstrap/img/addcartloader.gif b/themes/default-bootstrap/img/addcartloader.gif new file mode 100644 index 0000000000000000000000000000000000000000..561cb64078833827272c4dda9209194e8045d881 GIT binary patch literal 6000 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 V@Y)dtgY|&8+jQd9(^MQ-@xM!dA~XO1 literal 0 HcmV?d00001 diff --git a/themes/default-bootstrap/js/jquery/jquery.uniform-modify.js b/themes/default-bootstrap/js/jquery/jquery.uniform-modify.js index 1344cf021..3f0c73402 100644 --- a/themes/default-bootstrap/js/jquery/jquery.uniform-modify.js +++ b/themes/default-bootstrap/js/jquery/jquery.uniform-modify.js @@ -1077,4 +1077,11 @@ $(window).load(function () { $("#uniform-selectProductSort1 span").innerWidth(0); }); +// refresh uniform selects on document width change +$(window).resize( + function () { + $.uniform.update("select.form-control, input[type='file']"); + } +); + diff --git a/themes/default-bootstrap/lang/en.php b/themes/default-bootstrap/lang/en.php index 11136241c..b4c41a4ab 100644 --- a/themes/default-bootstrap/lang/en.php +++ b/themes/default-bootstrap/lang/en.php @@ -95,7 +95,7 @@ $_LANG['history_bd0e34e5be6447844e6f262d51f1a9dc'] = 'Price Rules'; $_LANG['history_ec53a8c4f07baed5d8825072c89799be'] = 'Status'; $_LANG['history_466eadd40b3c10580e3ab4e8061161ce'] = 'Invoice'; $_LANG['history_bcd1b68617759b1dfcff0403a6b5a8d1'] = 'PDF'; -$_LANG['history_0b3db27bc15f682e92ff250ebb167d4b'] = 'Back to your account'; +$_LANG['history_0b3db27bc15f682e92ff250ebb167d4b'] = 'Back to your account.'; $_LANG['history_8cf04a9734132302f96da8e113e80ce5'] = 'Home'; $_LANG['history_01abfc750a0c942167651c40d088531d'] = '#'; $_LANG['identity_19f823c6453c2b1ffd09cb715214813d'] = 'Required field'; @@ -419,3 +419,15 @@ $_LANG['product-sort_df25de42c84837baf5fa15049a8bc764'] = 'View'; $_LANG['product_694e8d1f2ee056f98ee488bdc4982d73'] = 'Quantity'; $_LANG['stores_8c2857a9ad1d8f31659e35e904e20fa6'] = 'Logo'; $_LANG['supplier-list_df25de42c84837baf5fa15049a8bc764'] = 'View'; +$_LANG['guest-tracking_6a1e265f92087bb6dd18194833fe946b'] = 'Email'; +$_LANG['history_c453a4b8e8d98e82f35b67f433e3b4da'] = 'Payment'; +$_LANG['history_3ec365dd533ddb7ef3d1c111186ce872'] = 'Details'; +$_LANG['order-address-product-line_69d08bd5f8cf4e228930935c3f13e42f'] = 'In stock'; +$_LANG['order-detail_601d8c4b9f72fc1862013c19b677a499'] = 'Invoice address'; +$_LANG['order-detail_ada0f55ef37f4928c5cd970f378c15e8'] = 'Total vouchers'; +$_LANG['order-detail_38fb6e512f5b9cd141963623ab3b5ddd'] = 'Total cost of gift wrapping'; +$_LANG['order-detail_0e321f3a4007b6404f4d93f7f35b2364'] = 'Shipping and handling'; +$_LANG['pagination_8bf8854bebe108183caeb845c7676ae4'] = 'of'; +$_LANG['pagination_691d502cfd0e0626cd3b058e5682ad1c'] = 'Items'; +$_LANG['password_b357b524e740bc85b9790a0712d84a30'] = 'Email address'; +$_LANG['shopping-cart-product-line_69d08bd5f8cf4e228930935c3f13e42f'] = 'In stock'; diff --git a/themes/default-bootstrap/modules/bankwire/views/templates/hook/payment.tpl b/themes/default-bootstrap/modules/bankwire/views/templates/hook/payment.tpl index e20bc6ebc..b3c1d1a80 100644 --- a/themes/default-bootstrap/modules/bankwire/views/templates/hook/payment.tpl +++ b/themes/default-bootstrap/modules/bankwire/views/templates/hook/payment.tpl @@ -25,7 +25,7 @@

- {l s='Pay by bank wire (order process will be longer)' mod='bankwire'} + {l s='Pay by bank wire' mod='bankwire'} ({l s='order process will be longer' mod='bankwire'})

\ No newline at end of file diff --git a/themes/default-bootstrap/modules/cheque/views/templates/hook/payment.tpl b/themes/default-bootstrap/modules/cheque/views/templates/hook/payment.tpl index 28bedddcd..67eb7d55b 100644 --- a/themes/default-bootstrap/modules/cheque/views/templates/hook/payment.tpl +++ b/themes/default-bootstrap/modules/cheque/views/templates/hook/payment.tpl @@ -26,7 +26,7 @@

- {l s='Pay by check (order processing will take more time).' mod='cheque'} + {l s='Pay by check' mod='cheque'} ({l s='order processing will take more time' mod='cheque'})

diff --git a/themes/default-bootstrap/modules/loyalty/views/templates/hook/my-account.tpl b/themes/default-bootstrap/modules/loyalty/views/templates/hook/my-account.tpl index 1100c8eeb..520da34d5 100644 --- a/themes/default-bootstrap/modules/loyalty/views/templates/hook/my-account.tpl +++ b/themes/default-bootstrap/modules/loyalty/views/templates/hook/my-account.tpl @@ -25,6 +25,6 @@
  • - {l s='My loyalty points' mod='loyalty'} + {l s='My loyalty points' mod='loyalty'}
    • \ No newline at end of file diff --git a/themes/default-bootstrap/modules/productcomments/products-comparison.tpl b/themes/default-bootstrap/modules/productcomments/products-comparison.tpl new file mode 100644 index 000000000..4251dc929 --- /dev/null +++ b/themes/default-bootstrap/modules/productcomments/products-comparison.tpl @@ -0,0 +1,131 @@ +{* +* 2007-2013 PrestaShop +* +* NOTICE OF LICENSE +* +* This source file is subject to the Academic Free License (AFL 3.0) +* that is bundled with this package in the file LICENSE.txt. +* It is also available through the world-wide-web at this URL: +* http://opensource.org/licenses/afl-3.0.php +* If you did not receive a copy of the license and are unable to +* obtain it through the world-wide-web, please send an email +* to license@prestashop.com so we can send you a copy immediately. +* +* DISCLAIMER +* +* Do not edit or add to this file if you wish to upgrade PrestaShop to newer +* versions in the future. If you wish to customize PrestaShop for your +* needs please refer to http://www.prestashop.com for more information. +* +* @author PrestaShop SA +* @copyright 2007-2013 PrestaShop SA +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*} + + + + + + + + + {l s='Comments' mod='productcomments'} + + {section loop=$list_ids_product|count step=1 start=0 name=td} + + {/section} + + +{foreach from=$grades item=grade key=grade_id} + + {cycle values='comparison_feature_odd,comparison_feature_even' assign='classname'} + + {$grade} + + + {foreach from=$list_ids_product item=id_product} + {assign var='tab_grade' value=$product_grades[$grade_id]} + + {if isset($tab_grade[$id_product]) AND $tab_grade[$id_product]} +
    + {section loop=6 step=1 start=1 name=average} + + {/section} +
    + {else} + - + {/if} + + {/foreach} + +{/foreach} + + {cycle values='comparison_feature_odd,comparison_feature_even' assign='classname'} + + {l s='Average' mod='productcomments'} +{foreach from=$list_ids_product item=id_product} + + {if isset($list_product_average[$id_product]) AND $list_product_average[$id_product]} +
    + {section loop=6 step=1 start=1 name=average} + + {/section} +
    + {else} + - + {/if} + +{/foreach} + + + +   + {foreach from=$list_ids_product item=id_product} + + {if isset($product_comments[$id_product]) AND $product_comments[$id_product]} + + {l s='View comments' mod='productcomments'} + + {else} + - + {/if} + +{/foreach} + \ No newline at end of file diff --git a/themes/default-bootstrap/product-list.tpl b/themes/default-bootstrap/product-list.tpl index 25256afaa..bc18bf100 100644 --- a/themes/default-bootstrap/product-list.tpl +++ b/themes/default-bootstrap/product-list.tpl @@ -65,8 +65,8 @@ {/if} {/if} - {if isset($product.new) && $product.new == 1}{l s='New'}{/if} - {if isset($product.on_sale) && $product.on_sale && isset($product.show_price) && $product.show_price && !$PS_CATALOG_MODE}{l s='Sale!'}{/if} + {if isset($product.new) && $product.new == 1}{l s='New'}{/if} + {if isset($product.on_sale) && $product.on_sale && isset($product.show_price) && $product.show_price && !$PS_CATALOG_MODE}{l s='Sale!'}{/if}
    diff --git a/themes/default-bootstrap/product.tpl b/themes/default-bootstrap/product.tpl index 73724e081..492fc0b02 100644 --- a/themes/default-bootstrap/product.tpl +++ b/themes/default-bootstrap/product.tpl @@ -190,7 +190,7 @@ var contentOnly = {if $content_only}true{else}false{/if} {if $product->on_sale} - {l s='Sale!'} + {l s='Sale!'} {elseif $product->specificPrice AND $product->specificPrice.reduction AND $productPriceWithoutReduction > $productPrice} {l s='Reduced price!'} {/if} diff --git a/themes/default-bootstrap/products-comparison.tpl b/themes/default-bootstrap/products-comparison.tpl index 3c3bff1ed..9ad6999e9 100644 --- a/themes/default-bootstrap/products-comparison.tpl +++ b/themes/default-bootstrap/products-comparison.tpl @@ -57,7 +57,7 @@ {if isset($product->show_price) && $product->show_price && !isset($restricted_country_mode) && !$PS_CATALOG_MODE} {if $product->on_sale} -
    {l s='Sale!'}
    +
    {l s='Sale!'}
    {/if} {/if}
    diff --git a/themes/default-bootstrap/sass/comparator.scss b/themes/default-bootstrap/sass/comparator.scss index 271ca4139..b64e4301e 100644 --- a/themes/default-bootstrap/sass/comparator.scss +++ b/themes/default-bootstrap/sass/comparator.scss @@ -100,6 +100,11 @@ table#product_comparison { color:$product-price-color; font-style:italic; } + .product-rating { + width:80px; + margin:0 auto; + overflow:hidden; + } } .ie8 table#product_comparison .product-image-block .product_image img { width:auto; diff --git a/themes/default-bootstrap/sass/global.scss b/themes/default-bootstrap/sass/global.scss index ea050d835..0c9dec188 100644 --- a/themes/default-bootstrap/sass/global.scss +++ b/themes/default-bootstrap/sass/global.scss @@ -602,7 +602,7 @@ table.table_block td { .sale-box { right:-5px; } -.new { +.new-label { font:700 15px/18px $font-famaly; color:$light-text-color; background:#6ad4ff; @@ -646,7 +646,7 @@ table.table_block td { @include rotate(145deg); } } -.sale { +.sale-label { font:700 15px/18px $font-famaly; color:$light-text-color; background:#f13340; @@ -689,7 +689,7 @@ table.table_block td { } } .ie8 { - .new { + .new-label { left:0px; top:0px; width:auto; @@ -702,7 +702,7 @@ table.table_block td { display:none; } } - .sale { + .sale-label { right:0px; top:0px; width:auto; @@ -804,7 +804,7 @@ table.table_block td { color:$light-text-color; padding:10px; @media (min-width: $screen-sm) { // min 768px - margin:-10px 0; + margin:-9px 0; } } } @@ -2174,12 +2174,12 @@ a.price_discount_delete { td { &.cart_product { padding:19px; + width:137px; img { border:1px solid $table-border-color; } } &.cart_unit { - text-align:center; .price { span { @@ -2195,12 +2195,15 @@ a.price_discount_delete { } } &.cart_description { - + width:480px; small { display:block; padding:5px 0 0 0; } } + &.cart_avail { + + } } } tfoot { @@ -2481,7 +2484,11 @@ p.payment_module { color:$link-color; } } - &:hover { background-color:#f6f6f6} + &:hover { background-color:#f6f6f6} + span { + font-weight:bold; + color:$base-body-color; + } } } .payment_module.box { margin-top:20px;} diff --git a/themes/default-bootstrap/sass/product.scss b/themes/default-bootstrap/sass/product.scss index b3992c19d..060888ef1 100644 --- a/themes/default-bootstrap/sass/product.scss +++ b/themes/default-bootstrap/sass/product.scss @@ -555,6 +555,11 @@ padding:18px 19px 12px; } } + &.disabled { + &:before { + content:""; + } + } &:after{ background:url(../img/border-1.gif) repeat-y 0 0; diff --git a/themes/default-bootstrap/scenes.tpl b/themes/default-bootstrap/scenes.tpl index 4a2e06945..a0c92811e 100644 --- a/themes/default-bootstrap/scenes.tpl +++ b/themes/default-bootstrap/scenes.tpl @@ -46,7 +46,7 @@ $(function () {ldelim}