Netsyms/Mods-for-HESK-Netsyms
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Starting on timeline

Browse Source
This commit is contained in:
Mike Koch 2016-09-20 13:08:08 -04:00
parent f1e106bf48
commit ee979cf15b
1 changed files with 33 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
admin/admin_ticket.php
View File

@ -1587,7 +1587,7 @@ function hesk_getAdminButtonsInTicket($reply = 0, $white = 1)
{ {
global $hesk_settings, $hesklang, $ticket, $reply, $trackingID, $can_edit, $can_archive, $can_delete, $isManager; global $hesk_settings, $hesklang, $ticket, $reply, $trackingID, $can_edit, $can_archive, $can_delete, $isManager;
$options = '<div class="pull-right">'; $options = $reply ? '' : '<div class="pull-right">';
/* Edit post */ /* Edit post */
if ($can_edit) { if ($can_edit) {
@ -1612,7 +1612,7 @@ function hesk_getAdminButtonsInTicket($reply = 0, $white = 1)
} }
/* Return generated HTML */ /* Return generated HTML */
$options .= '</div>'; $options .= $reply ? '' : '</div>';
return $options; return $options;
} // END hesk_getAdminButtonsInTicket() } // END hesk_getAdminButtonsInTicket()
@ -1665,38 +1665,45 @@ function hesk_printTicketReplies()
{ {
global $hesklang, $hesk_settings, $result, $reply, $isManager, $modsForHesk_settings; global $hesklang, $hesk_settings, $result, $reply, $isManager, $modsForHesk_settings;
$i = $hesk_settings['new_top'] ? 0 : 1;
if ($reply === false) { if ($reply === false) {
return $i; return;
} }
echo '<ul class="timeline">';
while ($reply = hesk_dbFetchAssoc($result)) { while ($reply = hesk_dbFetchAssoc($result)) {
$color = 'class="ticketMessageContainer"';
$reply['dt'] = hesk_date($reply['dt'], true); $reply['dt'] = hesk_date($reply['dt'], true);
?> ?>
<div class="row ticketMessageContainer"> <li>
<div class="col-md-3 col-xs-12"> <i class="fa fa-reply bg-blue"></i>
<div class="ticketName"><?php echo $reply['name']; ?></div> <div class="timeline-item">
</div> <span class="time"><i class="fa fa-clock-o"></i> <?php echo $reply['dt']; ?></span>
<div class="col-md-9 col-xs-12 pushMarginLeft"> <h3 class="timeline-header"><?php echo $reply['name']; ?></h3>
<div class="ticketMessageTop withBorder"> <div class="timeline-body">
<?php echo hesk_getAdminButtonsInTicket(); ?> <?php
<div class="blankSpace"></div> if ($reply['html']) {
<p><?php echo $hesklang['date']; ?>: <?php echo $reply['dt']; ?></p>
</div>
<div class="ticketMessageBottom">
<p><b><?php echo $hesklang['message']; ?>:</b></p>
<p><?php if ($reply['html']) {
echo hesk_html_entity_decode($reply['message']); echo hesk_html_entity_decode($reply['message']);
} else { } else {
echo $reply['message']; echo $reply['message'];
} ?></p> } ?>
</div> </div>
<?php
if ($hesk_settings['attachments']['use'] && strlen($reply['attachments'])):
?>
<div class="timeline-footer">
<?php mfh_listAttachments($reply['attachments'], $reply['id'], true); ?>
</div>
<?php endif; ?>
<div class="timeline-footer text-right">
<?php echo hesk_getAdminButtonsInTicket(); ?>
</div>
</div>
</li><div class="row ticketMessageContainer">
<div class="col-md-3 col-xs-12">
<div class="ticketName"></div>
</div>
<div class="col-md-9 col-xs-12 pushMarginLeft">
<div class="ticketMessageTop pushMargin"> <div class="ticketMessageTop pushMargin">
<?php mfh_listAttachments($reply['attachments'], $reply['id'], true); <?php
/* Staff rating */ /* Staff rating */
if ($hesk_settings['rating'] && $reply['staffid']) { if ($hesk_settings['rating'] && $reply['staffid']) {
if ($reply['rating'] == 1) { if ($reply['rating'] == 1) {
@ -1716,8 +1723,9 @@ function hesk_printTicketReplies()
</div> </div>
<?php <?php
} }
echo '</ul>';
return $i; return;
} // End hesk_printTicketReplies() } // End hesk_printTicketReplies()