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:
rGaillard
2013-12-10 18:49:58 +01:00
parent 85f1de2e8f e92d0bb0eb
commit f34975f3fc
38 changed files with 2165 additions and 1998 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form.tpl
+1 -14
View File
@@ -46,7 +46,7 @@
<input type="hidden" id="logo" name="logo" value="" />
<div class="dummyfile input-group">
<span class="input-group-addon"><i class="icon-file"></i></span>
<input id="attachement_filename" type="text" class="disabled" name="filename" readonly="">
<input id="attachement_filename" type="text" name="filename" readonly="">
<span class="input-group-btn">
<button id="attachement_fileselectbutton" type="button" name="submitAddAttachments" class="btn btn-default">
<i class="icon-folder-open"></i> Choose a file
@@ -58,19 +58,6 @@
{l s='Current size:'} <span id="carrier_logo_size">{l s='undefined'}</span>.
</p>
</div>
<script>
$(document).ready(function(){
$('#attachement_fileselectbutton').click(function(e){
$('#carrier_logo_input').trigger('click');
return false;
});
$('#carrier_logo_input').change(function(e){
var val = $(this).val();
var file = val.split(/[\\/]/);
$('#attachement_filename').val(file[file.length-1]);
});
});
</script>
{/if}
{$smarty.block.parent}
{/block}
admin-dev/themes/default/template/controllers/products/virtualproduct.tpl
+158 -158
View File
@@ -48,193 +48,193 @@
var fileName = data.getAttribute("filename");
if (result == "error")
{
$("#upload-confirmation").hide();
$("#upload-error td").html('<div class="error">{l s='Error:'} ' + msg + '</div>');
$("#upload-error").show();
$("#upload-confirmation").closest('.form-group.').hide();
$("#upload-error").html('{l s='Error:'} ' + msg);
$("#upload-error").closest('.form-group.').show();
}
else
{
$('#upload-error').hide();
$('#file_missing').hide();
$('#upload-error').closest('.form-group.').hide();
$('#file_missing').closest('.form-group.').hide();
$('#virtual_product_name').attr('value', fileName);
$("#upload-confirmation .error").remove();
$('#upload-confirmation div').find('span').remove();
$('#upload-confirmation div').prepend('<span>{l s='The file'}&nbsp;"<a class="link" href="get-file-admin.php?file='+msg+'&filename='+fileName+'">'+fileName+'</a>"&nbsp;{l s='has successfully been uploaded'}' +
$('#upload-confirmation').find('span').remove();
$('#upload-confirmation').prepend('<span>{l s='The file'}&nbsp;"<a class="link" href="get-file-admin.php?file='+msg+'&filename='+fileName+'">'+fileName+'</a>"&nbsp;{l s='has successfully been uploaded'}&nbsp;' +
'<input type="hidden" id="virtual_product_filename" name="virtual_product_filename" value="' + msg + '" /></span>');
$("#upload-confirmation").show();
$("#upload-confirmation").closest('.form-group.').show();
}
}
}
);
}
function uploadFile2()
{
var link = '';
$.ajaxFileUpload (
$(document).ready(function(){
$('#virtual_product_file-selectbutton').click(function(e) {
$('#virtual_product_file').trigger('click');
});
$('#virtual_product_file-name').click(function(e) {
$('#virtual_product_file').trigger('click');
});
$('#virtual_product_file').change(function(e) {
if ($(this)[0].files !== undefined)
{
url:'./uploadProductFileAttribute.php',
secureuri:false,
fileElementId:'virtual_product_file_attribute',
dataType: 'xml',
success: function (data, status)
{
data = data.getElementsByTagName('return')[0];
var result = data.getAttribute("result");
var msg = data.getAttribute("msg");
var fileName = data.getAttribute("filename");
if(result == "error")
$("#upload-confirmation2").html('<p>error: ' + msg + '</p>');
else
{
$('#virtual_product_file_attribute').remove();
$('#virtual_product_file_label').hide();
$('#file_missing').hide();
$('#delete_downloadable_product_attribute').show();
$('#upload-confirmation2').html(
'<a class="link" href="get-file-admin.php?file='+msg+'&filename='+fileName+'">{l s='The file'}&nbsp;"' + fileName + '"&nbsp;{l s='has successfully been uploaded'}</a>' +
'<input type="hidden" id="virtual_product_filename_attribute" name="virtual_product_filename_attribute" value="' + msg + '" />');
$('#virtual_product_name_attribute').attr('value', fileName);
var files = $(this)[0].files;
var name = '';
link = $("#delete_downloadable_product_attribute").attr('href');
$("#delete_downloadable_product_attribute").attr('href', link+"&file="+msg);
}
}
$.each(files, function(index, value) {
name += value.name+', ';
});
$('#virtual_product_file-name').val(name.slice(0, -2));
}
);
}
else // Internet Explorer 9 Compatibility
{
var name = $(this).val().split(/[\\/]/);
$('#virtual_product_file-name').val(name[name.length-1]);
}
uploadFile();
});
});
</script>
<input type="hidden" name="submitted_tabs[]" value="VirtualProduct" />
<h4>{l s='Virtual Product (services, booking or downloadable products)'}</h4>
<div class="separation"></div>
<div>
<div class="is_virtual_good">
<input type="checkbox" id="is_virtual_good" name="is_virtual_good" value="true" {if $product->is_virtual && $product->productDownload->active}checked="checked"{/if} />
<label for="is_virtual_good" class="t bold">{l s='Is this a virtual product?'}</label>
</div>
{* [begin] virtual product *}
<div id="virtual_good" {if !$product->productDownload->id || $product->productDownload->active}style="display:none"{/if} >
<div>
<label>{l s='Does this product have an associated file?'}</label>
<label style="width:50px"><input type="radio" value="1" name="is_virtual_file" {if $product_downloaded}checked="checked"{/if} />{l s='Yes'}</label>
<label style="width:50px;"><input type="radio" value="0" name="is_virtual_file" {if !$product_downloaded}checked="checked"{/if} />{l s='No'}</label>
</div><br />
<div class="separation"></div>
{if $download_product_file_missing}
<p class="alert" id="file_missing">
<b>{$download_product_file_missing} :<br/>
{$smarty.const._PS_DOWNLOAD_DIR_}/{$product->productDownload->filename}</b>
</p>
{/if}
<div id="is_virtual_file_product" style="display:none;">
{if !$download_dir_writable}
<p class="alert">
{l s='Your download repository is not writable.'}<br/>
{$smarty.const._PS_DOWNLOAD_DIR_}
</p>
{/if}
{* Don't display file form if the product has combinations *}
{if empty($product->cache_default_attribute)}
{if $product->productDownload->id}
<input type="hidden" id="virtual_product_id" name="virtual_product_id" value="{$product->productDownload->id}" />
<div id="product-virtualproduct" class="panel product-tab">
<input type="hidden" name="submitted_tabs[]" value="VirtualProduct" />
<h3>{l s='Virtual Product (services, booking or downloadable products)'}</h3>
<div class="is_virtual_good" class="form-group">
<input type="checkbox" id="is_virtual_good" name="is_virtual_good" value="true" {if $product->is_virtual && $product->productDownload->active}checked="checked"{/if} />
<label for="is_virtual_good" class="t bold">{l s='Is this a virtual product?'}</label>
</div>
<div id="virtual_good" {if !$product->productDownload->id || $product->productDownload->active}style="display:none"{/if} class="form-group">
<div class="form-group">
<label class="control-label col-lg-3">{l s='Does this product have an associated file?'}</label>
<div class="col-lg-9">
<label class="switch-light prestashop-switch fixed-width-lg">
<input name="is_virtual_file" id="is_virtual_file" type="checkbox"{if $product_downloaded} checked="checked"{/if} value="{if $product_downloaded}1{else}0{/if}" />
<span>
<span>{l s='Yes'}</span>
<span>{l s='No'}</span>
</span>
<a class="slide-button btn btn-default"></a>
</label>
</div>
</div>
<div id="is_virtual_file_product" style="display:none;">
{if $download_product_file_missing}
<div class="form-group">
<div class="col-lg-push-3 col-lg-9">
<div class="alert alert-danger" id="file_missing">
{$download_product_file_missing} :<br/>
<strong>{l s='Server file name : %s'|sprintf:$product->productDownload->filename}</strong>
</div>
</div>
</div>
{/if}
<table cellpadding="5" style="float: left; margin-left: 10px;">
<tr id="upload_input" {if $is_file}style="display:none"{/if}>
<td class="col-left">
<label id="virtual_product_file_label" for="virtual_product_file" class="t">{l s='Upload a file'}</label>
</td>
<td class="col-right">
<input type="file" id="virtual_product_file" name="virtual_product_file" onchange="uploadFile();" maxlength="{$upload_max_filesize}" />
<p class="preference_description">{l s='Your server\'s maximum file-upload size is'}:&nbsp;{$upload_max_filesize} {l s='MB'}</p>
</td>
</tr>
<tr id="upload-error" style="display:none">
<td colspan=2></td>
</tr>
<tr id="upload-confirmation" style="display:none">
<td colspan=2>
{if $up_filename}
<input type="hidden" id="virtual_product_filename" name="virtual_product_filename" value="{$up_filename}" />
{/if}
<div class="alert">
<script>
delete_this_file = '{l s='Delete this file'}';
</script>
<a class="delete_virtual_product" id="delete_downloadable_product" href="{$currentIndex}&deleteVirtualProduct=true&token={$token}&id_product={$product->id}" class="red">
<img src="../img/admin/delete.gif" alt="{l s='Delete this file'}"/>
{if !$download_dir_writable}
<div class="form-group">
<div class="col-lg-push-3 col-lg-9">
<div class="alert alert-danger">
{l s='Your download repository is not writable.'}
</div>
</div>
</div>
{/if}
{* Don't display file form if the product has combinations *}
{if empty($product->cache_default_attribute)}
{if $product->productDownload->id}
<input type="hidden" id="virtual_product_id" name="virtual_product_id" value="{$product->productDownload->id}" />
{/if}
<div class="form-group"{if $is_file} style="display:none"{/if}>
<label id="virtual_product_file_label" for="virtual_product_file" class="control-label col-lg-3">{l s='Upload a file'}</label>
<div class="col-lg-9">
<input id="virtual_product_file" type="file" name="virtual_product_file" class="hide" maxlength="{$upload_max_filesize}" />
<div class="dummyfile input-group">
<span class="input-group-addon"><i class="icon-file"></i></span>
<input id="virtual_product_file-name" type="text" class="disabled" name="filename" readonly />
<span class="input-group-btn">
<button id="virtual_product_file-selectbutton" type="button" name="submitAddAttachments" class="btn btn-default">
<i class="icon-folder-open"></i> {l s='Add file'}
</button>
</span>
</div>
<p class="help-block">{l s='Your server\'s maximum file-upload size is'}:&nbsp;{$upload_max_filesize} {l s='MB'}</p>
</div>
</div>
<div class="form-group" style="display:none">
<div class="col-lg-push-3 col-lg-9">
<div class="alert alert-error col-lg-push-3 col-lg-9" id="upload-error"></div>
</div>
</div>
<div class="form-group" style="display:none">
<div class="col-lg-push-3 col-lg-9">
{if $up_filename}
<input type="hidden" id="virtual_product_filename" name="virtual_product_filename" value="{$up_filename}" />
{/if}
<div class="alert alert-info" id="upload-confirmation">
<a class="btn btn-default" id="delete_downloadable_product" href="{$currentIndex}&deleteVirtualProduct=true&token={$token}&id_product={$product->id}"><i class="icon-trash"></i> {l s='Delete this file'}
</a>
</div>
</td>
</tr>
</div>
</div>
{if $is_file}
<tr>
<td class="col-left">
<input type="hidden" id="virtual_product_filename" name="virtual_product_filename" value="{$product->productDownload->filename}" />
<label class="t">{l s='Link to the file:'}</label>
</td>
<td class="col-right">
{$product->productDownload->getHtmlLink(false, true)}
<a href="{$currentIndex}&deleteVirtualProduct=true&token={$token}&id_product={$product->id}" class="red delete_virtual_product">
<img src="../img/admin/delete.gif" alt="{l s='Delete this file'}"/>
</a>
</td>
</tr>
<div class="form-group">
<label class="control-label col-lg-3">{l s='Link to the file:'}</label>
<div class="col-lg-9">
<input type="hidden" id="virtual_product_filename" name="virtual_product_filename" value="{$product->productDownload->filename}" />
<a href="{$product->productDownload->getTextLink(true)}" class="btn btn-default"><i class="icon-download"></i> {l s='Download file'}</a>
<a href="{$currentIndex}&deleteVirtualProduct=true&token={$token}&id_product={$product->id}" class="btn btn-default"><i class="icon-trash"></i> {l s='Delete this file'}</a>
</div>
</div>
{/if}
<tr>
<td class="col-left">
<label for="virtual_product_name" class="t">{l s='Filename'}</label>
</td>
<td class="col-right">
<div class="form-group">
<label class="control-label col-lg-3">{l s='Filename'}</label>
<div class="col-lg-9">
<input type="text" id="virtual_product_name" name="virtual_product_name" style="width:200px" value="{$product->productDownload->display_filename|escape:'html':'UTF-8'}" />
<p class="preference_description" name="help_box">{l s='The full filename with its extension (e.g. Book.pdf)'}</p>
</td>
</tr>
<tr>
<td class="col-left">
<label for="virtual_product_nb_downloable" class="t">{l s='Number of allowed downloads'}</label>
</td>
<td class="col-right">
<p class="help-block">{l s='The full filename with its extension (e.g. Book.pdf)'}</p>
</div>
</div>
<div class="form-group">
<label class="control-label col-lg-3">{l s='Number of allowed downloads'}</label>
<div class="col-lg-9">
<input type="text" id="virtual_product_nb_downloable" name="virtual_product_nb_downloable" value="{$product->productDownload->nb_downloadable|htmlentities}" class="" size="6" />
<p class="preference_description">{l s='Number of downloads allowed per customer. (Set to 0 for unlimited downloads)'}</p>
</td>
</tr>
<tr>
<td class="col-left">
<label for="virtual_product_expiration_date" class="t">{l s='Expiration date'}</label>
</td>
<td class="col-right">
<input class="datepicker" type="text" id="virtual_product_expiration_date" name="virtual_product_expiration_date" value="{$product->productDownload->date_expiration}" size="11" maxlength="10" autocomplete="off" /> {l s='Format: YYYY-MM-DD'}
<p class="preference_description">{l s='If set, the file will not be downloadable after this date. Leave blank if you do not wish to attach an expiration date.'}</p>
</td>
</tr>
<td class="col-left">
<label for="virtual_product_nb_days" class="t">{l s='Number of days'}</label>
</td>
<td class="col-right">
<input type="text" id="virtual_product_nb_days" name="virtual_product_nb_days" value="{$product->productDownload->nb_days_accessible|htmlentities}" class="" size="4" /><sup> *</sup>
<p class="preference_description">{l s='Number of days this file can be accessed by customers'} - <em>({l s='Set to zero for unlimited access.'})</em></p>
</td>
</tr>
<p class="help-block">{l s='Number of downloads allowed per customer. (Set to 0 for unlimited downloads)'}</p>
</div>
</div>
<div class="form-group">
<label class="control-label col-lg-3">
<span class="label-tooltip" data-toggle="tooltip" title="" data-original-title="{l s='Format: YYYY-MM-DD'}">
{l s='Expiration date'}
</span>
</label>
<div class="col-lg-9">
<input class="datepicker" type="text" id="virtual_product_expiration_date" name="virtual_product_expiration_date" value="{$product->productDownload->date_expiration}" size="11" maxlength="10" autocomplete="off" />
<p class="help-block">{l s='If set, the file will not be downloadable after this date. Leave blank if you do not wish to attach an expiration date.'}</p>
</div>
</div>
<div class="form-group">
<label class="control-label col-lg-3 required">{l s='Number of days'}</label>
<div class="col-lg-9">
<input type="text" id="virtual_product_nb_days" name="virtual_product_nb_days" value="{$product->productDownload->nb_days_accessible|htmlentities}" class="" size="4" />
<p class="help-block">{l s='Number of days this file can be accessed by customers'} - <em>({l s='Set to zero for unlimited access.'})</em></p>
</div>
</div>
{* Feature not implemented *}
{*<tr>*}
{*<td class="col-left">*}
{*<label for="virtual_product_is_shareable" class="t">{l s='is shareable'}</label>*}
{*</td>*}
{*<td class="col-right">*}
{*<div class="form-group">*}
{*<label for="virtual_product_is_shareable" class="control-label col-lg-3">{l s='is shareable'}</label>*}
{*<div class="col-lg-9">*}
{*<input type="checkbox" id="virtual_product_is_shareable" name="virtual_product_is_shareable" value="1" {if $product->productDownload->is_shareable}checked="checked"{/if} />*}
{*<span class="alert alert-info" name="help_box" style="display:none">{l s='Please specify if the file can be shared.'}</span>*}
{*</td>*}
{*</tr>*}
{else}
<div class="alert alert-info" style="display: block;width: 70%;">{l s='You cannot edit your file here because you used combinations. Please edit this file in the Combinations tab.'}</div>
<br />
{*</div>*}
{*</div>*}
<div class="alert alert-info">
{l s='You cannot edit your file here because you used combinations. Please edit this file in the Combinations tab.'}
</div>
{if isset($error_product_download)}{$error_product_download}{/if}
{/if}
</table>
</div>
</div>
</div>
<div style="clear:both"></div>
</div>
js/admin-products.js
+1 -14
View File
@@ -1332,33 +1332,20 @@ product_tabs['VirtualProduct'] = new function(){
if ($('#is_virtual_good').prop('checked'))
{
$('#virtual_good').show();
$('#virtual_good_more').show();
}
$('.is_virtual_good').hide();
if ( $('input[name=is_virtual_file]:checked').val() == 1)
{
$('#virtual_good_more').show();
$('#is_virtual_file_product').show();
}
else
{
$('#virtual_good_more').hide();
$('#is_virtual_file_product').hide();
}
$('input[name=is_virtual_file]').live('change', function(e) {
if($(this).val() == '1')
{
$('#virtual_good_more').show();
if($(this).prop('checked'))
$('#is_virtual_file_product').show();
}
else
{
$('#virtual_good_more').hide();
$('#is_virtual_file_product').hide();
}
});
// Bind file deletion
js/admin_carrier_wizard.js
+27
View File
@@ -31,6 +31,33 @@ $(document).ready(function() {
if (parseInt($('input[name="is_free"]:checked').val()))
is_freeClick($('input[name="is_free"]:checked'));
displayRangeType();
$('#attachement_fileselectbutton').click(function(e) {
$('#carrier_logo_input').trigger('click');
});
$('#attachement_filename').click(function(e) {
$('#carrier_logo_input').trigger('click');
});
$('#carrier_logo_input').change(function(e) {
if ($(this)[0].files !== undefined)
{
var files = $(this)[0].files;
var name = '';
$.each(files, function(index, value) {
name += value.name+', ';
});
$('#attachement_filename').val(name.slice(0, -2));
}
else // Internet Explorer 9 Compatibility
{
var name = $(this).val().split(/[\\/]/);
$('#attachement_filename').val(name[name.length-1]);
}
});
});
function initCarrierWizard()
modules/blockcms/blockcms.php
+8 -1
View File
@@ -39,7 +39,7 @@ class BlockCms extends Module
{
$this->name = 'blockcms';
$this->tab = 'front_office_features';
$this->version = '1.3';
$this->version = '1.4';
$this->author = 'PrestaShop';
$this->need_instance = 0;
@@ -61,6 +61,7 @@ class BlockCms extends Module
|| !$this->registerHook('actionObjectCmsUpdateAfter')
|| !$this->registerHook('actionObjectCmsDeleteAfter')
|| !$this->registerHook('actionShopDataDuplication')
|| !$this->registerHook('actionAdminStoresControllerUpdate_optionsAfter')
|| !BlockCMSModel::createTables()
|| !Configuration::updateValue('FOOTER_CMS', '')
|| !Configuration::updateValue('FOOTER_BLOCK_ACTIVATION', 1)
@@ -684,6 +685,12 @@ class BlockCms extends Module
return parent::getCacheId('blockcms|'.$name);
}
public function hookActionAdminStoresControllerUpdate_optionsAfter()
{
if (Tools::getIsset('PS_STORES_DISPLAY_FOOTER'))
$this->_clearCache('blockcms.tpl');
}
public function hookActionObjectCmsUpdateAfter()
{
$this->_clearCache('blockcms.tpl');
modules/blockcms/config.xml
+1 -1
View File
@@ -2,7 +2,7 @@
<module>
<name>blockcms</name>
<displayName><![CDATA[CMS Block]]></displayName>
<version><![CDATA[1.3]]></version>
<version><![CDATA[1.4]]></version>
<description><![CDATA[Adds a block with several CMS links.]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[front_office_features]]></tab>
modules/blockcms/upgrade/install-1.4.php
+9
View File
@@ -0,0 +1,9 @@
<?php
if (!defined('_PS_VERSION_'))
exit;
function upgrade_module_1_4($object)
{
return ($object->registerHook('actionAdminStoresControllerUpdate_optionsAfter'));
}
modules/blocklayered/blocklayered.php
+19 -7
View File
@@ -346,7 +346,10 @@ class BlockLayered extends Module
'is_indexable' =>(bool)$is_indexable
));
return $this->display(__FILE__, 'attribute_group_form.tpl');
if (version_compare(_PS_VERSION_, '1.6.0', '>=') === TRUE)
return $this->display(__FILE__, 'attribute_group_form_1.6.tpl');
else
return $this->display(__FILE__, 'attribute_group_form.tpl');
}
//ATTRIBUTES
@@ -421,8 +424,11 @@ class BlockLayered extends Module
'default_form_language' => (int)$this->context->controller->default_form_language,
'values' => $values
));
return $this->display(__FILE__, 'attribute_form.tpl');
if (version_compare(_PS_VERSION_, '1.6.0', '>=') === TRUE)
return $this->display(__FILE__, 'attribute_form_1.6.tpl');
else
return $this->display(__FILE__, 'attribute_form.tpl');
}
//FEATURES
@@ -514,8 +520,11 @@ class BlockLayered extends Module
'values' => $values,
'is_indexable' =>(bool)$is_indexable
));
return $this->display(__FILE__, 'feature_form.tpl');
if (version_compare(_PS_VERSION_, '1.6.0', '>=') === TRUE)
return $this->display(__FILE__, 'feature_form_1.6.tpl');
else
return $this->display(__FILE__, 'feature_form.tpl');
}
//FEATURES VALUE
@@ -591,8 +600,11 @@ class BlockLayered extends Module
'default_form_language' => (int)$this->context->controller->default_form_language,
'values' => $values
));
return $this->display(__FILE__, 'feature_value_form.tpl');
if (version_compare(_PS_VERSION_, '1.6.0', '>=') === TRUE)
return $this->display(__FILE__, 'feature_value_form_1.6.tpl');
else
return $this->display(__FILE__, 'feature_value_form.tpl');
}
public function hookProductListAssign($params)
modules/blocklayered/views/templates/admin/add.tpl
-1
View File
@@ -3,7 +3,6 @@
<legend><img src="{$uri}/img/cogs.gif" alt="{l s='Configuration' mod='blocklayered'}" /> {l s='New filters template' mod='blocklayered'}</legend>
<form action="{$current_url}" method="post" class="form-horizontal" onsubmit="return checkForm();">
<input type="hidden" name="id_layered_filter" id="id_layered_filter" value="{$id_layered_filter}" />
<input type="hidden" name="n_existing" id="n_existing" value="{$filters_templates|count}" />
<table class="table-configurations">
<tbody>
<tr>
modules/blocklayered/views/templates/admin/add_1.6.tpl
-1
View File
@@ -3,7 +3,6 @@
<h3><i class="icon-cogs"></i> {l s='New filters template' mod='blocklayered'}</h3>
<form action="{$current_url}" method="post" class="form-horizontal" onsubmit="return checkForm();">
<input type="hidden" name="id_layered_filter" id="id_layered_filter" value="{$id_layered_filter}" />
<input type="hidden" name="n_existing" id="n_existing" value="{$filters_templates|count}" />
<div class="form-group">
<label class="control-label col-lg-3">{l s='Template name:' mod='blocklayered'}</label>
<div class="col-lg-9">
modules/blocklayered/views/templates/hook/attribute_form.tpl
+24 -53
View File
@@ -22,61 +22,32 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registred Trademark & Property of PrestaShop SA
*}
<div class="form-group">
<label class="control-label col-lg-3">
<span class="label-tooltip" data-toggle="tooltip" data-html="true" title="" data-original-title="'.$this->l('Invalid characters:').' <>;=#{}_">{l s='URL:' mod='blockfacette'}</span>
</label>
<div class="col-lg-9">
<div class="row">
{foreach $languages as $language}
<div class="translatable-field lang-{$language['id_lang']}" style="display: {if $language['id_lang'] == $default_form_language}block{else}none{/if};">
<div class="col-lg-9">
<input type="text" size="64" name="url_name_{$language['id_lang']}" value="{if isset($values[$language['id_lang']]) && isset($values[$language['id_lang']]['url_name'])}{$values[$language['id_lang']]['url_name']|escape:'htmlall':'UTF-8'}{/if}" />
</div>
<div class="col-lg-2">
<button type="button" class="btn btn-default dropdown-toggle" tabindex="-1" data-toggle="dropdown">
{$language['iso_code']}
<span class="caret"></span>
</button>
<ul class="dropdown-menu">
{foreach $languages as $language}
<li><a href="javascript:hideOtherLanguage({$language['id_lang']});" tabindex="-1">{$language['name']}</a></li>
{/foreach}
</ul>
</div>
<label>
{l s='URL:' mod='blockfacette'}
</label>
<div class="margin-form">
<div class="translatable">
{foreach $languages as $language}
<div class="lang_{$language.id_lang}" style="display:{if $language.id_lang == $default_form_language}block{else}none{/if}; float: left;">
<input type="text" name="url_name_{$language.id_lang}" id="url_name_{$language.id_lang}" value="{if isset($values[$language['id_lang']]) && isset($values[$language['id_lang']]['url_name'])}{$values[$language['id_lang']]['url_name']|escape:'htmlall':'UTF-8'}{/if}" size="64" maxlength="64" />
<p class="preference_description">{l s='Specific URL format in block layered generation' mod='blockfacette'}</p>
<span class="hint" name="help_box">{l s='Invalid characters: <>;=#{}_' mod='blockfacette'}<span class="hint-pointer">&nbsp;</span></span>
</div>
{/foreach}
<div class="col-lg-9">
<p class="help-block">{l s='Specific URL format in block layered generation' mod='blockfacette'}</p>
</div>
</div>
{/foreach}
</div>
</div>
<div class="form-group">
<label class="control-label col-lg-3">{l s='Meta title:' mod='blockfacette'}</label>
<div class="col-lg-9">
<div class="row">
{foreach $languages as $language}
<div class="translatable-field lang-{$language['id_lang']}" style="display: {if $language['id_lang'] == $default_form_language}block{else}none{/if};">
<div class="col-lg-9">
<input type="text" size="70" name="meta_title_{$language['id_lang']}" value="{if isset($values[$language['id_lang']]) && isset($values[$language['id_lang']]['meta_title'])}{$values[$language['id_lang']]['meta_title']|escape:'htmlall':'UTF-8'}{/if}" />
</div>
<div class="col-lg-2">
<button type="button" class="btn btn-default dropdown-toggle" tabindex="-1" data-toggle="dropdown">
{$language['iso_code']}
<span class="caret"></span>
</button>
<ul class="dropdown-menu">';
{foreach $languages as $language}
<li><a href="javascript:hideOtherLanguage({$language['id_lang']});" tabindex="-1">{$language['name']}</a></li>
{/foreach}
</ul>
</div>
<div class="clear"></div>
<label>
{l s='Meta title:' mod='blockfacette'}
</label>
<div class="margin-form">
<div class="translatable">
{foreach $languages as $language}
<div class="lang_{$language.id_lang}" style="display:{if $language.id_lang == $default_form_language}block{else}none{/if}; float: left;">
<input type="text" name="meta_title_{$language.id_lang}" id="meta_title_{$language.id_lang}" value="{if isset($values[$language['id_lang']]) && isset($values[$language['id_lang']]['meta_title'])}{$values[$language['id_lang']]['meta_title']|escape:'htmlall':'UTF-8'}{/if}" size="70" maxlength="70" />
<p class="preference_description">{l s='Specific format for meta title' mod='blockfacette'}</p>
</div>
{/foreach}
<div class="col-lg-9">
<p class="help-block">{l s='Specific format for meta title' mod='blockfacette'}</p>
</div>
</div>
{/foreach}
</div>
</div>
</div>
<div class="clear"></div>
modules/blocklayered/views/templates/hook/attribute_form_1.6.tpl
+82
View File
@@ -0,0 +1,82 @@
{*
* 2007-2013 PrestaShop
*
* NOTICE OF LICENSE
*
* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL:
* http://opensource.org/licenses/afl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to license@prestashop.com so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
* versions in the future. If you wish to customize PrestaShop for your
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
* @copyright 2007-2013 PrestaShop SA
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registred Trademark & Property of PrestaShop SA
*}
<div class="form-group">
<label class="control-label col-lg-3">
<span class="label-tooltip" data-toggle="tooltip" data-html="true" title="" data-original-title="'.$this->l('Invalid characters:').' <>;=#{}_">{l s='URL:' mod='blockfacette'}</span>
</label>
<div class="col-lg-9">
<div class="row">
{foreach $languages as $language}
<div class="translatable-field lang-{$language['id_lang']}" style="display: {if $language['id_lang'] == $default_form_language}block{else}none{/if};">
<div class="col-lg-9">
<input type="text" size="64" name="url_name_{$language['id_lang']}" value="{if isset($values[$language['id_lang']]) && isset($values[$language['id_lang']]['url_name'])}{$values[$language['id_lang']]['url_name']|escape:'htmlall':'UTF-8'}{/if}" />
</div>
<div class="col-lg-2">
<button type="button" class="btn btn-default dropdown-toggle" tabindex="-1" data-toggle="dropdown">
{$language['iso_code']}
<span class="caret"></span>
</button>
<ul class="dropdown-menu">
{foreach $languages as $language}
<li><a href="javascript:hideOtherLanguage({$language['id_lang']});" tabindex="-1">{$language['name']}</a></li>
{/foreach}
</ul>
</div>
</div>
{/foreach}
<div class="col-lg-9">
<p class="help-block">{l s='Specific URL format in block layered generation' mod='blockfacette'}</p>
</div>
</div>
</div>
</div>
<div class="form-group">
<label class="control-label col-lg-3">{l s='Meta title:' mod='blockfacette'}</label>
<div class="col-lg-9">
<div class="row">
{foreach $languages as $language}
<div class="translatable-field lang-{$language['id_lang']}" style="display: {if $language['id_lang'] == $default_form_language}block{else}none{/if};">
<div class="col-lg-9">
<input type="text" size="70" name="meta_title_{$language['id_lang']}" value="{if isset($values[$language['id_lang']]) && isset($values[$language['id_lang']]['meta_title'])}{$values[$language['id_lang']]['meta_title']|escape:'htmlall':'UTF-8'}{/if}" />
</div>
<div class="col-lg-2">
<button type="button" class="btn btn-default dropdown-toggle" tabindex="-1" data-toggle="dropdown">
{$language['iso_code']}
<span class="caret"></span>
</button>
<ul class="dropdown-menu">';
{foreach $languages as $language}
<li><a href="javascript:hideOtherLanguage({$language['id_lang']});" tabindex="-1">{$language['name']}</a></li>
{/foreach}
</ul>
</div>
</div>
{/foreach}
<div class="col-lg-9">
<p class="help-block">{l s='Specific format for meta title' mod='blockfacette'}</p>
</div>
</div>
</div>
</div>
modules/blocklayered/views/templates/hook/attribute_group_form.tpl
+34 -75
View File
@@ -22,84 +22,43 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registred Trademark & Property of PrestaShop SA
*}
<div class="form-group">
<label class="control-label col-lg-3">
<span class="label-tooltip" data-toggle="tooltip" data-html="true" title="" data-original-title="'.$this->l('Invalid characters:').' <>;=#{}_">{l s='URL:' mod='blockfacette'}</span>
</label>
<div class="col-lg-9">
<div class="row">
{foreach $languages as $language}
<div class="translatable-field lang-{$language['id_lang']}" style="display: {if $language['id_lang'] == $default_form_language}block{else}none{/if};">
<div class="col-lg-9">
<input type="text" size="64" name="url_name_{$language['id_lang']}" value="{if isset($values[$language['id_lang']]) && isset($values[$language['id_lang']]['url_name'])}{$values[$language['id_lang']]['url_name']|escape:'htmlall':'UTF-8'}{/if}" />
</div>
<div class="col-lg-2">
<button type="button" class="btn btn-default dropdown-toggle" tabindex="-1" data-toggle="dropdown">
{$language['iso_code']}
<span class="caret"></span>
</button>
<ul class="dropdown-menu">
{foreach $languages as $language}
<li><a href="javascript:hideOtherLanguage({$language['id_lang']});" tabindex="-1">{$language['name']}</a></li>
{/foreach}
</ul>
</div>
<label>
{l s='URL:' mod='blockfacette'}
</label>
<div class="margin-form">
<div class="translatable">
{foreach $languages as $language}
<div class="lang_{$language.id_lang}" style="display:{if $language.id_lang == $default_form_language}block{else}none{/if}; float: left;">
<input type="text" name="url_name_{$language.id_lang}" id="url_name_{$language.id_lang}" value="{if isset($values[$language['id_lang']]) && isset($values[$language['id_lang']]['url_name'])}{$values[$language['id_lang']]['url_name']|escape:'htmlall':'UTF-8'}{/if}" size="64" maxlength="64" />
<p class="preference_description">{l s='Specific URL format in block layered generation' mod='blockfacette'}</p>
<span class="hint" name="help_box">{l s='Invalid characters: <>;=#{}_' mod='blockfacette'}<span class="hint-pointer">&nbsp;</span></span>
</div>
{/foreach}
<div class="col-lg-9">
<p class="help-block">{l s='Specific URL format in block layered generation' mod='blockfacette'}</p>
</div>
</div>
{/foreach}
</div>
</div>
<div class="form-group">
<label class="control-label col-lg-3">{l s='Meta title:' mod='blockfacette'}</label>
<div class="col-lg-9">
<div class="row">
{foreach $languages as $language}
<div class="translatable-field lang-{$language['id_lang']}" style="display: {if $language['id_lang'] == $default_form_language}block{else}none{/if};">
<div class="col-lg-9">
<input type="text" size="70" name="meta_title_{$language['id_lang']}" value="{if isset($values[$language['id_lang']]) && isset($values[$language['id_lang']]['meta_title'])}{$values[$language['id_lang']]['meta_title']|escape:'htmlall':'UTF-8'}{/if}" />
</div>
<div class="col-lg-2">
<button type="button" class="btn btn-default dropdown-toggle" tabindex="-1" data-toggle="dropdown">
{$language['iso_code']}
<span class="caret"></span>
</button>
<ul class="dropdown-menu">';
{foreach $languages as $language}
<li><a href="javascript:hideOtherLanguage({$language['id_lang']});" tabindex="-1">{$language['name']}</a></li>
{/foreach}
</ul>
</div>
<div class="clear"></div>
<label>
{l s='Meta title:' mod='blockfacette'}
</label>
<div class="margin-form">
<div class="translatable">
{foreach $languages as $language}
<div class="lang_{$language.id_lang}" style="display:{if $language.id_lang == $default_form_language}block{else}none{/if}; float: left;">
<input type="text" name="meta_title_{$language.id_lang}" id="meta_title_{$language.id_lang}" value="{if isset($values[$language['id_lang']]) && isset($values[$language['id_lang']]['meta_title'])}{$values[$language['id_lang']]['meta_title']|escape:'htmlall':'UTF-8'}{/if}" size="70" maxlength="70" />
<p class="preference_description">{l s='Specific format for meta title' mod='blockfacette'}</p>
</div>
{/foreach}
<div class="col-lg-9">
<p class="help-block">{l s='Specific format for meta title' mod='blockfacette'}</p>
</div>
</div>
{/foreach}
</div>
</div>
<div class="form-group">
<label class="control-label col-lg-3" for="">{l s='Indexable:' mod='blockfacette'}</label>
<div class="col-lg-9">
<div class="row">
<div class="input-group col-lg-2">
<span class="switch prestashop-switch">
<input type="radio" name="layered_indexable" id="indexable_on" value="1"{if $is_indexable} checked="checked"{/if}>
<label for="indexable_on" class="radioCheck">
<i class="icon-check-sign color_success"></i> {l s='Yes' mod='blockfacette'}
</label>
<input type="radio" name="layered_indexable" id="indexable_off" value="0"{if !$is_indexable} checked="checked"{/if}>
<label for="indexable_off" class="radioCheck">
<i class="icon-ban-circle color_danger"></i> {l s='No' mod='blockfacette'}
</label>
<a class="slide-button btn btn-default"></a>
</span>
</div>
</div>
</div>
<div class="col-lg-9 col-lg-push-3">
<p class="help-block">{l s='Use this attribute in URL generated by the layered navigation module' mod='blockfacette'}</p>
</div>
</div>
<div class="clear"></div>
<label>{l s='Indexable:' mod='blockfacette'}</label>
<div class="margin-form">
<label class="t" for="layered_indexable_on"><img src="../img/admin/enabled.gif" alt="{l s='Yes' mod='blockfacette'}" title="{l s='Yes' mod='blockfacette'}"></label>
<input type="radio" name="layered_indexable" id="layered_indexable_on" value="1"{if $is_indexable} checked="checked"{/if} />
<label class="t" for="layered_indexable_on"> {l s='Yes' mod='blockfacette'}</label>
<label class="t" for="layered_indexable_off"><img src="../img/admin/disabled.gif" alt="{l s='No' mod='blockfacette'}" title="{l s='No' mod='blockfacette'}" style="margin-left: 10px;"></label>
<input type="radio" name="layered_indexable" id="layered_indexable_off" value="0"{if !$is_indexable} checked="checked"{/if}>
<label class="t" for="layered_indexable_off"> {l s='No' mod='blockfacette'}</label>
<p class="preference_description">{l s='Use this attribute in URL generated by the layered navigation module' mod='blockfacette'}</p>
</div>
<div class="clear"></div>
modules/blocklayered/views/templates/hook/attribute_group_form_1.6.tpl
+105
View File
@@ -0,0 +1,105 @@
{*
* 2007-2013 PrestaShop
*
* NOTICE OF LICENSE
*
* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL:
* http://opensource.org/licenses/afl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to license@prestashop.com so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
* versions in the future. If you wish to customize PrestaShop for your
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
* @copyright 2007-2013 PrestaShop SA
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registred Trademark & Property of PrestaShop SA
*}
<div class="form-group">
<label class="control-label col-lg-3">
<span class="label-tooltip" data-toggle="tooltip" data-html="true" title="" data-original-title="'.$this->l('Invalid characters:').' <>;=#{}_">{l s='URL:' mod='blockfacette'}</span>
</label>
<div class="col-lg-9">
<div class="row">
{foreach $languages as $language}
<div class="translatable-field lang-{$language['id_lang']}" style="display: {if $language['id_lang'] == $default_form_language}block{else}none{/if};">
<div class="col-lg-9">
<input type="text" size="64" name="url_name_{$language['id_lang']}" value="{if isset($values[$language['id_lang']]) && isset($values[$language['id_lang']]['url_name'])}{$values[$language['id_lang']]['url_name']|escape:'htmlall':'UTF-8'}{/if}" />
</div>
<div class="col-lg-2">
<button type="button" class="btn btn-default dropdown-toggle" tabindex="-1" data-toggle="dropdown">
{$language['iso_code']}
<span class="caret"></span>
</button>
<ul class="dropdown-menu">
{foreach $languages as $language}
<li><a href="javascript:hideOtherLanguage({$language['id_lang']});" tabindex="-1">{$language['name']}</a></li>
{/foreach}
</ul>
</div>
</div>
{/foreach}
<div class="col-lg-9">
<p class="help-block">{l s='Specific URL format in block layered generation' mod='blockfacette'}</p>
</div>
</div>
</div>
</div>
<div class="form-group">
<label class="control-label col-lg-3">{l s='Meta title:' mod='blockfacette'}</label>
<div class="col-lg-9">
<div class="row">
{foreach $languages as $language}
<div class="translatable-field lang-{$language['id_lang']}" style="display: {if $language['id_lang'] == $default_form_language}block{else}none{/if};">
<div class="col-lg-9">
<input type="text" size="70" name="meta_title_{$language['id_lang']}" value="{if isset($values[$language['id_lang']]) && isset($values[$language['id_lang']]['meta_title'])}{$values[$language['id_lang']]['meta_title']|escape:'htmlall':'UTF-8'}{/if}" />
</div>
<div class="col-lg-2">
<button type="button" class="btn btn-default dropdown-toggle" tabindex="-1" data-toggle="dropdown">
{$language['iso_code']}
<span class="caret"></span>
</button>
<ul class="dropdown-menu">';
{foreach $languages as $language}
<li><a href="javascript:hideOtherLanguage({$language['id_lang']});" tabindex="-1">{$language['name']}</a></li>
{/foreach}
</ul>
</div>
</div>
{/foreach}
<div class="col-lg-9">
<p class="help-block">{l s='Specific format for meta title' mod='blockfacette'}</p>
</div>
</div>
</div>
</div>
<div class="form-group">
<label class="control-label col-lg-3" for="">{l s='Indexable:' mod='blockfacette'}</label>
<div class="col-lg-9">
<div class="row">
<div class="input-group col-lg-2">
<span class="switch prestashop-switch">
<input type="radio" name="layered_indexable" id="indexable_on" value="1"{if $is_indexable} checked="checked"{/if}>
<label for="indexable_on" class="radioCheck">
<i class="icon-check-sign color_success"></i> {l s='Yes' mod='blockfacette'}
</label>
<input type="radio" name="layered_indexable" id="indexable_off" value="0"{if !$is_indexable} checked="checked"{/if}>
<label for="indexable_off" class="radioCheck">
<i class="icon-ban-circle color_danger"></i> {l s='No' mod='blockfacette'}
</label>
<a class="slide-button btn btn-default"></a>
</span>
</div>
</div>
</div>
<div class="col-lg-9 col-lg-push-3">
<p class="help-block">{l s='Use this attribute in URL generated by the layered navigation module' mod='blockfacette'}</p>
</div>
</div>
modules/blocklayered/views/templates/hook/feature_form.tpl
+34 -75
View File
@@ -22,84 +22,43 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registred Trademark & Property of PrestaShop SA
*}
<div class="form-group">
<label class="control-label col-lg-3">
<span class="label-tooltip" data-toggle="tooltip" data-html="true" title="" data-original-title="'.$this->l('Invalid characters:').' <>;=#{}_">{l s='URL:' mod='blockfacette'}</span>
</label>
<div class="col-lg-9">
<div class="row">
{foreach $languages as $language}
<div class="translatable-field lang-{$language['id_lang']}" style="display: {if $language['id_lang'] == $default_form_language}block{else}none{/if};">
<div class="col-lg-9">
<input type="text" size="64" name="url_name_{$language['id_lang']}" value="{if isset($values[$language['id_lang']]) && isset($values[$language['id_lang']]['url_name'])}{$values[$language['id_lang']]['url_name']|escape:'htmlall':'UTF-8'}{/if}" />
</div>
<div class="col-lg-2">
<button type="button" class="btn btn-default dropdown-toggle" tabindex="-1" data-toggle="dropdown">
{$language['iso_code']}
<span class="caret"></span>
</button>
<ul class="dropdown-menu">
{foreach $languages as $language}
<li><a href="javascript:hideOtherLanguage({$language['id_lang']});" tabindex="-1">{$language['name']}</a></li>
{/foreach}
</ul>
</div>
<label>
{l s='URL:' mod='blockfacette'}
</label>
<div class="margin-form">
<div class="translatable">
{foreach $languages as $language}
<div class="lang_{$language.id_lang}" style="display:{if $language.id_lang == $default_form_language}block{else}none{/if}; float: left;">
<input type="text" name="url_name_{$language.id_lang}" id="url_name_{$language.id_lang}" value="{if isset($values[$language['id_lang']]) && isset($values[$language['id_lang']]['url_name'])}{$values[$language['id_lang']]['url_name']|escape:'htmlall':'UTF-8'}{/if}" size="64" maxlength="64" />
<p class="preference_description">{l s='Specific URL format in block layered generation' mod='blockfacette'}</p>
<span class="hint" name="help_box">{l s='Invalid characters: <>;=#{}_' mod='blockfacette'}<span class="hint-pointer">&nbsp;</span></span>
</div>
{/foreach}
<div class="col-lg-9">
<p class="help-block">{l s='Specific URL format in block layered generation' mod='blockfacette'}</p>
</div>
</div>
{/foreach}
</div>
</div>
<div class="form-group">
<label class="control-label col-lg-3">{l s='Meta title:' mod='blockfacette'}</label>
<div class="col-lg-9">
<div class="row">
{foreach $languages as $language}
<div class="translatable-field lang-{$language['id_lang']}" style="display: {if $language['id_lang'] == $default_form_language}block{else}none{/if};">
<div class="col-lg-9">
<input type="text" size="70" name="meta_title_{$language['id_lang']}" value="{if isset($values[$language['id_lang']]) && isset($values[$language['id_lang']]['meta_title'])}{$values[$language['id_lang']]['meta_title']|escape:'htmlall':'UTF-8'}{/if}" />
</div>
<div class="col-lg-2">
<button type="button" class="btn btn-default dropdown-toggle" tabindex="-1" data-toggle="dropdown">
{$language['iso_code']}
<span class="caret"></span>
</button>
<ul class="dropdown-menu">';
{foreach $languages as $language}
<li><a href="javascript:hideOtherLanguage({$language['id_lang']});" tabindex="-1">{$language['name']}</a></li>
{/foreach}
</ul>
</div>
<div class="clear"></div>
<label>
{l s='Meta title:' mod='blockfacette'}
</label>
<div class="margin-form">
<div class="translatable">
{foreach $languages as $language}
<div class="lang_{$language.id_lang}" style="display:{if $language.id_lang == $default_form_language}block{else}none{/if}; float: left;">
<input type="text" name="meta_title_{$language.id_lang}" id="meta_title_{$language.id_lang}" value="{if isset($values[$language['id_lang']]) && isset($values[$language['id_lang']]['meta_title'])}{$values[$language['id_lang']]['meta_title']|escape:'htmlall':'UTF-8'}{/if}" size="70" maxlength="70" />
<p class="preference_description">{l s='Specific format for meta title' mod='blockfacette'}</p>
</div>
{/foreach}
<div class="col-lg-9">
<p class="help-block">{l s='Specific format for meta title' mod='blockfacette'}</p>
</div>
</div>
{/foreach}
</div>
</div>
<div class="form-group">
<label class="control-label col-lg-3" for="">{l s='Indexable:' mod='blockfacette'}</label>
<div class="col-lg-9">
<div class="row">
<div class="input-group col-lg-2">
<span class="switch prestashop-switch">
<input type="radio" name="layered_indexable" id="indexable_on" value="1"{if $is_indexable} checked="checked"{/if}>
<label for="indexable_on">
<i class="icon-check-sign color_success"></i> {l s='Yes' mod='blockfacette'}
</label>
<input type="radio" name="layered_indexable" id="indexable_off" value="0"{if !$is_indexable} checked="checked"{/if}>
<label for="indexable_off">
<i class="icon-ban-circle color_danger"></i> {l s='No' mod='blockfacette'}
</label>
<a class="slide-button btn btn-default"></a>
</span>
</div>
</div>
</div>
<div class="col-lg-9 col-lg-push-3">
<p class="help-block">{l s='Use this attribute in URL generated by the layered navigation module' mod='blockfacette'}</p>
</div>
</div>
<div class="clear"></div>
<label>{l s='Indexable:' mod='blockfacette'}</label>
<div class="margin-form">
<label class="t" for="layered_indexable_on"><img src="../img/admin/enabled.gif" alt="{l s='Yes' mod='blockfacette'}" title="{l s='Yes' mod='blockfacette'}"></label>
<input type="radio" name="layered_indexable" id="layered_indexable_on" value="1"{if $is_indexable} checked="checked"{/if} />
<label class="t" for="layered_indexable_on"> {l s='Yes' mod='blockfacette'}</label>
<label class="t" for="layered_indexable_off"><img src="../img/admin/disabled.gif" alt="{l s='No' mod='blockfacette'}" title="{l s='No' mod='blockfacette'}" style="margin-left: 10px;"></label>
<input type="radio" name="layered_indexable" id="layered_indexable_off" value="0"{if !$is_indexable} checked="checked"{/if}>
<label class="t" for="layered_indexable_off"> {l s='No' mod='blockfacette'}</label>
<p class="preference_description">{l s='Use this attribute in URL generated by the layered navigation module' mod='blockfacette'}</p>
</div>
<div class="clear"></div>
modules/blocklayered/views/templates/hook/feature_form_1.6.tpl
+105
View File
@@ -0,0 +1,105 @@
{*
* 2007-2013 PrestaShop
*
* NOTICE OF LICENSE
*
* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL:
* http://opensource.org/licenses/afl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to license@prestashop.com so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
* versions in the future. If you wish to customize PrestaShop for your
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
* @copyright 2007-2013 PrestaShop SA
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registred Trademark & Property of PrestaShop SA
*}
<div class="form-group">
<label class="control-label col-lg-3">
<span class="label-tooltip" data-toggle="tooltip" data-html="true" title="" data-original-title="'.$this->l('Invalid characters:').' <>;=#{}_">{l s='URL:' mod='blockfacette'}</span>
</label>
<div class="col-lg-9">
<div class="row">
{foreach $languages as $language}
<div class="translatable-field lang-{$language['id_lang']}" style="display: {if $language['id_lang'] == $default_form_language}block{else}none{/if};">
<div class="col-lg-9">
<input type="text" size="64" name="url_name_{$language['id_lang']}" value="{if isset($values[$language['id_lang']]) && isset($values[$language['id_lang']]['url_name'])}{$values[$language['id_lang']]['url_name']|escape:'htmlall':'UTF-8'}{/if}" />
</div>
<div class="col-lg-2">
<button type="button" class="btn btn-default dropdown-toggle" tabindex="-1" data-toggle="dropdown">
{$language['iso_code']}
<span class="caret"></span>
</button>
<ul class="dropdown-menu">
{foreach $languages as $language}
<li><a href="javascript:hideOtherLanguage({$language['id_lang']});" tabindex="-1">{$language['name']}</a></li>
{/foreach}
</ul>
</div>
</div>
{/foreach}
<div class="col-lg-9">
<p class="help-block">{l s='Specific URL format in block layered generation' mod='blockfacette'}</p>
</div>
</div>
</div>
</div>
<div class="form-group">
<label class="control-label col-lg-3">{l s='Meta title:' mod='blockfacette'}</label>
<div class="col-lg-9">
<div class="row">
{foreach $languages as $language}
<div class="translatable-field lang-{$language['id_lang']}" style="display: {if $language['id_lang'] == $default_form_language}block{else}none{/if};">
<div class="col-lg-9">
<input type="text" size="70" name="meta_title_{$language['id_lang']}" value="{if isset($values[$language['id_lang']]) && isset($values[$language['id_lang']]['meta_title'])}{$values[$language['id_lang']]['meta_title']|escape:'htmlall':'UTF-8'}{/if}" />
</div>
<div class="col-lg-2">
<button type="button" class="btn btn-default dropdown-toggle" tabindex="-1" data-toggle="dropdown">
{$language['iso_code']}
<span class="caret"></span>
</button>
<ul class="dropdown-menu">';
{foreach $languages as $language}
<li><a href="javascript:hideOtherLanguage({$language['id_lang']});" tabindex="-1">{$language['name']}</a></li>
{/foreach}
</ul>
</div>
</div>
{/foreach}
<div class="col-lg-9">
<p class="help-block">{l s='Specific format for meta title' mod='blockfacette'}</p>
</div>
</div>
</div>
</div>
<div class="form-group">
<label class="control-label col-lg-3" for="">{l s='Indexable:' mod='blockfacette'}</label>
<div class="col-lg-9">
<div class="row">
<div class="input-group col-lg-2">
<span class="switch prestashop-switch">
<input type="radio" name="layered_indexable" id="indexable_on" value="1"{if $is_indexable} checked="checked"{/if}>
<label for="indexable_on">
<i class="icon-check-sign color_success"></i> {l s='Yes' mod='blockfacette'}
</label>
<input type="radio" name="layered_indexable" id="indexable_off" value="0"{if !$is_indexable} checked="checked"{/if}>
<label for="indexable_off">
<i class="icon-ban-circle color_danger"></i> {l s='No' mod='blockfacette'}
</label>
<a class="slide-button btn btn-default"></a>
</span>
</div>
</div>
</div>
<div class="col-lg-9 col-lg-push-3">
<p class="help-block">{l s='Use this attribute in URL generated by the layered navigation module' mod='blockfacette'}</p>
</div>
</div>
modules/blocklayered/views/templates/hook/feature_value_form.tpl
+24 -53
View File
@@ -22,61 +22,32 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registred Trademark & Property of PrestaShop SA
*}
<div class="form-group">
<label class="control-label col-lg-3">
<span class="label-tooltip" data-toggle="tooltip" data-html="true" title="" data-original-title="'.$this->l('Invalid characters:').' <>;=#{}_">{l s='URL:' mod='blockfacette'}</span>
</label>
<div class="col-lg-9">
<div class="row">
{foreach $languages as $language}
<div class="translatable-field lang-{$language['id_lang']}" style="display: {if $language['id_lang'] == $default_form_language}block{else}none{/if};">
<div class="col-lg-9">
<input type="text" size="64" name="url_name_{$language['id_lang']}" value="{if isset($values[$language['id_lang']]) && isset($values[$language['id_lang']]['url_name'])}{$values[$language['id_lang']]['url_name']|escape:'htmlall':'UTF-8'}{/if}" />
</div>
<div class="col-lg-2">
<button type="button" class="btn btn-default dropdown-toggle" tabindex="-1" data-toggle="dropdown">
{$language['iso_code']}
<span class="caret"></span>
</button>
<ul class="dropdown-menu">
{foreach $languages as $language}
<li><a href="javascript:hideOtherLanguage({$language['id_lang']});" tabindex="-1">{$language['name']}</a></li>
{/foreach}
</ul>
</div>
<label>
{l s='URL:' mod='blockfacette'}
</label>
<div class="margin-form">
<div class="translatable">
{foreach $languages as $language}
<div class="lang_{$language.id_lang}" style="display:{if $language.id_lang == $default_form_language}block{else}none{/if}; float: left;">
<input type="text" name="url_name_{$language.id_lang}" id="url_name_{$language.id_lang}" value="{if isset($values[$language['id_lang']]) && isset($values[$language['id_lang']]['url_name'])}{$values[$language['id_lang']]['url_name']|escape:'htmlall':'UTF-8'}{/if}" size="64" maxlength="64" />
<p class="preference_description">{l s='Specific URL format in block layered generation' mod='blockfacette'}</p>
<span class="hint" name="help_box">{l s='Invalid characters: <>;=#{}_' mod='blockfacette'}<span class="hint-pointer">&nbsp;</span></span>
</div>
{/foreach}
<div class="col-lg-9">
<p class="help-block">{l s='Specific URL format in block layered generation' mod='blockfacette'}</p>
</div>
</div>
{/foreach}
</div>
</div>
<div class="form-group">
<label class="control-label col-lg-3">{l s='Meta title:' mod='blockfacette'}</label>
<div class="col-lg-9">
<div class="row">
{foreach $languages as $language}
<div class="translatable-field lang-{$language['id_lang']}" style="display: {if $language['id_lang'] == $default_form_language}block{else}none{/if};">
<div class="col-lg-9">
<input type="text" size="70" name="meta_title_{$language['id_lang']}" value="{if isset($values[$language['id_lang']]) && isset($values[$language['id_lang']]['meta_title'])}{$values[$language['id_lang']]['meta_title']|escape:'htmlall':'UTF-8'}{/if}" />
</div>
<div class="col-lg-2">
<button type="button" class="btn btn-default dropdown-toggle" tabindex="-1" data-toggle="dropdown">
{$language['iso_code']}
<span class="caret"></span>
</button>
<ul class="dropdown-menu">';
{foreach $languages as $language}
<li><a href="javascript:hideOtherLanguage({$language['id_lang']});" tabindex="-1">{$language['name']}</a></li>
{/foreach}
</ul>
</div>
<div class="clear"></div>
<label>
{l s='Meta title:' mod='blockfacette'}
</label>
<div class="margin-form">
<div class="translatable">
{foreach $languages as $language}
<div class="lang_{$language.id_lang}" style="display:{if $language.id_lang == $default_form_language}block{else}none{/if}; float: left;">
<input type="text" name="meta_title_{$language.id_lang}" id="meta_title_{$language.id_lang}" value="{if isset($values[$language['id_lang']]) && isset($values[$language['id_lang']]['meta_title'])}{$values[$language['id_lang']]['meta_title']|escape:'htmlall':'UTF-8'}{/if}" size="70" maxlength="70" />
<p class="preference_description">{l s='Specific format for meta title' mod='blockfacette'}</p>
</div>
{/foreach}
<div class="col-lg-9">
<p class="help-block">{l s='Specific format for meta title' mod='blockfacette'}</p>
</div>
</div>
{/foreach}
</div>
</div>
</div>
<div class="clear"></div>
modules/blocklayered/views/templates/hook/feature_value_form_1.6.tpl
+82
View File
@@ -0,0 +1,82 @@
{*
* 2007-2013 PrestaShop
*
* NOTICE OF LICENSE
*
* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL:
* http://opensource.org/licenses/afl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to license@prestashop.com so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
* versions in the future. If you wish to customize PrestaShop for your
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
* @copyright 2007-2013 PrestaShop SA
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registred Trademark & Property of PrestaShop SA
*}
<div class="form-group">
<label class="control-label col-lg-3">
<span class="label-tooltip" data-toggle="tooltip" data-html="true" title="" data-original-title="'.$this->l('Invalid characters:').' <>;=#{}_">{l s='URL:' mod='blockfacette'}</span>
</label>
<div class="col-lg-9">
<div class="row">
{foreach $languages as $language}
<div class="translatable-field lang-{$language['id_lang']}" style="display: {if $language['id_lang'] == $default_form_language}block{else}none{/if};">
<div class="col-lg-9">
<input type="text" size="64" name="url_name_{$language['id_lang']}" value="{if isset($values[$language['id_lang']]) && isset($values[$language['id_lang']]['url_name'])}{$values[$language['id_lang']]['url_name']|escape:'htmlall':'UTF-8'}{/if}" />
</div>
<div class="col-lg-2">
<button type="button" class="btn btn-default dropdown-toggle" tabindex="-1" data-toggle="dropdown">
{$language['iso_code']}
<span class="caret"></span>
</button>
<ul class="dropdown-menu">
{foreach $languages as $language}
<li><a href="javascript:hideOtherLanguage({$language['id_lang']});" tabindex="-1">{$language['name']}</a></li>
{/foreach}
</ul>
</div>
</div>
{/foreach}
<div class="col-lg-9">
<p class="help-block">{l s='Specific URL format in block layered generation' mod='blockfacette'}</p>
</div>
</div>
</div>
</div>
<div class="form-group">
<label class="control-label col-lg-3">{l s='Meta title:' mod='blockfacette'}</label>
<div class="col-lg-9">
<div class="row">
{foreach $languages as $language}
<div class="translatable-field lang-{$language['id_lang']}" style="display: {if $language['id_lang'] == $default_form_language}block{else}none{/if};">
<div class="col-lg-9">
<input type="text" size="70" name="meta_title_{$language['id_lang']}" value="{if isset($values[$language['id_lang']]) && isset($values[$language['id_lang']]['meta_title'])}{$values[$language['id_lang']]['meta_title']|escape:'htmlall':'UTF-8'}{/if}" />
</div>
<div class="col-lg-2">
<button type="button" class="btn btn-default dropdown-toggle" tabindex="-1" data-toggle="dropdown">
{$language['iso_code']}
<span class="caret"></span>
</button>
<ul class="dropdown-menu">';
{foreach $languages as $language}
<li><a href="javascript:hideOtherLanguage({$language['id_lang']});" tabindex="-1">{$language['name']}</a></li>
{/foreach}
</ul>
</div>
</div>
{/foreach}
<div class="col-lg-9">
<p class="help-block">{l s='Specific format for meta title' mod='blockfacette'}</p>
</div>
</div>
</div>
</div>
modules/homefeatured/homefeatured.php
-1
View File
@@ -97,7 +97,6 @@ class HomeFeatured extends Module
public function hookHeader($params)
{
$this->context->controller->addCSS(($this->_path).'homefeatured.css', 'all');
$this->context->controller->addJS(($this->_path).'js/homefeatured.js');
}
public function hookDisplayHomeTab($params)
modules/homefeatured/js/homefeatured.js
-36
View File
@@ -1,36 +0,0 @@
/*
* 2007-2013 PrestaShop
*
* NOTICE OF LICENSE
*
* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL:
* http://opensource.org/licenses/afl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to license@prestashop.com so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
* versions in the future. If you wish to customize PrestaShop for your
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
* @copyright 2007-2013 PrestaShop SA
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
$(document).ready(function()
{
$('.home_tab li a').click(function(){
var button = $(this);
$('.home_tab li').removeClass('active');
button.parent('li').addClass('active');
$('.home_tab_content .product_list').hide(0, function(){
$('.home_tab_content .' + button.prop('class')).show(0).addClass('active').removeClass('hidden');
});
});
});
themes/default-bootstrap/js/modules/homefeatured/js/homefeatured.js
View File
themes/default-bootstrap/manufacturer-list.tpl
+84 -45
View File
@@ -43,70 +43,109 @@
{if isset($errors) AND $errors}
{include file="$tpl_dir./errors.tpl"}
{else}
{if $nbManufacturers > 0}
<div class="content_sortPagiBar">
<div class="sortPagiBar clearfix">
<ul class="display hidden-xs">
<li class="display-title">{l s='View:'}</li>
<li id="grid"><a onclick="display('grid');"><i class="icon-th-large"></i>{l s='Grid'}</a></li>
<li id="list"><a onclick="display('list');"><i class="icon-th-list"></i>{l s='List'}</a></li>
<li class="display-title">
{l s='View:'}
</li>
<li id="grid">
<a onclick="display('grid');">
<i class="icon-th-large"></i>{l s='Grid'}
</a>
</li>
<li id="list">
<a onclick="display('list');">
<i class="icon-th-list"></i>{l s='List'}
</a>
</li>
</ul>
{include file="./nbr-product-page.tpl"}
</div>
<div class="top-pagination-content clearfix bottom-line">
{include file="$tpl_dir./pagination.tpl"}
</div>
</div>
</div> <!-- .content_sortPagiBar -->
{assign var='nbItemsPerLine' value=3}
{assign var='nbItemsPerLineTablet' value=2}
{assign var='nbLi' value=$manufacturers|@count}
{math equation="nbLi/nbItemsPerLine" nbLi=$nbLi nbItemsPerLine=$nbItemsPerLine assign=nbLines}
{math equation="nbLi/nbItemsPerLineTablet" nbLi=$nbLi nbItemsPerLineTablet=$nbItemsPerLineTablet assign=nbLinesTablet}
<ul id="manufacturers_list">
{foreach from=$manufacturers item=manufacturer name=manufacturers}
{math equation="(total%perLine)" total=$smarty.foreach.manufacturers.total perLine=$nbItemsPerLine assign=totModulo}
{math equation="(total%perLineT)" total=$smarty.foreach.manufacturers.total perLineT=$nbItemsPerLineTablet assign=totModuloTablet}
{if $totModulo == 0}{assign var='totModulo' value=$nbItemsPerLine}{/if}
{if $totModuloTablet == 0}{assign var='totModuloTablet' value=$nbItemsPerLineTablet}{/if}
<li class="{if $smarty.foreach.manufacturers.iteration%$nbItemsPerLine == 0} last-in-line{elseif $smarty.foreach.manufacturers.iteration%$nbItemsPerLine == 1} first-in-line{/if} {if $smarty.foreach.manufacturers.iteration > ($smarty.foreach.manufacturers.total - $totModulo)}last-line{/if} {if $smarty.foreach.manufacturers.iteration%$nbItemsPerLineTablet == 0}last-item-of-tablet-line{elseif $smarty.foreach.manufacturers.iteration%$nbItemsPerLineTablet == 1}first-item-of-tablet-line{/if} {if $smarty.foreach.manufacturers.iteration > ($smarty.foreach.manufacturers.total - $totModuloTablet)}last-tablet-line{/if}{if $smarty.foreach.manufacturers.last} item-last{/if}">
<div class="left-side">
<!-- logo -->
<div class="logo">
{if $manufacturer.nb_products > 0}<a href="{$link->getmanufacturerLink($manufacturer.id_manufacturer, $manufacturer.link_rewrite)|escape:'html':'UTF-8'}" title="{$manufacturer.name|escape:'html':'UTF-8'}" class="lnk_img">{/if}
<img src="{$img_manu_dir}{$manufacturer.image|escape:'html':'UTF-8'}-medium_default.jpg" alt="" />
{if $manufacturer.nb_products > 0}</a>{/if}
</div>
</div>
<div class="middle-side">
<!-- name -->
<h3>
{if $manufacturer.nb_products > 0}<a class="product-name" href="{$link->getmanufacturerLink($manufacturer.id_manufacturer, $manufacturer.link_rewrite)|escape:'html':'UTF-8'}">{/if}
{$manufacturer.name|truncate:60:'...'|escape:'html':'UTF-8'}
{if $manufacturer.nb_products > 0}</a>{/if}
</h3>
<div class="description rte">
{$manufacturer.short_description}
</div>
</div>
<div class="right-side">
<div class="right-side-content">
<p class="product-counter">
{if $manufacturer.nb_products > 0}<a href="{$link->getmanufacturerLink($manufacturer.id_manufacturer, $manufacturer.link_rewrite)|escape:'html':'UTF-8'}">{/if}
{if $manufacturer.nb_products == 1}{l s='%d product' sprintf=$manufacturer.nb_products|intval}{else}{l s='%d products' sprintf=$manufacturer.nb_products|intval}{/if}
{if $manufacturer.nb_products > 0}</a>{/if}
</p>
{if $manufacturer.nb_products > 0}
<a class="btn btn-default button exclusive-medium" href="{$link->getmanufacturerLink($manufacturer.id_manufacturer, $manufacturer.link_rewrite)|escape:'html':'UTF-8'}"><span>{l s='view products'} <i class="icon-chevron-right right"></i></span></a>
{/if}
</div>
</div>
</li>
{/foreach}
{foreach from=$manufacturers item=manufacturer name=manufacturers}
{math equation="(total%perLine)" total=$smarty.foreach.manufacturers.total perLine=$nbItemsPerLine assign=totModulo}
{math equation="(total%perLineT)" total=$smarty.foreach.manufacturers.total perLineT=$nbItemsPerLineTablet assign=totModuloTablet}
{if $totModulo == 0}{assign var='totModulo' value=$nbItemsPerLine}{/if}
{if $totModuloTablet == 0}{assign var='totModuloTablet' value=$nbItemsPerLineTablet}{/if}
<li class="{if $smarty.foreach.manufacturers.iteration%$nbItemsPerLine == 0} last-in-line{elseif $smarty.foreach.manufacturers.iteration%$nbItemsPerLine == 1} first-in-line{/if} {if $smarty.foreach.manufacturers.iteration > ($smarty.foreach.manufacturers.total - $totModulo)}last-line{/if} {if $smarty.foreach.manufacturers.iteration%$nbItemsPerLineTablet == 0}last-item-of-tablet-line{elseif $smarty.foreach.manufacturers.iteration%$nbItemsPerLineTablet == 1}first-item-of-tablet-line{/if} {if $smarty.foreach.manufacturers.iteration > ($smarty.foreach.manufacturers.total - $totModuloTablet)}last-tablet-line{/if}{if $smarty.foreach.manufacturers.last} item-last{/if}">
<div class="left-side">
<div class="logo">
{if $manufacturer.nb_products > 0}
<a
class="lnk_img"
href="{$link->getmanufacturerLink($manufacturer.id_manufacturer, $manufacturer.link_rewrite)|escape:'html':'UTF-8'}"
title="{$manufacturer.name|escape:'html':'UTF-8'}" >
{/if}
<img src="{$img_manu_dir}{$manufacturer.image|escape:'html':'UTF-8'}-medium_default.jpg" alt="" />
{if $manufacturer.nb_products > 0}
</a>
{/if}
</div> <!-- .logo -->
</div> <!-- .left-side -->
<div class="middle-side">
<h3>
{if $manufacturer.nb_products > 0}
<a
class="product-name"
href="{$link->getmanufacturerLink($manufacturer.id_manufacturer, $manufacturer.link_rewrite)|escape:'html':'UTF-8'}">
{/if}
{$manufacturer.name|truncate:60:'...'|escape:'html':'UTF-8'}
{if $manufacturer.nb_products > 0}
</a>
{/if}
</h3>
<div class="description rte">
{$manufacturer.short_description}
</div>
</div> <!-- .middle-side -->
<div class="right-side">
<div class="right-side-content">
<p class="product-counter">
{if $manufacturer.nb_products > 0}
<a href="{$link->getmanufacturerLink($manufacturer.id_manufacturer, $manufacturer.link_rewrite)|escape:'html':'UTF-8'}">
{/if}
{if $manufacturer.nb_products == 1}
{l s='%d product' sprintf=$manufacturer.nb_products|intval}
{else}
{l s='%d products' sprintf=$manufacturer.nb_products|intval}
{/if}
{if $manufacturer.nb_products > 0}
</a>
{/if}
</p>
{if $manufacturer.nb_products > 0}
<a
class="btn btn-default button exclusive-medium"
href="{$link->getmanufacturerLink($manufacturer.id_manufacturer, $manufacturer.link_rewrite)|escape:'html':'UTF-8'}">
<span>
{l s='view products'} <i class="icon-chevron-right right"></i>
</span>
</a>
{/if}
</div>
</div> <!-- .right-side -->
</li>
{/foreach}
</ul>
<div class="content_sortPagiBar">
<div class="bottom-pagination-content clearfix">
{include file="$tpl_dir./pagination.tpl"}
{include file="$tpl_dir./pagination.tpl" paginationId='bottom'}
</div>
</div>
<script type="text/javascript"><!--
themes/default-bootstrap/manufacturer.tpl
+32 -22
View File
@@ -27,40 +27,50 @@
{include file="$tpl_dir./errors.tpl"}
{if !isset($errors) OR !sizeof($errors)}
<h1 class="page-heading product-listing">{l s='List of products by manufacturer'}&nbsp;{$manufacturer->name|escape:'html':'UTF-8'}</h1>
<h1 class="page-heading product-listing">
{l s='List of products by manufacturer'}&nbsp;{$manufacturer->name|escape:'html':'UTF-8'}
</h1>
{if !empty($manufacturer->description) || !empty($manufacturer->short_description)}
<div class="description_box">
{if !empty($manufacturer->short_description)}
<div class="short_desc">{$manufacturer->short_description}</div>
<div class="hide_desc">{$manufacturer->description}</div>
<a href="#" class="lnk_more" onclick="$(this).prev().slideDown('slow'); $(this).hide();$(this).prev().prev().hide(); return false;">{l s='More'}</a>
<div class="short_desc">
{$manufacturer->short_description}
</div>
<div class="hide_desc">
{$manufacturer->description}
</div>
<a href="#" class="lnk_more" onclick="$(this).prev().slideDown('slow'); $(this).hide();$(this).prev().prev().hide(); return false;">
{l s='More'}
</a>
{else}
<div>{$manufacturer->description}</div>
<div>
{$manufacturer->description}
</div>
{/if}
</div>
{/if}
{if $products}
<div class="content_sortPagiBar">
<div class="sortPagiBar clearfix">
{include file="./product-sort.tpl"}
{include file="./nbr-product-page.tpl"}
<div class="content_sortPagiBar">
<div class="sortPagiBar clearfix">
{include file="./product-sort.tpl"}
{include file="./nbr-product-page.tpl"}
</div>
<div class="top-pagination-content clearfix">
{include file="./product-compare.tpl"}
{include file="$tpl_dir./pagination.tpl"}
</div>
</div>
<div class="top-pagination-content clearfix">
{include file="./product-compare.tpl"}
{include file="$tpl_dir./pagination.tpl"}
</div>
</div>
{include file="./product-list.tpl" products=$products}
{include file="./product-list.tpl" products=$products}
<div class="content_sortPagiBar">
<div class="bottom-pagination-content clearfix">
{include file="./product-compare.tpl"}
{include file="./pagination.tpl" paginationId='bottom'}
</div>
</div>
<div class="content_sortPagiBar">
<div class="bottom-pagination-content clearfix">
{include file="./product-compare.tpl"}
{include file="./pagination.tpl" paginationId='bottom'}
</div>
</div>
{else}
<p class="alert alert-warning">{l s='No products for this manufacturer.'}</p>
<p class="alert alert-warning">{l s='No products for this manufacturer.'}</p>
{/if}
{/if}
themes/default-bootstrap/modules/blockbestsellers/blockbestsellers.tpl
+1 -1
View File
@@ -25,5 +25,5 @@
*}
{if is_array($best_sellers) && count($best_sellers)}
{include file="$tpl_dir./product-list.tpl" products=$best_sellers class='blockbestsellers tab-pane'}
{include file="$tpl_dir./product-list.tpl" products=$best_sellers class='blockbestsellers tab-pane' id='blockbestsellers'}
{/if}
themes/default-bootstrap/modules/blockbestsellers/tab.tpl
+1 -1
View File
@@ -24,5 +24,5 @@
*}
{if is_array($best_sellers) && count($best_sellers)}
<li><a data-toggle="tab" href="{$link->getPageLink('best-sales')|escape:'html'}" class="blockbestsellers">{l s='Best Sellers' mod='blockbestsellers'}</a></li>
<li><a data-toggle="tab" href="#blockbestsellers" class="blockbestsellers">{l s='Best Sellers' mod='blockbestsellers'}</a></li>
{/if}
themes/default-bootstrap/modules/blocknewproducts/blocknewproducts.tpl
+1 -1
View File
@@ -22,4 +22,4 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*}
{include file="$tpl_dir./product-list.tpl" products=$new_products class='blocknewproducts tab-pane active'}
{include file="$tpl_dir./product-list.tpl" products=$new_products class='blocknewproducts tab-pane active' id='blocknewproducts'}
themes/default-bootstrap/modules/blocknewproducts/tab.tpl
+1 -1
View File
@@ -22,4 +22,4 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*}
<li class="active"><a data-toggle="tab" href="{$link->getPageLink('new-products')|escape:'html'}" class="blocknewproducts">{l s='New arrivals' mod='blocknewproducts'}</a></li>
<li class="active"><a data-toggle="tab" href="#blocknewproducts" class="blocknewproducts">{l s='New arrivals' mod='blocknewproducts'}</a></li>
themes/default-bootstrap/modules/homefeatured/homefeatured.tpl
+1 -1
View File
@@ -22,4 +22,4 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*}
{include file="$tpl_dir./product-list.tpl" class='homefeatured tab-pane'}
{include file="$tpl_dir./product-list.tpl" class='homefeatured tab-pane' id='homefeatured'}
themes/default-bootstrap/modules/homefeatured/tab.tpl
+1 -1
View File
@@ -22,4 +22,4 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*}
<li><a data-toggle="tab" href="{$link->getPageLink('index')|escape:'html'}" class="homefeatured">{l s='Popular' mod='homefeatured'}</a></li>
<li><a data-toggle="tab" href="#homefeatured" class="homefeatured">{l s='Popular' mod='homefeatured'}</a></li>
themes/default-bootstrap/pagination.tpl
+133 -60
View File
@@ -49,68 +49,141 @@
{/if}
<!-- Pagination -->
<div id="pagination{if isset($paginationId)}_{$paginationId}{/if}" class="pagination clearfix">
{if $nb_products > $products_per_page && $start!=$stop}
<form action="{if !is_array($requestNb)}{$requestNb|escape:htmlall:'UTF-8'}{else}{$requestNb.requestUrl|escape:htmlall:'UTF-8'}{/if}" method="get" class="showall">
<div>
{if isset($search_query) AND $search_query}<input type="hidden" name="search_query" value="{$search_query|escape:'html':'UTF-8'}" />{/if}
{if isset($tag) AND $tag AND !is_array($tag)}<input type="hidden" name="tag" value="{$tag|escape:'html':'UTF-8'}" />{/if}
<button type="submit" class="btn btn-default button exclusive-medium"><span>{l s='Show all'}</span></button>
{if is_array($requestNb)}
{foreach from=$requestNb item=requestValue key=requestKey}
{if $requestKey != 'requestUrl'}
<input type="hidden" name="{$requestKey|escape:'html':'UTF-8'}" value="{$requestValue|escape:'html':'UTF-8'}" />
{/if}
{/foreach}
{if $nb_products > $products_per_page && $start!=$stop}
<form
class="showall"
action="{if !is_array($requestNb)}{$requestNb|escape:htmlall:'UTF-8'}{else}{$requestNb.requestUrl|escape:htmlall:'UTF-8'}{/if}"
method="get">
<div>
{if isset($search_query) AND $search_query}
<input type="hidden" name="search_query" value="{$search_query|escape:'html':'UTF-8'}" />
{/if}
{if isset($tag) AND $tag AND !is_array($tag)}
<input type="hidden" name="tag" value="{$tag|escape:'html':'UTF-8'}" />
{/if}
<button type="submit" class="btn btn-default button exclusive-medium">
<span>{l s='Show all'}</span>
</button>
{if is_array($requestNb)}
{foreach from=$requestNb item=requestValue key=requestKey}
{if $requestKey != 'requestUrl'}
<input type="hidden" name="{$requestKey|escape:'html':'UTF-8'}" value="{$requestValue|escape:'html':'UTF-8'}" />
{/if}
{/foreach}
{/if}
<input name="n" id="nb_item" class="hidden" value="{$nb_products}" />
</div>
</form>
{/if}
{if $start!=$stop}
<ul class="pagination">
{if $p != 1}
{assign var='p_previous' value=$p-1}
<li id="pagination_previous{if isset($paginationId)}_{$paginationId}{/if}" class="pagination_previous">
<a {$no_follow_text} href="{$link->goPage($requestPage, $p_previous)|escape:'html':'UTF-8'}">
<i class="icon-chevron-left"></i> <b>{l s='Previous'}</b>
</a>
</li>
{else}
<li id="pagination_previous{if isset($paginationId)}_{$paginationId}{/if}" class="disabled pagination_previous">
<span>
<i class="icon-chevron-left"></i> <b>{l s='Previous'}</b>
</span>
</li>
{/if}
<input name="n" id="nb_item" class="hidden" value="{$nb_products}" />
</div>
</form>
{/if}
{if $start!=$stop}
<ul class="pagination">
{if $p != 1}
{assign var='p_previous' value=$p-1}
<li id="pagination_previous{if isset($paginationId)}_{$paginationId}{/if}" class="pagination_previous"><a {$no_follow_text} href="{$link->goPage($requestPage, $p_previous)}"><i class="icon-chevron-left"></i> <b>{l s='Previous'}</b></a></li>
{else}
<li id="pagination_previous{if isset($paginationId)}_{$paginationId}{/if}" class="disabled pagination_previous"><span><i class="icon-chevron-left"></i> <b>{l s='Previous'}</b></span></li>
{if $start==3}
<li>
<a {$no_follow_text} href="{$link->goPage($requestPage, 1)|escape:'html':'UTF-8'}">
<span>1</span>
</a>
</li>
<li>
<a {$no_follow_text} href="{$link->goPage($requestPage, 2)|escape:'html':'UTF-8'}">
<span>2</span>
</a>
</li>
{/if}
{if $start==2}
<li>
<a {$no_follow_text} href="{$link->goPage($requestPage, 1)|escape:'html':'UTF-8'}">
<span>1</span>
</a>
</li>
{/if}
{if $start>3}
<li>
<a {$no_follow_text} href="{$link->goPage($requestPage, 1|escape:'html':'UTF-8')}">
<span>1</span>
</a>
</li>
<li class="truncate">
<span>
<span>...</span>
</span>
</li>
{/if}
{section name=pagination start=$start loop=$stop+1 step=1}
{if $p == $smarty.section.pagination.index}
<li class="active current">
<span>
<span>{$p|escape:'html':'UTF-8'}</span>
</span>
</li>
{else}
<li>
<a {$no_follow_text} href="{$link->goPage($requestPage, $smarty.section.pagination.index)|escape:'html':'UTF-8'}">
<span>{$smarty.section.pagination.index|escape:'html':'UTF-8'}</span>
</a>
</li>
{/if}
{/section}
{if $pages_nb>$stop+2}
<li class="truncate">
<span>
<span>...</span>
</span>
</li>
<li>
<a href="{$link->goPage($requestPage, $pages_nb)|escape:'html':'UTF-8'}">
<span>{$pages_nb|intval}</span>
</a>
</li>
{/if}
{if $pages_nb==$stop+1}
<li>
<a href="{$link->goPage($requestPage, $pages_nb)|escape:'html':'UTF-8'}">
<span>{$pages_nb|intval}</span>
</a>
</li>
{/if}
{if $pages_nb==$stop+2}
<li>
<a href="{$link->goPage($requestPage, $pages_nb-1)|escape:'html':'UTF-8'}">
<span>{$pages_nb-1|intval}</span>
</a>
</li>
<li>
<a href="{$link->goPage($requestPage, $pages_nb)|escape:'html':'UTF-8'}">
<span>{$pages_nb|intval}</span>
</a>
</li>
{/if}
{if $pages_nb > 1 AND $p != $pages_nb}
{assign var='p_next' value=$p+1}
<li id="pagination_next{if isset($paginationId)}_{$paginationId}{/if}" class="pagination_next">
<a {$no_follow_text} href="{$link->goPage($requestPage, $p_next)|escape:'html':'UTF-8'}">
<b>{l s='Next'}</b> <i class="icon-chevron-right"></i>
</a>
</li>
{else}
<li id="pagination_next{if isset($paginationId)}_{$paginationId}{/if}" class="disabled pagination_next">
<span>
<b>{l s='Next'}</b> <i class="icon-chevron-right"></i>
</span>
</li>
{/if}
</ul>
{/if}
{if $start==3}
<li><a {$no_follow_text} href="{$link->goPage($requestPage, 1)}"><span>1</span></a></li>
<li><a {$no_follow_text} href="{$link->goPage($requestPage, 2)}"><span>2</span></a></li>
{/if}
{if $start==2}
<li><a {$no_follow_text} href="{$link->goPage($requestPage, 1)}"><span>1</span></a></li>
{/if}
{if $start>3}
<li><a {$no_follow_text} href="{$link->goPage($requestPage, 1)}"><span>1</span></a></li>
<li class="truncate"><span><span>...</span></span></li>
{/if}
{section name=pagination start=$start loop=$stop+1 step=1}
{if $p == $smarty.section.pagination.index}
<li class="active current"><span><span>{$p|escape:'html':'UTF-8'}</span></span></li>
{else}
<li><a {$no_follow_text} href="{$link->goPage($requestPage, $smarty.section.pagination.index)}"><span>{$smarty.section.pagination.index|escape:'html':'UTF-8'}</span></a></li>
{/if}
{/section}
{if $pages_nb>$stop+2}
<li class="truncate"><span><span>...</span></span></li>
<li><a href="{$link->goPage($requestPage, $pages_nb)}"><span>{$pages_nb|intval}</span></a></li>
{/if}
{if $pages_nb==$stop+1}
<li><a href="{$link->goPage($requestPage, $pages_nb)}"><span>{$pages_nb|intval}</span></a></li>
{/if}
{if $pages_nb==$stop+2}
<li><a href="{$link->goPage($requestPage, $pages_nb-1)}"><span>{$pages_nb-1|intval}</span></a></li>
<li><a href="{$link->goPage($requestPage, $pages_nb)}"><span>{$pages_nb|intval}</span></a></li>
{/if}
{if $pages_nb > 1 AND $p != $pages_nb}
{assign var='p_next' value=$p+1}
<li id="pagination_next{if isset($paginationId)}_{$paginationId}{/if}" class="pagination_next"><a {$no_follow_text} href="{$link->goPage($requestPage, $p_next)}"><b>{l s='Next'}</b> <i class="icon-chevron-right"></i></a></li>
{else}
<li id="pagination_next{if isset($paginationId)}_{$paginationId}{/if}" class="disabled pagination_next"><span><b>{l s='Next'}</b> <i class="icon-chevron-right"></i></span></li>
{/if}
</ul>
{/if}
</div>
<div class="product-count">
{if ($n*$p) < $nb_products }
themes/default-bootstrap/product-compare.tpl
+1 -1
View File
@@ -37,7 +37,7 @@
{/if}
<form method="post" action="{$link->getPageLink('products-comparison')|escape:htmlall:'UTF-8'}" onsubmit="true" class="compare-form">
<div>
<button type="submit" id="bt_compare{if isset($paginationId)}_{$paginationId}{/if}" class="btn btn-default button button-medium bt_compare"><span>{l s='Compare'} (<strong class="total-compare-val">{count($compared_products)}</strong>)<i class="icon-chevron-right right"></i></span></button>
<button type="submit" class="btn btn-default button button-medium bt_compare{if isset($paginationId)}_{$paginationId}{/if}"><span>{l s='Compare'} (<strong class="total-compare-val">{count($compared_products)}</strong>)<i class="icon-chevron-right right"></i></span></button>
<input type="hidden" name="compare_product_count" class="compare_product_count" value="{count($compared_products)}" />
<input type="hidden" name="compare_product_list" class="compare_product_list" value="" />
</div>
themes/default-bootstrap/product-list.tpl
+11 -9
View File
@@ -39,7 +39,7 @@
{math equation="nbLi/nbItemsPerLine" nbLi=$nbLi nbItemsPerLine=$nbItemsPerLine assign=nbLines}
{math equation="nbLi/nbItemsPerLineTablet" nbLi=$nbLi nbItemsPerLineTablet=$nbItemsPerLineTablet assign=nbLinesTablet}
<!-- Products list -->
<ul class="product_list grid row {if isset($class) && $class} {$class}{/if}">
<ul{if isset($id) && $id} id="{$id}" {/if} class="product_list grid row{if isset($class) && $class} {$class}{/if}">
{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}
@@ -206,14 +206,16 @@
{/if}
{/if}
</div>
<!-- <div class="functional-buttons clearfix">
{hook h='displayProductListFunctionalButtons' product=$product}
{if isset($comparator_max_item) && $comparator_max_item}
<div class="compare">
<a class="addToCompare" href="#" data-id-product="{$product.id_product}" onClick="addToCompare('{$product.id_product|intval}'); return false;">{l s='Add to Compare'}</a>
</div>
{/if}
</div> -->
{if $page_name != 'index'}
<div class="functional-buttons clearfix">
{hook h='displayProductListFunctionalButtons' product=$product}
{if isset($comparator_max_item) && $comparator_max_item}
<div class="compare">
<a class="addToCompare" href="#" data-id-product="{$product.id_product}" onClick="addToCompare('{$product.id_product|intval}'); return false;">{l s='Add to Compare'}</a>
</div>
{/if}
</div>
{/if}
</div><!-- .product-container> -->
</li>
{/foreach}
themes/default-bootstrap/products-comparison.tpl
+51 -16
View File
@@ -49,20 +49,37 @@
{assign var='replace_id' value=$product->id|cat:'|'}
<td class="ajax_block_product comparison_infos product-block">
<div class="remove">
<a class="cmp_remove" href="{$link->getPageLink('products-comparison', true)|escape:'html'}" title="{l s='Remove'}" data-id-product="{$product->id}"><i class="icon-trash"></i></a>
<a
class="cmp_remove"
href="{$link->getPageLink('products-comparison', true)|escape:'html'}"
title="{l s='Remove'}"
data-id-product="{$product->id}">
<i class="icon-trash"></i>
</a>
</div>
<div class="product-image-block">
<a href="{$product->getLink()|escape:html:'UTF-8'}" title="{$product->name|escape:html:'UTF-8'}" class="product_image" >
<img class="img-responsive" src="{$link->getImageLink($product->link_rewrite, $product->id_image, 'home_default')|escape:'html'}" alt="{$product->name|escape:html:'UTF-8'}" />
<a
class="product_image"
href="{$product->getLink()|escape:html:'UTF-8'}"
title="{$product->name|escape:html:'UTF-8'}">
<img
class="img-responsive"
src="{$link->getImageLink($product->link_rewrite, $product->id_image, 'home_default')|escape:'html'}"
alt="{$product->name|escape:html:'UTF-8'}" />
</a>
{if isset($product->show_price) && $product->show_price && !isset($restricted_country_mode) && !$PS_CATALOG_MODE}
{if $product->on_sale}
<div class="sale-box"><span class="sale-label">{l s='Sale!'}</span></div>
<div class="sale-box">
<span class="sale-label">{l s='Sale!'}</span>
</div>
{/if}
{/if}
</div> <!-- end product-image-block -->
<h5>
<a class="product-name" href="{$product->getLink()|escape:html:'UTF-8'}" title="{$product->name|truncate:32:'...'|escape:'html':'UTF-8'}">
<a
class="product-name"
href="{$product->getLink()|escape:html:'UTF-8'}"
title="{$product->name|truncate:32:'...'|escape:'html':'UTF-8'}">
{$product->name|truncate:45:'...'|escape:'html':'UTF-8'}
</a>
</h5>
@@ -71,11 +88,19 @@
<span class="price product-price">{convertPrice price=$product->getPrice($taxes_behavior)}</span>
{if isset($product->specificPrice) && $product->specificPrice}
{if {$product->specificPrice.reduction_type == 'percentage'}}
<span class="old-price product-price">{displayWtPrice p=$product->getPrice($taxes_behavior)+($product->getPrice($taxes_behavior)* $product->specificPrice.reduction)}</span>
<span class="price-percent-reduction">-{$product->specificPrice.reduction*100|floatval}%</span>
<span class="old-price product-price">
{displayWtPrice p=$product->getPrice($taxes_behavior)+($product->getPrice($taxes_behavior)* $product->specificPrice.reduction)}
</span>
<span class="price-percent-reduction">
-{$product->specificPrice.reduction*100|floatval}%
</span>
{else}
<span class="old-price product-price">{convertPrice price=($product->getPrice($taxes_behavior) + $product->specificPrice.reduction)}</span>
<span class="price-percent-reduction">-{convertPrice price=$product->specificPrice.reduction}</span>
<span class="old-price product-price">
{convertPrice price=($product->getPrice($taxes_behavior) + $product->specificPrice.reduction)}
</span>
<span class="price-percent-reduction">
-{convertPrice price=$product->specificPrice.reduction}
</span>
{/if}
{/if}
{if $product->on_sale}
@@ -86,20 +111,23 @@
{/if}
{if !empty($product->unity) && $product->unit_price_ratio > 0.000000}
{math equation="pprice / punit_price" pprice=$product->getPrice($taxes_behavior) punit_price=$product->unit_price_ratio assign=unit_price}
<span class="comparison_unit_price">&nbsp;{convertPrice price=$unit_price} {l s='per %s' sprintf=$product->unity|escape:'html':'UTF-8'}</span>
<span class="comparison_unit_price">
&nbsp;{convertPrice price=$unit_price} {l s='per %s' sprintf=$product->unity|escape:'html':'UTF-8'}
</span>
{else}
{/if}
{/if}
</div> <!-- end prices-container -->
<div class="product_desc">{$product->description_short|strip_tags|truncate:60:'...'}</div>
<div class="product_desc">
{$product->description_short|strip_tags|truncate:60:'...'}
</div>
<div class="comparison_product_infos">
<!-- availability -->
<p class="comparison_availability_statut">
{if !(($product->quantity <= 0 && !$product->available_later) OR ($product->quantity != 0 && !$product->available_now) OR !$product->available_for_order OR $PS_CATALOG_MODE)}
<span id="availability_label">{l s='Availability:'}</span>
<span id="availability_value"{if $product->quantity <= 0} class="warning-inline"{/if}>
<span class="availability_label">{l s='Availability:'}</span>
<span class="availability_value"{if $product->quantity <= 0} class="warning-inline"{/if}>
{if $product->quantity <= 0}
{if $allow_oosp}
{$product->available_later|escape:'html':'UTF-8'}
@@ -124,10 +152,17 @@
<span>{l s='Add to cart'}</span>
</a>
{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}
<a class="button lnk_view btn btn-default" href="{$product->getLink()|escape:html:'UTF-8'}" title="{l s='View'}"><span>{l s='View'}</span></a>
<a
class="button lnk_view btn btn-default"
href="{$product->getLink()|escape:html:'UTF-8'}"
title="{l s='View'}">
<span>{l s='View'}</span>
</a>
</div>
</div>
</div> <!-- end comparison_product_infos -->
themes/default-bootstrap/sass/_theme_variables.scss
-22
View File
@@ -2,14 +2,12 @@
@import 'bootstrap_lib/_variables';
//------- FONTS
$font-famaly: Arial, Helvetica, sans-serif;
$font: normal 13px/18px $font-famaly;
$font-custom: 'Open Sans', sans-serif;
$font-icon: "FontAwesome";
//-------- BORDERS
$base-border-color: #d6d4d4;
$main_border: 1px solid $base-border-color;
$dark-border-color: #333;
@@ -17,8 +15,6 @@ $light-border-color: #fff;
$homepage-footer-border: #d9d9d9;
//--------- BACKGROUNDS
// -------------------------
$base-box-bg: #fbfbfb;
$table-background: $base-box-bg;
$dark-background: #333;
@@ -26,7 +22,6 @@ $light-background: #fff;
$homepage-footer-bg: #f2f2f2;
//--------- COLORS
$base-body-color: #777;
$base-text-color: #333;
$base-heading-color: #555454;
@@ -38,15 +33,11 @@ $description-color: #666;
//--------- Indents
//--------------------------
$base-page-indent: $grid-gutter-width;
$base-box-padding: 14px 18px 13px;
$base-box-indent: 0 0 30px 0;
//---------- Product Elements
//---------------------------
$product-name-color: #3a3939;
$product-name-hover-color: #515151;
$price-color: $base-body-color;
@@ -56,47 +47,35 @@ $product-special-price-color: #f13340;
$product-old-price-color: #6f6f6f;
//---------- Buttons
//----------------------------
$button-text-color: $light-text-color;
//------ Buttons +/- ---
$button-pm-color: #c0c0c0;
$button-pm-hover-color: $base-text-color;
//------ Button Small --
$button-small-bg: #6f6f6f;
$button-small-hover-bg: #575757;
//-------Button exclusive-medium
$button-em-color: $base-text-color;
//---------- Product Listing
//--------------------------
$base-listing-border-color: $base-border-color;
$base-listing-grid-padding: $base-box-padding;
//-------------- Grid/List vars
//---------------------------
$GL-text-color: #808080;
$GL-title-color: $base-text-color;
$GL-icon-color: #e1e0e0;
$GL-icon-color-hover: $base-text-color;
//-------------- Pagination vars
//------------------------------
$pagination-prevnext-color: #777676;
$pagination-bgcolor: $base-box-bg;
$pagination-hover-bg: #f6f6f6;
//---------- Product Info
//--------------------------
$top-line-color: #C4C4C4;
$product-image-border: #dbdbdb;
$scroll-button-color: #c0c0c0;
@@ -105,7 +84,6 @@ $scroll-button-hover-color: $base-text-color;
$tr-even-bg: #fdfdfd;
//sub heading (h2,h3) define
@mixin sub-heading {
color: $base-heading-color;
text-transform: uppercase;
themes/default-bootstrap/sass/global.sass
+1011 -1242
View File
File diff suppressed because it is too large Load Diff
themes/default-bootstrap/search.tpl
+30 -10
View File
@@ -25,9 +25,24 @@
{capture name=path}{l s='Search'}{/capture}
<h1 {if isset($instant_search) && $instant_search}id="instant_search_results"{/if} class="page-heading {if !isset($instant_search) || (isset($instant_search) && !$instant_search)} product-listing{/if}">
{l s='Search'}&nbsp;{if $nbProducts > 0}<span class="lighter">"{if isset($search_query) && $search_query}{$search_query|escape:'html':'UTF-8'}{elseif $search_tag}{$search_tag|escape:'html':'UTF-8'}{elseif $ref}{$ref|escape:'html':'UTF-8'}{/if}"</span>{/if}
{if isset($instant_search) && $instant_search}<a href="#" class="close">{l s='Return to the previous page'}</a>{else}<span class="heading-counter">{if $nbProducts == 1}{l s='%d result has been found.' sprintf=$nbProducts|intval}{else}{l s='%d results have been found.' sprintf=$nbProducts|intval}{/if}</span>{/if}
<h1
{if isset($instant_search) && $instant_search}id="instant_search_results"{/if}
class="page-heading {if !isset($instant_search) || (isset($instant_search) && !$instant_search)} product-listing{/if}">
{l s='Search'}&nbsp;
{if $nbProducts > 0}
<span class="lighter">
"{if isset($search_query) && $search_query}{$search_query|escape:'html':'UTF-8'}{elseif $search_tag}{$search_tag|escape:'html':'UTF-8'}{elseif $ref}{$ref|escape:'html':'UTF-8'}{/if}"
</span>
{/if}
{if isset($instant_search) && $instant_search}
<a href="#" class="close">
{l s='Return to the previous page'}
</a>
{else}
<span class="heading-counter">
{if $nbProducts == 1}{l s='%d result has been found.' sprintf=$nbProducts|intval}{else}{l s='%d results have been found.' sprintf=$nbProducts|intval}{/if}
</span>
{/if}
</h1>
{include file="$tpl_dir./errors.tpl"}
@@ -48,21 +63,26 @@
</p>
{/if}
<div class="content_sortPagiBar">
<div class="sortPagiBar clearfix {if isset($instant_search) && $instant_search} instant_search{/if}">
{include file="$tpl_dir./product-sort.tpl"}
{if !isset($instant_search) || (isset($instant_search) && !$instant_search)}{include file="./nbr-product-page.tpl"}{/if}
</div>
<div class="sortPagiBar clearfix {if isset($instant_search) && $instant_search} instant_search{/if}">
{include file="$tpl_dir./product-sort.tpl"}
{if !isset($instant_search) || (isset($instant_search) && !$instant_search)}
{include file="./nbr-product-page.tpl"}
{/if}
</div>
<div class="top-pagination-content clearfix">
{include file="./product-compare.tpl"}
{if !isset($instant_search) || (isset($instant_search) && !$instant_search)}{include file="$tpl_dir./pagination.tpl"}{/if}
{if !isset($instant_search) || (isset($instant_search) && !$instant_search)}
{include file="$tpl_dir./pagination.tpl"}
{/if}
</div>
</div>
{include file="$tpl_dir./product-list.tpl" products=$search_products}
<div class="content_sortPagiBar">
<div class="bottom-pagination-content clearfix">
{include file="./product-compare.tpl"}
{if !isset($instant_search) || (isset($instant_search) && !$instant_search)}{include file="$tpl_dir./pagination.tpl"}{/if}
{if !isset($instant_search) || (isset($instant_search) && !$instant_search)}
{include file="$tpl_dir./pagination.tpl" paginationId='bottom'}
{/if}
</div>
</div>
{/if}
themes/default-bootstrap/supplier-list.tpl
+72 -57
View File
@@ -36,7 +36,8 @@
{l s='There are %d suppliers.' sprintf=$nbSuppliers}
{/if}
{/if}
</span>{/strip}
</span>
{/strip}
</h1>
{if isset($errors) AND $errors}
@@ -47,77 +48,91 @@
<div class="content_sortPagiBar">
<div class="sortPagiBar clearfix">
<ul class="display hidden-xs">
<li class="display-title">{l s='View:'}</li>
<li id="grid"><a onclick="display('grid');"><i class="icon-th-large"></i>{l s='Grid'}</a></li>
<li id="list"><a onclick="display('list');"><i class="icon-th-list"></i>{l s='List'}</a></li>
<li class="display-title">
{l s='View:'}
</li>
<li id="grid">
<a onclick="display('grid');">
<i class="icon-th-large"></i>{l s='Grid'}
</a>
</li>
<li id="list">
<a onclick="display('list');">
<i class="icon-th-list"></i>{l s='List'}
</a>
</li>
</ul>
{include file="./nbr-product-page.tpl"}
</div>
<div class="top-pagination-content clearfix bottom-line">
{include file="$tpl_dir./pagination.tpl"}
</div>
</div>
</div> <!-- .content_sortPagiBar -->
{assign var='nbItemsPerLine' value=3}
{assign var='nbItemsPerLineTablet' value=2}
{assign var='nbLi' value=$suppliers_list|@count}
{math equation="nbLi/nbItemsPerLine" nbLi=$nbLi nbItemsPerLine=$nbItemsPerLine assign=nbLines}
{math equation="nbLi/nbItemsPerLineTablet" nbLi=$nbLi nbItemsPerLineTablet=$nbItemsPerLineTablet assign=nbLinesTablet}
<ul id="suppliers_list">
{foreach from=$suppliers_list item=supplier name=supplier}
{math equation="(total%perLine)" total=$smarty.foreach.supplier.total perLine=$nbItemsPerLine assign=totModulo}
{math equation="(total%perLineT)" total=$smarty.foreach.supplier.total perLineT=$nbItemsPerLineTablet assign=totModuloTablet}
{if $totModulo == 0}{assign var='totModulo' value=$nbItemsPerLine}{/if}
{if $totModuloTablet == 0}{assign var='totModuloTablet' value=$nbItemsPerLineTablet}{/if}
<li class="{if $smarty.foreach.supplier.iteration%$nbItemsPerLine == 0} last-in-line{elseif $smarty.foreach.supplier.iteration%$nbItemsPerLine == 1} first-in-line{/if} {if $smarty.foreach.supplier.iteration > ($smarty.foreach.supplier.total - $totModulo)}last-line{/if} {if $smarty.foreach.supplier.iteration%$nbItemsPerLineTablet == 0}last-item-of-tablet-line{elseif $smarty.foreach.supplier.iteration%$nbItemsPerLineTablet == 1}first-item-of-tablet-line{/if} {if $smarty.foreach.supplier.iteration > ($smarty.foreach.supplier.total - $totModuloTablet)}last-tablet-line{/if}">
<div class="left-side">
<!-- logo -->
<div class="logo">
{if $supplier.nb_products > 0}
<a href="{$link->getsupplierLink($supplier.id_supplier, $supplier.link_rewrite)|escape:'html':'UTF-8'}" title="{$supplier.name|escape:'html':'UTF-8'}">
{/if}
<img src="{$img_sup_dir}{$supplier.image|escape:'html':'UTF-8'}-medium_default.jpg" alt="" width="{$mediumSize.width}" height="{$mediumSize.height}" />
{if $supplier.nb_products > 0}
</a>
{/if}
</div>
</div>
<div class="middle-side">
<!-- name -->
<h3>
{if $supplier.nb_products > 0}
<a class="product-name" href="{$link->getsupplierLink($supplier.id_supplier, $supplier.link_rewrite)|escape:'html':'UTF-8'}">
{/if}
{$supplier.name|truncate:60:'...'|escape:'html':'UTF-8'}
{if $supplier.nb_products > 0}
</a>
{/if}
</h3>
<div class="description">
{$supplier.description|truncate:180:'...'}
</div>
</div>
<div class="right-side">
<div class="right-side-content">
<p class="product-counter">
{if $supplier.nb_products > 0}
<a href="{$link->getsupplierLink($supplier.id_supplier, $supplier.link_rewrite)|escape:'html':'UTF-8'}">
{/if}
{if $supplier.nb_products == 1}{l s='%d product' sprintf=$supplier.nb_products|intval}{else}{l s='%d products' sprintf=$supplier.nb_products|intval}{/if}
{if $supplier.nb_products > 0}
</a>
{/if}
</p>
{if $supplier.nb_products > 0}
<a class="btn btn-default button exclusive-medium" href="{$link->getsupplierLink($supplier.id_supplier, $supplier.link_rewrite)|escape:'html':'UTF-8'}"><span>{l s='View products'} <i class="icon-chevron-right right"></i></span></a>
{/if}
</div>
</div>
</li>
{/foreach}
{foreach from=$suppliers_list item=supplier name=supplier}
{math equation="(total%perLine)" total=$smarty.foreach.supplier.total perLine=$nbItemsPerLine assign=totModulo}
{math equation="(total%perLineT)" total=$smarty.foreach.supplier.total perLineT=$nbItemsPerLineTablet assign=totModuloTablet}
{if $totModulo == 0}{assign var='totModulo' value=$nbItemsPerLine}{/if}
{if $totModuloTablet == 0}{assign var='totModuloTablet' value=$nbItemsPerLineTablet}{/if}
<li class="{if $smarty.foreach.supplier.iteration%$nbItemsPerLine == 0} last-in-line{elseif $smarty.foreach.supplier.iteration%$nbItemsPerLine == 1} first-in-line{/if} {if $smarty.foreach.supplier.iteration > ($smarty.foreach.supplier.total - $totModulo)}last-line{/if} {if $smarty.foreach.supplier.iteration%$nbItemsPerLineTablet == 0}last-item-of-tablet-line{elseif $smarty.foreach.supplier.iteration%$nbItemsPerLineTablet == 1}first-item-of-tablet-line{/if} {if $smarty.foreach.supplier.iteration > ($smarty.foreach.supplier.total - $totModuloTablet)}last-tablet-line{/if}">
<div class="left-side">
<!-- logo -->
<div class="logo">
{if $supplier.nb_products > 0}
<a href="{$link->getsupplierLink($supplier.id_supplier, $supplier.link_rewrite)|escape:'html':'UTF-8'}" title="{$supplier.name|escape:'html':'UTF-8'}">
{/if}
<img src="{$img_sup_dir}{$supplier.image|escape:'html':'UTF-8'}-medium_default.jpg" alt="" width="{$mediumSize.width}" height="{$mediumSize.height}" />
{if $supplier.nb_products > 0}
</a>
{/if}
</div> <!-- .logo -->
</div> <!-- .left-side -->
<div class="middle-side">
<h3>
{if $supplier.nb_products > 0}
<a class="product-name" href="{$link->getsupplierLink($supplier.id_supplier, $supplier.link_rewrite)|escape:'html':'UTF-8'}">
{/if}
{$supplier.name|truncate:60:'...'|escape:'html':'UTF-8'}
{if $supplier.nb_products > 0}
</a>
{/if}
</h3>
<div class="description">
{$supplier.description|truncate:180:'...'}
</div>
</div><!-- .middle-side -->
<div class="right-side">
<div class="right-side-content">
<p class="product-counter">
{if $supplier.nb_products > 0}
<a href="{$link->getsupplierLink($supplier.id_supplier, $supplier.link_rewrite)|escape:'html':'UTF-8'}">
{/if}
{if $supplier.nb_products == 1}{l s='%d product' sprintf=$supplier.nb_products|intval}{else}{l s='%d products' sprintf=$supplier.nb_products|intval}{/if}
{if $supplier.nb_products > 0}
</a>
{/if}
</p>
{if $supplier.nb_products > 0}
<a class="btn btn-default button exclusive-medium" href="{$link->getsupplierLink($supplier.id_supplier, $supplier.link_rewrite)|escape:'html':'UTF-8'}"><span>{l s='View products'} <i class="icon-chevron-right right"></i></span></a>
{/if}
</div>
</div><!-- .right-side -->
</li>
{/foreach}
</ul>
<div class="content_sortPagiBar">
<div class="bottom-pagination-content clearfix">
{include file="$tpl_dir./pagination.tpl"}
{include file="$tpl_dir./pagination.tpl" paginationId='bottom'}
</div>
</div>
<script type="text/javascript"><!--
themes/default-bootstrap/supplier.tpl
+20 -18
View File
@@ -26,7 +26,9 @@
{include file="$tpl_dir./errors.tpl"}
{if !isset($errors) OR !sizeof($errors)}
<h1 class="page-heading product-listing">{l s='List of products by supplier:'}&nbsp;{$supplier->name|escape:'html':'UTF-8'}</h1>
<h1 class="page-heading product-listing">
{l s='List of products by supplier:'}&nbsp;{$supplier->name|escape:'html':'UTF-8'}
</h1>
{if !empty($supplier->description)}
<div class="description_box">
<p>{$supplier->description}</p>
@@ -34,26 +36,26 @@
{/if}
{if $products}
<div class="content_sortPagiBar">
<div class="sortPagiBar clearfix">
{include file="./product-sort.tpl"}
{include file="./nbr-product-page.tpl"}
<div class="content_sortPagiBar">
<div class="sortPagiBar clearfix">
{include file="./product-sort.tpl"}
{include file="./nbr-product-page.tpl"}
</div>
<div class="top-pagination-content clearfix">
{include file="./product-compare.tpl"}
{include file="$tpl_dir./pagination.tpl"}
</div>
</div>
<div class="top-pagination-content clearfix">
{include file="./product-compare.tpl"}
{include file="$tpl_dir./pagination.tpl"}
</div>
</div>
{include file="./product-list.tpl" products=$products}
{include file="./product-list.tpl" products=$products}
<div class="content_sortPagiBar">
<div class="bottom-pagination-content clearfix">
{include file="./product-compare.tpl"}
{include file="./pagination.tpl" paginationId='bottom'}
</div>
</div>
<div class="content_sortPagiBar">
<div class="bottom-pagination-content clearfix">
{include file="./product-compare.tpl"}
{include file="./pagination.tpl" paginationId='bottom'}
</div>
</div>
{else}
<p class="alert alert-warning">{l s='No products for this supplier.'}</p>
<p class="alert alert-warning">{l s='No products for this supplier.'}</p>
{/if}
{/if}