From 1be1d1c8e9b32b8bb47798901fd58f139b0b81eb Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Wed, 27 May 2020 11:48:05 +0200
Subject: [PATCH] Added GUI for 'Eigene Felder' + layout adaptations

. GUI: added multidropdown 'Eigene Felder', which contains fields of
the logged in user
. Layout: Message text area has now min and max height; sending
button now aligned correctly; multidropdowns now aligned to text area

Signed-off-by: Cris <hainberg@technikum-wien.at>
---
 .../system/messages/htmlWriteTemplate.php     | 31 ++++++++++++++++---
 public/js/messaging/messageWrite.js           |  7 ++++-
 2 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/application/views/system/messages/htmlWriteTemplate.php b/application/views/system/messages/htmlWriteTemplate.php
index 199a88cfa..95ab12630 100644
--- a/application/views/system/messages/htmlWriteTemplate.php
+++ b/application/views/system/messages/htmlWriteTemplate.php
@@ -83,19 +83,41 @@
 								</label>
 
 								<?php
+                                    $size = count($variables) > 19 ? 19 : count($variables);
 									echo $this->widgetlib->widget(
 										'MultipleDropdown_widget',
 										array('elements' => success($variables)),
 										array(
 											'name' => 'variables[]',
 											'id' => 'variables',
-											'size' => count($variables),
+											'size' => $size,
 											'multiple' => true
 										)
 									);
 								?>
-
 							</div>
+                            <br>
+                            <div class="form-group">
+                                <label>
+									
+									<?php echo ucfirst($this->p->t('ui', 'meineFelder')); ?>:
+
+                                </label>
+								
+								<?php
+								$size = count($user_fields) > 5 ? 5 : count($user_fields);
+								echo $this->widgetlib->widget(
+									'MultipleDropdown_widget',
+									array('elements' => success($user_fields)),
+									array(
+										'name' => 'user_fields[]',
+										'id' => 'user_fields',
+										'size' => $size,
+										'multiple' => true
+									)
+								);
+								?>
+                            </div>
 						</div>
 					</div>
 					<br>
@@ -111,14 +133,15 @@
 							?>
 
 						</div>
-						<div class="col-lg-7 col-xs-9 text-right">
-							<button id="sendButton" class="btn btn-default" type="button">
+						<div class="col-xs-6">
+							<button id="sendButton" class="btn btn-default pull-right" type="button">
 
 								<?php echo $this->p->t('ui', 'senden'); ?>
 
 							</button>
 						</div>
 					</div>
+                    <br>
 						<hr>
 						<div class="row">
 							<div class="col-lg-12">
diff --git a/public/js/messaging/messageWrite.js b/public/js/messaging/messageWrite.js
index 3a3a23792..1978fc08c 100644
--- a/public/js/messaging/messageWrite.js
+++ b/public/js/messaging/messageWrite.js
@@ -46,7 +46,12 @@ $(document).ready(function ()
 {
 	tinymce.init({
 		selector: "#bodyTextArea",
-		plugins: "autoresize"
+		plugins: "autoresize",
+		autoresize_on_init: false,
+		autoresize_min_height: 400,
+		autoresize_max_height: 400,
+		autoresize_bottom_margin: 10,
+		auto_focus: "bodyTextArea"
 	});
 
 	tinymce.init({