From 5f95dda75db5b4bd39eb5df1833a9ebf4f74e70e Mon Sep 17 00:00:00 2001
From: dMetzger <damien.metzger@prestashop.com>
Date: Thu, 9 Feb 2012 15:07:52 +0000
Subject: [PATCH] // Small display fixes

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13181 b9a71923-0436-4b27-9f14-aed3839534dd
---
 admin-dev/functions.php                                    | 6 +++---
 .../template/controllers/cart_rules/product_rule_group.tpl | 4 ++--
 modules/blockcart/blockcart.css                            | 7 +++++++
 modules/blockcart/blockcart.tpl                            | 2 +-
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/admin-dev/functions.php b/admin-dev/functions.php
index e1e037e2d..e58bb1169 100644
--- a/admin-dev/functions.php
+++ b/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)
diff --git a/admin-dev/themes/default/template/controllers/cart_rules/product_rule_group.tpl b/admin-dev/themes/default/template/controllers/cart_rules/product_rule_group.tpl
index 29f4c35d1..b82e9c8ad 100644
--- a/admin-dev/themes/default/template/controllers/cart_rules/product_rule_group.tpl
+++ b/admin-dev/themes/default/template/controllers/cart_rules/product_rule_group.tpl
@@ -1,10 +1,10 @@
 <tr id="product_rule_group_{$product_rule_group_id}_tr">
-	<td style="vertical-align:top">
+	<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>
+	<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" />
diff --git a/modules/blockcart/blockcart.css b/modules/blockcart/blockcart.css
index 412671513..ce9d23c08 100644
--- a/modules/blockcart/blockcart.css
+++ b/modules/blockcart/blockcart.css
@@ -94,3 +94,10 @@
 	width:26px;
 	background:url(img/icon/pict_add_cart.png) no-repeat 0 0
 }
+#cart_block table#vouchers {
+	clear: both;
+	width:100%
+}
+#cart_block table#vouchers tr td{
+	padding: 2px;
+}
diff --git a/modules/blockcart/blockcart.tpl b/modules/blockcart/blockcart.tpl
index eee50a53f..a21ddc2b0 100644
--- a/modules/blockcart/blockcart.tpl
+++ b/modules/blockcart/blockcart.tpl
@@ -103,7 +103,7 @@ var removingLinkText = '{l s='remove this product from my cart' mod='blockcart'
 				<tr class="bloc_cart_voucher" id="bloc_cart_voucher_{$discount.id_discount}">
 					<td class="name" title="{$discount.description}">{$discount.name|cat:' : '|cat:$discount.description|truncate:18:'...'|escape:'htmlall':'UTF-8'}</td>
 					<td class="price">-{if $discount.value_real != '!'}{if $priceDisplay == 1}{convertPrice price=$discount.value_tax_exc}{else}{convertPrice price=$discount.value_real}{/if}{/if}</td>
-					<td class="delete"><a href="{$link->getPageLink("$order_process.php", true)}?deleteDiscount={$discount.id_discount}" title="{l s='Delete'}"><img src="{$img_dir}icon/delete.gif" alt="{l s='Delete'}" width="11" height="13" class="icon" /></a></td>
+					<td class="delete"><a href="{$link->getPageLink('$order_process.php', true)}?deleteDiscount={$discount.id_discount}" title="{l s='Delete'}"><img src="{$img_dir}icon/delete.gif" alt="{l s='Delete'}" class="icon" /></a></td>
 				</tr>
 			{/foreach}
 			</tbody>