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

// Merge -> revision 8720

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8722 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-09-22 15:45:10 +00:00
parent 69db63f26c
commit 4f2a090e24
87 changed files with 1591 additions and 724 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/blocklayered/blocklayered-attribute-indexer.php
+11
View File
@@ -0,0 +1,11 @@
<?php
include(dirname(__FILE__).'/../../config/config.inc.php');
include(dirname(__FILE__).'/../../init.php');
include(dirname(__FILE__).'/blocklayered.php');
if (substr(Tools::encrypt('blocklayered/index'),0,10) != Tools::getValue('token') || !Module::isInstalled('blocklayered'))
die('Bad token');
$blockLayered = new BlockLayered();
echo $blockLayered->indexAttribute();
modules/blocklayered/blocklayered.js
+45 -26
View File
@@ -51,7 +51,7 @@ $(document).ready(function()
});
// Click on label
$("label a").live({
$('label a').live({
click: function() {
if($(this).parent().parent().find('input').attr('disabled') == '')
{
@@ -104,19 +104,19 @@ function updatelink(link)
function getValueSelected(){
var checkboxChecked = "";
$("#layered_form input:checkbox:checked").each(function(){
checkboxChecked += '#' + $(this).attr('id')+"="+$(this).val();
var checkboxChecked = '';
$('#layered_form input:checkbox:checked').each(function(){
checkboxChecked += '#' + $(this).attr('id')+'='+$(this).val();
});
$("#layered_form input:hidden").each(function(){
checkboxChecked += '#' + $(this).attr('name')+"="+$(this).val();
$('#layered_form input:hidden').each(function(){
checkboxChecked += '#' + $(this).attr('name')+'='+$(this).val();
});
$(['price','weight']).each(function(i, filter) {
if ($("#layered_"+filter+"_slider").length)
if ($('#layered_'+filter+'_slider').length)
{
if (typeof($("#layered_"+filter+"_slider").slider('values', 0)) != 'object')
if (typeof($('#layered_'+filter+'_slider').slider('values', 0)) != 'object')
{
checkboxChecked += '#'+filter+'='+$("#layered_"+filter+"_slider").slider('values', 0)+'_'+$("#layered_"+filter+"_slider").slider('values', 1);
checkboxChecked += '#'+filter+'='+$('#layered_'+filter+'_slider').slider('values', 0)+'_'+$('#layered_'+filter+'_slider').slider('values', 1);
}
}
});
@@ -125,7 +125,8 @@ function getValueSelected(){
function friendlyUrl(link, encode)
{
var friendlyTab = {
var friendlyTab =
{
'layered_condition_' : 'cond_',
'layered_id_attribute_group_' : 'g_',
'id_category_layered=' : 'c=',
@@ -134,13 +135,17 @@ function friendlyUrl(link, encode)
'layered_category_' : 'cat_',
};
if(encode == 'short'){
$.each(friendlyTab, function(key, value) {
if(encode == 'short')
{
$.each(friendlyTab, function(key, value)
{
Expression = new RegExp(key,'g');
link = link.replace(Expression, value);
});
}else{
$.each(friendlyTab, function(key, value) {
}else
{
$.each(friendlyTab, function(key, value)
{
Expression = new RegExp(value,'g');
link = link.replace(Expression, key);
});
@@ -176,9 +181,9 @@ function cancelFilter()
{
if($(this).attr('rel').search(/_slider$/) > 0)
{
$('#'+$(this).attr('rel')).slider("values" , 0, $('#'+$(this).attr('rel')).slider( "option" , 'min' ));
$('#'+$(this).attr('rel')).slider("values" , 1, $('#'+$(this).attr('rel')).slider( "option" , 'max' ));
$('#'+$(this).attr('rel')).slider('option', 'slide')(0,{values:[$('#'+$(this).attr('rel')).slider( "option" , 'min' ), $('#'+$(this).attr('rel')).slider( "option" , 'max' )]});
$('#'+$(this).attr('rel')).slider('values' , 0, $('#'+$(this).attr('rel')).slider('option' , 'min' ));
$('#'+$(this).attr('rel')).slider('values' , 1, $('#'+$(this).attr('rel')).slider('option' , 'max' ));
$('#'+$(this).attr('rel')).slider('option', 'slide')(0,{values:[$('#'+$(this).attr('rel')).slider( 'option' , 'min' ), $('#'+$(this).attr('rel')).slider( 'option' , 'max' )]});
}
else
{
@@ -242,9 +247,8 @@ function reloadContent(params_plus)
// Get nb items per page
var n = '';
$('#pagination #nb_item').children().each(function(it, option) {
if(option.selected) {
if (option.selected)
n = '&n='+option.value;
}
});
ajaxQuery = $.ajax(
@@ -267,14 +271,13 @@ function reloadContent(params_plus)
ajaxLoaderOn = 0;
// On submiting nb items form, relaod with the good nb of items
$("#pagination form").submit(function() {
$('#pagination form').submit(function() {
val = $('#pagination #nb_item').val();
$('#pagination #nb_item').children().each(function(it, option) {
if(option.value == val) {
if (option.value == val)
$(option).attr('selected', 'selected');
} else {
else
$(option).removeAttr('selected');
}
});
// Reload products and pagination
reloadContent();
@@ -282,12 +285,28 @@ function reloadContent(params_plus)
});
ajaxCart.overrideButtonsInThePage();
if(typeof(reloadProductComparison) == 'function') {
if (typeof(reloadProductComparison) == 'function')
reloadProductComparison();
}
initSliders();
if(typeof(current_friendly_url != 'undefined'))
// Currente page url
if (typeof(current_friendly_url) == 'undefined')
current_friendly_url = '#';
// Get all sliders value
$(['price', 'weight']).each(function(it, sliderType)
{
if ($('#layered_'+sliderType+'_slider'))
{
// Check if slider is enable & if slider is used
if(typeof($('#layered_'+sliderType+'_slider').slider('values', 0)) != 'object')
if ($('#layered_'+sliderType+'_slider').slider('values', 0) != $('#layered_'+sliderType+'_slider').slider('option' , 'min')
|| $('#layered_'+sliderType+'_slider').slider('values', 1) != $('#layered_'+sliderType+'_slider').slider('option' , 'max'))
current_friendly_url += '/'+sliderType+'-'+$('#layered_'+sliderType+'_slider').slider('values', 0)+'-'+$('#layered_'+sliderType+'_slider').slider('values', 1)
}
});
if (current_friendly_url == '#')
current_friendly_url = '#/';
window.location = current_friendly_url;
}
});
modules/blocklayered/blocklayered.php
+590 -149
View File
File diff suppressed because it is too large Load Diff
modules/blocklayered/blocklayered.tpl
+1 -1
View File
@@ -74,7 +74,7 @@ current_friendly_url = '#{$current_friendly_url}';
<div>
{/if}
<span class="layered_subtitle">{$filter.name|escape:html:'UTF-8'}</span>
<span class="layered_close"><a href="#" rel="layered_{$filter.type}_{$filter.id_key}">v</a></span>
<span class="layered_close"><a href="#" rel="ul_layered_{$filter.type}_{$filter.id_key}">v</a></span>
<div class="clear"></div>
<ul id="ul_layered_{$filter.type}_{$filter.id_key}">
{if !isset($filter.slider)}
modules/blocklayered/fr.php
+31 -2
View File
@@ -4,6 +4,17 @@ global $_MODULE;
$_MODULE = array();
$_MODULE['<{blocklayered}prestashop>blocklayered_84241e458cdd5162745500a59a3680f3'] = 'Bloc navigation à facettes';
$_MODULE['<{blocklayered}prestashop>blocklayered_2d08fa8e157fe3f1875402cbd98aee1b'] = 'Affiche un bloc avec les filtres de la navigation à facettes';
$_MODULE['<{blocklayered}prestashop>blocklayered_af1b98adf7f686b84cd0b443e022b7a0'] = 'Catégories';
$_MODULE['<{blocklayered}prestashop>blocklayered_abe854305a8ab993455a8a315d268449'] = 'Url :';
$_MODULE['<{blocklayered}prestashop>blocklayered_6252c0f2c2ed83b7b06dfca86d4650bb'] = 'Les caractères invalides :';
$_MODULE['<{blocklayered}prestashop>blocklayered_cfe58d0a56f5dee6826496e019d10095'] = 'Format spécifique pour la génération des url pour la navigation à facettes';
$_MODULE['<{blocklayered}prestashop>blocklayered_7b250cb374c12c42a75227ba75df7779'] = 'Titre Meta :';
$_MODULE['<{blocklayered}prestashop>blocklayered_a4020753b3e63fd8a1d0c0b2b33fc999'] = 'Format spécifique pour le titre méta';
$_MODULE['<{blocklayered}prestashop>blocklayered_b3786b970611c1a3809dd51b630812a7'] = '\'%s\' n\'est pas une URL valide';
$_MODULE['<{blocklayered}prestashop>blocklayered_c3ef60194d18cf4026d22051b3a19428'] = 'Indexable :';
$_MODULE['<{blocklayered}prestashop>blocklayered_7c831eb524882fd27ecdab45019d1466'] = 'Utilise cet attribut dans l\'url généré par le module de bloc de navigation à facette';
$_MODULE['<{blocklayered}prestashop>blocklayered_ccc12c5568381293a27db0232877937b'] = 'Nom du modèle de filtre nécessaire (ne peut être vide)';
$_MODULE['<{blocklayered}prestashop>blocklayered_af1b98adf7f686b84cd0b443e022b7a0'] = 'Catégories';
$_MODULE['<{blocklayered}prestashop>blocklayered_817c37b9c1f5cd4a450dad384e63e6c7'] = 'Votre filtre';
$_MODULE['<{blocklayered}prestashop>blocklayered_3185cefd67b575e582063148e4f15860'] = 'a été mis à jour avec succès.';
$_MODULE['<{blocklayered}prestashop>blocklayered_7ccab4d8de5d6b9bb61e99c7bba343ab'] = 'a été ajouté avec succès.';
@@ -11,11 +22,26 @@ $_MODULE['<{blocklayered}prestashop>blocklayered_fe016d3b990c2a9dd72ab6b45892f2a
$_MODULE['<{blocklayered}prestashop>blocklayered_4ad0f0fe31d93e0d8dd7a7fc69a72784'] = 'Modèle de filtres supprimé, catégories mises à jour (Modèle par défaut appliqué).';
$_MODULE['<{blocklayered}prestashop>blocklayered_91e77d047f2496b7ba8c9def96d03324'] = 'Modèle de filtres non trouvé';
$_MODULE['<{blocklayered}prestashop>blocklayered_09da2b6f1217055bb22caa6ea08d9b80'] = 'Navigation à facettes';
$_MODULE['<{blocklayered}prestashop>blocklayered_df2bbc994d10995dcffdf96dbb7acbb1'] = 'Index et les caches';
$_MODULE['<{blocklayered}prestashop>blocklayered_7c47bdf0ef7a058e0243fd870019f10b'] = 'Une indexation est en cours. Merci de ne pas fermer cette page';
$_MODULE['<{blocklayered}prestashop>blocklayered_5e2420d2318025812dc3e231ddb66b0b'] = 'Indexer les prix manquants';
$_MODULE['<{blocklayered}prestashop>blocklayered_c590f1d6840cd971922610e7d42cbd9c'] = 'Ré-indexer l\'intégralité des prix';
$_MODULE['<{blocklayered}prestashop>blocklayered_d47f700b6db025d98cae0b340ed847e9'] = 'Indexer les attributs';
$_MODULE['<{blocklayered}prestashop>blocklayered_ffb323adcfff34b04a48aeaf42f6cbde'] = 'Indexer les URLs';
$_MODULE['<{blocklayered}prestashop>blocklayered_df34c2aff5bc737993b9cb1122f2dbd9'] = 'Vous pouvez définir une tâche cron pour ré-indexer les prix en utilisant l\'URL suivante:';
$_MODULE['<{blocklayered}prestashop>blocklayered_0a82d067fe0a21871f868de1432409a5'] = 'Vous pouvez définir une tâche cron pour ré-indexer les URLs en utilisant l\'URL suivante:';
$_MODULE['<{blocklayered}prestashop>blocklayered_5a12793d564ff29c49e4ab3f542dd720'] = 'Vous pouvez définir une tâche cron pour ré-indexer les attributs à l\'aide de l\'URL suivante:';
$_MODULE['<{blocklayered}prestashop>blocklayered_16349835364cf839e6670b0de7da6362'] = 'Une ré-indexation nocturne est recommandée.';
$_MODULE['<{blocklayered}prestashop>blocklayered_56fc8142961f1f3e9f9ec0c178881b69'] = '(En cours)';
$_MODULE['<{blocklayered}prestashop>blocklayered_e1e43ed7e0922095a801341dca2f1822'] = 'Indexation des urls terminée';
$_MODULE['<{blocklayered}prestashop>blocklayered_1c1783101d972ba096fff9756378b0e1'] = 'L\'indexation des urls a échoué';
$_MODULE['<{blocklayered}prestashop>blocklayered_f83cc9b5e3192cbe1c40ec2effd6cbb4'] = 'Indexation des produits terminée';
$_MODULE['<{blocklayered}prestashop>blocklayered_638041e8465b00f32e95eeef1d15fc77'] = '(En cours, %s produits à indexer)';
$_MODULE['<{blocklayered}prestashop>blocklayered_5e123b0351f06875436de2dfde577e19'] = 'Produit d\'indexation a échoué';
$_MODULE['<{blocklayered}prestashop>blocklayered_a607dc3941415ecea04bb1eb8a978962'] = 'Modèles de filtres existants';
$_MODULE['<{blocklayered}prestashop>blocklayered_9923a3739235561cc50eb9446dc1771e'] = 'modèles de filtres sont configurés :';
$_MODULE['<{blocklayered}prestashop>blocklayered_b718adec73e04ce3ec720dd11a06a308'] = 'ID';
$_MODULE['<{blocklayered}prestashop>blocklayered_49ee3087348e8d44e1feda1917443987'] = 'Nom';
$_MODULE['<{blocklayered}prestashop>blocklayered_af1b98adf7f686b84cd0b443e022b7a0'] = 'Catégories';
$_MODULE['<{blocklayered}prestashop>blocklayered_f7f19392da30e81c3abf433ce7b8ca38'] = 'Créée le';
$_MODULE['<{blocklayered}prestashop>blocklayered_06df33001c1d7187fdd81ea1f5b277aa'] = 'Actions';
$_MODULE['<{blocklayered}prestashop>blocklayered_7dce122004969d56ae2e0245cb754d35'] = 'Modifier';
@@ -39,6 +65,8 @@ $_MODULE['<{blocklayered}prestashop>blocklayered_2e527847e8c785f3fd99651f6400679
$_MODULE['<{blocklayered}prestashop>blocklayered_3488a51eb7f723d65daeff912e69b177'] = 'Filres sélectionnés';
$_MODULE['<{blocklayered}prestashop>blocklayered_cf3cd81b30d4c4fd996ae5374fe656da'] = 'Aucun filtre sélectionné pour le moment.';
$_MODULE['<{blocklayered}prestashop>blocklayered_8524de963f07201e5c086830d370797f'] = 'Chargement...';
$_MODULE['<{blocklayered}prestashop>blocklayered_597c70730ebddba7d845e686665f9f28'] = 'Vous avez sélectionné - Toutes catégories-, les modèles de filtre existants seront supprimé, OK?';
$_MODULE['<{blocklayered}prestashop>blocklayered_c48c42c966b3a35ad3b893e798bdec7c'] = 'Erreurs :';
$_MODULE['<{blocklayered}prestashop>blocklayered_74a6a547d86659933a210680efb6e6d1'] = 'Etape 3/3 - Donnez un nom à votre modèle';
$_MODULE['<{blocklayered}prestashop>blocklayered_f8263d99054a4cdb3428196f078fa212'] = 'Nom du modèle :';
$_MODULE['<{blocklayered}prestashop>blocklayered_b96ce93c61b856a0163c116820646b19'] = 'Mon modèle';
@@ -47,6 +75,7 @@ $_MODULE['<{blocklayered}prestashop>blocklayered_ef1094d9826e98f5417e0a37f174213
$_MODULE['<{blocklayered}prestashop>blocklayered_254f642527b45bc260048e30704edb39'] = 'Configuration';
$_MODULE['<{blocklayered}prestashop>blocklayered_054b4f3ea543c990f6b125f41af6ebf7'] = 'Option';
$_MODULE['<{blocklayered}prestashop>blocklayered_689202409e48743b914713f96d93947c'] = 'Valeur';
$_MODULE['<{blocklayered}prestashop>blocklayered_9868c3ac0748acf3b981a96cfe163ee8'] = 'Cacher les valeurs de filtre avec aucun produit correspondant';
$_MODULE['<{blocklayered}prestashop>blocklayered_93cba07454f06a4a960172bbd6e2a435'] = 'Oui';
$_MODULE['<{blocklayered}prestashop>blocklayered_bafd7322c6e97d25b6299b5d6fe8920b'] = 'Non';
$_MODULE['<{blocklayered}prestashop>blocklayered_8531c73de81b9ed94322dda7cf947daa'] = 'Afficher le nombre de produits qui correspondent';
@@ -77,6 +106,6 @@ $_MODULE['<{blocklayered}prestashop>blocklayered_f09cc7ee3a9a93273f4b80601cafb00
$_MODULE['<{blocklayered}prestashop>blocklayered_2063c1608d6e0baf80249c42e2be5804'] = 'valeur';
$_MODULE['<{blocklayered}prestashop>blocklayered_c32516babc5b6c47eb8ce1bfc223253c'] = 'Catalogue';
$_MODULE['<{blocklayered}prestashop>blocklayered_1262d1b9fbffb3a8e85ac9e4b449e989'] = 'Filtres actifs :';
$_MODULE['<{blocklayered}prestashop>blocklayered_853ae90f0351324bd73ea615e6487517'] = ' :';
$_MODULE['<{blocklayered}prestashop>blocklayered_ea4788705e6873b424c65e91c2846b19'] = 'Annuler';
$_MODULE['<{blocklayered}prestashop>blocklayered_853ae90f0351324bd73ea615e6487517'] = ' :';
$_MODULE['<{blocklayered}prestashop>blocklayered_75954a3c6f2ea54cb9dff249b6b5e8e6'] = 'Tranche';