diff --git a/admin-dev/themes/default/template/controllers/login/content.tpl b/admin-dev/themes/default/template/controllers/login/content.tpl index 19608a75c..a485df33e 100755 --- a/admin-dev/themes/default/template/controllers/login/content.tpl +++ b/admin-dev/themes/default/template/controllers/login/content.tpl @@ -142,7 +142,7 @@
- diff --git a/admin-dev/themes/default/template/controllers/modules/js.tpl b/admin-dev/themes/default/template/controllers/modules/js.tpl index 19d0935da..799f285b1 100644 --- a/admin-dev/themes/default/template/controllers/modules/js.tpl +++ b/admin-dev/themes/default/template/controllers/modules/js.tpl @@ -247,10 +247,10 @@ catch(e){} return false; } - $('#module_type_filter').change(function() { setFilter(); }); - $('#module_install_filter').change(function() { setFilter(); }); - $('#module_status_filter').change(function() { setFilter(); }); - $('#country_module_value_filter').change(function() { setFilter(); }); + + $(document).on('change', '#module_type_filter, #module_install_filter, #module_status_filter, #country_module_value_filter', function() { + setFilter(); + }); $('.moduleTabPreferencesChoise').change(function() { diff --git a/classes/Search.php b/classes/Search.php index 4edd58879..f578d1743 100644 --- a/classes/Search.php +++ b/classes/Search.php @@ -394,16 +394,47 @@ class SearchCore return $features; } - protected static function getProductsToIndex($total_languages, $id_product = false, $limit = 50) + protected static function getProductsToIndex($total_languages, $id_product = false, $limit = 50, $weight_array = array()) { // Adjust the limit to get only "whole" products, in every languages (and at least one) $max_possibilities = $total_languages * count(Shop::getShops(true)); $limit = max($max_possibilities, floor($limit / $max_possibilities) * $max_possibilities); - return Db::getInstance()->executeS(' - SELECT p.id_product, pl.id_lang, pl.id_shop, pl.name pname, p.reference, p.ean13, p.upc, - pl.description_short, pl.description, cl.name cname, m.name mname, l.iso_code - FROM '._DB_PREFIX_.'product p + $sql = 'SELECT p.id_product, pl.id_lang, pl.id_shop, pl.name pname, p.reference, p.ean13, p.upc, + pl.description_short, pl.description, cl.name cname, m.name mname, l.iso_code'; + + if (is_array($weight_array)) + foreach($weight_array as $key => $weight) + if ((int)$weight) + switch($key) + { + case 'pname': + $sql .= ', pl.name pname'; + break; + case 'reference': + $sql .= ', p.reference'; + break; + case 'ean13': + $sql .= ', p.ean13'; + break; + case 'upc': + $sql .= ', p.upc'; + break; + case 'description_short': + $sql .= ', pl.description_short'; + break; + case 'description': + $sql .= ', pl.description'; + break; + case 'cname': + $sql .= ', cl.name cname'; + break; + case 'mname': + $sql .= ', m.name mname'; + break; + } + + $sql .= ' FROM '._DB_PREFIX_.'product p LEFT JOIN '._DB_PREFIX_.'product_lang pl ON p.id_product = pl.id_product '.Shop::addSqlAssociation('product', 'p').' @@ -416,8 +447,8 @@ class SearchCore WHERE product_shop.indexed = 0 AND product_shop.visibility IN ("both", "search") '.($id_product ? 'AND p.id_product = '.(int)$id_product : '').' - LIMIT '.(int)$limit - ); + LIMIT '.(int)$limit; + return Db::getInstance()->executeS($sql); } public static function indexation($full = false, $id_product = false) @@ -490,15 +521,18 @@ class SearchCore $total_languages = count(Language::getLanguages(false)); // Products are processed 50 by 50 in order to avoid overloading MySQL - while (($products = Search::getProductsToIndex($total_languages, $id_product, 50)) && (count($products) > 0)) + while (($products = Search::getProductsToIndex($total_languages, $id_product, 50, $weight_array)) && (count($products) > 0)) { $products_array = array(); // Now each non-indexed product is processed one by one, langage by langage foreach ($products as $product) { - $product['tags'] = Search::getTags($db, (int)$product['id_product'], (int)$product['id_lang']); - $product['attributes'] = Search::getAttributes($db, (int)$product['id_product'], (int)$product['id_lang']); - $product['features'] = Search::getFeatures($db, (int)$product['id_product'], (int)$product['id_lang']); + if ((int)$weight_array['tags']) + $product['tags'] = Search::getTags($db, (int)$product['id_product'], (int)$product['id_lang']); + if ((int)$weight_array['attributes']) + $product['attributes'] = Search::getAttributes($db, (int)$product['id_product'], (int)$product['id_lang']); + if ((int)$weight_array['features']) + $product['features'] = Search::getFeatures($db, (int)$product['id_product'], (int)$product['id_lang']); // Data must be cleaned of html, bad characters, spaces and anything, then if the resulting words are long enough, they're added to the array $product_array = array(); diff --git a/controllers/admin/AdminSearchConfController.php b/controllers/admin/AdminSearchConfController.php index 88b0eb844..e1b891b60 100644 --- a/controllers/admin/AdminSearchConfController.php +++ b/controllers/admin/AdminSearchConfController.php @@ -130,7 +130,8 @@ class AdminSearchConfControllerCore extends AdminController 'info' => $this->l('The "weight" represents its importance and relevance for the ranking of the products when completing a new search.').'
'.$this->l('A word with a weight of eight will have four times more value than a word with a weight of two.').'

- '.$this->l('We advise you to set a greater weight for words which appear in the name or reference of a product. This will allow the search results to be as precise and relevant as possible.'), + '.$this->l('We advise you to set a greater weight for words which appear in the name or reference of a product. This will allow the search results to be as precise and relevant as possible.').'

+ '.$this->l('Setting a weight to 0 will exclude that field from search index. Re-build of the entire index is required when changing to or from 0'), 'fields' => array( 'PS_SEARCH_WEIGHT_PNAME' => array( 'title' => $this->l('Product name weight'), diff --git a/controllers/front/CompareController.php b/controllers/front/CompareController.php index d88826c8d..09f819c5a 100644 --- a/controllers/front/CompareController.php +++ b/controllers/front/CompareController.php @@ -138,9 +138,10 @@ class CompareControllerCore extends FrontController 'product_features' => $listFeatures, 'products' => $listProducts, 'width' => $width, + 'HOOK_COMPARE_EXTRA_INFORMATION' => Hook::exec('displayCompareExtraInformation', array('list_ids_product' => $ids)), + 'HOOK_EXTRA_PRODUCT_COMPARISON' => Hook::exec('displayProductComparison', array('list_ids_product' => $ids)), 'homeSize' => Image::getSize(ImageType::getFormatedName('home')) )); - $this->context->smarty->assign('HOOK_EXTRA_PRODUCT_COMPARISON', Hook::exec('displayProductComparison', array('list_ids_product' => $ids))); } elseif (isset($this->context->cookie->id_compare)) { diff --git a/install-dev/upgrade/upgrade.php b/install-dev/upgrade/upgrade.php index b51c04d4e..191b66c11 100644 --- a/install-dev/upgrade/upgrade.php +++ b/install-dev/upgrade/upgrade.php @@ -346,7 +346,7 @@ if (empty($fail_result)) if (strpos($phpString, '::') === false) { $func_name = str_replace($pattern[0], '', $php[0]); - require_once(_PS_INSTALLER_PHP_UPGRADE_DIR_.$func_name.'.php'); + require_once(_PS_INSTALLER_PHP_UPGRADE_DIR_.Tools::strtolower($func_name).'.php'); $phpRes = call_user_func_array($func_name, $parameters); } /* Or an object method */ diff --git a/themes/default-bootstrap/css/comparator.css b/themes/default-bootstrap/css/comparator.css index 3715b7e0c..44642a120 100644 --- a/themes/default-bootstrap/css/comparator.css +++ b/themes/default-bootstrap/css/comparator.css @@ -20,7 +20,7 @@ table#product_comparison tbody tr td.comparison_infos div.center { table#product_comparison tbody tr td.td_empty { vertical-align: bottom; } -table#product_comparison tbody tr td.td_empty span { +table#product_comparison tbody tr td.td_empty > span { font: 600 18px/22px "Open Sans", sans-serif; text-transform: uppercase; color: #555454; @@ -95,6 +95,51 @@ table#product_comparison .product-rating { margin-bottom: 20px; } +#stOCClose { + width: 29px !important; + height: 29px !important; +} + +.stButton .stFb, .stButton .stTwbutton, .stButton .stMainServices { + height: 22px !important; +} + +.stButton .stButton_gradient { + height: 22px !important; +} + +@media (min-width: 1200px) { + .share { + margin-bottom: 315px; + } +} +@media (min-width: 992px) and (max-width: 1199px) { + .share { + margin-bottom: 315px; + } +} +@media (min-width: 768px) and (max-width: 991px) { + .share { + margin-bottom: 315px; + } +} +.share strong { + display: block; + margin-bottom: 10px; +} + +.share > div { + margin-bottom: 8px; +} + +.stArrow { + display: none !important; +} + +.stButton { + margin-left: 0 !important; +} + #product_comparison .comparison_feature .product_name { display: none; } diff --git a/themes/default-bootstrap/footer.tpl b/themes/default-bootstrap/footer.tpl index 63d62cee5..f572a7af1 100644 --- a/themes/default-bootstrap/footer.tpl +++ b/themes/default-bootstrap/footer.tpl @@ -23,16 +23,16 @@ * International Registered Trademark & Property of PrestaShop SA *} {if !$content_only} -
- {if isset($right_column_size) && !empty($right_column_size)} - -
- {$HOOK_RIGHT_COLUMN} -
- {/if} - - - + + {if isset($right_column_size) && !empty($right_column_size)} + +
+ {$HOOK_RIGHT_COLUMN} +
+ {/if} + + +
@@ -40,8 +40,8 @@ {$HOOK_FOOTER}
-
- + + {/if} diff --git a/themes/default-bootstrap/header.tpl b/themes/default-bootstrap/header.tpl index c63b54d15..fd7fa552c 100644 --- a/themes/default-bootstrap/header.tpl +++ b/themes/default-bootstrap/header.tpl @@ -27,22 +27,37 @@ - + {$meta_title|escape:'html':'UTF-8'} -{if isset($meta_description) AND $meta_description} - -{/if} -{if isset($meta_keywords) AND $meta_keywords} - -{/if} - - + {if isset($meta_description) AND $meta_description} + + {/if} + {if isset($meta_keywords) AND $meta_keywords} + + {/if} + - - - - - - - - - - - - -{if isset($css_files)} - {foreach from=$css_files key=css_uri item=media} - - {/foreach} -{/if} -{if isset($js_files)} - {foreach from=$js_files item=js_uri} - - {/foreach} -{/if} - - - - - - - - - + {if isset($js_files)} + {foreach from=$js_files item=js_uri} + + {/foreach} + {/if} + + + + + + + + + {$HOOK_HEADER} @@ -103,117 +104,124 @@ {/if}
-
- -
-
-
- {if $page_name !='index' && $page_name !='pagenotfound'} - {include file="$tpl_dir./breadcrumb.tpl"} - {/if} -
+
+ +
+ +
+
+ {if $page_name !='index' && $page_name !='pagenotfound'} + {include file="$tpl_dir./breadcrumb.tpl"} + {/if} +
{if isset($left_column_size) && !empty($left_column_size)} -
+
{$HOOK_LEFT_COLUMN} -
+
{/if} - -
+ +
{/if} \ No newline at end of file diff --git a/themes/default-bootstrap/js/modules/blockcart/ajax-cart.js b/themes/default-bootstrap/js/modules/blockcart/ajax-cart.js index 63e198425..23c36ec02 100644 --- a/themes/default-bootstrap/js/modules/blockcart/ajax-cart.js +++ b/themes/default-bootstrap/js/modules/blockcart/ajax-cart.js @@ -35,7 +35,7 @@ var ajaxCart = { overrideButtonsInThePage : function(){ //for every 'add' buttons... $('.ajax_add_to_cart_button').unbind('click').click(function(){ - var idProduct = $(this).attr('rel').replace('nofollow', '').replace('ajax_id_product_', ''); + var idProduct = $(this).data('id-product'); if ($(this).attr('disabled') != 'disabled') ajaxCart.add(idProduct, null, false, this); return false; diff --git a/themes/default-bootstrap/mobile/product-desc-features.tpl b/themes/default-bootstrap/mobile/product-desc-features.tpl index deca914b6..902de67e1 100644 --- a/themes/default-bootstrap/mobile/product-desc-features.tpl +++ b/themes/default-bootstrap/mobile/product-desc-features.tpl @@ -72,7 +72,20 @@ {assign var="btn_class" value="disabled"} {capture assign="btn_more"}{if (isset($accessory.quantity_all_versions) && $accessory.quantity_all_versions > 0)}{l s='Product available with different options'}{else}{if !$PS_CATALOG_MODE}{l s='Out of stock'}{/if}{/if}{/capture} {/if} - {l s='Add to cart'} + + {l s='Add to cart'} + {$btn_more}
diff --git a/themes/default-bootstrap/modules/blockcart/blockcart.tpl b/themes/default-bootstrap/modules/blockcart/blockcart.tpl index af543f92f..39ea46550 100644 --- a/themes/default-bootstrap/modules/blockcart/blockcart.tpl +++ b/themes/default-bootstrap/modules/blockcart/blockcart.tpl @@ -215,7 +215,7 @@ var generated_date = {$smarty.now|intval};
{/if}
- {l s='Total shipping (tax exclu.):' mod='blockcart'} + {l s='Total shipping (tax excl.):' mod='blockcart'} {if $shipping_cost_float == 0}{l s='Free shipping!' mod='blockcart'}{else}{$shipping_cost}{/if}
{if $show_tax && isset($tax_cost)} @@ -230,7 +230,7 @@ var generated_date = {$smarty.now|intval};
{l s='Continue shopping' mod='blockcart'} - {l s='Proceed to checkout' mod='blockcart'} + {l s='Proceed to checkout' mod='blockcart'}
diff --git a/themes/default-bootstrap/modules/blockwishlist/view.tpl b/themes/default-bootstrap/modules/blockwishlist/view.tpl index f66fcf265..4ceaa44c6 100644 --- a/themes/default-bootstrap/modules/blockwishlist/view.tpl +++ b/themes/default-bootstrap/modules/blockwishlist/view.tpl @@ -23,88 +23,100 @@ * International Registered Trademark & Property of PrestaShop SA *}
-

{l s='Wishlist' mod='blockwishlist'}

-{if $wishlists} -

- {l s='Other wishlists of' mod='blockwishlist'} {$current_wishlist.firstname} {$current_wishlist.lastname}: - {foreach from=$wishlists item=wishlist name=i} - {if $wishlist.id_wishlist != $current_wishlist.id_wishlist} - {$wishlist.name} - {if !$smarty.foreach.i.last} - / +

{l s='Wishlist' mod='blockwishlist'}

+ {if $wishlists} +

+ {l s='Other wishlists of' mod='blockwishlist'} {$current_wishlist.firstname} {$current_wishlist.lastname}: + {foreach from=$wishlists item=wishlist name=i} + {if $wishlist.id_wishlist != $current_wishlist.id_wishlist} + {$wishlist.name} + {if !$smarty.foreach.i.last} + / + {/if} {/if} - {/if} - {/foreach} -

-{/if} + {/foreach} +

+ {/if} -
- {assign var='nbItemsPerLine' value=3} - {assign var='nbItemsPerLineTablet' value=2} - {assign var='nbLi' value=$products|@count} - {math equation="nbLi/nbItemsPerLine" nbLi=$nbLi nbItemsPerLine=$nbItemsPerLine assign=nbLines} - {math equation="nbLi/nbItemsPerLineTablet" nbLi=$nbLi nbItemsPerLineTablet=$nbItemsPerLineTablet assign=nbLinesTablet} -
    - {foreach from=$products item=product name=i} - {math equation="(total%perLine)" total=$smarty.foreach.i.total perLine=$nbItemsPerLine assign=totModulo} - {math equation="(total%perLineT)" total=$smarty.foreach.i.total perLineT=$nbItemsPerLineTablet assign=totModuloTablet} - {if $totModulo == 0}{assign var='totModulo' value=$nbItemsPerLine}{/if} - {if $totModuloTablet == 0}{assign var='totModuloTablet' value=$nbItemsPerLineTablet}{/if} -
  • -
    -
    -
    - - {$product.name|escape:'html':'UTF-8'} - -
    -
    -
    -
    -

    - {$product.name|truncate:30:'...'|escape:'html':'UTF-8'} - {if isset($product.attributes_small)} - {$product.attributes_small|escape:'html':'UTF-8'} - {/if} -

    -
    -

    - - -

    -

    - - -

    -
    - {if isset($product.attribute_quantity) AND $product.attribute_quantity >= 1 OR !isset($product.attribute_quantity) AND $product.product_quantity >= 1} - {if !$ajax} -
    - -
    - {/if} - {l s='Add to cart' mod='blockwishlist'} - {else} - {l s='Add to cart' mod='blockwishlist'} - {/if} - {l s='View' mod='blockwishlist'} -
    -
    -
    -
    -
    -
    • - {/foreach} -
-
- -
+
+ {assign var='nbItemsPerLine' value=3} + {assign var='nbItemsPerLineTablet' value=2} + {assign var='nbLi' value=$products|@count} + {math equation="nbLi/nbItemsPerLine" nbLi=$nbLi nbItemsPerLine=$nbItemsPerLine assign=nbLines} + {math equation="nbLi/nbItemsPerLineTablet" nbLi=$nbLi nbItemsPerLineTablet=$nbItemsPerLineTablet assign=nbLinesTablet} +
    + {foreach from=$products item=product name=i} + {math equation="(total%perLine)" total=$smarty.foreach.i.total perLine=$nbItemsPerLine assign=totModulo} + {math equation="(total%perLineT)" total=$smarty.foreach.i.total perLineT=$nbItemsPerLineTablet assign=totModuloTablet} + {if $totModulo == 0}{assign var='totModulo' value=$nbItemsPerLine}{/if} + {if $totModuloTablet == 0}{assign var='totModuloTablet' value=$nbItemsPerLineTablet}{/if} +
  • +
    +
    +
    + + {$product.name|escape:'html':'UTF-8'} + +
    +
    +
    +
    +

    + {$product.name|truncate:30:'...'|escape:'html':'UTF-8'} + {if isset($product.attributes_small)} + {$product.attributes_small|escape:'html':'UTF-8'} + {/if} +

    +
    +

    + + +

    +

    + + +

    +
    + {if isset($product.attribute_quantity) AND $product.attribute_quantity >= 1 OR !isset($product.attribute_quantity) AND $product.product_quantity >= 1} + {if !$ajax} +
    + +
    + {/if} + + {l s='Add to cart' mod='blockwishlist'} + + {else} + {l s='Add to cart' mod='blockwishlist'} + {/if} + + {l s='View' mod='blockwishlist'} + +
    +
    +
    +
    +
    +
    • + {/foreach} +
+
+
\ No newline at end of file diff --git a/themes/default-bootstrap/product-list.tpl b/themes/default-bootstrap/product-list.tpl index 35dcb8253..ee6152b40 100644 --- a/themes/default-bootstrap/product-list.tpl +++ b/themes/default-bootstrap/product-list.tpl @@ -22,104 +22,119 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} + {if isset($products)} {*define numbers of product per line in other page for desktop*} {if $page_name !='index' && $page_name !='product'} {assign var='nbItemsPerLine' value=3} - {assign var='nbItemsPerLineTablet' value=2} - {assign var='nbItemsPerLineMobile' value=3} - {else} - {assign var='nbItemsPerLine' value=4} - {assign var='nbItemsPerLineTablet' value=3} - {assign var='nbItemsPerLineMobile' value=2} - {/if} - {*define numbers of product per line in other page for tablet*} - {assign var='nbLi' value=$products|@count} - {math equation="nbLi/nbItemsPerLine" nbLi=$nbLi nbItemsPerLine=$nbItemsPerLine assign=nbLines} - {math equation="nbLi/nbItemsPerLineTablet" nbLi=$nbLi nbItemsPerLineTablet=$nbItemsPerLineTablet assign=nbLinesTablet} + {assign var='nbItemsPerLineTablet' value=2} + {assign var='nbItemsPerLineMobile' value=3} + {else} + {assign var='nbItemsPerLine' value=4} + {assign var='nbItemsPerLineTablet' value=3} + {assign var='nbItemsPerLineMobile' value=2} + {/if} + {*define numbers of product per line in other page for tablet*} + {assign var='nbLi' value=$products|@count} + {math equation="nbLi/nbItemsPerLine" nbLi=$nbLi nbItemsPerLine=$nbItemsPerLine assign=nbLines} + {math equation="nbLi/nbItemsPerLineTablet" nbLi=$nbLi nbItemsPerLineTablet=$nbItemsPerLineTablet assign=nbLinesTablet}
    {foreach from=$products item=product name=products} - {math equation="(total%perLine)" total=$smarty.foreach.products.total perLine=$nbItemsPerLine assign=totModulo} - {math equation="(total%perLineT)" total=$smarty.foreach.products.total perLineT=$nbItemsPerLineTablet assign=totModuloTablet} - {math equation="(total%perLineT)" total=$smarty.foreach.products.total perLineT=$nbItemsPerLineMobile assign=totModuloMobile} - {if $totModulo == 0}{assign var='totModulo' value=$nbItemsPerLine}{/if} - {if $totModuloTablet == 0}{assign var='totModuloTablet' value=$nbItemsPerLineTablet}{/if} - {if $totModuloMobile == 0}{assign var='totModuloMobile' value=$nbItemsPerLineMobile}{/if} + {math equation="(total%perLine)" total=$smarty.foreach.products.total perLine=$nbItemsPerLine assign=totModulo} + {math equation="(total%perLineT)" total=$smarty.foreach.products.total perLineT=$nbItemsPerLineTablet assign=totModuloTablet} + {math equation="(total%perLineT)" total=$smarty.foreach.products.total perLineT=$nbItemsPerLineMobile assign=totModuloMobile} + {if $totModulo == 0}{assign var='totModulo' value=$nbItemsPerLine}{/if} + {if $totModuloTablet == 0}{assign var='totModuloTablet' value=$nbItemsPerLineTablet}{/if} + {if $totModuloMobile == 0}{assign var='totModuloMobile' value=$nbItemsPerLineMobile}{/if}
  • -
    -
    -
    - - {if !empty($product.legend)}{$product.legend|escape:'html':'UTF-8'}{else}{$product.name|escape:'html':'UTF-8'}{/if} - - {if isset($quick_view) && $quick_view}Quick view{/if} - {if (!$PS_CATALOG_MODE AND ((isset($product.show_price) && $product.show_price) || (isset($product.available_for_order) && $product.available_for_order)))} -
    - {if isset($product.show_price) && $product.show_price && !isset($restricted_country_mode)} - {if !$priceDisplay}{convertPrice price=$product.price}{else}{convertPrice price=$product.price_tax_exc}{/if} - {if isset($product.specific_prices) && $product.specific_prices} - {displayWtPrice p=$product.price_without_reduction} - {if isset($product.specific_prices.reduction) && $product.specific_prices.reduction && $product.specific_prices.reduction_type == 'percentage'}-{$product.specific_prices.reduction * 100}%{/if} - {/if} - {/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.pack_quantity) && $product.pack_quantity}{$product.pack_quantity|intval|cat:' x '}{/if}{$product.name|truncate:45:'...'|escape:'html':'UTF-8'}
    - {hook h='displayProductListReviews' product=$product} -

    {$product.description_short|strip_tags:'UTF-8'|truncate:360:'...'}

    - {if (!$PS_CATALOG_MODE AND ((isset($product.show_price) && $product.show_price) || (isset($product.available_for_order) && $product.available_for_order)))} -
    - {if isset($product.show_price) && $product.show_price && !isset($restricted_country_mode)} - {if !$priceDisplay}{convertPrice price=$product.price}{else}{convertPrice price=$product.price_tax_exc}{/if} - {if isset($product.specific_prices) && $product.specific_prices} - {displayWtPrice p=$product.price_without_reduction} - {if isset($product.specific_prices.reduction) && $product.specific_prices.reduction && $product.specific_prices.reduction_type == 'percentage'}-{$product.specific_prices.reduction * 100}%{/if} - {/if} - {/if} -
    - {/if} -
    - {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 isset($static_token)} - {l s='Add to cart'} - {else} - {l s='Add to cart'} - {/if} - {else} - {l s='Add to cart'} - {/if} - {/if} - {l s='More'} -
    - - {if isset($product.color_list)}
    {$product.color_list}
    {/if} -
    - {if (!$PS_CATALOG_MODE AND ((isset($product.show_price) && $product.show_price) || (isset($product.available_for_order) && $product.available_for_order)))} - {if isset($product.online_only) && $product.online_only}{l s='Online only'}{/if} - {/if} - {if isset($product.on_sale) && $product.on_sale && isset($product.show_price) && $product.show_price && !$PS_CATALOG_MODE} - {elseif isset($product.reduction) && $product.reduction && isset($product.show_price) && $product.show_price && !$PS_CATALOG_MODE}{l s='Reduced price!'}{/if} -
    - {if (!$PS_CATALOG_MODE AND ((isset($product.show_price) && $product.show_price) || (isset($product.available_for_order) && $product.available_for_order)))} - {if isset($product.available_for_order) && $product.available_for_order && !isset($restricted_country_mode)}{if ($product.allow_oosp || $product.quantity > 0)}{l s='In Stock'}{elseif (isset($product.quantity_all_versions) && $product.quantity_all_versions > 0)}{l s='Product available with different options'}{else}{l s='Out of stock'}{/if}{/if} - {/if} -
    -
    +
    +
    +
    + + {if !empty($product.legend)}{$product.legend|escape:'html':'UTF-8'}{else}{$product.name|escape:'html':'UTF-8'}{/if} + + {if isset($quick_view) && $quick_view}Quick view{/if} + {if (!$PS_CATALOG_MODE AND ((isset($product.show_price) && $product.show_price) || (isset($product.available_for_order) && $product.available_for_order)))} +
    + {if isset($product.show_price) && $product.show_price && !isset($restricted_country_mode)} + {if !$priceDisplay}{convertPrice price=$product.price}{else}{convertPrice price=$product.price_tax_exc}{/if} + {if isset($product.specific_prices) && $product.specific_prices} + {displayWtPrice p=$product.price_without_reduction} + {if isset($product.specific_prices.reduction) && $product.specific_prices.reduction && $product.specific_prices.reduction_type == 'percentage'}-{$product.specific_prices.reduction * 100}%{/if} + {/if} + {/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.pack_quantity) && $product.pack_quantity}{$product.pack_quantity|intval|cat:' x '}{/if}{$product.name|truncate:45:'...'|escape:'html':'UTF-8'}
    + {hook h='displayProductListReviews' product=$product} +

    {$product.description_short|strip_tags:'UTF-8'|truncate:360:'...'}

    + {if (!$PS_CATALOG_MODE AND ((isset($product.show_price) && $product.show_price) || (isset($product.available_for_order) && $product.available_for_order)))} +
    + {if isset($product.show_price) && $product.show_price && !isset($restricted_country_mode)} + {if !$priceDisplay}{convertPrice price=$product.price}{else}{convertPrice price=$product.price_tax_exc}{/if} + {if isset($product.specific_prices) && $product.specific_prices} + {displayWtPrice p=$product.price_without_reduction} + {if isset($product.specific_prices.reduction) && $product.specific_prices.reduction && $product.specific_prices.reduction_type == 'percentage'}-{$product.specific_prices.reduction * 100}%{/if} + {/if} + {/if} +
    + {/if} +
    + {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 isset($static_token)} + + {l s='Add to cart'} + + {else} + + {l s='Add to cart'} + + {/if} + {else} + {l s='Add to cart'} + {/if} + {/if} + {l s='More'} +
    + + {if isset($product.color_list)}
    {$product.color_list}
    {/if} +
    + {if (!$PS_CATALOG_MODE AND ((isset($product.show_price) && $product.show_price) || (isset($product.available_for_order) && $product.available_for_order)))} + {if isset($product.online_only) && $product.online_only}{l s='Online only'}{/if} + {/if} + {if isset($product.on_sale) && $product.on_sale && isset($product.show_price) && $product.show_price && !$PS_CATALOG_MODE} + {elseif isset($product.reduction) && $product.reduction && isset($product.show_price) && $product.show_price && !$PS_CATALOG_MODE}{l s='Reduced price!'}{/if} +
    + {if (!$PS_CATALOG_MODE AND ((isset($product.show_price) && $product.show_price) || (isset($product.available_for_order) && $product.available_for_order)))} + {if isset($product.available_for_order) && $product.available_for_order && !isset($restricted_country_mode)}{if ($product.allow_oosp || $product.quantity > 0)}{l s='In Stock'}{elseif (isset($product.quantity_all_versions) && $product.quantity_all_versions > 0)}{l s='Product available with different options'}{else}{l s='Out of stock'}{/if}{/if} + {/if} +
    +
    {hook h='displayProductListFunctionalButtons' product=$product} - {if isset($comparator_max_item) && $comparator_max_item} -
    - {l s='Add to Compare'} -
    - {/if} -
    -
    + {if isset($comparator_max_item) && $comparator_max_item} +
    + {l s='Add to Compare'} +
    + {/if} +
    +
    • {/foreach}
@@ -129,10 +144,10 @@ var comparator_max_item = {$comparator_max_item}; var comparedProductsIds = []; {foreach from=$compared_products key=k item=product}comparedProductsIds.push({$product});{/foreach} - $('document').ready(function(){ - blockHover(); - }); - + $('document').ready(function(){ + blockHover(); + }); + {/if} + {if $page_name !='index' && $page_name !='product'} + //--> {/if} {/if} diff --git a/themes/default-bootstrap/product.tpl b/themes/default-bootstrap/product.tpl index 9899fbdac..650a51947 100644 --- a/themes/default-bootstrap/product.tpl +++ b/themes/default-bootstrap/product.tpl @@ -180,31 +180,31 @@ var contentOnly = {if $content_only}true{else}false{/if} {$confirmation}

{/if} - + - +
- +
- - {if $product->on_sale} + + {if $product->on_sale} {l s='Sale!'} {elseif $product->specificPrice AND $product->specificPrice.reduction AND $productPriceWithoutReduction > $productPrice} {l s='Reduced price!'} {/if} - + {if $have_image} {if $jqZoomEnabled && $have_image && !$content_only} - - {if !empty($cover.legend)}{$cover.legend|escape:'html'}{else}{$product->name|escape:'html'}{/if} - - {else} - {if !empty($cover.legend)}{$cover.legend|escape:'html'}{else}{$product->name|escape:'html'}{/if} + + {if !empty($cover.legend)}{$cover.legend|escape:'html'}{else}{$product->name|escape:'html'}{/if} + + {else} + {if !empty($cover.legend)}{$cover.legend|escape:'html'}{else}{$product->name|escape:'html'}{/if} {if !$content_only}{l s='View larger'}{/if} - {/if} + {/if} {else} @@ -240,18 +240,18 @@ var contentOnly = {if $content_only}true{else}false{/if}
{/if} {if isset($images) && count($images) > 1}

{/if} + {l s='Display all pictures'}

{/if}
- + - +
- - {if $product->online_only} + + {if $product->online_only}

{l s='Online only'}

{/if} - +

{$product->name|escape:'html':'UTF-8'}

reference}style="display: none;"{/if}> @@ -266,18 +266,18 @@ var contentOnly = {if $content_only}true{else}false{/if}

{l s='More details'}

{/if}
{/if} @@ -290,22 +290,22 @@ var contentOnly = {if $content_only}true{else}false{/if} quantity == 1} style="display: none;"{/if} id="quantityAvailableTxtMultiple">{l s='Items'}

{/if} - +

quantity <= 0 && !$product->available_later && $allow_oosp) OR ($product->quantity > 0 && !$product->available_now) OR !$product->available_for_order OR $PS_CATALOG_MODE} style="display: none;"{/if}> {*{l s='Availability:'}*} quantity <= 0} class="warning_inline"{/if}>{if $product->quantity <= 0}{if $allow_oosp}{$product->available_later}{else}{l s='This product is no longer in stock'}{/if}{else}{$product->available_now}{/if}

- +

quantity > $last_qties OR $product->quantity <= 0) OR $allow_oosp OR !$product->available_for_order OR $PS_CATALOG_MODE} style="display: none"{/if} >{l s='Warning: Last items in stock!'}

- +

quantity > 0) OR !$product->available_for_order OR $PS_CATALOG_MODE OR !isset($product->available_date) OR $product->available_date < $smarty.now|date_format:'%Y-%m-%d'} style="display: none;"{/if}> {l s='Availability date:'} {dateFormat date=$product->available_date full=false}

- - + +
quantity > 0} style="display: none;"{/if}> @@ -325,7 +325,7 @@ var contentOnly = {if $content_only}true{else}false{/if}
{/if}*} - + {if ($product->show_price AND !isset($restricted_country_mode)) OR isset($groups) OR $product->reference OR (isset($HOOK_PRODUCT_ACTIONS) && $HOOK_PRODUCT_ACTIONS)} @@ -340,30 +340,30 @@ var contentOnly = {if $content_only}true{else}false{/if} {/if} {if isset($HOOK_EXTRA_RIGHT) && $HOOK_EXTRA_RIGHT}{$HOOK_EXTRA_RIGHT}{/if} - {if !$content_only} - + {if !$content_only} + - {/if} + {/if}
- - - - + + + +
-
+
- {if $product->show_price AND !isset($restricted_country_mode) AND !$PS_CATALOG_MODE} + {if $product->show_price AND !isset($restricted_country_mode) AND !$PS_CATALOG_MODE}

- quantity <= 0}href="http://schema.org/OutOfStock"{else}href="http://schema.org/InStock"{/if}> + quantity <= 0}href="http://schema.org/OutOfStock"{else}href="http://schema.org/InStock"{/if}> {if $priceDisplay >= 0 && $priceDisplay <= 2} {convertPrice price=$productPrice}

quantity <= 0) OR $virtual OR !$product->available_for_order OR $PS_CATALOG_MODE} style="display: none;"{/if}> - - - minimal_quantity > 1}onkeyup="checkMinimalQuantity({$product->minimal_quantity});"{/if} /> - - + + + minimal_quantity > 1}onkeyup="checkMinimalQuantity({$product->minimal_quantity});"{/if} /> + +

- +

minimal_quantity <= 1 OR !$product->available_for_order OR $PS_CATALOG_MODE} style="display: none;"{/if}> @@ -441,7 +441,7 @@ var contentOnly = {if $content_only}true{else}false{/if} checkMinimalQuantity(); {/if} - + {if isset($groups)}

@@ -491,37 +491,37 @@ var contentOnly = {if $content_only}true{else}false{/if} {/foreach}
{/if} - - + +
- -
- -

quantity <= 0) OR !$product->available_for_order OR (isset($restricted_country_mode) AND $restricted_country_mode) OR $PS_CATALOG_MODE}style="display:none"{/if} class="buttons_bottom_block"> - + +

+ +

quantity <= 0) OR !$product->available_for_order OR (isset($restricted_country_mode) AND $restricted_country_mode) OR $PS_CATALOG_MODE}style="display:none"{/if} class="buttons_bottom_block"> +

{if isset($HOOK_PRODUCT_ACTIONS) && $HOOK_PRODUCT_ACTIONS}{$HOOK_PRODUCT_ACTIONS}{/if} - -
- -
- -
- - + +
+ +
+ +
+ +
{if !$content_only} {if $product->description} -
-

{l s='More info'}

{/if} - {if isset($product) && $product->description} - -
{$product->description}
-
+
+

{l s='More info'}

{/if} + {if isset($product) && $product->description} + +
{$product->description}
+
{/if} @@ -533,12 +533,12 @@ var contentOnly = {if $content_only}true{else}false{/if} {if isset($features) && $features} {foreach from=$features item=feature} - - {if isset($feature.value)} - - {/if} + + {if isset($feature.value)} + + {/if} - {/foreach} + {/foreach}
{$feature.name|escape:'html':'UTF-8'} {$feature.value|escape:'html':'UTF-8'}
{$feature.name|escape:'html':'UTF-8'} {$feature.value|escape:'html':'UTF-8'}
{/if} @@ -568,27 +568,36 @@ var contentOnly = {if $content_only}true{else}false{/if}
{$accessory.legend|escape:'html':'UTF-8'} - -
+ +
{$accessory.description_short|strip_tags|truncate:25:'...'}
-
+
{$accessory.name|truncate:20:'...':true|escape:'html':'UTF-8'}
- + {if $accessory.show_price AND !isset($restricted_country_mode) AND !$PS_CATALOG_MODE} - {if $priceDisplay != 1}{displayWtPrice p=$accessory.price}{else}{displayWtPrice p=$accessory.price_tax_exc}{/if}{/if} + {if $priceDisplay != 1}{displayWtPrice p=$accessory.price}{else}{displayWtPrice p=$accessory.price_tax_exc}{/if}{/if}
- +
{if !$PS_CATALOG_MODE && ($accessory.allow_oosp || $accessory.quantity > 0)} - - + +
+ + {/if}
@@ -609,39 +618,39 @@ var contentOnly = {if $content_only}true{else}false{/if}

{l s='Volume discounts'}

- - - - - - - + + + + + + + - {foreach from=$quantity_discounts item='quantity_discount' name='quantity_discounts'} - - - - - - - {/foreach} - + {foreach from=$quantity_discounts item='quantity_discount' name='quantity_discounts'} + + + + + + + {/foreach} +
{l s='Quantity'}{l s='Discount'}{l s='You Save'}
{l s='Quantity'}{l s='Discount'}{l s='You Save'}
{$quantity_discount.quantity|intval} - {if $quantity_discount.price >= 0 OR $quantity_discount.reduction_type == 'amount'} - {convertPrice price=$quantity_discount.real_value|floatval} - {else} - {$quantity_discount.real_value|floatval}% - {/if} - - {l s='Up to'} - {if $quantity_discount.price >= 0 OR $quantity_discount.reduction_type == 'amount'} - {$discountPrice=$productPrice-$quantity_discount.real_value|floatval} - {else} - {$discountPrice=$productPrice-($productPrice*$quantity_discount.reduction)|floatval} - {/if} - {$discountPrice=$discountPrice*$quantity_discount.quantity} - {$qtyProductPrice = $productPrice*$quantity_discount.quantity} - {convertPrice price=$qtyProductPrice-$discountPrice} -
{$quantity_discount.quantity|intval} + {if $quantity_discount.price >= 0 OR $quantity_discount.reduction_type == 'amount'} + {convertPrice price=$quantity_discount.real_value|floatval} + {else} + {$quantity_discount.real_value|floatval}% + {/if} + + {l s='Up to'} + {if $quantity_discount.price >= 0 OR $quantity_discount.reduction_type == 'amount'} + {$discountPrice=$productPrice-$quantity_discount.real_value|floatval} + {else} + {$discountPrice=$productPrice-($productPrice*$quantity_discount.reduction)|floatval} + {/if} + {$discountPrice=$discountPrice*$quantity_discount.quantity} + {$qtyProductPrice = $productPrice*$quantity_discount.quantity} + {convertPrice price=$qtyProductPrice-$discountPrice} +
{/if} @@ -656,12 +665,12 @@ var contentOnly = {if $content_only}true{else}false{/if} {if isset($attachments) && $attachments} -
-

{l s='Download'}

+
+

{l s='Download'}

{foreach from=$attachments item=attachment} {$attachment.name|escape:'html':'UTF-8'}
{$attachment.description|escape:'html':'UTF-8'} {/foreach} - +
{/if} @@ -729,7 +738,7 @@ var contentOnly = {if $content_only}true{else}false{/if} - +

diff --git a/themes/default-bootstrap/products-comparison.tpl b/themes/default-bootstrap/products-comparison.tpl index 9ad6999e9..76fbf314c 100644 --- a/themes/default-bootstrap/products-comparison.tpl +++ b/themes/default-bootstrap/products-comparison.tpl @@ -37,7 +37,8 @@
- {assign var='taxes_behavior' value=false} @@ -48,37 +49,37 @@ {assign var='replace_id' value=$product->id|cat:'|'} {/foreach} @@ -162,5 +169,4 @@ {/if} - + \ No newline at end of file diff --git a/themes/default-bootstrap/sass/comparator.scss b/themes/default-bootstrap/sass/comparator.scss index 811593a8a..e168cee7f 100644 --- a/themes/default-bootstrap/sass/comparator.scss +++ b/themes/default-bootstrap/sass/comparator.scss @@ -30,11 +30,11 @@ table#product_comparison { td.td_empty { vertical-align:bottom; - span { + > span { font:600 18px/22px $font-custom; text-transform:uppercase; color:#555454; - } + } } } } @@ -110,8 +110,46 @@ table#product_comparison { width:auto; } .footer_link { margin-bottom:20px;} - - +#stOCClose { + width:29px !important; + height:29px !important; +} +.stButton .stFb, .stButton .stTwbutton, .stButton .stMainServices { + height:22px !important; +} +.stButton .stButton_gradient { + height:22px !important; +} +@media (min-width: $screen-lg) { // min 1200px + .share { + margin-bottom:315px; + } +} +@media (min-width: $screen-md) and (max-width: $screen-md-max) { // min 992px max 1199px + .share { + margin-bottom:315px; + } +} +@media (min-width: $screen-sm) and (max-width: $screen-sm-max) { // min 768px max 991px + .share { + margin-bottom:315px; + } +} +.share { + strong { + display:block; + margin-bottom:10px; + } +} +.share > div { + margin-bottom:8px; +} +.stArrow { + display:none !important; +} +.stButton { + margin-left:0 !important; +} #product_comparison{ .comparison_feature{ .product_name{display: none;}
+ + {$HOOK_COMPARE_EXTRA_INFORMATION} {l s='Features:'} -
- -
-
- - {$product->name|escape:html:'UTF-8'} - - {if isset($product->show_price) && $product->show_price && !isset($restricted_country_mode) && !$PS_CATALOG_MODE} - {if $product->on_sale} -
{l s='Sale!'}
- {/if} - {/if} -
+
+ +
+
+ + {$product->name|escape:html:'UTF-8'} + + {if isset($product->show_price) && $product->show_price && !isset($restricted_country_mode) && !$PS_CATALOG_MODE} + {if $product->on_sale} +
{l s='Sale!'}
+ {/if} + {/if} +
{$product->name|truncate:45:'...'|escape:'html':'UTF-8'}
-
+
{if isset($product->show_price) && $product->show_price && !isset($restricted_country_mode) && !$PS_CATALOG_MODE} {convertPrice price=$product->getPrice($taxes_behavior)} {if isset($product->specificPrice) && $product->specificPrice} - {if {$product->specificPrice.reduction_type == 'percentage'}} - {displayWtPrice p=$product->getPrice($taxes_behavior)+($product->getPrice($taxes_behavior)* $product->specificPrice.reduction)} - -{$product->specificPrice.reduction*100|floatval}% - {else} - {convertPrice price=($product->getPrice($taxes_behavior) + $product->specificPrice.reduction)} - -{convertPrice price=$product->specificPrice.reduction} - {/if} - {/if} + {if {$product->specificPrice.reduction_type == 'percentage'}} + {displayWtPrice p=$product->getPrice($taxes_behavior)+($product->getPrice($taxes_behavior)* $product->specificPrice.reduction)} + -{$product->specificPrice.reduction*100|floatval}% + {else} + {convertPrice price=($product->getPrice($taxes_behavior) + $product->specificPrice.reduction)} + -{convertPrice price=$product->specificPrice.reduction} + {/if} + {/if} {if $product->on_sale} {elseif $product->specificPrice AND $product->specificPrice.reduction} -
- {l s='Reduced price!'} -
+
+ {l s='Reduced price!'} +
{/if} {if !empty($product->unity) && $product->unit_price_ratio > 0.000000} @@ -108,22 +109,28 @@ {/if}

-
-
- {if (!$product->hasAttributes() OR (isset($add_prod_display) AND ($add_prod_display == 1))) AND $product->minimal_quantity == 1 AND $product->customizable != 2 AND !$PS_CATALOG_MODE} - {if ($product->quantity > 0 OR $product->allow_oosp)} - id}&token={$static_token}&add")|escape:'html'}" title="{l s='Add to cart'}">{l s='Add to cart'} - {else} - {l s='Add to cart'} - {/if} - {else} - - {/if} - {l s='View'} -
-
- -
+
+
+ {if (!$product->hasAttributes() OR (isset($add_prod_display) AND ($add_prod_display == 1))) AND $product->minimal_quantity == 1 AND $product->customizable != 2 AND !$PS_CATALOG_MODE} + {if ($product->quantity > 0 OR $product->allow_oosp)} + id}&token={$static_token}&add")|escape:'html'}" + title="{l s='Add to cart'}"> + {l s='Add to cart'} + + {else} + {l s='Add to cart'} + {/if} + {else} + + {/if} + {l s='View'} +
+
+ +