From 334766e567a496e052ad15da3a0dabac8fac394c Mon Sep 17 00:00:00 2001 From: johnnyq Date: Sat, 14 May 2022 13:03:03 -0400 Subject: [PATCH] Use toastr notifications and alerts instead dedupe alert feedback code --- blank.php | 6 ++++-- footer.php | 6 ++---- header.php | 3 +++ inc_alert_feedback.php | 11 +++++------ inc_wrapper.php | 27 +-------------------------- js/app.js | 2 +- post.php | 1 - 7 files changed, 16 insertions(+), 40 deletions(-) diff --git a/blank.php b/blank.php index 9a58776b..6aeaa538 100644 --- a/blank.php +++ b/blank.php @@ -11,9 +11,11 @@

Blank Page

-

This is a great starting point for new custom pages. +

This is a great starting point for new custom pages.

-

+ + + \ No newline at end of file diff --git a/footer.php b/footer.php index a9a48d59..fea993fe 100644 --- a/footer.php +++ b/footer.php @@ -7,13 +7,11 @@ - - - + - + diff --git a/header.php b/header.php index 40cef0d5..5931503f 100644 --- a/header.php +++ b/header.php @@ -33,6 +33,9 @@ header("X-Frame-Options: DENY"); + + + diff --git a/inc_alert_feedback.php b/inc_alert_feedback.php index 0038b1ed..51865585 100644 --- a/inc_alert_feedback.php +++ b/inc_alert_feedback.php @@ -3,15 +3,14 @@ //Alert Feedback if(!empty($_SESSION['alert_message'])){ if (!isset($_SESSION['alert_type'])){ - $_SESSION['alert_type'] = "info"; + $_SESSION['alert_type'] = "success"; } ?> -
- - -
+ + +
-
- - -
- - -
- \ No newline at end of file +
\ No newline at end of file diff --git a/js/app.js b/js/app.js index 3d167770..96f7dd15 100644 --- a/js/app.js +++ b/js/app.js @@ -77,4 +77,4 @@ clipboard.on('error', function(e) { // Enable Popovers $(function () { $('[data-toggle="popover"]').popover() -}) +}); \ No newline at end of file diff --git a/post.php b/post.php index 55a533ec..52e01636 100644 --- a/post.php +++ b/post.php @@ -4727,7 +4727,6 @@ if(isset($_GET['undo_archive_location'])){ //Logging mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Location', log_action = 'Undo Archive', log_description = '$session_name unarchived location $location_name', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id, company_id = $session_company_id"); - $_SESSION['alert_type'] = "danger"; $_SESSION['alert_message'] = "Location ".stripslashes($location_name)." unarchived."; header("Location: " . $_SERVER["HTTP_REFERER"]);