From 97e4d9b54dff0c88367c74615cc78c488056ca55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come@opensides.be>
Date: Wed, 17 Oct 2018 14:31:31 +0200
Subject: [PATCH] :ambulance: fix(simpleManagement) Adapt templates so that
 non-migrated management looks alright

issue #5912
---
 ihtml/themes/breezy/simple-filter.tpl       | 9 +++++++--
 include/class_filter.inc                    | 2 +-
 include/select/groupSelect/group-filter.tpl | 8 ++++----
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/ihtml/themes/breezy/simple-filter.tpl b/ihtml/themes/breezy/simple-filter.tpl
index 86b432d45..d9dea54f1 100644
--- a/ihtml/themes/breezy/simple-filter.tpl
+++ b/ihtml/themes/breezy/simple-filter.tpl
@@ -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}
diff --git a/include/class_filter.inc b/include/class_filter.inc
index 1f23ec100..6f7d92eb7 100644
--- a/include/class_filter.inc
+++ b/include/class_filter.inc
@@ -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>";
   }
 
   /*!
diff --git a/include/select/groupSelect/group-filter.tpl b/include/select/groupSelect/group-filter.tpl
index f0784fd84..dd05bb311 100644
--- a/include/select/groupSelect/group-filter.tpl
+++ b/include/select/groupSelect/group-filter.tpl
@@ -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}
-- 
GitLab