// CHANGELOG

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13296 b9a71923-0436-4b27-9f14-aed3839534dd

address.php

@@ -25,11 +25,14 @@
 *  International Registered Trademark & Property of PrestaShop SA
 */
 
+/**
+ * This file will be removed in 1.6
+ * You have to use index.php?controller=page_name instead of this page
+ *
+ * @deprecated 1.5.0
+ */
+
 require(dirname(__FILE__).'/config/config.inc.php');
 Tools::displayFileAsDeprecated();
 
-// init front controller in order to use Tools::redirect
-$controller = new FrontController();
-$controller->init();
-
-Tools::redirect('index.php?controller=address'.(($_SERVER['QUERY_STRING']) ? '&'.$_SERVER['QUERY_STRING'] : ''));
+Tools::redirect('index.php?controller=address'.($_REQUEST ? '&'.http_build_query($_REQUEST) : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');

addresses.php

@@ -25,11 +25,14 @@
 *  International Registered Trademark & Property of PrestaShop SA
 */
 
+/**
+ * This file will be removed in 1.6
+ * You have to use index.php?controller=page_name instead of this page
+ *
+ * @deprecated 1.5.0
+ */
+
 require(dirname(__FILE__).'/config/config.inc.php');
 Tools::displayFileAsDeprecated();
 
-// init front controller in order to use Tools::redirect
-$controller = new FrontController();
-$controller->init();
-
-Tools::redirect('index.php?controller=addresses'.(($_SERVER['QUERY_STRING']) ? '&'.$_SERVER['QUERY_STRING'] : ''));
+Tools::redirect('index.php?controller=addresses'.($_REQUEST ? '&'.http_build_query($_REQUEST) : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');

admin-dev/ajax-tab.php

@@ -38,6 +38,5 @@ if (!isset($_REQUEST['controller']) && isset($_REQUEST['tab']))
 	$_REQUEST['controller'] = strtolower($_REQUEST['tab']);
 // Retrocompatibility with 1.4
 $_REQUEST['ajaxMode'] = $_POST['ajaxMode'] = $_GET['ajaxMode'] = $_REQUEST['ajax'] = $_POST['ajax'] = $_GET['ajax'] = 1;
-	
-Dispatcher::getInstance()->setControllerDirectories(array(_PS_ADMIN_DIR_.'/tabs/', _PS_ADMIN_CONTROLLER_DIR_));
+
 Dispatcher::getInstance()->dispatch();

admin-dev/ajax.php

@@ -71,124 +71,14 @@ function displayJavascriptAlert($s)
 	echo '<script type="text/javascript">alert(\''.addslashes($s).'\');</script>';
 }
 
-if (Tools::isSubmit('ajaxProductManufacturers'))
-{
-	AdminTab::$currentIndex = 'index.php?tab=AdminCatalog';
-	$manufacturers = Manufacturer::getManufacturers();
-	if ($manufacturers)
-	{
-		$jsonArray = array();
-		foreach ($manufacturers AS $manufacturer)
-			$jsonArray[] = '{"optionValue": "'.$manufacturer['id_manufacturer'].'", "optionDisplay": "'.htmlspecialchars(trim($manufacturer['name'])).'"}';
-		die('['.implode(',', $jsonArray).']');
-	}
-}
-
-
 if (Tools::isSubmit('ajaxReferrers'))
 {
 	require(_PS_CONTROLLER_DIR_.'admin/AdminReferrersController.php');
 }
 
-if (Tools::isSubmit('ajaxProductSuppliers'))
-{
-	AdminTab::$currentIndex = 'index.php?tab=AdminCatalog';
-	$suppliers = Supplier::getSuppliers();
-	if ($suppliers)
-	{
-		$jsonArray = array();
-		foreach ($suppliers AS $supplier)
-			$jsonArray[] = '{"optionValue": "'.$supplier['id_supplier'].'", "optionDisplay": "'.htmlspecialchars(trim($supplier['name'])).'"}';
-		die('['.implode(',', $jsonArray).']');
-	}
-}
-
-if (Tools::isSubmit('ajaxProductAccessories'))
-{
-	AdminTab::$currentIndex = 'index.php?tab=AdminCatalog';
-	$jsonArray = array();
-
-	$products = Db::getInstance()->executeS('
-	SELECT p.`id_product`, pl.`name`
-	FROM `'._DB_PREFIX_.'product` p
-	NATURAL LEFT JOIN `'._DB_PREFIX_.'product_lang` pl
-	WHERE pl.`id_lang` = '.(int)(Tools::getValue('id_lang')).'
-	'.Context::getContext()->shop->addSqlRestrictionOnLang('pl').'
-	AND p.`id_product` != '.(int)(Tools::getValue('id_product')).'
-	AND p.`id_product` NOT IN (
-		SELECT a.`id_product_2`
-		FROM `'._DB_PREFIX_.'accessory` a
-		WHERE a.`id_product_1` = '.(int)(Tools::getValue('id_product')).')
-	ORDER BY pl.`name`');
-
-	foreach ($products AS $accessory)
-		$jsonArray[] = '{"value: "'.(int)($accessory['id_product']).'-'.addslashes($accessory['name']).'", "text":"'.(int)($accessory['id_product']).' - '.addslashes($accessory['name']).'"}';
-	die('['.implode(',', $jsonArray).']');
-}
-
-if (Tools::isSubmit('ajaxDiscountCustomers'))
-{
-	AdminTab::$currentIndex = 'index.php?tab=AdminDiscounts';
-	$jsonArray = array();
-	$filter = Tools::getValue('filter');
-
-	if (Validate::isBool_Id($filter))
-		$filterArray = explode('_', $filter);
-
-	$customers = Db::getInstance()->executeS('
-	SELECT `id_customer`, `email`, CONCAT(`lastname`, \' \', `firstname`) as name
-	FROM `'._DB_PREFIX_.'customer`
-	WHERE `deleted` = 0 AND is_guest = 0
-	AND '.(Validate::isUnsignedInt($filter) ? '`id_customer` = '.(int)($filter) : '(`email` LIKE "%'.pSQL($filter).'%"
-	'.((Validate::isBool_Id($filter) AND $filterArray[0] == 0) ? 'OR `id_customer` = '.(int)($filterArray[1]) : '').'
-	'.(Validate::isUnsignedInt($filter) ? '`id_customer` = '.(int)($filter) : '').'
-	OR CONCAT(`firstname`, \' \', `lastname`) LIKE "%'.pSQL($filter).'%"
-	OR CONCAT(`lastname`, \' \', `firstname`) LIKE "%'.pSQL($filter).'%")').'
-	ORDER BY CONCAT(`lastname`, \' \', `firstname`) ASC
-	LIMIT 50');
-
-	$groups = Db::getInstance()->executeS('
-	SELECT g.`id_group`, gl.`name`
-	FROM `'._DB_PREFIX_.'group` g
-	LEFT JOIN `'._DB_PREFIX_.'group_lang` AS gl ON (g.`id_group` = gl.`id_group` AND gl.`id_lang` = '.(int)($context->language->id).')
-	WHERE '.(Validate::isUnsignedInt($filter) ? 'g.`id_group` = '.(int)($filter) : 'gl.`name` LIKE "%'.pSQL($filter).'%"
-	'.((Validate::isBool_Id($filter) AND $filterArray[0] == 1) ? 'OR g.`id_group` = '.(int)($filterArray[1]) : '')).'
-	ORDER BY gl.`name` ASC
-	LIMIT 50');
-
-	$json = '{"customers" : ';
-	foreach ($customers AS $customer)
-		$jsonArray[] = '{"value":"0_'.(int)($customer['id_customer']).'", "text":"'.addslashes($customer['name']).' ('.addslashes($customer['email']).')"}';
-	$json .= '['.implode(',', $jsonArray).'],
-		"groups" : ';
-	$jsonArray = array();
-	foreach ($groups AS $group)
-		$jsonArray[] = '{"value":"1_'.(int)($group['id_group']).'", "text":"'.addslashes($group['name']).'"}';
-	$json .= '['.implode(',', $jsonArray).']}';
-	die($json);
-}
-
 if (Tools::getValue('page') == 'prestastore' AND @fsockopen('addons.prestashop.com', 80, $errno, $errst, 3))
 	readfile('http://addons.prestashop.com/adminmodules.php?lang='.$context->language->iso_code);
 
-if ($step = (int)(Tools::getValue('ajaxProductTab')))
-{
-	require_once(dirname(__FILE__).'/tabs/AdminCatalog.php');
-	$catalog = new AdminCatalog();
-	$admin = new AdminProducts();
-
-	$languages = Language::getLanguages(false);
-	$defaultLanguage = (int)(Configuration::get('PS_LANG_DEFAULT'));
-	$product = new Product((int)(Tools::getValue('id_product')));
-	if (!Validate::isLoadedObject($product))
-		die (Tools::displayError('Product cannot be loaded'));
-
-	$switchArray = array(3 => 'displayFormPrices', 4 => 'displayFormAttributes', 5 => 'displayFormFeatures', 6 => 'displayFormCustomization', 7 => 'displayFormAttachments');
-	AdminTab::$currentIndex = 'index.php?tab=AdminCatalog';
-	if (key_exists($step, $switchArray))
-		$admin->{$switchArray[$step]}($product, $languages, $defaultLanguage);
-}
-
 if (Tools::isSubmit('getAvailableFields') AND Tools::isSubmit('entity'))
 {
 	$jsonArray = array();
@@ -240,7 +130,7 @@ if (Tools::isSubmit('ajaxCategoriesPositions'))
 	{
 		if (isset($position) && $category->updatePosition($way, $position))
 		{
-			Hook::exec('categoryUpdate');
+			Hook::exec('actionCategoryUpdate');
 			die(true);
 		}
 		else
@@ -543,18 +433,6 @@ if (Tools::isSubmit('toggleScreencast'))
 	}
 }
 
-if (Tools::isSubmit('helpAccess'))
-{
-	$item = Tools::getValue('item');
-	$isoUser = Tools::getValue('isoUser');
-	$country = Tools::getValue('country');
-	$version = Tools::getValue('version');
-
-	if (isset($item) AND isset($isoUser) AND isset($country))
-		die(HelpAccess::displayHelp($item, $isoUser,  $country, $version));
-	die('{nohelp}');
-}
-
 if (Tools::isSubmit('getHookableList'))
 {
 	/* PrestaShop demo mode */
@@ -654,8 +532,8 @@ if (Tools::isSubmit('saveHook'))
 			$i++;
 		}
 		$value = rtrim($value, ',');
-		$res &= Db::getInstance()->execute('INSERT INTO  `'._DB_PREFIX_.'hook_module` 
-			(id_module, id_shop, id_hook, position) 
+		$res &= Db::getInstance()->execute('INSERT INTO  `'._DB_PREFIX_.'hook_module`
+			(id_module, id_shop, id_hook, position)
 			VALUES '.$value);
 
 	}
@@ -739,9 +617,9 @@ if (Tools::isSubmit('getAdminHomeElement'))
 	die(Tools::jsonEncode($result));
 }
 
-if (Tools::isSubmit('getChildrenCategories') && Tools::getValue('id_category_parent'))
+if (Tools::isSubmit('getChildrenCategories') && Tools::isSubmit('id_category_parent'))
 {
-	$children_categories = Category::getChildrenWithNbSelectedSubCat(Tools::getValue('id_category_parent'), Tools::getValue('selectedCat'), Context::getContext()->language->id);
+	$children_categories = Category::getChildrenWithNbSelectedSubCat(Tools::getValue('id_category_parent'), Tools::getValue('selectedCat'), Context::getContext()->language->id, null, Tools::getValue('use_shop_context'));
 	die(Tools::jsonEncode($children_categories));
 }
 
@@ -1014,3 +892,4 @@ if (Tools::isSubmit('getZones'))
 	$array = array('hasError' => false, 'errors' => '', 'data' => $html);
 	die(Tools::jsonEncode($html));
 }
+

admin-dev/ajax_category_list.php

@@ -1,83 +0,0 @@
-<?php
-/*
-* 2007-2011 PrestaShop
-*
-* NOTICE OF LICENSE
-*
-* This source file is subject to the Open Software License (OSL 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/osl-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-2011 PrestaShop SA
-*  @version  Release: $Revision: 6844 $
-*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
-*  International Registered Trademark & Property of PrestaShop SA
-*/
-
-define('_PS_ADMIN_DIR_', getcwd());
-include_once('../config/config.inc.php');
-include_once('tabs/AdminCatalog.php');
-include_once('tabs/AdminProducts.php');
-include_once('init.php');
-
-if (Tools::getValue('token') != Tools::getAdminTokenLite('AdminCatalog'))
-	die(1);
-
-$catalog = new AdminCatalog();
-$adminProducts = new AdminProducts();
-
-echo '			<tr>
-					<td class="col-left"><label for="id_category_default" class="t">'.$adminProducts->getL('Default category:').'</label></td>
-					<td>
-						<select id="id_category_default" name="id_category_default" onchange="checkDefaultCategory(this.value);">';
-	$categories = Category::getCategories(Context::getContext()->language->id, false);
-	Category::recurseCategory($categories, $categories[0][1], 1, (int)(Tools::getValue('id_category_default')));
-	echo '			</select>
-					</td>
-				</tr>
-				<tr>
-					<td class="col-left">'.$adminProducts->getL('Catalog:').'</td>
-					<td>
-						<div style="overflow: auto; min-height: 300px; padding-top: 0.6em;" id="categoryList">
-							<script type="text/javascript">
-							$(document).ready(function() {
-								$(\'div#categoryList input.categoryBox\').click(function (){
-									if ($(this).is(\':not(:checked)\') && $(\'div#categoryList input.id_category_default\').val() == $(this).val())
-										jAlert(\''.utf8_encode(html_entity_decode($adminProducts->getL('Consider changing the default category.'))).'\');
-								});
-							});
-							</script>
-							<table cellspacing="0" cellpadding="0" class="table">
-								<tr>
-									<th><input type="checkbox" name="checkme" class="noborder" onclick="checkDelBoxes(this.form, \'categoryBox[]\', this.checked)" /></th>
-									<th>'.$adminProducts->getL('ID').'</th>
-									<th style="width: 600px">'.$adminProducts->getL('Name').'</th>
-								</tr>';
-		$done = array();
-		$index = array();
-
-		$categoryBox = Tools::getValue('categoryBox');
-		if ($categoryBox != '')
-		{
-			$categoryBox = @unserialize($categoryBox);
-			foreach ($categoryBox AS $k => $row)
-				$index[] = $row;
-		}
-		elseif ((int)Tools::getValue('id_product'))
-			$index = Product::getProductCategories((int)Tools::getValue('id_product'));
-		$adminProducts->recurseCategoryForInclude((int)(Tools::getValue('id_product')), $index, $categories, $categories[0][1], 1, (int)(Tools::getValue('id_category_default')));
-		echo '				</table>
-							<p style="padding:0px; margin:0px 0px 10px 0px;">'.$adminProducts->getL('Mark all checkbox(es) of categories in which product is to appear').'<sup> *</sup></p>
-						</div>
-				</tr>';

admin-dev/ajax_send_mail_test.php

@@ -30,18 +30,19 @@ include_once(dirname(__FILE__).'/../config/config.inc.php');
 /* Getting cookie or logout */
 require_once(dirname(__FILE__).'/init.php');
 
-$smtpChecked = (trim($_GET['mailMethod']) ==  'smtp');
-$smtpServer = $_GET['smtpSrv'];
-$content = $_GET['testMsg'];
-$subject = $_GET['testSubject'];
+$smtpChecked = (trim($_POST['mailMethod']) ==  'smtp');
+$smtpServer = $_POST['smtpSrv'];
+$content = urldecode($_POST['testMsg']);
+$subject = urldecode($_POST['testSubject']);
 $type = 'text/html';
-$to =  $_GET['testEmail'];
+$to =  $_POST['testEmail'];
 $from = Configuration::get('PS_SHOP_EMAIL');
-$smtpLogin = $_GET['smtpLogin'];
-$smtpPassword = $_GET['smtpPassword'];
-$smtpPort = $_GET['smtpPort'];
-$smtpEncryption = $_GET['smtpEnc'];
+$smtpLogin = $_POST['smtpLogin'];
+$smtpPassword = (!empty($_POST['smtpPassword'])) ? urldecode($_POST['smtpPassword']) : Configuration::get('PS_MAIL_PASSWD');
+$smtpPort = $_POST['smtpPort'];
+$smtpEncryption = $_POST['smtpEnc'];
 
 $result = Mail::sendMailTest(Tools::htmlentitiesUTF8($smtpChecked), Tools::htmlentitiesUTF8($smtpServer), Tools::htmlentitiesUTF8($content), Tools::htmlentitiesUTF8($subject), Tools::htmlentitiesUTF8($type), Tools::htmlentitiesUTF8($to), Tools::htmlentitiesUTF8($from), Tools::htmlentitiesUTF8($smtpLogin), Tools::htmlentitiesUTF8($smtpPassword), Tools::htmlentitiesUTF8($smtpPort), Tools::htmlentitiesUTF8($smtpEncryption));
 die($result === true ? 'ok' : $result);
 
+

admin-dev/footer.inc.php

@@ -27,7 +27,7 @@
 
 echo '			</div>
 			</div>
-			'.Hook::exec('backOfficeFooter').'
+			'.Hook::exec('displayBackOfficeFooter').'
 			<div id="footer">
 				<div style="float:left;margin-left:10px;padding-top:6px">
 					<a href="http://www.prestashop.com/" target="_blank" style="font-weight:700;color:#666666">PrestaShop&trade; '._PS_VERSION_.'</a><br />

admin-dev/functions.php

@@ -30,7 +30,7 @@ require_once(dirname(__FILE__).'/../images.inc.php');
 function bindDatepicker($id, $time)
 {
 	if ($time)
-	echo '
+		echo '
 		var dateObj = new Date();
 		var hours = dateObj.getHours();
 		var mins = dateObj.getMinutes();
@@ -42,7 +42,7 @@ function bindDatepicker($id, $time)
 
 	echo '
 	$(function() {
-		$("#'.$id.'").datepicker({
+		$("#'.Tools::htmlentitiesUTF8($id).'").datepicker({
 			prevText:"",
 			nextText:"",
 			dateFormat:"yy-mm-dd"'.($time ? '+time' : '').'});
@@ -62,7 +62,7 @@ function includeDatepicker($id, $time = false)
 	echo '<script type="text/javascript" src="'.__PS_BASE_URI__.'js/jquery/jquery-ui-1.8.10.custom.min.js"></script>';
 	$iso = Db::getInstance()->getValue('SELECT iso_code FROM '._DB_PREFIX_.'lang WHERE `id_lang` = '.(int)Context::getContext()->language->id);
 	if ($iso != 'en')
-		echo '<script type="text/javascript" src="'.__PS_BASE_URI__.'js/jquery/ui/i18n/jquery.ui.datepicker-'.$iso.'.js"></script>';
+		echo '<script type="text/javascript" src="'.__PS_BASE_URI__.'js/jquery/ui/i18n/jquery.ui.datepicker-'.Tools::htmlentitiesUTF8($iso).'.js"></script>';
 	echo '<script type="text/javascript">';
 		if (is_array($id))
 			foreach ($id as $id2)
@@ -93,7 +93,6 @@ function	rewriteSettingsFile($baseUrls = NULL, $theme = NULL, $arrayDB = NULL)
 	$defines['_DB_USER_'] = (($arrayDB AND isset($arrayDB['_DB_USER_'])) ? $arrayDB['_DB_USER_'] : _DB_USER_);
 	$defines['_DB_PREFIX_'] = (($arrayDB AND isset($arrayDB['_DB_PREFIX_'])) ? $arrayDB['_DB_PREFIX_'] : _DB_PREFIX_);
 	$defines['_DB_PASSWD_'] = (($arrayDB AND isset($arrayDB['_DB_PASSWD_'])) ? $arrayDB['_DB_PASSWD_'] : _DB_PASSWD_);
-	$defines['_DB_TYPE_'] = (($arrayDB AND isset($arrayDB['_DB_TYPE_'])) ? $arrayDB['_DB_TYPE_'] : _DB_TYPE_);
 	$defines['_COOKIE_KEY_'] = addslashes(_COOKIE_KEY_);
 	$defines['_COOKIE_IV_'] = addslashes(_COOKIE_IV_);
 	if (defined('_RIJNDAEL_KEY_'))
@@ -162,9 +161,9 @@ function getPath($urlBase, $id_category, $path = '', $highlight = '', $categoryT
 			$nCategories = (int)sizeof($categories);
 			foreach ($categories AS $category)
 			{
-				$edit = '<a href="'.$urlBase.'&id_category='.(int)$category['id_category'].'&'.(($category['id_category'] == 1 || $home) ? 'viewcategory' : 'addcategory').'&token='.Tools::getAdminToken('AdminCatalog'.(int)(Tab::getIdFromClassName('AdminCatalog')).(int)$context->employee->id).'" title="'.($category['id_category'] == 1 ? 'Home' : 'Modify').'"><img src="../img/admin/'.(($category['id_category'] == 1  || $home) ? 'home' : 'edit').'.gif" alt="" /></a> ';
+				$edit = '<a href="'.$urlBase.'&id_category='.(int)$category['id_category'].'&'.(($category['id_category'] == 1 || $home) ? 'viewcategory' : 'updatecategory').'&token='.Tools::getAdminToken('AdminCategories'.(int)(Tab::getIdFromClassName('AdminCategories')).(int)$context->employee->id).'" title="'.($category['id_category'] == 1 ? 'Home' : 'Modify').'"><img src="../img/admin/'.(($category['id_category'] == 1  || $home) ? 'home' : 'edit').'.gif" alt="" /></a> ';
 				$fullPath .= $edit.
-				($n < $nCategories ? '<a href="'.$urlBase.'&id_category='.(int)$category['id_category'].'&viewcategory&token='.Tools::getAdminToken('AdminCatalog'.(int)(Tab::getIdFromClassName('AdminCatalog')).(int)$context->employee->id).'" title="'.htmlentities($category['name'], ENT_NOQUOTES, 'UTF-8').'">' : '').
+				($n < $nCategories ? '<a href="'.$urlBase.'&id_category='.(int)$category['id_category'].'&viewcategory&token='.Tools::getAdminToken('AdminCategories'.(int)(Tab::getIdFromClassName('AdminCategories')).(int)$context->employee->id).'" title="'.htmlentities($category['name'], ENT_NOQUOTES, 'UTF-8').'">' : '').
 				(!empty($highlight) ? str_ireplace($highlight, '<span class="highlight">'.htmlentities($highlight, ENT_NOQUOTES, 'UTF-8').'</span>', $category['name']) : $category['name']).
 				($n < $nCategories ? '</a>' : '').
 				(($n++ != $nCategories OR !empty($path)) ? ' > ' : '');

admin-dev/header.inc.php

@@ -40,7 +40,7 @@ echo '
 		<link type="text/css" rel="stylesheet" href="'._PS_JS_DIR_.'jquery/datepicker/datepicker.css" />
 		<link type="text/css" rel="stylesheet" href="'._PS_CSS_DIR_.'admin.css" />
 		<link type="text/css" rel="stylesheet" href="'._PS_CSS_DIR_.'jquery.cluetip.css" />
-		<link type="text/css" rel="stylesheet" href="themes/'.Context::getContext()->employee->bo_theme.'/admin.css" />
+		<link type="text/css" rel="stylesheet" href="themes/'.Context::getContext()->employee->bo_theme.'/css/admin.css" />
 		<title>PrestaShop&trade; - '.translate('Administration panel').'</title>
 		<script type="text/javascript">
 			var helpboxes = '.Configuration::get('PS_HELPBOX').';
@@ -54,7 +54,7 @@ echo '
 		<script type="text/javascript" src="'._PS_JS_DIR_.'tools.js"></script>
 		<script type="text/javascript" src="'._PS_JS_DIR_.'ajax.js"></script>
 		<link rel="shortcut icon" href="'._PS_IMG_.'favicon.ico" />
-		'.Hook::exec('backOfficeHeader').'
+		'.Hook::exec('displayBackOfficeHeader').'
 		<!--[if IE]>
 		<link type="text/css" rel="stylesheet" href="'._PS_CSS_DIR_.'admin-ie.css" />
 		<![endif]-->
@@ -283,7 +283,7 @@ echo '			</select>
 			echo '<div id="header_shoplist">'.translate('Select your shop:').' '.generateShopList().'</div>';
 
 		echo '</div>';
-			echo Hook::exec('backOfficeTop');
+			echo Hook::exec('displayBackOfficeTop');
 			echo '<ul id="menu">';
 
 if (empty($tab))

admin-dev/index.php

@@ -38,7 +38,4 @@ if (!isset($_REQUEST['controller']) && isset($_REQUEST['tab']))
 	$_REQUEST['controller'] = strtolower($_REQUEST['tab']);
 
 // Prepare and trigger admin dispatcher
-Dispatcher::getInstance()->setDefaultController('AdminHome');
-Dispatcher::getInstance()->setControllerNotFound('AdminNotFound');
-Dispatcher::getInstance()->setControllerDirectories(array(_PS_ADMIN_DIR_.'/tabs/', _PS_ADMIN_CONTROLLER_DIR_));
 Dispatcher::getInstance()->dispatch();

admin-dev/init.php

@@ -31,69 +31,86 @@ $timerStart = microtime(true);
 //	$_GET['tab'] = $_GET['controller'];
 //	$_POST['tab'] = $_POST['controller'];
 //	$_REQUEST['tab'] = $_REQUEST['controller'];
-
-$context = Context::getContext();
-if (isset($_GET['logout']))
-	$context->employee->logout();
-
-if (!isset($context->employee) || !$context->employee->isLoggedBack())
-	Tools::redirectAdmin('index.php?controller=AdminLogin&redirect='.$_SERVER['REQUEST_URI']);
-
-// Set current index
-$currentIndex = $_SERVER['SCRIPT_NAME'].(($controller = Tools::getValue('controller')) ? '?controller='.$controller: '');
-
-if ($back = Tools::getValue('back'))
-	$currentIndex .= '&back='.urlencode($back);
-AdminTab::$currentIndex = $currentIndex;
-
-$iso = $context->language->iso_code;
-include(_PS_TRANSLATIONS_DIR_.$iso.'/errors.php');
-include(_PS_TRANSLATIONS_DIR_.$iso.'/fields.php');
-include(_PS_TRANSLATIONS_DIR_.$iso.'/admin.php');
-
-/* Server Params */
-$protocol_link = (Configuration::get('PS_SSL_ENABLED')) ? 'https://' : 'http://';
-$protocol_content = (isset($useSSL) AND $useSSL AND Configuration::get('PS_SSL_ENABLED')) ? 'https://' : 'http://';
-$link = new Link($protocol_link, $protocol_content);
-$context->link = $link;
-define('_PS_BASE_URL_', Tools::getShopDomain(true));
-define('_PS_BASE_URL_SSL_', Tools::getShopDomainSsl(true));
-
-$path = dirname(__FILE__).'/themes/';
-if (empty($context->employee->bo_theme) OR !file_exists($path.$context->employee->bo_theme.'/admin.css'))
+try
 {
-	if (file_exists($path.'oldschool/admin.css'))
-		$context->employee->bo_theme = 'oldschool';
-	elseif (file_exists($path.'origins/admin.css'))
-		$context->employee->bo_theme = 'origins';
-	else
-		foreach (scandir($path) as $theme)
-			if ($theme[0] != '.' AND file_exists($path.$theme.'/admin.css'))
-			{
-				$employee->bo_theme = $theme;
-				break;
-			}
-	$context->employee->update();
-}
+	$context = Context::getContext();
+	if (isset($_GET['logout']))
+		$context->employee->logout();
 
-// Change shop context ?
-if (Shop::isFeatureActive() && Tools::getValue('setShopContext') !== false)
+	if (!isset($context->employee) || !$context->employee->isLoggedBack())
+		Tools::redirectAdmin('index.php?controller=AdminLogin&redirect='.$_SERVER['REQUEST_URI']);
+
+	// Set current index
+	// @deprecated global will be removed in 1.6
+	global $currentIndex; // retrocompatibility;
+	$currentIndex = $_SERVER['SCRIPT_NAME'].(($controller = Tools::getValue('controller')) ? '?controller='.$controller: '');
+
+	if ($back = Tools::getValue('back'))
+		$currentIndex .= '&back='.urlencode($back);
+	AdminTab::$currentIndex = $currentIndex;
+
+	$iso = $context->language->iso_code;
+	include(_PS_TRANSLATIONS_DIR_.$iso.'/errors.php');
+	include(_PS_TRANSLATIONS_DIR_.$iso.'/fields.php');
+	include(_PS_TRANSLATIONS_DIR_.$iso.'/admin.php');
+
+	/* Server Params */
+	$protocol_link = (Configuration::get('PS_SSL_ENABLED')) ? 'https://' : 'http://';
+	$protocol_content = (isset($useSSL) AND $useSSL AND Configuration::get('PS_SSL_ENABLED')) ? 'https://' : 'http://';
+	$link = new Link($protocol_link, $protocol_content);
+	$context->link = $link;
+	define('_PS_BASE_URL_', Tools::getShopDomain(true));
+	define('_PS_BASE_URL_SSL_', Tools::getShopDomainSsl(true));
+
+	$path = dirname(__FILE__).'/themes/';
+	// if the current employee theme is not valid (check layout.tpl presence), 
+	// reset to default theme
+	if (empty($context->employee->bo_theme) ||
+		!file_exists($path.$context->employee->bo_theme.'/template/layout.tpl'))
+	{
+		// default admin theme is "default".
+		$context->employee->bo_theme = '';
+		if (file_exists($path.'default/template/layout.tpl'))
+			$context->employee->bo_theme = 'default';
+		else
+		{
+			// if default theme doesn't exists, try to find one, otherwise throw exception
+			foreach (scandir($path) as $theme)
+				if ($theme[0] != '.' && file_exists($path.$theme.'/template/layout.tpl'))
+				{
+					$context->employee->bo_theme = $theme;
+					break;
+				}
+			// if no theme is found, admin can't work.
+			if (empty($context->employee->bo_theme))
+				throw new PrestaShopException('Unable to load theme for employee, and no valid theme found');
+		}
+		$context->employee->update();
+	}
+
+	// Change shop context ?
+	if (Shop::isFeatureActive() && Tools::getValue('setShopContext') !== false)
+	{
+		$context->cookie->shopContext = Tools::getValue('setShopContext');
+		$url = parse_url($_SERVER['REQUEST_URI']);
+		$query = (isset($url['query'])) ? $url['query'] : '';
+		parse_str($query, $parseQuery);
+		unset($parseQuery['setShopContext']);
+		Tools::redirectAdmin($url['path'] . '?' . http_build_query($parseQuery));
+	}
+
+	$context->currency = new Currency(Configuration::get('PS_CURRENCY_DEFAULT'));
+
+	$shopID = '';
+	if ($context->cookie->shopContext)
+	{
+		$split = explode('-', $context->cookie->shopContext);
+		if (count($split) == 2 && $split[0] == 's')
+			$shopID = (int)$split[1];
+	}
+	$context->shop = new Shop($shopID);
+}
+catch(PrestaShopException $e)
 {
-	$context->cookie->shopContext = Tools::getValue('setShopContext');
-	$url = parse_url($_SERVER['REQUEST_URI']);
-	$query = (isset($url['query'])) ? $url['query'] : '';
-	parse_str($query, $parseQuery);
-	unset($parseQuery['setShopContext']);
-	Tools::redirectAdmin($url['path'] . '?' . http_build_query($parseQuery));
+	$e->displayMessage();
 }
-
-$context->currency = new Currency(Configuration::get('PS_CURRENCY_DEFAULT'));
-
-$shopID = '';
-if ($context->cookie->shopContext)
-{
-	$split = explode('-', $context->cookie->shopContext);
-	if (count($split) == 2 && $split[0] == 's')
-		$shopID = (int)$split[1];
-}
-$context->shop = new Shop($shopID);

admin-dev/pdf.php

@@ -32,7 +32,7 @@ include(_PS_ADMIN_DIR_.'/../config/config.inc.php');
 if (!Context::getContext()->employee->id)
 	Tools::redirectAdmin('index.php?controller=AdminLogin');
 
-$functionArray = array(
+$function_array = array(
 	'pdf' => 'generateInvoicePDF',
 	'id_order_slip' => 'generateOrderSlipPDF',
 	'id_delivery' => 'generateDeliverySlipPDF',
@@ -44,7 +44,7 @@ $functionArray = array(
 	'id_supply_order' => 'generateSupplyOrderFormPDF'
 );
 
-foreach ($functionArray as $var => $function)
+foreach ($function_array as $var => $function)
 	if (isset($_GET[$var]))
 	{
 		call_user_func($function);
@@ -53,16 +53,16 @@ foreach ($functionArray as $var => $function)
 
 function generateSupplyOrderFormPDF()
 {
-	if (!isset($_GET['id_supply_order']))
+	if (!Tools::isSubmit('id_supply_order'))
 		die (Tools::displayError('Missing supply order ID'));
 
-	$id_supply_order = (int)$_GET['id_supply_order'];
+	$id_supply_order = (int)Tools::getValue('id_supply_order');
 	$supply_order = new SupplyOrder($id_supply_order);
 
 	if (!Validate::isLoadedObject($supply_order))
 		die(Tools::displayError('Cannot find this supply order in the database'));
 
-    generatePDF($supply_order, PDF::TEMPLATE_SUPPLY_ORDER_FORM);
+	generatePDF($supply_order, PDF::TEMPLATE_SUPPLY_ORDER_FORM);
 }
 
 function generateInvoicePDF()
@@ -78,7 +78,7 @@ function generateInvoicePDF()
 
 function generateInvoicePDFByIdOrder($id_order)
 {
-	$order = new Order($id_order);
+	$order = new Order((int)$id_order);
 	if (!Validate::isLoadedObject($order))
 		die(Tools::displayError('Cannot find order in database'));
 
@@ -89,7 +89,7 @@ function generateInvoicePDFByIdOrder($id_order)
 
 function generateInvoicePDFByIdOrderInvoice($id_order_invoice)
 {
-	$order_invoice = new OrderInvoice($id_order_invoice);
+	$order_invoice = new OrderInvoice((int)$id_order_invoice);
 	if (!Validate::isLoadedObject($order_invoice))
 		die(Tools::displayError('Cannot find order invoice in database'));
 
@@ -99,26 +99,25 @@ function generateInvoicePDFByIdOrderInvoice($id_order_invoice)
 
 function generateOrderSlipPDF()
 {
-	$orderSlip = new OrderSlip((int)($_GET['id_order_slip']));
-	$order = new Order((int)($orderSlip->id_order));
+	$orderSlip = new OrderSlip((int)Tools::getValue('id_order_slip'));
+	$order = new Order((int)$orderSlip->id_order);
 	if (!Validate::isLoadedObject($order))
 		die(Tools::displayError('Cannot find order in database'));
 	$order->products = OrderSlip::getOrdersSlipProducts($orderSlip->id, $order);
-	$tmp = NULL;
 
-   generatePDF($orderSlip, PDF::TEMPLATE_ORDER_SLIP);
+	generatePDF($orderSlip, PDF::TEMPLATE_ORDER_SLIP);
 }
 
 function generateDeliverySlipPDF()
 {
 	if (Tools::isSubmit('id_order'))
-		generateDeliverySlipPDFByIdOrder(Tools::getValue('id_order'));
+		generateDeliverySlipPDFByIdOrder((int)Tools::getValue('id_order'));
 	elseif (Tools::isSubmit('id_order_invoice'))
-		generateDeliverySlipPDFByIdOrderInvoice(Tools::getValue('id_order_invoice'));
+		generateDeliverySlipPDFByIdOrderInvoice((int)Tools::getValue('id_order_invoice'));
 	elseif (Tools::isSubmit('id_delivery'))
 	{
-		$order = Order::getByDelivery(Tools::getValue('id_delivery'));
-		generateDeliverySlipPDFByIdOrder($order->id);
+		$order = Order::getByDelivery((int)Tools::getValue('id_delivery'));
+		generateDeliverySlipPDFByIdOrder((int)$order->id);
 	}
 	else
 		die (Tools::displayError('Missing order ID or invoice order ID'));
@@ -127,9 +126,9 @@ function generateDeliverySlipPDF()
 
 function generateDeliverySlipPDFByIdOrder($id_order)
 {
-	$order = new Order($id_order);
+	$order = new Order((int)$id_order);
 	if (!Validate::isLoadedObject($order))
-		throw new PrestashopException('Can\'t load Order object');
+		throw new PrestaShopException('Can\'t load Order object');
 
 	$order_invoice_collection = $order->getInvoicesCollection();
 	generatePDF($order_invoice_collection, PDF::TEMPLATE_DELIVERY_SLIP);
@@ -137,69 +136,61 @@ function generateDeliverySlipPDFByIdOrder($id_order)
 
 function generateDeliverySlipPDFByIdOrderInvoice($id_order_invoice)
 {
-	$order_invoice = new OrderInvoice($id_order_invoice);
+	$order_invoice = new OrderInvoice((int)$id_order_invoice);
 	if (!Validate::isLoadedObject($order_invoice))
-		throw new PrestashopException('Can\'t load Order Invoice object');
+		throw new PrestaShopException('Can\'t load Order Invoice object');
 
 	generatePDF($order_invoice, PDF::TEMPLATE_DELIVERY_SLIP);
 }
 
 function generateInvoicesPDF()
 {
-	$id_orders_list = OrderInvoice::getByDateInterval($_GET['date_from'], $_GET['date_to'], NULL, 'invoice');
+	$order_invoice_collection = OrderInvoice::getByDateInterval(Tools::getValue('date_from'), Tools::getValue('date_to'));
 
-	if (!is_array($id_orders_list))
-		die (Tools::displayError('No invoices found'));
+	if (!count($order_invoice_collection))
+		die(Tools::displayError('No invoices found'));
 
- 	 generateOrderInvoicesPDF($id_orders_list);
+	generatePDF($order_invoice_collection, PDF::TEMPLATE_INVOICE);
 }
 
 function generateInvoicesPDF2()
 {
-	$id_orders_list = array();
+	$order_invoice_collection = array();
 	foreach (explode('-', Tools::getValue('id_order_state')) as $id_order_state)
-		if (is_array($id_orders = Order::getOrderIdsByStatus((int)$id_order_state)))
-			$id_orders_list = array_merge($id_orders_list, $id_orders);
+		if (is_array($order_invoices = OrderInvoice::getByStatus((int)$id_order_state)))
+			$order_invoice_collection = array_merge($order_invoices, $order_invoice_collection);
 
- 	 generateOrderInvoicesPDF($id_orders_list);
-}
+	if (!count($order_invoice_collection))
+		die(Tools::displayError('No invoices found'));
 
-function generateOrderInvoicesPDF($id_orders_list)
-{
-    $orders_invoices = array();
-    foreach ($id_orders_list as $id_order)
-    {
-			$order = new Order((int)$id_order);
-			$orders_invoices = array_merge($orders_invoices, $order->getInvoicesCollection());
-	 }
-
-    generatePDF($orders_invoices, PDF::TEMPLATE_INVOICE);
+	generatePDF($order_invoice_collection, PDF::TEMPLATE_INVOICE);
 }
 
 function generateOrderSlipsPDF()
 {
-	$id_order_slips_list = OrderSlip::getSlipsIdByDate($_GET['date_from'], $_GET['date_to']);
+	$id_order_slips_list = OrderSlip::getSlipsIdByDate(Tools::getValue('date_from'), Tools::getValue('date_to'));
 	if (!count($id_order_slips_list))
 		die (Tools::displayError('No order slips found'));
 
-    $order_slips = array();
-    foreach ($id_order_slips_list as $id_order_slips)
-        $order_slips[] = new OrderSlip((int)$id_order_slips);
+	$order_slips = array();
+	foreach ($id_order_slips_list as $id_order_slips)
+		$order_slips[] = new OrderSlip((int)$id_order_slips);
 
-    generatePDF($order_slips, PDF::TEMPLATE_ORDER_SLIP);
+	generatePDF($order_slips, PDF::TEMPLATE_ORDER_SLIP);
 }
 
 function generateDeliverySlipsPDF()
 {
-	$slips = unserialize(urldecode($_GET['deliveryslips']));
-	if (is_array($slips))
-        generatePDF($slips, PDF::TEMPLATE_DELIVERY_SLIP);
-}
+	$order_invoice_collection = OrderInvoice::getByDeliveryDateInterval(Tools::getValue('date_from'), Tools::getValue('date_to'));
 
+	if (!count($order_invoice_collection))
+		die(Tools::displayError('No invoices found'));
+
+	generatePDF($order_invoice_collection, PDF::TEMPLATE_DELIVERY_SLIP);
+}
 
 function generatePDF($object, $template)
 {
-    global $smarty;
-    $pdf = new PDF($object, $template, $smarty);
-    $pdf->render();
+	$pdf = new PDF($object, $template, Context::getContext()->smarty);
+	$pdf->render();
 }

admin-dev/themes/default/css/admin.css

@@ -17,17 +17,18 @@ label {color:#585a69;text-shadow:0 1px 0#fff;}
 fieldset{background-color:#EBEDF4; border:1px solid #CCCED7; color:#585A69; font-size:1.1em;margin:0;padding:1em}
 .Bloc {background-color:#EBEDF4; border:1px solid #CCCED7;font-size:1.1em;margin:0;padding:1em}
 legend{background:#EBEDF4;border:1px solid #CCCED7;font-weight:700;margin:0;padding:.2em .5em;text-align:left}
-input[type="text"],input[type="password"],input[type="file"],textarea {border:1px solid #ccc;}
+input[type="text"],input[type="password"],input[type="file"],textarea {border:1px solid #ccc; background-color:#fff;}
 select { border:1px solid #ccc; font-size: 12px;}
-select[disabled="disabled"], input[disabled="disabled"],textarea[disabled="disabled"] {border: 1px solid #CCCCCC;color: #AAAAAA}
+select[disabled="disabled"], input[disabled="disabled"],textarea[disabled="disabled"], option[disabled="disabled"] {border: 1px solid #CCCCCC;color: #AAAAAA}
 .header_module{background:url('../img/header_module.png');padding-left: 0.5em;padding-top: 0.8em;height:20px;color: #812143;border:solid 1px #CCC;}
 .double_select select{width:300px;height:160px;}
 .double_select a{text-align:center;display:block;border:1px solid #aaa;text-decoration:none;background-color:#fafafa;color:#123456;margin:2px;padding:2px}
 
 /*BUTTON*/
-.button{background: -moz-linear-gradient(center top , #F9F9F9, #E3E3E3) repeat scroll 0 0 transparent;
+.button{
+	background: #e3e3e3 url('../img/bg-button-degrade.png') repeat-x scroll left top;
+	background: -moz-linear-gradient(center top , #F9F9F9, #E3E3E3) repeat scroll 0 0 transparent;
 	background: -webkit-gradient(linear, center top ,center bottom, from(#F9F9F9), to(#E3E3E3)) repeat scroll 0 0 transparent;
-
 	border-color: #CCCCCC #BBBBBB #A0A0A0;border-left: 1px solid #BBBBBB;border-radius: 3px 3px 3px 3px;border-right: 1px solid #BBBBBB;border-style: solid;border-width: 1px;color: #000000;margin: 0; outline: medium none;padding: 3px 8px;text-align: center;vertical-align: middle;white-space: nowrap; text-shadow:0 1px 0 #fff;}
 .button[disabled=disabled]{color:#8C8C8C}
 .button.bt-icon { display:inline-block; margin-bottom:7px;}
@@ -45,15 +46,17 @@ input.button[disabled=disabled]:hover{background-color:#FFF6D3}
 #header #header_infos{ position:relative; margin: 0; padding:0; height:84px; }
 #header #header_shopname {float: left; margin:15px 20px 0 20px;}
 #header #employee_links {float: right; display:block; margin:15px 15px 0 15px; }
-#header #employee_links a{ float:left; color:#fff; text-transform:capitalize;}
+#header #employee_links a{ float:left; color:#BABABA; text-transform:capitalize;}
+#header #employee_links a:hover {color:#fff;}
 #header #employee_links .employee_name { float:left; color:#fff;}
 #header .separator { background: transparent url('../img/separator.png') no-repeat scroll center top; display: block;float: left;height: 19px; width: 16px;}
 #header #header_infos #header_shopname span{display:block; font-size:24px; height:28px; overflow:hidden;margin:0; color:#fff; text-shadow: 0 1px 0 #000000;}
-#header #header_infos #header_logout { background: transparent url('../img/logout.png') no-repeat scroll left top; float:left; padding-left:20px; color:#fff !important; }
-#header #header_infos #header_logout a { color:#fff !important;}
-#header #header_infos #header_logout a span {color:#fff;}
-#header #header_infos #header_foaccess{ text-decoration:none; color:#fff;}
-#header #header_infos #header_foaccess a {color:#fff !important;}
+#header #header_infos a#header_logout { background: transparent url('../img/logout.png') no-repeat scroll left top; float:left; padding-left:20px; color:#bababa;}
+#header #header_infos a#header_logout:hover {color:#fff;}
+#header #header_infos #header_logout a span {color:#bababa}
+#header #header_infos #header_foaccess{ text-decoration:none; color:#bababa;}
+#header #header_infos #header_foaccess a {color:#bababa !important;}
+#header #header_infos a#header_foaccess:hover { color:#fff;}
 #header #header_search{ float:left; margin-top:15px; position:relative;  }
 #header #header_search #bo_query{ font: 13px Arial,sans-serif; float:left;background: none repeat scroll 0 0 #fff;  border:1px solid #000; border-radius:4px;  padding: 5px 25px 5px 4px; width: 180px; box-shadow: 0 1px 0 #666;}
 #header #header_search #bo_search_type{ font-size:13px; float:left; margin:0 10px 0 0; padding:3px 0 4px; vertical-align:middle;width:auto; border-color: #666666 #CCCCCC #CCCCCC;border-style:solid solid solid none; height:27px; border-width: 1px;}
@@ -90,17 +93,18 @@ input.button[disabled=disabled]:hover{background-color:#FFF6D3}
 /*MENU*/
 #header #menu{ background-color: #f8f8f8; border-bottom:1px solid #e5e5e5; float:left;line-height:normal;margin:0;padding:0;width:100%;}
 #header #menu li.maintab{float:left;height:29px;list-style:none;margin:0 1px 0 0;list-style:none;display:block; border-left:1px solid #fff; border-right:1px solid #ccc;}
-#header #menu li#maintab1 { margin-left:20px;}
+#header #menu li:first-child { margin-left:15px;}
 #header #menu li.submenu_size .title{cursor:default;color:#000;display:block; padding:8px 6px 4px 0;font-weight:normal;font-size:12px;}
 #header #menu li.submenu_size .title{_display:inline;_padding:6px 5px 4px 0}
 #header #menu li{_height:32px;_padding-top:3px}
 #header #menu img{display:inline;padding:0 3px 0 6px; margin-top:-4px; vertical-align:middle;width:16px;height:16px}
 #header #menu li.active, #header #menu li:hover{background-position:0 -38px;white-space:nowrap;}
 #header #menu li.active a{}
-#header #menu li:hover, #header #menu li.active {background-color:#49B2FF; }
+#header #menu li:hover, #header #menu li.active {background-color:#49B2FF;}
+#header #menu li.maintab:hover, #header #menu li.active {border-left:1px solid #49B2FF;border-right:1px solid #49B2FF;}
 #header #menu li.active span.title, #header #menu li:hover span.title {color:#fff; text-shadow: -1px -1px 0 #3293D6;}
 #header #menu .withLeftBorder{background:transparent url('../img/separator_subnav.png') no-repeat 0 5px}
-#header #menu .submenu{background:#f8f8f8;clear:both;margin:0;padding:0;border:1px solid #d9d9d9;z-index:9999; box-shadow: 1px 5px 10px #CCCCCC; -moz-box-shadow:1px 5px 10px #CCCCCC; -webkit-box-shadow:1px 5px 10px #CCCCCC;}
+#header #menu .submenu{background:#f8f8f8;clear:both;margin:0;padding:0;border:1px solid #d9d9d9;z-index:9999; box-shadow: 1px 5px 5px #CCCCCC; -moz-box-shadow:1px 5px 10px #CCCCCC; -webkit-box-shadow:1px 5px 10px #CCCCCC;}
 #header #menu .submenu li{list-style:none;margin:0;padding:0;display:block;}
 #header #menu .submenu li a{ font-size:12px;display:block;padding: 5px 15px 5px 10px; color:#666666;border-top:1px solid #fff; border-bottom:1px solid #ccc;}
 #header #menu .submenu li a:hover { background-color:#eee; text-shadow:0 1px 0 #fff;}
@@ -116,14 +120,14 @@ input.button[disabled=disabled]:hover{background-color:#FFF6D3}
 .table a:hover{text-decoration:none}
 .table tr th{ background-color: #F1F1F1; text-shadow:0 1px 0 #fff; padding:4px 6px;
 	background: #ececec url('../img/bg-degrade-table.png') repeat-x scroll left top;
-	/*background-image: -moz-linear-gradient(center top , #F9F9F9, #ECECEC);
-	background: -webkit-gradient(linear, center top ,center bottom, from(#F9F9F9), to(#ECECEC)) repeat scroll 0 0 transparent;*/
+	background-image: -moz-linear-gradient(center top , #F9F9F9, #ECECEC);
+	background: -webkit-gradient(linear, center top ,center bottom, from(#F9F9F9), to(#ECECEC)) repeat scroll 0 0 transparent;
 	font-size:13px; text-align:left; color:#333;}
 .table tr th.right { text-align:center;}
 .table tr td{border-bottom:1px solid #ccc;color:#333;font-size:12px;padding: 4px 4px 4px 6px;}
-.table tr:hover td{background:#fff1b5}
-.table tr.filter:hover td{background:#F1F9FF}
-.table tr td:hover table tr td{background:none}
+.table tr.row_hover:hover td{background:#fff1b5}
+.table tr.row_hover.filter:hover td{background:#F1F9FF}
+.table tr td.row_hover:hover table tr td{background:none}
 .table tr.action_details td{background:#FAFAFA;}
 .table tr.alt_row.action_details td{background:#E8E8E8;}
 .table tr td.empty{border-bottom:none;background:white!important}
@@ -133,6 +137,8 @@ input.button[disabled=disabled]:hover{background-color:#FFF6D3}
 .table tr.last td{border-bottom:none}
 td.col-left {vertical-align:top; padding-right:10px;}
 #tabPane1 td.col-left { width:200px;}
+#product-tab-content-wait{display:block;background:url('../img/bg_loaderSpace.png');position:absolute;width:100%;z-index:100;min-height:600px;padding:5px 10px 10px;}
+div#loading{height:128px;width:128px;background:url('../img/ajax-loader.gif');display:block;text-indent:-9999px;margin:100px auto;}
 td.col-left label { display:block; width:100%; text-align:right;}
 .alt_row{background-color:#f8f8f8}
 .path_bar{background-color:#E2EBEE;border:1px solid #999999;font-family:Trebuchet,Arial,Helvetica,sans-serif;font-size:13px;margin-bottom:20px;padding:5px}
@@ -165,7 +171,7 @@ a.module_toggle_all{color: #268CCD;}
 /*toolbarBox*/
 .toolbarBox { background-color: #F8F8F8; border: 1px solid #CCCCCC; margin-bottom:10px; padding: 10px 0; border-radius:3px; -moz-border-radius:3px; -webkit-border-radius:3px;}
 .toolbarBox .pageTitle { margin-left:10px; line-height:48px}
-.toolbarBox .pageTitle h3 {font-size: 2em; font-weight: normal; line-height: 52px; margin: 0; padding: 0;}
+.toolbarBox .pageTitle h3 {font-size: 2em; font-weight: normal; line-height: 52px; margin: 0; padding: 0; text-shadow:0 1px 0 #fff;}
 .toolbarBox ul.cc_button {float:right;margin:0 5px 0 0;padding:0;}
 .toolbarBox ul.cc_button li {color: #666666; float: left; height: 48px; list-style: none outside none; padding: 1px 1px 3px 4px; text-align: center;}
 .toolbarBox a.toolbar_btn {   border:1px solid #f8f8f8; min-width:50px; border-width: 1px; font-size:11px;cursor: pointer; display: block; float: left; padding: 3px 5px; white-space: nowrap; text-shadow: 0 1px 0 #ffffff;}
@@ -188,6 +194,8 @@ a.module_toggle_all{color: #268CCD;}
 .toolbarBox .process-icon-new-url { background-image: url('../img/process-icon-new-url.png');}
 .toolbarBox .process-icon-new-module-addon { background-image: url('../img/process-icon-new-module-addon.png');}
 .toolbarBox .process-icon-save-and-preview { background-image: url('../img/process-icon-preview.png');}
+.toolbarBox .process-icon-export { background-image: url('../img/process-icon-export-csv.png');}
+.toolbarBox .process-icon-export-all { background-image: url('../img/process-icon-export-csv-details.png');}
 .toolbarBox .process-icon-export-stock-state-quantities-csv { background-image: url('../img/process-icon-export-csv.png');}
 .toolbarBox .process-icon-export-stock-state-prices-csv { background-image: url('../img/process-icon-export-csv-details.png');}
 .toolbarBox .process-icon-export-csv-orders { background-image: url('../img/process-icon-export-csv.png');}
@@ -197,6 +205,8 @@ a.module_toggle_all{color: #268CCD;}
 .toolbarBox .process-icon-new.add_product{ background-image: url('../img/process-icon-addProduct.png');}
 .toolbarBox .process-icon-partialRefund{ background-image: url('../img/process-icon-partial-refund.png');}
 .toolbarBox .process-icon-standardRefund{ background-image: url('../img/process-icon-standard-refund.png');}
+.toolbarBox .process-icon-help{ background-image: url('../img/process-icon-help.png');}
+.toolbarBox .process-icon-help-new{ background-image: url('../img/process-icon-help-new.png');}
 
 div.fix-toolbar {border-bottom: 1px solid #E0E0E0;position:fixed;top:0;opacity:0.9;z-index:1;}
 
@@ -208,8 +218,10 @@ div.fix-toolbar {border-bottom: 1px solid #E0E0E0;position:fixed;top:0;opacity:0
 		color:#333; width:180px; font-weight:bold; text-shadow: 0 1px 0 #fff;
 	border-color: #CCCCCC #BBBBBB #A0A0A0;border-left: 1px solid #BBBBBB;border-radius: 3px 3px 3px 3px;border-right: 1px solid #BBBBBB;border-style: solid;border-width: 1px;color: #000000;}
 .qq-upload-button:hover { border:1px solid #939393;}
+
 /*leadin*/
-.leadin { padding:10px;}
+.leadin {}
+.leadin .bloc-leadin{ padding:10px 3px;}
 
 /*productBox*/
 #productBox { position:relative; width:100%; float:left;}
@@ -217,6 +229,7 @@ div.fix-toolbar {border-bottom: 1px solid #E0E0E0;position:fixed;top:0;opacity:0
 /*tab-pane*/
 form#product_form, form#access_form, form#cart_rule_form { background-color:#ebedf4; border:1px solid #ccced7; min-height:404px; padding: 5px 10px 10px; margin-left:140px;}
 #content form.adminstockmanagement {margin-left:0px;}
+form#product_form h3 { font-size:14px; font-weight:normal;}
 form#product_form h4 { font-size:18px; font-weight:normal;}
 .tab-row {}
 .tab-row .tab {background:#EFEFEF;width:100px;}
@@ -229,7 +242,7 @@ form#product_form h4 { font-size:18px; font-weight:normal;}
 .productTabs ul li.tab-row a { display:block; font-weight:normal; color:#666;padding: 7px 10px; border-top:1px solid #CCCED7; border-right:1px solid #CCCED7;}
 .productTabs ul li.tab-row a.selected { background-color:#EBEDF4;font-weight:bold;color:#000; border-right:none;}
 .product-tab-content h4.tab { display:none;}
-
+#product_list {margin-bottom:0.5em}
 
 #categories-treeview { }
 #product-tab-content-3-Associations .Association td.col-left  { width:200px;}
@@ -270,7 +283,8 @@ form#product_form h4 { font-size:18px; font-weight:normal;}
 .sidebar ul.categorieList {}
 .sidebar ul.categorieList li { border-top:1px solid #ccc; position:relative; line-height:20px;}
 .sidebar ul.categorieList li:first-child { border-top:none;}
-.sidebar ul.categorieList li a {color:#3a6ea7; padding-left:5px;}
+.sidebar ul.categorieList li a {color:#3a6ea7; display:block; padding-left:5px;}
+.sidebar ul.categorieList li a:hover { background-color: #EBEDF4;}
 .sidebar ul.categorieList li div.categorieWidth { width:180px; margin-left:5px; overflow:hidden;}
 .sidebar ul.categorieList li div.count{ position:absolute; top:0; right:5px;}
 .sidebar .categorieStatus { display:none;}
@@ -286,17 +300,25 @@ form#product_form h4 { font-size:18px; font-weight:normal;}
 
 /*STATCONTAINER*/
 #statsContainer {margin-left:220px; padding:0 0 0 20px;}
-#statsContainer #calendar {   background-color: #EEEEEE;border-top: 1px solid #CCCCCC; display: block; margin: 10px 0;min-height: 25px; padding: 5px;}
-#statsContainer #calendar form {float:left;}
-#statsContainer #calendar input, #statsContainer #calendar p { float:left;}
-#statsContainer #calendar input.submitDateDay { border-top-right-radius: 0px; border-bottom-right-radius:0px; border-right:none;}
-#statsContainer #calendar input.submitDateMonth { border-radius:0px;}
-#statsContainer #calendar input.submitDateYear { border-top-left-radius: 0px; border-bottom-left-radius:0px; border-left:none; margin-right:10px;}
-#statsContainer #calendar input.submitDateDayPrev { border-top-right-radius: 0px; border-bottom-right-radius:0px; border-right:none;}
-#statsContainer #calendar input.submitDateMonthPrev { border-radius:0px;}
-#statsContainer #calendar input.submitDateYearPrev { border-top-left-radius: 0px; border-bottom-left-radius:0px; border-left:none; margin-right:10px;}
-#statsContainer #calendar p { margin:2px;}
-#statsContainer #calendar p span { float:left; display:block; padding:3px;}
+#statsContainer #calendar,
+#referrersContainer #calendar{   background-color: #EEEEEE;border-top: 1px solid #CCCCCC; display: block; margin: 10px 0;min-height: 25px; padding: 5px;}
+#statsContainer #calendar form,
+#referrersContainer #calendar form {float:left;}
+#statsContainer #calendar input, #statsContainer #calendar p,
+#referrersContainer #calendar input, #referrersContainer #calendar p { float:left;}
+#statsContainer #calendar input.submitDateDay, #referrersContainer #calendar input.submitDateDay { border-top-right-radius: 0px; border-bottom-right-radius:0px; border-right:none;}
+#statsContainer #calendar input.submitDateMonth, #statsContainer #calendar input.submitDateMonth,
+#referrersContainer #calendar input.submitDateMonth, #referrersContainer #calendar input.submitDateMonth { border-radius:0px;}
+#statsContainer #calendar input.submitDateYear,
+#referrersContainer #calendar input.submitDateYear { border-top-left-radius: 0px; border-bottom-left-radius:0px; border-left:none; margin-right:10px;}
+#statsContainer #calendar input.submitDateDayPrev,
+#referrersContainer #calendar input.submitDateDayPrev { border-top-right-radius: 0px; border-bottom-right-radius:0px; border-right:none;}
+#statsContainer #calendar input.submitDateMonthPrev,
+#referrersContainer #calendar input.submitDateMonthPrev { border-radius:0px;}
+#statsContainer #calendar input.submitDateYearPrev,
+#referrersContainer #calendar input.submitDateYearPrev { border-top-left-radius: 0px; border-bottom-left-radius:0px; border-left:none; margin-right:10px;}
+#statsContainer #calendar p, #referrersContainer #calendar p { margin:2px;}
+#statsContainer #calendar p span, #referrersContainer #calendar p span { float:left; display:block; padding:3px;}
 #statsContainer .blocStats { background-color: #EBEDF4;border: 1px solid #C2C4D9; display: block; position:relative; padding: 10px;}
 #statsContainer .blocStats h2 { font-weight:normal; margin:0;}
 #statsContainer .blocStats h2.icon-statsproduct span,
@@ -357,6 +379,7 @@ form#product_form h4 { font-size:18px; font-weight:normal;}
 #statsContainer .blocStats form { position:absolute; top:10px; right:5px;}
 #statsContainer .blocStats form.checkup { position:relative; top:0; left:0;}
 #statsContainer .totalStats { font-size:16px; font-weight:bold;}
+#statsContainer .blocStats .blocConversion { display:block; display:inline-table; min-height:80px !ie; }
 
 /*MODULECONTAINER*/
 #moduleContainer { margin-left:220px; padding:13px 0 0 20px;}
@@ -372,7 +395,7 @@ form#product_form h4 { font-size:18px; font-weight:normal;}
 #moduleContainer .moduleDesc .metadata dl dd { padding-right:10px;}
 #moduleContainer .moduleDesc .metadata dl dt { font-weight:bold; padding-right:5px;}
 #moduleContainer .moduleDesc p.desc { color:#666; font-family: Georgia; font-style: italic;  font-size:12px; display:block; clear:both;}
-#moduleContainer .setup  {background-color:#6db300;font-size:10px; color:#fff; text-transform:uppercase; position:relative; left:10px; padding:0px 4px; display: inline-block; border-radius:3px;}
+#moduleContainer .setup  {background-color:#6db300; font-weight:bold; font-size:10px; color:#fff; text-transform:uppercase; position:relative; left:10px; padding:0px 4px; display: inline-block; border-radius:3px;}
 #moduleContainer .setup.non-install { background-color:#ec7000;}
 #moduleContainer .setup.off{ background-color:#ccc;}
 #moduleContainer .row-actions-module span { padding-right:5px;}
@@ -401,10 +424,42 @@ form#product_form h4 { font-size:18px; font-weight:normal;}
 
 select#show_modules { font-size:12px;}
 
+label.text { padding:1px 12px 0 0;}
+label.radioCheck {font-weight:normal; padding:0; float:none; margin:0 1em 0 0.25em}
+
+.listForm {}
+ul.listForm {}
+ul.listForm li {padding-bottom:3px;}
+
+
 /*FOOTER*/
 #footer {height:40px; font-size:12px;clear:both;font-size:0.9em;color:#666666}
 #footer .footerLeft { float:left; margin-left:10px;}
 #footer .footerRight {float:right; margin-right:10px;}
-
-
 #footer .footer_link, #footer .footer_link:hover { color:#268CCD;}
+
+/*DASHBOARD*/
+.pageTitleHome { font-size: 1.6em; font-weight: normal; margin:0; padding:10px 0;}
+.pageTitleHome h3 { font-weight: normal; margin:0;}
+#dashboard {  background-color: #EBEDF4; border: 1px solid #C2C4D9; display: block; padding: 10px; position: relative; min-width:1200px;}
+#dashboard h2 {font-size: 1.4em; font-weight:normal; margin:0 0 15px 0;}
+#iframe {}
+#iframe #video-content { float:left;}
+#iframe {position:relative; display:block; min-height:180px;}
+#adminpresentation #video { float:left; padding-right:15px; min-height:150px;}
+#adminpresentation #video a { position:relative; height:128px; width:220px; display:block; padding:6px; }
+#adminpresentation #video a img { }
+#adminpresentation #video a span {background: transparent url("../img/play.png") no-repeat scroll left top; height:128px; width:220px; position:absolute; top:0; left:0; z-index:1; display:block; border:6px solid #fff; border-radius:3px; }
+#adminpresentation #video a span:hover {background-position:left bottom;border:6px solid #C2C4D9; transition:background 0.5s;}
+#adminpresentation #video-content { padding-left:10px; min-height:150px;  }
+#adminpresentation #video-content p { font-size:20px; line-height: 26px; color:#585A69; text-shadow: 0 1px 0 #fff;}
+
+.view-modules { float:right; margin: 10px 0;}
+.view-modules li { float:left;}
+.view-modules li img { padding-right:5px;}
+.view-modules li.normal-view-disabled {     background: -moz-linear-gradient(center top ,#cccccc, #F9F9F9 ) repeat scroll 0 0 transparent; border-bottom-right-radius: 0; border-right: 1px solid #ccc; border-top-right-radius: 0; color:#999;  }
+.view-modules li.favorites-view-disabled {     background: -moz-linear-gradient(center top ,#cccccc, #F9F9F9 ) repeat scroll 0 0 transparent; border-bottom-left-radius: 0; border-left: 1px solid #fff; border-top-left-radius: 0; color:#999;  }
+.view-modules li.normal-view-disabled:hover,
+.view-modules li.favorites-view-disabled:hover {border-color: #CCCCCC #BBBBBB #A0A0A0;}
+.view-modules li.favorites-view   {border-bottom-left-radius: 0;border-left: 1px solid #fff; border-top-left-radius: 0;}
+.view-modules li.normal-view  {border-bottom-right-radius: 0;border-right: 1px solid #ccc; border-top-right-radius: 0;}

admin-dev/themes/default/template/cart_rules/product_rule.tpl

@@ -1,61 +0,0 @@
-{*
-* 2007-2011 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-2011 PrestaShop SA
-*  @version  Release: $Revision: 8971 $
-*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
-*  International Registered Trademark & Property of PrestaShop SA
-*}
-<tr id="product_rule_{$product_rule_id}_tr">
-	<td>
-		<a href="javascript:removeProductRule({$product_rule_id});">
-			<img src="../img/admin/disabled.gif" alt="{l s='Remove'}" title="{l s='Remove'}" />
-		</a>
-	</td>
-	<td>
-		<input type="hidden" name="product_rule[]" value="{$product_rule_id}" />
-		<input type="hidden" name="product_rule_{$product_rule_id}_type" value="{$product_rule_type}" />
-		[{$product_rule_type}] {l s='The cart must contain at least'}
-	</td>
-	<td style="padding:5px">
-		<input type="text" name="product_rule_{$product_rule_id}_quantity" value="{$product_rule_quantity|intval}" style="width:30px" />
-	</td>
-	<td>
-		{l s='product(s) matching'}
-	</td>
-	<td>
-		<input type="text" id="product_rule_{$product_rule_id}_match" value="" disabled="disabled" />
-	</td>
-	<td>
-		<a id="product_rule_{$product_rule_id}_choose_link" href="#product_rule_{$product_rule_id}_choose_content">
-			<img src="../img/admin/choose.gif" alt="{l s='Choose'}" title="{l s='Choose'}" /> {l s='Choose'}
-		</a>
-		<div>
-			<div id="product_rule_{$product_rule_id}_choose_content">
-				{$product_rule_choose_content}
-			</div>
-		</div>
-	</td>
-</tr>
-
-<script type="text/javascript">
-	$('#product_rule_{$product_rule_id}_choose_content').parent().hide();
-	$("#product_rule_{$product_rule_id}_choose_link").fancybox();
-</script>

admin-dev/themes/default/template/cart_rules/product_rule_itemlist.tpl

@@ -1,57 +0,0 @@
-{*
-* 2007-2011 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-2011 PrestaShop SA
-*  @version  Release: $Revision: 8971 $
-*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
-*  International Registered Trademark & Property of PrestaShop SA
-*}
-<table>
-	<tr>
-		<td>
-			<p><strong>{l s='Selected'}</strong></p>
-			<select name="product_rule_select_{$product_rule_id}[]" class="product_rule_toselect" id="product_rule_select_{$product_rule_id}_2" style="border:1px solid #AAAAAA;width:400px;height:160px" multiple>
-				{foreach from=$product_rule_itemlist.selected item='item'}
-					<option value="{$item.id|intval}">&nbsp;{$item.name}</option>
-				{/foreach}
-			</select><br /><br />
-			<a style="cursor:pointer;text-align:center;display:block;border:1px solid #aaa;text-decoration:none;background-color:#fafafa;color:#123456;margin:2px;padding:2px" id="product_rule_select_{$product_rule_id}_remove">
-				{l s='Remove'} &gt;&gt;
-			</a>
-		</td>
-		<td style="padding-left:20px;">
-			<p><strong>{l s='Unselected'}</strong></p>
-			<select id="product_rule_select_{$product_rule_id}_1" style="border:1px solid #AAAAAA;width:400px;height:160px" multiple>
-				{foreach from=$product_rule_itemlist.unselected item='item'}
-					<option value="{$item.id|intval}">&nbsp;{$item.name}</option>
-				{/foreach}
-			</select><br /><br />
-			<a style="cursor:pointer;text-align:center;display:block;border:1px solid #aaa;text-decoration:none;background-color:#fafafa;color:#123456;margin:2px;padding:2px" id="product_rule_select_{$product_rule_id}_add">
-				&lt;&lt; {l s='Add'}
-			</a>
-		</td>
-	</tr>
-</table>
-
-<script type="text/javascript">
-	$('#product_rule_select_{$product_rule_id}_remove').click(function() { removeCartRuleOption(this); updateProductRuleShortDescription(this); });
-	$('#product_rule_select_{$product_rule_id}_add').click(function() { addCartRuleOption(this); updateProductRuleShortDescription(this); });
-	$(document).ready(function() { updateProductRuleShortDescription($('#product_rule_select_{$product_rule_id}_add')); });
-</script>

admin-dev/themes/default/template/controllers/accounting_export/common_form.tpl

@@ -34,7 +34,7 @@
 
 <label for="clientPrefix">{l s='Client prefix:'}</label>
 <div class="margin-form">
-	<input type="text" value="{$clientPrefix}" name="clientPrefix" />
+	<input type="text" value="{$clientPrefix|htmlentities}" name="clientPrefix" />
 	<span class="input-error"></span>
 </div>
 

admin-dev/themes/default/template/controllers/accounting_export/global_export.tpl

@@ -28,10 +28,10 @@
 	<fieldset>
 		<legend>{$title}</legend>
 		<form id="reconfiliation_form" action="{$smarty.server.REQUEST_URI}" method="POST">
-			{include file="$pathAccountExportTpl/common_form.tpl"}
+			{include file="controllers/accounting_export/common_form.tpl"}
 			<label for="clientPrefix">{l s='Journal:'}</label>
 			<div class="margin-form">
-				<input type="text" name="journal" value="{$journal}"/>
+				<input type="text" name="journal" value="{$journal|htmlentities}"/>
 			</div>	
 			<div class="margin-form">
 				<input id="submitGlobalExport" type="submit" class="button" name="submitAccountingExportType" />

admin-dev/themes/default/template/controllers/accounting_export/reconciliation_export.tpl

@@ -28,7 +28,7 @@
 	<fieldset>
 		<legend>{$title}</legend>
 		<form id="reconfiliation_form" action="{$smarty.server.REQUEST_URI}" method="POST">
-			{include file="$pathAccountExportTpl/common_form.tpl"}
+			{include file="controllers/accounting_export/common_form.tpl"}
 			
 			<div class="margin-form">
 				<input id="submitReconciliationExport" type="submit" class="button" name="submitAccountingExportType" />

admin-dev/themes/default/template/controllers/accounting_management/content.tpl

@@ -44,13 +44,13 @@
 		<form id="{$table}_form" method="POST" action="{$smarty.server.REQUEST_URI}">
 			<label>{l s='Default number for this shop'}</label>
 				<div class="margin-form">
-				<input type="text" name="default_account_number" value="{$shop_details['default_account_number']}" />
+				<input type="text" name="default_account_number" value="{$shop_details['default_account_number']|htmlentities}" />
 				<p>{l s='If a zone field is empty it will use this default number.'}</p>
 			</div>
 			{foreach from=$shop_details['zones'] key=id_zone item=currentZone}
 				<label>{$currentZone['name']}</label>
 				<div class="margin-form">
-					<input type="text" name="zone_{$id_zone}" value="{$currentZone['account_number']|escape:htmlall}" />
+					<input type="text" name="zone_{$id_zone}" value="{$currentZone['account_number']|escape:htmlall|htmlentities}" />
 
 				</div>
 			{/foreach}

admin-dev/themes/default/template/controllers/addresses/helpers/form/form.tpl

@@ -24,7 +24,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{extends file="../helper/form/form.tpl"}
+{extends file="helpers/form/form.tpl"}
 
 {block name="label"}
 {/block}
@@ -37,9 +37,43 @@
 			<input type="hidden" name="id_customer" value="{$customer->id}" />
 			<input type="hidden" name="email" value="{$customer->email}" />
 		{else}
+			<script type="text/javascript">
+			$('input[name=email]').live('blur', function(e)
+			{
+				var email = $(this).val();
+				if (email.length > 5)
+				{
+					var data = {};
+					data.email = email;
+					data.token = "{$token}";
+					data.ajax = 1;
+					data.controller = "AdminAddresses";
+					data.action = "loadNames";
+					$.ajax({
+						type: "POST",
+						url: "ajax-tab.php",
+						data: data,
+						dataType: 'json',
+						async : true,
+						success: function(msg)
+						{
+							if (msg)
+							{
+								var infos = msg.infos.split('_');
+								$('input[name=firstname]').val(infos[0]);
+								$('input[name=lastname]').val(infos[1]);
+							}
+						},
+						error: function(msg)
+						{
+						}
+					});
+				}
+			});
+			</script>
 			<label>{l s='Customer e-mail'}</label>
 			<div class="margin-form">
-				<input type="text" size="33" name="email" value="{$fields_value[$input.name]|escape:'htmlall':'UTF-8'}" style="text-transform: lowercase;" /> <sup>*</sup>
+				<input type="text" size="33" name="email" value="{$fields_value[$input.name]|escape:'htmlall':'UTF-8'|htmlentities}" style="text-transform: lowercase;" /> <sup>*</sup>
 			</div>
 		{/if}
 	{else} 

admin-dev/themes/default/template/controllers/attribute_generator/content.tpl

@@ -33,7 +33,7 @@
 	{
 			name = element.attr("name");
 			var element_price = element.val().replace(/,/g, ".");
-			var other_element_price = "0";
+			var other_element_price = 0;
 
 			if (!isNaN(element_price) && element_price > 0)
 			{
@@ -41,6 +41,8 @@
 					other_element_price = parseFloat(element_price / ((product_tax / 100) + 1));
 				else
 					other_element_price = ps_round(parseFloat(element_price * ((product_tax / 100) + 1)), 2);
+
+				other_element_price = other_element_price.toFixed(2);
 			}
 
 			$("#related_to_"+name).val(other_element_price);
@@ -74,6 +76,7 @@
 <form enctype="multipart/form-data" method="post" id="generator" action="{$url_generator}">
 	<fieldset style="margin-bottom: 35px;">
 		<legend><img src="../img/admin/asterisk.gif" />{l s='Attributes generator'}</legend>
+        <div style="display: block; margin-bottom: 20px;" class="hint">{l s='To generate the attributes, click on the "Ctrl", select your attributes and click "Add".'}</div>
 		<div style="float: left; margin-right:50px;">
 			<div>
 				<select multiple name="attributes[]" id="attribute_group" style="width: 200px; height: 350px; margin-bottom: 10px;">
@@ -81,7 +84,7 @@
 						{if isset($attribute_js[$attribute_group['id_attribute_group']])}
 							<optgroup name="{$attribute_group['id_attribute_group']}" id="{$attribute_group['id_attribute_group']}" label="{$attribute_group['name']|escape:'htmlall':'UTF-8'}">
 								{foreach $attribute_js[$attribute_group['id_attribute_group']] as $k => $v}
-									<option name="{$k}" id="attr_{$k}" value="{$v|escape:'quotes':'UTF-8'}" title="{$v|escape:'quotes':'UTF-8'}">{$v|escape:'quotes':'UTF-8'}</option>
+									<option name="{$k}" id="attr_{$k}" value="{$v|escape:'htmlall':'UTF-8'}" title="{$v|escape:'htmlall':'UTF-8'}">{$v|escape:'htmlall':'UTF-8'}</option>
 								{/foreach}
 							</optgroup>
 						{/if}
@@ -106,7 +109,7 @@
 				</div>
 				<label>{l s='Reference'}</label>
 				<div class="margin-form">
-					<input type="text" size="20" name="reference" value="{$product_reference}"/>
+					<input type="text" size="20" name="reference" value="{$product_reference|htmlentities}"/>
 				</div>
 			</div>
 			<div style="float:left; text-align:center; margin-left:20px;">

admin-dev/themes/default/template/controllers/attributes/helpers/form/form.tpl

@@ -24,7 +24,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{extends file="helper/form/form.tpl"}
+{extends file="helpers/form/form.tpl"}
 
 {block name="label"}
 	{if $input.type == 'color'}
@@ -41,15 +41,24 @@
 			</div>
 		{/if}
 	</div>
+		{if $input.name == 'name'}
+			{hook h="displayAttributeForm" id_attribute=$form_id}
+		{/if}
 {/block}
 
 {block name="script"}
 	var attributesGroups = {ldelim}{$strAttributesGroups}{rdelim};
-	$('#id_attribute_group').change(function() {
-		var val = $(this).val();
+	
+	var displayColorFieldsOption = function() {
+		var val = $('#id_attribute_group').val();
 		if (attributesGroups[val])
 			$('#colorAttributeProperties').show();
 		else
 			$('#colorAttributeProperties').hide();
-	});
+	};
+	
+	displayColorFieldsOption();
+	
+	$('#id_attribute_group').change(displayColorFieldsOption);
+	
 {/block}

admin-dev/themes/default/template/controllers/attributes/helpers/list/list_content.tpl

@@ -91,7 +91,7 @@
 				{$tr.$key}
 			{* If type is 'editable', an input is created *}
 			{elseif isset($params.type) && $params.type == 'editable' && isset($tr.id)}
-				<input type="text" name="{$key}_{$tr.id}" value="{$tr.$key}" class="{$key}" />
+				<input type="text" name="{$key}_{$tr.id}" value="{$tr.$key|htmlentities}" class="{$key}" />
 			{elseif isset($params.callback)}
 				{$tr.$key}
 			{elseif isset($tr.$key) && $key == 'color'}

admin-dev/themes/default/template/controllers/attributes_groups/helpers/form/form.tpl

@@ -0,0 +1,34 @@
+{*
+* 2007-2011 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-2011 PrestaShop SA
+*  @version  Release: $Revision$
+*  @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="end_field_block"}
+		</div>
+		{if $input.name == 'public_name'}
+			{hook h="displayAttributeGroupForm" id_attribute_group=$form_id}
+		{/if}
+{/block}

admin-dev/themes/default/template/controllers/backup/download/view.tpl

@@ -24,7 +24,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{extends file="helper/view/view.tpl"}
+{extends file="helpers/view/view.tpl"}
 
 {block name="override_tpl"}
 

admin-dev/themes/default/template/controllers/backup/helpers/list/list_header.tpl

@@ -24,7 +24,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{extends file="helper/list/list_header.tpl"}
+{extends file="helpers/list/list_header.tpl"}
 
 {block name="override_header"}
 

admin-dev/themes/default/template/controllers/backup/helpers/view/view.tpl

@@ -24,7 +24,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{extends file="helper/view/view.tpl"}
+{extends file="helpers/view/view.tpl"}
 
 {block name="override_tpl"}
 

admin-dev/themes/default/template/controllers/carriers/helpers/form/form.tpl

@@ -23,7 +23,7 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-{extends file="helper/form/form.tpl"}
+{extends file="helpers/form/form.tpl"}
 
 {block name=script}
 	// At the loading

admin-dev/themes/default/template/controllers/cart_rules/actions.tpl

@@ -1,28 +1,3 @@
-{*
-* 2007-2011 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-2011 PrestaShop SA
-*  @version  Release: $Revision: 8971 $
-*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
-*  International Registered Trademark & Property of PrestaShop SA
-*}
 <label>{l s='Free shipping'}</label>
 <div class="margin-form">
 	&nbsp;&nbsp;
@@ -87,7 +62,7 @@
 		<label>{l s='Product'}</label>
 		<div class="margin-form">
 			<input type="hidden" id="reduction_product" name="reduction_product" value="{$currentTab->getFieldValue($currentObject, 'reduction_product')|intval}" />
-			<input type="text" id="reductionProductFilter" name="reductionProductFilter" value="{$reductionProductFilter}" style="width:400px" />
+			<input type="text" id="reductionProductFilter" name="reductionProductFilter" value="{$reductionProductFilter|htmlentities}" style="width:400px" />
 		</div>
 	</div>
 </div>
@@ -105,6 +80,6 @@
 	<label>{l s='Product'}</label>
 	<div class="margin-form">
 		<input type="hidden" id="gift_product" name="gift_product" value="{$currentTab->getFieldValue($currentObject, 'gift_product')|intval}" />
-		<input type="text" id="giftProductFilter" name="giftProductFilter" value="{$giftProductFilter}" style="width:400px" />
+		<input type="text" id="giftProductFilter" name="giftProductFilter" value="{$giftProductFilter|htmlentities}" style="width:400px" />
 	</div>
-</div>
+</div>

admin-dev/themes/default/template/controllers/cart_rules/conditions.tpl

@@ -1,33 +1,8 @@
-{*
-* 2007-2011 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-2011 PrestaShop SA
-*  @version  Release: $Revision: 8971 $
-*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
-*  International Registered Trademark & Property of PrestaShop SA
-*}
 <label>{l s='Limit to a single customer'}</label>
 <div class="margin-form">
 	<input type="hidden" id="id_customer" name="id_customer" value="{$currentTab->getFieldValue($currentObject, 'id_customer')|intval}" />
-	<input type="text" id="customerFilter" name="customerFilter" value="{$customerFilter}" style="width:400px" />
-	<p>{l s='Optional, the cart rule will be available for everyone if you leave this field blank.'}</p>
+	<input type="text" id="customerFilter" name="customerFilter" value="{$customerFilter|htmlentities}" style="width:400px" />
+	<p class="preference_description">{l s='Optional, the cart rule will be available for everyone if you leave this field blank.'}</p>
 </div>
 <label>{l s='Validity'}</label>
 <div class="margin-form">
@@ -35,7 +10,7 @@
 	<input type="text" class="datepicker" name="date_from" value="{if $currentTab->getFieldValue($currentObject, 'date_from')}{$currentTab->getFieldValue($currentObject, 'date_from')}{else}{$defaultDateFrom}{/if}" />
 	<strong>{l s='to'}</strong>
 	<input type="text" class="datepicker" name="date_to" value="{if $currentTab->getFieldValue($currentObject, 'date_to')}{$currentTab->getFieldValue($currentObject, 'date_to')}{else}{$defaultDateTo}{/if}" />
-	<p>{l s='Default period is one year.'}</p>
+	<p class="preference_description">{l s='Default period is one month.'}</p>
 </div>
 <label>{l s='Minimum amount'}</label>
 <div class="margin-form">
@@ -53,15 +28,17 @@
 		<option value="0" {if $currentTab->getFieldValue($currentObject, 'minimum_amount_shipping') == 0}selected="selected"{/if}>{l s='Shipping excluded'}</option>
 		<option value="1" {if $currentTab->getFieldValue($currentObject, 'minimum_amount_shipping') == 1}selected="selected"{/if}>{l s='Shipping included'}</option>
 	</select>
-	<p>{l s='You can choose a minimum amount for the cart either with or without the taxes, with or without shipping.'}</p>
+	<p class="preference_description">{l s='You can choose a minimum amount for the cart either with or without the taxes, with or without shipping.'}</p>
 </div>
 <label>{l s='Total available'}</label>
 <div class="margin-form">
 	<input type="text" name="quantity" value="{$currentTab->getFieldValue($currentObject, 'quantity')|intval}" />
+	<p class="preference_description">{l s='The cart rule will be applied to the X first customers only.'}</p>
 </div>
 <label>{l s='Total available for each user'}</label>
 <div class="margin-form">
 	<input type="text" name="quantity_per_user" value="{$currentTab->getFieldValue($currentObject, 'quantity_per_user')|intval}" />
+	<p class="preference_description">{l s='A customer will only be able to use the cart rule X time(s).'}</p>
 </div>
 {if $countries.unselected|@count + $countries.selected|@count > 1}
 <br />
@@ -192,22 +169,46 @@
 </div>
 {/if}
 <br />
-<input type="checkbox" id="product_restriction" name="product_restriction" value="1" {if $product_rules|@count}checked="checked"{/if} /> <strong>{l s='Product selection'}</strong>
-<div id="product_restriction_div" style="border:1px solid #AAAAAA;margin-top:10px;padding:10px 10px 10px 10px;background-color:#FFF5D3">
-	{l s='Add a filter on'}
-	<select id="product_rule_type">
-		<option value="">{l s='-- Choose --'}</option>
-		<option value="products">{l s='Products'}</option>
-		<option value="attributes">{l s='Attributes'}</option>
-		<option value="categories">{l s='Categories'}</option>
-	</select>
-	<a href="javascript:addProductRule();">
-		<img src="../img/admin/add.gif" alt="{l s='Add'}" title="{l s='Add'}" /> {l s='Add'}
-	</a>
-	<hr />
-	<table id="product_rule_table" class="table" cellpadding="0" cellspacing="0">
-		{foreach from=$product_rules item='product_rule'}
-			{$product_rule}
+<input type="checkbox" id="product_restriction" name="product_restriction" value="1" {if $product_rule_groups|@count}checked="checked"{/if} /> <strong>{l s='Product selection'}</strong>
+<div id="product_restriction_div">
+	<table id="product_rule_group_table" style="border:1px solid #AAAAAA;margin:10px 0 10px 0;padding:10px 10px 10px 10px;background-color:#FFF5D3;width:600px" cellpadding="0" cellspacing="0">
+		{foreach from=$product_rule_groups item='product_rule_group'}
+			{$product_rule_group}
 		{/foreach}
 	</table>
+	<a href="javascript:addProductRuleGroup();">
+		<img src="../img/admin/add.gif" alt="{l s='Add'}" title="{l s='Add'}" /> {l s='Add a new rule group'}
+	</a>
 </div>
+{if $shops.unselected|@count + $shops.selected|@count > 1}
+<br />
+<input type="checkbox" id="shop_restriction" name="shop_restriction" value="1" {if $shops.unselected|@count}checked="checked"{/if} /> <strong>{l s='Shop selection'}</strong>
+<div id="shop_restriction_div" style="border:1px solid #AAAAAA;margin-top:10px;padding:0 10px 10px 10px;background-color:#FFF5D3">
+	<table>
+		<tr>
+			<td>
+				<p><strong>{l s='Selected shops'}</strong></p>
+				<select name="shop_select[]" id="shop_select_2" style="border:1px solid #AAAAAA;width:400px;height:160px" multiple>
+					{foreach from=$shops.selected item='shop'}
+						<option value="{$shop.id_shop|intval}">&nbsp;{$shop.name}</option>
+					{/foreach}
+				</select><br /><br />
+				<a style="text-align:center;display:block;border:1px solid #aaa;text-decoration:none;background-color:#fafafa;color:#123456;margin:2px;padding:2px" id="shop_select_remove">
+					{l s='Remove'} &gt;&gt;
+				</a>
+			</td>
+			<td style="padding-left:20px;">
+				<p><strong>{l s='Unselected shops'}</strong></p>
+				<select id="shop_select_1" style="border:1px solid #AAAAAA;width:400px;height:160px" multiple>
+					{foreach from=$shops.unselected item='shop'}
+						<option value="{$shop.id_shop|intval}">&nbsp;{$shop.name}</option>
+					{/foreach}
+				</select><br /><br />
+				<a style="text-align:center;display:block;border:1px solid #aaa;text-decoration:none;background-color:#fafafa;color:#123456;margin:2px;padding:2px" id="shop_select_add">
+					&lt;&lt; {l s='Add'}
+				</a>
+			</td>
+		</tr>
+	</table>
+</div>
+{/if}

admin-dev/themes/default/template/controllers/cart_rules/form.js

@@ -3,10 +3,10 @@
 *
 * NOTICE OF LICENSE
 *
-* This source file is subject to the Academic Free License (AFL 3.0)
+* This source file is subject to the Open Software License (OSL 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
+* http://opensource.org/licenses/osl-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.
@@ -19,28 +19,48 @@
 *
 *  @author PrestaShop SA <contact@prestashop.com>
 *  @copyright  2007-2011 PrestaShop SA
-*  @version  Release: $Revision: 7040 $
-*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  @version  Release: $Revision: 6844 $
+*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 */
 
-function addProductRule()
+function addProductRuleGroup()
 {
-	product_rules_counter += 1;
-	if ($('#product_rule_type').val() != 0)
+	product_rule_groups_counter += 1;
+	product_rule_counters[product_rule_groups_counter] = 0;
+
+	$.get(
+		'ajax-tab.php',
+		{controller:'AdminCartRules',token:currentToken,newProductRuleGroup:1,product_rule_group_id:product_rule_groups_counter},
+		function(content) {
+			if (content != "")
+				$('#product_rule_group_table').append(content);
+		}
+	);
+}
+
+function removeProductRuleGroup(id)
+{
+	$('#product_rule_group_' + id + '_tr').remove();
+}
+
+function addProductRule(product_rule_group_id)
+{
+	product_rule_counters[product_rule_group_id] += 1;
+	if ($('#product_rule_type_' + product_rule_group_id).val() != 0)
 		$.get(
 			'ajax-tab.php',
-			{controller:'AdminCartRules',token:currentToken,newProductRule:1,product_rule_type:$('#product_rule_type').val(),product_rule_id:product_rules_counter},
+			{controller:'AdminCartRules',token:currentToken,newProductRule:1,product_rule_type:$('#product_rule_type_' + product_rule_group_id).val(),product_rule_group_id:product_rule_group_id,product_rule_id:product_rule_counters[product_rule_group_id]},
 			function(content) {
 				if (content != "")
-					$('#product_rule_table').append(content);
+					$('#product_rule_table_' + product_rule_group_id).append(content);
 			}
 		);
 }
 
-function removeProductRule(id)
+function removeProductRule(product_rule_group_id, product_rule_id)
 {
-	$('#product_rule_' + id + '_tr').remove();
+	$('#product_rule_' + product_rule_group_id + '_' + product_rule_id + '_tr').remove();
 }
 
 function toggleCartRuleFilter(id)
@@ -74,7 +94,7 @@ function updateProductRuleShortDescription(item)
 		$('#' + id2 + '_match').val(length);
 }
 
-var restrictions = new Array('country', 'carrier', 'group', 'cart_rule');
+var restrictions = new Array('country', 'carrier', 'group', 'cart_rule', 'shop');
 for (i in restrictions)
 {
 	toggleCartRuleFilter($('#' + restrictions[i] + '_restriction'));
@@ -93,13 +113,12 @@ function toggleApplyDiscount(percent, amount, apply_to)
 		if ($('#apply_discount_to_product').attr('checked'))
 			toggleApplyDiscountTo();
 		$('#apply_discount_to_cheapest').removeAttr('disabled');
-		$('#apply_discount_to_cheapest').removeAttr('checked');
+		$('#apply_discount_to_selection').removeAttr('disabled');
 	}
 	else
 	{
 		$('#apply_discount_percent_div').hide(200);
 		$('#reduction_percent').val('0');
-		$('#apply_discount_to_cheapest').attr('disabled', 'disabled');
 	}
 	
 	if (amount)
@@ -109,12 +128,13 @@ function toggleApplyDiscount(percent, amount, apply_to)
 			toggleApplyDiscountTo();
 		$('#apply_discount_to_cheapest').attr('disabled', 'disabled');
 		$('#apply_discount_to_cheapest').removeAttr('checked');
+		$('#apply_discount_to_selection').attr('disabled', 'disabled');
+		$('#apply_discount_to_selection').removeAttr('checked');
 	}
 	else
 	{
 		$('#apply_discount_amount_div').hide(200);
 		$('#reduction_amount').val('0');
-		$('#apply_discount_to_cheapest').removeAttr('disabled');
 	}
 		
 	if (apply_to)
@@ -327,4 +347,4 @@ $('.datepicker').datepicker({
 	prevText: '',
 	nextText: '',
 	dateFormat: 'yy-mm-dd ' + hours + ':' + mins + ':' + secs
-});
+});

admin-dev/themes/default/template/controllers/cart_rules/form.tpl

@@ -1,28 +1,3 @@
-{*
-* 2007-2011 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-2011 PrestaShop SA
-*  @version  Release: $Revision: 8971 $
-*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
-*  International Registered Trademark & Property of PrestaShop SA
-*}
 {if $show_toolbar}
 	<div class="toolbar-placeholder">
 		<div class="toolbarBox {if $toolbar_fix}toolbarHead{/if}">
@@ -60,17 +35,17 @@
 	<div id="cart_rule_informations" class="cart_rule_tab">
 		<h4>{l s='Cart rule informations'}</h4>
 		<div class="separation"></div>
-		{include file='cart_rules/informations.tpl'}
+		{include file='controllers/cart_rules/informations.tpl'}
 	</div>
 	<div id="cart_rule_conditions" class="cart_rule_tab">
 		<h4>{l s='Cart rule conditions'}</h4>
 		<div class="separation"></div>
-		{include file='cart_rules/conditions.tpl'}
+		{include file='controllers/cart_rules/conditions.tpl'}
 	</div>
 	<div id="cart_rule_actions" class="cart_rule_tab">
 		<h4>{l s='Cart rule actions'}</h4>
 		<div class="separation"></div>
-		{include file='cart_rules/actions.tpl'}
+		{include file='controllers/cart_rules/actions.tpl'}
 	</div>
 	<div class="separation"></div>
 	<div style="text-align:center">
@@ -79,7 +54,8 @@
 	</div>
 </form>
 <script type="text/javascript">
-	var product_rules_counter = {if isset($product_rules_counter)}{$product_rules_counter}{else}0{/if};
+	var product_rule_groups_counter = {if isset($product_rule_groups_counter)}{$product_rule_groups_counter}{else}0{/if};
+	var product_rule_counters = new Array();
 	var currentToken = '{$currentToken}';
 	var currentFormTab = '{if isset($smarty.post.currentFormTab)}{$smarty.post.currentFormTab|escape}{else}informations{/if}';
 	
@@ -93,4 +69,4 @@
 	{/foreach}
 	displayFlags(languages, {$defaultLanguage});
 </script>
-<script type="text/javascript" src="themes/template/cart_rules/form.js"></script>
+<script type="text/javascript" src="themes/default/template/controllers/cart_rules/form.js"></script>

admin-dev/themes/default/template/controllers/cart_rules/informations.tpl

@@ -1,47 +1,27 @@
-{*
-* 2007-2011 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-2011 PrestaShop SA
-*  @version  Release: $Revision: 8971 $
-*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
-*  International Registered Trademark & Property of PrestaShop SA
-*}
 <table cellpadding="0" cellspacing="0">
 	<tr>
-		<td style="width:50%">
+		<td>
 			<label>{l s='Name'}</label>
 			<div class="margin-form">
 				<div class="translatable">
 				{foreach from=$languages item=language}
 					<div class="lang_{$language.id_lang}" style="display:{if $language.id_lang == $defaultLanguage}block{else}none{/if};float:left">
-						<input type="text" id="name_{$language.id_lang}" name="name_{$language.id_lang}" value="{$currentTab->getFieldValue($currentObject, 'name', $language.id_lang)}" style="width:300px" />
+						<input type="text" id="name_{$language.id_lang}" name="name_{$language.id_lang}" value="{$currentTab->getFieldValue($currentObject, 'name', $language.id_lang)}" />
 					</div>
 				{/foreach}
 				</div>
-				<p class="clear">{l s='Will be displayed in the cart summary as well as on the invoice.'}</p>
+				<p class="preference_description">{l s='Will be displayed in the cart summary as well as on the invoice.'}</p>
+			</div>
+			<label>{l s='Description'}</label>
+			<div class="margin-form">
+				<textarea name="description" style="width:80%;height:100px">{$currentTab->getFieldValue($currentObject, 'description')}</textarea>
+				<p class="preference_description">{l s='For you only, never displayed to the customer.'}</p>
 			</div>
 			<label>{l s='Code'}</label>
 			<div class="margin-form">
 				<input type="text" id="code" name="code" value="{$currentTab->getFieldValue($currentObject, 'code')}" />
-				<img src="../img/admin/news-new.gif" onclick="gencode(8);" style="cursor:pointer" />
-				<p>{l s='Optional, the rule will automatically be applied if you leave this field blank.'}</p>
+				<a href="javascript:gencode(8);" class="button">{l s='(Click to generate random code)'}</a>
+				<p class="preference_description">{l s='Caution! The rule will automatically be applied if you leave this field blank.'}</p>
 			</div>
 			<label>{l s='Partial use'}</label>
 			<div class="margin-form">
@@ -51,7 +31,7 @@
 				&nbsp;&nbsp;
 				<input type="radio" name="partial_use" id="partial_use_off" value="0"  {if !$currentTab->getFieldValue($currentObject, 'partial_use')|intval}checked="checked"{/if} />
 				<label class="t" for="partial_use_off"> <img src="../img/admin/disabled.gif" alt="{l s='Not allowed'}" title="{l s='Not allowed'}" style="cursor:pointer" /></label>
-				<p>
+				<p class="preference_description">
 					{l s='Only applicable if the voucher value is greater than the cart total.'}<br />
 					{l s='If you do not allow partial use, the voucher value will be lowered to the total order amount, but if you do, a new voucher will be created with the remainder.'}
 				</p>
@@ -59,7 +39,7 @@
 			<label>{l s='Priority'}</label>
 			<div class="margin-form">
 				<input type="text" name="priority" value="{$currentTab->getFieldValue($currentObject, 'priority')|intval}" />
-				<p>{l s='Cart rules are applied to the cart by priority. A cart rule with priority of "1" will be processed before a cart rule with a priority of "2".'}</p>
+				<p class="preference_description">{l s='Cart rules are applied to the cart by priority. A cart rule with priority of "1" will be processed before a cart rule with a priority of "2".'}</p>
 			</div>
 			<label>{l s='Status'}</label>
 			<div class="margin-form">
@@ -71,12 +51,5 @@
 				<label class="t" for="active_off"> <img src="../img/admin/disabled.gif" alt="{l s='Disabled'}" title="{l s='Disabled'}" style="cursor:pointer" /></label>
 			</div>
 		</td>
-		<td style="width:50%">
-			<label>{l s='Description'}</label>
-			<div class="margin-form">
-				<textarea name="description" style="width:90%;height:200px">{$currentTab->getFieldValue($currentObject, 'description')}</textarea>
-				<p>{l s='For you only, never displayed to the customer.'}</p>
-			</div>
-		</td>
 	</tr>
-</table>
+</table>

admin-dev/themes/default/template/controllers/cart_rules/product_rule.tpl

@@ -0,0 +1,34 @@
+<tr id="product_rule_{$product_rule_group_id}_{$product_rule_id}_tr">
+	<td>
+		<a href="javascript:removeProductRule({$product_rule_group_id}, {$product_rule_id});">
+			<img src="../img/admin/disabled.gif" alt="{l s='Remove'}" title="{l s='Remove'}" />
+		</a>
+	</td>
+	<td>
+		<input type="hidden" name="product_rule_{$product_rule_group_id}[]" value="{$product_rule_id}" />
+		<input type="hidden" name="product_rule_{$product_rule_group_id}_{$product_rule_id}_type" value="{$product_rule_type}" />
+		[{$product_rule_type}]
+	</td>
+	<td>
+		{l s='The product(s) are matching on of these'}
+	</td>
+	<td>
+		<input type="text" id="product_rule_{$product_rule_group_id}_{$product_rule_id}_match" value="" disabled="disabled" />
+	</td>
+	<td>
+		<a id="product_rule_{$product_rule_group_id}_{$product_rule_id}_choose_link" href="#product_rule_{$product_rule_group_id}_{$product_rule_id}_choose_content">
+			<img src="../img/admin/choose.gif" alt="{l s='Choose'}" title="{l s='Choose'}" /> {l s='Choose'}
+		</a>
+		<div>
+			<div id="product_rule_{$product_rule_group_id}_{$product_rule_id}_choose_content">
+				{$product_rule_choose_content}
+			</div>
+		</div>
+	</td>
+</tr>
+
+<script type="text/javascript">
+	$('#product_rule_{$product_rule_group_id}_{$product_rule_id}_choose_content').parent().hide();
+	$("#product_rule_{$product_rule_group_id}_{$product_rule_id}_choose_link").fancybox();
+	$(document).ready(function() { updateProductRuleShortDescription($('#product_rule_select_{$product_rule_group_id}_{$product_rule_id}_add')); });
+</script>

admin-dev/themes/default/template/controllers/cart_rules/product_rule_group.tpl

@@ -0,0 +1,36 @@
+<tr id="product_rule_group_{$product_rule_group_id}_tr">
+	<td style="vertical-align:center;padding-right:10px">
+		<a href="javascript:removeProductRuleGroup({$product_rule_group_id});">
+			<img src="../img/admin/disabled.gif" alt="{l s='Remove'}" title="{l s='Remove'}" />
+		</a>
+	</td>
+	<td style="padding-bottom:15px">
+		<input type="hidden" name="product_rule_group[]" value="{$product_rule_group_id}" />
+		{l s='The cart must contain at least'}
+		<input type="text" name="product_rule_group_{$product_rule_group_id}_quantity" value="{$product_rule_group_quantity|intval}" style="width:30px" />
+		{l s='product(s) matching the following rules:'}
+		<br />
+		<a href="javascript:addProductRule({$product_rule_group_id});">
+			<img src="../img/admin/add.gif" alt="{l s='Add'}" title="{l s='Add'}" />
+			{l s='Add a rule concerning'}
+		</a>
+		<select id="product_rule_type_{$product_rule_group_id}">
+			<option value="">{l s='-- Choose --'}</option>
+			<option value="products">{l s='Products'}</option>
+			<option value="attributes">{l s='Attributes'}</option>
+			<option value="categories">{l s='Categories'}</option>
+			<option value="manufacturers">{l s='Manufacturers'}</option>
+			<option value="suppliers">{l s='Suppliers'}</option>
+		</select>
+		<a href="javascript:addProductRule({$product_rule_group_id});">
+			<input type="button" class="button" value="OK" />
+		</a>
+		<table id="product_rule_table_{$product_rule_group_id}" class="table" cellpadding="0" cellspacing="0">
+			{if isset($product_rules) && $product_rules|@count}
+				{foreach from=$product_rules item='product_rule'}
+					{$product_rule}
+				{/foreach}
+			{/if}
+		</table>
+	</td>
+</tr>

admin-dev/themes/default/template/controllers/cart_rules/product_rule_itemlist.tpl

@@ -0,0 +1,32 @@
+<table>
+	<tr>
+		<td>
+			<p><strong>{l s='Selected'}</strong></p>
+			<select name="product_rule_select_{$product_rule_group_id}_{$product_rule_id}[]" class="product_rule_toselect" id="product_rule_select_{$product_rule_group_id}_{$product_rule_id}_2" style="border:1px solid #AAAAAA;width:400px;height:160px" multiple>
+				{foreach from=$product_rule_itemlist.selected item='item'}
+					<option value="{$item.id|intval}">&nbsp;{$item.name}</option>
+				{/foreach}
+			</select><br /><br />
+			<a style="cursor:pointer;text-align:center;display:block;border:1px solid #aaa;text-decoration:none;background-color:#fafafa;color:#123456;margin:2px;padding:2px" id="product_rule_select_{$product_rule_group_id}_{$product_rule_id}_remove">
+				{l s='Remove'} &gt;&gt;
+			</a>
+		</td>
+		<td style="padding-left:20px;">
+			<p><strong>{l s='Unselected'}</strong></p>
+			<select id="product_rule_select_{$product_rule_group_id}_{$product_rule_id}_1" style="border:1px solid #AAAAAA;width:400px;height:160px" multiple>
+				{foreach from=$product_rule_itemlist.unselected item='item'}
+					<option value="{$item.id|intval}">&nbsp;{$item.name}</option>
+				{/foreach}
+			</select><br /><br />
+			<a style="cursor:pointer;text-align:center;display:block;border:1px solid #aaa;text-decoration:none;background-color:#fafafa;color:#123456;margin:2px;padding:2px" id="product_rule_select_{$product_rule_group_id}_{$product_rule_id}_add">
+				&lt;&lt; {l s='Add'}
+			</a>
+		</td>
+	</tr>
+</table>
+
+<script type="text/javascript">
+	$('#product_rule_select_{$product_rule_group_id}_{$product_rule_id}_remove').click(function() { removeCartRuleOption(this); updateProductRuleShortDescription(this); });
+	$('#product_rule_select_{$product_rule_group_id}_{$product_rule_id}_add').click(function() { addCartRuleOption(this); updateProductRuleShortDescription(this); });
+	$(document).ready(function() { updateProductRuleShortDescription($('#product_rule_select_{$product_rule_group_id}_{$product_rule_id}_add')); });
+</script>

admin-dev/themes/default/template/controllers/carts/helpers/view/view.tpl

@@ -24,20 +24,21 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{extends file="helper/view/view.tpl"}
+{extends file="helpers/view/view.tpl"}
 
 {block name="override_tpl"}
 	
-	<h2>{if $customer->id}{$customer->firstname} {$customer->lastname}{else}{l s='Guest'}{/if} - {l s='Cart #'}{$cart->id|string_format:"%06d"} {l s='from'} {$cart->date_upd}</h2>
+	<div id="container-customer">
+		<h2><img src="../img/admin/basket.png" /><span>{if $customer->id}{$customer->firstname} {$customer->lastname}{else}{l s='Guest'}{/if} - {l s='Cart #'}{$cart->id|string_format:"%06d"}</span><span style="color:#585A69;padding-left:10px;">{l s='from'} {$cart->date_upd}</span></h2>
+				<div class="separation"></div>
 	
-	<br />
-	<div style="float: left;">
-	<fieldset style="width: 400px">
-		<legend><img src="../img/admin/tab-customers.gif" />{l s='Customer information'}</legend>
-		<span style="font-weight: bold; font-size: 14px;">
+	<div class="info-customer-left">
+		<h2><img src="../img/admin/vcard.png" />{l s='Customer information'}</h2>
+		<span style="font-size: 14px;">
 		{if $customer->id}
-			<a href={$link->getAdminLink('AdminCustomers')}&id_customer={$customer->id}&viewcustomer">{$customer->firstname} {$customer->lastname}</a></span> {l s='#'}{$customer->id}<br />
-			<a href="mailto:{$customer->email}">{$customer->email}</a>	<br /><br />
+			<a href="{$link->getAdminLink('AdminCustomers')}&id_customer={$customer->id}&viewcustomer">{$customer->firstname} {$customer->lastname}</a></span>
+			{l s='#'}{$customer->id}<br />
+			<a style="text-decoration: underline; color:#268CCD;" href="mailto:{$customer->email}">{$customer->email}</a>	<br /><br />
 			{l s='Account registered:'} {dateFormat date=$customer->date_add}<br />
 			{l s='Valid orders placed:'} <b>{$customer_stats.nb_orders}</b><br />
 			{l s='Total paid since registration:'} <b>{displayWtPriceWithCurrency price=$customer_stats.total_orders currency=$currency}</b><br />
@@ -45,30 +46,29 @@
 			{l s='Guest not registered'}
 		{/if}
 		</span>
-	</fieldset>
 	</div>
-	<div style="float: left; margin-left: 40px">
-	<fieldset style="width: 400px">
-		<legend><img src="../img/admin/cart.gif" /> {l s='Order information'}</legend>
-		<span style="font-weight: bold; font-size: 14px;">
+	<div class="info-customer-right">
+		<h2><img src="../img/admin/cart.gif" /> {l s='Order information'}</h2>
+		<span>
 		{if $order->id}
 			<a href="{$link->getAdminLink('AdminOrders')}&id_order={$order->id}&vieworder"> {l s='Order #'}{$order->id|string_format:"%06d"}</a></span>
 			<br /><br />
 			{l s='Made on:'} {dateFormat date=$order->date_add}<br /><br /><br /><br />
 		{else}
 			{l s='No order created from this cart'}</span>
-			<p><a href="{$link->getAdminLink('AdminOrders')}&id_cart={$cart->id}&addorder">{l s='Create an order with this cart'}</a></p>
+			<p><a class="button" href="{$link->getAdminLink('AdminOrders')}&id_cart={$cart->id}&addorder">{l s='Create an order with this cart'}</a></p>
 		{/if}
-	</fieldset>
 	</div>
 	<br style="clear:both;" />
-	<fieldset style="margin-top:25px; width: 715px; ">
-	<legend><img src="../img/admin/cart.gif" alt="{l s='Products'}" />{l s='Cart summary'}</legend>
-	<div style="float:left;">
-		<table style="width: 700px;" cellspacing="0" cellpadding="0" class="table" id="orderProducts">
+				<div class="separation"></div>
+				
+
+	<h2><img src="../img/admin/cart.gif" alt="{l s='Products'}" />{l s='Cart summary'}</h2>
+	<br/>
+		<table style="width:100%;" cellspacing="0" cellpadding="0" class="table" id="orderProducts">
 		<thead>
 			<tr>
-			<th align="center" style="width: 60px">&nbsp;</th>
+			<th height="39" align="center" style="width: 60px">&nbsp;</th>
 			<th>{l s='Product'}</th>
 			<th style="width: 80px; text-align: center">{l s='UP'}</th>
 			<th style="width: 20px; text-align: center">{l s='Qty'}</th>
@@ -183,8 +183,9 @@
 	{/if}
 	<div style="float:left; margin-top:15px;">
 	{l s='According to the group of this customer, prices are printed:'} <b>{if $order->getTaxCalculationMethod() == $smarty.const.PS_TAX_EXC}{l s='tax excluded'}{else}{l s='tax included'}{/if}</b>
-	</div></div>
+</div>
 	
-	</fieldset>
 	<div class="clear" style="height:20px;">&nbsp;</div>
 {/block}
+
+</div>

admin-dev/themes/default/template/controllers/categories/helpers/form/form.tpl

@@ -23,15 +23,15 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-{extends file="helper/form/form.tpl"}
+{extends file="helpers/form/form.tpl"}
 
 {block name="end_field_block"}
 	{if ($input.name == 'groupBox')}
-		<p class="hint" style="display:block">
+		<p class="hint" style="display:block; position:relative; display:inline-block;">
 			<span>{$input.info_introduction}</span><br />
 			<span>{$input.unidentified}</span><br />
 			<span>{$input.guest}</span><br />
 			<span>{$input.customer}</span><br />
-		</p><br /><br /><br /><br />
+		</p>
 	{/if}</div>
-{/block}
+{/block}

admin-dev/themes/default/template/controllers/categories/helpers/list/list_header.tpl

@@ -0,0 +1,92 @@
+{*
+* 2007-2011 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-2011 PrestaShop SA
+*  @version  Release: $Revision$
+*  @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_header.tpl"}
+
+{block name=leadin}
+<div class="cat_bar2">
+	{assign var=i value=0}
+	{foreach $categories_tree key=key item=category}
+		{if $i++ == 0}
+			&nbsp;<img src="../img/admin/home.gif" alt="" />
+			{assign var=params_url value=""}
+		{else}
+			{assign var=params_url value="&id_category={$category.id_category}&viewcategory"}
+		{/if}
+		{if $key == 0}
+			{$category.name}
+		{else}
+			<a href="{$currentIndex}{$params_url}&token={$token}">{$category.name}</a>&nbsp;>&nbsp;
+		{/if}
+	{/foreach}
+</div>
+	{if isset($delete_category) && $delete_category}
+		<form action="{$REQUEST_URI}" method="post">
+			<div class="warn">
+				<h2>
+					{if $need_delete_mode}
+						{l s='Do you want to delete products too?'}
+					{else}
+						{l s='Deleting this category will remove products linked with this category and without any others. Are you sure you want to continue?'}
+					{/if}
+				</h2>
+				{if $need_delete_mode}
+				<ul class="listForm">
+				<li>
+					<input type="radio" name="deleteMode" value="linkanddisable" id="deleteMode_linkanddisable" />
+					<label for="deleteMode_linkanddisable" style="float:none;">{l s='No, I want to link products without others categories with the parent category and disable them.'}</label>
+				</li>
+				<li>
+					<input type="radio" name="deleteMode" value="link" id="deleteMode_link" />
+					<label for="deleteMode_link" style="float:none;">{l s='No, I want to link products without others categories with the parent category.'}</label>
+				</li>
+				<li>
+					<input type="radio" name="deleteMode" value="delete" id="deleteMode_delete" />
+					<label for="deleteMode_delete" style="float:none">{l s='Yes, I want to remove products linked with this category and without any others categories.'}</label>
+				</li>
+				</ul>
+				{else}
+					<input type="hidden" name="deleteMode" value="delete" id="deleteMode_delete" />
+				{/if}
+				{foreach $POST as $key => $value}
+					{if $key != 'deleteMode'}
+						{if is_array($value)}
+							{foreach $value as $val}
+								<input type="hidden" name="{$key}[]" value="{$val}" />
+							{/foreach}
+						{else}
+							<input type="hidden" name="{$key}" value="{$value}" />
+						{/if}
+					{/if}
+				{/foreach}
+				<br />
+				<input type="submit" name="cancel" class="button" value="{l s='   Cancel   '}" />
+				<input type="submit" class="button" value="{l s='   Validate   '}" />
+			</div>
+		</form>
+		<div class="clear">&nbsp;</div>
+	{/if}
+{/block}

admin-dev/themes/default/template/controllers/cms/helpers/form/form.tpl

@@ -24,7 +24,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{extends file="../helper/form/form.tpl"}
+{extends file="helpers/form/form.tpl"}
 
 {block name="script"}
 	$(document).ready(function() {

admin-dev/themes/default/template/controllers/cms_categories/helpers/form/form.tpl

@@ -24,7 +24,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{extends file="../helper/form/form.tpl"}
+{extends file="helpers/form/form.tpl"}
 
 {block name="start_field_block"}
 	<div class="margin-form">

admin-dev/themes/default/template/controllers/countries/helpers/form/form.tpl

@@ -23,7 +23,7 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-{extends file="helper/form/form.tpl"}
+{extends file="helpers/form/form.tpl"}
 
 {block name="start_field_block"}
 	<div class="margin-form">

admin-dev/themes/default/template/controllers/customer_threads/helpers/list/list_header.tpl

@@ -24,7 +24,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{extends file="helper/list/list_header.tpl"}
+{extends file="helpers/list/list_header.tpl"}
 
 {block name="override_header"}
 

admin-dev/themes/default/template/controllers/customer_threads/helpers/options/options.tpl

@@ -23,7 +23,7 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-{extends file="helper/options/options.tpl"}
+{extends file="helpers/options/options.tpl"}
 {block name="after"}
 {if $use_sync}
 		<fieldset><legend>{l s='Sync'}</legend>

admin-dev/themes/default/template/controllers/customer_threads/helpers/view/view.tpl

@@ -24,7 +24,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{extends file="helper/view/view.tpl"}
+{extends file="helpers/view/view.tpl"}
 
 {block name="override_tpl"}
 	<form action="{$current}&token={$token}&viewcustomer_thread&id_customer_thread={$id_customer_thread}" method="post" enctype="multipart/form-data">
@@ -40,7 +40,7 @@
 			</div>
 
 			<p>
-				<img src="../img/admin/msg-forward.png" alt="" style="vertical-align: middle;" /> 
+				<img src="../img/admin/email_go.png" alt="" style="vertical-align: middle;" /> 
 				{l s='Forward this discussion to an employee:'}
 				<select name="id_employee_forward" style="vertical-align: middle;">
 					<option value="-1">{l s='-- Choose --'}</option>
@@ -142,7 +142,7 @@
 			{$message}
 		{/foreach}
 	</div>
-	<div class="clear">&nbsp;</div>
+
 
 
 	

admin-dev/themes/default/template/controllers/customer_threads/message.tpl

@@ -28,8 +28,8 @@
 
 {if !$email}
 
-	<fieldset style="margin-top:10px;{if !empty($message.employee_name)}background: rgb(255,236,242){/if}">
-		<legend {if !empty($message.employee_name)}style="background:rgb(255,210,225)"{/if}>
+	<fieldset style="margin-top:10px;{if !empty($message.id_employee)}background-color:#F0F8E6;border:1px solid #88D254{/if}">
+		<legend {if !empty($message.id_employee)}style="background-color:#F0F8E6;color:#000;border:1px solid #88D254;"{/if}>
 			{if !empty($message.employee_name)}
 				<img src="../img/t/AdminCustomers.gif" alt="{$PS_SHOP_NAME}" />
 					{$PS_SHOP_NAME} - {$message.employee_name}
@@ -45,43 +45,60 @@
 			{/if}
 		</legend>
 
-		<div style="font-size:11px">
-			{if !empty($message.id_customer) && empty($message.employee_name)}
-				<b>{l s='Customer ID:'}</b> 
-				<a href="index.php?tab=AdminCustomers&id_customer={$message.id_customer}&viewcustomer&token={getAdminToken tab='AdminCustomers'}" title="{l s='View customer'}">
+		<div class="infoCustomer">
+			{if !empty($message.id_customer) && empty($message.id_employee)}
+			<dl>
+				<dt>{l s='Customer ID:'}&#32;:</dd> 
+				<dd><a href="index.php?tab=AdminCustomers&id_customer={$message.id_customer}&viewcustomer&token={getAdminToken tab='AdminCustomers'}" title="{l s='View customer'}">
 					{$message.id_customer} <img src="../img/admin/search.gif" alt="{l s='view'}" />
-				</a><br />
+				</a>
+				</dd>
+			</dl>
 			{/if}
+			
+			<dl>			
+				<dt>{l s='Sent on:'}&#32;:</dt>
+				<dd>{$message.date_add}</dd> 
+			
+			</dl>
 
-			<b>{l s='Sent on:'}</b> {$message.date_add}<br />
-			{if empty($message.employee_name)}
-				<b>{l s='Browser:'}</b> {$message.user_agent}<br />
+			{if empty($message.id_employee)}
+			<dl>
+				<dt>{l s='Browser:'}&#32;:</dt>
+				<dd>{$message.user_agent}</dd>
+			</dl>
 			{/if}
 
 			{if !empty($message.file_name) && $file_name}
-				<b>{l s='File attachment'}</b> 
-				<a href="index.php?tab=AdminCustomerThreads&id_customer_thread={$message.id_customer_thread}&viewcustomer_thread&token={getAdminToken tab='AdminCustomerThreads'}&filename={$message.file_name}"
+			<dl>
+				<dt>{l s='File attachment'}&#32;:</dt> 
+				<dd><a href="index.php?tab=AdminCustomerThreads&id_customer_thread={$message.id_customer_thread}&viewcustomer_thread&token={getAdminToken tab='AdminCustomerThreads'}&filename={$message.file_name}"
 					title="{l s='View file'}">
 						<img src="../img/admin/search.gif" alt="{l s='view'}" />
-				</a><br />
+				</a>
+				</dd>
+			</dl>
 			{/if}
 
-			{if !empty($message.id_order) && empty($message.employee_name)}
-				<b>{l s='Order #'}</b> 
-				<a href="index.php?tab=AdminOrders&id_order={$message.id_order}&vieworder&token={getAdminToken tab='AdminOrders'}" title="{l s='View order'}">
+			{if !empty($message.id_order) && empty($message.id_employee)}
+				<dl>
+					<dt>{l s='Order #'}&#32;:</dt> 
+					<dd><a href="index.php?tab=AdminOrders&id_order={$message.id_order}&vieworder&token={getAdminToken tab='AdminOrders'}" title="{l s='View order'}">
 					{$message.id_order} <img src="../img/admin/search.gif" alt="{l s='view'}" />
-				</a><br />
+				</a></dd>
+				</dl>
 			{/if}
 
-			{if !empty($message.id_product) && empty($message.employee_name)}
-				<b>{l s='Product #'}</b> 
-				<a href="index.php?tab=AdminOrders&id_order={$id_order_product}&vieworder&token={getAdminToken tab='AdminOrders'}" title="{l s='View order'}">
+			{if !empty($message.id_product) && empty($message.id_employee)}
+				<dl>
+					<dt>{l s='Product #'}&#32;:</dt> 
+					<dd><a href="index.php?tab=AdminOrders&id_order={$id_order_product}&vieworder&token={getAdminToken tab='AdminOrders'}" title="{l s='View order'}">
 					{$message.id_product} <img src="../img/admin/search.gif" alt="{l s='view'}" />
-				</a><br />
+				</a></dd>
+				</dl>
 			{/if}
-			<br />
-
-			<form action="{$current}&token={$token}&id_customer_thread={$message.id_customer_thread}&viewcustomer_thread" method="post">
+			
+				<form action="{$current}&token={$token}&id_customer_thread={$message.id_customer_thread}&viewcustomer_thread" method="post">
 				<b>{l s='Subject:'}</b>
 				<input type="hidden" name="id_customer_message" value="{$message.id_customer_message}" />
 				<select name="id_contact" onchange="this.form.submit();">
@@ -93,9 +110,10 @@
 				</select>
 			</form>
 
+
 {else}
 
-	<div style="font-size:11px">
+	<div class="infoEmployee">
 		{if $id_employee}
 			<a href="{$current}&token={getAdminToken tab='AdminCustomerThreads'}&id_customer_thread={$message.id_customer_thread}&viewcustomer_thread">'.
 				{l s='View this thread'}
@@ -109,40 +127,41 @@
 			{$message.email}
 		{/if}
 
-		{if !empty($message.id_customer) && empty($message.employee_name)}
+		{if !empty($message.id_customer) && empty($message.id_employee)}
 			<br /><b>{l s='Customer ID:'}</b> {$message.id_customer}<br />
 		{/if}
 
-		{if !empty($message.id_order) && empty($message.employee_name)}
+		{if !empty($message.id_order) && empty($message.id_employee)}
 			<br /><b>{l s='Order #'}:</b> {$message.id_order}<br />
 		{/if}
 
-		{if !empty($message.id_product) && empty($message.employee_name)}
+		{if !empty($message.id_product) && empty($message.id_employee)}
 			<br /><b>{l s='Product #'}:</b> {$message.id_product}<br />
 		{/if}
 
 		<br /><b>{l s='Subject:'}</b> {$message.subject}
 
 {/if}
-		<br /><br />
-		<b>{l s='Thread ID:'}</b> {$message.id_customer_thread}<br />
-		<b>{l s='Message ID:'}</b> {$message.id_customer_message}<br />
-		<b>{l s='Message:'}</b><br />
-		{$message.message}
+		<dl>
+			<dt>{l s='Thread ID:'}&#32;:</dt>
+			<dd>{$message.id_customer_thread}</dd>
+		</dl>
+		<dl>
+			<dt>{l s='Message ID:'}&#32;:</dt>
+			<dd>{$message.id_customer_message}</dd>
+		</dl>
+		<dl>
+			<dt>{l s='Message:'}&#32;:</dt>
+			<dd>{$message.message}</dd>
+		</dl>
 	</div>
 
-
 {if !$email}
-
-	{if empty($message.employee_name)}
-
-		<p style="text-align:right">
-			<button style="font-family: Verdana; font-size: 11px; font-weight:bold; height: 65px; width: 120px;" 
+	{if empty($message.id_employee)}
+			<button class="button" style="font-size:12px;"
 				onclick="$('#reply_to_{$message.id_customer_message}').show(500); $(this).hide();">
-				<img src="../img/admin/contact.gif" alt="" style="margin-bottom: 5px;" /><br />{l s='Reply to this message'}
+				<img src="../img/admin/contact.gif" alt=""/>{l s='Reply to this message'}
 			</button>
-		</p>
-
 	{/if}
 
 	<div id="reply_to_{$message.id_customer_message}" style="display: none; margin-top: 20px;"">
@@ -157,7 +176,7 @@
 			<div style="width: 450px; margin-top: 0px;">
 				<input type="file" name="joinFile"/>
 			<div>
-			<div style="width: 450px; text-align: center;">
+			<div>
 				<input type="submit" class="button" name="submitReply" value="{l s='Send my reply'}" style="margin-top:20px;" />
 				<input type="hidden" name="id_customer_thread" value="{$message.id_customer_thread}" />
 				<input type="hidden" name="msg_email" value="{$message.email}" />
@@ -169,10 +188,4 @@
 
 {/if}
 
-		</div>
-
-
-
-
-
-	</fieldset>
+	</fieldset>

admin-dev/themes/default/template/controllers/customers/helpers/list/list_header.tpl

@@ -24,21 +24,24 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{extends file="helper/list/list_header.tpl"}
+{extends file="helpers/list/list_header.tpl"}
 
 {block name=leadin}
 	{if isset($delete_customer) && $delete_customer}
 		<form action="{$REQUEST_URI}" method="post">
-			<fieldset><legend>{l s='How do you want to delete your customer(s)?'}</legend>
-				{l s='You have two ways to delete a customer, please choose what you want to do.'}
-				<p>
+			<div class="warn">
+				<h2>{l s='How do you want to delete your customer(s)?'}</h2>
+				<p>{l s='You have two ways to delete a customer, please choose what you want to do.'}</p>
+				<ul class="listForm">
+				<li>
 					<input type="radio" name="deleteMode" value="real" id="deleteMode_real" />
-					<label for="deleteMode_real" style="float:none">{l s='I want to delete my customer(s) for real, all data will be removed from the database. A customer with the same e-mail address will be able to register again.'}</label>
-				</p>
-				<p>
+					<label for="deleteMode_real" style="float:none;">{l s='I want to delete my customer(s) for real, all data will be removed from the database. A customer with the same e-mail address will be able to register again.'}</label>
+				</li>
+				<li>
 					<input type="radio" name="deleteMode" value="deleted" id="deleteMode_deleted" />
 					<label for="deleteMode_deleted" style="float:none">{l s='I don\'t want my customer(s) to register again. The customer(s) will be removed from this list but all data will be kept in the database.'}</label>
-				</p>
+				</li>
+				</ul>
 				{foreach $POST as $key => $value}
 					{if is_array($value)}
 						{foreach $value as $val}
@@ -49,7 +52,7 @@
 					{/if}
 				{/foreach}
 				<br /><input type="submit" class="button" value="{l s='   Delete   '}" />
-			</fieldset>
+			</div>
 		</form>
 		<div class="clear">&nbsp;</div>
 	{/if}

admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl

@@ -24,7 +24,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{extends file="helper/view/view.tpl"}
+{extends file="helpers/view/view.tpl"}
 
 {block name="override_tpl"}
 	<script type="text/javascript">
@@ -63,11 +63,11 @@
 				<img src="../img/admin/edit.gif" />
 			</a>
 		</div>
-		<span style="font-weight: bold; font-size: 14px;">
+		<span style="font-size: 14px;">
 			{$customer->firstname} {$customer->lastname}
 		</span>
 		<img src="{$gender_image}" style="margin-bottom: 5px" /><br />
-		<a href="mailto:{$customer->email}" style="text-decoration: underline; color: blue">{$customer->email}</a>
+		<a href="mailto:{$customer->email}" style="text-decoration: underline; color:#268CCD;">{$customer->email}</a>
 		<br /><br />
 		{l s='ID:'} {$customer->id|string_format:"%06d"}<br />
 		{l s='Registration date:'} {$registration_date}<br />
@@ -115,7 +115,7 @@
 		<form action="ajax.php" method="post" onsubmit="saveCustomerNote();return false;" id="customer_note">
 			<textarea name="note" id="noteContent" style="width:600px;height:100px" onkeydown="$('#submitCustomerNote').removeAttr('disabled');">{$customer_note}</textarea><br />
 			<input type="submit" id="submitCustomerNote" class="button" value="{l s='   Save   '}" style="float:left;margin-top:5px" disabled="disabled" />
-			<span id="note_feedback" style="margin:10px 0 0 10px"></span>
+			<span id="note_feedback" style="position:relative; top:10px; left:10px;"></span>
 		</form>
 	</div>
 	<div class="clear"></div>
@@ -148,9 +148,7 @@
 	{/if}
 	
 	{* display hook specified to this page : AdminCustomers *}
-	{if $hook !== false}
-		<div>{$hook}</div>
-	{/if}
+	<div>{hook h="displayAdminCustomers" id_customer=$customer->id}</div>
 	
 	<div class="clear">&nbsp;</div>
 	
@@ -223,7 +221,7 @@
 		{assign var=count_ko value=count($orders_ko)}
 		{if $count_ko}
 			<div>
-				<h3 style="color:red;font-weight:700">{l s='Invalid orders:'} {$count_ko}</h3>
+				<h3 style="color:red;font-weight:normal;">{l s='Invalid orders:'} {$count_ko}</h3>
 				<table cellspacing="0" cellpadding="0" class="table" style="width:100%;">
 					<colgroup>
 						<col width="10px"></col>

admin-dev/themes/default/template/controllers/db/helpers/form/form.tpl

@@ -23,7 +23,7 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-{extends file="helper/form/form.tpl"}
+{extends file="helpers/form/form.tpl"}
 
 {block name="label"}
 	{if $input.type == 'table'}

admin-dev/themes/default/template/controllers/employees/helpers/form/form.tpl

@@ -23,7 +23,7 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-{extends file="helper/form/form.tpl"}
+{extends file="helpers/form/form.tpl"}
 
 {block name="start_field_block"}
 	<div class="margin-form">

admin-dev/themes/default/template/controllers/feature_value/helpers/form/form.tpl

@@ -23,11 +23,11 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-{extends file="helper/form/form.tpl"}
+{extends file="helpers/form/form.tpl"}
 
 {block name="end_field_block"}
 	</div>
 	{if $input.name == 'id_feature'}
-		{if isset($hook)}{$hook}{/if}
+		{hook h="displayFeatureValueForm" id_feature_value=$feature_value->id}
 	{/if}
 {/block}

admin-dev/themes/default/template/controllers/features/helpers/form/form.tpl

@@ -19,15 +19,15 @@
 *
 *  @author PrestaShop SA <contact@prestashop.com>
 *  @copyright  2007-2011 PrestaShop SA
-*  @version  Release: $Revision: 9771 $
+*  @version  Release: $Revision$
 *  @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"}
 
-
-{if isset($module_content)}
-	{$module_content}
-{else}
-	{include file='modules/js.tpl'}
-	{include file='modules/page.tpl'}
-{/if}
+{block name="end_field_block"}
+	</div>
+	{if $input.name == 'name'}
+		{hook h="displayFeatureForm" id_feature=$form_id}
+	{/if}
+{/block}

admin-dev/themes/default/template/controllers/generator/helpers/options/options.tpl

@@ -23,7 +23,7 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-{extends file="helper/options/options.tpl"}
+{extends file="helpers/options/options.tpl"}
 {block name="defaultOptions"}
 		<form action="{$current}&amp;token={$token}" method="post" enctype="multipart/form-data">
 		<fieldset><legend><img src="../img/admin/htaccess.gif" alt="" />{l s='Htaccess file generation'}</legend>

admin-dev/themes/default/template/controllers/geolocation/helpers/options/options.tpl

@@ -24,7 +24,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{extends file="helper/options/options.tpl"} 
+{extends file="helpers/options/options.tpl"}
 {block name="start_field_block"}
 	{if $field['type'] == 'checkbox_table'}
 		<div class="margin-form" style="float: left; padding-left: 0; width: 317px; margin-top: 6px; height: 300px; overflow-y: auto;">

admin-dev/themes/default/template/controllers/group_shop/helpers/form/form.tpl

@@ -23,7 +23,7 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-{extends file="helper/form/form.tpl"}
+{extends file="helpers/form/form.tpl"}
 
 {block name=script}
 

admin-dev/themes/default/template/controllers/groups/helpers/form/form.tpl

@@ -24,7 +24,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{extends file="helper/form/form.tpl"} 
+{extends file="helpers/form/form.tpl"}
 
 {block name="label"}
 	{if $input['type'] == 'modules'}
@@ -202,15 +202,14 @@
 			$(document).ready(function() {
 				$( "#sortable_module_authorize_list, #sortable_module_unauthorize_list" ).sortable({
 					connectWith: ".connectedSortable",
-			        stop: function(event, ui) 
+					stop: function(event, ui) 
 					{
-			          	console.log($(event.toElement).parent('ul').attr('id'));
-			          	if ($(event.toElement).parent('ul').attr('id') == 'sortable_module_authorize_list')
-	               			$(event.toElement).children('input["type=hidden"]').attr('name', 'modulesBoxAuth[]');
-	               		else
-	               			$(event.toElement).children('input["type=hidden"]').attr('name', 'modulesBoxUnauth[]');
-			        }
-	            }).disableSelection();
+						if ($(event.toElement).parent('ul').attr('id') == 'sortable_module_authorize_list')
+							$(event.toElement).children('input["type=hidden"]').attr('name', 'modulesBoxAuth[]');
+						else
+							$(event.toElement).children('input["type=hidden"]').attr('name', 'modulesBoxUnauth[]');
+					}
+				}).disableSelection();
 			});
 		</script>
 			<table cellspacing="0" cellpadding="0" class="table" style="width:600px">

admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl

@@ -24,16 +24,15 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{extends file="helper/view/view.tpl"}
+{extends file="helpers/view/view.tpl"}
 
 {block name="override_tpl"}
 
-	<fieldset style="width: 400px">
-		<span style="font-weight: bold; font-size: 14px;">{l s='Name:'}</span> {$group->name[$language->id]}
-		<div class="clear">&nbsp;</div>
-		<span style="font-weight: bold; font-size: 14px;">{l s='Discount:'}</span> {$group->reduction} {l s='%'}
-		<div class="clear">&nbsp;</div>
-		<span style="font-weight: bold; font-size: 14px;">{l s='Current category discount:'}</span>
+	<fieldset>
+		<ul>
+			<li><span style="font-weight: bold; font-size: 13px; color:#000;">{l s='Name:'}</span> {$group->name[$language->id]}</li>
+		<li><span style="font-weight: bold; font-size: 13px; color:#000;">{l s='Discount:'}</span> {$group->reduction} {l s='%'}</li>
+		<li><span style="font-weight: bold; font-size: 13px; color:#000;">{l s='Current category discount:'}</span>
 			{if !$categorieReductions}
 				{l s='None'}
 			{else}
@@ -46,16 +45,18 @@
 					{/foreach}
 				</table>
 			{/if}
-		<div class="clear">&nbsp;</div>
-		<span style="font-weight: bold; font-size: 14px;">{l s='Price display method:'}</span>
+			</li>
+			
+		<li><span style="font-weight: bold; font-size: 13px; color:#000;">{l s='Price display method:'}</span>
 			{if $group->price_display_method}
 				{l s='Tax excluded'}
 			{else}
 				{l s='Tax included'}
 				{/if}
-		<div class="clear">&nbsp;</div>
-		<span style="font-weight: bold; font-size: 14px;">{l s='Show prices:'}</span> {if $group->show_prices}{l s='Yes'}{else}{l s='No'}{/if}
-		<div class="clear">&nbsp;</div>
+		</li>
+		<li><span style="font-weight: bold; font-size: 13px; color:#000;">{l s='Show prices:'}</span> {if $group->show_prices}{l s='Yes'}{else}{l s='No'}{/if}
+		</li>
+		</ul>
 	</fieldset>
 	<h2>{l s='Customer members of this group'}</h2>
 	{$customerList}

admin-dev/themes/default/template/controllers/home/content.tpl

@@ -24,12 +24,15 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-<div class="toolbarBox">
-	<div class="pageTitle">
+	<div class="pageTitleHome">
 		<span><h3>{l s='Dashboard'}</h3></span>
 	</div>
-</div>
-	{if $upgrade}
+<div id="dashboard">
+<div id="homepage">
+
+
+	<div id="column_left">
+		{if $upgrade}
 		<div id="blockNewVersionCheck">
 		{if $upgrade->need_upgrade}
 			<div class="warning warn" style="margin-bottom:10px;"><h3>{l s ='New PrestaShop version available'} : <a style="text-decoration: underline;" href="{$upgrade->link}" target="_blank">{l s ='Download'} {$upgrade->version_name}</a> !</h3></div>
@@ -42,13 +45,20 @@
 		<p>{l s ='If you don\'t know how to do that, please contact your host administrator !'}</p><br />
 	{/if}
 {if $employee->bo_show_screencast}
-<div id="adminpresentation">
-	<iframe src="{$protocol}://screencasts.prestashop.com/v1.5/screencast.php?iso_lang={$isoUser}" style="border:none;width:100%;height:384px;" scrolling="no"></iframe>
+<div id="adminpresentation" style="display:block;">
+<h2>{l s ='Video'}</h2>
+		<div id="video">
+			<a href="{$protocol}://screencasts.prestashop.com/v1.5/screencast.php?iso_lang={$isoUser}" id="screencast_fancybox"><img height="128" width="220" src="../img/admin/preview_fr.jpg" /><span class="mask-player"></span></a>
+		</div>
+			<div id="video-content">
+			<p>{l s ='Start now with PrestaShop and all new features to help you sell more and simplify management of your shop'}</p>
+			</div>
 	<div id="footer_iframe_home">
 		<!--<a href="#">{l s ='View more video tutorials'}</a>-->
 		<input type="checkbox" id="screencast_dont_show_again">
 		<label for="screencast_dont_show_again">{l s='don\'t show again'}</label>
 	</div>
+				<div class="separation"></div>
 </div>
 <script type="text/javascript">
 $(document).ready(function() {
@@ -62,7 +72,7 @@ $(document).ready(function() {
 					controller : 'AdminHome',
 					token : '{$token}',
 					id_employee : '{$employee->id}',
-					action : 'hideScreencast',
+					action : 'hideScreencast'
 				},
 				url: 'ajax-tab.php',
 				dataType : 'json',
@@ -84,11 +94,9 @@ $(document).ready(function() {
 	});
 });
 </script>
-<div class="clear"></div>
 {/if}
 
-<div id="homepage">
-	<div id="column_left">
+<h2>{l s='Quick link'}</h2>
 		<ul class="F_list clearfix">
 		{foreach from=$quick_links key=k item=link}
 		<li id="{$k}_block">
@@ -98,35 +106,48 @@ $(document).ready(function() {
 			</a>
 		</li>
 		{/foreach}
+		{hook h="displayAdminHomeQuickLinks"}
 		</ul>
+	<div class="separation"></div>
+	<div id="partner_preactivation"><h2>{l s='Your Required'}</h2><p class="center"><img src="../img/loader.gif" alt="" /></p>
+		<div class="separation"></div>
+	</div>
+
+	{$tips_optimization}
+	<div id="discover_prestashop"><p class="center"><img src="../img/loader.gif" alt="" />{l s='Loading...'}</p></div>
+
+	{hook h="displayAdminHomeInfos"}
+
+</div>
+
+
+	<div id="column_right">
+	<h2>{l s='Your Indicators'}</h2>
 		{$monthly_statistics}
 		{$customers_service}
 		{$stats_sales}
 		{$last_orders}
-
-
-	<div id="column_right">
-	{$tips_optimization}
-	<div id="partner_preactivation"><p class="center"><img src="../img/loader.gif" alt="" />{l s='Loading...'}</p></div>
-	<div id="discover_prestashop"><p class="center"><img src="../img/loader.gif" alt="" />{l s='Loading...'}</p></div>
+		{hook h="displayAdminHomeStatistics"}
 	</div>
-	{$HOOK_BACKOFFICEHOME}
+
 </div>
 	<div class="clear">&nbsp;</div>
+	
+	</div>
+
 <script type="text/javascript">
 $(document).ready(function() {
-
-	if({$refresh_check_version})
+	if ({$refresh_check_version})
 	{
 		$('#blockNewVersionCheck').hide();
-	$.ajax({
+		$.ajax({
 			type : 'POST',
 			data : {
 				ajax : '1',
 				controller : 'AdminHome',
 				token : '{$token}',
 				id_employee : '{$employee->id}',
-				action : 'refreshCheckVersion',
+				action : 'refreshCheckVersion'
 			},
 			url: 'ajax-tab.php',
 			dataType : 'json',
@@ -177,7 +198,7 @@ $(document).ready(function() {
 
 			$('#discover_prestashop').fadeOut('slow', function() {
 				if (json.discover_prestashop != 'NOK')
-					$('#discover_prestashop').html(json.discover_prestashop);
+					$('#discover_prestashop').replaceWith(json.discover_prestashop);
 				else
 					$('#discover_prestashop').html('');
 				$('#discover_prestashop').fadeIn('slow');
@@ -193,5 +214,27 @@ $(document).ready(function() {
 			$('#discover_prestashop').fadeOut('slow');
 		}
 	});
+	$('#screencast_fancybox').bind('click', function(event)
+	{
+		$.fancybox(
+			this.href,
+			{
+				'width'				: 	660,
+				'height'			: 	384,
+				'transitionIn'		: 'none',
+				'transitionOut'		: 'none',
+				'type' 				: 'iframe',
+				'scrolling'			: 'no',
+				'onComplete'		: function()
+					{
+						// Rewrite some css properties of Fancybox
+						$('#fancybox-wrap').css('width', '');
+						$('#fancybox-content').css('background-color', '');
+						$('#fancybox-content').css( 'border', '');
+					}
+			});
+
+		event.preventDefault();
+	});
 });
 </script>

admin-dev/themes/default/template/controllers/images/content.tpl

@@ -52,7 +52,7 @@
 				<label class="second-select format_{$k}" style="display:none;">{l s='Select format'}</label>
 				<div class="second-select margin-form format_{$k}" style="display:none;">
 					<select class="second-select format_{$k}" name="format_{$k}">
-						<option value="all">{l s='All'}</option>';
+						<option value="all">{l s='All'}</option>
 						{foreach $formats[$k] AS $format}
 							<option value="{$format['id_image_type']}">{$format['name']}</option>
 						{/foreach}

admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl

@@ -155,8 +155,8 @@
 					{/foreach}
 				</select>
 			{/if}
-				&nbsp;&nbsp;<img src="../img/admin/add.gif" alt="Uplaod" title="Upload" />
-				<b><a href="#upload_file_import" id="upload_file_import_link">{l s='Upload'}</a></b>
+				&nbsp;&nbsp;
+				<a href="#upload_file_import" id="upload_file_import_link" class="button"><img src="../img/admin/add.gif" alt="Uplaod" title="Upload" />{l s='Upload'}</a>
 			</div>
 			<br />
 				
@@ -199,14 +199,16 @@
 				<p>{l s='Note that you can have serveral products with the same reference.'}</p>
 			</div>
 			<div class="warn import_supply_orders_details" style="margin-top: 20px; display:none">
-				<p>{l s='Importing Supply Order Details will first reset the products ordered.'}</p>
+				<p>{l s='Importing Supply Order Details will first reset the products ordered, if any.'}</p>
 			</div>
 		{if !count($files_to_import)}
 			<div class="warn" style="margin-top: 20px;">
-				{l s='There is no CSV file available, please upload one using the form above.'}
-				<br /><br />
-				{l s='You can read informations on CSV import at:'} <a href="http://www.prestashop.com/wiki/Troubleshooting_6/" target="_blank">http://www.prestashop.com/wiki/Troubleshooting_6/</a><br /><br />
-				{l s='Read more about CSV format at: '} <a href="http://en.wikipedia.org/wiki/Comma-separated_values" target="_blank">http://en.wikipedia.org/wiki/Comma-separated_values</a>
+				<p>{l s='There is no CSV file available, please upload one using the \'Upload\' button above.'}</p>
+				<ul>
+				<li>{l s='You can read informations on CSV import at:'} <a href="http://www.prestashop.com/wiki/Troubleshooting_6/" target="_blank">http://www.prestashop.com/wiki/Troubleshooting_6/</a></li>	
+					<li>
+				{l s='Read more about CSV format at: '} <a href="http://en.wikipedia.org/wiki/Comma-separated_values" target="_blank">http://en.wikipedia.org/wiki/Comma-separated_values</a></li>
+				</ul>
 			</div>
 		{/if}
 	</fieldset>
@@ -268,19 +270,25 @@
 			$(".import_products_categories").hide();
 
 		$("#entitie").html($("#entity > option:selected").text().toLowerCase());
-		$.getJSON("ajax.php",
-		{
-			getAvailableFields:1,
-			entity: $("#entity").val()
-		},
-		function(j)
-		{
-			var fields = "";
-			$("#availableFields").empty();
-			for (var i = 0; i < j.length; i++)
-				fields += j[i].field;
-			$("#availableFields").html(fields);
-			activeClueTip();
+		$.ajax({
+			url: 'ajax.php',
+			data: {
+				getAvailableFields:1,
+				entity: $("#entity").val()
+			},
+			dataType: 'json',
+			success: function(j) {
+				var fields = "";
+				$("#availableFields").empty();
+				
+				for (var i = 0; i < j.length; i++)
+					fields += j[i].field;
+
+				$("#availableFields").html(fields);
+				activeClueTip();
+			},
+			error: function(j) {		
+			}			
 		});
 
 	});

admin-dev/themes/default/template/controllers/import/helpers/view/view.tpl

@@ -24,12 +24,13 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{extends file="helper/view/view.tpl"}
+{extends file="helpers/view/view.tpl"}
 
 {block name="override_tpl"}
 	<script type="text/javascript">
 		var errorEmpty = "{l s='Please enter a name to save.'}"
 	</script>
+	<div id="container-customer">
 	<h2>{l s='View your data'}</h2>
 	<div>
 		<b>{l s='Save and load your matching configuration'} : </b><br><br>
@@ -134,5 +135,6 @@
 		</table>
 		<script type="text/javascript">showTable(current);</script>
 	</form>
+	</div>
 {/block}
 

admin-dev/themes/default/template/controllers/information/helpers/view/view.tpl

@@ -24,7 +24,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{extends file="helper/view/view.tpl"}
+{extends file="helpers/view/view.tpl"}
 
 {block name="override_tpl"}
 

admin-dev/themes/default/template/controllers/invoices/helpers/form/form.tpl

@@ -23,7 +23,7 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-{extends file="helper/form/form.tpl"}
+{extends file="helpers/form/form.tpl"}
 
 {block name=script}
 
@@ -65,7 +65,7 @@
 	<div class="margin-form">
 		{if $input.type == 'checkboxStatuses'}
 			{foreach $input.values.query as $value}
-				{assign var=id_checkbox value=$input.name|cat:'_'|cat:$value[$input.values.id]|intval}
+				{assign var=id_checkbox value=$input.name|cat:'_'|cat:intval($value[$input.values.id])}
 				<input type="checkbox"
 					name="{$input.name}[]"
 					id="{$id_checkbox}"

admin-dev/themes/default/template/controllers/languages/helpers/form/form.tpl

@@ -23,7 +23,7 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-{extends file="helper/form/form.tpl"}
+{extends file="helpers/form/form.tpl"}
 
 {block name="start_field_block"}
 	<div class="margin-form">
@@ -33,10 +33,16 @@
 {/block}
 
 {block name=script}
+		var langPackOk = "<img src=\"{$smarty.const._PS_IMG_}admin/information.png\" alt=\"\" /> {l s='A language pack is available for this ISO (name is'}";
+		var langPackVersion = "{l s='The compatible Prestashop version for this language and your system is: '}";
+		var langPackInfo = "{l s='After creating the language, you can import the content of the language pack, which you can download above under "Tools - Translations"'}";
+		var noLangPack = "<img src=\"{$smarty.const._PS_IMG_}admin/information.png\" alt=\"\" /> {l s='No language pack available on prestashop.com for this ISO code'}";
+		var download = "{l s='Download'}";
 
 	$(document).ready(function() {
-		$('#iso_code').keyup(function() {
-			checkLangPack();
+		$('#iso_code').keyup(function(e) {
+			e.preventDefault();
+			checkLangPack("{$token}");
 		});
 	});
 

admin-dev/themes/default/template/controllers/login/content.tpl

@@ -52,7 +52,7 @@
 		<h1>{$shop_name}</h1>
 		<form action="" method="post" id="login_form" onsubmit="doAjaxLogin();return false;">
 			<label for="email">{l s='E-mail address:'}</label><br />
-			<input type="text" id="email" name="email" class="input" value="{if isset($email)}{$email}{/if}" />
+			<input type="text" id="email" name="email" class="input" value="{if isset($email)}{$email|htmlentities}{/if}" />
 			<div style="margin: 1.8em 0 0 0;">
 				<label for="passwd">{l s='Password:'}</label><br />
 				<input id="passwd" type="password" name="passwd" class="input" value="{if isset($password)}{$password}{/if}"/>
@@ -78,7 +78,6 @@
 			<p><span>{l s='For security reasons, you cannot connect to the Back Office until after you have:'}<br /><br />
 				<ul>
 					<li>{l s='delete the /install folder'}</li>
-					<li>{l s='delete the /install-new folder'}</li>
 					<li>{l s='renamed the /admin folder (eg.) /admin'}{$randomNb}</li>
 				</ul>
 			<br />{l s='Please then access this page by the new url (eg.) http://www.domain.tld/admin'}{$randomNb}</span></p>

admin-dev/themes/default/template/controllers/logs/helpers/list/list_header.tpl

@@ -24,7 +24,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{extends file="helper/list/list_header.tpl"}
+{extends file="helpers/list/list_header.tpl"}
 
 {block name="override_header"}
 

admin-dev/themes/default/template/controllers/manufacturers/helpers/view/view.tpl

@@ -24,7 +24,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{extends file="helper/view/view.tpl"}
+{extends file="helpers/view/view.tpl"}
 
 {block name="override_tpl"}
 
@@ -60,7 +60,6 @@
 			</table><br />
 		{/foreach}
 	{/if}
-	<br /><br />
 
 	<h3>{l s='Total products:'} {count($products)}</h3>
 	{foreach $products AS $product}
@@ -70,9 +69,10 @@
 				<a href="?tab=AdminProducts&id_product={$product->id}&updateproduct&token={getAdminToken tab='AdminProducts'}" class="button">{l s='Edit'}</a>
 				<a href="?tab=AdminProducts&id_product={$product->id}&deleteproduct&token={getAdminToken tab='AdminProducts'}" class="button" onclick="return confirm('{l s='Delete item #'}{$product->id} ?');">{l s='Delete'}</a>
 			</div>
-			<table border="0" cellpadding="0" cellspacing="0" class="table" style="width:80%;margin-left:10%;">
+			<br/><br/>
+			<table border="0" cellpadding="0" cellspacing="0" class="table" style="width:100%;">
 				<tr>
-					<th>{$product->name}</th>
+					<th height="39">{$product->name}</th>
 					{if !empty($product->reference)}<th width="150">{l s='Ref:'} {$product->reference}</th>{/if}
 					{if !empty($product->ean13)}<th width="120">{l s='EAN13:'} {$product->ean13}</th>{/if}
 					{if !empty($product->upc)}<th width="120">{l s='UPC:'} {$product->upc}</th>{/if}
@@ -85,9 +85,9 @@
 				<a href="?tab=AdminProducts&id_product={$product->id}&deleteproduct&token={getAdminToken tab='AdminProducts'}" class="button" onclick="return confirm('{l s='Delete item #'}{$product->id} ?');">{l s='Delete'}</a>
 			</div>
 			<h3><a href="?tab=AdminProducts&id_product={$product->id}&updateproduct&token={getAdminToken tab='AdminProducts'}">{$product->name}</a></h3>
-			<table border="0" cellpadding="0" cellspacing="0" class="table" style="width:80%;margin-left:10%;">
+			<table border="0" cellpadding="0" cellspacing="0" class="table" style="width:100%;">
 				<tr>
-					<th>{l s='Attribute name'}</th>
+					<th height="39">{l s='Attribute name'}</th>
 					<th width="80">{l s='Reference'}</th>
 					<th width="80">{l s='EAN13'}</th>
 					<th width="80">{l s='UPC'}</th>

admin-dev/themes/default/template/controllers/modules/content.tpl

@@ -0,0 +1,37 @@
+{*
+* 2007-2011 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-2011 PrestaShop SA
+*  @version  Release: $Revision: 9771 $
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*}
+
+
+{if isset($module_content)}
+	{$module_content}
+{else}
+	{include file='controllers/modules/js.tpl'}
+	{if isset($smarty.get.select) && $smarty.get.select eq 'favorites'}
+		{include file='controllers/modules/favorites.tpl'}
+	{else}
+		{include file='controllers/modules/page.tpl'}
+	{/if}
+{/if}

admin-dev/themes/default/template/controllers/modules/favorites.tpl

@@ -0,0 +1,66 @@
+<div id="productBox">
+
+	{include file='controllers/modules/header.tpl'}
+	<ul class="view-modules">
+		<li class="button normal-view"><a href="index.php?controller={$smarty.get.controller|htmlentities}&token={$smarty.get.token|htmlentities}"><img src="themes/default/img/modules_view_layout_sidebar.png" alt="{l s='Normal view'}" border="0" /><span>{l s='Normal view'}</span></a></li>
+		<li class="button favorites-view-disabled"><img src="themes/default/img/modules_view_table_select_row.png" alt="{l s='Favorites view'}" border="0" /><span>{l s='Favorites view'}</span></li>
+	</ul>
+
+
+	<div id="container">
+
+		<div id="moduleContainer" style="padding:0px;margin:0px;padding-top:15px">
+
+			<table cellspacing="0" cellpadding="0" style="width: 100%; margin-bottom:10px;" class="table" id="">
+				<col width="30px">
+				<col width="240px">
+				<col width="">
+				<col width="140px">
+				<col width="180px">
+				<col width="70px">
+				<col width="70px">
+				<col width="130px">
+				</colgroup>
+				<thead>
+					<tr class="nodrag nodrop">
+						<th class="center">Logo</th>
+						<th>Nom du module</th>
+						<th>Description</th>
+						<th>Etat</th>
+						<th>Catégories</th>
+						<th>Intérêt</th>
+						<th>Favori</th>
+						<th>&nbsp;</th>
+					</tr>
+				</thead>
+				<tbody>
+				{foreach from=$modules key=km item=module}
+					<tr{if $km % 2 eq 0} class="alt_row"{/if}>
+						<td><img src="{if isset($module->image)}{$module->image}{else}../modules/{$module->name}/{$module->logo}{/if}" width="16" height="16" /></td>
+						<td>{$module->displayName}</td>
+						<td>{$module->description|truncate:80:'…'}</td>
+						<td>{if isset($module->id) && $module->id gt 0}<span class="setup">{l s='Installed'}</span>{else}<span class="setup non-install">{l s='Not Installed'}</span>{/if}</td>
+						<td>{$module->categoryName}</td>
+						<td>
+						<select name="i_{$module->name}" class="moduleFavorite" style="width:50px">
+							<option value="" selected="selected">---</option>
+							<option value="1" {if isset($module->preferences.interest) && $module->preferences.interest eq '1'}selected="selected"{/if}>Yes</option>
+							<option value="0" {if isset($module->preferences.interest) && $module->preferences.interest eq '0'}selected="selected"{/if}>No</option>
+						</select>
+						</td>
+						<td>
+						<select name="f_{$module->name}" class="moduleFavorite" style="width:50px">
+							<option value="" selected="selected">---</option>
+							<option value="1" {if isset($module->preferences.favorite) && $module->preferences.favorite eq '1'}selected="selected"{/if}>Yes</option>
+							<option value="0" {if isset($module->preferences.favorite) && $module->preferences.favorite eq '0'}selected="selected"{/if}>No</option>
+						</select>
+						</td>
+						<td id="r_{$module->name}">&nbsp;</td>
+					</tr>
+				{/foreach}
+				</tbody>
+			</table>
+
+		</div>
+	</div>
+</div>

admin-dev/themes/default/template/controllers/modules/filters.tpl

@@ -24,6 +24,38 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
+
+	{if !isset($logged_on_addons)}
+
+		{if $check_url_fopen eq 'ko'  OR $check_openssl eq 'ko'}
+			
+			<div class="warn">
+				<b>{l s='If you want to be able to fully use the AdminModules pannel and have free modules available, you should enable the following configuration on your server :'}</b><br />
+				{if $check_url_fopen eq 'ko'}- {l s='Enable allow_url_fopen'}<br />{/if}
+				{if $check_openssl eq 'ko'}- {l s='Enable php openssl extension'}<br />{/if}
+			</div>
+			
+		{else}
+
+			<!--start addons login-->
+			<div class="filter-module" id="addons_login_div">
+		
+				<p>{l s='You have a PrestaShop Addons account ?'}</p>
+				<form id="addons_login_form" method="post">
+					<label>{l s='Login Addons'} :</label> <input type="text" value="" id="username_addons" autocomplete="off" class="ac_input">
+					<label>{l s= 'Password Addons'} :</label> <input type="password" value="" id="password_addons" autocomplete="off" class="ac_input">
+					<input type="submit" class="button" id="addons_login_button" value="{l s='Log in'}">
+					<span id="addons_loading" style="color:red"></span>
+				</form>
+
+			</div>
+			<!--end addons login-->
+
+		{/if}
+
+	{/if}
+
+
 	<!--start filter module-->
 	<style>.ac_results { border:1px solid #C2C4D9; }</style>
 	<div class="filter-module">

admin-dev/themes/default/template/controllers/modules/header.tpl

@@ -43,7 +43,7 @@
 			</ul>
 
 			<div class="pageTitle">
-				<h3><span id="current_obj" style="font-weight: normal;"><span class="breadcrumb item-0">Module</span> : <span class="breadcrumb item-1">Liste de modules</span></span></h3>
+				<h3><span id="current_obj" style="font-weight: normal;"><span class="breadcrumb item-0">Module</span> : <span class="breadcrumb item-1">{l s='List of modules'}</span></span></h3>
 			</div>
 
 		</div>
@@ -70,18 +70,4 @@
 		<br />
 	</div>
 
-	{if !isset($logged_on_addons)}
-		<!--start addons login-->
-		<div class="filter-module" id="addons_login_div">
-			<p>{l s='You have a PrestaShop Addons account ?'}</p>
-			<form id="addons_login_form" method="post">
-				<label>{l s='Login Addons'} :</label> <input type="text" value="" id="username_addons" autocomplete="off" class="ac_input">
-				<label>{l s= 'Password Addons'} :</label> <input type="password" value="" id="password_addons" autocomplete="off" class="ac_input">
-				<input type="submit" class="button" id="addons_login_button" value="{l s='Log in'}">
-				<span id="addons_loading" style="color:red"></span>
-			</form>
-
-		</div>
-		<!--end addons login-->
-	{/if}
 

admin-dev/themes/default/template/controllers/modules/js.tpl

@@ -25,7 +25,7 @@
 *}
 
 
-<link href="{$smarty.const._PS_CSS_DIR_}jquery.fancybox-1.3.4.css" rel="stylesheet" type="text/css" media="screen" />
+<link href="{$smarty.const._PS_JS_DIR_}jquery/plugins/fancybox/jquery.fancybox.css" rel="stylesheet" type="text/css" media="screen" />
 <script type="text/javascript">{$autocompleteList}</script>
 <script type="text/javascript" src="{$smarty.const._PS_JS_DIR_}jquery/plugins/autocomplete/jquery.autocomplete.js"></script>
 <script type="text/javascript" src="{$smarty.const._PS_JS_DIR_}jquery/plugins/fancybox/jquery.fancybox.js"></script>
@@ -36,7 +36,8 @@
 	var ajaxCurrentIndex = '{$ajaxCurrentIndex}';
 	var by = '{l s='by'}';
 	var errorLogin = '{l s='Could not login to Addons'}';
-	{if isset($smarty.get.anchor)}var anchor = '{$smarty.get.anchor|htmlentities|replace:'(':''|replace:')':''|replace:'{':''|replace:'}':''}';{else}var anchor = '';{/if}
+	var confirmPreferencesSaved = '{l s='Preferences saved'}';
+	{if isset($smarty.get.anchor)}var anchor = '{$smarty.get.anchor|htmlentities|replace:'(':''|replace:')':''|replace:'{':''|replace:'}':''|replace:'\'':''|replace:'/':''}';{else}var anchor = '';{/if}
 
 
 
@@ -134,7 +135,7 @@
 							ajax : "1",
 							token : token,
 							controller : "AdminModules",
-							action : "reloadModulesList",
+							action : "reloadModulesList"
 						},
  						beforeSend: function(xhr)
 						{
@@ -170,9 +171,11 @@
 					controller : "AdminModules",
 					action : "refreshModuleList"
 				},
-				success : function(res,textStatus,jqXHR)
+				success : function(data)
 				{
 					// res.status  = cache or refresh
+					if (data == '{"status":"refresh"}')
+						window.location.href = window.location.href;
 				},
 				error: function(res,textStatus,jqXHR)
 				{
@@ -277,6 +280,48 @@
 
 
 
+
+		// Method to save favorites preferences
+		$('.moduleFavorite').change(function()
+		{
+			var value_pref = $(this).val();
+			var module_pref = $(this).attr('name');
+			var action_pref = module_pref.substring(0, 1);
+			module_pref = module_pref.substring(2, module_pref.length);
+			try
+			{
+				resAjax = $.ajax({
+						type:"POST",
+						url : ajaxCurrentIndex,
+						async: true,
+						data : {
+							ajax : "1",
+							token : token,
+							controller : "AdminModules",
+							action : "saveFavoritePreferences",
+							action_pref : action_pref,
+							module_pref : module_pref,
+							value_pref : value_pref
+						},
+						success : function(data)
+						{
+							// res.status  = cache or refresh
+							if (data == 'OK')
+								$('#r_' + module_pref).html(confirmPreferencesSaved);
+						},
+						error: function(res,textStatus,jqXHR)
+						{
+							//jAlert("TECHNICAL ERROR"+res);
+						}
+				});
+			}
+			catch(e){}
+			return false;
+		});
+
+
+
+
 	});
 	{/literal}
 </script>

admin-dev/themes/default/template/controllers/modules/list.tpl

@@ -76,3 +76,10 @@
 					</tbody>
 				</table>
 
+				{if count($modules)}
+					<div style="margin-top: 12px;">
+						<input type="button" class="button big" value="{l s='Install the selection'}" onclick="modules_management('install')"/>
+						<input type="button" class="button big" value="{l s='Uninstall the selection'}" onclick="modules_management('uninstall')" />
+					</div>
+				{/if}
+

admin-dev/themes/default/template/controllers/modules/page.tpl

@@ -26,16 +26,30 @@
 
 <div id="productBox">
 
-	{include file='modules/header.tpl'}
-	{include file='modules/filters.tpl'}
+	{include file='controllers/modules/header.tpl'}
+	{include file='controllers/modules/filters.tpl'}
+
+	<ul class="view-modules">
+		<li class="button normal-view-disabled"><img src="themes/default/img/modules_view_layout_sidebar.png" alt="{l s='Normal view'}" border="0" /><span>{l s='Normal view'}</span></li>
+		<li class="button favorites-view"><a  href="index.php?controller={$smarty.get.controller|htmlentities}&token={$smarty.get.token|htmlentities}&select=favorites"><img src="themes/default/img/modules_view_table_select_row.png" alt="{l s='Favorites view'}" border="0" /><span>{l s='Favorites view'}</span></a></li>
+	
+	</ul>
 
 	<div id="container">
 		<!--start sidebar module-->
 		<div class="sidebar">
 			<div class="categorieTitle">
 				<h3>{l s='Categories'}</h3>
-				<div class="subHeadline">{$nb_modules}</div>
+				<div class="subHeadline">&nbsp;</div>
 				<ul class="categorieList">
+					<li {if isset($categoryFiltered.favorites)}style="background-color:#EBEDF4"{/if} class="categoryModuleFilterLink">
+							<div class="categorieWidth"><a href="{$currentIndex}&token={$token}&filterCategory=favorites"><span><b>{l s='Favorites'}</b></span></a></div>
+							<div class="count"><b>{$nb_modules_favorites}</b></div>
+					</li>
+					<li {if count($categoryFiltered) lte 0}style="background-color:#EBEDF4"{/if} class="categoryModuleFilterLink">
+							<div class="categorieWidth"><a href="{$currentIndex}&token={$token}&unfilterCategory=yes"><span><b>{l s='Total'}</b></span></a></div>
+							<div class="count"><b>{$nb_modules}</b></div>
+					</li>
 					{foreach from=$list_modules_categories item=module_category key=module_category_key}
 						<li {if isset($categoryFiltered[$module_category_key])}style="background-color:#EBEDF4"{/if} class="categoryModuleFilterLink">
 							<div class="categorieWidth"><a href="{$currentIndex}&token={$token}&{if isset($categoryFiltered[$module_category_key])}un{/if}filterCategory={$module_category_key}"><span>{$module_category.name}</span></a></div>
@@ -47,13 +61,7 @@
 		</div>
 
 		<div id="moduleContainer">
-			{include file='modules/list.tpl'}
-			{if count($modules)}
-				<div style="margin-top: 12px;">
-					<input type="button" class="button big" value="Install the selection" onclick="modules_management('install')"/>
-					<input type="button" class="button big" value="Uninstall the selection" onclick="modules_management('uninstall')" />
-				</div>
-			{/if}
+			{include file='controllers/modules/list.tpl'}
 		</div>
 	</div>