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 design improvements, subject in info box, optimized space usage, bugfix warteschlange autocomplete

Browse Source
This commit is contained in:
OpenXE 2022-12-23 19:55:48 +01:00
parent 135017158c
commit d94c05383a
5 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
www/pages/ajax.php
View File

@ -1289,7 +1289,7 @@ class Ajax {
} }
break; break;
case 'warteschlangename': case 'warteschlangename':
$arr = $this->app->DB->SelectArr("SELECT CONCAT(label, ' ', warteschlange) as result from warteschlangen"); $arr = $this->app->DB->SelectArr("SELECT CONCAT(label, ' ', warteschlange) as result from warteschlangen WHERE label LIKE '%$term%' OR warteschlange LIKE '%$term%' ORDER BY label");
$carr = !empty($arr)?count($arr):0; $carr = !empty($arr)?count($arr):0;
for($i = 0; $i < $carr; $i++) { for($i = 0; $i < $carr; $i++) {
$newarr[] = "{$arr[$i]['result']}"; $newarr[] = "{$arr[$i]['result']}";

2
www/pages/content/ticket_edit.tpl
View File

@ -21,7 +21,7 @@
<legend>{|[STATUSICON]<b>Ticket <font color="blue">#[SCHLUESSEL]</font></b>|}</legend> <legend>{|[STATUSICON]<b>Ticket <font color="blue">#[SCHLUESSEL]</font></b>|}</legend>
<tr><td>{|Betreff|}:</td><td><input type="text" name="betreff" id="betreff" value="[BETREFF]" size="20"></td></tr> <tr><td>{|Betreff|}:</td><td><input type="text" name="betreff" id="betreff" value="[BETREFF]" size="20"></td></tr>
<tr><td>{|Letzte Aktion|}:</td><td>[ZEIT]</td></tr> <tr><td>{|Letzte Aktion|}:</td><td>[ZEIT]</td></tr>
<tr><td>{|Von|}:</td><td>[MAILADRESSE] ([KUNDE])</td></tr> <tr><td>{|Von|}:</td><td>[KUNDE]&nbsp;[MAILADRESSE]</td></tr>
<tr><td>{|Projekt|}:</td><td><input type="text" name="projekt" id="projekt" value="[PROJEKT]" size="20"></td></tr> <tr><td>{|Projekt|}:</td><td><input type="text" name="projekt" id="projekt" value="[PROJEKT]" size="20"></td></tr>
<tr><td>{|Adresse|}:</td><td><input type="text" name="adresse" id="adresse" value="[ADRESSE]" size="20"><a href="index.php?module=adresse&action=edit&id=[ADRESSE_ID]"><img src="./themes/new/images/forward.svg" border="0" style="top:6px; position:relative"></a></td></tr> <tr><td>{|Adresse|}:</td><td><input type="text" name="adresse" id="adresse" value="[ADRESSE]" size="20"><a href="index.php?module=adresse&action=edit&id=[ADRESSE_ID]"><img src="./themes/new/images/forward.svg" border="0" style="top:6px; position:relative"></a></td></tr>
<tr><td>{|Tags|}:</td><td><input type="text" name="tags" id="tags" value="[TAGS]" size="20"></td></tr> <tr><td>{|Tags|}:</td><td><input type="text" name="tags" id="tags" value="[TAGS]" size="20"></td></tr>

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

@ -8,6 +8,7 @@
<div class="inside inside-full-height" > <div class="inside inside-full-height" >
<fieldset> <fieldset>
<table width="100%" border="0" class="mkTableFormular"> <table width="100%" border="0" class="mkTableFormular">
<tr><td>{|Betreff|}:</td><td><b>[NACHRICHT_BETREFF]<b></td></tr>
<tr><td>{|Zeit|}:</td><td>[NACHRICHT_ZEIT]</td></tr> <tr><td>{|Zeit|}:</td><td>[NACHRICHT_ZEIT]</td></tr>
<tr><td>{|Von|}:</td><td>[NACHRICHT_SENDER]</td></tr> <tr><td>{|Von|}:</td><td>[NACHRICHT_SENDER]</td></tr>
<tr><td>{|An|}:</td><td>[NACHRICHT_RECIPIENTS]</td></tr> <tr><td>{|An|}:</td><td>[NACHRICHT_RECIPIENTS]</td></tr>
@ -20,9 +21,7 @@
<div class="col-xs-12 col-md-8 col-md-height ticket_nachricht_box" style="float:[NACHRICHT_FLOAT]"> <div class="col-xs-12 col-md-8 col-md-height ticket_nachricht_box" style="float:[NACHRICHT_FLOAT]">
<div class="inside inside-full-height"> <div class="inside inside-full-height">
<fieldset> <fieldset>
<legend>{|<b>[NACHRICHT_BETREFF]</b>|}</legend>
<table width="100%" border="0" class="mkTableFormular"> <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> <tr><td colspan=2><div id="body" class="ticket_text_div">[NACHRICHT_TEXT]</div></td></tr>
</table> </table>
</fieldset> </fieldset>

6
www/pages/ticket.php
View File

@ -328,7 +328,7 @@ class Ticket {
} }
$this->app->Tpl->Set("NACHRICHT_BETREFF",htmlentities($message['betreff']." (Entwurf)")); $this->app->Tpl->Set("NACHRICHT_BETREFF",htmlentities($message['betreff']." (Entwurf)"));
} else { } else {
$this->app->Tpl->Set("NACHRICHT_BETREFF",htmlentities($message['betreff'])); $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_SENDER",htmlentities($message['verfasser']." <".$message['mail_replyto'].">")); $this->app->Tpl->Set("NACHRICHT_SENDER",htmlentities($message['verfasser']." <".$message['mail_replyto'].">"));
$this->app->Tpl->Set("NACHRICHT_RECIPIENTS",htmlentities($message['mail'])); $this->app->Tpl->Set("NACHRICHT_RECIPIENTS",htmlentities($message['mail']));
@ -564,6 +564,10 @@ class Ticket {
$this->app->Tpl->Set('ADRESSE', $this->app->erp->ReplaceAdresse(false,$ticket_from_db['adresse'],false)); // Convert ID to form display $this->app->Tpl->Set('ADRESSE', $this->app->erp->ReplaceAdresse(false,$ticket_from_db['adresse'],false)); // Convert ID to form display
if ($ticket_from_db['mailadresse'] != "") {
$this->app->Tpl->Set('MAILADRESSE',"&lt;".$ticket_from_db['mailadresse']."&gt;");
}
$this->app->Tpl->Set('ADRESSE_ID',$ticket_from_db['adresse']); $this->app->Tpl->Set('ADRESSE_ID',$ticket_from_db['adresse']);
$this->app->YUI->AutoComplete("projekt","projektname",1); $this->app->YUI->AutoComplete("projekt","projektname",1);

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

@ -1809,12 +1809,12 @@ fieldset.usersave div.filter-item > label {
fieldset { fieldset {
position: relative; position: relative;
margin: 0; margin: 0;
margin-top: 5px; /* margin-top: 5px;
padding: 5px; padding: 5px;
border: 0 solid transparent; border: 0 solid transparent;
border-top: 25px solid transparent; border-top: 25px solid transparent;
border-bottom: 5px solid transparent; border-bottom: 5px solid transparent;
border-width: 24px 5px 0; border-width: 24px 5px 0;*/
border-color: transparent; border-color: transparent;
background-color: transparent; background-color: transparent;
} }
@ -2469,12 +2469,19 @@ ul.tag-editor {
.ticket_nachricht_box { .ticket_nachricht_box {
border: solid 1px; border: solid 1px;
border-color: var(--textfield-border);
border-radius: 7px; border-radius: 7px;
padding: 0px !important;
}
.ticket_nachricht_box fieldset {
padding: 0px !important;
} }
.ticket_text { .ticket_text {
width: 100%; width: 100%;
border: none; border: none;
height: 300px;
} }
.ui-button-icon, .ui-button-icon,