More admin ticket changes
This commit is contained in:
parent
3eb1cdaffb
commit
b2f1ff3419
@ -1056,6 +1056,12 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
<?php
|
||||
/* Reply form on top? */
|
||||
if ($can_reply && $hesk_settings['reply_top'] == 1) {
|
||||
hesk_printReplyForm();
|
||||
}
|
||||
?>
|
||||
<div class="box">
|
||||
<div class="box-header with-border">
|
||||
<h1 class="box-title">
|
||||
@ -1073,10 +1079,10 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
|
||||
$can_options = hesk_printCanned();
|
||||
?>
|
||||
<div class="row">
|
||||
<div class="col-md-2 text-right">
|
||||
<div class="col-md-3 text-right">
|
||||
<strong><?php echo $hesklang['m_sub']; ?></strong>
|
||||
</div>
|
||||
<div class="col-md-10">
|
||||
<div class="col-md-9">
|
||||
<?php echo $ticket['subject']; ?>
|
||||
</div>
|
||||
</div>
|
||||
@ -1086,25 +1092,47 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
|
||||
$v['name'] = $hesklang[$v['name']];
|
||||
}
|
||||
echo '<div class="row">';
|
||||
echo '<div class="col-md-2 text-right"><strong>' . $v['name'] . ':</strong></div>';
|
||||
echo '<div class="col-md-3 text-right"><strong>' . $v['name'] . ':</strong></div>';
|
||||
if ($v['type'] == 'date' && !empty($ticket[$k])) {
|
||||
$dt = date('Y-m-d h:i:s', $ticket[$k]);
|
||||
echo '<div class="col-md-10">' . hesk_dateToString($dt, 0) . '</div>';
|
||||
echo '<div class="col-md-9">' . hesk_dateToString($dt, 0) . '</div>';
|
||||
} else {
|
||||
echo '<div class="col-md-10">' . $ticket[$k] . '</div>';
|
||||
echo '<div class="col-md-9">' . $ticket[$k] . '</div>';
|
||||
}
|
||||
echo '</div>';
|
||||
}
|
||||
}
|
||||
?>
|
||||
<div class="row push-down-10">
|
||||
<div class="col-md-2 text-right">
|
||||
<div class="col-md-3 text-right">
|
||||
<strong><?php echo $hesklang['message_colon']; ?></strong>
|
||||
</div>
|
||||
<div class="col-md-10">
|
||||
<?php echo $ticket['subject']; ?>
|
||||
<div class="col-md-9">
|
||||
<?php if ($ticket['html']) {
|
||||
echo hesk_html_entity_decode($ticket['message']);
|
||||
} else {
|
||||
echo $ticket['message'];
|
||||
} ?>
|
||||
</div>
|
||||
</div>
|
||||
<?php
|
||||
foreach ($hesk_settings['custom_fields'] as $k => $v) {
|
||||
if ($v['use'] && $v['place']) {
|
||||
if ($modsForHesk_settings['custom_field_setting']) {
|
||||
$v['name'] = $hesklang[$v['name']];
|
||||
}
|
||||
echo '<div class="row">';
|
||||
echo '<div class="col-md-3 text-right"><strong>' . $v['name'] . ':</strong></div>';
|
||||
if ($v['type'] == 'date' && !empty($ticket[$k])) {
|
||||
$dt = date('Y-m-d h:i:s', $ticket[$k]);
|
||||
echo '<div class="col-md-9">' . hesk_dateToString($dt, 0) . '</div>';
|
||||
} else {
|
||||
echo '<div class="col-md-9">' . $ticket[$k] . '</div>';
|
||||
}
|
||||
echo '</div>';
|
||||
}
|
||||
}
|
||||
?>
|
||||
</div>
|
||||
<div class="box-footer">
|
||||
<?php echo hesk_getAdminButtonsInTicket(0, $i); ?>
|
||||
@ -1223,18 +1251,6 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="blankSpace"></div>
|
||||
<!-- END TICKET HEAD -->
|
||||
|
||||
<?php
|
||||
/* Reply form on top? */
|
||||
if ($can_reply && $hesk_settings['reply_top'] == 1) {
|
||||
hesk_printReplyForm();
|
||||
echo '<br />';
|
||||
}
|
||||
?>
|
||||
|
||||
<!-- START TICKET REPLIES -->
|
||||
|
||||
<?php
|
||||
if ($hesk_settings['new_top']) {
|
||||
@ -1248,43 +1264,10 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
|
||||
?>
|
||||
<div class="row ticketMessageContainer">
|
||||
<div class="col-md-9 col-xs-12 pushMarginLeft">
|
||||
<div class="ticketMessageTop withBorder">
|
||||
<!-- Action Buttons -->
|
||||
|
||||
<!-- Custom Fields Before Message -->
|
||||
|
||||
</div>
|
||||
<div class="ticketMessageBottom">
|
||||
<!-- Message -->
|
||||
<p><b><?php echo $hesklang['message']; ?>:</b></p>
|
||||
|
||||
<div class="message">
|
||||
<?php if ($ticket['html']) {
|
||||
echo hesk_html_entity_decode($ticket['message']);
|
||||
} else {
|
||||
echo $ticket['message'];
|
||||
} ?>
|
||||
</div>
|
||||
</div>
|
||||
<div class="ticketMessageTop">
|
||||
<!-- Custom Fields after Message -->
|
||||
<?php
|
||||
foreach ($hesk_settings['custom_fields'] as $k => $v) {
|
||||
if ($v['use'] && $v['place']) {
|
||||
if ($modsForHesk_settings['custom_field_setting']) {
|
||||
$v['name'] = $hesklang[$v['name']];
|
||||
}
|
||||
|
||||
echo '<p>' . $v['name'] . ': ';
|
||||
if ($v['type'] == 'date' && !empty($ticket[$k])) {
|
||||
$dt = date('Y-m-d h:i:s', $ticket[$k]);
|
||||
echo hesk_dateToString($dt, 0);
|
||||
} else {
|
||||
echo $ticket[$k];
|
||||
}
|
||||
echo '</p>';
|
||||
}
|
||||
}
|
||||
/* Attachments */
|
||||
mfh_listAttachments($ticket['attachments'], 0, true);
|
||||
|
||||
@ -1752,12 +1735,20 @@ function hesk_printReplyForm()
|
||||
});
|
||||
/* ]]> */
|
||||
</script>
|
||||
<?php endif; ?>
|
||||
|
||||
<h3 class="text-left"><?php echo $hesklang['add_reply']; ?></h3>
|
||||
<div class="footerWithBorder"></div>
|
||||
<div class="blankSpace"></div>
|
||||
<?php endif; ?>
|
||||
|
||||
<div class="box">
|
||||
<div class="box-header with-border">
|
||||
<h1 class="box-title">
|
||||
<?php echo $hesklang['add_reply']; ?>
|
||||
</h1>
|
||||
<div class="box-tools pull-right">
|
||||
<button type="button" class="btn btn-box-tool" data-widget="collapse">
|
||||
<i class="fa fa-minus"></i>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="box-body">
|
||||
<?php
|
||||
$onsubmit = 'onsubmit="force_stop();"';
|
||||
if ($modsForHesk_settings['rich_text_for_tickets']) {
|
||||
@ -1936,7 +1927,8 @@ function hesk_printReplyForm()
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<!-- END REPLY FORM -->
|
||||
<?php
|
||||
} // End hesk_printReplyForm()
|
||||
|
Loading…
x
Reference in New Issue
Block a user