From 7c1b3c9c575e66abc7b9de1eb0f87e94571277c4 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Tue, 17 Jan 2023 11:47:23 -0500 Subject: [PATCH] More UI Updates various modals and settings, company add and edit etc --- account_add_modal.php | 2 +- account_edit_modal.php | 6 +- api_key_add_modal.php | 4 +- category_add_modal.php | 4 +- category_edit_modal.php | 6 +- company_add_modal.php | 259 ++++++++++++---------- company_edit_modal.php | 258 +++++++++++---------- plugins/PHPMailer/{VERSION => VERSION.md} | 0 settings_alerts.php | 2 +- settings_defaults.php | 2 +- settings_integrations.php | 2 +- settings_invoice.php | 4 +- settings_mail.php | 4 +- settings_modules.php | 2 +- settings_online_payment.php | 2 +- settings_quote.php | 4 +- settings_tag_add_modal.php | 4 +- settings_tag_edit_modal.php | 6 +- settings_tax_add_modal.php | 6 +- settings_tax_edit_modal.php | 6 +- settings_ticket.php | 2 +- 21 files changed, 328 insertions(+), 257 deletions(-) rename plugins/PHPMailer/{VERSION => VERSION.md} (100%) diff --git a/account_add_modal.php b/account_add_modal.php index 7ea25cf4..c79e3b57 100644 --- a/account_add_modal.php +++ b/account_add_modal.php @@ -53,7 +53,7 @@
- +
diff --git a/account_edit_modal.php b/account_edit_modal.php index db4d102d..729e8dcf 100644 --- a/account_edit_modal.php +++ b/account_edit_modal.php @@ -2,7 +2,7 @@
-
+
Editing account:
@@ -28,8 +28,8 @@
- - + +
diff --git a/api_key_add_modal.php b/api_key_add_modal.php index 4f6aa795..a48976fa 100644 --- a/api_key_add_modal.php +++ b/api_key_add_modal.php @@ -78,8 +78,8 @@ $key = bin2hex(random_bytes(78));
- - + +
diff --git a/category_add_modal.php b/category_add_modal.php index e4a8db87..3c11aa54 100644 --- a/category_add_modal.php +++ b/category_add_modal.php @@ -40,8 +40,8 @@
- - + +
diff --git a/category_edit_modal.php b/category_edit_modal.php index 8ecf7b15..520a3ef5 100644 --- a/category_edit_modal.php +++ b/category_edit_modal.php @@ -2,7 +2,7 @@
-
+
Editing category:
@@ -46,8 +46,8 @@
- - + +
diff --git a/company_add_modal.php b/company_add_modal.php index 210c1359..5b0989d3 100644 --- a/company_add_modal.php +++ b/company_add_modal.php @@ -10,140 +10,177 @@
-
- -
-
- -
- -
-
+ -
- -
-
- -
- -
-
+
+ +
-
- -
-
- -
- -
-
+
-
- -
-
- +
+ +
+
+ +
+ +
- -
-
-
- -
-
- +
+ +
- -
-
-
- -
-
- +
+ +
+ +
+ +
+
+ +
+ +
- -
-
-
- -
-
- +
+ +
+
+ +
+ +
- -
-
-
- -
-
- +
+ +
+
+ +
+ +
- -
-
-
- -
-
- +
+ +
+
+ +
+ +
- -
-
-
- -
-
- +
+ +
+
+ +
+ +
- -
-
-
- -
-
- +
+ +
+ +
+ +
+
+ +
+ +
- -
-
-
- - +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+
- - + +
diff --git a/company_edit_modal.php b/company_edit_modal.php index 45900326..4bc0e4ad 100644 --- a/company_edit_modal.php +++ b/company_edit_modal.php @@ -2,7 +2,7 @@
-
+
Editing company:
@@ -12,146 +12,178 @@
-
- -
-
- + + +
+ +
+ +
+ +
+ +
+
+ +
+ +
- -
-
-
- -
-
- +
+
+ "> +
- -
-
-
- -
-
- +
+ +
+ +
+ +
+
+ +
+ +
- -
-
-
- -
-
- +
+ +
+
+ +
+ +
- -
-
-
- -
-
- +
+ +
+
+ +
+ +
- -
-
-
- -
-
- +
+ +
+
+ +
+ +
- -
-
-
- -
-
- +
+ +
+
+ +
+ +
- -
-
-
- -
-
- +
+ +
+ +
+ +
+
+ +
+ +
- -
-
-
- -
-
- +
+ +
+
+ +
+ +
- -
-
-
- -
-
- +
+ +
+
+ +
+ +
- -
-
-
- -
-
- +
+ +
+ +
+ +
+
+ +
+ +
- -
-
-
- - -
+
+ +
+
+ +
+ +
+
-
-
- ">
+
- - + +
diff --git a/plugins/PHPMailer/VERSION b/plugins/PHPMailer/VERSION.md similarity index 100% rename from plugins/PHPMailer/VERSION rename to plugins/PHPMailer/VERSION.md diff --git a/settings_alerts.php b/settings_alerts.php index 9e13c9df..3f9e7506 100644 --- a/settings_alerts.php +++ b/settings_alerts.php @@ -38,7 +38,7 @@
- +
diff --git a/settings_defaults.php b/settings_defaults.php index d7299eb4..259e8115 100644 --- a/settings_defaults.php +++ b/settings_defaults.php @@ -196,7 +196,7 @@
- +
diff --git a/settings_integrations.php b/settings_integrations.php index bb6d7858..9576ec22 100644 --- a/settings_integrations.php +++ b/settings_integrations.php @@ -30,7 +30,7 @@
- +
diff --git a/settings_invoice.php b/settings_invoice.php index 16f8af31..e3298f8b 100644 --- a/settings_invoice.php +++ b/settings_invoice.php @@ -54,6 +54,8 @@
+
+ Recurring Invoice
@@ -80,7 +82,7 @@
- +
diff --git a/settings_mail.php b/settings_mail.php index 51d16087..4b25de82 100644 --- a/settings_mail.php +++ b/settings_mail.php @@ -119,8 +119,10 @@
+ +
- +
diff --git a/settings_modules.php b/settings_modules.php index 2e335e39..09c0a7ac 100644 --- a/settings_modules.php +++ b/settings_modules.php @@ -24,7 +24,7 @@
- +
diff --git a/settings_online_payment.php b/settings_online_payment.php index 523fc397..db7a8d54 100644 --- a/settings_online_payment.php +++ b/settings_online_payment.php @@ -42,7 +42,7 @@
- +
diff --git a/settings_quote.php b/settings_quote.php index 9fca55c7..f0bc54b6 100644 --- a/settings_quote.php +++ b/settings_quote.php @@ -6,8 +6,6 @@
- - Quote
@@ -56,7 +54,7 @@
- +
diff --git a/settings_tag_add_modal.php b/settings_tag_add_modal.php index f89bf6d4..14422720 100644 --- a/settings_tag_add_modal.php +++ b/settings_tag_add_modal.php @@ -57,8 +57,8 @@
- - + +
diff --git a/settings_tag_edit_modal.php b/settings_tag_edit_modal.php index 299ecfc5..74167732 100644 --- a/settings_tag_edit_modal.php +++ b/settings_tag_edit_modal.php @@ -2,7 +2,7 @@
-
+
Editing tag:
@@ -63,8 +63,8 @@
- - + +
diff --git a/settings_tax_add_modal.php b/settings_tax_add_modal.php index 5aac27d5..616ce00e 100644 --- a/settings_tax_add_modal.php +++ b/settings_tax_add_modal.php @@ -2,7 +2,7 @@
-
New Tax
+
New Tax
@@ -19,8 +19,8 @@
- - + +
diff --git a/settings_tax_edit_modal.php b/settings_tax_edit_modal.php index 458d3208..af0ccde2 100644 --- a/settings_tax_edit_modal.php +++ b/settings_tax_edit_modal.php @@ -2,7 +2,7 @@
-
+
Editing tax:
@@ -24,8 +24,8 @@
- - + +
diff --git a/settings_ticket.php b/settings_ticket.php index 9479b773..e41dbb6f 100644 --- a/settings_ticket.php +++ b/settings_ticket.php @@ -55,7 +55,7 @@
- +