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

Merge pull request #991 from TMMeilleur/bootstrap

Browse Source 
// fixed add to wishlist/compare buttons and added product review
This commit is contained in:
Rémi Gaillard committed 2013-11-18 06:22:43 -08:00
2 parents c4dab5f5a6 95b9710eda
commit 4c51570b34
18 files changed
+638 -292
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

classes/controller/FrontController.php
+4 -1
View File
@@ -346,7 +346,8 @@ class FrontControllerCore extends Controller
'PS_STOCK_MANAGEMENT' => Configuration::get('PS_STOCK_MANAGEMENT'), 'PS_STOCK_MANAGEMENT' => Configuration::get('PS_STOCK_MANAGEMENT'),
'quick_view' => Configuration::get('PS_QUICK_VIEW'), 'quick_view' => Configuration::get('PS_QUICK_VIEW'),
'shop_phone' => Configuration::get('PS_SHOP_PHONE'), 'shop_phone' => Configuration::get('PS_SHOP_PHONE'),
'compared_products' => is_array($compared_products) ? $compared_products : array() 'compared_products' => is_array($compared_products) ? $compared_products : array(),
'comparator_max_item' => (int)Configuration::get('PS_COMPARATOR_MAX_ITEM')
)); ));
// Add the tpl files directory for mobile // Add the tpl files directory for mobile
@@ -757,6 +758,8 @@ class FrontControllerCore extends Controller
$this->addjqueryPlugin('fancybox'); $this->addjqueryPlugin('fancybox');
$this->addJS(_THEME_JS_DIR_.'quick-view.js'); $this->addJS(_THEME_JS_DIR_.'quick-view.js');
} }
if (Configuration::get('PS_COMPARATOR_MAX_ITEM') > 0)
$this->addJS(_THEME_JS_DIR_.'products-comparison.js');
// Execute Hook FrontController SetMedia // Execute Hook FrontController SetMedia
Hook::exec('actionFrontControllerSetMedia', array()); Hook::exec('actionFrontControllerSetMedia', array());
modules/blockwishlist/blockwishlist.php
+32
View File
@@ -118,6 +118,38 @@ class BlockWishList extends Module
public function hookTop($params) public function hookTop($params)
{ {
global $errors;
require_once(dirname(__FILE__).'/WishList.php');
if ($this->context->customer->isLogged())
{
$wishlists = Wishlist::getByIdCustomer($this->context->customer->id);
if (empty($this->context->cookie->id_wishlist) === true ||
WishList::exists($this->context->cookie->id_wishlist, $this->context->customer->id) === false)
{
if (!sizeof($wishlists))
$id_wishlist = false;
else
{
$id_wishlist = (int)($wishlists[0]['id_wishlist']);
$this->context->cookie->id_wishlist = (int)($id_wishlist);
}
}
else
$id_wishlist = $this->context->cookie->id_wishlist;
$this->smarty->assign(array(
'id_wishlist' => $id_wishlist,
'isLogged' => true,
'wishlist_products' => ($id_wishlist == false ? false : WishList::getProductByIdCustomer($id_wishlist, $this->context->customer->id, $this->context->language->id, null, true)),
'wishlists' => $wishlists,
'ptoken' => Tools::getToken(false)));
}
else
$this->smarty->assign(array('wishlist_products' => false, 'wishlists' => false));
return $this->display(__FILE__, 'blockwishlist_top.tpl'); return $this->display(__FILE__, 'blockwishlist_top.tpl');
} }
modules/productcomments/productcomments.php
+1
View File
@@ -709,6 +709,7 @@ class ProductComments extends Module
$this->smarty->assign(array( $this->smarty->assign(array(
'product' => $params['product'], 'product' => $params['product'],
'averageTotal' => round($average['grade']), 'averageTotal' => round($average['grade']),
'nbComments' => (int)(ProductComment::getCommentNumber((int)$params['product']['id_product']))
)); ));
return $this->display(__FILE__, 'productcomments_reviews.tpl'); return $this->display(__FILE__, 'productcomments_reviews.tpl');
} }
themes/default-bootstrap/css/contact-form.css
+3 -3
View File
@@ -17,9 +17,9 @@
padding: 23px 0 0 0; padding: 23px 0 0 0;
margin-bottom: 30px; margin-bottom: 30px;
background: url(../img/contact-form.png) repeat-x white; background: url(../img/contact-form.png) repeat-x white;
-webkit-box-shadow: rgba(0, 0, 0, 0) 0px 5px 13px; -webkit-box-shadow: rgba(0, 0, 0, 0.17) 0px 5px 13px;
-moz-box-shadow: rgba(0, 0, 0, 0) 0px 5px 13px; -moz-box-shadow: rgba(0, 0, 0, 0.17) 0px 5px 13px;
box-shadow: rgba(0, 0, 0, 0) 0px 5px 13px; box-shadow: rgba(0, 0, 0, 0.17) 0px 5px 13px;
} }
.contact-form-box fieldset { .contact-form-box fieldset {
padding: 0 19px 21px 19px; padding: 0 19px 21px 19px;
themes/default-bootstrap/css/global.css
+30 -14
View File
@@ -1733,7 +1733,6 @@ ul.step li em {
margin: 0 1px 0 0; margin: 0 1px 0 0;
width: 16px; width: 16px;
height: 16px; height: 16px;
text-indent: -999em;
cursor: pointer; cursor: pointer;
} }
@@ -1741,10 +1740,6 @@ ul.step li em {
background: url(../../../modules/productcomments/img/delete.gif) no-repeat 0 -16px !important; background: url(../../../modules/productcomments/img/delete.gif) no-repeat 0 -16px !important;
} }
.star, .star a {
background: url(modules/productcomments/img/star.png) no-repeat 0 0;
}
.cancel a, .star a { .cancel a, .star a {
display: block; display: block;
width: 100%; width: 100%;
@@ -3203,25 +3198,46 @@ form#sendComment h3 {
.star { .star {
position: relative; position: relative;
top: 2px; top: -1px;
float: left; float: left;
height: 12px; width: 14px;
width: 12px;
overflow: hidden; overflow: hidden;
text-indent: -999em;
cursor: pointer; cursor: pointer;
font-size: 14px;
font-weight: normal;
} }
.star, .star a { .star, .star a {
background: url(modules/productcomments/img/star.png) no-repeat 0 0; display: block;
} }
div.star_on a { .star a {
background-position: 0 -13px; position: absolute;
text-indent: -5000px;
} }
div.star_hover a, div.star a:hover { div.star:after {
background-position: 0 -13px; content: "";
font-family: "FontAwesome";
display: inline-block;
color: #777676;
}
div.star.star_on {
display: block;
}
div.star.star_on:after {
content: "";
font-family: "FontAwesome";
display: inline-block;
color: #ef8743;
}
div.star.star_hover:after {
content: "";
font-family: "FontAwesome";
display: inline-block;
color: #ef8743;
} }
/* ************************************************************************************************ /* ************************************************************************************************
themes/default-bootstrap/css/modules/productcomments/productcomments.css
+20 -14
View File
@@ -14,7 +14,6 @@
.comments_advices li { .comments_advices li {
display: inline-block; display: inline-block;
line-height: 30px; line-height: 30px;
/*min 768px max 991px*/
} }
@media (min-width: 768px) and (max-width: 991px) { @media (min-width: 768px) and (max-width: 991px) {
.comments_advices li { .comments_advices li {
@@ -30,7 +29,6 @@
line-height: 30px; line-height: 30px;
padding: 0; padding: 0;
display: inline-block; display: inline-block;
/*min 768px max 991px*/
} }
@media (min-width: 768px) and (max-width: 1199px) { @media (min-width: 768px) and (max-width: 1199px) {
.comments_advices a { .comments_advices a {
@@ -73,7 +71,6 @@
border-right: 1px solid #d6d4d4; border-right: 1px solid #d6d4d4;
padding-right: 30px; padding-right: 30px;
margin-right: 9px; margin-right: 9px;
/* min 768px max 991px*/
} }
@media (min-width: 768px) and (max-width: 991px) { @media (min-width: 768px) and (max-width: 991px) {
.comments_advices a.reviews { .comments_advices a.reviews {
@@ -94,11 +91,17 @@
#product_comments_block_extra .star_content { #product_comments_block_extra .star_content {
margin-top: 1px; margin-top: 1px;
} }
#product_comments_block_extra div.star { #product_comments_block_extra div.star:after {
background: url(img/star.png) no-repeat 0 0; content: "";
font-family: "FontAwesome";
display: inline-block;
color: #777676;
} }
#product_comments_block_extra div.star_on { #product_comments_block_extra div.star_on:after {
background: url(img/star.png) no-repeat 0 -13px; content: "";
font-family: "FontAwesome";
display: inline-block;
color: #ef8743;
} }
#product_comments_block_extra .comments_advices { #product_comments_block_extra .comments_advices {
clear: both; clear: both;
@@ -125,7 +128,6 @@
overflow: hidden; overflow: hidden;
color: #333333; color: #333333;
text-align: left; text-align: left;
/*max 767px*/
} }
@media (max-width: 767px) { @media (max-width: 767px) {
#new_comment_form { #new_comment_form {
@@ -252,12 +254,17 @@
#product_comments_block_tab div.comment .star_content { #product_comments_block_tab div.comment .star_content {
margin: 0 0 0 5px; margin: 0 0 0 5px;
} }
#product_comments_block_tab div.star, #product_comments_block_tab div.star:after {
#product_comments_block_tab div.star_on { content: "";
background: url(img/star.png) no-repeat 0 0; font-family: "FontAwesome";
display: inline-block;
color: #777676;
} }
#product_comments_block_tab div.star_on { #product_comments_block_tab div.star_on:after {
background-position: 0 -13px; content: "";
font-family: "FontAwesome";
display: inline-block;
color: #ef8743;
} }
#product_comments_block_tab .comment_author_infos { #product_comments_block_tab .comment_author_infos {
clear: both; clear: both;
@@ -273,7 +280,6 @@
#product_comments_block_tab div.comment div.comment_details { #product_comments_block_tab div.comment div.comment_details {
overflow: hidden; overflow: hidden;
border-left: 1px solid #d6d4d4; border-left: 1px solid #d6d4d4;
/*max 767px */
} }
@media (max-width: 991px) { @media (max-width: 991px) {
#product_comments_block_tab div.comment div.comment_details { #product_comments_block_tab div.comment div.comment_details {
themes/default-bootstrap/css/product_list.css
+50 -10
View File
@@ -62,6 +62,17 @@ ul.product_list .product-image-container .quick-view {
display: none; display: none;
} }
} }
ul.product_list .comments_note {
text-align: left;
overflow: hidden;
}
ul.product_list .comments_note .star_content {
float: left;
}
ul.product_list .comments_note .nb-comments {
overflow: hidden;
font-style: italic;
}
/******************************************************* /*******************************************************
Product list(Grid) Styles Product list(Grid) Styles
@@ -113,6 +124,16 @@ ul.product_list.grid > li .product-container h5 {
padding: 0 15px 7px 15px; padding: 0 15px 7px 15px;
min-height: 53px; min-height: 53px;
} }
@media (min-width: 1200px) {
ul.product_list.grid > li .product-container .comments_note {
display: none;
}
}
ul.product_list.grid > li .product-container .comments_note .star_content {
margin-left: 59px;
margin-right: 3px;
margin-bottom: 12px;
}
ul.product_list.grid > li .product-container .product-desc { ul.product_list.grid > li .product-container .product-desc {
display: none; display: none;
} }
@@ -165,11 +186,20 @@ ul.product_list.grid > li .product-container .functional-buttons div a:hover, ul
ul.product_list.grid > li .product-container .functional-buttons div.wishlist { ul.product_list.grid > li .product-container .functional-buttons div.wishlist {
border-right: 1px solid #d6d4d4; border-right: 1px solid #d6d4d4;
} }
ul.product_list.grid > li .product-container .functional-buttons div.wishlist a:before {
display: inline-block;
font-family: "FontAwesome";
content: "";
margin-right: 3px;
}
ul.product_list.grid > li .product-container .functional-buttons div.wishlist a.ckecked:before {
content: "";
}
@media (min-width: 992px) and (max-width: 1199px) { @media (min-width: 992px) and (max-width: 1199px) {
ul.product_list.grid > li .product-container .functional-buttons div.wishlist { ul.product_list.grid > li .product-container .functional-buttons div.wishlist {
border-right: 0; border-right: 0;
} }
ul.product_list.grid > li .product-container .functional-buttons div.wishlist i { ul.product_list.grid > li .product-container .functional-buttons div.wishlist a:before {
display: none; display: none;
} }
} }
@@ -177,7 +207,7 @@ ul.product_list.grid > li .product-container .functional-buttons div.wishlist {
ul.product_list.grid > li .product-container .functional-buttons div.wishlist { ul.product_list.grid > li .product-container .functional-buttons div.wishlist {
border-right: 0; border-right: 0;
} }
ul.product_list.grid > li .product-container .functional-buttons div.wishlist i { ul.product_list.grid > li .product-container .functional-buttons div.wishlist a:before {
display: none; display: none;
} }
} }
@@ -220,7 +250,7 @@ ul.product_list.grid > li .product-container .functional-buttons div.compare lab
ul.product_list.grid > li.hovered .product-container .product-image-container .quick-view { ul.product_list.grid > li.hovered .product-container .product-image-container .quick-view {
display: block; display: block;
} }
ul.product_list.grid > li.hovered .product-container .functional-buttons, ul.product_list.grid > li.hovered .product-container .button-container { ul.product_list.grid > li.hovered .product-container .functional-buttons, ul.product_list.grid > li.hovered .product-container .button-container, ul.product_list.grid > li.hovered .product-container .comments_note {
display: block; display: block;
} }
} }
@@ -242,7 +272,7 @@ ul.product_list.grid > li .product-container .functional-buttons div.compare lab
margin-bottom: 0; margin-bottom: 0;
} }
#blockpack ul > li.last-line.hovered { #blockpack ul > li.last-line.hovered {
margin-bottom: -289px; margin-bottom: -320px;
padding-bottom: 250px; padding-bottom: 250px;
} }
} }
@@ -299,6 +329,9 @@ ul.product_list.list > li .product-desc {
width: 100%; width: 100%;
} }
} }
ul.product_list.list > li .center-block .comments_note {
margin-bottom: 12px;
}
@media (min-width: 992px) { @media (min-width: 992px) {
ul.product_list.list > li .right-block .right-block-content { ul.product_list.list > li .right-block .right-block-content {
margin: 0; margin: 0;
@@ -387,7 +420,9 @@ ul.product_list.list > li .right-block .right-block-content .functional-buttons
color: #777676; color: #777676;
cursor: pointer; cursor: pointer;
} }
ul.product_list.list > li .right-block .right-block-content .functional-buttons a i, ul.product_list.list > li .right-block .right-block-content .functional-buttons label i { ul.product_list.list > li .right-block .right-block-content .functional-buttons .wishlist a:before {
content: "";
font-family: "FontAwesome";
width: 30px; width: 30px;
height: 30px; height: 30px;
font-size: 15px; font-size: 15px;
@@ -402,13 +437,18 @@ ul.product_list.list > li .right-block .right-block-content .functional-buttons
-o-border-radius: 100px; -o-border-radius: 100px;
border-radius: 100px; border-radius: 100px;
margin-right: 3px; margin-right: 3px;
font-weight: normal;
margin-right: 7px;
} }
ul.product_list.list > li .right-block .right-block-content .functional-buttons a:hover, ul.product_list.list > li .right-block .right-block-content .functional-buttons label:hover { ul.product_list.list > li .right-block .right-block-content .functional-buttons .wishlist a:hover {
color: #333333; color: #333333;
} }
ul.product_list.list > li .right-block .right-block-content .functional-buttons a:hover i, ul.product_list.list > li .right-block .right-block-content .functional-buttons label:hover i { ul.product_list.list > li .right-block .right-block-content .functional-buttons .wishlist a:hover:before {
background: #333333; background: #333333;
} }
ul.product_list.list > li .right-block .right-block-content .functional-buttons .wishlist a.ckecked:before {
content: "";
}
ul.product_list.list > li .right-block .right-block-content .functional-buttons .compare { ul.product_list.list > li .right-block .right-block-content .functional-buttons .compare {
padding-top: 10px; padding-top: 10px;
} }
@@ -468,7 +508,7 @@ ul.product_list.list > li .right-block .right-block-content .functional-buttons
} }
@media (min-width: 1200px) { @media (min-width: 1200px) {
#index ul.product_list.tab-pane > li.hovered { #index ul.product_list.tab-pane > li.hovered {
margin-bottom: -290px; margin-bottom: -300px;
} }
} }
#index ul.product_list.tab-pane > li .availability { #index ul.product_list.tab-pane > li .availability {
@@ -481,8 +521,8 @@ ul.product_list.list > li .right-block .right-block-content .functional-buttons
margin-bottom: 0; margin-bottom: 0;
} }
#index ul.product_list.tab-pane > li.last-line.hovered { #index ul.product_list.tab-pane > li.last-line.hovered {
margin-bottom: -290px; margin-bottom: -300px;
padding-bottom: 250px; padding-bottom: 230px;
} }
} }
@media (min-width: 480px) and (max-width: 767px) { @media (min-width: 480px) and (max-width: 767px) {
themes/default-bootstrap/index.tpl
+7
View File
@@ -28,6 +28,13 @@
{if isset($HOOK_HOME_TAB)} {if isset($HOOK_HOME_TAB)}
<ul id="home-page-tabs" class="nav nav-tabs">{/if}{$HOOK_HOME_TAB}{if isset($HOOK_HOME_TAB)}</ul> <ul id="home-page-tabs" class="nav nav-tabs">{/if}{$HOOK_HOME_TAB}{if isset($HOOK_HOME_TAB)}</ul>
{/if} {/if}
<script type="text/javascript">
$('document').ready(function(){
blockHover();
if (typeof reloadProductComparison != 'undefined')
reloadProductComparison();
});
</script>
<div class="tab-content"> <div class="tab-content">
{$HOOK_HOME_TAB_CONTENT} {$HOOK_HOME_TAB_CONTENT}
</div> </div>
themes/default-bootstrap/js/modules/blockwishlist/js/ajax-wishlist.js
+209 -182
View File
@@ -17,230 +17,257 @@
* versions in the future. If you wish to customize PrestaShop for your * versions in the future. If you wish to customize PrestaShop for your
* needs please refer to http://www.prestashop.com for more information. * needs please refer to http://www.prestashop.com for more information.
* *
* @author PrestaShop SA <contact@prestashop.com> * @author PrestaShop SA <contact@prestashop.com>
* @copyright 2007-2013 PrestaShop SA * @copyright 2007-2013 PrestaShop SA
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA * International Registered Trademark & Property of PrestaShop SA
*/ */
/** /**
* Update WishList Cart by adding, deleting, updating objects * Update WishList Cart by adding, deleting, updating objects
* *
* @return void * @return void
*/ */
function WishlistCart(id, action, id_product, id_product_attribute, quantity) function WishlistCart(id, action, id_product, id_product_attribute, quantity)
{ {
$.ajax({ $.ajax({
type: 'GET', type: 'GET',
url: baseDir + 'modules/blockwishlist/cart.php', url: baseDir + 'modules/blockwishlist/cart.php',
async: true, async: true,
cache: false, cache: false,
data: 'action=' + action + '&id_product=' + id_product + '&quantity=' + quantity + '&token=' + static_token + '&id_product_attribute=' + id_product_attribute, data: 'action=' + action + '&id_product=' + id_product + '&quantity=' + quantity + '&token=' + static_token + '&id_product_attribute=' + id_product_attribute,
success: function(data) success: function(data)
{ {
if (action == 'add') if (action == 'add')
{ {
if (isLoggedWishlist == true) { if (isLoggedWishlist == true) {
alert ('Adedd to wishlist') wishlistProductsIdsAdd(id_product),
} wishlistRefreshStatus(),
else { alert ('Adedd to wishlist')
alert ('You must be logged in to manage your wishlist.') }
} else {
} alert ('You must be logged in to manage your wishlist.')
}
if($('#' + id).length != 0) }
{ if (action == 'delete') {
$('#' + id).slideUp('normal'); wishlistProductsIdsRemove(id_product),
document.getElementById(id).innerHTML = data; wishlistRefreshStatus();
$('#' + id).slideDown('normal'); }
} if($('#' + id).length != 0)
} {
}); $('#' + id).slideUp('normal');
document.getElementById(id).innerHTML = data;
$('#' + id).slideDown('normal');
}
}
});
} }
/** /**
* Change customer default wishlist * Change customer default wishlist
* *
* @return void * @return void
*/ */
function WishlistChangeDefault(id, id_wishlist) function WishlistChangeDefault(id, id_wishlist)
{ {
$.ajax({ $.ajax({
type: 'GET', type: 'GET',
url: baseDir + 'modules/blockwishlist/cart.php', url: baseDir + 'modules/blockwishlist/cart.php',
async: true, async: true,
data: 'id_wishlist=' + id_wishlist + '&token=' + static_token, data: 'id_wishlist=' + id_wishlist + '&token=' + static_token,
cache: false, cache: false,
success: function(data) success: function(data)
{ {
$('#' + id).slideUp('normal'); $('#' + id).slideUp('normal');
document.getElementById(id).innerHTML = data; document.getElementById(id).innerHTML = data;
$('#' + id).slideDown('normal'); $('#' + id).slideDown('normal');
} }
}); });
} }
/** /**
* Buy Product * Buy Product
* *
* @return void * @return void
*/ */
function WishlistBuyProduct(token, id_product, id_product_attribute, id_quantity, button, ajax) function WishlistBuyProduct(token, id_product, id_product_attribute, id_quantity, button, ajax)
{ {
if(ajax) if(ajax)
ajaxCart.add(id_product, id_product_attribute, false, button, 1, [token, id_quantity]); ajaxCart.add(id_product, id_product_attribute, false, button, 1, [token, id_quantity]);
else else
{ {
$('#' + id_quantity).val(0); $('#' + id_quantity).val(0);
WishlistAddProductCart(token, id_product, id_product_attribute, id_quantity) WishlistAddProductCart(token, id_product, id_product_attribute, id_quantity)
document.forms['addtocart' + '_' + id_product + '_' + id_product_attribute].method='POST'; document.forms['addtocart' + '_' + id_product + '_' + id_product_attribute].method='POST';
document.forms['addtocart' + '_' + id_product + '_' + id_product_attribute].action=baseUri + '?controller=cart'; document.forms['addtocart' + '_' + id_product + '_' + id_product_attribute].action=baseUri + '?controller=cart';
document.forms['addtocart' + '_' + id_product + '_' + id_product_attribute].elements['token'].value = static_token; document.forms['addtocart' + '_' + id_product + '_' + id_product_attribute].elements['token'].value = static_token;
document.forms['addtocart' + '_' + id_product + '_' + id_product_attribute].submit(); document.forms['addtocart' + '_' + id_product + '_' + id_product_attribute].submit();
} }
return (true); return (true);
} }
function WishlistAddProductCart(token, id_product, id_product_attribute, id_quantity) function WishlistAddProductCart(token, id_product, id_product_attribute, id_quantity)
{ {
if ($('#' + id_quantity).val() <= 0) if ($('#' + id_quantity).val() <= 0)
return (false); return (false);
$.ajax({ $.ajax({
type: 'GET', type: 'GET',
url: baseDir + 'modules/blockwishlist/buywishlistproduct.php', url: baseDir + 'modules/blockwishlist/buywishlistproduct.php',
data: 'token=' + token + '&static_token=' + static_token + '&id_product=' + id_product + '&id_product_attribute=' + id_product_attribute, data: 'token=' + token + '&static_token=' + static_token + '&id_product=' + id_product + '&id_product_attribute=' + id_product_attribute,
async: true, async: true,
cache: false, cache: false,
success: function(data) success: function(data)
{ {
if (data) if (data)
alert(data); alert(data);
else else
{ {
$('#' + id_quantity).val($('#' + id_quantity).val() - 1); $('#' + id_quantity).val($('#' + id_quantity).val() - 1);
} }
} }
}); });
return (true); return (true);
} }
/** /**
* Show wishlist managment page * Show wishlist managment page
* *
* @return void * @return void
*/ */
function WishlistManage(id, id_wishlist) function WishlistManage(id, id_wishlist)
{ {
$.ajax({ $.ajax({
type: 'GET', type: 'GET',
async: true, async: true,
url: baseDir + 'modules/blockwishlist/managewishlist.php', url: baseDir + 'modules/blockwishlist/managewishlist.php',
data: 'id_wishlist=' + id_wishlist + '&refresh=' + false, data: 'id_wishlist=' + id_wishlist + '&refresh=' + false,
cache: false, cache: false,
success: function(data) success: function(data)
{ {
$('#' + id).hide(); $('#' + id).hide();
document.getElementById(id).innerHTML = data; document.getElementById(id).innerHTML = data;
$('#' + id).fadeIn('slow'); $('#' + id).fadeIn('slow');
} }
}); });
} }
/** /**
* Show wishlist product managment page * Show wishlist product managment page
* *
* @return void * @return void
*/ */
function WishlistProductManage(id, action, id_wishlist, id_product, id_product_attribute, quantity, priority) function WishlistProductManage(id, action, id_wishlist, id_product, id_product_attribute, quantity, priority)
{ {
$.ajax({ $.ajax({
type: 'GET', type: 'GET',
async: true, async: true,
url: baseDir + 'modules/blockwishlist/managewishlist.php', url: baseDir + 'modules/blockwishlist/managewishlist.php',
data: 'action=' + action + '&id_wishlist=' + id_wishlist + '&id_product=' + id_product + '&id_product_attribute=' + id_product_attribute + '&quantity=' + quantity + '&priority=' + priority + '&refresh=' + true, data: 'action=' + action + '&id_wishlist=' + id_wishlist + '&id_product=' + id_product + '&id_product_attribute=' + id_product_attribute + '&quantity=' + quantity + '&priority=' + priority + '&refresh=' + true,
cache: false, cache: false,
success: function(data) success: function(data)
{ {
if (action == 'delete') if (action == 'delete')
$('#wlp_' + id_product + '_' + id_product_attribute).fadeOut('fast'); $('#wlp_' + id_product + '_' + id_product_attribute).fadeOut('fast');
else if (action == 'update') else if (action == 'update')
{ {
$('#wlp_' + id_product + '_' + id_product_attribute).fadeOut('fast'); $('#wlp_' + id_product + '_' + id_product_attribute).fadeOut('fast');
$('#wlp_' + id_product + '_' + id_product_attribute).fadeIn('fast'); $('#wlp_' + id_product + '_' + id_product_attribute).fadeIn('fast');
} }
} }
}); });
} }
/** /**
* Delete wishlist * Delete wishlist
* *
* @return boolean succeed * @return boolean succeed
*/ */
function WishlistDelete(id, id_wishlist, msg) function WishlistDelete(id, id_wishlist, msg)
{ {
var res = confirm(msg); var res = confirm(msg);
if (res == false) if (res == false)
return (false); return (false);
$.ajax({ $.ajax({
type: 'GET', type: 'GET',
async: true, async: true,
url: baseDir + 'modules/blockwishlist/mywishlist.php', url: baseDir + 'modules/blockwishlist/mywishlist.php',
cache: false, cache: false,
data: 'deleted&id_wishlist=' + id_wishlist, data: 'deleted&id_wishlist=' + id_wishlist,
success: function(data) success: function(data)
{ {
$('#' + id).fadeOut('slow'); $('#' + id).fadeOut('slow');
} }
}); });
} }
/** /**
* Hide/Show bought product * Hide/Show bought product
* *
* @return void * @return void
*/ */
function WishlistVisibility(bought_class, id_button) function WishlistVisibility(bought_class, id_button)
{ {
if ($('#hide' + id_button).css('display') == 'none') if ($('#hide' + id_button).css('display') == 'none')
{ {
$('.' + bought_class).slideDown('fast'); $('.' + bought_class).slideDown('fast');
$('#show' + id_button).hide(); $('#show' + id_button).hide();
$('#hide' + id_button).css('display', 'block'); $('#hide' + id_button).css('display', 'block');
} }
else else
{ {
$('.' + bought_class).slideUp('fast'); $('.' + bought_class).slideUp('fast');
$('#hide' + id_button).hide(); $('#hide' + id_button).hide();
$('#show' + id_button).css('display', 'block'); $('#show' + id_button).css('display', 'block');
} }
} }
/** /**
* Send wishlist by email * Send wishlist by email
* *
* @return void * @return void
*/ */
function WishlistSend(id, id_wishlist, id_email) function WishlistSend(id, id_wishlist, id_email)
{ {
$.post(baseDir + 'modules/blockwishlist/sendwishlist.php', $.post(baseDir + 'modules/blockwishlist/sendwishlist.php',
{ token: static_token, { token: static_token,
id_wishlist: id_wishlist, id_wishlist: id_wishlist,
email1: $('#' + id_email + '1').val(), email1: $('#' + id_email + '1').val(),
email2: $('#' + id_email + '2').val(), email2: $('#' + id_email + '2').val(),
email3: $('#' + id_email + '3').val(), email3: $('#' + id_email + '3').val(),
email4: $('#' + id_email + '4').val(), email4: $('#' + id_email + '4').val(),
email5: $('#' + id_email + '5').val(), email5: $('#' + id_email + '5').val(),
email6: $('#' + id_email + '6').val(), email6: $('#' + id_email + '6').val(),
email7: $('#' + id_email + '7').val(), email7: $('#' + id_email + '7').val(),
email8: $('#' + id_email + '8').val(), email8: $('#' + id_email + '8').val(),
email9: $('#' + id_email + '9').val(), email9: $('#' + id_email + '9').val(),
email10: $('#' + id_email + '10').val() }, email10: $('#' + id_email + '10').val() },
function(data) function(data)
{ {
if (data) if (data)
alert(data); alert(data);
else else
WishlistVisibility(id, 'hideSendWishlist'); WishlistVisibility(id, 'hideSendWishlist');
}); });
} }
function wishlistProductsIdsAdd(id){
if ($.inArray(parseInt(id),wishlistProductsIds) == -1)
wishlistProductsIds.push(parseInt(id))
}
function wishlistProductsIdsRemove(id){
wishlistProductsIds.splice($.inArray(parseInt(id),wishlistProductsIds), 1)
}
function wishlistRefreshStatus(){
$('.addToWishlist').each(function() {
if ($.inArray(parseInt($(this).prop('rel')),wishlistProductsIds)!= -1){
$(this).addClass('ckecked');
}
else
$(this).removeClass('ckecked');
});
}
$(document).ready(function() {
if (typeof wishlistProductsIds == 'undefined') {
wishlistProductsIds = [];
}
wishlistRefreshStatus();
});
themes/default-bootstrap/lang/en.php
+1 -1
View File
@@ -95,7 +95,7 @@ $_LANG['history_bd0e34e5be6447844e6f262d51f1a9dc'] = 'Price Rules';
$_LANG['history_ec53a8c4f07baed5d8825072c89799be'] = 'Status'; $_LANG['history_ec53a8c4f07baed5d8825072c89799be'] = 'Status';
$_LANG['history_466eadd40b3c10580e3ab4e8061161ce'] = 'Invoice'; $_LANG['history_466eadd40b3c10580e3ab4e8061161ce'] = 'Invoice';
$_LANG['history_bcd1b68617759b1dfcff0403a6b5a8d1'] = 'PDF'; $_LANG['history_bcd1b68617759b1dfcff0403a6b5a8d1'] = 'PDF';
$_LANG['history_0b3db27bc15f682e92ff250ebb167d4b'] = 'Back to your account'; $_LANG['history_0b3db27bc15f682e92ff250ebb167d4b'] = 'Back to your account.';
$_LANG['history_8cf04a9734132302f96da8e113e80ce5'] = 'Home'; $_LANG['history_8cf04a9734132302f96da8e113e80ce5'] = 'Home';
$_LANG['history_01abfc750a0c942167651c40d088531d'] = '#'; $_LANG['history_01abfc750a0c942167651c40d088531d'] = '#';
$_LANG['identity_19f823c6453c2b1ffd09cb715214813d'] = 'Required field'; $_LANG['identity_19f823c6453c2b1ffd09cb715214813d'] = 'Required field';
themes/default-bootstrap/modules/blockwishlist/blockwishlist_button.tpl
+28
View File
@@ -0,0 +1,28 @@
{*
* 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
*}
<div class="wishlist">
<a href="#" id="wishlist_button_{$product.id_product|intval}" rel="{$product.id_product|intval}" onclick="WishlistCart('wishlist_block_list', 'add', '{$product.id_product|intval}', false, 1); return false;" class="addToWishlist wishlistProd_{$product.id_product|intval}">{l s="Add to Wishlist"}</a>
</div>
themes/default-bootstrap/modules/blockwishlist/blockwishlist_top.tpl
+31
View File
@@ -0,0 +1,31 @@
{*
* 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">
var isLoggedWishlist = {if $logged}true{else}false{/if};
var wishlistProductsIds = [];
</script>
{foreach from=$wishlist_products item=product name=i}
<script type="text/javascript">wishlistProductsIds.push({$product.id_product});</script>
{/foreach}
themes/default-bootstrap/modules/productcomments/productcomments_reviews.tpl
+39
View File
@@ -0,0 +1,39 @@
{*
* 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
* @version Release: $Revision$
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*}
{if isset($nbComments) && $nbComments > 0}
<div class="comments_note">
<div class="star_content clearfix">
{section name="i" start=0 loop=5 step=1}
{if $averageTotal le $smarty.section.i.index}
<div class="star"></div>
{else}
<div class="star star_on"></div>
{/if}
{/section}
</div>
<span class="nb-comments">{l s='%s Review(s)'|sprintf:$nbComments mod='productcomments'}&nbsp</span>
</div>
{/if}
themes/default-bootstrap/modules/productcomments/productcomments_top.tpl
+6
View File
@@ -0,0 +1,6 @@
<script type="text/javascript">
$( document ).ready(function() {
$('input[@type=radio].star').rating();
$('.auto-submit-star').rating();
});
</script>
themes/default-bootstrap/product-list.tpl
+26 -10
View File
@@ -29,13 +29,6 @@
{assign var='nbItemsPerLineTablet' value=2} {assign var='nbItemsPerLineTablet' value=2}
{assign var='nbItemsPerLineMobile' value=3} {assign var='nbItemsPerLineMobile' value=3}
{else} {else}
<script type="text/javascript">
$('document').ready(function(){
blockHover();
if (typeof reloadProductComparison != 'undefined')
reloadProductComparison();
});
</script>
{assign var='nbItemsPerLine' value=4} {assign var='nbItemsPerLine' value=4}
{assign var='nbItemsPerLineTablet' value=3} {assign var='nbItemsPerLineTablet' value=3}
{assign var='nbItemsPerLineMobile' value=2} {assign var='nbItemsPerLineMobile' value=2}
@@ -78,6 +71,7 @@
</div> </div>
<div class="right-block"> <div class="right-block">
<h5>{if isset($product.pack_quantity) && $product.pack_quantity}{$product.pack_quantity|intval|cat:' x '}{/if}<a class="product-name" href="{$product.link|escape:'htmlall':'UTF-8'}" title="{$product.name|escape:'htmlall':'UTF-8'}">{$product.name|truncate:45:'...'|escape:'htmlall':'UTF-8'}</a></h5> <h5>{if isset($product.pack_quantity) && $product.pack_quantity}{$product.pack_quantity|intval|cat:' x '}{/if}<a class="product-name" href="{$product.link|escape:'htmlall':'UTF-8'}" title="{$product.name|escape:'htmlall':'UTF-8'}">{$product.name|truncate:45:'...'|escape:'htmlall':'UTF-8'}</a></h5>
{hook h='displayProductListReviews' product=$product}
<p class="product-desc">{$product.description_short|strip_tags:'UTF-8'|truncate:360:'...'}</p> <p class="product-desc">{$product.description_short|strip_tags:'UTF-8'|truncate:360:'...'}</p>
{if (!$PS_CATALOG_MODE AND ((isset($product.show_price) && $product.show_price) || (isset($product.available_for_order) && $product.available_for_order)))} {if (!$PS_CATALOG_MODE AND ((isset($product.show_price) && $product.show_price) || (isset($product.available_for_order) && $product.available_for_order)))}
<div class="content_price"> <div class="content_price">
@@ -91,7 +85,6 @@
</div> </div>
{/if} {/if}
<div class="button-container"> <div class="button-container">
{hook h='displayProductListReviews' product=$product}
{if ($product.id_product_attribute == 0 || (isset($add_prod_display) && ($add_prod_display == 1))) && $product.available_for_order && !isset($restricted_country_mode) && $product.minimal_quantity <= 1 && $product.customizable != 2 && !$PS_CATALOG_MODE} {if ($product.id_product_attribute == 0 || (isset($add_prod_display) && ($add_prod_display == 1))) && $product.available_for_order && !isset($restricted_country_mode) && $product.minimal_quantity <= 1 && $product.customizable != 2 && !$PS_CATALOG_MODE}
{if ($product.allow_oosp || $product.quantity > 0)} {if ($product.allow_oosp || $product.quantity > 0)}
{if isset($static_token)} {if isset($static_token)}
@@ -134,6 +127,15 @@
</ul> </ul>
<!-- Script for transformation Grid/List layouts --> <!-- Script for transformation Grid/List layouts -->
{if $page_name == 'product'}
<script type="text/javascript">
$('document').ready(function(){
blockHover();
if (typeof reloadProductComparison != 'undefined')
reloadProductComparison();
});
</script>
{/if}
<script type="text/javascript"> <script type="text/javascript">
function blockHover(status) { function blockHover(status) {
$('.product_list.grid li.ajax_block_product').each(function() { $('.product_list.grid li.ajax_block_product').each(function() {
@@ -162,8 +164,15 @@
html += '<div class="center-block col-xs-4 col-xs-7 col-md-4">'; html += '<div class="center-block col-xs-4 col-xs-7 col-md-4">';
html += '<div class="product-flags">'+ $(element).find('.product-flags').html() + '</div>'; html += '<div class="product-flags">'+ $(element).find('.product-flags').html() + '</div>';
html += '<h5>'+ $(element).find('h5').html() + '</h5>'; html += '<h5>'+ $(element).find('h5').html() + '</h5>';
var rating = $(element).find('.comments_note').html(); // check : rating
if (rating != null) {
html += '<div class="comments_note">'+ rating + '</div>';
}
html += '<p class="product-desc">'+ $(element).find('.product-desc').html() + '</p>'; html += '<p class="product-desc">'+ $(element).find('.product-desc').html() + '</p>';
html += '<div class="color-list-container">'+ $(element).find('.color-list-container').html() +'</div>'; var colorList = $(element).find('.color-list-container').html();
if (colorList != null) {
html += '<div class="color-list-container">'+ colorList +'</div>';
}
var availability = $(element).find('.availability').html(); // check : catalog mode is enabled var availability = $(element).find('.availability').html(); // check : catalog mode is enabled
if (availability != null) { if (availability != null) {
html += '<span class="availability">'+ availability +'</span>'; html += '<span class="availability">'+ availability +'</span>';
@@ -199,13 +208,20 @@
html += '<div class="right-block">'; html += '<div class="right-block">';
html += '<div class="product-flags">'+ $(element).find('.product-flags').html() + '</div>'; html += '<div class="product-flags">'+ $(element).find('.product-flags').html() + '</div>';
html += '<h5>'+ $(element).find('h5').html() + '</h5>'; html += '<h5>'+ $(element).find('h5').html() + '</h5>';
var rating = $(element).find('.comments_note').html(); // check : rating
if (rating != null) {
html += '<div class="comments_note">'+ rating + '</div>';
}
html += '<p class="product-desc">'+ $(element).find('.product-desc').html() + '</p>'; html += '<p class="product-desc">'+ $(element).find('.product-desc').html() + '</p>';
var price = $(element).find('.content_price').html(); // check : catalog mode is enabled var price = $(element).find('.content_price').html(); // check : catalog mode is enabled
if (price != null) { if (price != null) {
html += '<div class="content_price">'+ price + '</div>'; html += '<div class="content_price">'+ price + '</div>';
} }
html += '<div class="button-container">'+ $(element).find('.button-container').html() +'</div>'; html += '<div class="button-container">'+ $(element).find('.button-container').html() +'</div>';
html += '<div class="color-list-container">'+ $(element).find('.color-list-container').html() +'</div>'; var colorList = $(element).find('.color-list-container').html();
if (colorList != null) {
html += '<div class="color-list-container">'+ colorList +'</div>';
}
var availability = $(element).find('.availability').html(); // check : catalog mode is enabled var availability = $(element).find('.availability').html(); // check : catalog mode is enabled
if (availability != null) { if (availability != null) {
html += '<span class="availability">'+ availability +'</span>'; html += '<span class="availability">'+ availability +'</span>';
themes/default-bootstrap/sass/global.scss
+38 -10
View File
@@ -1589,11 +1589,10 @@ ul.step {
margin:0 1px 0 0; margin:0 1px 0 0;
width: 16px; width: 16px;
height: 16px; height: 16px;
text-indent: -999em;
cursor: pointer cursor: pointer
} }
.cancel, .cancel a { background: url(../../../modules/productcomments/img/delete.gif) no-repeat 0 -16px !important } .cancel, .cancel a { background: url(../../../modules/productcomments/img/delete.gif) no-repeat 0 -16px !important }
.star, .star a { background: url(modules/productcomments/img/star.png) no-repeat 0 0; } .star, .star a { }
.cancel a, .star a { .cancel a, .star a {
display: block; display: block;
width: 100%; width: 100%;
@@ -2966,17 +2965,46 @@ form#sendComment h3 {font-size:14px;}
.star { .star {
position: relative; position: relative;
top:2px; top:-1px;
float: left; float: left;
height: 12px; width: 14px;
width: 12px;
overflow: hidden; overflow: hidden;
text-indent: -999em; cursor: pointer;
cursor: pointer font-size:14px;
font-weight:normal;
}
.star, .star a {
display:block;
}
.star a {
position:absolute;
text-indent:-5000px;
}
div.star {
&:after {
content:"";
font-family:$font-icon;
display:inline-block;
color:#777676;
}
}
div.star.star_on {
display:block;
&:after {
content:"";
font-family:$font-icon;
display:inline-block;
color:#ef8743;
}
}
div.star.star_hover {
&:after {
content:"";
font-family:$font-icon;
display:inline-block;
color:#ef8743;
}
} }
.star, .star a { background: url(modules/productcomments/img/star.png) no-repeat 0 0;}
div.star_on a { background-position: 0 -13px }
div.star_hover a, div.star a:hover { background-position: 0 -13px }
/* ************************************************************************************************ /* ************************************************************************************************
themes/default-bootstrap/sass/modules/productcomments/productcomments.scss
+42 -17
View File
@@ -14,8 +14,7 @@ padding-top:2px;
li{display:inline-block; li{display:inline-block;
line-height:30px; line-height:30px;
/*min 768px max 991px*/ @media (min-width: $screen-sm) and (max-width: $screen-sm-max) { //min 768px max 991px
@media (min-width: $screen-sm) and (max-width: $screen-sm-max) {
display:block; display:block;
line-height:20px line-height:20px
} }
@@ -29,8 +28,7 @@ padding-top:2px;
padding:0; padding:0;
display:inline-block; display:inline-block;
/*min 768px max 991px*/ @media (min-width: $screen-sm) and (max-width: $screen-md-max) { //min 768px max 991px
@media (min-width: $screen-sm) and (max-width: $screen-md-max) {
float:none; float:none;
line-height:20px; line-height:20px;
} }
@@ -67,8 +65,7 @@ padding-top:2px;
padding-right:30px; padding-right:30px;
margin-right:9px; margin-right:9px;
/* min 768px max 991px*/ @media (min-width: $screen-sm) and (max-width: $screen-sm-max) { // min 768px max 991px
@media (min-width: $screen-sm) and (max-width: $screen-sm-max) {
margin-right:0; margin-right:0;
padding:0; padding:0;
border:none border:none
@@ -80,10 +77,29 @@ padding-top:2px;
#product_comments_block_extra{ #product_comments_block_extra{
.comments_note {margin-bottom:5px} .comments_note {margin-bottom:5px}
.comments_note span, .comments_note span,
.star_content {float:left;color:$base-text-color} .star_content {
.star_content {margin-top:1px} float:left;
div.star {background: url(img/star.png) no-repeat 0 0} color:$base-text-color;
div.star_on {background: url(img/star.png) no-repeat 0 -13px} }
.star_content {
margin-top:1px;
}
div.star {
&:after {
content:"";
font-family:$font-icon;
display:inline-block;
color:#777676;
}
}
div.star_on {
&:after {
content:"";
font-family:$font-icon;
display:inline-block;
color:#ef8743;
}
}
.comments_advices {clear:both;} .comments_advices {clear:both;}
} }
@@ -106,8 +122,7 @@ padding-top:2px;
color: $base-text-color; color: $base-text-color;
text-align: left; text-align: left;
/*max 767px*/ @media (max-width: $screen-xs-max) { //max 767px
@media (max-width: $screen-xs-max) {
width:275px; width:275px;
} }
@@ -218,11 +233,22 @@ padding-top:2px;
float:left; float:left;
} }
div.comment .star_content {margin: 0 0 0 5px} div.comment .star_content {margin: 0 0 0 5px}
div.star, div.star {
&:after {
content:"";
font-family:$font-icon;
display:inline-block;
color:#777676;
}
}
div.star_on { div.star_on {
background: url(img/star.png) no-repeat 0 0 &:after {
content:"";
font-family:$font-icon;
display:inline-block;
color:#ef8743;
}
} }
div.star_on {background-position: 0 -13px}
.comment_author_infos {clear:both; .comment_author_infos {clear:both;
padding-top:9px; padding-top:9px;
strong{display:block;color:$base-text-color} strong{display:block;color:$base-text-color}
@@ -234,8 +260,7 @@ padding-top:2px;
overflow:hidden; overflow:hidden;
border-left:$main_border; border-left:$main_border;
/*max 767px */ @media (max-width: $screen-sm-max) { //max 767px
@media (max-width: $screen-sm-max) {
border-left: none border-left: none
} }
themes/default-bootstrap/sass/product_list.scss
+71 -30
View File
@@ -73,6 +73,15 @@ ul.product_list {
} }
} }
} }
.comments_note {
text-align:left;
overflow:hidden;
.star_content {
float:left;
}
.nb-comments {overflow:hidden; font-style:italic;}
}
} }
/******************************************************* /*******************************************************
@@ -127,7 +136,16 @@ ul.product_list.grid {
padding:0 15px 7px 15px; padding:0 15px 7px 15px;
min-height:53px; min-height:53px;
} }
.comments_note {
@media (min-width: $screen-lg) { // min 1200px
display:none;
}
.star_content {
margin-left:59px;
margin-right:3px;
margin-bottom:12px;
}
}
.product-desc { .product-desc {
display:none; display:none;
} }
@@ -169,16 +187,26 @@ ul.product_list.grid {
&.wishlist { &.wishlist {
border-right:1px solid $base-border-color; border-right:1px solid $base-border-color;
a:before {
display:inline-block;
font-family:$font-icon;
content:"";
margin-right:3px;
}
a.ckecked:before {
content:"";
}
@media (min-width: $screen-md) and (max-width: $screen-md-max) { // min 992px max 1199px @media (min-width: $screen-md) and (max-width: $screen-md-max) { // min 992px max 1199px
border-right:0; border-right:0;
i {display:none;} a:before {display:none;}
} }
@media (min-width: $screen-xs) and (max-width: $screen-xs-max) { // min 480px max 767px @media (min-width: $screen-xs) and (max-width: $screen-xs-max) { // min 480px max 767px
border-right:0; border-right:0;
i {display:none;} a:before {display:none;}
} }
} }
@@ -225,7 +253,7 @@ ul.product_list.grid {
} }
.quick-view {display:block;} .quick-view {display:block;}
} }
.functional-buttons, .button-container {display:block} .functional-buttons, .button-container, .comments_note {display:block}
} }
} }
} }
@@ -248,7 +276,7 @@ ul.product_list.grid {
margin-bottom:0; margin-bottom:0;
&.hovered { &.hovered {
margin-bottom:-289px; margin-bottom:-320px;
padding-bottom:250px; padding-bottom:250px;
} }
} }
@@ -305,6 +333,9 @@ ul.product_list.list {
@media (max-width: $screen-xs - 1) { // max 479px @media (max-width: $screen-xs - 1) { // max 479px
width:100%; width:100%;
} }
.comments_note {
margin-bottom:12px;
}
} }
.right-block { .right-block {
@@ -382,29 +413,39 @@ ul.product_list.list {
} }
} }
a, label { a, label {
font-weight:bold; font-weight:bold;
color:#777676; color:#777676;
cursor:pointer; cursor:pointer;
}
.wishlist {
a:before {
content:"";
font-family:$font-icon;
width:30px;
height:30px;
font-size:15px;
text-align:center;
display:inline-block;
background:#929292;
color:$light-text-color;
padding:7px 0 0 0;
@include border-radius(100px);
margin-right:3px;
font-weight:normal;
margin-right:7px;
}
a:hover {
color:$base-text-color;
i { &:before {
width:30px; background:$dark-background;
height:30px; }
font-size:15px; }
text-align:center; a.ckecked {
display:inline-block; &:before {
background:#929292; content:"";
color:$light-text-color; }
padding:7px 0 0 0; }
@include border-radius(100px);
margin-right:3px;
}
&:hover {
color:$base-text-color;
i {
background:$dark-background;
}
}
} }
.compare { .compare {
@@ -483,7 +524,7 @@ ul.product_list.list {
@media (min-width: $screen-lg) { // min 1200px @media (min-width: $screen-lg) { // min 1200px
&.hovered { &.hovered {
margin-bottom:-290px; margin-bottom:-300px;
} }
} }
.availability {display:none;} .availability {display:none;}
@@ -495,8 +536,8 @@ ul.product_list.list {
margin-bottom:0; margin-bottom:0;
&.hovered { &.hovered {
margin-bottom:-290px; margin-bottom:-300px;
padding-bottom:250px; padding-bottom:230px;
} }
} }
} }