Merge pull request #58 from sainmas/main

Finishing touches on Sprint4
cervantes-yadira · Mar 5, 2024 · 29fd1ef · 29fd1ef
2 parents 07da48b + d8c63bc
commit 29fd1ef
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/index.php b/index.php
@@ -204,9 +204,6 @@
                     createAppReminders($appReminders);
                     ?>
                 </div>
-                <div class="col pt-5 d-flex justify-content-center" id="update-account-container">
-                    <button id="update-acc-btn" class="submit-btn"><i class="fa-solid fa-gear px-1"></i>Update Account</button>
-                </div>
             </div>
         </div>
         <div class="row welcome-info">

diff --git a/php/admin_announcement_submit.php b/php/admin_announcement_submit.php
@@ -18,7 +18,13 @@
 <?php
 session_start();
 $_SESSION['location'] = '../';
-include '../php/nav_bar.php'
+include '../php/nav_bar.php';
+
+global $db_location;
+global $cnxn;
+
+include '../db_picker.php';
+include $db_location;
 
 ?>
 <main>

diff --git a/styles/styles.css b/styles/styles.css
@@ -473,15 +473,15 @@ table td {
     background-color: #033a94;
 }
 
-.app-list-item .btn-update:hover, .user-list-item .btn-update:hover {
+.app-list-item .btn-update:hover, .user-list-item .btn-update:hover, .admin-announcement .btn-update:hover {
     background-color: #006225;
 }
 
 .btn-delete, .modal-delete {
     background-color: #d24747;
 }
 
-.app-list-item .btn-delete:hover, .user-list-item .btn-delete:hover, .modal-delete:hover{
+.app-list-item .btn-delete:hover, .user-list-item .btn-delete:hover, .modal-delete:hover, .admin-announcement .btn-delete:hover{
     background-color: #b42c2c;
 }