From 3cf33afac4351f4c538930dc8e4365e32a84146f Mon Sep 17 00:00:00 2001 From: johnnyq Date: Sun, 16 Feb 2025 13:20:15 -0500 Subject: [PATCH] Let AJAX handle the model header --- ajax/ajax_admin_mail_queue_message_view.php | 9 +- ajax/ajax_asset_copy.php | 12 +-- ajax/ajax_asset_edit.php | 10 ++- ajax/ajax_asset_interface_edit.php | 10 ++- ajax/ajax_client_edit.php | 10 ++- ajax/ajax_contact_edit.php | 9 +- ajax/ajax_contact_note_create.php | 11 ++- ajax/ajax_credential_edit.php | 11 ++- ajax/ajax_expense_copy.php | 11 ++- ajax/ajax_expense_edit.php | 11 ++- ajax/ajax_expense_refund.php | 11 ++- ajax/ajax_notifications.php | 11 ++- ajax/ajax_ticket_assign.php | 84 +++++++++++++++++++ includes/footer.php | 2 +- js/{generic_modal_loader.js => ajax_modal.js} | 14 +--- 15 files changed, 175 insertions(+), 51 deletions(-) create mode 100644 ajax/ajax_ticket_assign.php rename js/{generic_modal_loader.js => ajax_modal.js} (76%) diff --git a/ajax/ajax_admin_mail_queue_message_view.php b/ajax/ajax_admin_mail_queue_message_view.php index 6b94d4a7..d3e4a0e5 100644 --- a/ajax/ajax_admin_mail_queue_message_view.php +++ b/ajax/ajax_admin_mail_queue_message_view.php @@ -40,12 +40,15 @@ if ($email_status == 0) { $email_status_display = "
Sent
$email_sent_at"; } -// Build the dynamic modal title -$title = "$email_subject"; - // Generate the HTML form content using output buffering. ob_start(); ?> +
+
+ +
diff --git a/ajax/ajax_asset_copy.php b/ajax/ajax_asset_copy.php index 86a92b17..2b795a8c 100644 --- a/ajax/ajax_asset_copy.php +++ b/ajax/ajax_asset_copy.php @@ -38,17 +38,19 @@ $asset_vendor_id = intval($row['asset_vendor_id']); $asset_location_id = intval($row['asset_location_id']); $asset_contact_id = intval($row['asset_contact_id']); $asset_network_id = intval($row['interface_network_id']); - $device_icon = getAssetIcon($asset_type); -// Build the dynamic modal title -$title = "Copying asset: $asset_name"; - // Generate the HTML form content using output buffering. ob_start(); ?> -
+
+
Copying asset:
+ +
+ diff --git a/ajax/ajax_asset_edit.php b/ajax/ajax_asset_edit.php index 1c7403ed..419945eb 100644 --- a/ajax/ajax_asset_edit.php +++ b/ajax/ajax_asset_edit.php @@ -48,13 +48,15 @@ $sql_asset_history = mysqli_query($mysqli, "SELECT * FROM asset_history DESC LIMIT 10" ); -// Build the dynamic modal title -$title = "Editing asset: $asset_name"; - // Generate the HTML form content using output buffering. ob_start(); ?> - +
+
Editing asset:
+ +
diff --git a/ajax/ajax_asset_interface_edit.php b/ajax/ajax_asset_interface_edit.php index 6b6f50e3..c0f53bc8 100644 --- a/ajax/ajax_asset_interface_edit.php +++ b/ajax/ajax_asset_interface_edit.php @@ -45,13 +45,15 @@ if ($link_row = mysqli_fetch_assoc($sql_link)) { } } -// Build the dynamic modal title -$title = "Editing Interface: $asset_name - $interface_name"; - // Generate the HTML form content using output buffering. ob_start(); ?> - +
+
Editing Interface: -
+ +
diff --git a/ajax/ajax_client_edit.php b/ajax/ajax_client_edit.php index 3cfb7242..d30f53fd 100644 --- a/ajax/ajax_client_edit.php +++ b/ajax/ajax_client_edit.php @@ -29,12 +29,16 @@ while ($row = mysqli_fetch_array($sql_client_tags)) { $client_tag_id_array[] = $client_tag_id; } -// Build the dynamic modal title -$title = "Editing Client: $client_name"; - // Generate the HTML form content using output buffering. ob_start(); ?> +
+
Editing Client:
+ +
+ diff --git a/ajax/ajax_contact_edit.php b/ajax/ajax_contact_edit.php index b7841c3f..99ea1823 100644 --- a/ajax/ajax_contact_edit.php +++ b/ajax/ajax_contact_edit.php @@ -41,12 +41,15 @@ while ($row = mysqli_fetch_array($sql_contact_tags)) { $contact_tag_id_array[] = $contact_tag_id; } -// Build the dynamic modal title -$title = "Editing Contact: $contact_name"; - // Generate the HTML form content using output buffering. ob_start(); ?> +
+
Editing Contact:
+ +
diff --git a/ajax/ajax_contact_note_create.php b/ajax/ajax_contact_note_create.php index 7990be87..f668e23a 100644 --- a/ajax/ajax_contact_note_create.php +++ b/ajax/ajax_contact_note_create.php @@ -8,12 +8,17 @@ $sql = mysqli_query($mysqli, "SELECT contact_name FROM contacts WHERE contact_id $row = mysqli_fetch_array($sql); $contact_name = nullable_htmlentities($row['contact_name']); -// Build the dynamic modal title -$title = "Creating note: $contact_name"; - // Generate the HTML form content using output buffering. ob_start(); ?> + +
+
Creating note:
+ +
+ diff --git a/ajax/ajax_credential_edit.php b/ajax/ajax_credential_edit.php index 7671517a..1bbd9b29 100644 --- a/ajax/ajax_credential_edit.php +++ b/ajax/ajax_credential_edit.php @@ -33,12 +33,17 @@ while ($row = mysqli_fetch_array($sql_login_tags)) { $login_tag_id_array[] = $login_tag_id; } -// Build the dynamic modal title -$title = "Editing credential: $login_name"; - // Generate the HTML form content using output buffering. ob_start(); ?> + +
+
Editing credential:
+ +
+ diff --git a/ajax/ajax_expense_copy.php b/ajax/ajax_expense_copy.php index 07afc129..2e9f3c6d 100644 --- a/ajax/ajax_expense_copy.php +++ b/ajax/ajax_expense_copy.php @@ -19,12 +19,17 @@ $expense_category_id = intval($row['expense_category_id']); $expense_account_id = intval($row['expense_account_id']); $expense_client_id = intval($row['expense_client_id']); -// Build the dynamic modal title -$title = "Copying expense"; - // Generate the HTML form content using output buffering. ob_start(); ?> + +
+
Copying expense
+ +
+
diff --git a/ajax/ajax_expense_edit.php b/ajax/ajax_expense_edit.php index 2036b2ee..e1c70b9a 100644 --- a/ajax/ajax_expense_edit.php +++ b/ajax/ajax_expense_edit.php @@ -19,12 +19,17 @@ $expense_category_id = intval($row['expense_category_id']); $expense_account_id = intval($row['expense_account_id']); $expense_client_id = intval($row['expense_client_id']); -// Build the dynamic modal title -$title = "Editing expense"; - // Generate the HTML form content using output buffering. ob_start(); ?> + +
+
Editing expense
+ +
+
diff --git a/ajax/ajax_expense_refund.php b/ajax/ajax_expense_refund.php index f053d275..cbf8d619 100644 --- a/ajax/ajax_expense_refund.php +++ b/ajax/ajax_expense_refund.php @@ -19,12 +19,17 @@ $expense_category_id = intval($row['expense_category_id']); $expense_account_id = intval($row['expense_account_id']); $expense_client_id = intval($row['expense_client_id']); -// Build the dynamic modal title -$title = "Refunding expense"; - // Generate the HTML form content using output buffering. ob_start(); ?> + +
+
Refunding expense
+ +
+
diff --git a/ajax/ajax_notifications.php b/ajax/ajax_notifications.php index 1a4f5f0d..048d7f0e 100644 --- a/ajax/ajax_notifications.php +++ b/ajax/ajax_notifications.php @@ -10,12 +10,17 @@ $sql = mysqli_query($mysqli, "SELECT * FROM notifications $num_notifications = mysqli_num_rows($sql); -// Build the dynamic modal title -$title = "Notifications$num_notifications"; - // Generate the HTML form content using output buffering. ob_start(); ?> + +
+
Notifications
+ +
+
diff --git a/ajax/ajax_ticket_assign.php b/ajax/ajax_ticket_assign.php new file mode 100644 index 00000000..c8bd25e1 --- /dev/null +++ b/ajax/ajax_ticket_assign.php @@ -0,0 +1,84 @@ + + +
+
Assigning Ticket: -
+ +
+ + + + +
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+ + +
+ + + + - + diff --git a/js/generic_modal_loader.js b/js/ajax_modal.js similarity index 76% rename from js/generic_modal_loader.js rename to js/ajax_modal.js index 67752f46..1fd88fbb 100644 --- a/js/generic_modal_loader.js +++ b/js/ajax_modal.js @@ -1,4 +1,4 @@ -// Generic Ajax Modal Load Script +// Ajax Modal Load Script // /* Example Triggering --> @@ -35,7 +35,7 @@ $(document).on('click', '[data-toggle="ajax-modal"]', function (e) { } // Create a modal ID by appending the ajaxId. - var modalId = 'dynamicAjaxModal_' + ajaxId; + var modalId = 'ajaxModal_' + ajaxId; // Remove any existing modal with this ID. $('#' + modalId).remove(); @@ -44,14 +44,8 @@ $(document).on('click', '[data-toggle="ajax-modal"]', function (e) { var modalHtml = '
' + '
' + - '
' + - '
' + - ' ' + - ' ' + - '
' + - response.content + + '
' + + response.content + '
' + '
' + '
';