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

Merge branch 'release' into development

Browse Source
This commit is contained in:
François Gaillard
2013-03-14 16:39:47 +01:00
parent 13e9de16e1 da77ce1029
commit e08945de6b
715 changed files with 10968 additions and 19548 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/blocksearch/blocksearch-top.tpl
+2 -2
View File
@@ -29,7 +29,7 @@
<input type="hidden" name="controller" value="search" />
<input type="hidden" name="orderby" value="position" />
<input type="hidden" name="orderway" value="desc" />
<input class="search_query" type="search" id="search_query_top" name="search_query" placeholder="{l s='Search:' mod='blocksearch'}" value="{if isset($smarty.get.search_query)}{$smarty.get.search_query|htmlentities:$ENT_QUOTES:'utf-8'|stripslashes}{/if}" />
<input class="search_query" type="search" id="search_query_top" name="search_query" placeholder="{l s='Search' mod='blocksearch'}" value="{if isset($smarty.get.search_query)}{$smarty.get.search_query|htmlentities:$ENT_QUOTES:'utf-8'|stripslashes}{/if}" />
</form>
</div>
{else}
@@ -43,7 +43,7 @@
<input type="hidden" name="orderby" value="position" />
<input type="hidden" name="orderway" value="desc" />
<input class="search_query" type="text" id="search_query_top" name="search_query" value="{if isset($smarty.get.search_query)}{$smarty.get.search_query|htmlentities:$ENT_QUOTES:'utf-8'|stripslashes}{/if}" />
<input type="submit" name="submit_search" value="{l s='Search:' mod='blocksearch'}" class="button" />
<input type="submit" name="submit_search" value="{l s='Search' mod='blocksearch'}" class="button" />
</p>
</form>
</div>
modules/blocksearch/blocksearch.php
+2 -2
View File
@@ -39,8 +39,8 @@ class BlockSearch extends Module
parent::__construct();
$this->displayName = $this->l('Quick Search block');
$this->description = $this->l('Adds a block with a quick search field.');
$this->displayName = $this->l('Quick search block');
$this->description = $this->l('Adds a quick search field to your website.');
}
public function install()
modules/blocksearch/blocksearch.tpl
+3 -3
View File
@@ -25,15 +25,15 @@
<!-- Block search module -->
<div id="search_block_left" class="block exclusive">
<h4 class="title_block">{l s='Search:' mod='blocksearch'}</h4>
<h4 class="title_block">{l s='Search' mod='blocksearch'}</h4>
<form method="get" action="{$link->getPageLink('search', true)}" id="searchbox">
<p class="block_content">
<label for="search_query_block">{l s='Enter a product name' mod='blocksearch'}</label>
<label for="search_query_block">{l s='Enter a product name or description.' mod='blocksearch'}</label>
<input type="hidden" name="orderby" value="position" />
<input type="hidden" name="controller" value="search" />
<input type="hidden" name="orderway" value="desc" />
<input class="search_query" type="text" id="search_query_block" name="search_query" value="{if isset($smarty.get.search_query)}{$smarty.get.search_query|htmlentities:$ENT_QUOTES:'utf-8'|stripslashes}{/if}" />
<input type="submit" id="search_button" class="button_mini" value="{l s='go' mod='blocksearch'}" />
<input type="submit" id="search_button" class="button_mini" value="{l s='Go!' mod='blocksearch'}" />
</p>
</form>
</div>
modules/blocksearch/config.xml
+2 -2
View File
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>
<module>
<name>blocksearch</name>
<displayName><![CDATA[Quick Search block]]></displayName>
<displayName><![CDATA[Quick search block]]></displayName>
<version><![CDATA[1.2]]></version>
<description><![CDATA[Adds a block with a quick search field.]]></description>
<description><![CDATA[Adds a quick search field to your website.]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[search_filter]]></tab>
<is_configurable>0</is_configurable>
modules/blocksearch/translations/de.php
+6 -6
View File
@@ -3,9 +3,9 @@
global $_MODULE;
$_MODULE = array();
$_MODULE['<{blocksearch}prestashop>blocksearch-top_24c29702dc9c63dedb98e92f3028e068'] = 'Suche';
$_MODULE['<{blocksearch}prestashop>blocksearch_34d1f91fb2e514b8576fab1a75a89a6b'] = 'los';
$_MODULE['<{blocksearch}prestashop>blocksearch_99e20473c0bf3c22d7420eff03ce66c3'] = 'Fügt einen Block mit einem Quick Search Feld hinzu';
$_MODULE['<{blocksearch}prestashop>blocksearch_24c29702dc9c63dedb98e92f3028e068'] = 'Suche';
$_MODULE['<{blocksearch}prestashop>blocksearch_52d578d063d6101bbdae388ece037e60'] = 'Geben Sie einen Produktnamen ein';
$_MODULE['<{blocksearch}prestashop>blocksearch_31a0c03d7fbd1dc61d3b8e02760e703b'] = 'Quick Search Block';
$_MODULE['<{blocksearch}prestashop>blocksearch-top_13348442cc6a27032d2b4aa28b75a5d3'] = 'Suche';
$_MODULE['<{blocksearch}prestashop>blocksearch_1fb103afe92d693ae23d0463b185a9a7'] = 'los';
$_MODULE['<{blocksearch}prestashop>blocksearch_be305c865235f417d9b4d22fcdf9f1c5'] = 'Fügt einen Block mit einem Quick Search Feld hinzu';
$_MODULE['<{blocksearch}prestashop>blocksearch_13348442cc6a27032d2b4aa28b75a5d3'] = 'Suche';
$_MODULE['<{blocksearch}prestashop>blocksearch_3d4999b5a4129d6c189f50d6f977b846'] = 'Geben Sie einen Produktnamen ein';
$_MODULE['<{blocksearch}prestashop>blocksearch_e2ca130372651672ba285abd796412ed'] = 'Quick Search Block';
modules/blocksearch/translations/en.php
+1 -1
View File
@@ -1,4 +1,4 @@
<?php
global $_MODULE;
$_MODULE = array();
$_MODULE = array();
modules/blocksearch/translations/es.php
+6 -6
View File
@@ -3,9 +3,9 @@
global $_MODULE;
$_MODULE = array();
$_MODULE['<{blocksearch}prestashop>blocksearch-top_24c29702dc9c63dedb98e92f3028e068'] = 'Buscar';
$_MODULE['<{blocksearch}prestashop>blocksearch_34d1f91fb2e514b8576fab1a75a89a6b'] = 'buscar';
$_MODULE['<{blocksearch}prestashop>blocksearch_99e20473c0bf3c22d7420eff03ce66c3'] = 'Añada u bloque con un campo de búsqueda rápida';
$_MODULE['<{blocksearch}prestashop>blocksearch_24c29702dc9c63dedb98e92f3028e068'] = 'Buscar';
$_MODULE['<{blocksearch}prestashop>blocksearch_52d578d063d6101bbdae388ece037e60'] = 'Introduzca el nombre del producto';
$_MODULE['<{blocksearch}prestashop>blocksearch_31a0c03d7fbd1dc61d3b8e02760e703b'] = 'Bloque de búsqueda rápida';
$_MODULE['<{blocksearch}prestashop>blocksearch-top_13348442cc6a27032d2b4aa28b75a5d3'] = 'Buscar';
$_MODULE['<{blocksearch}prestashop>blocksearch_1fb103afe92d693ae23d0463b185a9a7'] = 'buscar';
$_MODULE['<{blocksearch}prestashop>blocksearch_be305c865235f417d9b4d22fcdf9f1c5'] = 'Añada u bloque con un campo de búsqueda rápida';
$_MODULE['<{blocksearch}prestashop>blocksearch_13348442cc6a27032d2b4aa28b75a5d3'] = 'Buscar';
$_MODULE['<{blocksearch}prestashop>blocksearch_3d4999b5a4129d6c189f50d6f977b846'] = 'Introduzca el nombre del producto';
$_MODULE['<{blocksearch}prestashop>blocksearch_e2ca130372651672ba285abd796412ed'] = 'Bloque de búsqueda rápida';
modules/blocksearch/translations/fr.php
+6 -6
View File
@@ -3,9 +3,9 @@
global $_MODULE;
$_MODULE = array();
$_MODULE['<{blocksearch}prestashop>blocksearch-top_24c29702dc9c63dedb98e92f3028e068'] = 'Rechercher';
$_MODULE['<{blocksearch}prestashop>blocksearch_34d1f91fb2e514b8576fab1a75a89a6b'] = 'ok';
$_MODULE['<{blocksearch}prestashop>blocksearch_99e20473c0bf3c22d7420eff03ce66c3'] = 'Ajoute un bloc avec un champ de recherche rapide';
$_MODULE['<{blocksearch}prestashop>blocksearch_24c29702dc9c63dedb98e92f3028e068'] = 'Rechercher';
$_MODULE['<{blocksearch}prestashop>blocksearch_52d578d063d6101bbdae388ece037e60'] = 'Saisissez un nom de produit';
$_MODULE['<{blocksearch}prestashop>blocksearch_31a0c03d7fbd1dc61d3b8e02760e703b'] = 'Bloc recherche rapide';
$_MODULE['<{blocksearch}prestashop>blocksearch-top_13348442cc6a27032d2b4aa28b75a5d3'] = 'Rechercher';
$_MODULE['<{blocksearch}prestashop>blocksearch_1fb103afe92d693ae23d0463b185a9a7'] = 'ok';
$_MODULE['<{blocksearch}prestashop>blocksearch_be305c865235f417d9b4d22fcdf9f1c5'] = 'Ajoute un bloc avec un champ de recherche rapide';
$_MODULE['<{blocksearch}prestashop>blocksearch_13348442cc6a27032d2b4aa28b75a5d3'] = 'Rechercher';
$_MODULE['<{blocksearch}prestashop>blocksearch_3d4999b5a4129d6c189f50d6f977b846'] = 'Saisissez un nom de produit';
$_MODULE['<{blocksearch}prestashop>blocksearch_e2ca130372651672ba285abd796412ed'] = 'Bloc recherche rapide';
modules/blocksearch/translations/it.php
+6 -6
View File
@@ -3,9 +3,9 @@
global $_MODULE;
$_MODULE = array();
$_MODULE['<{blocksearch}prestashop>blocksearch-top_24c29702dc9c63dedb98e92f3028e068'] = 'Cerca';
$_MODULE['<{blocksearch}prestashop>blocksearch_34d1f91fb2e514b8576fab1a75a89a6b'] = 'Vai';
$_MODULE['<{blocksearch}prestashop>blocksearch_99e20473c0bf3c22d7420eff03ce66c3'] = 'Aggiunge un blocco con un campo di ricerca rapida';
$_MODULE['<{blocksearch}prestashop>blocksearch_24c29702dc9c63dedb98e92f3028e068'] = 'Cerca';
$_MODULE['<{blocksearch}prestashop>blocksearch_52d578d063d6101bbdae388ece037e60'] = 'Inserisci il nome di un prodotto';
$_MODULE['<{blocksearch}prestashop>blocksearch_31a0c03d7fbd1dc61d3b8e02760e703b'] = 'Blocco ricerca rapida';
$_MODULE['<{blocksearch}prestashop>blocksearch-top_13348442cc6a27032d2b4aa28b75a5d3'] = 'Cerca';
$_MODULE['<{blocksearch}prestashop>blocksearch_1fb103afe92d693ae23d0463b185a9a7'] = 'Vai';
$_MODULE['<{blocksearch}prestashop>blocksearch_be305c865235f417d9b4d22fcdf9f1c5'] = 'Aggiunge un blocco con un campo di ricerca rapida';
$_MODULE['<{blocksearch}prestashop>blocksearch_13348442cc6a27032d2b4aa28b75a5d3'] = 'Cerca';
$_MODULE['<{blocksearch}prestashop>blocksearch_3d4999b5a4129d6c189f50d6f977b846'] = 'Inserisci il nome di un prodotto';
$_MODULE['<{blocksearch}prestashop>blocksearch_e2ca130372651672ba285abd796412ed'] = 'Blocco ricerca rapida';