#503 tweak message format, also fix some missing changes for the calendar fix

merge-requests/47/head
Mike Koch 7 years ago
parent ba0a035d88
commit 80b6ef4c9b

@ -1609,6 +1609,11 @@ function mfh_print_message() {
?> ?>
</div> </div>
<div class="timeline-body"> <div class="timeline-body">
<div class="row">
<div class="col-md-3 text-right">
<strong><?php echo $hesklang['message_colon']; ?></strong>
</div>
<div class="col-md-9">
<?php <?php
if ($ticket['message'] != '') { if ($ticket['message'] != '') {
if ($ticket['html']) { if ($ticket['html']) {
@ -1619,6 +1624,8 @@ function mfh_print_message() {
} }
?> ?>
</div> </div>
</div>
</div>
<?php <?php
$first = true; $first = true;
foreach ($hesk_settings['custom_fields'] as $k => $v) { foreach ($hesk_settings['custom_fields'] as $k => $v) {
@ -1713,6 +1720,11 @@ function hesk_printTicketReplies()
<span class="time"><i class="fa fa-clock-o"></i> <?php echo $reply['dt']; ?></span> <span class="time"><i class="fa fa-clock-o"></i> <?php echo $reply['dt']; ?></span>
<h3 class="timeline-header"><?php echo $reply['name']; ?></h3> <h3 class="timeline-header"><?php echo $reply['name']; ?></h3>
<div class="timeline-body"> <div class="timeline-body">
<div class="row">
<div class="col-md-3 text-right">
<strong><?php echo $hesklang['message_colon']; ?></strong>
</div>
<div class="col-md-9">
<?php <?php
if ($reply['html']) { if ($reply['html']) {
echo hesk_html_entity_decode($reply['message']); echo hesk_html_entity_decode($reply['message']);
@ -1720,6 +1732,8 @@ function hesk_printTicketReplies()
echo $reply['message']; echo $reply['message'];
} ?> } ?>
</div> </div>
</div>
</div>
<?php <?php
if ($hesk_settings['attachments']['use'] && strlen($reply['attachments'])): if ($hesk_settings['attachments']['use'] && strlen($reply['attachments'])):
?> ?>

@ -22,6 +22,7 @@ $(document).ready(function() {
events.push(buildEvent(this.id, this)); events.push(buildEvent(this.id, this));
}); });
callback(events); callback(events);
updateCategoryVisibility();
}, },
error: function(data) { error: function(data) {
console.error(data); console.error(data);

@ -22,6 +22,7 @@ $(document).ready(function() {
events.push(buildEvent(this.id, this)); events.push(buildEvent(this.id, this));
}); });
callback(events); callback(events);
updateCategoryVisibility();
}, },
error: function(data) { error: function(data) {
console.error(data); console.error(data);

Loading…
Cancel
Save