dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[-] BO : Fix bug #PSCFV-8843, no closing span in category-filter helper

Browse Source
This commit is contained in:
gRoussac
2013-04-19 10:34:20 +02:00
parent 54b75b9818
commit f93c7ec8c7
2 changed files with 19 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/helpers/form/form_category.tpl
+11 -17
View File
@@ -35,39 +35,33 @@
buildTreeView(use_context); buildTreeView(use_context);
}); });
</script> </script>
<div class="category-filter"> <div class="category-filter">
<span><a href="#" id="collapse_all" >{$categories.trads['Collapse All']}</a> <span><a href="#" id="collapse_all">{$categories.trads['Collapse All']}</a>|&nbsp;</span>
|</span> <span><a href="#" id="expand_all">{$categories.trads['Expand All']}</a>|&nbsp;</span>
<span><a href="#" id="expand_all" >{$categories.trads['Expand All']}</a>
{if !$categories.use_radio} {if !$categories.use_radio}
|</span> <span><a href="#" id="check_all">{$categories.trads['Check All']}</a>|&nbsp;</span>
<span></span><a href="#" id="check_all" >{$categories.trads['Check All']}</a> <span><a href="#" id="uncheck_all">{$categories.trads['Uncheck All']}</a>|&nbsp;</span>
|</span> {/if}
<span></span><a href="#" id="uncheck_all" >{$categories.trads['Uncheck All']}</a></span>
{/if}
{if $categories.use_search} {if $categories.use_search}
<span style="margin-left:20px"> <span style="margin-left:20px">
{$categories.trads.search} : {$categories.trads.search}:&nbsp;
<form method="post" id="filternameForm"> <form method="post" id="filternameForm">
<input type="text" name="search_cat" id="search_cat"> <input type="text" name="search_cat" id="search_cat"/>
</form> </form>
</span> </span>
{/if} {/if}
</div> </div>
{assign var=home_is_selected value=false} {assign var=home_is_selected value=false}
{foreach $categories.selected_cat AS $cat} {foreach $categories.selected_cat AS $cat}
{if is_array($cat)} {if is_array($cat)}
{if $cat.id_category != $categories.trads.Root.id_category} {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} {else}
{assign var=home_is_selected value=true} {assign var=home_is_selected value=true}
{/if} {/if}
{else} {else}
{if $cat != $categories.trads.Root.id_category} {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} {else}
{assign var=home_is_selected value=true} {assign var=home_is_selected value=true}
{/if} {/if}
@@ -80,8 +74,8 @@
<input type="{if !$categories.use_radio}checkbox{else}radio{/if}" <input type="{if !$categories.use_radio}checkbox{else}radio{/if}"
name="{$categories.input_name}" name="{$categories.input_name}"
value="{$categories.trads.Root.id_category}" value="{$categories.trads.Root.id_category}"
{if $home_is_selected}checked{/if} {if $home_is_selected}checked="checked"{/if}
onclick="clickOnCategoryBox($(this));" /> onclick="clickOnCategoryBox($(this));"/>
<span class="category_label">{$categories.trads.Root.name}</span> <span class="category_label">{$categories.trads.Root.name}</span>
{else} {else}
&nbsp; &nbsp;
classes/helper/Helper.php
+7 -10
View File
@@ -239,17 +239,14 @@ class HelperCore
$html .= ' $html .= '
<div class="category-filter"> <div class="category-filter">
<span><a href="#" id="collapse_all" >'.$translations['Collapse All'].'</a> <span><a href="#" id="collapse_all">'.$translations['Collapse All'].'</a>|&nbsp;</span>
| </span> <span><a href="#" id="expand_all">'.$translations['Expand All'].'</a>|&nbsp;</span>
<span><a href="#" id="expand_all" >'.$translations['Expand All'].'</a>
'.(!$use_radio ? ' '.(!$use_radio ? '
|</span> <span><a href="#" id="check_all">'.$translations['Check All'].'</a>|&nbsp;</span>
<span> <a href="#" id="check_all" >'.$translations['Check All'].'</a> <span><a href="#" id="uncheck_all">'.$translations['Uncheck All'].'</a>|&nbsp;</span>' : '')
|</span> .($use_search ? '
<span><a href="#" id="uncheck_all" >'.$translations['Uncheck All'].'</a>|</span> <span>'.$translations['search'].': <input type="text" name="search_cat" id="search_cat"/></span>' : '')
' : '').($use_search ? '<span>'.$translations['search'].' : <input type="text" name="search_cat" id="search_cat"></span>' : '').' .'</div>';
</div>
';
$home_is_selected = false; $home_is_selected = false;
foreach ($selected_cat as $cat) foreach ($selected_cat as $cat)