From ba28c5f5279569b343c2765f8d1db2ed8fc1c5f7 Mon Sep 17 00:00:00 2001
From: Kevin Granger <shipowlata@gmail.com>
Date: Thu, 31 Oct 2013 15:49:57 +0100
Subject: [PATCH] // UI fixs

---
 .../performance/helpers/form/form.tpl         | 63 +++++++++----------
 .../template/helpers/form/assoshop.tpl        | 10 +--
 .../admin/AdminPerformanceController.php      |  6 +-
 3 files changed, 40 insertions(+), 39 deletions(-)

diff --git a/admin-dev/themes/default/template/controllers/performance/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/performance/helpers/form/form.tpl
index 0eb93f213..e1d7c29e2 100644
--- a/admin-dev/themes/default/template/controllers/performance/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/performance/helpers/form/form.tpl
@@ -33,7 +33,7 @@
 	{$smarty.block.parent}
 	{if in_array($input.type, array('radio', 'switch')) && $input.name == 'smarty_cache'}
 		<div class="clearfix row-padding-top">
-			<a href="{$current}&token={$token}&empty_smarty_cache=1" class="btn btn-default" href="">
+			<a href="{$current}&token={$token}&empty_smarty_cache=1" class="btn btn-default">
 				<i class="icon-eraser"></i>
 				{l s='Clear Smarty cache & Autoload cache'}
 			</a>
@@ -97,33 +97,31 @@
 				</form>
 			</div>
 			{if $servers}
-			<div class="row">
-				<div class="form-group">
-					<table class="table">
-						<thead>
-							<tr>
-								<th class="fixed-width-xs"><span class="title_box">{l s='ID'}</span></th>
-								<th><span class="title_box">{l s='IP address'}</span></th>
-								<th class="fixed-width-xs"><span class="title_box">{l s='Port'}</span></th>
-								<th class="fixed-width-xs"><span class="title_box">{l s='Weight'}</span></th>
-								<th>&nbsp;</th>
-							</tr>
-						</thead>
-						<tbody>
-					{foreach $servers AS $server}
+			<div class="form-group">
+				<table class="table">
+					<thead>
 						<tr>
-							<td>{$server.id_memcached_server}</td>
-							<td>{$server.ip}</td>
-							<td>{$server.port}</td>
-							<td>{$server.weight}</td>
-							<td align="right">
-								<a class="btn btn-default" href="{$current}&token={$token}&deleteMemcachedServer={$server.id_memcached_server}" onclick="if (!confirm('{l s='Do you really want to remove the server %s:%s' sprintf=[$server.ip, $server.port] js=1}')) return false;"><i class="icon-minus-sign-alt"></i> {l s='Remove'}</a>
-							</td>
+							<th class="fixed-width-xs"><span class="title_box">{l s='ID'}</span></th>
+							<th><span class="title_box">{l s='IP address'}</span></th>
+							<th class="fixed-width-xs"><span class="title_box">{l s='Port'}</span></th>
+							<th class="fixed-width-xs"><span class="title_box">{l s='Weight'}</span></th>
+							<th>&nbsp;</th>
 						</tr>
-					{/foreach}
-						</tbody>
-					</table>
-				</div>
+					</thead>
+					<tbody>
+				{foreach $servers AS $server}
+					<tr>
+						<td>{$server.id_memcached_server}</td>
+						<td>{$server.ip}</td>
+						<td>{$server.port}</td>
+						<td>{$server.weight}</td>
+						<td>
+							<a class="btn btn-default" href="{$current}&token={$token}&deleteMemcachedServer={$server.id_memcached_server}" onclick="if (!confirm('{l s='Do you really want to remove the server %s:%s' sprintf=[$server.ip, $server.port] js=1}')) return false;"><i class="icon-minus-sign-alt"></i> {l s='Remove'}</a>
+						</td>
+					</tr>
+				{/foreach}
+					</tbody>
+				</table>
 			</div>
 			{/if}
 		</div>
@@ -132,18 +130,19 @@
 
 {block name="script"}
 
-	function showMemcached()
-	{
-		if ($('input[name="caching_system"]:radio:checked').val() == 'CacheMemcache')
-		{
+	function showMemcached() {
+		if ($('input[name="caching_system"]:radio:checked').val() == 'CacheMemcache') {
 			$('#memcachedServers').show();
 			$('#ps_cache_fs_directory_depth').parent().parent().hide();
 		}
-		else
-		{
+		else if ($('input[name="caching_system"]:radio:checked').val() == 'CacheFs') {
 			$('#memcachedServers').hide();
 			$('#ps_cache_fs_directory_depth').parent().parent().show();
 		}
+		else {
+			$('#memcachedServers').hide();
+			$('#ps_cache_fs_directory_depth').parent().parent().hide();
+		}
 	}
 
 	$(document).ready(function() {
diff --git a/admin-dev/themes/default/template/helpers/form/assoshop.tpl b/admin-dev/themes/default/template/helpers/form/assoshop.tpl
index fc76148fb..b9fe8eff4 100644
--- a/admin-dev/themes/default/template/helpers/form/assoshop.tpl
+++ b/admin-dev/themes/default/template/helpers/form/assoshop.tpl
@@ -74,13 +74,15 @@ function check_all_shop() {
 </script>
 
 <div class="assoShop">
-	<table class="table" cellpadding="0" cellspacing="0" width="100%">
+	<table class="table">
 		<tr>
 			<th>{l s='Shop'}</th>
 		</tr>
 		<tr>
 			<td>
-				<label class="t"><input class="input_all_shop" type="checkbox" /> <b>{l s='All shops'}</b></label>
+				<label>
+					<input class="input_all_shop" type="checkbox" />{l s='All shops'}
+				</label>
 			</td>
 		</tr>
 		{foreach $input.values as $groupID => $groupData}
@@ -88,13 +90,13 @@ function check_all_shop() {
 			<tr {if $input.type == 'shop'}class="alt_row"{/if}>
 				<td>
 					<img style="vertical-align:middle;" alt="" src="../img/admin/lv2_b.gif" />
-					<label class="t">
+					<label>
 						<input class="input_shop_group"
 							type="checkbox"
 							name="checkBoxShopGroupAsso_{$table}[{$groupID}]"
 							value="{$groupID}"
 							{if $groupChecked} checked="checked"{/if} />
-						<b>{l s='Group:'} {$groupData['name']}</b>
+						{l s='Group:'} {$groupData['name']}
 					</label>
 				</td>
 			</tr>
diff --git a/controllers/admin/AdminPerformanceController.php b/controllers/admin/AdminPerformanceController.php
index 7da93a542..4eb588566 100644
--- a/controllers/admin/AdminPerformanceController.php
+++ b/controllers/admin/AdminPerformanceController.php
@@ -136,7 +136,7 @@ class AdminPerformanceControllerCore extends AdminController
 				'title' => $this->l('Optional features'),
 				'icon' => 'icon-puzzle-piece'
 			),
-			'hint' => $this->l('Some features can be disabled in order to improve performance.'),
+			'description' => $this->l('Some features can be disabled in order to improve performance.'),
 			'input' => array(
 				array(
 					'type' => 'hidden',
@@ -195,7 +195,7 @@ class AdminPerformanceControllerCore extends AdminController
 				'title' => $this->l('CCC (Combine, Compress and Cache)'),
 				'icon' => 'icon-fullscreen'
 			),
-			'hint' => $this->l('CCC allows you to reduce the loading time of your page. With these settings you will gain performance without even touching the code of your theme. Make sure, however, that your theme is compatible with PrestaShop 1.4+. Otherwise, CCC will cause problems.'),
+			'description' => $this->l('CCC allows you to reduce the loading time of your page. With these settings you will gain performance without even touching the code of your theme. Make sure, however, that your theme is compatible with PrestaShop 1.4+. Otherwise, CCC will cause problems.'),
 			'input' => array(
 				array(
 					'type' => 'hidden',
@@ -305,7 +305,7 @@ class AdminPerformanceControllerCore extends AdminController
 				'title' => $this->l('Media servers (use only with CCC)'),
 				'icon' => 'icon-link'
 			),
-			'hint' => $this->l('You must enter another domain, or subdomain, in order to use cookieless static content.'),
+			'description' => $this->l('You must enter another domain, or subdomain, in order to use cookieless static content.'),
 			'input' => array(
 				array(
 					'type' => 'hidden',