// fixs for merge

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

@@ -36,56 +36,54 @@
 	<title>{$shop_name} {if $meta_title != ''}{if isset($navigationPipe)}{$navigationPipe|escape:'htmlall':'UTF-8'}{else}&gt;{/if} {$meta_title}{/if}</title>
 	{if $display_header}
 	<script type="text/javascript">
-		var help_class_name = '{$controller_name}';
+
-		var iso_user = '{$iso_user}';
+		var help_class_name = '{$controller_name|@addcslashes:'\''}';
-		var country_iso_code = '{$country_iso_code}';
+		var iso_user = '{$iso_user|@addcslashes:'\''}';
-		var _PS_VERSION_ = '{$smarty.const._PS_VERSION_}';
+		var country_iso_code = '{$country_iso_code|@addcslashes:'\''}';
-		var helpboxes = {$help_box};
+		var _PS_VERSION_ = '{$smarty.const._PS_VERSION_|@addcslashes:'\''}';
-		var roundMode = {$round_mode};
+		var helpboxes = {$help_box|intval};
-			{if isset($shop_context)}
+		var roundMode = {$round_mode|intval};
-				{if $shop_context == Shop::CONTEXT_ALL}
+{if isset($shop_context)}
-				var youEditFieldFor = '{l s='A modification of this field will be applied for all shops' slashes=1}';
+{if $shop_context == Shop::CONTEXT_ALL}
-					{elseif $shop_context == Shop::CONTEXT_GROUP}
+		var youEditFieldFor = '{l s='A modification of this field will be applied for all shops' js=1}';
-				var youEditFieldFor = '{l s='A modification of this field will be applied for all shops of group' slashes=1}<b>{$shop_name}</b>';
+{elseif $shop_context == Shop::CONTEXT_GROUP}
-					{else}
+		var youEditFieldFor = '{l s='A modification of this field will be applied for all shops of group' js=1} <b>{$shop_name|@addcslashes:'\''}</b>';
-				var youEditFieldFor = '{l s='A modification of this field will be applied for the shop' slashes=1}<b>{$shop_name}</b>';
+{else}
-				{/if}
+		var youEditFieldFor = '{l s='A modification of this field will be applied for the shop' js=1} <b>{$shop_name|@addcslashes:'\''}</b>';
-			{else}
+{/if}
-				var youEditFieldFor = '';
+{else}
-			{/if}
+		var youEditFieldFor = '';
-		{* Notifications vars *}
+{/if}
-		var autorefresh_notifications = '{$autorefresh_notifications}';
+		var autorefresh_notifications = '{$autorefresh_notifications|@addcslashes:'\''}';
-		var new_order_msg = '{l s='A new order has been placed on your shop.' slashes=1}';
+		var new_order_msg = '{l s='A new order has been placed on your shop.' js=1}';
-		var order_number_msg = '{l s='Order number: ' slashes=1}';
+		var order_number_msg = '{l s='Order number: ' js=1}';
-		var total_msg = '{l s='Total: ' slashes=1}';
+		var total_msg = '{l s='Total: ' js=1}';
-		var from_msg = '{l s='From: ' slashes=1}';
+		var from_msg = '{l s='From: ' js=1}';
-		var see_order_msg = '{l s='View this order' slashes=1}';
+		var see_order_msg = '{l s='View this order' js=1}';
-		var new_customer_msg = '{l s='A new customer registered on your shop.' slashes=1}';
+		var new_customer_msg = '{l s='A new customer registered on your shop.' js=1}';
-		var customer_name_msg = '{l s='Customer name: ' slashes=1}';
+		var customer_name_msg = '{l s='Customer name: ' js=1}';
-		var see_customer_msg = '{l s='View this customer' slashes=1}';
+		var see_customer_msg = '{l s='View this customer' js=1}';
-		var new_msg = '{l s='A new message posted on your shop.' slashes=1}';
+		var new_msg = '{l s='A new message posted on your shop.' js=1}';
-		var excerpt_msg = '{l s='Excerpt: ' slashes=1}';
+		var excerpt_msg = '{l s='Excerpt: ' js=1}';
-		var see_msg = '{l s='Read this message' slashes=1}';
+		var see_msg = '{l s='Read this message' js=1}';
 		var token_admin_orders = '{getAdminToken tab='AdminOrders'}';
 		var token_admin_customers = '{getAdminToken tab='AdminCustomers'}';
 		var token_admin_customer_threads = '{getAdminToken tab='AdminCustomerThreads'}';
-		var currentIndex = '{$currentIndex}';
+		var currentIndex = '{$currentIndex|@addcslashes:'\''}';
-		var default_language = '{$default_language|intval}';
+		var choose_language_translate = '{l s='Choose language' js=1}';
-		var choose_language_translate = '{l s='Choose language' slashes=1}';
-		var admin_modules_link = '{$link->getAdminLink("AdminModules")|addslashes}';
-		var tab_modules_list = '{if isset($tab_modules_list) && $tab_modules_list}{$tab_modules_list|addslashes}{/if}';
 	</script>
-	{/if}
+{/if}
-	{if isset($css_files)}
+{if isset($css_files)}
-		{foreach from=$css_files key=css_uri item=media}
+{foreach from=$css_files key=css_uri item=media}
-		<link href="{$css_uri}" rel="stylesheet" type="text/css" media="{$media}" />
+	<link href="{$css_uri}" rel="stylesheet" type="text/css" media="{$media}" />
-		{/foreach}
+{/foreach}
-	{/if}
+{/if}
-	{if isset($js_files)}
+{if isset($js_files)}
-	{foreach from=$js_files item=js_uri}
+{foreach from=$js_files item=js_uri}
-		<script type="text/javascript" src="{$js_uri}"></script>
+	<script type="text/javascript" src="{$js_uri}"></script>
-	{/foreach}
+{/foreach}
-	{/if}
+{/if}
+
 	<link rel="icon" type="image/vnd.microsoft.icon" href="{$img_dir}favicon.ico" />
 	<link rel="shortcut icon" type="image/x-icon" href="{$img_dir}favicon.ico" />
 	{if isset($displayBackOfficeHeader)}

controllers/admin/AdminPerformanceController.php

@@ -134,11 +134,11 @@ class AdminPerformanceControllerCore extends AdminController
 		$this->fields_form[1]['form'] = array(
 			'legend' => array(
 				'title' => $this->l('Debug mode'),
-				'image' => '../img/admin/prefs.gif'
+				'icon' => 'icon-bug'
 			),
 			'input' => array(
 				array(
-					'type' => 'radio',
+					'type' => 'switch',
 					'label' => $this->l('Disable non PrestaShop modules'),
 					'name' => 'native_module',
 					'class' => 't',
@@ -155,10 +155,10 @@ class AdminPerformanceControllerCore extends AdminController
 							'label' => $this->l('Disabled')
 						)
 					),
-					'desc' => $this->l('Enable or disable non PrestaShop Modules.')
+					'hint' => $this->l('Enable or disable non PrestaShop Modules.')
 				),
 				array(
-					'type' => 'radio',
+					'type' => 'switch',
 					'label' => $this->l('Disable all overrides'),
 					'name' => 'overrides',
 					'class' => 't',
@@ -175,7 +175,7 @@ class AdminPerformanceControllerCore extends AdminController
 							'label' => $this->l('Disabled')
 						)
 					),
-					'desc' => $this->l('Enable or disable all classes and controllers overrides')
+					'hint' => $this->l('Enable or disable all classes and controllers overrides')
 				),
 			),
 			'submit' => array(
@@ -522,10 +522,6 @@ class AdminPerformanceControllerCore extends AdminController
 					'name' => 'ps_cache_fs_directory_depth'
 				),
 			),
-			'submit' => array(
-				'title' => $this->l('Save'),
-				'class' => 'btn btn-default'
-			),
 			'memcachedServers' => true
 		);