Merge pull request #6363 from christianbeeznest/uco-22714

Internal: Add labels to addmultiselect element for formvalidator - refs BT#22714

Author: NicoDucou

main/inc/lib/pear/HTML/QuickForm/advmultiselect.php

@@ -773,6 +773,14 @@ public function toHtml()
                 $leftAll = "<br /><br /><button $attrStrAdd  /> <em class='fa fa-backward'></em></button>";
             }
 
+            $strHtmlAdd = "<div class='d-flex justify-content-center align-items-center' style='height: 100%; padding-top: 100px;'>
+                <button $attrStrAdd><em class='fa fa-arrow-right'></em></button>
+            </div>";
+
+            $strHtmlRemove = "<div class='d-flex justify-content-center align-items-center' style='padding-top: 10px;'>
+                <button $attrStrRemove><em class='fa fa-arrow-left'></em></button>
+            </div>";
+
             // build the select all button with all its attributes
             $strHtmlAll = '';
 
@@ -925,7 +933,7 @@ public function getElementJs($raw = true, $min = true)
                             left: \''.$search.'\',
                             right: \''.$search.'\'
                         },
-                        fireSearch: function(value) {                        
+                        fireSearch: function(value) {
                             return value.length > 2;
                         }
                     });

main/inc/lib/pear/HTML/QuickForm/select.php

@@ -581,6 +581,21 @@ public function getTemplate($layout)
                 </div>';
                 break;
             case FormValidator::LAYOUT_HORIZONTAL:
+                if ($this instanceof HTML_QuickForm_advmultiselect) {
+                    return '
+                    <div class="form-group {error_class}">
+                        <label {label-for} class="col-sm-'.$size[0].' control-label {extra_label_class}">
+                            <!-- BEGIN required --><span class="form_required">*</span><!-- END required -->
+                            {label}
+                        </label>
+                        <div class="col-sm-'.$size[1].'">
+                            {icon}
+                            {element}
+                            <!-- BEGIN error --><span class="help-inline help-block">{error}</span><!-- END error -->
+                        </div>
+                    </div>';
+                }
+
                 return '
                 <div class="form-group {error_class}">
                     <label {label-for}  class="col-sm-'.$size[0].' control-label  {extra_label_class}" >

main/lp/lp_subscribe_users.php

@@ -113,9 +113,15 @@
 $userMultiSelect = $formUsers->addElement(
     'advmultiselect',
     'users',
-    get_lang('Users'),
+    null,
     $choices
 );
+
+$userMultiSelect->setLabel([
+    get_lang('Users'),
+    get_lang('NotSubscribed'),
+    get_lang('Subscribed'),
+]);
 $formUsers->addButtonSave(get_lang('Save'));
 
 $defaults = [];
@@ -161,10 +167,15 @@
 $groupMultiSelect = $form->addElement(
     'advmultiselect',
     'groups',
-    get_lang('Groups'),
+    null,
     $groupChoices
 );
 
+$groupMultiSelect->setLabel([
+    get_lang('Groups'),
+    get_lang('NotSubscribed'),
+    get_lang('Subscribed'),
+]);
 $form->addButtonSave(get_lang('Save'));
 
 // UserGroup