Merge branch 'develop' into 'develop'

Improve client circle page

See merge request ispconfig/ispconfig3!1710

Author: Till Brehm

interface/web/client/form/client_circle.tform.php

@@ -112,10 +112,11 @@
 			'default' => '',
 			'separator' => ',',
 			'datasource' => array (  'type' => 'SQL',
-				'querystring' => 'SELECT client_id,contact_name FROM client WHERE {AUTHSQL} ORDER BY contact_name',
+				'querystring' => 'SELECT client_id,CONCAT(company_name, " (",contact_firstname, " ", contact_name, ")") as contact_label FROM client WHERE {AUTHSQL} ORDER BY contact_label',
 				'keyfield'=> 'client_id',
-				'valuefield'=> 'contact_name'
+				'valuefield'=> 'contact_label'
 			),
+			'render_inline' => 'n',
 			'value'  => ''
 		),
 		'description' => array (

interface/web/client/templates/client_circle_edit.htm

@@ -9,12 +9,6 @@ <h1><tmpl_var name="list_head_txt"></h1>
             <div class="form-group">
                 <label for="circle_name" class="col-sm-3 control-label">{tmpl_var name='circle_name_txt'}*</label>
                 <div class="col-sm-9"><input type="text" name="circle_name" id="circle_name" value="{tmpl_var name='circle_name'}" class="form-control" /></div></div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">{tmpl_var name='client_ids_txt'}</label>
-                <div class="col-sm-9">
-                    {tmpl_var name='client_ids'}
-                </div>
-            </div>
             <div class="form-group">
                 <label for="description" class="col-sm-3 control-label">{tmpl_var name='description_txt'}</label>
                 <div class="col-sm-9"><textarea class="form-control" name="description" id="description" rows='10' cols='30'>{tmpl_var name='description'}</textarea></div>
@@ -25,6 +19,13 @@ <h1><tmpl_var name="list_head_txt"></h1>
                     {tmpl_var name='active'}
                 </div>
             </div>
+            <hr>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">{tmpl_var name='client_ids_txt'}</label>
+                <div class="col-sm-9">
+                    {tmpl_var name='client_ids'}
+                </div>
+            </div>
             {tmpl_var name='required_fields_txt'}
 
 
@@ -33,4 +34,4 @@ <h1><tmpl_var name="list_head_txt"></h1>
         <div class="clear"><div class="right">
             <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="client/client_circle_edit.php">{tmpl_var name='btn_save_txt'}</button>
             <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="client/client_circle_list.php">{tmpl_var name='btn_cancel_txt'}</button>
-        </div></div>
+        </div></div>