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 
Conflicts:
	themes/default-bootstrap/products-comparison.tpl
This commit is contained in:
Kevin Granger
2013-12-04 15:48:16 +01:00
parent ad6ed3dcf1 79198487ac
commit b450a9fa80
11 changed files with 322 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/modules/js.tpl
+4 -4
View File
@@ -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()
{
classes/Search.php
+45 -11
View File
@@ -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();
controllers/admin/AdminSearchConfController.php
+2 -1
View File
@@ -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.').'<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(
'PS_SEARCH_WEIGHT_PNAME' => array(
'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,
'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))
{
install-dev/upgrade/upgrade.php
+1 -1
View File
@@ -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 */
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 {
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;
}
themes/default-bootstrap/footer.tpl
+12 -12
View File
@@ -23,16 +23,16 @@
* International Registered Trademark & Property of PrestaShop SA
*}
{if !$content_only}
</div>
{if isset($right_column_size) && !empty($right_column_size)}
<!-- Right -->
<div id="right_column" class="col-xs-12 col-sm-3 column">
{$HOOK_RIGHT_COLUMN}
</div>
{/if}
</div>
</div>
</div>
</div> <!-- #center_column -->
{if isset($right_column_size) && !empty($right_column_size)}
<!-- Right -->
<div id="right_column" class="col-xs-12 col-sm-3 column">
{$HOOK_RIGHT_COLUMN}
</div>
{/if}
</div> <!-- .row -->
</div> <!-- #columns -->
</div> <!-- .columns-container -->
<!-- Footer -->
<div class="footer-container">
<div class="container">
@@ -40,8 +40,8 @@
{$HOOK_FOOTER}
</footer>
</div>
</div>
</div>
</div> <!-- .footer-container -->
</div> <!-- #page -->
{/if}
</body>
</html>
themes/default-bootstrap/header.tpl
+160 -152
View File
@@ -27,22 +27,37 @@
<!--[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 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>
<title>{$meta_title|escape:'html':'UTF-8'}</title>
{if isset($meta_description) AND $meta_description}
<meta name="description" content="{$meta_description|escape:html:'UTF-8'}" />
{/if}
{if isset($meta_keywords) AND $meta_keywords}
<meta name="keywords" content="{$meta_keywords|escape:html:'UTF-8'}" />
{/if}
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=utf-8" />
<meta http-equiv="content-language" content="{$meta_language}" />
{if isset($meta_description) AND $meta_description}
<meta name="description" content="{$meta_description|escape:html:'UTF-8'}" />
{/if}
{if isset($meta_keywords) AND $meta_keywords}
<meta name="keywords" content="{$meta_keywords|escape:html:'UTF-8'}" />
{/if}
<meta charset="utf-8" />
<meta name="generator" content="PrestaShop" />
<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="apple-mobile-web-app-capable" content="yes" />
<script>
<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" />
<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>
if (navigator.userAgent.match(/Android/i)) {
var viewport = document.querySelector("meta[name=viewport]");
viewport.setAttribute('content', 'initial-scale=1.0,maximum-scale=1.0,user-scalable=0,width=device-width,height=device-height');
@@ -51,8 +66,6 @@
window.scrollTo(0,1);
}
</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">
var baseDir = '{$content_dir|addslashes}';
var baseUri = '{$base_uri|addslashes}';
@@ -63,35 +76,23 @@
var roundMode = {$roundMode};
var isUserLogged = {if $logged}true{else}false{/if};
</script>
<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}
{if isset($js_files)}
{foreach from=$js_files item=js_uri}
<script type="text/javascript" src="{$js_uri}"></script>
{/foreach}
{/if}
<script src="{$js_dir}tools/bootstrap.min.js"></script>
<!--[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/respond.js/1.3.0/respond.min.js"></script>
<![endif]-->
<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/highdpi.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.sort.js"></script>
<script src="{$js_dir}jquery/resonsive_utilites.js"></script>
{if isset($js_files)}
{foreach from=$js_files item=js_uri}
<script type="text/javascript" src="{$js_uri}"></script>
{/foreach}
{/if}
<script src="{$js_dir}tools/bootstrap.min.js"></script>
<!--[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/respond.js/1.3.0/respond.min.js"></script>
<![endif]-->
<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/highdpi.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.sort.js"></script>
<script src="{$js_dir}jquery/resonsive_utilites.js"></script>
{$HOOK_HEADER}
</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}">
@@ -103,117 +104,124 @@
{/if}
<div id="page">
<!-- Header -->
<div class="header-container">
<header id="header">
<div class="header-row">
<div class="container clearfix">
<!-- User info -->
<div id="header_user_info">
{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>
{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>
{/if}
</div>
<!-- /User info -->
<!-- languages -->
{if count($languages) > 1}
<div id="languages-block-top">
<div id="countries">
{foreach from=$languages key=k item=language name="languages"}
{if $language.iso_code == $lang_iso}
<div class="current">
<span>{$language.name}</span>
</div>
{/if}
{/foreach}
<ul id="first-languages" class="countries_ul toogle_content">
{foreach from=$languages key=k item=language name="languages"}
<li {if $language.iso_code == $lang_iso}class="selected"{/if}>
{if $language.iso_code != $lang_iso}
{assign var=indice_lang value=$language.id_lang}
{if isset($lang_rewrite_urls.$indice_lang)}
<a href="{$lang_rewrite_urls.$indice_lang|escape:htmlall}" title="{$language.name}">
{else}
<a href="{$link->getLanguageLink($language.id_lang)|escape:htmlall}" title="{$language.name}">
{/if}
{/if}
<span>{$language.name}</span>
{if $language.iso_code != $lang_iso}
</a>
{/if}
</li>
{/foreach}
</ul>
</div>
</div>
<script type="text/javascript">
$(document).ready(function(){
$('#countries .current span, #countries .countries_ul li span').each(function() {
var h = $(this).html();
var index = h.indexOf(' ');
if(index == -1) {
index = h.length;
}
$(this).html('<span class="firstWord">'+ h.substring(index, h.length) + '</span>' + h.substring(0, index));
});
});
</script>
{/if}
<!-- /languages -->
<!-- Currencies -->
{if count($currencies) > 1}
<div id="currencies-block-top">
<form id="setCurrency" action="{$request_uri}" method="post">
<div class="current">
<input type="hidden" name="id_currency" id="id_currency" value=""/>
<input type="hidden" name="SubmitCurrency" value="" />
<span class="cur-label">{l s='Currency'} :</span>
{foreach from=$currencies key=k item=f_currency}
{if $cookie->id_currency == $f_currency.id_currency}<strong>{$f_currency.iso_code}</strong>{/if}
{/foreach}
</div>
<ul id="first-currencies" class="currencies_ul toogle_content">
{foreach from=$currencies key=k item=f_currency}
<li {if $cookie->id_currency == $f_currency.id_currency}class="selected"{/if}>
<a href="javascript:setCurrency({$f_currency.id_currency});" title="{$f_currency.name}" rel="nofollow">{$f_currency.name}</a>
</li>
{/foreach}
</ul>
</form>
</div>
{/if}
<!-- /Currencies -->
<!--Contact link-->
<div id="contact-link">
<a href="{$link->getPageLink('contact', true)|escape:'html'}" title="{l s='contact'}">{l s='Contact Us'}</a>
</div>
{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>
</div>
<div class="container header-row-2">
<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}/>
</a>
<div id="header_right">
{$HOOK_TOP}
</div>
</div>
</header>
</div>
<div class="columns-container">
<div id="columns" class="container">
{if $page_name !='index' && $page_name !='pagenotfound'}
{include file="$tpl_dir./breadcrumb.tpl"}
{/if}
<div class="row">
<div class="header-container">
<header id="header">
<div class="header-row">
<nav class="container clearfix">
<div id="header_user_info">
{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>
{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>
{/if}
</div> <!-- #header_user_info -->
{if count($languages) > 1}
<div id="languages-block-top">
<div id="countries">
{foreach from=$languages key=k item=language name="languages"}
{if $language.iso_code == $lang_iso}
<div class="current">
<span>{$language.name}</span>
</div>
{/if}
{/foreach}
<ul id="first-languages" class="countries_ul toogle_content">
{foreach from=$languages key=k item=language name="languages"}
<li {if $language.iso_code == $lang_iso}class="selected"{/if}>
{if $language.iso_code != $lang_iso}
{assign var=indice_lang value=$language.id_lang}
{if isset($lang_rewrite_urls.$indice_lang)}
<a href="{$lang_rewrite_urls.$indice_lang|escape:htmlall}" title="{$language.name}">
{else}
<a href="{$link->getLanguageLink($language.id_lang)|escape:htmlall}" title="{$language.name}">
{/if}
{/if}
<span>{$language.name}</span>
{if $language.iso_code != $lang_iso}
</a>
{/if}
</li>
{/foreach}
</ul>
</div>
</div> <!-- #languages-block-top -->
<script type="text/javascript">
$(document).ready(function(){
$('#countries .current span, #countries .countries_ul li span').each(function() {
var h = $(this).html();
var index = h.indexOf(' ');
if(index == -1) {
index = h.length;
}
$(this).html('<span class="firstWord">'+ h.substring(index, h.length) + '</span>' + h.substring(0, index));
});
});
</script>
{/if}
{if count($currencies) > 1}
<div id="currencies-block-top">
<form id="setCurrency" action="{$request_uri}" method="post">
<div class="current">
<input type="hidden" name="id_currency" id="id_currency" value=""/>
<input type="hidden" name="SubmitCurrency" value="" />
<span class="cur-label">{l s='Currency'} :</span>
{foreach from=$currencies key=k item=f_currency}
{if $cookie->id_currency == $f_currency.id_currency}<strong>{$f_currency.iso_code}</strong>{/if}
{/foreach}
</div>
<ul id="first-currencies" class="currencies_ul toogle_content">
{foreach from=$currencies key=k item=f_currency}
<li {if $cookie->id_currency == $f_currency.id_currency}class="selected"{/if}>
<a href="javascript:setCurrency({$f_currency.id_currency});" title="{$f_currency.name}" rel="nofollow">{$f_currency.name}</a>
</li>
{/foreach}
</ul>
</form>
</div> <!-- #currencies-block-top -->
{/if}
<div id="contact-link">
<a href="{$link->getPageLink('contact', true)|escape:'html'}" title="{l s='contact'}">{l s='Contact Us'}</a>
</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}
</nav><!-- .container-row -->
</div> <!-- .header-row -->
<div class="container header-row-2">
<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}/>
</a>
<div id="header_right">
{$HOOK_TOP}
</div>
</div> <!-- .header-row-2 -->
</header> <!-- #header -->
</div> <!-- .header-container -->
<div class="columns-container">
<div id="columns" class="container">
{if $page_name !='index' && $page_name !='pagenotfound'}
{include file="$tpl_dir./breadcrumb.tpl"}
{/if}
<div class="row">
{if isset($left_column_size) && !empty($left_column_size)}
<!-- Left -->
<div id="left_column" class="column col-xs-12 col-sm-3">
<div id="left_column" class="column col-xs-12 col-sm-3">
{$HOOK_LEFT_COLUMN}
</div>
</div>
{/if}
<!-- Center -->
<div id="center_column" class="center_column col-xs-12 col-sm-{12 - $left_column_size - $right_column_size}">
<!-- Center -->
<div id="center_column" class="center_column col-xs-12 col-sm-{12 - $left_column_size - $right_column_size}">
{/if}
themes/default-bootstrap/modules/blockcart/blockcart.tpl
+2 -2
View File
@@ -215,7 +215,7 @@ var generated_date = {$smarty.now|intval};
</div>
{/if}
<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>
</div>
{if $show_tax && isset($tax_cost)}
@@ -230,7 +230,7 @@ var generated_date = {$smarty.now|intval};
</div>
<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>
<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>
themes/default-bootstrap/products-comparison.tpl
+6 -6
View File
@@ -36,10 +36,11 @@
</script>
<div class="products_block table-responsive">
<table id="product_comparison" class="table table-bordered">
<tr>
<td width="20%" class="td_empty">
<span>{l s='Features:'}</span>
</td>
<tr>
<td width="20%" class="td_empty compare_extra_information">
{$HOOK_COMPARE_EXTRA_INFORMATION}
<span>{l s='Features:'}</span>
</td>
{assign var='taxes_behavior' value=false}
{if $use_taxes && (!$priceDisplay || $priceDisplay == 2)}
{assign var='taxes_behavior' value=true}
@@ -168,5 +169,4 @@
{/if}
<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>
</ul>
</ul>
themes/default-bootstrap/sass/comparator.scss
+42 -4
View File
@@ -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;}