🎨 Version upgrades and UI improvements

Signed-off-by: Luke Tainton <luke@tainton.uk>
This commit is contained in:
2020-08-14 21:51:26 +01:00
parent 31cecc6757
commit c18e14299e
2 changed files with 118 additions and 116 deletions

View File

@@ -20,7 +20,7 @@
</div>
</footer>
<script src="https://code.jquery.com/jquery-3.5.1.slim.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.5.0/js/bootstrap.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.1/dist/umd/popper.min.js"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js"></script>
</body>
</html>

View File

@@ -29,130 +29,132 @@
<div class="card-header">
<span class="mdi mdi-ticket-outline"></span> My Requests
</div>
<ul class="nav nav-pills">
<li class="active"><a data-toggle="pill" href="#open">Open Requests</a></li>
<li><a data-toggle="pill" href="#closed">Closed Requests</a></li>
</ul>
<!-- Open requests content -->
<div id="open" class="tab-pane fade in active">
<div class="tab-content">
<ul class="list-group list-group-flush">
<?php
if (count($open_requests) == 0) {
echo("<center><b>No open tickets</b></center>");
} else {
foreach($open_requests as $tkt) {
?>
<li class="list-group-item">
<div class="container">
<div class="row">
<div class="col-10">
<span class="requestinfo text-muted">#<?php echo(sprintf("%'.05d\n", $tkt["id"])); ?> </span>
<span><b><?php echo($tkt['title']); ?></b></span>
<p class="m-0"><?php echo($tkt['description']); ?></p>
</div>
<div class="col-2">
<a class="btn btn-success float-right" href="view?rid=<?php echo($tkt["uuid"]); ?>" role="button">Go</a>
</div>
</div>
</div>
</li>
<?php } } ?>
</ul>
</div>
</div>
<!-- Closed requests content -->
<div id="closed" class="tab-pane fade">
<ul class="list-group list-group-flush">
<?php
if (count($closed_requests) == 0) {
echo("<center><b>No closed tickets</b></center>");
<nav>
<div class="nav nav-tabs" id="my-tab" role="tablist">
<a id="nav-my-open-tab" class="nav-link" data-toggle="tab" role="tab" aria-selected="false" href="#my-open" aria-controls="nav-my-open">Open</a>
<a id="nav-my-closed-tab" class="nav-link active" data-toggle="tab" role="tab" aria-selected="true" href="#my-closed" aria-controls="nav-my-closed">Closed</a>
</div>
</nav>
<div class="tab-content" id="my-tabContent">
<!-- Open requests content -->
<div id="my-open" class="tab-pane fade active show" role="tabpanel" aria-labelledby="nav-my-open">
<ul class="list-group list-group-flush">
<?php
if (count($open_requests) == 0) {
echo("<center><b>No open tickets</b></center>");
} else {
foreach($closed_requests as $tkt) {
?>
<li class="list-group-item">
<div class="container">
<div class="row">
<div class="col-10">
<span class="requestinfo text-muted">#<?php echo(sprintf("%'.05d\n", $tkt["id"])); ?> </span><span><b><?php echo($tkt['title']); ?></b></span>
<p class="m-0"><?php echo($tkt['description']); ?></p>
</div>
<div class="col-2">
<a class="btn btn-success float-right" href="view?rid=<?php echo($tkt["uuid"]); ?>" role="button">Go</a>
</div>
</div>
</div>
</li>
<?php } } ?>
</ul>
</div>
</div>
</section>
<section>
<div class="col-sm">
<div class="card mx-auto" style="width: 80%; margin-bottom: 50px;">
<div class="card-header">
<span class="mdi mdi-rss"></span> My Subscribed Requests
foreach($open_requests as $tkt) {
?>
<li class="list-group-item">
<div class="container">
<div class="row">
<div class="col-10">
<span class="requestinfo text-muted">#<?php echo(sprintf("%'.05d\n", $tkt["id"])); ?> </span>
<span><b><?php echo($tkt['title']); ?></b></span>
<p class="m-0"><?php echo($tkt['description']); ?></p>
</div>
<div class="col-2">
<a class="btn btn-success float-right" href="view?rid=<?php echo($tkt["uuid"]); ?>" role="button">Go</a>
</div>
</div>
</div>
</li>
<?php } } ?>
</ul>
</div>
<ul class="nav nav-pills">
<li class="active"><a data-toggle="pill" href="#opensubs">Open Subscribed Requests</a></li>
<li><a data-toggle="pill" href="#closedsubs">Closed Subscribed Requests</a></li>
</ul>
<!-- Open Subscribed requests content -->
<div id="open" class="tab-pane fade in active">
<div class="tab-content">
<ul class="list-group list-group-flush">
<?php
if (count($open_subscriptions) == 0) {
echo("<center><b>No subscribed tickets</b></center>");
<!-- Closed requests content -->
<div id="my-closed" class="tab-pane fade" role="tabpanel" aria-labelledby="nav-my-closed">
<ul class="list-group list-group-flush">
<?php
if (count($closed_requests) == 0) {
echo("<center><b>No closed tickets</b></center>");
} else {
foreach($open_subscriptions as $sub) { ?>
<li class="list-group-item">
<div class="container">
<div class="row">
<div class="col-10">
<span class="requestinfo text-muted">#<?php echo sprintf("%'.05d\n", $sub["id"]); ?> </span><span><b><?php echo($sub['title']); ?></b></span> <span style="display: inline;" class="text-muted"><?php echo("(Creator: " . get_user_name($db, $sub['created_by']) . ")"); ?></span>
<p class="m-0"><?php echo($sub['description']); ?></p>
</div>
<div class="col-2">
<a class="btn btn-success float-right" href="view?rid=<?php echo($sub["uuid"]); ?>" role="button">Go</a>
</div>
</div>
</div>
</li>
<?php } } ?>
</ul>
</div>
</div>
<div id="closed" class="tab-pane fade in active">
<div class="tab-content">
<ul class="list-group list-group-flush">
<?php
if (count($closed_subscriptions) == 0) {
echo("<center><b>No subscribed tickets</b></center>");
} else {
foreach($closed_subscriptions as $sub) { ?>
<li class="list-group-item">
<div class="container">
<div class="row">
<div class="col-10">
<span class="requestinfo text-muted">#<?php echo sprintf("%'.05d\n", $sub["id"]); ?> </span><span><b><?php echo($sub['title']); ?></b></span> <span style="display: inline;" class="text-muted"><?php echo("(Creator: " . get_user_name($db, $sub['created_by']) . ")"); ?></span>
<p class="m-0"><?php echo($sub['description']); ?></p>
</div>
<div class="col-2">
<a class="btn btn-success float-right" href="view?rid=<?php echo($sub["uuid"]); ?>" role="button">Go</a>
foreach($closed_requests as $tkt) {
?>
<li class="list-group-item">
<div class="container">
<div class="row">
<div class="col-10">
<span class="requestinfo text-muted">#<?php echo(sprintf("%'.05d\n", $tkt["id"])); ?> </span><span><b><?php echo($tkt['title']); ?></b></span>
<p class="m-0"><?php echo($tkt['description']); ?></p>
</div>
<div class="col-2">
<a class="btn btn-success float-right" href="view?rid=<?php echo($tkt["uuid"]); ?>" role="button">Go</a>
</div>
</div>
</div>
</div>
</li>
</li>
<?php } } ?>
</ul>
</div>
</div>
</div>
</section>
</div>
</div>
</section>
<section>
<div class="col-sm">
<div class="card mx-auto" style="width: 80%; margin-bottom: 50px;">
<div class="card-header">
<span class="mdi mdi-rss"></span> My Subscribed Requests
</div>
<nav>
<div class="nav nav-tabs" id="sub-tab" role="tablist">
<a id="nav-sub-open-tab" class="nav-link" data-toggle="tab" role="tab" aria-selected="false" href="#sub-open" aria-controls="nav-sub-open">Open</a>
<a id="nav-sub-closed-tab" class="nav-link active" data-toggle="tab" role="tab" aria-selected="true" href="#sub-closed" aria-controls="nav-sub-closed">Closed</a>
</div>
</nav>
<div class="tab-content" id="sub-tabContent">
<!-- Open Subscribed requests content -->
<div id="sub-open" class="tab-pane fade active show" role="tabpanel" aria-labelledby="nav-sub-open">
<ul class="list-group list-group-flush">
<?php
if (count($open_subscriptions) == 0) {
echo("<center><b>No subscribed tickets</b></center>");
} else {
foreach($open_subscriptions as $sub) { ?>
<li class="list-group-item">
<div class="container">
<div class="row">
<div class="col-10">
<span class="requestinfo text-muted">#<?php echo sprintf("%'.05d\n", $sub["id"]); ?> </span><span><b><?php echo($sub['title']); ?></b></span> <span style="display: inline;" class="text-muted"><?php echo("(Creator: " . get_user_name($db, $sub['created_by']) . ")"); ?></span>
<p class="m-0"><?php echo($sub['description']); ?></p>
</div>
<div class="col-2">
<a class="btn btn-success float-right" href="view?rid=<?php echo($sub["uuid"]); ?>" role="button">Go</a>
</div>
</div>
</div>
</li>
<?php } } ?>
</ul>
</div>
<div id="sub-closed" class="tab-pane fade" role="tabpanel" aria-labelledby="nav-sub-closed">
<ul class="list-group list-group-flush">
<?php
if (count($closed_subscriptions) == 0) {
echo("<center><b>No subscribed tickets</b></center>");
} else {
foreach($closed_subscriptions as $sub) { ?>
<li class="list-group-item">
<div class="container">
<div class="row">
<div class="col-10">
<span class="requestinfo text-muted">#<?php echo sprintf("%'.05d\n", $sub["id"]); ?> </span><span><b><?php echo($sub['title']); ?></b></span> <span style="display: inline;" class="text-muted"><?php echo("(Creator: " . get_user_name($db, $sub['created_by']) . ")"); ?></span>
<p class="m-0"><?php echo($sub['description']); ?></p>
</div>
<div class="col-2">
<a class="btn btn-success float-right" href="view?rid=<?php echo($sub["uuid"]); ?>" role="button">Go</a>
</div>
</div>
</div>
</li>
<?php } } ?>
</ul>
</div>
</div>
</div>
</section>
</div>
</section>
<?php } else { ?>
<section>
<div class='alert alert-danger alert-dismissible fade show' role='alert'>