Commit 0fae8492 authored by Côme Chilliet's avatar Côme Chilliet
Browse files

Merge branch '5912-simplemanagement-filters-are-not-displayed-correctly' into '1.4-dev'

Resolve "simpleManagement filters are not displayed correctly"

See merge request fusiondirectory/fd!427
parents fd74d822 97e4d9b5
......@@ -5,7 +5,9 @@
<div class="contentboxb">
{if isset($objectFilters)}
{foreach from=$objectFilters item="ofilter"}
{${$ofilter.id}}<label for="{$ofilter.id}">&nbsp;{$ofilter.label}</label><br/>
<label for="{$ofilter.id}">
{${$ofilter.id}}&nbsp;{$ofilter.label}
</label>
{/foreach}
{/if}
......@@ -13,7 +15,10 @@
{$SCOPE}
<hr/>
<label for="NAME" title="{$NAMEDESC}"><img src="geticon.php?context=actions&amp;icon=system-search&amp;size=16" alt="Search"/></label>{$NAME}
<label for="NAME" title="{$NAMEDESC}">
<img src="geticon.php?context=actions&amp;icon=system-search&amp;size=16" alt="Search"/>
{$NAME}
</label>
<div>
{$APPLY}
......
......@@ -326,7 +326,7 @@ class filter
function renderScope()
{
$checked = ($this->scope == 'sub' ? ' checked' : '');
return "<input type='checkbox' id='SCOPE' name='SCOPE' value='1' onClick='document.mainform.submit();'$checked>&nbsp;<LABEL for='SCOPE'>"._("Search in subtrees")."</LABEL>";
return "<LABEL for='SCOPE'><input type='checkbox' id='SCOPE' name='SCOPE' value='1' onClick='document.mainform.submit();'$checked>&nbsp;"._("Search in subtrees")."</LABEL>";
}
/*!
......
......@@ -3,15 +3,15 @@
</div>
<div class="contentboxb">
{$PRIMARY}&nbsp;<label for="PRIMARY">{t}Show primary groups{/t}</label><br/>
{$SAMBA}&nbsp;<label for="SAMBA">{t}Show samba groups{/t}</label><br/>
{$MAIL}&nbsp;<label for="MAIL">{t}Show mail groups{/t}</label><br/>
<label for="PRIMARY">{$PRIMARY}&nbsp;{t}Show primary groups{/t}</label><br/>
<label for="SAMBA">{$SAMBA}&nbsp;{t}Show samba groups{/t}</label><br/>
<label for="MAIL">{$MAIL}&nbsp;{t}Show mail groups{/t}</label><br/>
<hr/>
{$SCOPE}
<hr/>
<label for="NAME"><img src="geticon.php?context=actions&amp;icon=system-search&amp;size=16"/></label>{$NAME}
<label for="NAME"><img src="geticon.php?context=actions&amp;icon=system-search&amp;size=16"/>{$NAME}</label>
<div>
{$APPLY}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment