From 91b00804288efc2764ac12436f23a0e00725c440 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Sun, 24 Aug 2025 00:38:48 -0400 Subject: [PATCH] Finished Consolidating the remaining user modals to modals/ENTITY removed ajax_ and _modal prefixes from file names and use new ajax-modal syntax --- .../modals/custom_field_create_modal.php | 0 .../modals/custom_field_edit_modal.php | 0 user/asset_details.php | 51 +++------ user/calendar.php | 17 ++- user/certificates.php | 18 +-- user/contact_details.php | 97 ++++++---------- user/contacts.php | 2 +- user/credentials.php | 22 ++-- user/domains.php | 18 +-- user/invoice.php | 31 ++--- user/invoices.php | 29 ++--- user/locations.php | 12 +- .../asset_documents.php} | 0 user/modals/budget_create_modal.php | 108 ------------------ user/modals/budget_edit_modal.php | 102 ----------------- .../calendar_add.php} | 0 .../calendar/calendar_edit.php} | 4 +- .../calendar_event_add.php} | 0 .../calendar/calendar_event_edit.php} | 4 +- .../certificate_add.php} | 0 .../certificate/certificate_edit.php} | 4 +- .../certificate_export.php} | 0 user/modals/contact/contact_create_note.php | 42 ------- ...t_note_create.php => contact_note_add.php} | 0 .../credential_add.php} | 0 .../credential_bulk_assign_tags.php} | 0 .../credential/credential_edit.php} | 4 +- .../credential_export.php} | 0 .../credential_import.php} | 0 .../credential/credential_view.php} | 4 +- .../domain_add.php} | 0 .../domain/domain_edit.php} | 4 +- .../domain_export.php} | 0 .../invoice_add.php} | 0 .../invoice_add_ticket.php} | 0 .../invoice/invoice_apply_credit.php} | 4 +- .../invoice_bulk_edit_category.php} | 0 .../invoice/invoice_copy.php} | 4 +- .../invoice/invoice_edit.php} | 4 +- .../invoice_export.php} | 0 .../invoice_note.php} | 0 .../invoice/invoice_pay.php} | 4 +- .../invoice_payment_add_bulk.php} | 0 .../invoice_recurring_add.php} | 0 .../invoice/item_edit.php} | 4 +- user/modals/item_edit_modal.php | 104 ----------------- .../location_add.php} | 0 .../location_bulk_assign_tags.php} | 0 .../location/location_edit.php} | 6 +- .../location_export.php} | 0 .../location_import.php} | 0 .../network_add.php} | 0 .../network/network_edit.php} | 4 +- .../network_export.php} | 0 .../payment_export.php} | 0 .../project_add.php} | 0 .../project/project_edit.php} | 4 +- .../project_link_closed_ticket.php} | 0 .../project_link_ticket.php} | 0 .../quote_add.php} | 0 .../quote/quote_copy.php} | 4 +- .../quote/quote_edit.php} | 4 +- .../quote_export.php} | 0 .../quote_note.php} | 0 .../quote_to_invoice.php} | 0 .../recurring_expense_add.php} | 0 .../recurring_expense_edit.php} | 4 +- .../recurring_invoice_add.php} | 0 .../recurring_invoice_edit.php} | 4 +- .../recurring_invoice_export.php} | 0 .../recurring_invoice_note.php} | 0 .../recurring_payment_add.php} | 0 .../recurring_ticket_add.php} | 0 .../recurring_ticket_edit.php} | 4 +- .../revenue_add.php} | 0 .../revenue/revenue_edit.php} | 4 +- .../service_add.php} | 0 .../service/service_details.php} | 6 +- .../service/service_edit.php} | 4 +- .../software_add.php} | 0 .../software_add_from_template.php} | 0 .../software/software_edit.php} | 4 +- .../software_export.php} | 0 .../transfer_add.php} | 0 .../transfer/transfer_edit.php} | 4 +- user/networks.php | 8 +- user/payments.php | 2 +- user/project_details.php | 6 +- user/projects.php | 12 +- user/quote.php | 25 ++-- user/quotes.php | 18 +-- user/recurring_expenses.php | 16 +-- user/recurring_invoice.php | 18 +-- user/recurring_invoices.php | 11 +- user/recurring_tickets.php | 16 +-- user/revenues.php | 15 +-- user/services.php | 16 +-- user/software.php | 10 +- user/transfers.php | 18 +-- 99 files changed, 223 insertions(+), 721 deletions(-) rename {user => admin}/modals/custom_field_create_modal.php (100%) rename {user => admin}/modals/custom_field_edit_modal.php (100%) rename user/modals/{client_asset_documents_modal.php => asset/asset_documents.php} (100%) delete mode 100644 user/modals/budget_create_modal.php delete mode 100644 user/modals/budget_edit_modal.php rename user/modals/{calendar_add_modal.php => calendar/calendar_add.php} (100%) rename user/{ajax/ajax_calendar_edit.php => modals/calendar/calendar_edit.php} (95%) rename user/modals/{calendar_event_add_modal.php => calendar/calendar_event_add.php} (100%) rename user/{ajax/ajax_calendar_event_edit.php => modals/calendar/calendar_event_edit.php} (98%) rename user/modals/{certificate_add_modal.php => certificate/certificate_add.php} (100%) rename user/{ajax/ajax_certificate_edit.php => modals/certificate/certificate_edit.php} (98%) rename user/modals/{certificate_export_modal.php => certificate/certificate_export.php} (100%) delete mode 100644 user/modals/contact/contact_create_note.php rename user/modals/contact/{contact_note_create.php => contact_note_add.php} (100%) rename user/modals/{credential_add_modal.php => credential/credential_add.php} (100%) rename user/modals/{credential_bulk_assign_tags_modal.php => credential/credential_bulk_assign_tags.php} (100%) rename user/{ajax/ajax_credential_edit.php => modals/credential/credential_edit.php} (99%) rename user/modals/{credential_export_modal.php => credential/credential_export.php} (100%) rename user/modals/{credential_import_modal.php => credential/credential_import.php} (100%) rename user/{ajax/ajax_credential_view.php => modals/credential/credential_view.php} (97%) rename user/modals/{domain_add_modal.php => domain/domain_add.php} (100%) rename user/{ajax/ajax_domain_edit.php => modals/domain/domain_edit.php} (99%) rename user/modals/{domain_export_modal.php => domain/domain_export.php} (100%) rename user/modals/{invoice_add_modal.php => invoice/invoice_add.php} (100%) rename user/modals/{invoice_add_ticket_modal.php => invoice/invoice_add_ticket.php} (100%) rename user/{ajax/ajax_invoice_apply_credit.php => modals/invoice/invoice_apply_credit.php} (97%) rename user/modals/{invoice_bulk_edit_category_modal.php => invoice/invoice_bulk_edit_category.php} (100%) rename user/{ajax/ajax_invoice_copy.php => modals/invoice/invoice_copy.php} (94%) rename user/{ajax/ajax_invoice_edit.php => modals/invoice/invoice_edit.php} (98%) rename user/modals/{invoice_export_modal.php => invoice/invoice_export.php} (100%) rename user/modals/{invoice_note_modal.php => invoice/invoice_note.php} (100%) rename user/{ajax/ajax_invoice_pay.php => modals/invoice/invoice_pay.php} (98%) rename user/modals/{invoice_payment_add_bulk_modal.php => invoice/invoice_payment_add_bulk.php} (100%) rename user/modals/{invoice_recurring_add_modal.php => invoice/invoice_recurring_add.php} (100%) rename user/{ajax/ajax_item_edit.php => modals/invoice/item_edit.php} (97%) delete mode 100644 user/modals/item_edit_modal.php rename user/modals/{location_add_modal.php => location/location_add.php} (100%) rename user/modals/{location_bulk_assign_tags_modal.php => location/location_bulk_assign_tags.php} (100%) rename user/{ajax/ajax_location_edit.php => modals/location/location_edit.php} (98%) rename user/modals/{location_export_modal.php => location/location_export.php} (100%) rename user/modals/{location_import_modal.php => location/location_import.php} (100%) rename user/modals/{network_add_modal.php => network/network_add.php} (100%) rename user/{ajax/ajax_network_edit.php => modals/network/network_edit.php} (98%) rename user/modals/{network_export_modal.php => network/network_export.php} (100%) rename user/modals/{payment_export_modal.php => payment/payment_export.php} (100%) rename user/modals/{project_add_modal.php => project/project_add.php} (100%) rename user/{ajax/ajax_project_edit.php => modals/project/project_edit.php} (98%) rename user/modals/{project_link_closed_ticket_modal.php => project/project_link_closed_ticket.php} (100%) rename user/modals/{project_link_ticket_modal.php => project/project_link_ticket.php} (100%) rename user/modals/{quote_add_modal.php => quote/quote_add.php} (100%) rename user/{ajax/ajax_quote_copy.php => modals/quote/quote_copy.php} (97%) rename user/{ajax/ajax_quote_edit.php => modals/quote/quote_edit.php} (97%) rename user/modals/{quote_export_modal.php => quote/quote_export.php} (100%) rename user/modals/{quote_note_modal.php => quote/quote_note.php} (100%) rename user/modals/{quote_to_invoice_modal.php => quote/quote_to_invoice.php} (100%) rename user/modals/{recurring_expense_create_modal.php => recurring_expense/recurring_expense_add.php} (100%) rename user/{ajax/ajax_recurring_expense_edit.php => modals/recurring_expense/recurring_expense_edit.php} (99%) rename user/modals/{recurring_invoice_add_modal.php => recurring_invoice/recurring_invoice_add.php} (100%) rename user/{ajax/ajax_recurring_invoice_edit.php => modals/recurring_invoice/recurring_invoice_edit.php} (98%) rename user/modals/{client_recurring_export_modal.php => recurring_invoice/recurring_invoice_export.php} (100%) rename user/modals/{recurring_invoice_note_modal.php => recurring_invoice/recurring_invoice_note.php} (100%) rename user/modals/{recurring_payment_add_modal.php => recurring_invoice/recurring_payment_add.php} (100%) rename user/modals/{recurring_ticket_add_modal.php => recurring_ticket/recurring_ticket_add.php} (100%) rename user/{ajax/ajax_recurring_ticket_edit.php => modals/recurring_ticket/recurring_ticket_edit.php} (99%) rename user/modals/{revenue_add_modal.php => revenue/revenue_add.php} (100%) rename user/{ajax/ajax_revenue_edit.php => modals/revenue/revenue_edit.php} (98%) rename user/modals/{service_add_modal.php => service/service_add.php} (100%) rename user/{ajax/ajax_service_details.php => modals/service/service_details.php} (99%) rename user/{ajax/ajax_service_edit.php => modals/service/service_edit.php} (99%) rename user/modals/{software_add_modal.php => software/software_add.php} (100%) rename user/modals/{software_add_from_template_modal.php => software/software_add_from_template.php} (100%) rename user/{ajax/ajax_software_edit.php => modals/software/software_edit.php} (99%) rename user/modals/{software_export_modal.php => software/software_export.php} (100%) rename user/modals/{transfer_add_modal.php => transfer/transfer_add.php} (100%) rename user/{ajax/ajax_transfer_edit.php => modals/transfer/transfer_edit.php} (98%) diff --git a/user/modals/custom_field_create_modal.php b/admin/modals/custom_field_create_modal.php similarity index 100% rename from user/modals/custom_field_create_modal.php rename to admin/modals/custom_field_create_modal.php diff --git a/user/modals/custom_field_edit_modal.php b/admin/modals/custom_field_edit_modal.php similarity index 100% rename from user/modals/custom_field_edit_modal.php rename to admin/modals/custom_field_edit_modal.php diff --git a/user/asset_details.php b/user/asset_details.php index 0466119d..ac4ec904 100644 --- a/user/asset_details.php +++ b/user/asset_details.php @@ -646,12 +646,9 @@ if (isset($_GET['asset_id'])) { - - + + @@ -667,11 +664,8 @@ if (isset($_GET['asset_id'])) {