From 25874c2803066be6fc04fd298fb3ed6773988151 Mon Sep 17 00:00:00 2001
From: Alexander Davis <alex@adcm.uk>
Date: Mon, 10 Aug 2020 18:06:02 +0100
Subject: [PATCH] Movement of buttons

---
 app/public/actions/reopen.php |  2 +-
 app/public/view.php           | 54 +++++++++++++++++------------------
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/app/public/actions/reopen.php b/app/public/actions/reopen.php
index ee79f47..6a43860 100644
--- a/app/public/actions/reopen.php
+++ b/app/public/actions/reopen.php
@@ -1,5 +1,5 @@
 <?php
-    $PAGE_NAME = "Close request";
+    $PAGE_NAME = "Reopen request";
     require_once __DIR__ . "/../../includes/prereqs.php";
 
     $request = get_request($db, $_GET['rid']);
diff --git a/app/public/view.php b/app/public/view.php
index a2919a1..a594055 100644
--- a/app/public/view.php
+++ b/app/public/view.php
@@ -51,39 +51,39 @@
           <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>
-              <?php if ($_SESSION['uuid'] == $request['created_by']) { ?>
-                <a href='/editsub?rid=<?php echo($request["uuid"]); ?>' class='btn btn-secondary my-2'>Manage subscribers</a>
-                <?php if ($request['status'] == 'Closed') { ?>
-                <a href='/editsub?rid=<?php echo($request["uuid"]); ?>' class='btn btn-success my-2'>Reopen request</a>
-              <?php }} ?>
               <?php if ($request['status'] != 'Closed') { ?>
                 <a href='/update?rid=<?php echo($request["uuid"]); ?>' class='btn btn-primary my-2'>Update the request</a>
                 <a href='/upload?rid=<?php echo($request["uuid"]); ?>' class='btn btn-primary my-2'>Add attachment(s)</a>
-                <button type="button" class="btn btn-danger" data-toggle="modal" data-target="#closeModal">Close the request</button>
+                <?php if ($_SESSION['uuid'] == $request['created_by']) { ?>
+                  <a href='/editsub?rid=<?php echo($request["uuid"]); ?>' class='btn btn-secondary my-2'>Manage subscribers</a>
+                  <button type="button" class="btn btn-danger" data-toggle="modal" data-target="#closeModal">Close the request</button>
+                  <div class="modal fade" id="closeModal" tabindex="-1" aria-labelledby="closeModalLabel" aria-hidden="true">
+                    <div class="modal-dialog">
+                      <div class="modal-content">
+                        <div class="modal-header">
+                          <h5 class="modal-title" id="closeModalLabel">Close the request?</h5>
+                          <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                            <span aria-hidden="true">&times;</span>
+                          </button>
+                        </div>
+                        <div class="modal-body">
+                          Are you sure you want to close request <b><?php echo($request['title']); ?></b>? This action is irreversible.
+                        </div>
+                        <div class="modal-footer">
+                          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
+                          <a href='/actions/close?rid=<?php echo($request["uuid"]); ?>' class='btn btn-danger'>Close request</a>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                <?php } ?>
               <?php } ?>
+              <?php if ($_SESSION['uuid'] == $request['created_by']) { ?>
+                <?php if ($request['status'] == 'Closed') { ?>
+                  <a href='/reopen?rid=<?php echo($request["uuid"]); ?>' class='btn btn-success my-2'>Reopen request</a>
+                <?php }} ?>
             </p>
         </div>
-
-        <div class="modal fade" id="closeModal" tabindex="-1" aria-labelledby="closeModalLabel" aria-hidden="true">
-          <div class="modal-dialog">
-            <div class="modal-content">
-              <div class="modal-header">
-                <h5 class="modal-title" id="closeModalLabel">Close the request?</h5>
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                  <span aria-hidden="true">&times;</span>
-                </button>
-              </div>
-              <div class="modal-body">
-                Are you sure you want to close request <b><?php echo($request['title']); ?></b>? This action is irreversible.
-              </div>
-              <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-                <a href='/actions/close?rid=<?php echo($request["uuid"]); ?>' class='btn btn-danger'>Close request</a>
-              </div>
-            </div>
-          </div>
-        </div>
-
       </section>
       <section>
         <div class="container-fluid">