s.probst/OpenXE
1
0
Fork 0
mirror of https://github.com/OpenXE-org/OpenXE.git synced 2024-11-15 04:27:14 +01:00
Code Issues Projects Releases Wiki Activity

ticket system minor design improvement

Browse Source
This commit is contained in:
OpenXE 2022-12-20 08:37:27 +00:00
parent 2cfe710c9a
commit 143e4e96bd
3 changed files with 40 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
www/pages/content/ticket_nachricht.tpl
View File

@ -1,19 +1,35 @@
<div class="row"> <div class="row">
<div class="row-height"> <div class="row-height">
<div class="col-xs-12 col-md-10 col-md-height" style="float:[NACHRICHT_FLOAT];"> <div class="col-xs-12 col-md-12 col-md-height">
<div class="inside inside-full-height" style= "border:1px solid black;"> <div class="inside inside-full-height" >
<fieldset> <div class="row">
<legend>{|<b>[NACHRICHT_BETREFF]</b>|}</legend> <div class="row-height">
<table width="100%" border="0" class="mkTableFormular"> <div class="col-xs-12 col-md-4 col-md-height" style="float:[META_FLOAT];">
<tr><td>{|Zeit|}:</td><td>[NACHRICHT_ZEIT]</td></tr> <div class="inside inside-full-height" >
<tr><td>{|Von|}:</td><td>[NACHRICHT_SENDER]</td></tr> <fieldset>
<tr><td>{|An|}:</td><td>[NACHRICHT_RECIPIENTS]</td></tr> <table width="100%" border="0" class="mkTableFormular">
<tr><td>{|CC|}:</td><td>[NACHRICHT_CC_RECIPIENTS]</td></tr> <tr><td>{|Zeit|}:</td><td>[NACHRICHT_ZEIT]</td></tr>
<tr><td colspan=2><hr style="border-style:solid; border-width:1px"></td></tr> <tr><td>{|Von|}:</td><td>[NACHRICHT_SENDER]</td></tr>
<tr><td colspan=2><div id="body" class="ticket_text_div">[NACHRICHT_TEXT]</div></td></tr> <tr><td>{|An|}:</td><td>[NACHRICHT_RECIPIENTS]</td></tr>
<tr><td colspan=2><div id="body" class="ticket_attachments">[NACHRICHT_ANHANG]</div></td></tr> <tr><td>{|CC|}:</td><td>[NACHRICHT_CC_RECIPIENTS]</td></tr>
</table> <tr><td colspan=2><div id="body" class="ticket_attachments">[NACHRICHT_ANHANG]</div></td></tr>
</fieldset> </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> </div>
</div> </div>

3
www/pages/ticket.php
View File

@ -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_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_ZEIT",$message['zeitausgang']);
$this->app->Tpl->Set("NACHRICHT_FLOAT","right"); $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_TEXT",$message['textausgang']);
$this->app->Tpl->Set("NACHRICHT_SENDER",htmlentities($message['bearbeiter'])); $this->app->Tpl->Set("NACHRICHT_SENDER",htmlentities($message['bearbeiter']));
$this->app->Tpl->Set("NACHRICHT_RECIPIENTS",htmlentities($message['verfasser']." <".$message['mail'].">")); $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_RECIPIENTS",htmlentities($message['mail']));
$this->app->Tpl->Set("NACHRICHT_CC_RECIPIENTS",htmlentities($message['mail_cc'])); $this->app->Tpl->Set("NACHRICHT_CC_RECIPIENTS",htmlentities($message['mail_cc']));
$this->app->Tpl->Set("NACHRICHT_FLOAT","right"); $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_ZEIT",$message['zeitausgang']);
$this->app->Tpl->Set("NACHRICHT_NAME",htmlentities($message['verfasser'])); $this->app->Tpl->Set("NACHRICHT_NAME",htmlentities($message['verfasser']));
} else { } else {
@ -351,6 +353,7 @@ class Ticket {
$this->app->Tpl->Set("NACHRICHT_CC_RECIPIENTS",htmlentities($message['mail_cc_recipients'])); $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_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("NACHRICHT_FLOAT","left");
$this->app->Tpl->Set("META_FLOAT","right");
$this->app->Tpl->Set("NACHRICHT_ZEIT",$message['zeit']); $this->app->Tpl->Set("NACHRICHT_ZEIT",$message['zeit']);
} }

10
www/themes/new/css/styles.css
View File

@ -2467,12 +2467,16 @@ ul.tag-editor {
visibility: hidden; visibility: hidden;
} }
.ticket_nachricht_box {
border: solid 1px;
border-radius: 7px;
}
.ticket_text { .ticket_text {
width: 100%; width: 100%;
border: none; border: none;
} }
.ui-button-icon, .ui-button-icon,
.ui-button:not(.ui-dialog-titlebar-close):not(.button-secondary), .ui-button:not(.ui-dialog-titlebar-close):not(.button-secondary),
input[type=submit]:not(.button-secondary) { input[type=submit]:not(.button-secondary) {
@ -3373,7 +3377,7 @@ div.noteit_highprio {
right: 10px; right: 10px;
top: 28px; top: 28px;
} }
/*
@media screen and (min-width: 320px) { @media screen and (min-width: 320px) {
.mkTableFormular tr td:first-child { .mkTableFormular tr td:first-child {
padding-top: 7px; padding-top: 7px;
@ -3386,7 +3390,7 @@ div.noteit_highprio {
} }
.mkTableFormular tr td { .mkTableFormular tr td {
vertical-align: top; vertical-align: top;
} }*/
@media screen and (max-width: 768px) { @media screen and (max-width: 768px) {
.hide768 { .hide768 {
display: none; display: none;