From acf847658363d7f1a9b18ab56f80daaacaae7986 Mon Sep 17 00:00:00 2001
From: Luke Tainton <luke@tainton.uk>
Date: Sun, 9 Aug 2020 14:25:50 +0100
Subject: [PATCH] :lipstick: Fix bugs and tidy up UI

Signed-off-by: Luke Tainton <luke@tainton.uk>
---
 app/public/update.php | 36 ++++++++++++++++++++----------------
 app/public/upload.php | 31 ++++++++++++++++++++-----------
 2 files changed, 40 insertions(+), 27 deletions(-)

diff --git a/app/public/update.php b/app/public/update.php
index 30d7642..6d3b830 100644
--- a/app/public/update.php
+++ b/app/public/update.php
@@ -93,11 +93,6 @@
           <h1><?php echo($request['title']); ?></h1>
           <p style="color: gray; font-style: italic;"><?php echo("#" . sprintf("%'.05d\n", $request["id"])); ?></p>
           <p class="lead text-muted"><?php echo($request['description']); ?></p>
-          <p>
-            <a href='/update?rid=<?php echo($tkt["uuid"]); ?>' class='btn btn-primary my-2'>Update the request</a>
-            <a href='/upload?rid=<?php echo($tkt["uuid"]); ?>' class='btn btn-secondary my-2'>Add attachment(s)</a>
-            <a href='/close?rid=<?php echo($tkt["uuid"]); ?>' class='btn btn-danger my-2'>Close the request</a>
-          </p>
         </div>
       </section>
       <section>
@@ -183,20 +178,29 @@
           </div>
         </div>
       </section>
-      <section>
-        <div class="card mx-auto" style="width: 50%;margin-bottom: 50px;">
-          <form style="padding: 2%" action="/update" method="post" enctype="multipart/form-data">
-            <div class="form-group">
-              <input type="hidden" id="rid" name="rid" value="<?php echo($_GET['rid']); ?>">
+
+      <section style="margin-top: 2%;">
+        <div class="container">
+          <div class="row">
+            <div class="col-12">
+              <div class="card mx-auto">
+                <div class="card-header"><span class="mdi mdi-send-outline"></span> Post update</div>
+                  <form action="/update" method="post" enctype="multipart/form-data">
+                    <div class="form-group">
+                      <input type="hidden" id="rid" name="rid" value="b4b3d4cf-d64d-11ea-b64d-0019997c933f">
+                    </div>
+                    <div class="form-group" style="margin: 2%;">
+                      <textarea type="text" class="form-control" id="msg" name="msg" rows="3"></textarea>
+                      <button type="submit" class="btn btn-primary" style="margin-top: 2%;">Submit</button>
+                      <a href="/view?rid=<?php echo($_GET['rid']); ?>" class="btn btn-danger" style="margin-top: 2%;">Cancel</a>
+                    </div>
+                  </form>
+              </div>
             </div>
-            <div class="form-group">
-              <label for="msg">Update: </label>
-              <textarea type="text" class="form-control" id="msg" name="msg" rows="3"></textarea>
-            </div>
-            <button type="submit" class="btn btn-primary">Submit</button>
-          </form>
+          </div>
         </div>
       </section>
+      
     <?php } else if ($is_authorised == false) { ?>
       <section class="jumbotron text-center">
         <div class="container">
diff --git a/app/public/upload.php b/app/public/upload.php
index 7840c80..118b42b 100644
--- a/app/public/upload.php
+++ b/app/public/upload.php
@@ -192,20 +192,29 @@
           </div>
         </div>
       </section>
-      <section>
-        <div class="card mx-auto" style="width: 50%;margin-bottom: 50px;">
-          <form style="padding: 2%" action="/upload" method="post" enctype="multipart/form-data">
-            <div class="form-group">
-              <input type="hidden" id="rid" name="rid" value="<?php echo($_GET['rid']); ?>">
+
+      <section style="margin-top: 2%;">
+        <div class="container">
+          <div class="row">
+            <div class="col-12">
+              <div class="card mx-auto">
+                <div class="card-header"><span class="mdi mdi-cloud-upload-outline"></span> Upload file(s)</div>
+                  <form action="/upload" method="post" enctype="multipart/form-data">
+                    <div class="form-group">
+                      <input type="hidden" id="rid" name="rid" value="b4b3d4cf-d64d-11ea-b64d-0019997c933f">
+                    </div>
+                    <div class="form-group" style="margin: 2%;">
+                      <input type="file" class="form-control-file" id="file" name="file">
+                      <button type="submit" class="btn btn-primary" style="margin-top: 2%;">Submit</button>
+                      <a href="/view?rid=<?php echo($_GET['rid']); ?>" class="btn btn-danger" style="margin-top: 2%;">Cancel</a>
+                    </div>
+                  </form>
+              </div>
             </div>
-            <div class="form-group">
-              <label for="file">Upload file(s): </label>
-              <input type="file" class="form-control-file" id="file" name="file">
-            </div>
-            <button type="submit" class="btn btn-primary">Submit</button>
-          </form>
+          </div>
         </div>
       </section>
+
     <?php } else if ($is_authorised == false) { ?>
       <section class="jumbotron text-center">
         <div class="container">