suite module ...

2015-09-17 11:57:04 +02:00 · 2015-09-17 11:57:04 +02:00 · a72d09932c
commit a72d09932c
parent e2e9079ac9
118 changed files with 5247 additions and 5 deletions
--- a/modules/blocktags
+++ b/modules/blocktags
@ -1 +0,0 @@
-Subproject commit 95f85ceb5bd67f9c7f358930417dcd2c751dbe9a
--- a/modules/blocktags/CHANGELOG.txt
+++ b/modules/blocktags/CHANGELOG.txt
@ -0,0 +1,4 @@
+2014-04-22 18:57:55 +0200	// Changelog updated
+2014-03-24 11:43:29 +0100	/ MO blocktags : ps_versions_compliancy modified (1.5.6.1 => 1.6)
+2014-03-24 11:04:19 +0100	/ MO blocktags : ps_versions_compliancy added
+2014-03-20 14:28:14 +0100	Initial commit
--- a/modules/blocktags/Readme.md
+++ b/modules/blocktags/Readme.md
@ -0,0 +1,37 @@
+# Tags block
+
+## About
+
+Adds a block containing your product tags.
+
+## Contributing
+
+PrestaShop modules are open-source extensions to the PrestaShop e-commerce solution. Everyone is welcome and even encouraged to contribute with their own improvements.
+
+### Requirements
+
+Contributors **must** follow the following rules:
+
+* **Make your Pull Request on the "dev" branch**, NOT the "master" branch.
+* Do not update the module's version number.
+* Follow [the coding standards][1].
+
+### Process in details
+
+Contributors wishing to edit a module's files should follow the following process:
+
+1. Create your GitHub account, if you do not have one already.
+2. Fork the blocktags project to your GitHub account.
+3. Clone your fork to your local machine in the ```/modules``` directory of your PrestaShop installation.
+4. Create a branch in your local clone of the module for your changes.
+5. Change the files in your branch. Be sure to follow [the coding standards][1]!
+6. Push your changed branch to your fork in your GitHub account.
+7. Create a pull request for your changes **on the _'dev'_ branch** of the module's project. Be sure to follow [the commit message norm][2] in your pull request. If you need help to make a pull request, read the [Github help page about creating pull requests][3].
+8. Wait for one of the core developers either to include your change in the codebase, or to comment on possible improvements you should make to your code.
+
+That's it: you have contributed to this open-source project! Congratulations!
+
+[1]: http://doc.prestashop.com/display/PS16/Coding+Standards
+[2]: http://doc.prestashop.com/display/PS16/How+to+write+a+commit+message
+[3]: https://help.github.com/articles/using-pull-requests
+
--- a/modules/blocktags/blocktags.css
+++ b/modules/blocktags/blocktags.css
@ -0,0 +1,20 @@
+/* Block tags */
+div.tags_block .block_content { padding: 3px 6px 0 }
+div.tags_block p {
+	text-align: justify;
+	font-size: 0.9em
+}
+div.tags_block p a {
+	margin: 0 0.1em;
+	line-height: 1.5em;
+	padding:2px;
+}
+div.tags_block p a:hover {
+	background-color: #ccc;
+	text-decoration: none;
+	padding:2px;
+	color:#333333;
+}
+a.tag_level3 { font-size: 1.8em; font-weight: bold }
+a.tag_level2 { font-size: 1.4em }
+a.tag_level1 { font-size: 1em; color: #888 }
--- a/modules/blocktags/blocktags.php
+++ b/modules/blocktags/blocktags.php
@ -0,0 +1,257 @@
+<?php
+/*
+* 2007-2014 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-2014 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+
+if (!defined('_PS_VERSION_'))
+	exit;
+
+class BlockTags extends Module
+{
+	function __construct()
+	{
+		$this->name = 'blocktags';
+		$this->tab = 'front_office_features';
+		$this->version = '1.2.6';
+		$this->author = 'PrestaShop';
+		$this->need_instance = 0;
+
+		$this->bootstrap = true;
+		parent::__construct();
+
+		$this->displayName = $this->l('Tags block');
+		$this->description = $this->l('Adds a block containing your product tags.');
+		$this->ps_versions_compliancy = array('min' => '1.6', 'max' => _PS_VERSION_);
+	}
+
+	function install()
+	{
+		$success = (parent::install()
+			&& $this->registerHook('header')
+			&& $this->registerHook('leftColumn')
+			&& $this->registerHook('addproduct')
+			&& $this->registerHook('updateproduct')
+			&& $this->registerHook('deleteproduct')
+			&& Configuration::updateValue('BLOCKTAGS_NBR', 10)
+			&& Configuration::updateValue('BLOCKTAGS_MAX_LEVEL', 3)
+			&& Configuration::updateValue('BLOCKTAGS_RANDOMIZE', false)
+		);
+
+		$this->_clearCache('*');
+
+		return $success;
+	}
+
+	public function uninstall()
+	{
+		$this->_clearCache('*');
+
+		return parent::uninstall();
+	}
+
+	public function hookAddProduct($params)
+	{
+		$this->_clearCache('*');
+	}
+
+	public function hookUpdateProduct($params)
+	{
+		$this->_clearCache('*');
+	}
+
+	public function hookDeleteProduct($params)
+	{
+		$this->_clearCache('*');
+	}
+
+	public function _clearCache($template, $cache_id = NULL, $compile_id = NULL)
+	{
+		parent::_clearCache('blocktags.tpl');
+	}
+
+	public function getContent()
+        {
+                $output = '';
+                $errors = array();
+                if (Tools::isSubmit('submitBlockTags'))
+                {
+                        $tagsNbr = Tools::getValue('BLOCKTAGS_NBR');
+                        if (!strlen($tagsNbr))
+                                $errors[] = $this->l('Please complete the "Displayed tags" field.');
+                        elseif (!Validate::isInt($tagsNbr) || (int)($tagsNbr) <= 0)
+                                $errors[] = $this->l('Invalid number.');
+
+                        $tagsLevels = Tools::getValue('BLOCKTAGS_MAX_LEVEL');
+                        if (!strlen($tagsLevels))
+                                $errors[] = $this->l('Please complete the "Tag levels" field.');
+                        elseif (!Validate::isInt($tagsLevels) || (int)($tagsLevels) <= 0)
+                                $errors[] = $this->l('Invalid value for "Tag levels". Choose a positive integer number.');
+
+                        $randomize = Tools::getValue('BLOCKTAGS_RANDOMIZE');
+                        if (!strlen($randomize))
+                        	$errors[] = $this->l('Please complete the "Randomize" field.');
+                        elseif (!Validate::isBool($randomize))
+                        	$errors[] = $this->l('Invalid value for "Randomize". It has to be a boolean.');
+
+                        if (count($errors))
+                                $output = $this->displayError(implode('<br />', $errors));
+                        else
+                        {
+                                Configuration::updateValue('BLOCKTAGS_NBR', (int)$tagsNbr);
+                                Configuration::updateValue('BLOCKTAGS_MAX_LEVEL', (int)$tagsLevels);
+                                Configuration::updateValue('BLOCKTAGS_RANDOMIZE', (bool)$randomize);
+
+                                $output = $this->displayConfirmation($this->l('Settings updated'));
+                        }
+                }
+                return $output.$this->renderForm();
+        }
+
+	/**
+	* Returns module content for left column
+	*
+	* @param array $params Parameters
+	* @return string Content
+	*
+	*/
+	function hookLeftColumn($params)
+	{
+		if (!$this->isCached('blocktags.tpl', $this->getCacheId('blocktags')))
+		{
+			$tags = Tag::getMainTags((int)($params['cookie']->id_lang), (int)(Configuration::get('BLOCKTAGS_NBR')));
+
+			$max = -1;
+			$min = -1;
+			foreach ($tags as $tag)
+			{
+				if ($tag['times'] > $max)
+					$max = $tag['times'];
+				if ($tag['times'] < $min || $min == -1)
+					$min = $tag['times'];
+			}
+
+			if ($min == $max)
+				$coef = $max;
+			else
+				$coef = (Configuration::get('BLOCKTAGS_MAX_LEVEL') - 1) / ($max - $min);
+
+			if (!count($tags))
+				return false;
+			if (Configuration::get('BLOCKTAGS_RANDOMIZE'))
+				shuffle($tags);
+			foreach ($tags as &$tag)
+				$tag['class'] = 'tag_level'.(int)(($tag['times'] - $min) * $coef + 1);
+			$this->smarty->assign('tags', $tags);
+		}
+		return $this->display(__FILE__, 'blocktags.tpl', $this->getCacheId('blocktags'));
+	}
+
+	function hookRightColumn($params)
+	{
+		return $this->hookLeftColumn($params);
+	}
+
+	function hookHeader($params)
+	{
+		$this->context->controller->addCSS(($this->_path).'blocktags.css', 'all');
+	}
+
+	public function renderForm()
+	{
+		$fields_form = array(
+			'form' => array(
+				'legend' => array(
+					'title' => $this->l('Settings'),
+					'icon' => 'icon-cogs'
+				),
+				'input' => array(
+					array(
+						'type' => 'text',
+						'label' => $this->l('Displayed tags'),
+						'name' => 'BLOCKTAGS_NBR',
+						'class' => 'fixed-width-xs',
+						'desc' => $this->l('Set the number of tags you would like to see displayed in this block. (default: 10)')
+                                        ),
+                                        array(
+                                                'type' => 'text',
+                                                'label' => $this->l('Tag levels'),
+                                                'name' => 'BLOCKTAGS_MAX_LEVEL',
+                                                'class' => 'fixed-width-xs',
+                                                'desc' => $this->l('Set the number of different tag levels you would like to use. (default: 3)')
+                                        ),
+                                        array(
+                                        	'type' => 'switch',
+                                        	'label' => $this->l('Random display'),
+                                        	'name' => 'BLOCKTAGS_RANDOMIZE',
+                                        	'class' => 'fixed-width-xs',
+                                        	'desc' => $this->l('If enabled, displays tags randomly. By default, random display is disabled and the most used tags are displayed first.'),
+                                        	'values' => array(
+                                        		array(
+                                        			'id' => 'active_on',
+                                        			'value' => 1,
+                                        			'label' => $this->l('Enabled')
+                                        			),
+                                        		array(
+                                        			'id' => 'active_off',
+                                        			'value' => 0,
+                                        			'label' => $this->l('Disabled')
+                                        		)
+                                        	)
+                                        )
+				),
+				'submit' => array(
+					'title' => $this->l('Save'),
+				)
+			),
+		);
+
+		$helper = new HelperForm();
+		$helper->show_toolbar = false;
+		$helper->table = $this->table;
+		$lang = new Language((int)Configuration::get('PS_LANG_DEFAULT'));
+		$helper->default_form_language = $lang->id;
+		$helper->allow_employee_form_lang = Configuration::get('PS_BO_ALLOW_EMPLOYEE_FORM_LANG') ? Configuration::get('PS_BO_ALLOW_EMPLOYEE_FORM_LANG') : 0;
+		$helper->identifier = $this->identifier;
+		$helper->submit_action = 'submitBlockTags';
+		$helper->currentIndex = $this->context->link->getAdminLink('AdminModules', false).'&configure='.$this->name.'&tab_module='.$this->tab.'&module_name='.$this->name;
+		$helper->token = Tools::getAdminTokenLite('AdminModules');
+		$helper->tpl_vars = array(
+			'fields_value' => $this->getConfigFieldsValues(),
+			'languages' => $this->context->controller->getLanguages(),
+			'id_language' => $this->context->language->id
+		);
+
+		return $helper->generateForm(array($fields_form));
+	}
+
+	public function getConfigFieldsValues()
+	{
+		return array(
+			'BLOCKTAGS_NBR' => Tools::getValue('BLOCKTAGS_NBR', (int)Configuration::get('BLOCKTAGS_NBR')),
+			'BLOCKTAGS_MAX_LEVEL' => Tools::getValue('BLOCKTAGS_MAX_LEVEL', (int)Configuration::get('BLOCKTAGS_MAX_LEVEL')),
+			'BLOCKTAGS_RANDOMIZE' => Tools::getValue('BLOCKTAGS_RANDOMIZE', (bool)Configuration::get('BLOCKTAGS_RANDOMIZE')),
+		);
+	}
+
+}
--- a/modules/blocktags/blocktags.tpl
+++ b/modules/blocktags/blocktags.tpl
@ -0,0 +1,39 @@
+{*
+* 2007-2014 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-2014 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*}
+
+<!-- Block tags module -->
+<div id="tags_block_left" class="block tags_block">
+	<h4 class="title_block">{l s='Tags' mod='blocktags'}</h4>
+	<p class="block_content">
+{if $tags}
+	{foreach from=$tags item=tag name=myLoop}
+		<a href="{$link->getPageLink('search', true, NULL, "tag={$tag.name|urlencode}")|escape:'html'}" title="{l s='More about' mod='blocktags'} {$tag.name|escape:html:'UTF-8'}" class="{$tag.class} {if $smarty.foreach.myLoop.last}last_item{elseif $smarty.foreach.myLoop.first}first_item{else}item{/if}">{$tag.name|escape:html:'UTF-8'}</a>
+	{/foreach}
+{else}
+	{l s='No tags have been specified yet.' mod='blocktags'}
+{/if}
+	</p>
+</div>
+<!-- /Block tags module -->
--- a/modules/blocktags/config.xml
+++ b/modules/blocktags/config.xml
@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<module>
+	<name>blocktags</name>
+	<displayName><![CDATA[Tags block]]></displayName>
+	<version><![CDATA[1.2.6]]></version>
+	<description><![CDATA[Adds a block containing your product tags.]]></description>
+	<author><![CDATA[PrestaShop]]></author>
+	<tab><![CDATA[front_office_features]]></tab>
+	<is_configurable>1</is_configurable>
+	<need_instance>0</need_instance>
+	<limited_countries></limited_countries>
+</module>
--- a/modules/blocktags/config_fr.xml
+++ b/modules/blocktags/config_fr.xml
@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<module>
+	<name>blocktags</name>
+	<displayName><![CDATA[Bloc mots-cl&eacute;s]]></displayName>
+	<version><![CDATA[1.2.6]]></version>
+	<description><![CDATA[Ajoute un bloc contenant vos mots-cl&eacute;s de produit.]]></description>
+	<author><![CDATA[PrestaShop]]></author>
+	<tab><![CDATA[front_office_features]]></tab>
+	<is_configurable>1</is_configurable>
+	<need_instance>0</need_instance>
+	<limited_countries></limited_countries>
+</module>
--- a/modules/blocktags/index.php
+++ b/modules/blocktags/index.php
@ -0,0 +1,35 @@
+<?php
+/*
+* 2007-2014 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-2014 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+				    	
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+						
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+						
+header("Location: ../");
+exit;
--- a/modules/blocktags/logo.gif
+++ b/modules/blocktags/logo.gif
--- a/modules/blocktags/logo.png
+++ b/modules/blocktags/logo.png
--- a/modules/blocktags/translations/fr.php
+++ b/modules/blocktags/translations/fr.php
@ -0,0 +1,31 @@
+<?php
+
+global $_MODULE;
+$_MODULE = array();
+
+$_MODULE['<{blocktags}prestashop>blocktags_f2568a62d4ac8d1d5b532556379772ba'] = 'Bloc mots-clés';
+$_MODULE['<{blocktags}prestashop>blocktags_b2de1a21b938fcae9955206a4ca11a12'] = 'Ajoute un bloc contenant vos mots-clés de produit.';
+$_MODULE['<{blocktags}prestashop>blocktags_8d731d453cacf8cff061df22a269b82b'] = 'Veuillez remplir le champ "Mots-clés affichés".';
+$_MODULE['<{blocktags}prestashop>blocktags_73293a024e644165e9bf48f270af63a0'] = 'Nombre invalide.';
+$_MODULE['<{blocktags}prestashop>blocktags_fb3855930920fd1ef34c4904ef230802'] = 'Veuillez renseigner le champ "Niveaux de mots-clés".';
+$_MODULE['<{blocktags}prestashop>blocktags_feb6da9d1dab0d22293d1da205fa1bb2'] = 'Valeur invalide pour "Niveaux de mots-clés". Choisissez un nombre entier positif.';
+$_MODULE['<{blocktags}prestashop>blocktags_08d5df9c340804cbdd62c0afc6afa784'] = 'Veuillez renseigner le champ "Affichage aléatoire".';
+$_MODULE['<{blocktags}prestashop>blocktags_5c35c840e2d37e5cb3b6e1cf8aa78880'] = 'Le champ "Affichage aléatoire" n\'est pas valide. Sa valeur doit être booléenne.';
+$_MODULE['<{blocktags}prestashop>blocktags_c888438d14855d7d96a2724ee9c306bd'] = 'Mise à jour réussie';
+$_MODULE['<{blocktags}prestashop>blocktags_f4f70727dc34561dfde1a3c529b6205c'] = 'Paramètres';
+$_MODULE['<{blocktags}prestashop>blocktags_726cefc6088fc537bc5b18f333357724'] = 'Mots-clés affichés';
+$_MODULE['<{blocktags}prestashop>blocktags_34a51d24608287f9b34807c3004b39d9'] = 'Définissez le nombre de mots-clés à afficher dans ce bloc (par défaut : 10).';
+$_MODULE['<{blocktags}prestashop>blocktags_ed7a7c842913f44b32b0f06d5a369dcf'] = 'Niveaux de mots-clés';
+$_MODULE['<{blocktags}prestashop>blocktags_d088d9f9a8634d69a2aa0b11883fb6b1'] = 'Définissez le nombre de différents niveaux que vous souhaitez utiliser pour vos mots-clés (par défaut: 3)';
+$_MODULE['<{blocktags}prestashop>blocktags_ac5bf3b321fa29adf8af5c825d670e76'] = 'Affichage aléatoire';
+$_MODULE['<{blocktags}prestashop>blocktags_d4a9f41f7f8d2a65cda97d8b5eb0c9d5'] = 'Quand activé, les mots-clés s\'affichent aléatoirement. Par défault, l\'affichage aléatoire est désactivé et les mots-clés les plus fréquents s\'affichent en premier.';
+$_MODULE['<{blocktags}prestashop>blocktags_00d23a76e43b46dae9ec7aa9dcbebb32'] = 'Activé';
+$_MODULE['<{blocktags}prestashop>blocktags_b9f5c797ebbf55adccdd8539a65a0241'] = 'Désactivé';
+$_MODULE['<{blocktags}prestashop>blocktags_c9cc8cce247e49bae79f15173ce97354'] = 'Enregistrer';
+$_MODULE['<{blocktags}prestashop>blocktags_189f63f277cd73395561651753563065'] = 'Mots-clés';
+$_MODULE['<{blocktags}prestashop>blocktags_49fa2426b7903b3d4c89e2c1874d9346'] = 'En savoir plus sur';
+$_MODULE['<{blocktags}prestashop>blocktags_4e6307cfde762f042d0de430e82ba854'] = 'Aucun mot-clé spécifié pour le moment.';
+$_MODULE['<{blocktags}prestashop>blocktags_70d5e9f2bb7bcb17339709134ba3a2c6'] = 'Aucun mot-clé spécifié pour le moment';
+
+
+return $_MODULE;
--- a/modules/blocktags/translations/index.php
+++ b/modules/blocktags/translations/index.php
@ -0,0 +1,35 @@
+<?php
+/*
+* 2007-2014 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-2014 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+				    	
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+						
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+						
+header("Location: ../");
+exit;
--- a/modules/blocktags/upgrade/install-1.2.2.php
+++ b/modules/blocktags/upgrade/install-1.2.2.php
@ -0,0 +1,9 @@
+<?php
+
+if (!defined('_PS_VERSION_'))
+	exit;
+
+function upgrade_module_1_2_2($object)
+{
+	return Configuration::updateValue('BLOCKTAGS_MAX_LEVEL', 3);
+}
--- a/modules/blocktags/upgrade/install-1.2.3.php
+++ b/modules/blocktags/upgrade/install-1.2.3.php
@ -0,0 +1,9 @@
+<?php
+
+if (!defined('_PS_VERSION_'))
+        exit;
+
+function upgrade_module_1_2_3($object)
+{
+        return Configuration::updateValue('BLOCKTAGS_RANDOMIZE', false);
+}
--- a/modules/blocktags/upgrade/install-1.2.5.php
+++ b/modules/blocktags/upgrade/install-1.2.5.php
@ -0,0 +1,9 @@
+<?php
+
+if (!defined('_PS_VERSION_'))
+	exit;
+
+function upgrade_module_1_2_5($object)
+{
+	return ($object->registerHook('addproduct') && $object->registerHook('updateproduct') && $object->registerHook('deleteproduct'));
+}
--- a/modules/blocktopmenu
+++ b/modules/blocktopmenu
@ -1 +0,0 @@
-Subproject commit 6816b775ad338a693f153e34d0d736203c60cb5a
--- a/modules/blocktopmenu/CHANGELOG.txt
+++ b/modules/blocktopmenu/CHANGELOG.txt
@ -0,0 +1,4 @@
+2014-04-22 18:57:57 +0200	// Changelog updated
+2014-03-24 11:43:29 +0100	/ MO blocktopmenu : ps_versions_compliancy modified (1.5.6.1 => 1.6)
+2014-03-24 11:04:46 +0100	/ MO blocktopmenu : ps_versions_compliancy added
+2014-03-20 14:28:17 +0100	Initial commit
--- a/modules/blocktopmenu/Readme.md
+++ b/modules/blocktopmenu/Readme.md
@ -0,0 +1,37 @@
+# Top horizontal menu
+
+## About
+
+Adds a new horizontal menu to the top of your e-commerce website.
+
+## Contributing
+
+PrestaShop modules are open-source extensions to the PrestaShop e-commerce solution. Everyone is welcome and even encouraged to contribute with their own improvements.
+
+### Requirements
+
+Contributors **must** follow the following rules:
+
+* **Make your Pull Request on the "dev" branch**, NOT the "master" branch.
+* Do not update the module's version number.
+* Follow [the coding standards][1].
+
+### Process in details
+
+Contributors wishing to edit a module's files should follow the following process:
+
+1. Create your GitHub account, if you do not have one already.
+2. Fork the  project to your GitHub account.
+3. Clone your fork to your local machine in the ```/modules``` directory of your PrestaShop installation.
+4. Create a branch in your local clone of the module for your changes.
+5. Change the files in your branch. Be sure to follow [the coding standards][1]!
+6. Push your changed branch to your fork in your GitHub account.
+7. Create a pull request for your changes **on the _'dev'_ branch** of the module's project. Be sure to follow [the commit message norm][2] in your pull request. If you need help to make a pull request, read the [Github help page about creating pull requests][3].
+8. Wait for one of the core developers either to include your change in the codebase, or to comment on possible improvements you should make to your code.
+
+That's it: you have contributed to this open-source project! Congratulations!
+
+[1]: http://doc.prestashop.com/display/PS16/Coding+Standards
+[2]: http://doc.prestashop.com/display/PS16/How+to+write+a+commit+message
+[3]: https://help.github.com/articles/using-pull-requests
+
--- a/modules/blocktopmenu/blocktopmenu.php
+++ b/modules/blocktopmenu/blocktopmenu.php
--- a/modules/blocktopmenu/blocktopmenu.tpl
+++ b/modules/blocktopmenu/blocktopmenu.tpl
@ -0,0 +1,24 @@
+{if $MENU != ''}
+	
+	<!-- Menu -->
+	<div class="sf-contener clearfix">
+		<ul class="sf-menu clearfix">
+			{$MENU}
+			{if $MENU_SEARCH}
+				<li class="sf-search noBack" style="float:right">
+					<form id="searchbox" action="{$link->getPageLink('search')|escape:'html'}" method="get">
+						<p>
+							<input type="hidden" name="controller" value="search" />
+							<input type="hidden" value="position" name="orderby"/>
+							<input type="hidden" value="desc" name="orderway"/>
+							<input type="text" name="search_query" value="{if isset($smarty.get.search_query)}{$smarty.get.search_query|escape:'html':'UTF-8'}{/if}" />
+						</p>
+					</form>
+				</li>
+			{/if}
+		</ul>
+	</div>
+	<div class="sf-right">&nbsp;</div>
+
+	<!--/ Menu -->
+{/if}
--- a/modules/blocktopmenu/config.xml
+++ b/modules/blocktopmenu/config.xml
@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<module>
+	<name>blocktopmenu</name>
+	<displayName><![CDATA[Top horizontal menu]]></displayName>
+	<version><![CDATA[2.2.0]]></version>
+	<description><![CDATA[Adds a new horizontal menu to the top of your e-commerce website.]]></description>
+	<author><![CDATA[PrestaShop]]></author>
+	<tab><![CDATA[front_office_features]]></tab>
+	<is_configurable>1</is_configurable>
+	<need_instance>1</need_instance>
+	<limited_countries></limited_countries>
+</module>
--- a/modules/blocktopmenu/config_fr.xml
+++ b/modules/blocktopmenu/config_fr.xml
@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<module>
+	<name>blocktopmenu</name>
+	<displayName><![CDATA[Menu Haut horizontal]]></displayName>
+	<version><![CDATA[2.2.0]]></version>
+	<description><![CDATA[Ajouter un nouveau menu horizontal en haut de votre site e-commerce.]]></description>
+	<author><![CDATA[PrestaShop]]></author>
+	<tab><![CDATA[front_office_features]]></tab>
+	<is_configurable>1</is_configurable>
+	<need_instance>1</need_instance>
+	<limited_countries></limited_countries>
+</module>
--- a/modules/blocktopmenu/css/blocktopmenu.css
+++ b/modules/blocktopmenu/css/blocktopmenu.css
--- a/modules/blocktopmenu/css/index.php
+++ b/modules/blocktopmenu/css/index.php
@ -0,0 +1,35 @@
+<?php
+/*
+* 2007-2015 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-2015 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+
+header("Location: ../");
+exit;
--- a/modules/blocktopmenu/css/superfish-modified.css
+++ b/modules/blocktopmenu/css/superfish-modified.css
@ -0,0 +1,172 @@
+/*** ESSENTIAL STYLES ***/
+.sf-contener {
+	clear: both;
+}
+.sf-right {
+  margin-right: 14px;
+  float: right;
+  width: 7px;
+}
+.sf-menu, .sf-menu * {
+	margin:			0;
+	padding:		0;
+	list-style:		none;
+}
+.sf-menu {
+	margin: 10px 0;
+	padding:0;
+	width:980px;/* 980 */
+	background: #383838;
+}
+.sf-menu ul {
+	position:		absolute;
+	top:			-999em;
+	width:			10em; /* left offset of submenus need to match (see below) */
+}
+.sf-menu ul li {
+	width:			100%;
+}
+.sf-menu li:hover {
+	visibility:		inherit; /* fixes IE7 'sticky bug' */
+}
+.sf-menu li {
+	float:			left;
+	position:		relative;
+	border-right: 1px solid #777;
+}
+.sf-menu a {
+	display:		block;
+	position:		relative;
+	color:#fff;
+	text-shadow:0 1px 0 #333;
+}
+.sf-menu li:hover ul,
+.sf-menu li.sfHover ul {
+	left:			0;
+	top:			34px; /* match top ul list item height */
+	z-index:		99;
+	width:auto
+}
+ul.sf-menu li:hover li ul,
+ul.sf-menu li.sfHover li ul {
+	top:			-999em;
+}
+ul.sf-menu li li:hover ul,
+ul.sf-menu li li.sfHover ul {
+	left:			200px; /* match ul width */
+	top:			0;
+}
+ul.sf-menu li li:hover li ul,
+ul.sf-menu li li.sfHover li ul {
+	top:			-999em;
+}
+ul.sf-menu li li li:hover ul,
+ul.sf-menu li li li.sfHover ul {
+	left:			200px; /* match ul width */
+	top:			0;
+}
+
+/*** DEMO SKIN ***/
+.sf-menu {
+	float:			left;
+	margin-bottom:	1em;
+}
+.sf-menu a {
+	display:block;
+	margin-right:2px;
+	padding: 0 22px 0 20px;
+	line-height:34px;
+	border: 0;
+	text-decoration:none;
+}
+.sf-menu a, .sf-menu a:visited  { /* visited pseudo selector so IE6 applies text colour*/
+	color:			#fff;
+	white-space:nowrap;
+}
+.sf-menu li li {
+	background: rgba(113, 113, 113, 0.9);
+}
+.sf-menu li li li {
+	background:	rgba(113, 113, 113, 0.9);
+}
+.sf-menu a:focus, .sf-menu a:hover, .sf-menu a:active {
+  	background: #4E4E4E;
+}
+.sf-menu ul li:hover, .sf-menu ul li.sfHover,
+.sf-menu ul li a:focus, .sf-menu ul li a:hover, .sf-menu ul li a:active {
+	background:		#4e4e4e;
+	outline:		0;
+}
+/*** arrows **/
+.sf-menu a.sf-with-ul {
+	padding-right: 	2.25em;
+	min-width:		1px; /* trigger IE7 hasLayout so spans position accurately */
+}
+.sf-sub-indicator {
+	position:		absolute;
+	display:		block;
+	right:			10px;
+	top:			1.05em; /* IE6 only */
+	width:			10px;
+	height:			10px;
+	text-indent: 	-999em;
+	overflow:		hidden;
+	background:		url('../img/arrows-ffffff.png') no-repeat -10px -100px; /* 8-bit indexed alpha png. IE6 gets solid image only */
+}
+a > .sf-sub-indicator {  /* give all except IE6 the correct values */
+	top: 11px;
+	background-position: 0 -100px; /* use translucent arrow for modern browsers*/
+}
+/* apply hovers to modern browsers */
+a:focus > .sf-sub-indicator,
+a:hover > .sf-sub-indicator,
+a:active > .sf-sub-indicator,
+li:hover > a > .sf-sub-indicator,
+li.sfHover > a > .sf-sub-indicator {
+	background-position: -10px -100px; /* arrow hovers for modern browsers*/
+}
+
+/* point right for anchors in subs */
+.sf-menu ul .sf-sub-indicator { background-position:  -10px 0; }
+.sf-menu ul a > .sf-sub-indicator { background-position:  0 0; }
+/* apply hovers to modern browsers */
+.sf-menu ul a:focus > .sf-sub-indicator,
+.sf-menu ul a:hover > .sf-sub-indicator,
+.sf-menu ul a:active > .sf-sub-indicator,
+.sf-menu ul li:hover > a > .sf-sub-indicator,
+.sf-menu ul li.sfHover > a > .sf-sub-indicator {
+	background-position: -10px 0; /* arrow hovers for modern browsers*/
+}
+
+/*** shadows for all but IE6 ***/
+.sf-shadow ul {
+	background:	url('../img/shadow.png') no-repeat bottom right;
+	padding: 0 8px 9px 0;
+	-moz-border-bottom-left-radius: 17px;
+	-moz-border-top-right-radius: 17px;
+	-webkit-border-top-right-radius: 17px;
+	-webkit-border-bottom-left-radius: 17px;
+}
+.sf-shadow ul.sf-shadow-off {
+	background: transparent;
+}
+li.sf-search {
+  background: inherit;
+  float: right;
+  line-height: 25px;
+}
+li.sf-search input {
+  -moz-border-radius: 0 5px 5px 0;
+  padding: 3px 0;
+  padding-left: 20px;
+  margin: 6px 6px 0 0;
+  background: #fff url('../img/search.gif') no-repeat left center;
+  border:1px solid #777
+}
+
+/* hack IE7 */
+.sf-menu a, .sf-menu a:visited {height:34px !IE;}
+.sf-menu li li {
+	width:200px;
+	background:#726f72 !IE;
+}
--- a/modules/blocktopmenu/img/arrows-ffffff.png
+++ b/modules/blocktopmenu/img/arrows-ffffff.png
--- a/modules/blocktopmenu/img/bg_blocktopmenu_li_seleted.png
+++ b/modules/blocktopmenu/img/bg_blocktopmenu_li_seleted.png
--- a/modules/blocktopmenu/img/blocktopmenu.gif
+++ b/modules/blocktopmenu/img/blocktopmenu.gif
--- a/modules/blocktopmenu/img/blocktopmenu_hover.gif
+++ b/modules/blocktopmenu/img/blocktopmenu_hover.gif
--- a/modules/blocktopmenu/img/blocktopmenu_left.gif
+++ b/modules/blocktopmenu/img/blocktopmenu_left.gif
--- a/modules/blocktopmenu/img/blocktopmenu_right.gif
+++ b/modules/blocktopmenu/img/blocktopmenu_right.gif
--- a/modules/blocktopmenu/img/index.php
+++ b/modules/blocktopmenu/img/index.php
@ -0,0 +1,35 @@
+<?php
+/*
+* 2007-2015 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-2015 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+
+header("Location: ../");
+exit;
--- a/modules/blocktopmenu/img/search.gif
+++ b/modules/blocktopmenu/img/search.gif
--- a/modules/blocktopmenu/img/shadow.png
+++ b/modules/blocktopmenu/img/shadow.png
--- a/modules/blocktopmenu/index.php
+++ b/modules/blocktopmenu/index.php
@ -0,0 +1,35 @@
+<?php
+/*
+* 2007-2015 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-2015 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+
+header("Location: ../");
+exit;
--- a/modules/blocktopmenu/js/blocktopmenu.js
+++ b/modules/blocktopmenu/js/blocktopmenu.js
--- a/modules/blocktopmenu/js/hoverIntent.js
+++ b/modules/blocktopmenu/js/hoverIntent.js
@ -0,0 +1,84 @@
+(function($){
+	/* hoverIntent by Brian Cherne */
+	$.fn.hoverIntent = function(f,g) {
+		// default configuration options
+		var cfg = {
+			sensitivity: 7,
+			interval: 100,
+			timeout: 0
+		};
+		// override configuration options with user supplied object
+		cfg = $.extend(cfg, g ? { over: f, out: g } : f );
+
+		// instantiate variables
+		// cX, cY = current X and Y position of mouse, updated by mousemove event
+		// pX, pY = previous X and Y position of mouse, set by mouseover and polling interval
+		var cX, cY, pX, pY;
+
+		// A private function for getting mouse position
+		var track = function(ev) {
+			cX = ev.pageX;
+			cY = ev.pageY;
+		};
+
+		// A private function for comparing current and previous mouse position
+		var compare = function(ev,ob) {
+			ob.hoverIntent_t = clearTimeout(ob.hoverIntent_t);
+			// compare mouse positions to see if they've crossed the threshold
+			if ( ( Math.abs(pX-cX) + Math.abs(pY-cY) ) < cfg.sensitivity ) {
+				$(ob).unbind("mousemove",track);
+				// set hoverIntent state to true (so mouseOut can be called)
+				ob.hoverIntent_s = 1;
+				return cfg.over.apply(ob,[ev]);
+			} else {
+				// set previous coordinates for next time
+				pX = cX; pY = cY;
+				// use self-calling timeout, guarantees intervals are spaced out properly (avoids JavaScript timer bugs)
+				ob.hoverIntent_t = setTimeout( function(){compare(ev, ob);} , cfg.interval );
+			}
+		};
+
+		// A private function for delaying the mouseOut function
+		var delay = function(ev,ob) {
+			ob.hoverIntent_t = clearTimeout(ob.hoverIntent_t);
+			ob.hoverIntent_s = 0;
+			return cfg.out.apply(ob,[ev]);
+		};
+
+		// A private function for handling mouse 'hovering'
+		var handleHover = function(e) {
+			// next three lines copied from jQuery.hover, ignore children onMouseOver/onMouseOut
+			var p = (e.type == "mouseover" ? e.fromElement : e.toElement) || e.relatedTarget;
+			while ( p && p != this ) { try { p = p.parentNode; } catch(e) { p = this; } }
+			if ( p == this ) { return false; }
+
+			// copy objects to be passed into t (required for event object to be passed in IE)
+			var ev = jQuery.extend({},e);
+			var ob = this;
+
+			// cancel hoverIntent timer if it exists
+			if (ob.hoverIntent_t) { ob.hoverIntent_t = clearTimeout(ob.hoverIntent_t); }
+
+			// else e.type == "onmouseover"
+			if (e.type == "mouseover") {
+				// set "previous" X and Y position based on initial entry point
+				pX = ev.pageX; pY = ev.pageY;
+				// update "current" X and Y position based on mousemove
+				$(ob).bind("mousemove",track);
+				// start polling interval (self-calling timeout) to compare mouse coordinates over time
+				if (ob.hoverIntent_s != 1) { ob.hoverIntent_t = setTimeout( function(){compare(ev,ob);} , cfg.interval );}
+
+			// else e.type == "onmouseout"
+			} else {
+				// unbind expensive mousemove event
+				$(ob).unbind("mousemove",track);
+				// if hoverIntent state is true, then call the mouseOut function after the specified delay
+				if (ob.hoverIntent_s == 1) { ob.hoverIntent_t = setTimeout( function(){delay(ev,ob);} , cfg.timeout );}
+			}
+		};
+
+		// bind the function to the two event listeners
+		return this.mouseover(handleHover).mouseout(handleHover);
+	};
+	
+})(jQuery);
--- a/modules/blocktopmenu/js/index.php
+++ b/modules/blocktopmenu/js/index.php
@ -0,0 +1,35 @@
+<?php
+/*
+* 2007-2015 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-2015 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+
+header("Location: ../");
+exit;
--- a/modules/blocktopmenu/js/superfish-modified.js
+++ b/modules/blocktopmenu/js/superfish-modified.js
@ -0,0 +1,124 @@
+
+/*
+ * Superfish v1.4.8 - jQuery menu widget
+ * Copyright (c) 2008 Joel Birch
+ *
+ * Dual licensed under the MIT and GPL licenses:
+ * 	http://www.opensource.org/licenses/mit-license.php
+ * 	http://www.gnu.org/licenses/gpl.html
+ *
+ * CHANGELOG: http://users.tpg.com.au/j_birch/plugins/superfish/changelog.txt
+ */
+
+(function($){
+	$.fn.superfish = function(op){
+
+		var sf = $.fn.superfish,
+			c = sf.c,
+			$arrow = $(['<span class="',c.arrowClass,'"> &#187;</span>'].join('')),
+			over = function(){
+				var $$ = $(this), menu = getMenu($$);
+				clearTimeout(menu.sfTimer);
+				$$.showSuperfishUl().siblings().hideSuperfishUl();
+			},
+			out = function(){
+				var $$ = $(this), menu = getMenu($$), o = sf.op;
+				clearTimeout(menu.sfTimer);
+				menu.sfTimer=setTimeout(function(){
+					o.retainPath=($.inArray($$[0],o.$path)>-1);
+					$$.hideSuperfishUl();
+					if (o.$path.length && $$.parents(['li.',o.hoverClass].join('')).length<1){over.call(o.$path);}
+				},o.delay);	
+			},
+			getMenu = function($menu){
+				var menu = $menu.parents(['ul.',c.menuClass,':first'].join(''))[0];
+				sf.op = sf.o[menu.serial];
+				return menu;
+			},
+			addArrow = function($a){ $a.addClass(c.anchorClass).append($arrow.clone()); };
+			
+		return this.each(function() {
+			var s = this.serial = sf.o.length;
+			var o = $.extend({},sf.defaults,op);
+			o.$path = $('li.'+o.pathClass,this).slice(0,o.pathLevels).each(function(){
+				$(this).addClass([o.hoverClass,c.bcClass].join(' '))
+					.filter('li:has(ul)').removeClass(o.pathClass);
+			});
+			sf.o[s] = sf.op = o;
+			
+			$('li:has(ul)',this)[($.fn.hoverIntent && !o.disableHI) ? 'hoverIntent' : 'hover'](over,out).each(function() {
+				if (o.autoArrows) addArrow( $('>a:first-child',this) );
+			})
+			.not('.'+c.bcClass)
+				.hideSuperfishUl();
+			
+			var $a = $('a',this);
+			$a.each(function(i){
+				var $li = $a.eq(i).parents('li');
+				$a.eq(i).focus(function(){over.call($li);}).blur(function(){out.call($li);});
+			});
+			o.onInit.call(this);
+			
+		}).each(function() {
+			menuClasses = [c.menuClass];
+			if (sf.op.dropShadows  && !($.browser.msie && $.browser.version < 7)) menuClasses.push(c.shadowClass);
+			$(this).addClass(menuClasses.join(' '));
+		});
+	};
+
+	var sf = $.fn.superfish;
+	sf.o = [];
+	sf.op = {};
+	sf.IE7fix = function(){
+		var o = sf.op;
+		if ($.browser.msie && $.browser.version > 6 && o.dropShadows && o.animation.opacity!=undefined)
+			this.toggleClass(sf.c.shadowClass+'-off');
+		};
+	sf.c = {
+		bcClass     : 'sf-breadcrumb',
+		menuClass   : 'sf-js-enabled',
+		anchorClass : 'sf-with-ul',
+		arrowClass  : 'sf-sub-indicator',
+		shadowClass : 'sf-shadow'
+	};
+	sf.defaults = {
+		hoverClass	: 'sfHover',
+		pathClass	: 'overideThisToUse',
+		pathLevels	: 1,
+		delay		: 800,
+		animation	: {opacity:'show'},
+		speed		: 'fast',
+		autoArrows	: true,
+		dropShadows : true,
+		disableHI	: false,		// true disables hoverIntent detection
+		onInit		: function(){}, // callback functions
+		onBeforeShow: function(){},
+		onShow		: function(){},
+		onHide		: function(){}
+	};
+	$.fn.extend({
+		hideSuperfishUl : function(){
+			var o = sf.op,
+				not = (o.retainPath===true) ? o.$path : '';
+			o.retainPath = false;
+			var $ul = $(['li.',o.hoverClass].join(''),this).add(this).not(not).removeClass(o.hoverClass)
+					.find('>ul').hide().css('visibility','hidden');
+			o.onHide.call($ul);
+			return this;
+		},
+		showSuperfishUl : function(){
+			var o = sf.op,
+				sh = sf.c.shadowClass+'-off',
+				$ul = this.addClass(o.hoverClass)
+					.find('>ul:hidden').css('visibility','visible');
+			sf.IE7fix.call($ul);
+			o.onBeforeShow.call($ul);
+			$ul.animate(o.animation,o.speed,function(){ sf.IE7fix.call($ul); o.onShow.call($ul); });
+			return this;
+		}
+	});
+
+})(jQuery);
+jQuery(function(){
+	jQuery('ul.sf-menu').superfish();
+});
--- a/modules/blocktopmenu/logo.gif
+++ b/modules/blocktopmenu/logo.gif
--- a/modules/blocktopmenu/logo.png
+++ b/modules/blocktopmenu/logo.png
--- a/modules/blocktopmenu/menutoplinks.class.php
+++ b/modules/blocktopmenu/menutoplinks.class.php
@ -0,0 +1,142 @@
+<?php
+/*
+* 2007-2015 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-2015 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+
+class MenuTopLinks
+{
+	public static function gets($id_lang, $id_linksmenutop = null, $id_shop)
+	{
+		$sql = 'SELECT l.id_linksmenutop, l.new_window, s.name, ll.link, ll.label
+				FROM '._DB_PREFIX_.'linksmenutop l
+				LEFT JOIN '._DB_PREFIX_.'linksmenutop_lang ll ON (l.id_linksmenutop = ll.id_linksmenutop AND ll.id_lang = '.(int)$id_lang.' AND ll.id_shop='.(int)$id_shop.')
+				LEFT JOIN '._DB_PREFIX_.'shop s ON l.id_shop = s.id_shop
+				WHERE 1 '.((!is_null($id_linksmenutop)) ? ' AND l.id_linksmenutop = "'.(int)$id_linksmenutop.'"' : '').'
+				AND l.id_shop IN (0, '.(int)$id_shop.')';
+
+		return Db::getInstance()->executeS($sql);
+	}
+
+	public static function get($id_linksmenutop, $id_lang, $id_shop)
+	{
+		return self::gets($id_lang, $id_linksmenutop, $id_shop);
+	}
+
+	public static function getLinkLang($id_linksmenutop, $id_shop)
+	{
+		$ret = Db::getInstance()->executeS('
+			SELECT l.id_linksmenutop, l.new_window, ll.link, ll.label, ll.id_lang
+			FROM '._DB_PREFIX_.'linksmenutop l
+			LEFT JOIN '._DB_PREFIX_.'linksmenutop_lang ll ON (l.id_linksmenutop = ll.id_linksmenutop AND ll.id_shop='.(int)$id_shop.')
+			WHERE 1
+			'.((!is_null($id_linksmenutop)) ? ' AND l.id_linksmenutop = "'.(int)$id_linksmenutop.'"' : '').'
+			AND l.id_shop IN (0, '.(int)$id_shop.')
+		');
+
+		$link = array();
+		$label = array();
+		$new_window = false;
+
+		foreach ($ret as $line)
+		{
+			$link[$line['id_lang']] = Tools::safeOutput($line['link']);
+			$label[$line['id_lang']] = Tools::safeOutput($line['label']);
+			$new_window = (bool)$line['new_window'];
+		}
+
+		return array('link' => $link, 'label' => $label, 'new_window' => $new_window);
+	}
+
+	public static function add($link, $label, $newWindow = 0, $id_shop)
+	{
+		if(!is_array($label))
+			return false;
+		if(!is_array($link))
+			return false;
+
+		Db::getInstance()->insert(
+			'linksmenutop',
+			array(
+				'new_window'=>(int)$newWindow,
+				'id_shop' => (int)$id_shop
+			)
+		);
+		$id_linksmenutop = Db::getInstance()->Insert_ID();
+
+		$result = true;
+
+		foreach ($label as $id_lang=>$label)
+		$result &= Db::getInstance()->insert(
+			'linksmenutop_lang',
+			array(
+				'id_linksmenutop'=>(int)$id_linksmenutop,
+				'id_lang'=>(int)$id_lang,
+				'id_shop'=>(int)$id_shop,
+				'label'=>pSQL($label),
+				'link'=>pSQL($link[$id_lang])
+			)
+		);
+
+		return $result;
+	}
+
+	public static function update($link, $labels, $newWindow = 0, $id_shop, $id_link)
+	{
+		if(!is_array($labels))
+			return false;
+		if(!is_array($link))
+			return false;
+
+		Db::getInstance()->update(
+			'linksmenutop',
+			array(
+				'new_window'=>(int)$newWindow,
+				'id_shop' => (int)$id_shop
+			),
+			'id_linksmenutop = '.(int)$id_link
+		);
+
+		foreach ($labels as $id_lang => $label)
+			Db::getInstance()->update(
+				'linksmenutop_lang',
+				array(
+					'id_shop'=>(int)$id_shop,
+					'label'=>pSQL($label),
+					'link'=>pSQL($link[$id_lang])
+				),
+				'id_linksmenutop = '.(int)$id_link.' AND id_lang = '.(int)$id_lang
+			);
+	}
+
+
+	public static function remove($id_linksmenutop, $id_shop)
+	{
+		$result = true;
+		$result &= Db::getInstance()->delete('linksmenutop', 'id_linksmenutop = '.(int)$id_linksmenutop.' AND id_shop = '.(int)$id_shop);
+		$result &= Db::getInstance()->delete('linksmenutop_lang', 'id_linksmenutop = '.(int)$id_linksmenutop);
+		
+		return $result;
+	}
+
+}
--- a/modules/blocktopmenu/translations/fr.php
+++ b/modules/blocktopmenu/translations/fr.php
@ -0,0 +1,59 @@
+<?php
+
+global $_MODULE;
+$_MODULE = array();
+
+$_MODULE['<{blocktopmenu}prestashop>blocktopmenu_e5b7525b4214a759876af4448bd6b87d'] = 'Menu Haut horizontal';
+$_MODULE['<{blocktopmenu}prestashop>blocktopmenu_f7979d86fe0b2cd11f44747ed4ff1100'] = 'Ajouter un nouveau menu horizontal en haut de votre site e-commerce.';
+$_MODULE['<{blocktopmenu}prestashop>blocktopmenu_efc226b17e0532afff43be870bff0de7'] = 'Paramètres mis à jour';
+$_MODULE['<{blocktopmenu}prestashop>blocktopmenu_d9a776c185f73d018b2915f4d5e7cc05'] = 'Impossible de mettre à jour les paramètres pour la (les) boutique(s) suivante(s) : %s';
+$_MODULE['<{blocktopmenu}prestashop>blocktopmenu_f32880ae5183a02c0a743bfd37a42cbc'] = 'Veuillez remplir le champ "Lien".';
+$_MODULE['<{blocktopmenu}prestashop>blocktopmenu_cf8d684bd5f89d30da67c95363a48ab9'] = 'Veuillez ajouter un label.';
+$_MODULE['<{blocktopmenu}prestashop>blocktopmenu_e8d6809226ab177013e0a26bd2d8b60d'] = 'Veuillez ajouter un label pour le langage par défaut';
+$_MODULE['<{blocktopmenu}prestashop>blocktopmenu_3da9d5745155a430aac6d7de3b6de0c8'] = 'Le lien a été ajouté';
+$_MODULE['<{blocktopmenu}prestashop>blocktopmenu_022bb0995e3256abeeac1788a5e2c5b3'] = 'Impossible d\'ajouter un lien pour la (les) boutique(s) suivante(s) : %s';
+$_MODULE['<{blocktopmenu}prestashop>blocktopmenu_e24e88b590807c2816be15abd7c7dbbc'] = 'Le lien a été enlevé.';
+$_MODULE['<{blocktopmenu}prestashop>blocktopmenu_e418ee8626f7941239c5b7a0880691ae'] = 'Impossible de supprimer le lien pour la (les) boutiques suivante(s) : %s';
+$_MODULE['<{blocktopmenu}prestashop>blocktopmenu_beb4f951c292ec9218473ffe5f59849d'] = 'Le lien a été modifié.';
+$_MODULE['<{blocktopmenu}prestashop>blocktopmenu_b1a23c1a76918c10acc27bfa60798c42'] = 'Vous ne pouvez pas modifier le menu horizontal pour un groupe de boutiques ou toutes les boutiques à la fois. Sélectionnez uniquement la boutique que vous souhaitez modifier';
+$_MODULE['<{blocktopmenu}prestashop>blocktopmenu_298b615220606d42b6ac60269df0d321'] = 'Les modifications s\'appliqueront à la boutique suivante : %s';
+$_MODULE['<{blocktopmenu}prestashop>blocktopmenu_aef3662e6419ddaaa0a31df70e3b6557'] = 'Les modifications s\'appliqueront au groupe de boutiques suivant : %s';
+$_MODULE['<{blocktopmenu}prestashop>blocktopmenu_dd25f68471362f6f5f183d6158d67854'] = 'Les modifications seront appliquées à toutes les boutiques';
+$_MODULE['<{blocktopmenu}prestashop>blocktopmenu_bf24faeb13210b5a703f3ccef792b000'] = 'Tous les fabricants';
+$_MODULE['<{blocktopmenu}prestashop>blocktopmenu_ecf253735ac0cba84a9d2eeff1f1b87c'] = 'Tous les fournisseurs';
+$_MODULE['<{blocktopmenu}prestashop>blocktopmenu_944d19a34e5fa333a6a0de27e8c971da'] = 'Lien du menu';
+$_MODULE['<{blocktopmenu}prestashop>blocktopmenu_eacd852cc1f621763dccbda3f3c15081'] = 'Barre de recherche';
+$_MODULE['<{blocktopmenu}prestashop>blocktopmenu_00d23a76e43b46dae9ec7aa9dcbebb32'] = 'Activé';
+$_MODULE['<{blocktopmenu}prestashop>blocktopmenu_b9f5c797ebbf55adccdd8539a65a0241'] = 'Désactivé';
+$_MODULE['<{blocktopmenu}prestashop>blocktopmenu_c9cc8cce247e49bae79f15173ce97354'] = 'Enregistrer';
+$_MODULE['<{blocktopmenu}prestashop>blocktopmenu_0a112e5da975d8eaf28df9219c397764'] = 'Toutes les quantités des combinaisons de produits actives seront modifiées';
+$_MODULE['<{blocktopmenu}prestashop>blocktopmenu_1a6191a2dc928ff8fb8c02c050975ea7'] = 'Mettre à jour le lien';
+$_MODULE['<{blocktopmenu}prestashop>blocktopmenu_58e9b25bb2e2699986a3abe2c92fc82e'] = 'Ajouter un nouveau lien';
+$_MODULE['<{blocktopmenu}prestashop>blocktopmenu_b021df6aac4654c454f46c77646e745f'] = 'Libellé';
+$_MODULE['<{blocktopmenu}prestashop>blocktopmenu_97e7c9a7d06eac006a28bf05467fcc8b'] = 'Lien';
+$_MODULE['<{blocktopmenu}prestashop>blocktopmenu_e5dc8e5afea0a065948622039358de37'] = 'Nouvelle fenêtre';
+$_MODULE['<{blocktopmenu}prestashop>blocktopmenu_ec211f7c20af43e742bf2570c3cb84f9'] = 'Ajouter';
+$_MODULE['<{blocktopmenu}prestashop>blocktopmenu_06933067aafd48425d67bcb01bba5cb6'] = 'Mettre à jour';
+$_MODULE['<{blocktopmenu}prestashop>blocktopmenu_c7da501f54544eba6787960200d9efdb'] = 'CMS';
+$_MODULE['<{blocktopmenu}prestashop>blocktopmenu_ec136b444eede3bc85639fac0dd06229'] = 'Fournisseurs';
+$_MODULE['<{blocktopmenu}prestashop>blocktopmenu_c0bd7654d5b278e65f21cf4e9153fdb4'] = 'Fabricant';
+$_MODULE['<{blocktopmenu}prestashop>blocktopmenu_af1b98adf7f686b84cd0b443e022b7a0'] = 'Catégories';
+$_MODULE['<{blocktopmenu}prestashop>blocktopmenu_12a521af593422cd508f7707662c9eb2'] = 'Boutiques';
+$_MODULE['<{blocktopmenu}prestashop>blocktopmenu_068f80c7519d0528fb08e82137a72131'] = 'Produits';
+$_MODULE['<{blocktopmenu}prestashop>blocktopmenu_778118c7dd993db08f704e15efa4a7fa'] = 'Choisissez un ID de produit';
+$_MODULE['<{blocktopmenu}prestashop>blocktopmenu_56e8bf6c54f1638e7bce5a2fcd5b20fe'] = 'Liens du menu';
+$_MODULE['<{blocktopmenu}prestashop>blocktopmenu_449f6d82cde894eafd3c85b6fa918f89'] = 'ID du lien';
+$_MODULE['<{blocktopmenu}prestashop>blocktopmenu_e93c33bd1341ab74195430daeb63db13'] = 'Nom de la boutique';
+$_MODULE['<{blocktopmenu}prestashop>blocktopmenu_387a8014f530f080bf2f3be723f8c164'] = 'Liste des liens';
+$_MODULE['<{blocktopmenu}prestashop>form_17a1352d3f69a733fd472fce0238a07d'] = 'Indiquez l\'identifiant (ID) du produit';
+$_MODULE['<{blocktopmenu}prestashop>form_6bb999afde6fca60d70edce79d20b370'] = 'Identifiant du produit';
+$_MODULE['<{blocktopmenu}prestashop>form_3ee3549ff0c93372a730749f784e9438'] = 'Veuillez sélectionner un seul élément';
+$_MODULE['<{blocktopmenu}prestashop>form_e1b11c03820641dd1d1441bf68898d08'] = 'Modifier la position';
+$_MODULE['<{blocktopmenu}prestashop>form_3713a99a6284e39061bd48069807aa52'] = 'Éléments sélectionnés';
+$_MODULE['<{blocktopmenu}prestashop>form_8fb31b552d63ffef9df733646a195bc0'] = 'Éléments disponibles';
+$_MODULE['<{blocktopmenu}prestashop>form_1063e38cb53d94d386f21227fcd84717'] = 'Retirer';
+$_MODULE['<{blocktopmenu}prestashop>form_ec211f7c20af43e742bf2570c3cb84f9'] = 'Ajouter';
+$_MODULE['<{blocktopmenu}prestashop>blocktopmenu_b61541208db7fa7dba42c85224405911'] = 'Menu';
+
+
+return $_MODULE;
--- a/modules/blocktopmenu/translations/index.php
+++ b/modules/blocktopmenu/translations/index.php
@ -0,0 +1,35 @@
+<?php
+/*
+* 2007-2015 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-2015 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+				    	
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+						
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+						
+header("Location: ../");
+exit;
--- a/modules/blocktopmenu/upgrade/install-1.6.php
+++ b/modules/blocktopmenu/upgrade/install-1.6.php
@ -0,0 +1,9 @@
+<?php
+
+if (!defined('_PS_VERSION_'))
+	exit;
+
+function upgrade_module_1_6($object)
+{
+	return ($object->registerHook('actionObjectCategoryAddAfter'));
+}
--- a/modules/blocktopmenu/upgrade/install-2.1.1.php
+++ b/modules/blocktopmenu/upgrade/install-2.1.1.php
@ -0,0 +1,32 @@
+<?php
+/*
+* 2007-2015 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-2015 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+if (!defined('_PS_VERSION_'))
+	exit;
+	
+function upgrade_module_2_1_1($object)
+{
+	return ($object->registerHook('header'));
+}
--- a/modules/blocktopmenu/views/index.php
+++ b/modules/blocktopmenu/views/index.php
@ -0,0 +1,35 @@
+<?php
+/*
+* 2007-2015 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-2015 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+				    	
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+						
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+						
+header("Location: ../");
+exit;
--- a/modules/blocktopmenu/views/templates/admin/_configure/helpers/form/form.tpl
+++ b/modules/blocktopmenu/views/templates/admin/_configure/helpers/form/form.tpl
@ -0,0 +1,125 @@
+{*
+* 2007-2015 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-2015 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*}
+
+{extends file="helpers/form/form.tpl"}
+
+{block name="script"}
+$(document).ready(function(){
+$('#menuOrderUp').click(function(e){
+	e.preventDefault();
+    move(true);
+});
+$('#menuOrderDown').click(function(e){
+    e.preventDefault();
+    move();
+});
+$("#items").closest('form').on('submit', function(e) {
+	$("#items option").prop('selected', true);
+});
+$("#addItem").click(add);
+$("#availableItems").dblclick(add);
+$("#removeItem").click(remove);
+$("#items").dblclick(remove);
+function add()
+{
+	$("#availableItems option:selected").each(function(i){
+		var val = $(this).val();
+		var text = $(this).text();
+		text = text.replace(/(^\s*)|(\s*$)/gi,"");
+		if (val == "PRODUCT")
+		{
+			val = prompt('{l s="Indicate the ID number for the product" mod='blocktopmenu' js=1}');
+			if (val == null || val == "" || isNaN(val))
+				return;
+			text = '{l s="Product ID #" mod='blocktopmenu' js=1}'+val;
+			val = "PRD"+val;
+		}
+		$("#items").append('<option value="'+val+'" selected="selected">'+text+'</option>');
+	});
+	serialize();
+	return false;
+}
+function remove()
+{
+	$("#items option:selected").each(function(i){
+		$(this).remove();
+	});
+	serialize();
+	return false;
+}
+function serialize()
+{
+	var options = "";
+	$("#items option").each(function(i){
+		options += $(this).val()+",";
+	});
+	$("#itemsInput").val(options.substr(0, options.length - 1));
+}
+function move(up)
+{
+        var tomove = $('#items option:selected');
+        if (tomove.length >1)
+        {
+                alert('{l s="Please select just one item" mod='blocktopmenu'}');
+                return false;
+        }
+        if (up)
+                tomove.prev().insertAfter(tomove);
+        else
+                tomove.next().insertBefore(tomove);
+        serialize();
+        return false;
+}
+});
+{/block}
+
+{block name="input"}
+    {if $input.type == 'link_choice'}
+	    <div class="row">
+	    	<div class="col-lg-1">
+	    		<h4 style="margin-top:5px;">{l s='Change position' mod='blocktopmenu'}</h4> 
+                <a href="#" id="menuOrderUp" class="btn btn-default" style="font-size:20px;display:block;"><i class="icon-chevron-up"></i></a><br/>
+                <a href="#" id="menuOrderDown" class="btn btn-default" style="font-size:20px;display:block;"><i class="icon-chevron-down"></i></a><br/>
+	    	</div>
+	    	<div class="col-lg-4">
+	    		<h4 style="margin-top:5px;">{l s='Selected items' mod='blocktopmenu'}</h4>
+	    		{$selected_links}
+	    	</div>
+	    	<div class="col-lg-4">
+	    		<h4 style="margin-top:5px;">{l s='Available items' mod='blocktopmenu'}</h4>
+	    		{$choices}
+	    	</div>
+	    	
+	    </div>
+	    <br/>
+	    <div class="row">
+	    	<div class="col-lg-1"></div>
+	    	<div class="col-lg-4"><a href="#" id="removeItem" class="btn btn-default"><i class="icon-arrow-right"></i> {l s='Remove' mod='blocktopmenu'}</a></div>
+	    	<div class="col-lg-4"><a href="#" id="addItem" class="btn btn-default"><i class="icon-arrow-left"></i> {l s='Add' mod='blocktopmenu'}</a></div>
+	    </div>
+	{else}
+		{$smarty.block.parent}
+    {/if}
+{/block}
--- a/modules/blocktopmenu/views/templates/admin/_configure/helpers/form/index.php
+++ b/modules/blocktopmenu/views/templates/admin/_configure/helpers/form/index.php
@ -0,0 +1,35 @@
+<?php
+/*
+* 2007-2015 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-2015 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+				    	
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+						
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+						
+header("Location: ../");
+exit;
--- a/modules/blocktopmenu/views/templates/admin/_configure/helpers/index.php
+++ b/modules/blocktopmenu/views/templates/admin/_configure/helpers/index.php
@ -0,0 +1,35 @@
+<?php
+/*
+* 2007-2015 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-2015 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+				    	
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+						
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+						
+header("Location: ../");
+exit;
--- a/modules/blocktopmenu/views/templates/admin/_configure/helpers/list/index.php
+++ b/modules/blocktopmenu/views/templates/admin/_configure/helpers/list/index.php
@ -0,0 +1,35 @@
+<?php
+/*
+* 2007-2015 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-2015 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+				    	
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+						
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+						
+header("Location: ../");
+exit;
--- a/modules/blocktopmenu/views/templates/admin/_configure/helpers/list/list_content.tpl
+++ b/modules/blocktopmenu/views/templates/admin/_configure/helpers/list/list_content.tpl
@ -0,0 +1,34 @@
+{*
+* 2007-2015 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-2015 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*}
+
+{extends file="helpers/list/list_content.tpl"}
+
+{block name="td_content"}
+	{if isset($params.type) && $params.type == 'link'}
+		<a href="{$tr.$key|escape:'html':'UTF-8'}" target="_blank">{$tr.$key|escape:'html':'UTF-8'}</a>
+	{else}
+		{$smarty.block.parent}
+	{/if}
+{/block}
--- a/modules/blocktopmenu/views/templates/admin/_configure/index.php
+++ b/modules/blocktopmenu/views/templates/admin/_configure/index.php
@ -0,0 +1,35 @@
+<?php
+/*
+* 2007-2015 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-2015 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+				    	
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+						
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+						
+header("Location: ../");
+exit;
--- a/modules/blocktopmenu/views/templates/admin/index.php
+++ b/modules/blocktopmenu/views/templates/admin/index.php
@ -0,0 +1,35 @@
+<?php
+/*
+* 2007-2015 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-2015 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+				    	
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+						
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+						
+header("Location: ../");
+exit;
--- a/modules/blocktopmenu/views/templates/index.php
+++ b/modules/blocktopmenu/views/templates/index.php
@ -0,0 +1,35 @@
+<?php
+/*
+* 2007-2015 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-2015 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+				    	
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+						
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+						
+header("Location: ../");
+exit;
--- a/modules/blockuserinfo
+++ b/modules/blockuserinfo
@ -1 +0,0 @@
-Subproject commit a4bc8edccd9590ca2c7376a70c2300d369c28fd4
--- a/modules/blockuserinfo/CHANGELOG.txt
+++ b/modules/blockuserinfo/CHANGELOG.txt
@ -0,0 +1,4 @@
+2014-04-22 18:57:59 +0200	// Changelog updated
+2014-03-24 11:43:29 +0100	/ MO blockuserinfo : ps_versions_compliancy modified (1.5.6.1 => 1.6)
+2014-03-24 11:04:51 +0100	/ MO blockuserinfo : ps_versions_compliancy added
+2014-03-20 14:29:37 +0100	Initial commit
--- a/modules/blockuserinfo/Readme.md
+++ b/modules/blockuserinfo/Readme.md
@ -0,0 +1,37 @@
+# User info block
+
+## About
+
+Adds a block that displays information about the customer.
+
+## Contributing
+
+PrestaShop modules are open-source extensions to the PrestaShop e-commerce solution. Everyone is welcome and even encouraged to contribute with their own improvements.
+
+### Requirements
+
+Contributors **must** follow the following rules:
+
+* **Make your Pull Request on the "dev" branch**, NOT the "master" branch.
+* Do not update the module's version number.
+* Follow [the coding standards][1].
+
+### Process in details
+
+Contributors wishing to edit a module's files should follow the following process:
+
+1. Create your GitHub account, if you do not have one already.
+2. Fork the blockuserinfo project to your GitHub account.
+3. Clone your fork to your local machine in the ```/modules``` directory of your PrestaShop installation.
+4. Create a branch in your local clone of the module for your changes.
+5. Change the files in your branch. Be sure to follow [the coding standards][1]!
+6. Push your changed branch to your fork in your GitHub account.
+7. Create a pull request for your changes **on the _'dev'_ branch** of the module's project. Be sure to follow [the commit message norm][2] in your pull request. If you need help to make a pull request, read the [Github help page about creating pull requests][3].
+8. Wait for one of the core developers either to include your change in the codebase, or to comment on possible improvements you should make to your code.
+
+That's it: you have contributed to this open-source project! Congratulations!
+
+[1]: http://doc.prestashop.com/display/PS16/Coding+Standards
+[2]: http://doc.prestashop.com/display/PS16/How+to+write+a+commit+message
+[3]: https://help.github.com/articles/using-pull-requests
+
--- a/modules/blockuserinfo/blockuserinfo.css
+++ b/modules/blockuserinfo/blockuserinfo.css
@ -0,0 +1,61 @@
+/* block top user information */
+
+#header_right #header_user {
+	clear:both;
+	float: right;
+	margin-top:8px;
+}
+
+#header_right #header_user.header_user_catalog {
+	margin-top: 15px;
+    min-height: 60px;
+}
+
+#header_user #header_nav {
+	list-style-type:none;
+	float:right;
+}
+
+/* cart */
+.lt-ie6 #shopping_cart {width: 130px;}
+#shopping_cart a{
+	height: 15px;
+	padding:15px 27px 10px 43px;
+	background: url('img/icon/cart.gif') no-repeat 10px 9px #eee;
+	min-width: 130px;/* 200 */
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	border-radius: 3px;display:block}
+#shopping_cart a:hover span{text-decoration: none}
+#header_user #shopping_cart .ajax_cart_quantity { font-weight:bold; font-size:18px }
+#header_user #shopping_cart .ajax_cart_total { display:none !important; }
+
+
+/* account */
+#header_user #your_account {display:none;}
+#header_user #your_account a { background-image: url('img/icon/my-account.gif') }
+
+/* user infos */ 
+#header_user_info {
+	clear:both;
+	float:right;
+	margin-top:10px;
+	padding:0;
+	font-size:12px
+}
+#header_user_info a {
+	display:inline-block;
+	margin:0 0 0 10px;
+	padding:3px 0 0 34px;
+	line-height: 11px;
+	border-left:1px solid #000
+}
+#header_user_info a.account {
+	border: none;
+	display: inline;
+	margin: 0;
+	padding: 0;
+}
+*:first-child+html #header_user_info a {line-height:14px;}
+#header_user_info a.login {background: url('img/icon/login.gif') no-repeat 10px 0}
+#header_user_info a.logout {background: url('img/icon/logout.png') no-repeat 10px -1px}
--- a/modules/blockuserinfo/blockuserinfo.php
+++ b/modules/blockuserinfo/blockuserinfo.php
@ -0,0 +1,84 @@
+<?php
+/*
+* 2007-2014 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-2014 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+
+if (!defined('_PS_VERSION_'))
+	exit;
+
+class BlockUserInfo extends Module
+{
+	public function __construct()
+	{
+		$this->name = 'blockuserinfo';
+		$this->tab = 'front_office_features';
+		$this->version = '0.3.1';
+		$this->author = 'PrestaShop';
+		$this->need_instance = 0;
+
+		parent::__construct();
+
+		$this->displayName = $this->l('User info block');
+		$this->description = $this->l('Adds a block that displays information about the customer.');
+		$this->ps_versions_compliancy = array('min' => '1.6', 'max' => _PS_VERSION_);
+	}
+
+	public function install()
+	{
+		return (parent::install() && $this->registerHook('displayTop') && $this->registerHook('displayNav') && $this->registerHook('displayHeader'));
+	}
+
+	/**
+	* Returns module content for header
+	*
+	* @param array $params Parameters
+	* @return string Content
+	*/
+	public function hookDisplayTop($params)
+	{
+		if (!$this->active)
+			return;
+
+		$this->smarty->assign(array(
+			'cart' => $this->context->cart,
+			'cart_qties' => $this->context->cart->nbProducts(),
+			'logged' => $this->context->customer->isLogged(),
+			'customerName' => ($this->context->customer->logged ? $this->context->customer->firstname.' '.$this->context->customer->lastname : false),
+			'firstName' => ($this->context->customer->logged ? $this->context->customer->firstname : false),
+			'lastName' => ($this->context->customer->logged ? $this->context->customer->lastname : false),
+			'order_process' => Configuration::get('PS_ORDER_PROCESS_TYPE') ? 'order-opc' : 'order'
+		));
+		return $this->display(__FILE__, 'blockuserinfo.tpl');
+	}
+
+	public function hookDisplayHeader($params)
+	{
+		$this->context->controller->addCSS(($this->_path).'blockuserinfo.css', 'all');
+	}
+
+	public function hookDisplayNav($params)
+	{
+		return $this->display(__FILE__, 'nav.tpl');
+	}
+}
--- a/modules/blockuserinfo/blockuserinfo.tpl
+++ b/modules/blockuserinfo/blockuserinfo.tpl
@ -0,0 +1,62 @@
+{*
+* 2007-2014 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-2014 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*}
+
+<!-- Block user information module HEADER -->
+<div id="header_user" {if $PS_CATALOG_MODE}class="header_user_catalog"{/if}>
+	<ul id="header_nav">
+		{if !$PS_CATALOG_MODE}
+		<li id="shopping_cart">
+			<a href="{$link->getPageLink($order_process, true)|escape:'html'}" title="{l s='View my shopping cart' mod='blockuserinfo'}" rel="nofollow">{l s='Cart' mod='blockuserinfo'}
+			<span class="ajax_cart_quantity{if $cart_qties == 0} hidden{/if}">{$cart_qties}</span>
+			<span class="ajax_cart_product_txt{if $cart_qties != 1} hidden{/if}">{l s='Product' mod='blockuserinfo'}</span>
+			<span class="ajax_cart_product_txt_s{if $cart_qties < 2} hidden{/if}">{l s='Products' mod='blockuserinfo'}</span>
+			<span class="ajax_cart_total{if $cart_qties == 0} hidden{/if}">
+				{if $cart_qties > 0}
+					{if $priceDisplay == 1}
+						{assign var='blockuser_cart_flag' value='Cart::BOTH_WITHOUT_SHIPPING'|constant}
+						{convertPrice price=$cart->getOrderTotal(false, $blockuser_cart_flag)}
+					{else}
+						{assign var='blockuser_cart_flag' value='Cart::BOTH_WITHOUT_SHIPPING'|constant}
+						{convertPrice price=$cart->getOrderTotal(true, $blockuser_cart_flag)}
+					{/if}
+				{/if}
+			</span>
+			<span class="ajax_cart_no_product{if $cart_qties > 0} hidden{/if}">{l s='(empty)' mod='blockuserinfo'}</span>
+			</a>
+		</li>
+		{/if}
+		<li id="your_account"><a href="{$link->getPageLink('my-account', true)|escape:'html'}" title="{l s='View my customer account' mod='blockuserinfo'}" rel="nofollow">{l s='Your Account' mod='blockuserinfo'}</a></li>
+	</ul>
+	<p id="header_user_info">
+		{l s='Welcome' mod='blockuserinfo'}
+		{if $logged}
+			<a href="{$link->getPageLink('my-account', true)|escape:'html'}" title="{l s='View my customer account' mod='blockuserinfo'}" class="account" rel="nofollow"><span>{$cookie->customer_firstname} {$cookie->customer_lastname}</span></a>
+			<a href="{$link->getPageLink('index', true, NULL, "mylogout")|escape:'html'}" title="{l s='Log me out' mod='blockuserinfo'}" class="logout" rel="nofollow">{l s='Sign out' mod='blockuserinfo'}</a>
+		{else}
+			<a href="{$link->getPageLink('my-account', true)|escape:'html'}" title="{l s='Log in to your customer account' mod='blockuserinfo'}" class="login" rel="nofollow">{l s='Sign in' mod='blockuserinfo'}</a>
+		{/if}
+	</p>
+</div>
+<!-- /Block user information module HEADER -->
--- a/modules/blockuserinfo/config.xml
+++ b/modules/blockuserinfo/config.xml
@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<module>
+	<name>blockuserinfo</name>
+	<displayName><![CDATA[User info block]]></displayName>
+	<version><![CDATA[0.3.1]]></version>
+	<description><![CDATA[Adds a block that displays information about the customer.]]></description>
+	<author><![CDATA[PrestaShop]]></author>
+	<tab><![CDATA[front_office_features]]></tab>
+	<is_configurable>0</is_configurable>
+	<need_instance>0</need_instance>
+	<limited_countries></limited_countries>
+</module>
--- a/modules/blockuserinfo/config_fr.xml
+++ b/modules/blockuserinfo/config_fr.xml
@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<module>
+	<name>blockuserinfo</name>
+	<displayName><![CDATA[Bloc informations clients]]></displayName>
+	<version><![CDATA[0.3.1]]></version>
+	<description><![CDATA[Ajoute un bloc avec des liens utiles pour le client (login, d&eacute;connexion...)]]></description>
+	<author><![CDATA[PrestaShop]]></author>
+	<tab><![CDATA[front_office_features]]></tab>
+	<is_configurable>0</is_configurable>
+	<need_instance>0</need_instance>
+	<limited_countries></limited_countries>
+</module>
--- a/modules/blockuserinfo/img/icon/cart.gif
+++ b/modules/blockuserinfo/img/icon/cart.gif
--- a/modules/blockuserinfo/img/icon/index.php
+++ b/modules/blockuserinfo/img/icon/index.php
@ -0,0 +1,35 @@
+<?php
+/*
+* 2007-2014 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-2014 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+				    	
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+						
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+						
+header("Location: ../");
+exit;
--- a/modules/blockuserinfo/img/icon/login.gif
+++ b/modules/blockuserinfo/img/icon/login.gif
--- a/modules/blockuserinfo/img/icon/logout.png
+++ b/modules/blockuserinfo/img/icon/logout.png
--- a/modules/blockuserinfo/img/icon/my-account.gif
+++ b/modules/blockuserinfo/img/icon/my-account.gif
--- a/modules/blockuserinfo/img/index.php
+++ b/modules/blockuserinfo/img/index.php
@ -0,0 +1,35 @@
+<?php
+/*
+* 2007-2014 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-2014 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+				    	
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+						
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+						
+header("Location: ../");
+exit;
--- a/modules/blockuserinfo/index.php
+++ b/modules/blockuserinfo/index.php
@ -0,0 +1,35 @@
+<?php
+/*
+* 2007-2014 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-2014 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+				    	
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+						
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+						
+header("Location: ../");
+exit;
--- a/modules/blockuserinfo/logo.gif
+++ b/modules/blockuserinfo/logo.gif
--- a/modules/blockuserinfo/logo.png
+++ b/modules/blockuserinfo/logo.png
--- a/modules/blockuserinfo/nav.tpl
+++ b/modules/blockuserinfo/nav.tpl
@ -0,0 +1,14 @@
+<!-- Block user information module NAV  -->
+{if $logged}
+<div class="header_user_info">
+	<a href="{$link->getPageLink('my-account', true)|escape:'html'}" title="{l s='View my customer account' mod='blockuserinfo'}" class="account" rel="nofollow"><span>{$cookie->customer_firstname} {$cookie->customer_lastname}</span></a>
+</div>
+{/if}
+<div class="header_user_info">
+	{if $logged}
+		<a class="logout" href="{$link->getPageLink('index', true, NULL, "mylogout")|escape:'html'}" rel="nofollow" title="{l s='Log me out' mod='blockuserinfo'}">{l s='Sign out' mod='blockuserinfo'}</a>
+	{else}
+		<a class="login" href="{$link->getPageLink('my-account', true)|escape:'html'}" rel="nofollow" title="{l s='Log in to your customer account' mod='blockuserinfo'}">{l s='Sign in' mod='blockuserinfo'}</a>
+	{/if}
+</div>
+<!-- /Block user information module NAV -->
--- a/modules/blockuserinfo/translations/fr.php
+++ b/modules/blockuserinfo/translations/fr.php
@ -0,0 +1,27 @@
+<?php
+
+global $_MODULE;
+$_MODULE = array();
+
+$_MODULE['<{blockuserinfo}prestashop>blockuserinfo_a2e9cd952cda8ba167e62b25a496c6c1'] = 'Bloc informations clients';
+$_MODULE['<{blockuserinfo}prestashop>blockuserinfo_970a31aa19d205f92ccfd1913ca04dc0'] = 'Ajoute un bloc avec des liens utiles pour le client (login, déconnexion...)';
+$_MODULE['<{blockuserinfo}prestashop>blockuserinfo_0c3bf3014aafb90201805e45b5e62881'] = 'Voir mon panier';
+$_MODULE['<{blockuserinfo}prestashop>blockuserinfo_a85eba4c6c699122b2bb1387ea4813ad'] = 'Panier';
+$_MODULE['<{blockuserinfo}prestashop>blockuserinfo_deb10517653c255364175796ace3553f'] = 'Produit';
+$_MODULE['<{blockuserinfo}prestashop>blockuserinfo_068f80c7519d0528fb08e82137a72131'] = 'Produits';
+$_MODULE['<{blockuserinfo}prestashop>blockuserinfo_9e65b51e82f2a9b9f72ebe3e083582bb'] = '(vide)';
+$_MODULE['<{blockuserinfo}prestashop>blockuserinfo_2cbfb6731610056e1d0aaacde07096c1'] = 'Voir mon compte client';
+$_MODULE['<{blockuserinfo}prestashop>blockuserinfo_a0623b78a5f2cfe415d9dbbd4428ea40'] = 'Votre compte';
+$_MODULE['<{blockuserinfo}prestashop>blockuserinfo_83218ac34c1834c26781fe4bde918ee4'] = 'Bienvenue';
+$_MODULE['<{blockuserinfo}prestashop>blockuserinfo_4b877ba8588b19f1b278510bf2b57ebb'] = 'Me déconnecter';
+$_MODULE['<{blockuserinfo}prestashop>blockuserinfo_c87aacf5673fada1108c9f809d354311'] = 'Déconnexion';
+$_MODULE['<{blockuserinfo}prestashop>blockuserinfo_d4151a9a3959bdd43690735737034f27'] = 'Identifiez-vous';
+$_MODULE['<{blockuserinfo}prestashop>blockuserinfo_b6d4223e60986fa4c9af77ee5f7149c5'] = 'Connexion';
+$_MODULE['<{blockuserinfo}prestashop>nav_2cbfb6731610056e1d0aaacde07096c1'] = 'Voir mon compte client';
+$_MODULE['<{blockuserinfo}prestashop>nav_4b877ba8588b19f1b278510bf2b57ebb'] = 'Me déconnecter';
+$_MODULE['<{blockuserinfo}prestashop>nav_c87aacf5673fada1108c9f809d354311'] = 'Déconnexion';
+$_MODULE['<{blockuserinfo}prestashop>nav_d4151a9a3959bdd43690735737034f27'] = 'Identifiez-vous';
+$_MODULE['<{blockuserinfo}prestashop>nav_b6d4223e60986fa4c9af77ee5f7149c5'] = 'Connexion';
+
+
+return $_MODULE;
--- a/modules/blockuserinfo/translations/index.php
+++ b/modules/blockuserinfo/translations/index.php
@ -0,0 +1,35 @@
+<?php
+/*
+* 2007-2014 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-2014 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+				    	
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+						
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+						
+header("Location: ../");
+exit;
--- a/modules/blockuserinfo/upgrade/install-0.2.php
+++ b/modules/blockuserinfo/upgrade/install-0.2.php
@ -0,0 +1,9 @@
+<?php
+
+if (!defined('_PS_VERSION_'))
+	exit;
+
+function upgrade_module_0_2($object)
+{
+	return ($object->registerHook('displayNav'));
+}
--- a/modules/blockviewed
+++ b/modules/blockviewed
@ -1 +0,0 @@
-Subproject commit d3366432f78ff6dc563860dd42d3c3bb4c06f4ee
--- a/modules/blockviewed/CHANGELOG.txt
+++ b/modules/blockviewed/CHANGELOG.txt
@ -0,0 +1,4 @@
+2014-04-22 18:58:01 +0200	// Changelog updated
+2014-03-24 11:43:29 +0100	/ MO blockviewed : ps_versions_compliancy modified (1.5.6.1 => 1.6)
+2014-03-24 11:04:58 +0100	/ MO blockviewed : ps_versions_compliancy added
+2014-03-20 14:29:39 +0100	Initial commit
--- a/modules/blockviewed/Readme.md
+++ b/modules/blockviewed/Readme.md
@ -0,0 +1,37 @@
+# Viewed products block
+
+## About
+
+Adds a block displaying recently viewed products.
+
+## Contributing
+
+PrestaShop modules are open-source extensions to the PrestaShop e-commerce solution. Everyone is welcome and even encouraged to contribute with their own improvements.
+
+### Requirements
+
+Contributors **must** follow the following rules:
+
+* **Make your Pull Request on the "dev" branch**, NOT the "master" branch.
+* Do not update the module's version number.
+* Follow [the coding standards][1].
+
+### Process in details
+
+Contributors wishing to edit a module's files should follow the following process:
+
+1. Create your GitHub account, if you do not have one already.
+2. Fork the blockviewed project to your GitHub account.
+3. Clone your fork to your local machine in the ```/modules``` directory of your PrestaShop installation.
+4. Create a branch in your local clone of the module for your changes.
+5. Change the files in your branch. Be sure to follow [the coding standards][1]!
+6. Push your changed branch to your fork in your GitHub account.
+7. Create a pull request for your changes **on the _'dev'_ branch** of the module's project. Be sure to follow [the commit message norm][2] in your pull request. If you need help to make a pull request, read the [Github help page about creating pull requests][3].
+8. Wait for one of the core developers either to include your change in the codebase, or to comment on possible improvements you should make to your code.
+
+That's it: you have contributed to this open-source project! Congratulations!
+
+[1]: http://doc.prestashop.com/display/PS16/Coding+Standards
+[2]: http://doc.prestashop.com/display/PS16/How+to+write+a+commit+message
+[3]: https://help.github.com/articles/using-pull-requests
+
--- a/modules/blockviewed/blockviewed.css
+++ b/modules/blockviewed/blockviewed.css
@ -0,0 +1,35 @@
+/* Block Viewed Products */
+#viewed-products_block_left .products li {
+	padding:10px 0;
+	border-bottom:1px dotted #ccc;
+}
+#viewed-products_block_left .products li.last_item {
+	padding-bottom:0;
+	border:none;
+}
+
+#viewed-products_block_left .content_img {
+	float:left;
+}
+#viewed-products_block_left .text_desc {
+	float:left;
+	margin-left: 10px;
+   width: 130px;
+}
+#viewed-products_block_left li .text_desc .s_title_block, #viewed-products_block_left li .text_desc h5 {
+	padding:0 0 5px 0;
+	font-size:12px;
+	color:#333;
+	font-weight: bold;
+}
+
+#viewed-products_block_left li .text_desc .s_title_block a, #viewed-products_block_left li .text_desc h5 a {
+	color:#333;
+}
+#viewed-products_block_left li .text_desc p,
+#viewed-products_block_left li .text_desc p a {
+	padding-bottom:0;
+	line-height:14px;
+	color:#666
+}
+
--- a/modules/blockviewed/blockviewed.php
+++ b/modules/blockviewed/blockviewed.php
@ -0,0 +1,218 @@
+<?php
+/*
+* 2007-2014 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-2014 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+
+if (!defined('_PS_VERSION_'))
+	exit;
+
+class BlockViewed extends Module
+{
+
+	public function __construct()
+	{
+		$this->name = 'blockviewed';
+		$this->tab = 'front_office_features';
+		$this->version = '1.2.3';
+		$this->author = 'PrestaShop';
+		$this->need_instance = 0;
+
+		$this->bootstrap = true;
+		parent::__construct();
+
+		$this->displayName = $this->l('Viewed products block');
+		$this->description = $this->l('Adds a block displaying recently viewed products.');
+		$this->ps_versions_compliancy = array('min' => '1.6', 'max' => _PS_VERSION_);
+	}
+
+	public function install()
+	{
+		return (parent::install() && $this->registerHook('header') && $this->registerHook('leftColumn') && Configuration::updateValue('PRODUCTS_VIEWED_NBR', 2));
+
+	}
+
+	public function getContent()
+	{
+		$output = '';
+		if (Tools::isSubmit('submitBlockViewed'))
+		{
+			if (!($productNbr = Tools::getValue('PRODUCTS_VIEWED_NBR')) || empty($productNbr))
+				$output .= $this->displayError($this->l('You must fill in the \'Products displayed\' field.'));
+			elseif ((int)($productNbr) == 0)
+				$output .= $this->displayError($this->l('Invalid number.'));
+			else
+			{
+				Configuration::updateValue('PRODUCTS_VIEWED_NBR', (int)$productNbr);
+				$output .= $this->displayConfirmation($this->l('Settings updated.'));
+			}
+		}
+		return $output.$this->renderForm();
+	}
+
+	public function hookRightColumn($params)
+	{
+		$productsViewed = (isset($params['cookie']->viewed) && !empty($params['cookie']->viewed)) ? array_slice(array_reverse(explode(',', $params['cookie']->viewed)), 0, Configuration::get('PRODUCTS_VIEWED_NBR')) : array();
+
+		if (count($productsViewed))
+		{
+			$defaultCover = Language::getIsoById($params['cookie']->id_lang).'-default';
+
+			$productIds = implode(',', array_map('intval', $productsViewed));
+			$productsImages = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('
+			SELECT MAX(image_shop.id_image) id_image, p.id_product, il.legend, product_shop.active, pl.name, pl.description_short, pl.link_rewrite, cl.link_rewrite AS category_rewrite
+			FROM '._DB_PREFIX_.'product p
+			'.Shop::addSqlAssociation('product', 'p').'
+			LEFT JOIN '._DB_PREFIX_.'product_lang pl ON (pl.id_product = p.id_product'.Shop::addSqlRestrictionOnLang('pl').')
+			LEFT JOIN '._DB_PREFIX_.'image i ON (i.id_product = p.id_product)'.
+			Shop::addSqlAssociation('image', 'i', false, 'image_shop.cover=1').'
+			LEFT JOIN '._DB_PREFIX_.'image_lang il ON (il.id_image = image_shop.id_image AND il.id_lang = '.(int)($params['cookie']->id_lang).')
+			LEFT JOIN '._DB_PREFIX_.'category_lang cl ON (cl.id_category = product_shop.id_category_default'.Shop::addSqlRestrictionOnLang('cl').')
+			WHERE p.id_product IN ('.$productIds.')
+			AND pl.id_lang = '.(int)($params['cookie']->id_lang).'
+			AND cl.id_lang = '.(int)($params['cookie']->id_lang).'
+			GROUP BY product_shop.id_product'
+			);
+
+			$productsImagesArray = array();
+			foreach ($productsImages as $pi)
+				$productsImagesArray[$pi['id_product']] = $pi;
+
+			$productsViewedObj = array();
+			foreach ($productsViewed as $productViewed)
+			{
+				$obj = (object)'Product';
+				if (!isset($productsImagesArray[$productViewed]) || (!$obj->active = $productsImagesArray[$productViewed]['active']))
+					continue;
+				else
+				{
+					$obj->id = (int)($productsImagesArray[$productViewed]['id_product']);
+					$obj->id_image = (int)$productsImagesArray[$productViewed]['id_image'];
+					$obj->cover = (int)($productsImagesArray[$productViewed]['id_product']).'-'.(int)($productsImagesArray[$productViewed]['id_image']);
+					$obj->legend = $productsImagesArray[$productViewed]['legend'];
+					$obj->name = $productsImagesArray[$productViewed]['name'];
+					$obj->description_short = $productsImagesArray[$productViewed]['description_short'];
+					$obj->link_rewrite = $productsImagesArray[$productViewed]['link_rewrite'];
+					$obj->category_rewrite = $productsImagesArray[$productViewed]['category_rewrite'];
+					// $obj is not a real product so it cannot be used as argument for getProductLink()
+					$obj->product_link = $this->context->link->getProductLink($obj->id, $obj->link_rewrite, $obj->category_rewrite);
+
+					if (!isset($obj->cover) || !$productsImagesArray[$productViewed]['id_image'])
+					{
+						$obj->cover = $defaultCover;
+						$obj->legend = '';
+					}
+					$productsViewedObj[] = $obj;
+				}
+			}
+
+			if (!count($productsViewedObj))
+				return;
+
+			$this->smarty->assign(array(
+				'productsViewedObj' => $productsViewedObj,
+				'mediumSize' => Image::getSize('medium')));
+
+			return $this->display(__FILE__, 'blockviewed.tpl');
+		}
+		return;
+	}
+
+	public function hookLeftColumn($params)
+	{
+		return $this->hookRightColumn($params);
+	}
+
+	public function hookFooter($params)
+	{
+		return $this->hookRightColumn($params);
+	}
+
+	public function hookHeader($params)
+	{
+		$id_product = (int)Tools::getValue('id_product');
+		$productsViewed = (isset($params['cookie']->viewed) && !empty($params['cookie']->viewed)) ? array_slice(array_reverse(explode(',', $params['cookie']->viewed)), 0, Configuration::get('PRODUCTS_VIEWED_NBR')) : array();
+
+		if ($id_product && !in_array($id_product, $productsViewed))
+		{
+			$product = new Product((int)$id_product);
+			if ($product->checkAccess((int)$this->context->customer->id))
+			{
+				if (isset($params['cookie']->viewed) && !empty($params['cookie']->viewed))
+					$params['cookie']->viewed .= ','.(int)$id_product;
+				else
+					$params['cookie']->viewed = (int)$id_product;
+			}
+		}
+		$this->context->controller->addCSS(($this->_path).'blockviewed.css', 'all');
+	}
+
+	public function renderForm()
+	{
+		$fields_form = array(
+			'form' => array(
+				'legend' => array(
+					'title' => $this->l('Settings'),
+					'icon' => 'icon-cogs'
+				),
+				'input' => array(
+					array(
+						'type' => 'text',
+						'label' => $this->l('Products to display'),
+						'name' => 'PRODUCTS_VIEWED_NBR',
+						'class' => 'fixed-width-xs',
+						'desc' => $this->l('Define the number of products displayed in this block.')
+					),
+				),
+				'submit' => array(
+					'title' => $this->l('Save'),
+				)
+			),
+		);
+
+		$helper = new HelperForm();
+		$helper->show_toolbar = false;
+		$helper->table =  $this->table;
+		$lang = new Language((int)Configuration::get('PS_LANG_DEFAULT'));
+		$helper->default_form_language = $lang->id;
+		$helper->allow_employee_form_lang = Configuration::get('PS_BO_ALLOW_EMPLOYEE_FORM_LANG') ? Configuration::get('PS_BO_ALLOW_EMPLOYEE_FORM_LANG') : 0;
+		$helper->identifier = $this->identifier;
+		$helper->submit_action = 'submitBlockViewed';
+		$helper->currentIndex = $this->context->link->getAdminLink('AdminModules', false).'&configure='.$this->name.'&tab_module='.$this->tab.'&module_name='.$this->name;
+		$helper->token = Tools::getAdminTokenLite('AdminModules');
+		$helper->tpl_vars = array(
+			'fields_value' => $this->getConfigFieldsValues(),
+			'languages' => $this->context->controller->getLanguages(),
+			'id_language' => $this->context->language->id
+		);
+
+		return $helper->generateForm(array($fields_form));
+	}
+
+	public function getConfigFieldsValues()
+	{
+		return array(
+			'PRODUCTS_VIEWED_NBR' => Tools::getValue('PRODUCTS_VIEWED_NBR', Configuration::get('PRODUCTS_VIEWED_NBR')),
+		);
+	}
+}
--- a/modules/blockviewed/blockviewed.tpl
+++ b/modules/blockviewed/blockviewed.tpl
@ -0,0 +1,44 @@
+{*
+* 2007-2014 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-2014 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*}
+
+<!-- Block Viewed products -->
+<div id="viewed-products_block_left" class="block products_block">
+	<h4 class="title_block">{l s='Viewed products' mod='blockviewed'}</h4>
+	<div class="block_content">
+		<ul class="products clearfix">
+			{foreach from=$productsViewedObj item=viewedProduct name=myLoop}
+				<li class="clearfix{if $smarty.foreach.myLoop.last} last_item{elseif $smarty.foreach.myLoop.first} first_item{else} item{/if}">
+					<a href="{$viewedProduct->product_link|escape:'html'}" title="{l s='About' mod='blockviewed'} {$viewedProduct->name|escape:html:'UTF-8'}" class="content_img">
+					<img src="{if isset($viewedProduct->id_image) && $viewedProduct->id_image}{$link->getImageLink($viewedProduct->link_rewrite, $viewedProduct->cover, 'medium_default')}{else}{$img_prod_dir}{$lang_iso}-default-medium_default.jpg{/if}" alt="{$viewedProduct->legend|escape:html:'UTF-8'}" title="{$viewedProduct->legend|escape:html:'UTF-8'}"/>
+					</a>
+					<div class="text_desc">
+						<h5 class="s_title_block"><a href="{$viewedProduct->product_link|escape:'html'}" title="{l s='About' mod='blockviewed'} {$viewedProduct->name|escape:html:'UTF-8'}">{$viewedProduct->name|truncate:14:'...'|escape:html:'UTF-8'}</a></h5>
+						<p><a href="{$viewedProduct->product_link|escape:'html'}" title="{l s='About' mod='blockviewed'} {$viewedProduct->name|escape:html:'UTF-8'}">{$viewedProduct->description_short|strip_tags:'UTF-8'|truncate:44}</a></p>
+					</div>
+				</li>
+			{/foreach}
+		</ul>
+	</div>
+</div>
--- a/modules/blockviewed/config.xml
+++ b/modules/blockviewed/config.xml
@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<module>
+	<name>blockviewed</name>
+	<displayName><![CDATA[Viewed products block]]></displayName>
+	<version><![CDATA[1.2.3]]></version>
+	<description><![CDATA[Adds a block displaying recently viewed products.]]></description>
+	<author><![CDATA[PrestaShop]]></author>
+	<tab><![CDATA[front_office_features]]></tab>
+	<is_configurable>1</is_configurable>
+	<need_instance>0</need_instance>
+	<limited_countries></limited_countries>
+</module>
--- a/modules/blockviewed/config_fr.xml
+++ b/modules/blockviewed/config_fr.xml
@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<module>
+	<name>blockviewed</name>
+	<displayName><![CDATA[Bloc des derniers produits vus]]></displayName>
+	<version><![CDATA[1.2.3]]></version>
+	<description><![CDATA[Ajoute un bloc proposant les derniers produits vus par le client.]]></description>
+	<author><![CDATA[PrestaShop]]></author>
+	<tab><![CDATA[front_office_features]]></tab>
+	<is_configurable>1</is_configurable>
+	<need_instance>0</need_instance>
+	<limited_countries></limited_countries>
+</module>
--- a/modules/blockviewed/index.php
+++ b/modules/blockviewed/index.php
@ -0,0 +1,35 @@
+<?php
+/*
+* 2007-2014 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-2014 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+				    	
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+						
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+						
+header("Location: ../");
+exit;
--- a/modules/blockviewed/logo.gif
+++ b/modules/blockviewed/logo.gif
--- a/modules/blockviewed/logo.png
+++ b/modules/blockviewed/logo.png
--- a/modules/blockviewed/translations/fr.php
+++ b/modules/blockviewed/translations/fr.php
@ -0,0 +1,20 @@
+<?php
+
+global $_MODULE;
+$_MODULE = array();
+
+$_MODULE['<{blockviewed}prestashop>blockviewed_859e85774d372c6084d62d02324a1cc3'] = 'Bloc des derniers produits vus';
+$_MODULE['<{blockviewed}prestashop>blockviewed_eaa362292272519b786c2046ab4b68d2'] = 'Ajoute un bloc proposant les derniers produits vus par le client.';
+$_MODULE['<{blockviewed}prestashop>blockviewed_2e57399079951d84b435700493b8a8c1'] = 'Champ \\"Produits vus\\" obligatoire\\"';
+$_MODULE['<{blockviewed}prestashop>blockviewed_73293a024e644165e9bf48f270af63a0'] = 'Nombre invalide.';
+$_MODULE['<{blockviewed}prestashop>blockviewed_f38f5974cdc23279ffe6d203641a8bdf'] = 'Réglages mis à jour.';
+$_MODULE['<{blockviewed}prestashop>blockviewed_f4f70727dc34561dfde1a3c529b6205c'] = 'Paramètres';
+$_MODULE['<{blockviewed}prestashop>blockviewed_26986c3388870d4148b1b5375368a83d'] = 'Produits à afficher';
+$_MODULE['<{blockviewed}prestashop>blockviewed_d36bbb6066e3744039d38e580f17a2cc'] = 'Définir le nombre de produits affichés dans ce bloc.';
+$_MODULE['<{blockviewed}prestashop>blockviewed_c9cc8cce247e49bae79f15173ce97354'] = 'Enregistrer';
+$_MODULE['<{blockviewed}prestashop>blockviewed_43560641f91e63dc83682bc598892fa1'] = 'Déjà vus';
+$_MODULE['<{blockviewed}prestashop>blockviewed_8f7f4c1ce7a4f933663d10543562b096'] = 'En savoir plus sur';
+$_MODULE['<{blockviewed}prestashop>blockviewed_c70ad5f80e4c6f299013e08cabc980df'] = 'En savoir plus sur %s';
+
+
+return $_MODULE;
--- a/modules/blockviewed/translations/index.php
+++ b/modules/blockviewed/translations/index.php
@ -0,0 +1,35 @@
+<?php
+/*
+* 2007-2014 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-2014 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+				    	
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+						
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+						
+header("Location: ../");
+exit;
--- a/modules/cheque
+++ b/modules/cheque
@ -1 +0,0 @@
-Subproject commit 5ed07346c5d45f765563f5310a81a2f1873dd1aa
--- a/modules/cheque/CHANGELOG.txt
+++ b/modules/cheque/CHANGELOG.txt
@ -0,0 +1,4 @@
+2014-04-22 18:58:10 +0200	// Changelog updated
+2014-04-17 11:25:59 +0200	Bug fix (PS 1.5): ps_version_compliancy removed
+2014-03-24 15:20:50 +0100	/ MO cheque : ps_versions_compliancy added
+2014-03-20 14:30:59 +0100	Initial commit
--- a/modules/cheque/Readme.md
+++ b/modules/cheque/Readme.md
@ -0,0 +1,37 @@
+# Payments by check
+
+## About
+
+This module allows you to accept payments by check.
+
+## Contributing
+
+PrestaShop modules are open-source extensions to the PrestaShop e-commerce solution. Everyone is welcome and even encouraged to contribute with their own improvements.
+
+### Requirements
+
+Contributors **must** follow the following rules:
+
+* **Make your Pull Request on the "dev" branch**, NOT the "master" branch.
+* Do not update the module's version number.
+* Follow [the coding standards][1].
+
+### Process in details
+
+Contributors wishing to edit a module's files should follow the following process:
+
+1. Create your GitHub account, if you do not have one already.
+2. Fork the cheque project to your GitHub account.
+3. Clone your fork to your local machine in the ```/modules``` directory of your PrestaShop installation.
+4. Create a branch in your local clone of the module for your changes.
+5. Change the files in your branch. Be sure to follow [the coding standards][1]!
+6. Push your changed branch to your fork in your GitHub account.
+7. Create a pull request for your changes **on the _'dev'_ branch** of the module's project. Be sure to follow [the commit message norm][2] in your pull request. If you need help to make a pull request, read the [Github help page about creating pull requests][3].
+8. Wait for one of the core developers either to include your change in the codebase, or to comment on possible improvements you should make to your code.
+
+That's it: you have contributed to this open-source project! Congratulations!
+
+[1]: http://doc.prestashop.com/display/PS16/Coding+Standards
+[2]: http://doc.prestashop.com/display/PS16/How+to+write+a+commit+message
+[3]: https://help.github.com/articles/using-pull-requests
+
--- a/modules/cheque/cheque.jpg
+++ b/modules/cheque/cheque.jpg
--- a/modules/cheque/cheque.php
+++ b/modules/cheque/cheque.php
@ -0,0 +1,259 @@
+<?php
+/*
+* 2007-2015 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-2015 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+
+if (!defined('_PS_VERSION_'))
+	exit;
+
+class Cheque extends PaymentModule
+{
+	private $_html = '';
+	private $_postErrors = array();
+
+	public $chequeName;
+	public $address;
+	public $extra_mail_vars;
+
+	public function __construct()
+	{
+		$this->name = 'cheque';
+		$this->tab = 'payments_gateways';
+		$this->version = '2.6.0';
+		$this->author = 'PrestaShop';
+		$this->controllers = array('payment', 'validation');
+		$this->is_eu_compatible = 1;
+
+		$this->currencies = true;
+		$this->currencies_mode = 'checkbox';
+
+		$config = Configuration::getMultiple(array('CHEQUE_NAME', 'CHEQUE_ADDRESS'));
+		if (isset($config['CHEQUE_NAME']))
+			$this->chequeName = $config['CHEQUE_NAME'];
+		if (isset($config['CHEQUE_ADDRESS']))
+			$this->address = $config['CHEQUE_ADDRESS'];
+
+		$this->bootstrap = true;
+		parent::__construct();
+
+		$this->displayName = $this->l('Payments by check');
+		$this->description = $this->l('This module allows you to accept payments by check.');
+		$this->confirmUninstall = $this->l('Are you sure you want to delete these details?');
+
+		if ((!isset($this->chequeName) || !isset($this->address) || empty($this->chequeName) || empty($this->address)))
+			$this->warning = $this->l('The "Pay to the order of" and "Address" fields must be configured before using this module.');
+		if (!count(Currency::checkPaymentCurrencies($this->id)))
+			$this->warning = $this->l('No currency has been set for this module.');
+
+		$this->extra_mail_vars = array(
+											'{cheque_name}' => Configuration::get('CHEQUE_NAME'),
+											'{cheque_address}' => Configuration::get('CHEQUE_ADDRESS'),
+											'{cheque_address_html}' => str_replace("\n", '<br />', Configuration::get('CHEQUE_ADDRESS'))
+											);
+	}
+
+	public function install()
+	{
+		if (!parent::install() || !$this->registerHook('payment') || ! $this->registerHook('displayPaymentEU') || !$this->registerHook('paymentReturn'))
+			return false;
+		return true;
+	}
+
+	public function uninstall()
+	{
+		if (!Configuration::deleteByName('CHEQUE_NAME') || !Configuration::deleteByName('CHEQUE_ADDRESS') || !parent::uninstall())
+			return false;
+		return true;
+	}
+
+	private function _postValidation()
+	{
+		if (Tools::isSubmit('btnSubmit'))
+		{
+			if (!Tools::getValue('CHEQUE_NAME'))
+				$this->_postErrors[] = $this->l('The "Pay to the order of" field is required.');
+			elseif (!Tools::getValue('CHEQUE_ADDRESS'))
+				$this->_postErrors[] = $this->l('The "Address" field is required.');
+		}
+	}
+
+	private function _postProcess()
+	{
+		if (Tools::isSubmit('btnSubmit'))
+		{
+			Configuration::updateValue('CHEQUE_NAME', Tools::getValue('CHEQUE_NAME'));
+			Configuration::updateValue('CHEQUE_ADDRESS', Tools::getValue('CHEQUE_ADDRESS'));
+		}
+		$this->_html .= $this->displayConfirmation($this->l('Settings updated'));
+	}
+
+	private function _displayCheque()
+	{
+		return $this->display(__FILE__, 'infos.tpl');
+	}
+
+	public function getContent()
+	{
+		$this->_html = '';
+
+		if (Tools::isSubmit('btnSubmit'))
+		{
+			$this->_postValidation();
+			if (!count($this->_postErrors))
+				$this->_postProcess();
+			else
+				foreach ($this->_postErrors as $err)
+					$this->_html .= $this->displayError($err);
+		}
+
+		$this->_html .= $this->_displayCheque();
+		$this->_html .= $this->renderForm();
+
+		return $this->_html;
+	}
+
+	public function hookPayment($params)
+	{
+		if (!$this->active)
+			return;
+		if (!$this->checkCurrency($params['cart']))
+			return;
+
+		$this->smarty->assign(array(
+			'this_path' => $this->_path,
+			'this_path_cheque' => $this->_path,
+			'this_path_ssl' => Tools::getShopDomainSsl(true, true).__PS_BASE_URI__.'modules/'.$this->name.'/'
+		));
+		return $this->display(__FILE__, 'payment.tpl');
+	}
+
+	public function hookDisplayPaymentEU($params)
+	{
+		if (!$this->active)
+			return;
+		if (!$this->checkCurrency($params['cart']))
+			return;
+
+		$payment_options = array(
+			'cta_text' => $this->l('Pay by Check'),
+			'logo' => Media::getMediaPath(dirname(__FILE__).'/cheque.jpg'),
+			'action' => $this->context->link->getModuleLink($this->name, 'validation', array(), true)
+		);
+
+		return $payment_options;
+	}
+
+	public function hookPaymentReturn($params)
+	{
+		if (!$this->active)
+			return;
+
+		$state = $params['objOrder']->getCurrentState();
+		if (in_array($state, array(Configuration::get('PS_OS_CHEQUE'), Configuration::get('PS_OS_OUTOFSTOCK'), Configuration::get('PS_OS_OUTOFSTOCK_UNPAID'))))
+		{
+			$this->smarty->assign(array(
+				'total_to_pay' => Tools::displayPrice($params['total_to_pay'], $params['currencyObj'], false),
+				'chequeName' => $this->chequeName,
+				'chequeAddress' => Tools::nl2br($this->address),
+				'status' => 'ok',
+				'id_order' => $params['objOrder']->id
+			));
+			if (isset($params['objOrder']->reference) && !empty($params['objOrder']->reference))
+				$this->smarty->assign('reference', $params['objOrder']->reference);
+		}
+		else
+			$this->smarty->assign('status', 'failed');
+		return $this->display(__FILE__, 'payment_return.tpl');
+	}
+
+	public function checkCurrency($cart)
+	{
+		$currency_order = new Currency((int)($cart->id_currency));
+		$currencies_module = $this->getCurrency((int)$cart->id_currency);
+
+		if (is_array($currencies_module))
+			foreach ($currencies_module as $currency_module)
+				if ($currency_order->id == $currency_module['id_currency'])
+					return true;
+		return false;
+	}
+
+	public function renderForm()
+	{
+		$fields_form = array(
+			'form' => array(
+				'legend' => array(
+					'title' => $this->l('Contact details'),
+					'icon' => 'icon-envelope'
+				),
+				'input' => array(
+					array(
+						'type' => 'text',
+						'label' => $this->l('Pay to the order of (name)'),
+						'name' => 'CHEQUE_NAME',
+						'required' => true
+					),
+					array(
+						'type' => 'textarea',
+						'label' => $this->l('Address'),
+						'desc' => $this->l('Address where the check should be sent to.'),
+						'name' => 'CHEQUE_ADDRESS',
+						'required' => true
+					),
+				),
+				'submit' => array(
+					'title' => $this->l('Save'),
+				)
+			),
+		);
+
+		$helper = new HelperForm();
+		$helper->show_toolbar = false;
+		$helper->table = $this->table;
+		$lang = new Language((int)Configuration::get('PS_LANG_DEFAULT'));
+		$helper->default_form_language = $lang->id;
+		$helper->allow_employee_form_lang = Configuration::get('PS_BO_ALLOW_EMPLOYEE_FORM_LANG') ? Configuration::get('PS_BO_ALLOW_EMPLOYEE_FORM_LANG') : 0;
+		$this->fields_form = array();
+		$helper->id = (int)Tools::getValue('id_carrier');
+		$helper->identifier = $this->identifier;
+		$helper->submit_action = 'btnSubmit';
+		$helper->currentIndex = $this->context->link->getAdminLink('AdminModules', false).'&configure='.$this->name.'&tab_module='.$this->tab.'&module_name='.$this->name;
+		$helper->token = Tools::getAdminTokenLite('AdminModules');
+		$helper->tpl_vars = array(
+			'fields_value' => $this->getConfigFieldsValues(),
+			'languages' => $this->context->controller->getLanguages(),
+			'id_language' => $this->context->language->id
+		);
+
+		return $helper->generateForm(array($fields_form));
+	}
+
+	public function getConfigFieldsValues()
+	{
+		return array(
+			'CHEQUE_NAME' => Tools::getValue('CHEQUE_NAME', Configuration::get('CHEQUE_NAME')),
+			'CHEQUE_ADDRESS' => Tools::getValue('CHEQUE_ADDRESS', Configuration::get('CHEQUE_ADDRESS')),
+		);
+	}
+}
--- a/modules/cheque/config.xml
+++ b/modules/cheque/config.xml
@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<module>
+	<name>cheque</name>
+	<displayName><![CDATA[Payment by check]]></displayName>
+	<version><![CDATA[2.6.0]]></version>
+	<description><![CDATA[This module allows you to accept payments by check.]]></description>
+	<author><![CDATA[PrestaShop]]></author>
+	<tab><![CDATA[payments_gateways]]></tab>
+	<confirmUninstall>Are you sure you want to delete these details?</confirmUninstall>
+	<is_configurable>1</is_configurable>
+	<need_instance>1</need_instance>
+	<limited_countries></limited_countries>
+</module>
--- a/modules/cheque/config_fr.xml
+++ b/modules/cheque/config_fr.xml
@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<module>
+	<name>cheque</name>
+	<displayName><![CDATA[Ch&egrave;que]]></displayName>
+	<version><![CDATA[2.6.0]]></version>
+	<description><![CDATA[Ce module vous permet d&#039;accepter des paiements par ch&egrave;que.]]></description>
+	<author><![CDATA[PrestaShop]]></author>
+	<tab><![CDATA[payments_gateways]]></tab>
+	<confirmUninstall><![CDATA[Êtes-vous sûr de vouloir supprimer vos paramètres ?]]></confirmUninstall>
+	<is_configurable>1</is_configurable>
+	<need_instance>1</need_instance>
+	<limited_countries></limited_countries>
+</module>
--- a/modules/cheque/controllers/front/index.php
+++ b/modules/cheque/controllers/front/index.php
@ -0,0 +1,35 @@
+<?php
+/*
+* 2007-2015 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-2015 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+				    	
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+						
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+						
+header("Location: ../");
+exit;
--- a/modules/cheque/controllers/front/payment.php
+++ b/modules/cheque/controllers/front/payment.php
@ -0,0 +1,61 @@
+<?php
+/*
+* 2007-2015 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-2015 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+
+/**
+ * @since 1.5.0
+ */
+class ChequePaymentModuleFrontController extends ModuleFrontController
+{
+	public $ssl = true;
+	public $display_column_left = false;
+
+	/**
+	 * @see FrontController::initContent()
+	 */
+	public function initContent()
+	{
+		parent::initContent();
+
+		$cart = $this->context->cart;
+		if (!$this->module->checkCurrency($cart))
+			Tools::redirect('index.php?controller=order');
+
+		$this->context->smarty->assign(array(
+			'nbProducts' => $cart->nbProducts(),
+			'cust_currency' => $cart->id_currency,
+			'currencies' => $this->module->getCurrency((int)$cart->id_currency),
+			'total' => $cart->getOrderTotal(true, Cart::BOTH),
+			'isoCode' => $this->context->language->iso_code,
+			'chequeName' => $this->module->chequeName,
+			'chequeAddress' => Tools::nl2br($this->module->address),
+			'this_path' => $this->module->getPathUri(),
+			'this_path_cheque' => $this->module->getPathUri(),
+			'this_path_ssl' => Tools::getShopDomainSsl(true, true).__PS_BASE_URI__.'modules/'.$this->module->name.'/'
+		));
+
+		$this->setTemplate('payment_execution.tpl');
+	}
+}
--- a/modules/cheque/controllers/front/validation.php
+++ b/modules/cheque/controllers/front/validation.php
@ -0,0 +1,67 @@
+<?php
+/*
+* 2007-2015 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-2015 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+
+/**
+ * @since 1.5.0
+ */
+class ChequeValidationModuleFrontController extends ModuleFrontController
+{
+	public function postProcess()
+	{
+		$cart = $this->context->cart;
+
+		if ($cart->id_customer == 0 || $cart->id_address_delivery == 0 || $cart->id_address_invoice == 0 || !$this->module->active)
+			Tools::redirect('index.php?controller=order&step=1');
+
+		// Check that this payment option is still available in case the customer changed his address just before the end of the checkout process
+		$authorized = false;
+		foreach (Module::getPaymentModules() as $module)
+			if ($module['name'] == 'cheque')
+			{
+				$authorized = true;
+				break;
+			}
+
+		if (!$authorized)
+			die($this->module->l('This payment method is not available.', 'validation'));
+
+		$customer = new Customer($cart->id_customer);
+
+		if (!Validate::isLoadedObject($customer))
+			Tools::redirect('index.php?controller=order&step=1');
+
+		$currency = $this->context->currency;
+		$total = (float)$cart->getOrderTotal(true, Cart::BOTH);
+
+		$mailVars =	array(
+			'{cheque_name}' => Configuration::get('CHEQUE_NAME'),
+			'{cheque_address}' => Configuration::get('CHEQUE_ADDRESS'),
+			'{cheque_address_html}' => str_replace("\n", '<br />', Configuration::get('CHEQUE_ADDRESS')));
+
+		$this->module->validateOrder((int)$cart->id, Configuration::get('PS_OS_CHEQUE'), $total, $this->module->displayName, NULL, $mailVars, (int)$currency->id, false, $customer->secure_key);
+		Tools::redirect('index.php?controller=order-confirmation&id_cart='.(int)$cart->id.'&id_module='.(int)$this->module->id.'&id_order='.$this->module->currentOrder.'&key='.$customer->secure_key);
+	}
+}
--- a/Show More
+++ b/Show More
				`@ -1 +0,0 @@`
				`Subproject commit 95f85ceb5bd67f9c7f358930417dcd2c751dbe9a`
				`@ -1 +0,0 @@`
				`Subproject commit 6816b775ad338a693f153e34d0d736203c60cb5a`
				`@ -1 +0,0 @@`
				`Subproject commit a4bc8edccd9590ca2c7376a70c2300d369c28fd4`
				`@ -1 +0,0 @@`
				`Subproject commit d3366432f78ff6dc563860dd42d3c3bb4c06f4ee`
				`@ -1 +0,0 @@`
				`Subproject commit 5ed07346c5d45f765563f5310a81a2f1873dd1aa`