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'])) {
- + Edit )"> @@ -709,7 +703,7 @@ if (isset($_GET['asset_id'])) {

Licenses

-
@@ -766,11 +760,8 @@ if (isset($_GET['asset_id'])) { ?> - + $software_version"; ?> @@ -835,9 +826,9 @@ if (isset($_GET['asset_id'])) {
- - - + + + - + data-modal-url="modals/recurring_ticket/recurring_ticket_edit.php?id="> @@ -1001,12 +989,9 @@ if (isset($_GET['asset_id'])) {
- + data-modal-url="modals/recurring_ticket/recurring_ticket_edit.php?id="> Edit
@@ -1126,7 +1111,7 @@ if (isset($_GET['asset_id'])) {

Linked Services

-
@@ -1235,8 +1220,8 @@ require_once "modals/asset/asset_interface_multiple_add.php"; require_once "modals/asset/asset_interface_import.php"; require_once "modals/asset/asset_interface_export.php"; require_once "modals/ticket/ticket_add.php"; -require_once "modals/recurring_ticket_add_modal.php"; -require_once "modals/credential_add_modal.php"; +require_once "modals/recurring_ticket/recurring_ticket_add.php"; +require_once "modals/credential/credential_add.php"; require_once "modals/document/document_add.php"; require_once "modals/file/file_upload.php"; diff --git a/user/calendar.php b/user/calendar.php index 455e66ef..75356d69 100644 --- a/user/calendar.php +++ b/user/calendar.php @@ -48,11 +48,8 @@ if (isset($_GET['calendar_id'])) { ?>
-
@@ -84,8 +81,8 @@ if (isset($_GET['calendar_id'])) { ', { href: '#', - 'data-toggle': 'ajax-modal', - 'data-ajax-url': 'ajax/ajax_calendar_event_edit.php?', - 'data-ajax-id': editEvent.event.id + 'class': 'ajax-modal', + 'data-modal-url': 'modals/calendar/calendar_event_edit.php?&id=' + eventId }); $('body').append($link); // Append to the body diff --git a/user/certificates.php b/user/certificates.php index 36393445..b1147b79 100644 --- a/user/certificates.php +++ b/user/certificates.php @@ -233,11 +233,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
- +
@@ -264,11 +261,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
- + Edit @@ -309,8 +303,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
diff --git a/user/contact_details.php b/user/contact_details.php index 81652418..5acb948a 100644 --- a/user/contact_details.php +++ b/user/contact_details.php @@ -169,10 +169,8 @@ if (isset($_GET['contact_id'])) {
-

@@ -281,10 +279,8 @@ if (isset($_GET['contact_id'])) { Upload file(s)
- + New Note
@@ -293,45 +289,33 @@ if (isset($_GET['contact_id'])) {
- + Asset
- + License
- + Credential
- + Service
- + Document
- + File
@@ -343,7 +327,7 @@ if (isset($_GET['contact_id'])) {

Related Assets

@@ -483,7 +467,7 @@ if (isset($_GET['contact_id'])) {

Credentials

-
@@ -561,11 +545,8 @@ if (isset($_GET['contact_id'])) { - + @@ -582,10 +563,8 @@ if (isset($_GET['contact_id'])) {
- + Edit )"> @@ -625,7 +604,7 @@ if (isset($_GET['contact_id'])) {

Related Licenses

-
@@ -730,11 +709,8 @@ if (isset($_GET['contact_id'])) { - + @@ -747,11 +723,8 @@ if (isset($_GET['contact_id'])) {
- + Edit
@@ -874,7 +847,7 @@ if (isset($_GET['contact_id'])) {

Linked Services

-
@@ -932,7 +905,7 @@ if (isset($_GET['contact_id'])) {

Linked Documents

-
@@ -998,7 +971,7 @@ if (isset($_GET['contact_id'])) {

Linked Files

-
@@ -1061,10 +1034,8 @@ if (isset($_GET['contact_id'])) {

Notes

-
@@ -1203,9 +1174,9 @@ if (isset($_GET['contact_id'])) { contact_id="> Details - + Make Note diff --git a/user/credentials.php b/user/credentials.php index e9790ad6..90d2f047 100644 --- a/user/credentials.php +++ b/user/credentials.php @@ -410,11 +410,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
- +
@@ -478,11 +475,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
- + Edit
@@ -523,7 +517,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
- + @@ -538,10 +532,10 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); - + data-modal-url="modals/domain/domain_edit.php?&id=">
@@ -322,12 +319,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
- + data-modal-url="modals/domain/domain_edit.php?&id="> Edit @@ -367,8 +361,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
diff --git a/user/invoice.php b/user/invoice.php index a5057e5e..27c835b2 100644 --- a/user/invoice.php +++ b/user/invoice.php @@ -258,13 +258,13 @@ if (isset($_GET['invoice_id'])) {
- + 0 || $credit_balance > 0) { ?>
- Apply Credit (Balance: ) + Apply Credit (Balance: )
- + Edit - + Copy @@ -466,11 +460,8 @@ if (isset($_GET['invoice_id'])) {
- + Edit
@@ -772,9 +763,9 @@ if (isset($_GET['invoice_id'])) {
- + Add Payment
@@ -408,18 +405,12 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
- + Edit - + Copy
@@ -452,7 +443,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
- + @@ -462,7 +453,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); - +
@@ -360,7 +360,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
- + Edit @@ -393,7 +393,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
- + @@ -404,7 +404,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); -
-
-
-
Creating Budget
- -
-
-
- -
- -
- -
-
- -
- -
-
- -
- -
-
- -
- -
-
- -
- -
- -
- -
- - -
- -
- -
- -
-
- -
- -
-
- -
- -
-
- -
- -
- - -
- -
- -
-
- - -
-
-
-
-
diff --git a/user/modals/budget_edit_modal.php b/user/modals/budget_edit_modal.php deleted file mode 100644 index 40647be0..00000000 --- a/user/modals/budget_edit_modal.php +++ /dev/null @@ -1,102 +0,0 @@ - diff --git a/user/modals/calendar_add_modal.php b/user/modals/calendar/calendar_add.php similarity index 100% rename from user/modals/calendar_add_modal.php rename to user/modals/calendar/calendar_add.php diff --git a/user/ajax/ajax_calendar_edit.php b/user/modals/calendar/calendar_edit.php similarity index 95% rename from user/ajax/ajax_calendar_edit.php rename to user/modals/calendar/calendar_edit.php index 4a2c5062..a82d044b 100644 --- a/user/ajax/ajax_calendar_edit.php +++ b/user/modals/calendar/calendar_edit.php @@ -1,6 +1,6 @@ " tabindex="-1"> -
-
-
-
Creating note:
- -
-
- - -
- -
- -
-
- -
- -
-
- -
- -
- -
- -
- - -
-
-
-
-
diff --git a/user/modals/contact/contact_note_create.php b/user/modals/contact/contact_note_add.php similarity index 100% rename from user/modals/contact/contact_note_create.php rename to user/modals/contact/contact_note_add.php diff --git a/user/modals/credential_add_modal.php b/user/modals/credential/credential_add.php similarity index 100% rename from user/modals/credential_add_modal.php rename to user/modals/credential/credential_add.php diff --git a/user/modals/credential_bulk_assign_tags_modal.php b/user/modals/credential/credential_bulk_assign_tags.php similarity index 100% rename from user/modals/credential_bulk_assign_tags_modal.php rename to user/modals/credential/credential_bulk_assign_tags.php diff --git a/user/ajax/ajax_credential_edit.php b/user/modals/credential/credential_edit.php similarity index 99% rename from user/ajax/ajax_credential_edit.php rename to user/modals/credential/credential_edit.php index 5ac407ef..92e06e90 100644 --- a/user/ajax/ajax_credential_edit.php +++ b/user/modals/credential/credential_edit.php @@ -1,6 +1,6 @@ " tabindex="-1"> -
-
-
-
Editing Line Item:
- -
-
- - - - - - - - - -
- -
- -
-
- -
- -
-
- -
-
- -
- -
-
- -
- -
-
- -
- -
- -
- -
-
- -
- -
-
- -
- -
- -
- -
- -
-
- -
- -
-
- -
- - -
-
- -
-
- - -
-
-
-
-
\ No newline at end of file diff --git a/user/modals/location_add_modal.php b/user/modals/location/location_add.php similarity index 100% rename from user/modals/location_add_modal.php rename to user/modals/location/location_add.php diff --git a/user/modals/location_bulk_assign_tags_modal.php b/user/modals/location/location_bulk_assign_tags.php similarity index 100% rename from user/modals/location_bulk_assign_tags_modal.php rename to user/modals/location/location_bulk_assign_tags.php diff --git a/user/ajax/ajax_location_edit.php b/user/modals/location/location_edit.php similarity index 98% rename from user/ajax/ajax_location_edit.php rename to user/modals/location/location_edit.php index 444d0d85..c2602f49 100644 --- a/user/ajax/ajax_location_edit.php +++ b/user/modals/location/location_edit.php @@ -1,6 +1,6 @@ +require_once '../../../includes/modal_footer_new.php'; + diff --git a/user/ajax/ajax_service_edit.php b/user/modals/service/service_edit.php similarity index 99% rename from user/ajax/ajax_service_edit.php rename to user/modals/service/service_edit.php index d493c6f3..aab026bf 100644 --- a/user/ajax/ajax_service_edit.php +++ b/user/modals/service/service_edit.php @@ -1,6 +1,6 @@ - +
@@ -320,7 +320,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
- + Edit @@ -358,8 +358,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
diff --git a/user/payments.php b/user/payments.php index 666a6e4e..6f00c86e 100644 --- a/user/payments.php +++ b/user/payments.php @@ -289,5 +289,5 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
+ data-modal-url = "modals/project/project_edit.php?id="> Edit @@ -539,8 +539,8 @@ if (isset($_GET['project_id'])) {
- + Edit @@ -341,5 +335,5 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
- + Edit = 2) { ?> - + Copy @@ -350,11 +344,8 @@ if (isset($_GET['quote_id'])) {
- + Edit
@@ -589,8 +580,8 @@ if (isset($_GET['quote_id'])) {
- + Edit = 2) { ?> - + Copy @@ -280,6 +274,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); - + data-modal-url = "modals/recurring_expense/recurring_expense_edit.php?id="> @@ -207,12 +204,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
- + data-modal-url="modals/recurring_expense/recurring_expense_edit.php?id="> Edit
@@ -239,7 +233,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
"> Create AutoPay - +
@@ -191,11 +191,8 @@ if (isset($_GET['recurring_invoice_id'])) {
- + Edit
@@ -315,11 +312,8 @@ if (isset($_GET['recurring_invoice_id'])) {
- + Edit
@@ -491,7 +485,7 @@ if (isset($_GET['recurring_invoice_id'])) { "; - require "modals/recurring_payment_add_modal.php"; + require "modals/recurring_invoice/recurring_payment_add.php"; } ?> @@ -270,11 +270,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
- + Edit @@ -302,5 +299,5 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); - + data-modal-url="modals/recurring_ticket/recurring_ticket_edit.php?id="> @@ -207,12 +204,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
- + data-modal-url="modals/recurring_ticket/recurring_ticket_edit.php?id="> Edit
@@ -251,5 +245,5 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); - + data-modal-url = "modals/revenue/revenue_edit.php?id="> @@ -163,11 +160,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
- Edit @@ -192,5 +187,5 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); - + data-modal-url="modals/service/service_details.php?id=">
@@ -196,11 +193,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
- + Edit = 3) { ?> @@ -226,5 +220,5 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
- +
@@ -287,7 +287,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
- Edit @@ -322,7 +322,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); - + @@ -247,15 +244,12 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
- + Edit
- + Delete
@@ -278,7 +272,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));