ThaMunsta/itflow
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1050 from itflow-org/ticket-reply-layout

Browse Source 
Adjust ticket reply layout
This commit is contained in:
Johnny
2024-09-12 12:16:02 -04:00
committed by GitHub
parent f2a3299ef0 77b7250703
commit 412eed7554
2 changed files with 282 additions and 284 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ticket.php
+25 -27
View File
@@ -674,7 +674,7 @@ if (isset($_GET['ticket_id'])) {
<?php } ?> <?php } ?>
<!-- Ticket Responses --> <!-- Ticket Responses -->
<h6>Responses <?php echo $ticket_all_comments_count; ?></h6> <h6>Responses: <?php echo $ticket_all_comments_count; ?></h6>
<!-- Ticket replies --> <!-- Ticket replies -->
<?php <?php
@@ -712,15 +712,12 @@ if (isset($_GET['ticket_id'])) {
?> ?>
<div class="card border-left border-<?php if ($ticket_reply_type == 'Internal') { echo "dark"; <!-- Begin ticket reply card -->
} elseif ($ticket_reply_type == 'Client') { <div class="card border-left border-<?php if ($ticket_reply_type == 'Internal') { echo "dark"; } elseif ($ticket_reply_type == 'Client') { echo "warning"; } else { echo "info"; } ?> mb-3">
echo "warning";
} else {
echo "info";
} ?> mb-3">
<div class="card-header"> <div class="card-header">
<h3 class="card-title"> <div class="d-flex justify-content-between align-items-center w-100">
<div class="media"> <!-- Left side content -->
<div class="d-flex align-items-center">
<?php if (!empty($user_avatar)) { ?> <?php if (!empty($user_avatar)) { ?>
<img src="<?php echo $avatar_link; ?>" alt="User Avatar" class="img-size-50 mr-3 img-circle"> <img src="<?php echo $avatar_link; ?>" alt="User Avatar" class="img-size-50 mr-3 img-circle">
<?php } else { ?> <?php } else { ?>
@@ -730,33 +727,24 @@ if (isset($_GET['ticket_id'])) {
</span> </span>
<?php } ?> <?php } ?>
<div class="media-body"> <div class="ml-3">
<?php echo $ticket_reply_by_display; ?> <h3 class="card-title"><?php echo $ticket_reply_by_display; ?></h3>
<div> <div>
<small class="text-muted">
<div title="<?php echo $ticket_reply_created_at; ?>">
<?php echo $ticket_reply_created_at_ago; ?>
</div>
<?php if ($ticket_reply_updated_at) { ?>
<div title="<?php echo $ticket_reply_updated_at; ?>">
modified: <?php echo $ticket_reply_updated_at_ago; ?>
</div>
<?php } ?>
</small>
</div>
<?php if ($ticket_reply_type !== "Client") { ?> <?php if ($ticket_reply_type !== "Client") { ?>
<div> <div>
<small class="text-muted">Time worked: <?php echo date_format($ticket_reply_time_worked, 'H:i:s'); ?></small> <br><small class="text-muted">Time worked: <?php echo date_format($ticket_reply_time_worked, 'H:i:s'); ?></small>
</div> </div>
<?php } ?> <?php } ?>
</div> </div>
</div> </div>
</h3> </div>
<!-- Right-side content -->
<div class="text-right d-flex flex-column align-items-end">
<?php if ($ticket_reply_type !== "Client" && empty($ticket_closed_at)) { ?> <?php if ($ticket_reply_type !== "Client" && empty($ticket_closed_at)) { ?>
<div class="card-tools d-print-none"> <div class="card-tools d-print-none mb-2">
<div class="dropdown dropleft"> <div class="dropdown dropleft">
<button class="btn btn-tool" type="button" id="dropdownMenuButton" data-toggle="dropdown"> <button class="btn btn-sm btn-tool" type="button" id="dropdownMenuButton" data-toggle="dropdown">
<i class="fas fa-fw fa-ellipsis-v"></i> <i class="fas fa-fw fa-ellipsis-v"></i>
</button> </button>
<div class="dropdown-menu"> <div class="dropdown-menu">
@@ -774,6 +762,14 @@ if (isset($_GET['ticket_id'])) {
</div> </div>
<?php } ?> <?php } ?>
<small class="text-muted">
<div title="Created: <?php echo $ticket_reply_created_at; if ($ticket_reply_updated_at) { echo '. Edited: ' . $ticket_reply_updated_at; } ?>">
<?php echo $ticket_reply_type . " - " . $ticket_reply_created_at_ago; if ($ticket_reply_updated_at) { echo '*'; } ?>
</div>
</small>
</div>
</div>
</div> </div>
<div class="card-body prettyContent"> <div class="card-body prettyContent">
@@ -787,9 +783,11 @@ if (isset($_GET['ticket_id'])) {
} }
?> ?>
</div> </div>
</div> </div>
<!-- End ticket reply card -->
<?php <?php
require "ticket_reply_edit_modal.php"; require "ticket_reply_edit_modal.php";
user_details.php
+1 -1
View File
@@ -16,7 +16,7 @@ require_once "inc_all_user.php";
<?php if (empty($session_avatar)) { ?> <?php if (empty($session_avatar)) { ?>
<i class="fas fa-user-circle fa-8x text-secondary"></i> <i class="fas fa-user-circle fa-8x text-secondary"></i>
<?php } else { ?> <?php } else { ?>
<img alt="User avatar" src="<?php echo "uploads/users/$session_user_id/" . nullable_htmlentities($session_avatar); ?>" class="img-fluid"> <img alt="User avatar" src="<?php echo "uploads/users/$session_user_id/" . nullable_htmlentities($session_avatar); ?>" class="img-size-64">
<?php } ?> <?php } ?>
<h4 class="text-secondary mt-2"><?php echo nullable_htmlentities($session_user_role_display); ?></h4> <h4 class="text-secondary mt-2"><?php echo nullable_htmlentities($session_user_role_display); ?></h4>
</center> </center>