Rémi Gaillard
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 5.9 KiB |
@@ -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']");
|
||||
}
|
||||
);
|
||||
|
||||
|
||||
|
||||
@@ -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';
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
<div class="row">
|
||||
<div class="col-xs-12 col-md-6">
|
||||
<p class="payment_module">
|
||||
<a class="bankwire" href="{$link->getModuleLink('bankwire', 'payment')|escape:'html'}" title="{l s='Pay by bank wire' mod='bankwire'}">{l s='Pay by bank wire (order process will be longer)' mod='bankwire'}</a>
|
||||
<a class="bankwire" href="{$link->getModuleLink('bankwire', 'payment')|escape:'html'}" title="{l s='Pay by bank wire' mod='bankwire'}">{l s='Pay by bank wire' mod='bankwire'} <span>({l s='order process will be longer' mod='bankwire'})</span></a>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
@@ -26,7 +26,7 @@
|
||||
<div class="col-xs-12 col-md-6">
|
||||
<p class="payment_module">
|
||||
<a class="cheque" href="{$link->getModuleLink('cheque', 'payment', [], true)|escape:'html'}" title="{l s='Pay by check.' mod='cheque'}">
|
||||
{l s='Pay by check (order processing will take more time).' mod='cheque'}
|
||||
{l s='Pay by check' mod='cheque'} <span>({l s='order processing will take more time' mod='cheque'})</span>
|
||||
</a>
|
||||
</p>
|
||||
</div>
|
||||
|
||||
@@ -25,6 +25,6 @@
|
||||
|
||||
<!-- MODULE Loyalty -->
|
||||
<li class="loyalty">
|
||||
<a href="{$link->getModuleLink('loyalty', 'default', ['process' => 'summary'], true)|escape:'html'}" title="{l s='My loyalty points' mod='loyalty'}" rel="nofollow"><i class="icon-flag"></i><span>{l s='My loyalty points' mod='loyalty'}</span></a>
|
||||
<a href="{$link->getModuleLink('loyalty', 'default', ['process' => 'summary'])|escape:'html'}" title="{l s='My loyalty points' mod='loyalty'}" rel="nofollow"><i class="icon-flag"></i><span>{l s='My loyalty points' mod='loyalty'}</span></a>
|
||||
</li>
|
||||
<!-- END : MODULE Loyalty -->
|
||||
@@ -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 <contact@prestashop.com>
|
||||
* @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
|
||||
*}
|
||||
|
||||
<script type="text/javascript" src="{$module_dir}js/products-comparison.js"></script>
|
||||
<script type="text/javascript" src="{$module_dir}js/jquery.rating.pack.js"></script>
|
||||
<script type="text/javascript" src="{$smarty.const._PS_JS_DIR_}jquery/jquery.cluetip.js"></script>
|
||||
<script type="text/javascript">
|
||||
{literal}
|
||||
$(function()
|
||||
{
|
||||
$('input[type=radio].star').rating();
|
||||
});
|
||||
$(function()
|
||||
{
|
||||
$('.auto-submit-star').rating();
|
||||
});
|
||||
|
||||
//close comment form
|
||||
function closeCommentForm()
|
||||
{
|
||||
$('#sendComment').slideUp('fast');
|
||||
$('input#addCommentButton').fadeIn('slow');
|
||||
}
|
||||
{/literal}
|
||||
</script>
|
||||
|
||||
<tr class="comparison_header">
|
||||
<td class="feature-name">
|
||||
<strong>{l s='Comments' mod='productcomments'}</strong>
|
||||
</td>
|
||||
{section loop=$list_ids_product|count step=1 start=0 name=td}
|
||||
<td></td>
|
||||
{/section}
|
||||
</tr>
|
||||
|
||||
{foreach from=$grades item=grade key=grade_id}
|
||||
<tr>
|
||||
{cycle values='comparison_feature_odd,comparison_feature_even' assign='classname'}
|
||||
<td class="{$classname} feature-name">
|
||||
<strong>{$grade}</strong>
|
||||
</td>
|
||||
|
||||
{foreach from=$list_ids_product item=id_product}
|
||||
{assign var='tab_grade' value=$product_grades[$grade_id]}
|
||||
<td width="{$width}%" class="{$classname} comparison_infos ajax_block_product" align="center">
|
||||
{if isset($tab_grade[$id_product]) AND $tab_grade[$id_product]}
|
||||
<div class="product-rating">
|
||||
{section loop=6 step=1 start=1 name=average}
|
||||
<input class="auto-submit-star" disabled="disabled" type="radio" name="{$grade_id}_{$id_product}_{$smarty.section.average.index}" {if isset($tab_grade[$id_product]) AND $tab_grade[$id_product]|round neq 0 and $smarty.section.average.index eq $tab_grade[$id_product]|round}checked="checked"{/if} />
|
||||
{/section}
|
||||
</div>
|
||||
{else}
|
||||
-
|
||||
{/if}
|
||||
</td>
|
||||
{/foreach}
|
||||
</tr>
|
||||
{/foreach}
|
||||
|
||||
{cycle values='comparison_feature_odd,comparison_feature_even' assign='classname'}
|
||||
<tr>
|
||||
<td class="{$classname} feature-name"><strong>{l s='Average' mod='productcomments'}</strong></td>
|
||||
{foreach from=$list_ids_product item=id_product}
|
||||
<td width="{$width}%" class="{$classname} comparison_infos" align="center" >
|
||||
{if isset($list_product_average[$id_product]) AND $list_product_average[$id_product]}
|
||||
<div class="product-rating">
|
||||
{section loop=6 step=1 start=1 name=average}
|
||||
<input class="auto-submit-star" disabled="disabled" type="radio" name="average_{$id_product}" {if $list_product_average[$id_product]|round neq 0 and $smarty.section.average.index eq $list_product_average[$id_product]|round}checked="checked"{/if} />
|
||||
{/section}
|
||||
</div>
|
||||
{else}
|
||||
-
|
||||
{/if}
|
||||
</td>
|
||||
{/foreach}
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td class="{$classname} comparison_infos feature-name"> </td>
|
||||
{foreach from=$list_ids_product item=id_product}
|
||||
<td width="{$width}%" class="{$classname} comparison_infos" align="center" >
|
||||
{if isset($product_comments[$id_product]) AND $product_comments[$id_product]}
|
||||
<script type="text/javascript">
|
||||
$(document).ready(function() {
|
||||
var htmlContent = $('#comments_{$id_product}').html();
|
||||
$("[rel=#comments_{$id_product}]").popover({
|
||||
placement : 'top', //placement of the popover. also can use top, bottom, left or right
|
||||
title : false, //this is the top title bar of the popover. add some basic css
|
||||
html: 'true', //needed to show html of course
|
||||
content : htmlContent //this is the content of the html box. add the image here or anything you want really.
|
||||
});
|
||||
});
|
||||
</script>
|
||||
<a href="#" onclick="return false;" rel="#comments_{$id_product}" class="btn btn-default button button-small"><span>{l s='View comments' mod='productcomments'}<i class="icon-chevron-right right"></i></span></a>
|
||||
<div style="display:none" id="comments_{$id_product}">
|
||||
{foreach from=$product_comments[$id_product] item=comment}
|
||||
<div class="well well-sm">
|
||||
<strong>{$comment.customer_name|escape:'html':'UTF-8'} </strong>
|
||||
<small class="date"> {dateFormat date=$comment.date_add|escape:'html':'UTF-8' full=0}</small>
|
||||
<div class="comment_content">{$comment.content|escape:'html':'UTF-8'|nl2br}</div>
|
||||
</div>
|
||||
{/foreach}
|
||||
</div>
|
||||
{else}
|
||||
-
|
||||
{/if}
|
||||
</td>
|
||||
{/foreach}
|
||||
</tr>
|
||||
@@ -65,8 +65,8 @@
|
||||
{/if}
|
||||
</div>
|
||||
{/if}
|
||||
{if isset($product.new) && $product.new == 1}<span class="new-box"><span class="new">{l s='New'}</span></span>{/if}
|
||||
{if isset($product.on_sale) && $product.on_sale && isset($product.show_price) && $product.show_price && !$PS_CATALOG_MODE}<span class="sale-box"><span class="sale">{l s='Sale!'}</span></span>{/if}
|
||||
{if isset($product.new) && $product.new == 1}<span class="new-box"><span class="new-label">{l s='New'}</span></span>{/if}
|
||||
{if isset($product.on_sale) && $product.on_sale && isset($product.show_price) && $product.show_price && !$PS_CATALOG_MODE}<span class="sale-box"><span class="sale-label">{l s='Sale!'}</span></span>{/if}
|
||||
</div>
|
||||
</div>
|
||||
<div class="right-block">
|
||||
|
||||
@@ -190,7 +190,7 @@ var contentOnly = {if $content_only}true{else}false{/if}
|
||||
|
||||
|
||||
{if $product->on_sale}
|
||||
<span class="sale-box"><span class="sale">{l s='Sale!'}</span></span>
|
||||
<span class="sale-box"><span class="sale-label">{l s='Sale!'}</span></span>
|
||||
{elseif $product->specificPrice AND $product->specificPrice.reduction AND $productPriceWithoutReduction > $productPrice}
|
||||
<span class="discount">{l s='Reduced price!'}</span>
|
||||
{/if}
|
||||
|
||||
@@ -57,7 +57,7 @@
|
||||
</a>
|
||||
{if isset($product->show_price) && $product->show_price && !isset($restricted_country_mode) && !$PS_CATALOG_MODE}
|
||||
{if $product->on_sale}
|
||||
<div class="sale-box"><span class="sale">{l s='Sale!'}</span></div>
|
||||
<div class="sale-box"><span class="sale-label">{l s='Sale!'}</span></div>
|
||||
{/if}
|
||||
{/if}
|
||||
</div>
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;}
|
||||
|
||||
@@ -555,6 +555,11 @@ padding:18px 19px 12px;
|
||||
}
|
||||
|
||||
}
|
||||
&.disabled {
|
||||
&:before {
|
||||
content:"";
|
||||
}
|
||||
}
|
||||
|
||||
&:after{
|
||||
background:url(../img/border-1.gif) repeat-y 0 0;
|
||||
|
||||
@@ -46,7 +46,7 @@ $(function () {ldelim}
|
||||
<div id="scene_products_cluetip_{$scene_key}_{$product_key}_{$product.id_product}" style="display:none;">
|
||||
{if !$PS_CATALOG_MODE AND $product.details->show_price}
|
||||
<div class="prices">
|
||||
{if isset($product.details->new) AND $product.details->new}<span class="new">{l s='New'}</span>{/if}
|
||||
{if isset($product.details->new) AND $product.details->new}<span class="new-label">{l s='New'}</span>{/if}
|
||||
<p class="price">{if $priceDisplay}{convertPrice price=$product.details->getPrice(false, $product.details->getDefaultAttribute($product.id_product))}{else}{convertPrice price=$product.details->getPrice(true, $product.details->getDefaultAttribute($product.id_product))}{/if}</p>
|
||||
{if $product.details->on_sale}
|
||||
<span class="on_sale">{l s='On sale!'}</span>
|
||||
|
||||
Reference in New Issue
Block a user