From 143e4e96bd461cb4da4b80c7ff741b3f74f7c0da Mon Sep 17 00:00:00 2001
From: OpenXE <>
Date: Tue, 20 Dec 2022 08:37:27 +0000
Subject: [PATCH] ticket system minor design improvement

---
 www/pages/content/ticket_nachricht.tpl | 44 ++++++++++++++++++--------
 www/pages/ticket.php                   |  3 ++
 www/themes/new/css/styles.css          | 10 ++++--
 3 files changed, 40 insertions(+), 17 deletions(-)

diff --git a/www/pages/content/ticket_nachricht.tpl b/www/pages/content/ticket_nachricht.tpl
index 7e3f388d..8c28306a 100644
--- a/www/pages/content/ticket_nachricht.tpl
+++ b/www/pages/content/ticket_nachricht.tpl
@@ -1,19 +1,35 @@
             <div class="row">
 	        	<div class="row-height">
-	        		<div class="col-xs-12 col-md-10 col-md-height" style="float:[NACHRICHT_FLOAT];">
-	        			<div class="inside inside-full-height" style= "border:1px solid black;">
-	        				<fieldset>
-                                <legend>{|<b>[NACHRICHT_BETREFF]</b>|}</legend>
-                                <table width="100%" border="0" class="mkTableFormular">
-                                    <tr><td>{|Zeit|}:</td><td>[NACHRICHT_ZEIT]</td></tr>
-                                    <tr><td>{|Von|}:</td><td>[NACHRICHT_SENDER]</td></tr>
-                                    <tr><td>{|An|}:</td><td>[NACHRICHT_RECIPIENTS]</td></tr>
-                                    <tr><td>{|CC|}:</td><td>[NACHRICHT_CC_RECIPIENTS]</td></tr>
-                                    <tr><td colspan=2><hr style="border-style:solid; border-width:1px"></td></tr>
-                                    <tr><td colspan=2><div id="body" class="ticket_text_div">[NACHRICHT_TEXT]</div></td></tr>
-                                    <tr><td colspan=2><div id="body" class="ticket_attachments">[NACHRICHT_ANHANG]</div></td></tr>
-                                </table>
-                            </fieldset> 
+	        		<div class="col-xs-12 col-md-12 col-md-height">
+	        			<div class="inside inside-full-height" >
+                             <div class="row">
+	        	                <div class="row-height">
+                                     <div class="col-xs-12 col-md-4 col-md-height" style="float:[META_FLOAT];">
+	                        			<div class="inside inside-full-height" >
+	                        				<fieldset>                                    
+                                                <table width="100%" border="0" class="mkTableFormular">
+                                                    <tr><td>{|Zeit|}:</td><td>[NACHRICHT_ZEIT]</td></tr>
+                                                    <tr><td>{|Von|}:</td><td>[NACHRICHT_SENDER]</td></tr>
+                                                    <tr><td>{|An|}:</td><td>[NACHRICHT_RECIPIENTS]</td></tr>
+                                                    <tr><td>{|CC|}:</td><td>[NACHRICHT_CC_RECIPIENTS]</td></tr>
+                                                    <tr><td colspan=2><div id="body" class="ticket_attachments">[NACHRICHT_ANHANG]</div></td></tr>
+                                                </table>
+                                            </fieldset> 
+                                        </div>
+                               		</div>                         		         
+                                    <div class="col-xs-12 col-md-8 col-md-height ticket_nachricht_box" style="float:[NACHRICHT_FLOAT]">
+	                        			<div class="inside inside-full-height">
+	                        				<fieldset>
+                                                <legend>{|<b>[NACHRICHT_BETREFF]</b>|}</legend>
+                                                <table width="100%" border="0" class="mkTableFormular">
+                                                    <tr><td colspan=2><hr style="border-style:solid; border-width:1px"></td></tr>
+                                                    <tr><td colspan=2><div id="body" class="ticket_text_div">[NACHRICHT_TEXT]</div></td></tr>
+                                                </table>
+                                            </fieldset> 
+                                        </div>
+                               		</div>                         
+                                 </div>
+               		        </div>  
                         </div>
                		</div>
                	</div>	
diff --git a/www/pages/ticket.php b/www/pages/ticket.php
index 936da277..a9ed6542 100644
--- a/www/pages/ticket.php
+++ b/www/pages/ticket.php
@@ -307,6 +307,7 @@ class Ticket {
               $this->app->Tpl->Set("NACHRICHT_BETREFF",'<a href="index.php?module=ticket&action=text_ausgang&mid='.$message['id'].'" target="_blank">'.htmlentities($message['betreff']).'</a>');
               $this->app->Tpl->Set("NACHRICHT_ZEIT",$message['zeitausgang']);            
               $this->app->Tpl->Set("NACHRICHT_FLOAT","right");
+              $this->app->Tpl->Set("META_FLOAT","left");
               $this->app->Tpl->Set("NACHRICHT_TEXT",$message['textausgang']);
               $this->app->Tpl->Set("NACHRICHT_SENDER",htmlentities($message['bearbeiter']));
               $this->app->Tpl->Set("NACHRICHT_RECIPIENTS",htmlentities($message['verfasser']." <".$message['mail'].">"));
@@ -333,6 +334,7 @@ class Ticket {
                 $this->app->Tpl->Set("NACHRICHT_RECIPIENTS",htmlentities($message['mail']));
                 $this->app->Tpl->Set("NACHRICHT_CC_RECIPIENTS",htmlentities($message['mail_cc']));  
                 $this->app->Tpl->Set("NACHRICHT_FLOAT","right");
+                $this->app->Tpl->Set("META_FLOAT","left");
                 $this->app->Tpl->Set("NACHRICHT_ZEIT",$message['zeitausgang']);            
                 $this->app->Tpl->Set("NACHRICHT_NAME",htmlentities($message['verfasser']));
             } else {
@@ -351,6 +353,7 @@ class Ticket {
                 $this->app->Tpl->Set("NACHRICHT_CC_RECIPIENTS",htmlentities($message['mail_cc_recipients']));
                 $this->app->Tpl->Set("NACHRICHT_BETREFF",'<a href="index.php?module=ticket&action=text&mid='.$message['id'].'" target="_blank">'.htmlentities($message['betreff']).'</a>');
                 $this->app->Tpl->Set("NACHRICHT_FLOAT","left");
+                $this->app->Tpl->Set("META_FLOAT","right");
                 $this->app->Tpl->Set("NACHRICHT_ZEIT",$message['zeit']);            
             }
 
diff --git a/www/themes/new/css/styles.css b/www/themes/new/css/styles.css
index 5bdf18ed..9bdd766b 100644
--- a/www/themes/new/css/styles.css
+++ b/www/themes/new/css/styles.css
@@ -2467,12 +2467,16 @@ ul.tag-editor {
     visibility: hidden;
 }
 
+.ticket_nachricht_box {
+    border: solid 1px;
+    border-radius: 7px;
+}
+
 .ticket_text {
     width: 100%;
     border: none;
 }
 
-
 .ui-button-icon,
 .ui-button:not(.ui-dialog-titlebar-close):not(.button-secondary),
 input[type=submit]:not(.button-secondary) {
@@ -3373,7 +3377,7 @@ div.noteit_highprio {
     right: 10px;
     top: 28px;
 }
-
+/*
 @media screen and (min-width: 320px) {
     .mkTableFormular tr td:first-child {
         padding-top: 7px;
@@ -3386,7 +3390,7 @@ div.noteit_highprio {
 }
 .mkTableFormular tr td {
     vertical-align: top;
-}
+}*/
 @media screen and (max-width: 768px) {
     .hide768 {
         display: none;