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

Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6

Browse Source
This commit is contained in:
Damien Metzger
2013-12-04 16:06:55 +01:00
parent 2f088c4ac3 b450a9fa80
commit fa804b9bf8
17 changed files with 718 additions and 535 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/login/content.tpl
+1 -1
View File
@@ -142,7 +142,7 @@
</div> </div>
</div> </div>
<div class="panel-footer"> <div class="panel-footer">
<button href="#" class="btn btn-default show-login-form" tabindex="7"> <button type="button" href="#" class="btn btn-default show-login-form" tabindex="7">
<i class="icon-caret-left"></i> <i class="icon-caret-left"></i>
{l s='Back to login'} {l s='Back to login'}
</button> </button>
admin-dev/themes/default/template/controllers/modules/js.tpl
+4 -4
View File
@@ -247,10 +247,10 @@
catch(e){} catch(e){}
return false; return false;
} }
$('#module_type_filter').change(function() { setFilter(); });
$('#module_install_filter').change(function() { setFilter(); }); $(document).on('change', '#module_type_filter, #module_install_filter, #module_status_filter, #country_module_value_filter', function() {
$('#module_status_filter').change(function() { setFilter(); }); setFilter();
$('#country_module_value_filter').change(function() { setFilter(); }); });
$('.moduleTabPreferencesChoise').change(function() $('.moduleTabPreferencesChoise').change(function()
{ {
classes/Search.php
+42 -8
View File
@@ -394,16 +394,47 @@ class SearchCore
return $features; 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) // Adjust the limit to get only "whole" products, in every languages (and at least one)
$max_possibilities = $total_languages * count(Shop::getShops(true)); $max_possibilities = $total_languages * count(Shop::getShops(true));
$limit = max($max_possibilities, floor($limit / $max_possibilities) * $max_possibilities); $limit = max($max_possibilities, floor($limit / $max_possibilities) * $max_possibilities);
return Db::getInstance()->executeS(' $sql = 'SELECT p.id_product, pl.id_lang, pl.id_shop, pl.name pname, p.reference, p.ean13, p.upc,
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';
pl.description_short, pl.description, cl.name cname, m.name mname, l.iso_code
FROM '._DB_PREFIX_.'product p 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 LEFT JOIN '._DB_PREFIX_.'product_lang pl
ON p.id_product = pl.id_product ON p.id_product = pl.id_product
'.Shop::addSqlAssociation('product', 'p').' '.Shop::addSqlAssociation('product', 'p').'
@@ -416,8 +447,8 @@ class SearchCore
WHERE product_shop.indexed = 0 WHERE product_shop.indexed = 0
AND product_shop.visibility IN ("both", "search") AND product_shop.visibility IN ("both", "search")
'.($id_product ? 'AND p.id_product = '.(int)$id_product : '').' '.($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) public static function indexation($full = false, $id_product = false)
@@ -490,14 +521,17 @@ class SearchCore
$total_languages = count(Language::getLanguages(false)); $total_languages = count(Language::getLanguages(false));
// Products are processed 50 by 50 in order to avoid overloading MySQL // 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(); $products_array = array();
// Now each non-indexed product is processed one by one, langage by langage // Now each non-indexed product is processed one by one, langage by langage
foreach ($products as $product) foreach ($products as $product)
{ {
if ((int)$weight_array['tags'])
$product['tags'] = Search::getTags($db, (int)$product['id_product'], (int)$product['id_lang']); $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']); $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']); $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 // 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
controllers/admin/AdminSearchConfController.php
+2 -1
View File
@@ -130,7 +130,8 @@ class AdminSearchConfControllerCore extends AdminController
'info' => 'info' =>
$this->l('The "weight" represents its importance and relevance for the ranking of the products when completing a new search.').'<br /> $this->l('The "weight" represents its importance and relevance for the ranking of the products when completing a new search.').'<br />
'.$this->l('A word with a weight of eight will have four times more value than a word with a weight of two.').'<br /><br /> '.$this->l('A word with a weight of eight will have four times more value than a word with a weight of two.').'<br /><br />
'.$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.').'<br /><br />
'.$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( 'fields' => array(
'PS_SEARCH_WEIGHT_PNAME' => array( 'PS_SEARCH_WEIGHT_PNAME' => array(
'title' => $this->l('Product name weight'), 'title' => $this->l('Product name weight'),
controllers/front/CompareController.php
+2 -1
View File
@@ -138,9 +138,10 @@ class CompareControllerCore extends FrontController
'product_features' => $listFeatures, 'product_features' => $listFeatures,
'products' => $listProducts, 'products' => $listProducts,
'width' => $width, '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')) '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)) elseif (isset($this->context->cookie->id_compare))
{ {
install-dev/upgrade/upgrade.php
+1 -1
View File
@@ -346,7 +346,7 @@ if (empty($fail_result))
if (strpos($phpString, '::') === false) if (strpos($phpString, '::') === false)
{ {
$func_name = str_replace($pattern[0], '', $php[0]); $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); $phpRes = call_user_func_array($func_name, $parameters);
} }
/* Or an object method */ /* Or an object method */
themes/default-bootstrap/css/comparator.css
+46 -1
View File
@@ -20,7 +20,7 @@ table#product_comparison tbody tr td.comparison_infos div.center {
table#product_comparison tbody tr td.td_empty { table#product_comparison tbody tr td.td_empty {
vertical-align: bottom; 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; font: 600 18px/22px "Open Sans", sans-serif;
text-transform: uppercase; text-transform: uppercase;
color: #555454; color: #555454;
@@ -95,6 +95,51 @@ table#product_comparison .product-rating {
margin-bottom: 20px; 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 { #product_comparison .comparison_feature .product_name {
display: none; display: none;
} }
themes/default-bootstrap/footer.tpl
+6 -6
View File
@@ -23,16 +23,16 @@
* International Registered Trademark & Property of PrestaShop SA * International Registered Trademark & Property of PrestaShop SA
*} *}
{if !$content_only} {if !$content_only}
</div> </div> <!-- #center_column -->
{if isset($right_column_size) && !empty($right_column_size)} {if isset($right_column_size) && !empty($right_column_size)}
<!-- Right --> <!-- Right -->
<div id="right_column" class="col-xs-12 col-sm-3 column"> <div id="right_column" class="col-xs-12 col-sm-3 column">
{$HOOK_RIGHT_COLUMN} {$HOOK_RIGHT_COLUMN}
</div> </div>
{/if} {/if}
</div> </div> <!-- .row -->
</div> </div> <!-- #columns -->
</div> </div> <!-- .columns-container -->
<!-- Footer --> <!-- Footer -->
<div class="footer-container"> <div class="footer-container">
<div class="container"> <div class="container">
@@ -40,8 +40,8 @@
{$HOOK_FOOTER} {$HOOK_FOOTER}
</footer> </footer>
</div> </div>
</div> </div> <!-- .footer-container -->
</div> </div> <!-- #page -->
{/if} {/if}
</body> </body>
</html> </html>
themes/default-bootstrap/header.tpl
+59 -51
View File
@@ -27,21 +27,36 @@
<!--[if IE 7]><html class="no-js lt-ie9 lt-ie8 ie7" lang="{$lang_iso}"> <![endif]--> <!--[if IE 7]><html class="no-js lt-ie9 lt-ie8 ie7" lang="{$lang_iso}"> <![endif]-->
<!--[if IE 8]><html class="no-js lt-ie9 ie8" lang="{$lang_iso}"> <![endif]--> <!--[if IE 8]><html class="no-js lt-ie9 ie8" lang="{$lang_iso}"> <![endif]-->
<!--[if gt IE 8]> <html class="no-js ie9" lang="{$lang_iso}"> <![endif]--> <!--[if gt IE 8]> <html class="no-js ie9" lang="{$lang_iso}"> <![endif]-->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="{$lang_iso}"> <html lang="{$lang_iso}">
<head> <head>
<title>{$meta_title|escape:'html':'UTF-8'}</title> <title>{$meta_title|escape:'html':'UTF-8'}</title>
{if isset($meta_description) AND $meta_description} {if isset($meta_description) AND $meta_description}
<meta name="description" content="{$meta_description|escape:html:'UTF-8'}" /> <meta name="description" content="{$meta_description|escape:html:'UTF-8'}" />
{/if} {/if}
{if isset($meta_keywords) AND $meta_keywords} {if isset($meta_keywords) AND $meta_keywords}
<meta name="keywords" content="{$meta_keywords|escape:html:'UTF-8'}" /> <meta name="keywords" content="{$meta_keywords|escape:html:'UTF-8'}" />
{/if} {/if}
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=utf-8" /> <meta charset="utf-8" />
<meta http-equiv="content-language" content="{$meta_language}" />
<meta name="generator" content="PrestaShop" /> <meta name="generator" content="PrestaShop" />
<meta name="robots" content="{if isset($nobots)}no{/if}index,{if isset($nofollow) && $nofollow}no{/if}follow" /> <meta name="robots" content="{if isset($nobots)}no{/if}index,{if isset($nofollow) && $nofollow}no{/if}follow" />
<meta name="viewport" content="width=device-width, minimum-scale=0.25, maximum-scale=1.6, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, minimum-scale=0.25, maximum-scale=1.6, initial-scale=1.0" />
<meta name="apple-mobile-web-app-capable" content="yes" /> <meta name="apple-mobile-web-app-capable" content="yes" />
<link rel="icon" type="image/vnd.microsoft.icon" href="{$favicon_url}?{$img_update_time}" />
<link rel="shortcut icon" type="image/x-icon" href="{$favicon_url}?{$img_update_time}" />
<link href="{$css_dir}bootstrap_lib/bootstrap.css" rel="stylesheet" type="text/css" media="all" />
<link href="{$css_dir}font-awesome.css" rel="stylesheet" type="text/css" media="all" />
<link href="{$css_dir}jquery/uniform.default.css" rel="stylesheet" type="text/css" media="all" />
<link href="{$css_dir}highdpi.css" rel="stylesheet" media="only screen and (-webkit-min-device-pixel-ratio: 2)" />
<link href="{$css_dir}jquery/footable.core.css" rel="stylesheet" type="text/css" media="all" />
<link href="{$css_dir}jquery/jquery.bxslider.css" rel="stylesheet" type="text/css" media="all" />
<link href='//fonts.googleapis.com/css?family=Open+Sans:400,400italic,300italic,300,600,600italic,700,700italic,800,800italic' rel='stylesheet' type='text/css' />
{if isset($css_files)}
{foreach from=$css_files key=css_uri item=media}
<link href="{$css_uri}" rel="stylesheet" type="text/css" media="{$media}" />
{/foreach}
{/if}
<script> <script>
if (navigator.userAgent.match(/Android/i)) { if (navigator.userAgent.match(/Android/i)) {
var viewport = document.querySelector("meta[name=viewport]"); var viewport = document.querySelector("meta[name=viewport]");
@@ -51,8 +66,6 @@
window.scrollTo(0,1); window.scrollTo(0,1);
} }
</script> </script>
<link rel="icon" type="image/vnd.microsoft.icon" href="{$favicon_url}?{$img_update_time}" />
<link rel="shortcut icon" type="image/x-icon" href="{$favicon_url}?{$img_update_time}" />
<script type="text/javascript"> <script type="text/javascript">
var baseDir = '{$content_dir|addslashes}'; var baseDir = '{$content_dir|addslashes}';
var baseUri = '{$base_uri|addslashes}'; var baseUri = '{$base_uri|addslashes}';
@@ -63,35 +76,23 @@
var roundMode = {$roundMode}; var roundMode = {$roundMode};
var isUserLogged = {if $logged}true{else}false{/if}; var isUserLogged = {if $logged}true{else}false{/if};
</script> </script>
<link href="{$css_dir}bootstrap_lib/bootstrap.css" rel="stylesheet" type="text/css" media="all" /> {if isset($js_files)}
<link href="{$css_dir}font-awesome.css" rel="stylesheet" type="text/css" media="all" />
<link href="{$css_dir}jquery/uniform.default.css" rel="stylesheet" type="text/css" media="all" />
<link href="{$css_dir}highdpi.css" rel="stylesheet" media="only screen and (-webkit-min-device-pixel-ratio: 2)" />
<link href="{$css_dir}jquery/footable.core.css" rel="stylesheet" type="text/css" media="all" />
<link href="{$css_dir}jquery/jquery.bxslider.css" rel="stylesheet" type="text/css" media="all" />
<link href='//fonts.googleapis.com/css?family=Open+Sans:400,400italic,300italic,300,600,600italic,700,700italic,800,800italic' rel='stylesheet' type='text/css' />
{if isset($css_files)}
{foreach from=$css_files key=css_uri item=media}
<link href="{$css_uri}" rel="stylesheet" type="text/css" media="{$media}" />
{/foreach}
{/if}
{if isset($js_files)}
{foreach from=$js_files item=js_uri} {foreach from=$js_files item=js_uri}
<script type="text/javascript" src="{$js_uri}"></script> <script type="text/javascript" src="{$js_uri}"></script>
{/foreach} {/foreach}
{/if} {/if}
<script src="{$js_dir}tools/bootstrap.min.js"></script> <script src="{$js_dir}tools/bootstrap.min.js"></script>
<!--[if IE 8]><html class="no-js lt-ie9 ie8" lang="{$lang_iso}"> <!--[if IE 8]><html class="no-js lt-ie9 ie8" lang="{$lang_iso}">
<script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script> <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
<script src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script> <script src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
<![endif]--> <![endif]-->
<script src="{$js_dir}tools/jquery.total-storage.min.js"></script> <script src="{$js_dir}tools/jquery.total-storage.min.js"></script>
<script src="{$js_dir}jquery/jquery.uniform-modify.js"></script> <script src="{$js_dir}jquery/jquery.uniform-modify.js"></script>
<script src="{$js_dir}jquery/highdpi.js"></script> <script src="{$js_dir}jquery/highdpi.js"></script>
<script src="{$js_dir}jquery/jquery.bxslider.js"></script> <script src="{$js_dir}jquery/jquery.bxslider.js"></script>
<script src="{$js_dir}jquery/footable.js"></script> <script src="{$js_dir}jquery/footable.js"></script>
<script src="{$js_dir}jquery/footable.sort.js"></script> <script src="{$js_dir}jquery/footable.sort.js"></script>
<script src="{$js_dir}jquery/resonsive_utilites.js"></script> <script src="{$js_dir}jquery/resonsive_utilites.js"></script>
{$HOOK_HEADER} {$HOOK_HEADER}
</head> </head>
<body{if isset($page_name)} id="{$page_name|escape:'html':'UTF-8'}"{/if} class="{if isset($page_name)}{$page_name|escape:'html':'UTF-8'}{/if}{if isset($body_classes) && $body_classes|@count} {implode value=$body_classes separator=' '}{/if}{if $hide_left_column} hide-left-column{/if}{if $hide_right_column} hide-right-column{/if}{if $content_only} content_only{/if} lang_{$lang_iso}"> <body{if isset($page_name)} id="{$page_name|escape:'html':'UTF-8'}"{/if} class="{if isset($page_name)}{$page_name|escape:'html':'UTF-8'}{/if}{if isset($body_classes) && $body_classes|@count} {implode value=$body_classes separator=' '}{/if}{if $hide_left_column} hide-left-column{/if}{if $hide_right_column} hide-right-column{/if}{if $content_only} content_only{/if} lang_{$lang_iso}">
@@ -106,17 +107,16 @@
<div class="header-container"> <div class="header-container">
<header id="header"> <header id="header">
<div class="header-row"> <div class="header-row">
<div class="container clearfix"> <nav class="container clearfix">
<!-- User info -->
<div id="header_user_info"> <div id="header_user_info">
{if $logged} {if $logged}
<a href="{$link->getPageLink('index', true, NULL, "mylogout")|escape:'html'}" title="{l s='Log me out'}" class="logout" rel="nofollow">{l s='Sign out'}</a> <a href="{$link->getPageLink('index', true, NULL, "mylogout")|escape:'html'}" title="{l s='Log me out'}" class="logout" rel="nofollow">{l s='Sign out'}</a>
{else} {else}
<a href="{$link->getPageLink('my-account', true)|escape:'html'}" title="{l s='Login to your customer account'}" class="login" rel="nofollow">{l s='Sign in'}</a> <a href="{$link->getPageLink('my-account', true)|escape:'html'}" title="{l s='Login to your customer account'}" class="login" rel="nofollow">{l s='Sign in'}</a>
{/if} {/if}
</div> </div> <!-- #header_user_info -->
<!-- /User info -->
<!-- languages -->
{if count($languages) > 1} {if count($languages) > 1}
<div id="languages-block-top"> <div id="languages-block-top">
<div id="countries"> <div id="countries">
@@ -147,7 +147,8 @@
{/foreach} {/foreach}
</ul> </ul>
</div> </div>
</div> </div> <!-- #languages-block-top -->
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function(){ $(document).ready(function(){
$('#countries .current span, #countries .countries_ul li span').each(function() { $('#countries .current span, #countries .countries_ul li span').each(function() {
@@ -161,8 +162,7 @@
}); });
</script> </script>
{/if} {/if}
<!-- /languages -->
<!-- Currencies -->
{if count($currencies) > 1} {if count($currencies) > 1}
<div id="currencies-block-top"> <div id="currencies-block-top">
<form id="setCurrency" action="{$request_uri}" method="post"> <form id="setCurrency" action="{$request_uri}" method="post">
@@ -182,16 +182,22 @@
{/foreach} {/foreach}
</ul> </ul>
</form> </form>
</div> </div> <!-- #currencies-block-top -->
{/if} {/if}
<!-- /Currencies -->
<!--Contact link-->
<div id="contact-link"> <div id="contact-link">
<a href="{$link->getPageLink('contact', true)|escape:'html'}" title="{l s='contact'}">{l s='Contact Us'}</a> <a href="{$link->getPageLink('contact', true)|escape:'html'}" title="{l s='contact'}">{l s='Contact Us'}</a>
</div> </div> <!-- #contact-link -->
{if $shop_phone}<span class="shop-phone"><i class="icon-phone"></i>{l s='Call us now toll free:'} <strong>{$shop_phone}</strong></span>{/if}
</div> {if $shop_phone}
</div> <span class="shop-phone">
<i class="icon-phone"></i>{l s='Call us now toll free:'} <strong>{$shop_phone}</strong>
</span>
{/if}
</nav><!-- .container-row -->
</div> <!-- .header-row -->
<div class="container header-row-2"> <div class="container header-row-2">
<a id="header_logo" href="{$base_dir}" title="{$shop_name|escape:'html':'UTF-8'}"> <a id="header_logo" href="{$base_dir}" title="{$shop_name|escape:'html':'UTF-8'}">
<img class="logo img-responsive" src="{$logo_url}" alt="{$shop_name|escape:'html':'UTF-8'}" {if $logo_image_width}width="{$logo_image_width}"{/if} {if $logo_image_height}height="{$logo_image_height}" {/if}/> <img class="logo img-responsive" src="{$logo_url}" alt="{$shop_name|escape:'html':'UTF-8'}" {if $logo_image_width}width="{$logo_image_width}"{/if} {if $logo_image_height}height="{$logo_image_height}" {/if}/>
@@ -199,9 +205,11 @@
<div id="header_right"> <div id="header_right">
{$HOOK_TOP} {$HOOK_TOP}
</div> </div>
</div> </div> <!-- .header-row-2 -->
</header>
</div> </header> <!-- #header -->
</div> <!-- .header-container -->
<div class="columns-container"> <div class="columns-container">
<div id="columns" class="container"> <div id="columns" class="container">
{if $page_name !='index' && $page_name !='pagenotfound'} {if $page_name !='index' && $page_name !='pagenotfound'}
themes/default-bootstrap/js/modules/blockcart/ajax-cart.js
+1 -1
View File
@@ -35,7 +35,7 @@ var ajaxCart = {
overrideButtonsInThePage : function(){ overrideButtonsInThePage : function(){
//for every 'add' buttons... //for every 'add' buttons...
$('.ajax_add_to_cart_button').unbind('click').click(function(){ $('.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') if ($(this).attr('disabled') != 'disabled')
ajaxCart.add(idProduct, null, false, this); ajaxCart.add(idProduct, null, false, this);
return false; return false;
themes/default-bootstrap/mobile/product-desc-features.tpl
+14 -1
View File
@@ -72,7 +72,20 @@
{assign var="btn_class" value="disabled"} {assign var="btn_class" value="disabled"}
{capture assign="btn_more"}<span class="availability">{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}</span>{/capture} {capture assign="btn_more"}<span class="availability">{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}</span>{/capture}
{/if} {/if}
<a class="{$btn_class}" data-role="button" data-inline="true" data-theme="e" data-icon="plus" data-mini="true" class="exclusive button ajax_add_to_cart_button" href="{$btn_href}" rel="ajax_id_product_{$accessory.id_product|intval}" title="{l s='Add to cart'}" data-ajax="false">{l s='Add to cart'}</a> <a
class="{$btn_class}"
data-role="button"
data-inline="true"
data-theme="e"
data-icon="plus"
data-mini="true"
class="exclusive button ajax_add_to_cart_button"
href="{$btn_href}"
data-id-product="{$accessory.id_product|intval}"
title="{l s='Add to cart'}"
data-ajax="false">
{l s='Add to cart'}
</a>
{$btn_more} {$btn_more}
</div><!-- .btn-row --> </div><!-- .btn-row -->
</li> </li>
themes/default-bootstrap/modules/blockcart/blockcart.tpl
+2 -2
View File
@@ -215,7 +215,7 @@ var generated_date = {$smarty.now|intval};
</div> </div>
{/if} {/if}
<div class="layer_cart_row"> <div class="layer_cart_row">
<strong class="dark">{l s='Total shipping (tax exclu.):' mod='blockcart'}</strong> <strong class="dark">{l s='Total shipping (tax excl.):' mod='blockcart'}</strong>
<span class="ajax_cart_shipping_cost">{if $shipping_cost_float == 0}{l s='Free shipping!' mod='blockcart'}{else}{$shipping_cost}{/if}</span> <span class="ajax_cart_shipping_cost">{if $shipping_cost_float == 0}{l s='Free shipping!' mod='blockcart'}{else}{$shipping_cost}{/if}</span>
</div> </div>
{if $show_tax && isset($tax_cost)} {if $show_tax && isset($tax_cost)}
@@ -230,7 +230,7 @@ var generated_date = {$smarty.now|intval};
</div> </div>
<div class="button-container"> <div class="button-container">
<span class="continue btn btn-default button exclusive-medium" title="{l s='Continue shopping' mod='blockcart'}"><span><i class="icon-chevron-left left"></i>{l s='Continue shopping' mod='blockcart'}</span></span> <span class="continue btn btn-default button exclusive-medium" title="{l s='Continue shopping' mod='blockcart'}"><span><i class="icon-chevron-left left"></i>{l s='Continue shopping' mod='blockcart'}</span></span>
<a class="btn btn-default button button-medium" href="{$link->getPageLink("$order_process", true)|escape:'html'}" title="{l s='Procedd to checkout' mod='blockcart'}" rel="nofollow"><span>{l s='Proceed to checkout' mod='blockcart'}<i class="icon-chevron-right right"></i></span></a> <a class="btn btn-default button button-medium" href="{$link->getPageLink("$order_process", true)|escape:'html'}" title="{l s='Proceed to checkout' mod='blockcart'}" rel="nofollow"><span>{l s='Proceed to checkout' mod='blockcart'}<i class="icon-chevron-right right"></i></span></a>
</div> </div>
</div> </div>
</div> </div>
themes/default-bootstrap/modules/blockwishlist/view.tpl
+22 -10
View File
@@ -23,9 +23,9 @@
* International Registered Trademark & Property of PrestaShop SA * International Registered Trademark & Property of PrestaShop SA
*} *}
<div id="view_wishlist"> <div id="view_wishlist">
<h1 class="page-heading bottom-indent">{l s='Wishlist' mod='blockwishlist'}</h1> <h1 class="page-heading bottom-indent">{l s='Wishlist' mod='blockwishlist'}</h1>
{if $wishlists} {if $wishlists}
<p> <p>
<strong class="dark">{l s='Other wishlists of' mod='blockwishlist'} {$current_wishlist.firstname} {$current_wishlist.lastname}:</strong> <strong class="dark">{l s='Other wishlists of' mod='blockwishlist'} {$current_wishlist.firstname} {$current_wishlist.lastname}:</strong>
{foreach from=$wishlists item=wishlist name=i} {foreach from=$wishlists item=wishlist name=i}
{if $wishlist.id_wishlist != $current_wishlist.id_wishlist} {if $wishlist.id_wishlist != $current_wishlist.id_wishlist}
@@ -35,10 +35,10 @@
{/if} {/if}
{/if} {/if}
{/foreach} {/foreach}
</p> </p>
{/if} {/if}
<div class="wlp_bought"> <div class="wlp_bought">
{assign var='nbItemsPerLine' value=3} {assign var='nbItemsPerLine' value=3}
{assign var='nbItemsPerLineTablet' value=2} {assign var='nbItemsPerLineTablet' value=2}
{assign var='nbLi' value=$products|@count} {assign var='nbLi' value=$products|@count}
@@ -92,11 +92,24 @@
</p> </p>
</form> </form>
{/if} {/if}
<a href="javascript:;" class="button ajax_add_to_cart_button btn btn-default" onclick="WishlistBuyProduct('{$token|escape:'html':'UTF-8'}', '{$product.id_product}', '{$product.id_product_attribute}', '{$product.id_product}_{$product.id_product_attribute}', this, {$ajax});" title="{l s='Add to cart' mod='homefeatured'}" rel="nofollow"><span>{l s='Add to cart' mod='blockwishlist'}</span></a> <a
href="javascript:void(0);"
class="button ajax_add_to_cart_button btn btn-default"
onclick="WishlistBuyProduct('{$token|escape:'html':'UTF-8'}', '{$product.id_product}', '{$product.id_product_attribute}', '{$product.id_product}_{$product.id_product_attribute}', this, {$ajax});"
title="{l s='Add to cart' mod='homefeatured'}"
rel="nofollow">
<span>{l s='Add to cart' mod='blockwishlist'}</span>
</a>
{else} {else}
<span class="button ajax_add_to_cart_button btn btn-default disabled"><span>{l s='Add to cart' mod='blockwishlist'}</span></span> <span class="button ajax_add_to_cart_button btn btn-default disabled"><span>{l s='Add to cart' mod='blockwishlist'}</span></span>
{/if} {/if}
<a class="button lnk_view btn btn-default" href="{$link->getProductLink($product.id_product, $product.link_rewrite, $product.category_rewrite)|escape:'html'}" title="{l s='View' mod='blockwishlist'}" rel="nofollow"><span>{l s='View' mod='blockwishlist'}</span></a> <a
class="button lnk_view btn btn-default"
href="{$link->getProductLink($product.id_product, $product.link_rewrite, $product.category_rewrite)|escape:'html'}"
title="{l s='View' mod='blockwishlist'}"
rel="nofollow">
<span>{l s='View' mod='blockwishlist'}</span>
</a>
</div> </div>
</div> </div>
</div> </div>
@@ -105,6 +118,5 @@
</li> </li>
{/foreach} {/foreach}
</ul> </ul>
</div> </div>
</div> </div>
themes/default-bootstrap/product-list.tpl
+19 -3
View File
@@ -22,6 +22,7 @@
* @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
*} *}
{if isset($products)} {if isset($products)}
{*define numbers of product per line in other page for desktop*} {*define numbers of product per line in other page for desktop*}
{if $page_name !='index' && $page_name !='product'} {if $page_name !='index' && $page_name !='product'}
@@ -88,9 +89,23 @@
{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)}
<a class="button ajax_add_to_cart_button btn btn-default" rel="ajax_id_product_{$product.id_product|intval} nofollow" href="{$link->getPageLink('cart',false, NULL, "add=1&amp;id_product={$product.id_product|intval}&amp;token={$static_token}", false)|escape:'html'}" title="{l s='Add to cart'}"><span>{l s='Add to cart'}</span></a> <a
class="button ajax_add_to_cart_button btn btn-default"
rel="nofollow"
data-id-product="{$product.id_product|intval}"
href="{$link->getPageLink('cart',false, NULL, "add=1&amp;id_product={$product.id_product|intval}&amp;token={$static_token}", false)|escape:'html'}"
title="{l s='Add to cart'}">
<span>{l s='Add to cart'}</span>
</a>
{else} {else}
<a class="button ajax_add_to_cart_button btn btn-default" rel="ajax_id_product_{$product.id_product|intval} nofollow" href="{$link->getPageLink('cart',false, NULL, "add=1&amp;id_product={$product.id_product|intval}", false)|escape:'html'}" title="{l s='Add to cart'}"><span>{l s='Add to cart'}</span></a> <a
class="button ajax_add_to_cart_button btn btn-default"
rel="nofollow"
data-id-product="{$product.id_product|intval}"
href="{$link->getPageLink('cart',false, NULL, "add=1&amp;id_product={$product.id_product|intval}", false)|escape:'html'}"
title="{l s='Add to cart'}">
<span>{l s='Add to cart'}</span>
</a>
{/if} {/if}
{else} {else}
<span class="button ajax_add_to_cart_button btn btn-default disabled"><span>{l s='Add to cart'}</span></span> <span class="button ajax_add_to_cart_button btn btn-default disabled"><span>{l s='Add to cart'}</span></span>
@@ -119,7 +134,7 @@
</div> </div>
{/if} {/if}
</div> </div>
</div> </div><!-- .product-container> -->
</li> </li>
{/foreach} {/foreach}
</ul> </ul>
@@ -149,6 +164,7 @@
)}); )});
} }
</script> </script>
{if $page_name !='index' && $page_name !='product'} <!--// excluding page for Grid/List--> {if $page_name !='index' && $page_name !='product'} <!--// excluding page for Grid/List-->
<script type="text/javascript"><!-- <script type="text/javascript"><!--
function display(view) { function display(view) {
themes/default-bootstrap/product.tpl
+12 -3
View File
@@ -584,9 +584,18 @@ var contentOnly = {if $content_only}true{else}false{/if}
<div class="clearfix" style="margin-top:5px"> <div class="clearfix" style="margin-top:5px">
{if !$PS_CATALOG_MODE && ($accessory.allow_oosp || $accessory.quantity > 0)} {if !$PS_CATALOG_MODE && ($accessory.allow_oosp || $accessory.quantity > 0)}
<div> <div>
<div> <div>
<div> <div>
<a class="exclusive button ajax_add_to_cart_button" href="{$link->getPageLink('cart', true, NULL, "qty=1&amp;id_product={$accessory.id_product|intval}&amp;token={$static_token}&amp;add")|escape:'html'}" rel="ajax_id_product_{$accessory.id_product|intval}" title="{l s='Add to cart'}"><span>{l s='Add to cart'}</span></a> </div> </div> </div> <a
class="exclusive button ajax_add_to_cart_button"
href="{$link->getPageLink('cart', true, NULL, "qty=1&amp;id_product={$accessory.id_product|intval}&amp;token={$static_token}&amp;add")|escape:'html'}"
data-id-product="{$accessory.id_product|intval}"
title="{l s='Add to cart'}">
<span>{l s='Add to cart'}</span>
</a>
</div>
</div>
</div>
{/if} {/if}
themes/default-bootstrap/products-comparison.tpl
+9 -3
View File
@@ -37,7 +37,8 @@
<div class="products_block table-responsive"> <div class="products_block table-responsive">
<table id="product_comparison" class="table table-bordered"> <table id="product_comparison" class="table table-bordered">
<tr> <tr>
<td width="20%" class="td_empty"> <td width="20%" class="td_empty compare_extra_information">
{$HOOK_COMPARE_EXTRA_INFORMATION}
<span>{l s='Features:'}</span> <span>{l s='Features:'}</span>
</td> </td>
{assign var='taxes_behavior' value=false} {assign var='taxes_behavior' value=false}
@@ -112,7 +113,13 @@
<div class="button-container"> <div class="button-container">
{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->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)} {if ($product->quantity > 0 OR $product->allow_oosp)}
<a class="button ajax_add_to_cart_button btn btn-default" rel="ajax_id_product_{$product->id}" href="{$link->getPageLink('cart', true, NULL, "qty=1&amp;id_product={$product->id}&amp;token={$static_token}&amp;add")|escape:'html'}" title="{l s='Add to cart'}"><span>{l s='Add to cart'}</span></a> <a
class="button ajax_add_to_cart_button btn btn-default"
data-id-product="ajax_id_product_{$product->id}"
href="{$link->getPageLink('cart', true, NULL, "qty=1&amp;id_product={$product->id}&amp;token={$static_token}&amp;add")|escape:'html'}"
title="{l s='Add to cart'}">
<span>{l s='Add to cart'}</span>
</a>
{else} {else}
<span class="ajax_add_to_cart_button button btn btn-default disabled"><span>{l s='Add to cart'}</span></span> <span class="ajax_add_to_cart_button button btn btn-default disabled"><span>{l s='Add to cart'}</span></span>
{/if} {/if}
@@ -163,4 +170,3 @@
<ul class="footer_link"> <ul class="footer_link">
<li><a class="button lnk_view btn btn-default" href="{$base_dir}"><span><i class="icon-chevron-left left"></i>{l s='Continue Shopping'}</span></a></li> <li><a class="button lnk_view btn btn-default" href="{$base_dir}"><span><i class="icon-chevron-left left"></i>{l s='Continue Shopping'}</span></a></li>
</ul> </ul>
themes/default-bootstrap/sass/comparator.scss
+41 -3
View File
@@ -30,7 +30,7 @@ table#product_comparison {
td.td_empty { td.td_empty {
vertical-align:bottom; vertical-align:bottom;
span { > span {
font:600 18px/22px $font-custom; font:600 18px/22px $font-custom;
text-transform:uppercase; text-transform:uppercase;
color:#555454; color:#555454;
@@ -110,8 +110,46 @@ table#product_comparison {
width:auto; width:auto;
} }
.footer_link { margin-bottom:20px;} .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{ #product_comparison{
.comparison_feature{ .comparison_feature{
.product_name{display: none;} .product_name{display: none;}