// CHANGELOG

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

admin-dev/ajax_category_list.php

@@ -54,7 +54,7 @@ echo '			<tr>
 							$(document).ready(function() {
 								$(\'div#categoryList input.categoryBox\').click(function (){
 									if ($(this).is(\':not(:checked)\') && $(\'div#categoryList input.id_category_default\').val() == $(this).val())
-										alert(\''.utf8_encode(html_entity_decode($adminProducts->getL('Consider changing the default category.'))).'\');
+										jAlert(\''.utf8_encode(html_entity_decode($adminProducts->getL('Consider changing the default category.'))).'\');
 								});
 							});
 							</script>

admin-dev/ajaxfilemanager/inc/config.tinymce.php

@@ -8,7 +8,6 @@
 	 */
 	
 
-error_reporting(E_ALL);	
 //error_reporting(E_ALL ^ E_NOTICE);	
 	
 	
@@ -128,4 +127,4 @@ error_reporting(E_ALL);
 	//LANGAUGAE DECLARATIONNS
 	define('CONFIG_LANG_INDEX', 'language'); //the index in the session
 	define('CONFIG_LANG_DEFAULT', (CONFIG_QUERY_STRING_ENABLE && !empty($_GET['language']) && file_exists(DIR_LANG . secureFileName($_GET['language'] . '.php'))?secureFileName($_GET['language']):'en')); //change it to be your language file base name, such en
-?>
+?>

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

@@ -14,19 +14,20 @@ ul li {color:#585A69;}
 
 /*FORM*/
 label {color:#585a69;text-shadow:0 1px 0#fff;}
-fieldset{background-color:#EBEDF4; border:1px solid #CCCED7;font-size:1.1em;margin:0;padding:1em}
+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;}
-select { border:1px solid #ccc; color: #666666; font-size: 12px; height: 22px;}
+select { border:1px solid #ccc; font-size: 12px;}
 select[disabled="disabled"], input[disabled="disabled"],textarea[disabled="disabled"] {border: 1px solid #CCCCCC;color: #AAAAAA}
-.header_module{background:url(header_module.png);padding-left: 0.5em;padding-top: 0.8em;height:20px;color: #812143;border:solid 1px #CCC;}
+.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: -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;}
@@ -34,7 +35,7 @@ select[disabled="disabled"], input[disabled="disabled"],textarea[disabled="disab
 input.button[disabled=disabled]:hover{background-color:#FFF6D3}
 .button:hover{border:1px solid #939393;}
 .button:active{border:1px solid #939393;}
-.button.export-csv span{ background: transparent url(export-csv.png) no-repeat scroll left top; padding:1px 0 1px 20px}
+.button.export-csv span{ background: transparent url('../img/export-csv.png') no-repeat scroll left top; padding:1px 0 1px 20px}
 
 
 #top_container{margin:0;padding:0}
@@ -46,9 +47,9 @@ input.button[disabled=disabled]:hover{background-color:#FFF6D3}
 #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 .employee_name { float:left; color:#fff;}
-#header .separator { background: transparent url(separator.png) no-repeat scroll center top; display: block;float: left;height: 19px; width: 16px;}
+#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(logout.png) no-repeat scroll left top; float:left; padding-left:20px; color:#fff !important; }
+#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;}
@@ -56,20 +57,20 @@ input.button[disabled=disabled]:hover{background-color:#FFF6D3}
 #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;}
-#header #header_search #bo_search_submit { background: transparent url(icon-search.png) no-repeat scroll center; border:none; width:27px; height:27px; float:left; font-weight:normal; margin:0; padding:0;  cursor:pointer; text-indent:-9999em; position:absolute; right:0;}
+#header #header_search #bo_search_submit { background: transparent url('../img/icon-search.png') no-repeat scroll center; border:none; width:27px; height:27px; float:left; font-weight:normal; margin:0; padding:0;  cursor:pointer; text-indent:-9999em; position:absolute; right:0; display:block; /*hacking ie7*/ font-size:0 !ie7; color: transparent !ie;}
 #header #header_quick{float:right; display:block; margin-top:15px;}
 #header #header_quick #quick_select{ font-size:13px; margin:0 10px 0 0; padding:3px 0 4px; vertical-align:middle;width:140px; height:27px;}
 #header #header_shoplist{ background-image:none; clear:both; float: right; color:#fff; margin-top:10px; margin-right:15px;}
 #header #header_shoplist span { float:left; padding:3px;}
-#header #header_myaccount{background:url(bg-lang.png) no-repeat;display:block;float:right;height:16px;margin:8px 1px 0 0;width:16px}
+#header #header_myaccount{background:url('../img/bg-lang.png') no-repeat;display:block;float:right;height:16px;margin:8px 1px 0 0;width:16px}
 
 
 .path_bar {display:none;}
 #notifs_icon_wrapper {float: left;position: relative;margin:15px 10px 0; width:90px;}
 .notifs { float: left;position: relative;cursor: pointer;margin:0; padding:5px; width: 18px;height: 16px;}
-#orders_notif {background: url("notif_order.png") no-repeat center top;}
+#orders_notif {background: url('../img/notif_order.png') no-repeat center top;}
-#customers_notif {background: url("notif_customer.png") no-repeat center top;}
+#customers_notif {background: url('../img/notif_customer.png') no-repeat center top;}
-#customer_messages_notif {background: url("notif_message.png") no-repeat center top;}
+#customer_messages_notif {background: url('../img/notif_message.png') no-repeat center top;}
 #orders_notif.open_notifs,
 #customers_notif.open_notifs,
 #customer_messages_notif.open_notifs { background-color: #FFFFFF;border: 1px solid #000000; position: relative; display: block; background-position:center bottom; }
@@ -98,7 +99,7 @@ input.button[disabled=disabled]:hover{background-color:#FFF6D3}
 #header #menu li.active a{}
 #header #menu li:hover, #header #menu li.active {background-color:#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(separator_subnav.png) no-repeat 0 5px}
+#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 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;}
@@ -114,9 +115,10 @@ input.button[disabled=disabled]:hover{background-color:#FFF6D3}
 .table th a{text-decoration:underline}
 .table a:hover{text-decoration:none}
 .table tr th{ background-color: #F1F1F1; text-shadow:0 1px 0 #fff; padding:4px 6px;
-	background-image: -moz-linear-gradient(center top , #F9F9F9, #ECECEC);
+	background: #ececec url('../img/bg-degrade-table.png') repeat-x scroll left top;
-	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);
-	font-size:13px; text-align:left;}
+	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}
@@ -145,7 +147,7 @@ a.module_toggle_all{color: #268CCD;}
 
 .autoupgradeSteps div {  line-height: 30px; }
 .upgradestep { margin-right: 5px;padding-left: 10px; padding-right: 5px;}
-#upgradeNow.stepok, .autoupgradeSteps a.stepok { background-image: url("../img/admin/enabled.gif");background-position: left center;background-repeat: no-repeat;padding-left: 15px;}
+#upgradeNow.stepok, .autoupgradeSteps a.stepok { background-image: url('../img/admin/enabled.gif');background-position: left center;background-repeat: no-repeat;padding-left: 15px;}
 #upgradeNow {-moz-border-bottom-colors: none;-moz-border-image: none;-moz-border-left-colors: none;-moz-border-right-colors: none;-moz-border-top-colors: none;border-color: #FFF6D3 #DFD5AF #DFD5AF #FFF6D3;border-right: 1px solid #DFD5AF;border-style: solid;border-width: 1px;color: #268CCD;font-size: medium;padding: 5px;}
 .button-autoupgrade {-moz-border-bottom-colors: none;-moz-border-image: none;-moz-border-left-colors: none;-moz-border-right-colors: none;-moz-border-top-colors: none;border-color: #FFF6D3 #DFD5AF #DFD5AF #FFF6D3;border-right: 1px solid #DFD5AF;border-style: solid;border-width: 1px;color: #268CCD;font-size: medium;padding: 5px;}
 .processing {overflow: auto;}
@@ -169,35 +171,41 @@ a.module_toggle_all{color: #268CCD;}
 .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;}
 .toolbarBox a.toolbar_btn:hover { background-color:#fff; border:1px inset #ccc; border-radius:3px;}
 .toolbarBox .toolbar_btn span{ display: block;float: none;height: 32px;margin: 0 auto;width: 32px; /*hacking ie7*/ margin:0 !ie; position:relative !ie;}
-.toolbarBox .process-icon-delete { background-image: url(process-icon-delete.png);}
+.toolbarBox .process-icon-delete { background-image: url('../img/process-icon-delete.png');}
-.toolbarBox .process-icon-duplicate { background-image: url(process-icon-duplicate.png);}
+.toolbarBox .process-icon-duplicate { background-image: url('../img/process-icon-duplicate.png');}
-.toolbarBox .process-icon-preview { background-image: url(process-icon-preview.png);}
+.toolbarBox .process-icon-preview { background-image: url('../img/process-icon-preview.png');}
-.toolbarBox .process-icon-stats { background-image: url(process-icon-stats.png);}
+.toolbarBox .process-icon-stats { background-image: url('../img/process-icon-stats.png');}
-.toolbarBox .process-icon-cancel, .toolbarBox .toolbar-cancel { background-image: url(process-icon-cancel.png);}
+.toolbarBox .process-icon-cancel, .toolbarBox .toolbar-cancel { background-image: url('../img/process-icon-cancel.png');}
-.toolbarBox .process-icon-new, .toolbarBox .toolbar-new{ background-image: url(process-icon-new.png);}
+.toolbarBox .process-icon-new, .toolbarBox .toolbar-new{ background-image: url('../img/process-icon-new.png');}
-.toolbarBox .process-icon-save { background-image: url(process-icon-save.png);}
+.toolbarBox .process-icon-save { background-image: url('../img/process-icon-save.png');}
-.toolbarBox .process-icon-save-and-stay { background-image: url(process-icon-save-and-stay.png);}
+.toolbarBox .process-icon-save-and-stay { background-image: url('../img/process-icon-save-and-stay.png');}
-.toolbarBox .process-icon-edit { background-image: url(process-icon-edit.png);}
+.toolbarBox .process-icon-edit { background-image: url('../img/process-icon-edit.png');}
-.toolbarBox .process-icon-back { background-image: url(process-icon-back.png);}
+.toolbarBox .process-icon-back { background-image: url('../img/process-icon-back.png');}
-.toolbarBox .process-icon-refresh-index  { background-image: url(process-icon-refresh-index.png);}
+.toolbarBox .process-icon-refresh-index  { background-image: url('../img/process-icon-refresh-index.png');}
-.toolbarBox .process-icon-refresh-cache  { background-image: url(process-icon-refresh-cache.png);}
+.toolbarBox .process-icon-refresh-cache  { background-image: url('../img/process-icon-refresh-cache.png');}
-.toolbarBox .process-icon-save-calendar { background-image: url(process-icon-save-calendar.png);}
+.toolbarBox .process-icon-save-calendar { background-image: url('../img/process-icon-save-calendar.png');}
-.toolbarBox .process-icon-new-module { background-image: url(process-icon-new-module.png);}
+.toolbarBox .process-icon-new-module { background-image: url('../img/process-icon-new-module.png');}
-.toolbarBox .process-icon-new-url { background-image: url(process-icon-new-url.png);}
+.toolbarBox .process-icon-new-url { background-image: url('../img/process-icon-new-url.png');}
-.toolbarBox .process-icon-new-module-addon { background-image: url(process-icon-new-module-addon.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(process-icon-preview.png);}
+.toolbarBox .process-icon-save-and-preview { background-image: url('../img/process-icon-preview.png');}
-.toolbarBox .process-icon-export-stock-state-quantities-csv { background-image: url(process-icon-export-csv.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(process-icon-export-csv-details.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(process-icon-export-csv.png);}
+.toolbarBox .process-icon-export-csv-orders { background-image: url('../img/process-icon-export-csv.png');}
-.toolbarBox .process-icon-export-csv-details { background-image: url(process-icon-export-csv-details.png);}
+.toolbarBox .process-icon-export-csv-details { background-image: url('../img/process-icon-export-csv-details.png');}
-.toolbarBox .process-icon-export-stock-mvt-csv { background-image: url(process-icon-export-csv.png);}
+.toolbarBox .process-icon-export-stock-mvt-csv { background-image: url('../img/process-icon-export-csv.png');}
-.toolbarBox .process-icon-newAttributes, .toolbarBox .toolbar-new{ background-image: url(process-icon-new.png);}
+.toolbarBox .process-icon-newAttributes, .toolbarBox .toolbar-new{ background-image: url('../img/process-icon-new.png');}
+.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');}
 
 div.fix-toolbar {border-bottom: 1px solid #E0E0E0;position:fixed;top:0;opacity:0.9;z-index:1;}
 
 /*button upload files*/
-.qq-upload-button {background: -moz-linear-gradient(center top , #F9F9F9, #E3E3E3) repeat scroll 0 0 transparent;
+.qq-upload-button {
+		background: #e4e4e4 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;
+		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*/
@@ -247,7 +255,7 @@ form#product_form h4 { font-size:18px; font-weight:normal;}
 .filter-stock-extended .button-filter { float:right;}
 
 /*ADDONS LOGIN*/
-#addons_login_div { background: #EBEDF4 url(lock.png) no-repeat scroll left 5px;}
+#addons_login_div { background: #EBEDF4 url('../img/lock.png') no-repeat scroll left 5px;}
 #addons_login_div form#addons_login_form { float:right;}
 #addons_login_div p {float:left; font-size:16px; color:#585A69; line-height:24px; text-shadow: 0 1px 0 #fff; margin:0; padding-left:25px;}
 #addons_login_div label {}
@@ -317,7 +325,7 @@ form#product_form h4 { font-size:18px; font-weight:normal;}
 #statsContainer .blocStats h2.icon-category span,
 #statsContainer .blocStats h2.icon-currency span,
 #statsContainer .blocStats h2.icon-language span,
-#statsContainer .blocStats h2.icon-attribute span { background: transparent url(icon-sprites-title.png) no-repeat scroll left top; width:16px; height:16px; padding-right:18px; margin-right:3px;}
+#statsContainer .blocStats h2.icon-attribute span { background: transparent url('../img/icon-sprites-title.png') no-repeat scroll left top; width:16px; height:16px; padding-right:18px; margin-right:3px;}
 
 #statsContainer .blocStats h2.icon-statsproduct span { background-position :2px 2px;}
 #statsContainer .blocStats h2.icon-statsforecast span { background-position :-18px 2px;}
@@ -379,12 +387,12 @@ form#product_form h4 { font-size:18px; font-weight:normal;}
 
 /*MODULE POSITION*/
 .blocLiveEdit { float:right; clear:right;  background-color: #EBEDF4; border: 1px solid #C2C4D9;display: block;  width:250px;}
-.blocLiveEdit h2 { background: transparent url(live_edit.png) no-repeat scroll 10px 10px; height: 40px; line-height: 50px;margin: 0; padding: 0 10px; text-indent: 40px;}
+.blocLiveEdit h2 { background: transparent url('../img/live_edit.png') no-repeat scroll 10px 10px; height: 40px; line-height: 50px;margin: 0; padding: 0 10px; text-indent: 40px;}
 .blocLiveEdit p { padding: 0 10px;}
 .blocLiveEdit a.button {float: left; margin:10px; display: inline-block;}
 
 
-#modulePosition { width:100%; float:left; clear:left; margin-right:270px;}
+#modulePosition { width:100%; float:left; clear:left;}
 #modulePosition .table tr th { height:40px;}
 #modulePosition form{ margin-right:270px;}
 #modulePosition .lab_modules_positions h3 { color:#3A6EA7; margin:0 0 0 10px; float:left;}

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

@@ -20,7 +20,7 @@
 *
 *  @author PrestaShop SA <contact@prestashop.com>
 *  @copyright  2007-2011 PrestaShop SA
-*  @version  Release: $Revision$
+*  @version  Release: $Revision: 8667 $
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 */

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

@@ -18,7 +18,7 @@ legend{background:#EBEDF4;border:1px solid #CCCED7;font-weight:700;margin:0;padd
 input[type="text"],input[type="password"],input[type="file"],textarea {border:1px solid #ccc;}
 select { border:1px solid #ccc;}
 select[disabled="disabled"], input[disabled="disabled"],textarea[disabled="disabled"] {border: 1px solid #CCCCCC;color: #AAAAAA}
-.header_module{background:url(header_module.png);padding-left: 0.5em;padding-top: 0.8em;height:20px;color: #812143;border:solid 1px #CCC;}
+.header_module{background:url('../img/header_module.png');padding-left: 0.5em;padding-top: 0.8em;height:20px;color: #812143;border:solid 1px #CCC;}
 
 /*BUTTON*/
 .button{background: -moz-linear-gradient(center top , #F9F9F9, #E3E3E3) repeat scroll 0 0 transparent; 
@@ -38,9 +38,9 @@ input.button[disabled=disabled]:hover{background-color:#FFF6D3}
 #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 .employee_name { float:left; color:#fff;}
-#header .separator { background: transparent url(separator.png) no-repeat scroll center top; display: block;float: left;height: 19px; width: 16px;}
+#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(logout.png) no-repeat scroll left top; float:left; padding-left:20px; color:#fff !important; }
+#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;}
@@ -58,15 +58,15 @@ input.button[disabled=disabled]:hover{background-color:#FFF6D3}
 #header #header_quick #quick_select{margin:0; padding:3px 0 4px; vertical-align:middle;width:140px; height:25px;}
 #header #header_shoplist{ background-image:none; clear:both; float: right; color:#fff; margin-top:10px; margin-right:15px;}
 #header #header_shoplist span { float:left; padding:3px;}
-#header #header_myaccount{background:url(bg-lang.png) no-repeat;display:block;float:right;height:16px;margin:8px 1px 0 0;width:16px}
+#header #header_myaccount{background:url('../img/bg-lang.png') no-repeat;display:block;float:right;height:16px;margin:8px 1px 0 0;width:16px}
 
 
 .path_bar {display:none;}
 #notifs_icon_wrapper {float: left;position: relative;margin:15px 10px 0; width:90px;}
 .notifs { float: left;position: relative;cursor: pointer;margin:0; padding:5px; width: 18px;height: 16px;}
-#orders_notif {background: url("notif_order.png") no-repeat center top;}
+#orders_notif {background: url('../img/notif_order.png') no-repeat center top;}
-#customers_notif {background: url("notif_customer.png") no-repeat center top;}
+#customers_notif {background: url('../img/notif_customer.png') no-repeat center top;}
-#messages_notif {background: url("notif_message.png") no-repeat center top;}
+#messages_notif {background: url('../img/notif_message.png') no-repeat center top;}
 #orders_notif.open_notifs,
 #customers_notif.open_notifs,
 #messages_notif.open_notifs { background-color: #FFFFFF;border: 1px solid #000000; position: relative; display: block; background-position:center bottom; }
@@ -95,7 +95,7 @@ input.button[disabled=disabled]:hover{background-color:#FFF6D3}
 #header #menu li.active a{}
 #header #menu li:hover, #header #menu li.active {background-color:#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(separator_subnav.png) no-repeat 0 5px}
+#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 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;}
@@ -136,7 +136,7 @@ a.module_toggle_all{color: #268CCD;}
 
 .autoupgradeSteps div {  line-height: 30px; }
 .upgradestep { margin-right: 5px;padding-left: 10px; padding-right: 5px;}
-#upgradeNow.stepok, .autoupgradeSteps a.stepok { background-image: url("../img/admin/enabled.gif");background-position: left center;background-repeat: no-repeat;padding-left: 15px;}
+#upgradeNow.stepok, .autoupgradeSteps a.stepok { background-image: url('../img/admin/enabled.gif');background-position: left center;background-repeat: no-repeat;padding-left: 15px;}
 #upgradeNow {-moz-border-bottom-colors: none;-moz-border-image: none;-moz-border-left-colors: none;-moz-border-right-colors: none;-moz-border-top-colors: none;border-color: #FFF6D3 #DFD5AF #DFD5AF #FFF6D3;border-right: 1px solid #DFD5AF;border-style: solid;border-width: 1px;color: #268CCD;font-size: medium;padding: 5px;}
 .button-autoupgrade {-moz-border-bottom-colors: none;-moz-border-image: none;-moz-border-left-colors: none;-moz-border-right-colors: none;-moz-border-top-colors: none;border-color: #FFF6D3 #DFD5AF #DFD5AF #FFF6D3;border-right: 1px solid #DFD5AF;border-style: solid;border-width: 1px;color: #268CCD;font-size: medium;padding: 5px;}
 .processing {overflow: auto;}
@@ -153,21 +153,21 @@ a.module_toggle_all{color: #268CCD;}
 .toolbarBox a.toolbar_btn {   border-width: 1px;font-size:11px;cursor: pointer; display: block; float: left; padding: 1px 5px; white-space: nowrap; text-shadow: 0 1px 0 #ffffff;;}
 .toolbarBox a.toolbar_btn:hover {}
 .toolbarBox .toolbar_btn span{ display: block;float: none;height: 32px;margin: 0 auto;width: 32px;}
-.toolbarBox .process-icon-delete { background-image: url(process-icon-delete.png);}
+.toolbarBox .process-icon-delete { background-image: url('../img/process-icon-delete.png');}
-.toolbarBox .process-icon-duplicate { background-image: url(process-icon-duplicate.png);}
+.toolbarBox .process-icon-duplicate { background-image: url('../img/process-icon-duplicate.png');}
-.toolbarBox .process-icon-preview { background-image: url(process-icon-preview.png);}
+.toolbarBox .process-icon-preview { background-image: url('../img/process-icon-preview.png');}
-.toolbarBox .process-icon-stats { background-image: url(process-icon-stats.png);}
+.toolbarBox .process-icon-stats { background-image: url('../img/process-icon-stats.png');}
-.toolbarBox .process-icon-cancel { background-image: url(process-icon-cancel.png);}
+.toolbarBox .process-icon-cancel { background-image: url('../img/process-icon-cancel.png');}
-.toolbarBox .process-icon-new, .toolbarBox .process-icon-newAttributes{ background-image: url(process-icon-new.png);}
+.toolbarBox .process-icon-new, .toolbarBox .process-icon-newAttributes{ background-image: url('../img/process-icon-new.png');}
-.toolbarBox .process-icon-save, .toolbarBox .process-icon-save-settings { background-image: url(process-icon-save.png);}
+.toolbarBox .process-icon-save, .toolbarBox .process-icon-save-settings { background-image: url('../img/process-icon-save.png');}
-.toolbarBox .process-icon-save-and-stay { background-image: url(process-icon-save-and-stay.png);}
+.toolbarBox .process-icon-save-and-stay { background-image: url('../img/process-icon-save-and-stay.png');}
-.toolbarBox .process-icon-edit { background-image: url(process-icon-edit.png);}
+.toolbarBox .process-icon-edit { background-image: url('../img/process-icon-edit.png');}
-.toolbarBox .process-icon-back { background-image: url(process-icon-back.png);}
+.toolbarBox .process-icon-back { background-image: url('../img/process-icon-back.png');}
-.toolbarBox .process-icon-refresh-index  { background-image: url(process-icon-refresh-index.png);}
+.toolbarBox .process-icon-refresh-index  { background-image: url('../img/process-icon-refresh-index.png');}
-.toolbarBox .process-icon-refresh-cache  { background-image: url(process-icon-refresh-cache.png);}
+.toolbarBox .process-icon-refresh-cache  { background-image: url('../img/process-icon-refresh-cache.png');}
-.toolbarBox .process-icon-save-calendar { background-image: url(process-icon-save-calendar.png);}
+.toolbarBox .process-icon-save-calendar { background-image: url('../img/process-icon-save-calendar.png');}
-.toolbarBox .process-icon-new-module { background-image: url(process-icon-new-module.png);}
+.toolbarBox .process-icon-new-module { background-image: url('../img/process-icon-new-module.png');}
-.toolbarBox .process-icon-new-module-addon { background-image: url(process-icon-new-module-addon.png);}
+.toolbarBox .process-icon-new-module-addon { background-image: url('../img/process-icon-new-module-addon.png');}
 
 div.fix-toolbar {border-bottom: 1px solid #E0E0E0;position:fixed;top:0;opacity:0.9;z-index:1;}
 

admin-dev/themes/default/img/index.php

@@ -20,7 +20,7 @@
 *
 *  @author PrestaShop SA <contact@prestashop.com>
 *  @copyright  2007-2011 PrestaShop SA
-*  @version  Release: $Revision$
+*  @version  Release: $Revision: 8667 $
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 */

admin-dev/themes/default/template/access/form.tpl

@@ -75,7 +75,7 @@
 					}
 					catch(e)
 					{
-						alert('oups');
+						jAlert('Technical error');
 					}
 				}
 			});
@@ -123,7 +123,7 @@
 					}
 					catch(e)
 					{
-						alert("oups");
+						jAlert('Technical error');
 					}
 				}
 			});

admin-dev/themes/default/template/accounting_export/menu.tpl

@@ -114,4 +114,4 @@
 			{/foreach}
 		</div>
 	</div>
-</div>
+</div>

admin-dev/themes/default/template/addons_catalog/content.tpl

@@ -1,13 +1,12 @@
-<?php
+{*
-/*
+* 2007-2011 PrestaShop
-* 2007-2011 PrestaShop 
 *
 * NOTICE OF LICENSE
 *
-* This source file is subject to the Open Software License (OSL 3.0)
+* 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/osl-3.0.php
+* 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.
@@ -21,11 +20,9 @@
 *  @author PrestaShop SA <contact@prestashop.com>
 *  @copyright  2007-2011 PrestaShop SA
 *  @version  Release: $Revision$
-*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
-*/
+*}
+<iframe frameborder="no" style="margin:0px;padding:0px;width:100%;height:920px" src="http://addons.prestashop.com/iframe/search.php?parentUrl={$parentDomain}"></iframe>
+<div class="clear">&nbsp;</div>
 
-function generate_ntree()
-{
-	Category::regenerateEntireNtree();
-}

admin-dev/themes/default/template/addons_my_account/content.tpl

@@ -1,13 +1,12 @@
-<?php
+{*
-/*
+* 2007-2011 PrestaShop
-* 2007-2011 PrestaShop 
 *
 * NOTICE OF LICENSE
 *
-* This source file is subject to the Open Software License (OSL 3.0)
+* 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/osl-3.0.php
+* 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.
@@ -21,13 +20,8 @@
 *  @author PrestaShop SA <contact@prestashop.com>
 *  @copyright  2007-2011 PrestaShop SA
 *  @version  Release: $Revision$
-*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
-*/
+*}
-
+<iframe frameborder="no" style="margin:0px;padding:0px;width:960px;height:920px" src="http://addons.prestashop.com/iframe/myaccount.php?parentUrl={$parentDomain}"></iframe>
-function blocknewsletter()
+<div class="clear">&nbsp;</div>
-{
-	// No one will know if the table does not exist :]
-	DB::getInstance()->Execute('ALTER TABLE '._DB_PREFIX_.'newsletter ADD `http_referer` VARCHAR(255) NULL');
-}
-

admin-dev/themes/default/template/attachments/list_action_delete.tpl

@@ -26,9 +26,9 @@
 <script>
 	function confirmProductAttached(productList)
 	{
-		var confirm_text = {l s='This attachment is used by the following products:'}
+		var confirm_text = "{l s='This attachment is used by the following products:'}";
 		if (confirm('{$confirm}'))
-			return confirm(confirm_text + {$product_list[$id]});
+			return confirm(confirm_text + product_list);
 		return false;
 	}
 </script>

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

@@ -1,3 +1,28 @@
+{*
+* 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;
@@ -82,4 +107,4 @@
 		<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" />
 	</div>
-</div>
+</div>

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

@@ -1,3 +1,28 @@
+{*
+* 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}" />
@@ -185,4 +210,4 @@
 			{$product_rule}
 		{/foreach}
 	</table>
-</div>
+</div>

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

@@ -3,10 +3,10 @@
 *
 * NOTICE OF LICENSE
 *
-* This source file is subject to the Open Software License (OSL 3.0)
+* 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/osl-3.0.php
+* 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.
@@ -19,8 +19,8 @@
 *
 *  @author PrestaShop SA <contact@prestashop.com>
 *  @copyright  2007-2011 PrestaShop SA
-*  @version  Release: $Revision: 6844 $
+*  @version  Release: $Revision: 7040 $
-*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 */
 
@@ -327,4 +327,4 @@ $('.datepicker').datepicker({
 	prevText: '',
 	nextText: '',
 	dateFormat: 'yy-mm-dd ' + hours + ':' + mins + ':' + secs
-});
+});

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

@@ -1,3 +1,28 @@
+{*
+* 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}">
@@ -68,4 +93,4 @@
 	{/foreach}
 	displayFlags(languages, {$defaultLanguage});
 </script>
-<script type="text/javascript" src="themes/template/cart_rules/form.js"></script>
+<script type="text/javascript" src="themes/template/cart_rules/form.js"></script>

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

@@ -1,3 +1,28 @@
+{*
+* 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%">
@@ -54,4 +79,4 @@
 			</div>
 		</td>
 	</tr>
-</table>
+</table>

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

@@ -1,3 +1,28 @@
+{*
+* 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});">
@@ -33,4 +58,4 @@
 <script type="text/javascript">
 	$('#product_rule_{$product_rule_id}_choose_content').parent().hide();
 	$("#product_rule_{$product_rule_id}_choose_link").fancybox();
-</script>
+</script>

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

@@ -1,3 +1,28 @@
+{*
+* 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>
@@ -29,4 +54,4 @@
 	$('#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>
+</script>

admin-dev/themes/default/template/customer_threads/list_header.tpl

@@ -46,16 +46,16 @@
 				{/if}
 			{/foreach}
 
-			<div style="width:{if $nb_categories > 6}200{else}300{/if}px;">
+			<div class="blocSAV">
 
-					<h3>&nbsp;{$val.name}</h3>
+					<h3>{$val.name}</h3>
 
 					{if $nb_categories < 6}
 						<p>{$val.description}</p>
 					{/if}
 
 					{if $total_thread == 0}
-						<h4>{l s='No new message'}</h4>
+						<span class="message-mail">{l s='No new message'}</span>
 					{else}
 						<a href="{$currentIndex}&token={$token}&id_customer_thread={$id_customer_thread}&viewcustomer_thread" class="button">
 							{$total_thread} 
@@ -65,7 +65,7 @@
 			</div>
 		{/foreach}
 
-		<div id="MeaningStatus">
+		<div id="MeaningStatus" class="blocSAV">
 			<h3>&nbsp;{l s='Meaning of status'}</h3>
 			<ul>
 				<li><img src="../img/admin/status_green.png" alt="{l s='Open'}">{l s='Open'}</li>
@@ -76,10 +76,10 @@
 		</div>
 	
 		<div id="CustomerService">
-			<table cellspacing="1" class="table">
+			<table ccellspacing="0" cellpadding="0" class="table">
 				<thead>
 					<tr>
-						<td colspan="2">{l s='Customer service'} : {l s='Statistics'}</td>
+						<th colspan="2">{l s='Customer service'} : {l s='Statistics'}</th>
 					</tr>
 				</thead>
 				<tbody>
@@ -88,7 +88,7 @@
 						{assign var=count value=$count+1}
 						<tr {if $count % 2 == 0}class="alt_row"{/if}>
 							<td>{$key}</td>
-							<td>{$val}</td>
+							<td><span>{$val}</span></td>
 						</tr>
 					{/foreach}
 				</tbody>

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

@@ -1,3 +1,28 @@
+{*
+* 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="helper/options/options.tpl"}
 {block name="after"}
 {if $use_sync}
@@ -13,7 +38,8 @@
 		</fieldset><br/>
 		<script type="text/javascript"> 
 			var ajaxQueries = new Array();
-			function run_sync () {
+			function run_sync()
+			{
 				$('#ajax_error').html('');
 				$('#ajax_error').hide();
 				$('#ajax_conf').html('');
@@ -47,8 +73,9 @@
 							
 						$('#ajax_loader').html('');
 					},
-					error: function(XMLHttpRequest, textStatus, errorThrown) {
+					error: function(XMLHttpRequest, textStatus, errorThrown)
-						alert("TECHNICAL ERROR: unable to sync.\n\nDetails:\nError thrown: " + XMLHttpRequest + "\n" + 'Text status: ' + textStatus);
+					{
+						jAlert("TECHNICAL ERROR: unable to sync.\n\nDetails:\nError thrown: " + XMLHttpRequest + "\n" + 'Text status: ' + textStatus);
 					}
 				});
 				ajaxQueries.push(ajaxQuery);

admin-dev/themes/default/template/customers/list_header.tpl

@@ -0,0 +1,56 @@
+{*
+* 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: 10891 $
+*  @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/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>
+					<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>
+					<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>
+				{foreach $POST as $key => $value}
+					{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}
+				{/foreach}
+				<br /><input type="submit" class="button" value="{l s='   Delete   '}" />
+			</fieldset>
+		</form>
+		<div class="clear">&nbsp;</div>
+	{/if}
+{/block}

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

@@ -54,9 +54,11 @@
 			});
 		}
 	</script>
-	
+
-	<fieldset style="width:400px;float: left">
+<div id="container-customer">
-		<div style="float: right">
+
+	<div class="info-customer-left">
+			<div style="float: right">
 			<a href="{$current}&addcustomer&id_customer={$customer->id}&token={$token}">
 				<img src="../img/admin/edit.gif" />
 			</a>
@@ -72,9 +74,9 @@
 		{l s='Last visit:'} {if $customer_stats['last_visit']}{$last_visit}{else}{l s='never'}{/if}<br />
 		{if $count_better_customers != '-'}{l s='Rank: #'} {$count_better_customers}<br />{/if}
 		{if $shop_is_feature_active}{l s='Shop:'} {$name_shop}<br />{/if}
-	</fieldset>
+	</div>
 	
-	<fieldset style="width:300px;float:left;margin-left:50px">
+	<div class="info-customer-right">
 		<div style="float: right">
 			<a href="{$current}&addcustomer&id_customer={$customer->id}&token={$token}">
 				<img src="../img/admin/edit.gif" />
@@ -100,28 +102,29 @@
 				{/if}
 			</div>
 		{/if}
-	</fieldset>
+
+</div>
+<div class="clear"></div>
+	<div class="separation"></div>
 	
-	<div class="clear">&nbsp;</div>
+	<div>
-	
+		<h2>
-	<fieldset style="height:190px">
-		<legend>
 			<img src="../img/admin/cms.gif" /> {l s='Add a private note'}
-		</legend>
+		</h2>
 		<p>{l s='This note will be displayed to all the employees but not to the customer.'}</p>
 		<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="float:left;margin:10px 0 0 10px"></span>
+			<span id="note_feedback" style="margin:10px 0 0 10px"></span>
 		</form>
-	</fieldset>
+	</div>
-	
+	<div class="clear"></div>
-	<div class="clear">&nbsp;</div>
+	<div class="separation"></div>
 	
 	
 	<h2>{l s='Messages'} ({count($messages)})</h2>
 	{if count($messages)}
-		<table cellspacing="0" cellpadding="0" class="table">
+		<table cellspacing="0" cellpadding="0" class="table" style="width:100%;">
 			<tr>
 				<th class="center">{l s='Status'}</th>
 				<th class="center">{l s='Message'}</th>
@@ -153,9 +156,14 @@
 	
 	<h2>{l s='Groups'} ({count($groups)})</h2>
 	{if $groups AND count($groups)}
-		<table cellspacing="0" cellpadding="0" class="table">
+		<table cellspacing="0" cellpadding="0" class="table" style="width:100%;">
+			<colgroup>
+				<col width="10px"></col>
+				<col width=""></col>
+				<col width="70px"></col>
+			</colgroup>
 			<tr>
-				<th class="center">{l s='ID'}</th>
+				<th height="39px" class="right">{l s='ID'}</th>
 				<th class="center">{l s='Name'}</th>
 				<th class="center">{l s='Actions'}</th>
 			</tr>
@@ -175,57 +183,74 @@
 	{if $orders AND count($orders)}
 		{assign var=count_ok value=count($orders_ok)}
 		{if $count_ok}
-			<div style="float:left;margin-right:20px">
+			<div>
 				<h3 style="color:green;font-weight:700">
 					{l s='Valid orders:'} {$count_ok} {l s='for'} {$total_ok}
 				</h3>
-				<table cellspacing="0" cellpadding="0" class="table float">
+				<table cellspacing="0" cellpadding="0" class="table" style="width:100%; text-align:left;">
+					<colgroup>
+						<col width="10px"></col>
+						<col width="100px"></col>
+						<col width="100px"></col>
+						<col width=""></col>
+						<col width="50px"></col>
+						<col width="80px"></col>
+						<col width="70px"></col>
+					</colgroup>
 					<tr>
-						<th class="center">{l s='ID'}</th>
+						<th height="39px" class="center">{l s='ID'}</th>
-						<th class="center">{l s='Date'}</th>
+						<th class="left">{l s='Date'}</th>
-						<th class="center">{l s='Products'}</th>
+						<th class="left">{l s='Payment'}</th>
-						<th class="center">{l s='Total paid'}</th>
+						<th class="left">{l s='State'}</th>
-						<th class="center">{l s='Payment'}</th>
+						<th class="left">{l s='Products'}</th>
-						<th class="center">{l s='State'}</th>
+						<th class="left">{l s='Total paid'}</th>
 						<th class="center">{l s='Actions'}</th>
 					</tr>
 					{foreach $orders_ok AS $key => $order}
 						<tr {if $key %2}class="alt_row"{/if} style="cursor: pointer" onclick="document.location = '?tab=AdminOrders&id_order={$order['id_order']}&vieworder&token={getAdminToken tab='AdminOrders'}'">
 							<td class="center">{$order['id_order']}</td>
 							<td>{$order['date_add']}</td>
-							<td align="right">{$order['nb_products']}</td>
-							<td align="right">{$order['total_paid_real']}</td>
 							<td>{$order['payment']}</td>
 							<td>{$order['order_state']}</td>
+							<td align="right">{$order['nb_products']}</td>
+							<td align="right">{$order['total_paid_real']}</td>
 							<td align="center"><a href="?tab=AdminOrders&id_order={$order['id_order']}&vieworder&token={getAdminToken tab='AdminOrders'}"><img src="../img/admin/details.gif" /></a></td>
 						</tr>
 					{/foreach}
 				</table>
 			</div>
 		{/if}
-		<div class="clear">&nbsp;</</div>
 		{assign var=count_ko value=count($orders_ko)}
 		{if $count_ko}
-			<div style="float:left;margin-right:20px">
+			<div>
 				<h3 style="color:red;font-weight:700">{l s='Invalid orders:'} {$count_ko}</h3>
-				<table cellspacing="0" cellpadding="0" class="table float">
+				<table cellspacing="0" cellpadding="0" class="table" style="width:100%;">
+					<colgroup>
+						<col width="10px"></col>
+						<col width="100px"></col>
+						<col width=""></col>
+						<col width=""></col>
+						<col width="100px"></col>
+						<col width="100px"></col>
+						<col width="52px"></col>
+					</colgroup>
 					<tr>
-						<th class="center">{l s='ID'}</th>
+						<th height="39px" class="center">{l s='ID'}</th>
 						<th class="center">{l s='Date'}</th>
-						<th class="center">{l s='Products'}</th>
-						<th class="center">{l s='Total paid'}</th>
 						<th class="center">{l s='Payment'}</th>
 						<th class="center">{l s='State'}</th>
+						<th class="center">{l s='Products'}</th>
+						<th class="center">{l s='Total paid'}</th>
 						<th class="center">{l s='Actions'}</th>
 					</tr>
 					{foreach $orders_ko AS $key => $order}
 						<tr {if $key %2}class="alt_row"{/if} style="cursor: pointer" onclick="document.location = '?tab=AdminOrders&id_order={$order['id_order']}&vieworder&token={getAdminToken tab='AdminOrders'}'">
 							<td class="center">{$order['id_order']}</td>
 							<td>{$order['date_add']}</td>
-							<td align="right">{$order['nb_products']}</td>
-							<td align="right">{$order['total_paid_real']}</td>
 							<td>{$order['payment']}</td>
 							<td>{$order['order_state']}</td>
+														<td align="right">{$order['nb_products']}</td>
+							<td align="right">{$order['total_paid_real']}</td>
 							<td align="center"><a href="?tab=AdminOrders&id_order={$order['id_order']}&vieworder&token={getAdminToken tab='AdminOrders'}"><img src="../img/admin/details.gif" /></a></td>
 						</tr>
 					{/foreach}
@@ -240,9 +265,15 @@
 	{if $products AND count($products)}
 	<div class="clear">&nbsp;</div>
 		<h2>{l s='Products'} ({count($products)})</h2>
-		<table cellspacing="0" cellpadding="0" class="table">
+		<table cellspacing="0" cellpadding="0" class="table" style="width:100%;">
+					<colgroup>
+						<col width="50px"></col>
+						<col width=""></col>
+						<col width="60px"></col>
+						<col width="70px"></col>
+					</colgroup>
 			<tr>
-				<th class="center">{l s='Date'}</th>
+				<th height="39px" class="center">{l s='Date'}</th>
 				<th class="center">{l s='Name'}</th>
 				<th class="center">{l s='Quantity'}</th>
 				<th class="center">{l s='Actions'}</th>
@@ -261,9 +292,17 @@
 	
 	<h2>{l s='Addresses'} ({count($addresses)})</h2>
 	{if count($addresses)}
-		<table cellspacing="0" cellpadding="0" class="table">
+		<table cellspacing="0" cellpadding="0" class="table" style="width:100%;">
+					<colgroup>
+						<col width="120px"></col>
+						<col width="120px"></col>	
+						<col width=""></col>
+						<col width="100px"></col>
+						<col width="170px"></col>
+						<col width="70px"></col>
+					</colgroup>
 			<tr>
-				<th>{l s='Company'}</th>
+				<th height="39px">{l s='Company'}</th>
 				<th>{l s='Name'}</th>
 				<th>{l s='Address'}</th>
 				<th>{l s='Country'}</th>
@@ -276,7 +315,7 @@
 					<td>{$address['firstname']} {$address['lastname']}</td>
 					<td>{$address['address1']} {if $address['address2']}{$address['address2']}{/if} {$address['postcode']} {$address['city']}</td>
 					<td>{$address['country']}</td>
-					<td>
+					<td class="right">
 						{if $address['phone']}
 							{$address['phone']}
 							{if $address['phone_mobile']}<br />{$address['phone_mobile']}{/if}
@@ -324,23 +363,30 @@
 	{/if}
 	<div class="clear">&nbsp;</div>
 	
-	<div style="float:left">
+	<div>
 		<h2>{l s='Carts'} ({count($carts)})</h2>
 		{if $carts AND count($carts)}
-			<table cellspacing="0" cellpadding="0" class="table">
+			<table cellspacing="0" cellpadding="0" class="table" style="width:100%">
+				<colgroup>
+					<col width="50px"></col>
+					<col width="150px"></col>
+					<col width=""></col>
+					<col width="70px"></col>
+					<col width="50px"></col>
+				</colgroup>
 				<tr>
-					<th class="center">{l s='ID'}</th>
+					<th height="39px" class="center">{l s='ID'}</th>
 					<th class="center">{l s='Date'}</th>
-					<th class="center">{l s='Total'}</th>
 					<th class="center">{l s='Carrier'}</th>
+					<th class="center">{l s='Total'}</th>
 					<th class="center">{l s='Actions'}</th>
 				</tr>
 				{foreach $carts AS $key => $cart}
 					<tr {if $key %2}class="alt_row"{/if} style="cursor: pointer" onclick="document.location = '?tab=AdminCarts&id_cart={$cart['id_cart']}&viewcart&token={getAdminToken tab='AdminCarts'}'">
 						<td class="center">{$cart['id_cart']}</td>
 						<td>{$cart['date_add']}</td>
-						<td align="right">{$cart['total_price']}</td>
 						<td>{$cart['name']}</td>
+						<td align="right">{$cart['total_price']}</td>
 						<td align="center"><a href="index.php?tab=AdminCarts&id_cart={$cart['id_cart']}&viewcart&token={getAdminToken tab='AdminCarts'}"><img src="../img/admin/details.gif" /></a></td>
 					</tr>
 				{/foreach}
@@ -351,9 +397,14 @@
 	</div>
 	
 	{if count($interested)}
-		<div style="float:left;margin-left:20px">
+		<div>
 		<h2>{l s='Products'} ({count($interested)})</h2>
-			<table cellspacing="0" cellpadding="0" class="table">
+			<table cellspacing="0" cellpadding="0" class="table" style="width:100%;">
+				<colgroup>
+					<col width="10px"></col>
+					<col width=""></col>
+					<col width="50px"></col>
+				</colgroup>
 				{foreach $interested as $key => $p}
 					<tr {if $key %2}class="alt_row"{/if} style="cursor: pointer" onclick="document.location = '{$p['url']}'">
 						<td>{$p['id']}</td>
@@ -370,13 +421,20 @@
 	{* Last connections *}
 	{if count($connections)}
 		<h2>{l s='Last connections'}</h2>
-		<table cellspacing="0" cellpadding="0" class="table">
+		<table cellspacing="0" cellpadding="0" class="table" style="width:100%;">
+				<colgroup>
+					<col width="150px"></col>
+					<col width="100px"></col>
+					<col width="100px"></col>
+					<col width=""></col>
+					<col width="150px"></col>
+				</colgroup>
 			<tr>
-				<th style="width: 200px">{l s='Date'}</th>
+				<th height="39px;">{l s='Date'}</th>
-				<th style="width: 100px">{l s='Pages viewed'}</th>
+				<th>{l s='Pages viewed'}</th>
-				<th style="width: 100px">{l s='Total time'}</th>
+				<th>{l s='Total time'}</th>
-				<th style="width: 100px">{l s='Origin'}</th>
+				<th>{l s='Origin'}</th>
-				<th style="width: 100px">{l s='IP Address'}</th>
+				<th>{l s='IP Address'}</th>
 			</tr>
 			{foreach $connections as $connection}
 				<tr>
@@ -407,7 +465,7 @@
 				</tr>
 			{/foreach}
 		</table>
-		<div class="clear">&nbsp;</div>
 	{/if}
 {/block}
-
+</div>	
+		<div class="clear">&nbsp;</div>