From f93c7ec8c746e30de329a7bb0dc5fbc8eae84bd1 Mon Sep 17 00:00:00 2001
From: gRoussac <gregory.roussac@prestashop.com>
Date: Fri, 19 Apr 2013 10:34:20 +0200
Subject: [PATCH] [-] BO : Fix bug #PSCFV-8843, no closing span in
 category-filter helper

---
 .../template/helpers/form/form_category.tpl   | 30 ++++++++-----------
 classes/helper/Helper.php                     | 17 +++++------
 2 files changed, 19 insertions(+), 28 deletions(-)

diff --git a/admin-dev/themes/default/template/helpers/form/form_category.tpl b/admin-dev/themes/default/template/helpers/form/form_category.tpl
index b2a7f6af6..55452b132 100644
--- a/admin-dev/themes/default/template/helpers/form/form_category.tpl
+++ b/admin-dev/themes/default/template/helpers/form/form_category.tpl
@@ -35,39 +35,33 @@
 			buildTreeView(use_context);
 		});
 	</script>
-
 	<div class="category-filter">
-		<span><a href="#" id="collapse_all" >{$categories.trads['Collapse All']}</a>
-		 |</span>
-		 <span><a href="#" id="expand_all" >{$categories.trads['Expand All']}</a>
+		<span><a href="#" id="collapse_all">{$categories.trads['Collapse All']}</a>|&nbsp;</span>
+	 	<span><a href="#" id="expand_all">{$categories.trads['Expand All']}</a>|&nbsp;</span>		 
 		{if !$categories.use_radio}
-		 |</span>
-		 <span></span><a href="#" id="check_all" >{$categories.trads['Check All']}</a>
-		 |</span>
-		 <span></span><a href="#" id="uncheck_all" >{$categories.trads['Uncheck All']}</a></span>
-		 {/if}
+		<span><a href="#" id="check_all">{$categories.trads['Check All']}</a>|&nbsp;</span>
+		<span><a href="#" id="uncheck_all">{$categories.trads['Uncheck All']}</a>|&nbsp;</span>
+		{/if}
 		{if $categories.use_search}
 			<span style="margin-left:20px">
-				{$categories.trads.search} :
+				{$categories.trads.search}:&nbsp;
 				<form method="post" id="filternameForm">
-					<input type="text" name="search_cat" id="search_cat">
+					<input type="text" name="search_cat" id="search_cat"/>
 				</form>
 			</span>
 		{/if}
 	</div>
-
 	{assign var=home_is_selected value=false}
-
 	{foreach $categories.selected_cat AS $cat}
 		{if is_array($cat)}
 			{if $cat.id_category != $categories.trads.Root.id_category}
-				<input {if in_array($cat.id_category, $categories.disabled_categories)}disabled="disabled"{/if} type="hidden" name="{$categories.input_name}" value="{$cat.id_category}" >
+				<input {if in_array($cat.id_category, $categories.disabled_categories)}disabled="disabled"{/if} type="hidden" name="{$categories.input_name}" value="{$cat.id_category}"/>
 			{else}
 				{assign var=home_is_selected value=true}
 			{/if}
 		{else}
 			{if $cat != $categories.trads.Root.id_category}
-				<input {if in_array($cat, $categories.disabled_categories)}disabled="disabled"{/if} type="hidden" name="{$categories.input_name}" value="{$cat}" >
+				<input {if in_array($cat, $categories.disabled_categories)}disabled="disabled"{/if} type="hidden" name="{$categories.input_name}" value="{$cat}"/>
 			{else}
 				{assign var=home_is_selected value=true}
 			{/if}
@@ -80,8 +74,8 @@
 					<input type="{if !$categories.use_radio}checkbox{else}radio{/if}"
 							name="{$categories.input_name}"
 							value="{$categories.trads.Root.id_category}"
-							{if $home_is_selected}checked{/if}
-							onclick="clickOnCategoryBox($(this));" />
+							{if $home_is_selected}checked="checked"{/if}
+							onclick="clickOnCategoryBox($(this));"/>
 						<span class="category_label">{$categories.trads.Root.name}</span>
 				{else}
 					&nbsp;
@@ -97,4 +91,4 @@
 		searchCategory();
 	</script>
 	{/if}
-{/if}
+{/if}
\ No newline at end of file
diff --git a/classes/helper/Helper.php b/classes/helper/Helper.php
index 83c998f81..d5516c3e6 100755
--- a/classes/helper/Helper.php
+++ b/classes/helper/Helper.php
@@ -239,17 +239,14 @@ class HelperCore
 
 		$html .= '
 		<div class="category-filter">
-			<span><a href="#" id="collapse_all" >'.$translations['Collapse All'].'</a>
-			| </span>
-			<span><a href="#" id="expand_all" >'.$translations['Expand All'].'</a>
+			<span><a href="#" id="collapse_all">'.$translations['Collapse All'].'</a>|&nbsp;</span>
+			<span><a href="#" id="expand_all">'.$translations['Expand All'].'</a>|&nbsp;</span>
 			'.(!$use_radio ? '
-			 |</span>
-			 <span> <a href="#" id="check_all" >'.$translations['Check All'].'</a>
-			 |</span>
-			 <span><a href="#" id="uncheck_all" >'.$translations['Uncheck All'].'</a>|</span>
-			 ' : '').($use_search ? '<span>'.$translations['search'].' : <input type="text" name="search_cat" id="search_cat"></span>' : '').'
-		</div>
-		';
+				<span><a href="#" id="check_all">'.$translations['Check All'].'</a>|&nbsp;</span>
+				<span><a href="#" id="uncheck_all">'.$translations['Uncheck All'].'</a>|&nbsp;</span>' : '')
+			.($use_search ? '
+				<span>'.$translations['search'].': <input type="text" name="search_cat" id="search_cat"/></span>' : '')
+		.'</div>';
 
 		$home_is_selected = false;
 		foreach ($selected_cat as $cat)