🐛 Move opening and closing 'main' tags #132

Merged
luketainton merged 2 commits from bug-117 into main 2020-08-31 18:16:34 +00:00
2 changed files with 27 additions and 16 deletions
Showing only changes of commit 0a62e92095 - Show all commits

View File

@@ -10,7 +10,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="theme-color" content="#563d7c"> <meta name="theme-color" content="#563d7c">
<link rel="icon" type="image/png" href="/favicon.png"> <link rel="icon" type="image/png" href="/favicon.png">
<title><?php echo( $PAGE_TITLE ); ?></title> <title><?php echo($PAGE_TITLE); ?></title>
<!-- Bootstrap core CSS --> <!-- Bootstrap core CSS -->
<link rel="stylesheet" href="/css/bootstrap.min.css"> <link rel="stylesheet" href="/css/bootstrap.min.css">
@@ -34,10 +34,14 @@
<a class="nav-link" href="/">Home</a> <a class="nav-link" href="/">Home</a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a class="nav-link <?php if (!is_signed_in()) {echo(' disabled');} ?>" href="/new">New request</a> <a class="nav-link <?php if (!is_signed_in()) {
echo(' disabled');
} ?>" href="/new">New request</a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a class="nav-link <?php if (!is_signed_in()) {echo(' disabled');} ?>" href="/existing">Existing requests</a> <a class="nav-link <?php if (!is_signed_in()) {
echo(' disabled');
} ?>" href="/existing">Existing requests</a>
</li> </li>
</ul> </ul>
<div class="mt-2 mt-md-0"> <div class="mt-2 mt-md-0">

View File

@@ -12,7 +12,7 @@
<section> <section>
<?php <?php
if(isset($alert)) { if (isset($alert)) {
echo(" echo("
<div class='container'> <div class='container'>
<div class='alert alert-" . $alert[0] . " alert-dismissible fade show' role='alert'> <div class='alert alert-" . $alert[0] . " alert-dismissible fade show' role='alert'>
@@ -33,7 +33,11 @@
<h1>Welcome to <?php echo($_ENV['APP_NAME']); ?></h1> <h1>Welcome to <?php echo($_ENV['APP_NAME']); ?></h1>
<p class="lead text-muted"> <p class="lead text-muted">
<?php <?php
if ($_ENV['APP_NAME'] == "FHeD") {echo("The Free HelpDesk");} else {echo($_ENV['APP_NAME']);}; if ($_ENV['APP_NAME'] == "FHeD") {
echo("The Free HelpDesk");
} else {
echo($_ENV['APP_NAME']);
};
?> ?>
is the one-stop shop for all of your IT-related needs. Let us know how we can help you by opening a request. is the one-stop shop for all of your IT-related needs. Let us know how we can help you by opening a request.
</p> </p>
@@ -61,7 +65,7 @@
if (count($requests) == 0) { if (count($requests) == 0) {
echo("<center><b>No open tickets</b></center>"); echo("<center><b>No open tickets</b></center>");
} else { } else {
foreach($requests as $tkt) { foreach ($requests as $tkt) {
?> ?>
<li class="list-group-item"> <li class="list-group-item">
<div class="container"> <div class="container">
@@ -76,7 +80,9 @@
</div> </div>
</div> </div>
</li> </li>
<?php } } ?> <?php
}
} ?>
</ul> </ul>
</div> </div>
</div> </div>
@@ -91,7 +97,7 @@
if (count($subscriptions) == 0) { if (count($subscriptions) == 0) {
echo("<center><b>No subscribed tickets</b></center>"); echo("<center><b>No subscribed tickets</b></center>");
} else { } else {
foreach($subscriptions as $sub) { ?> foreach ($subscriptions as $sub) { ?>
<li class="list-group-item"> <li class="list-group-item">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
@@ -105,7 +111,8 @@
</div> </div>
</div> </div>
</li> </li>
<?php } } ?> <?php }
} ?>
</ul> </ul>
</div> </div>
</section> </section>