From f1253a0fd35588dfa2ea44373986b5a931247a5e Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Thu, 20 Sep 2012 15:22:16 +0300 Subject: [PATCH] refactoring package section: new html formating --- web/add/package/index.php | 1 - web/edit/package/index.php | 1 - web/list/backup/index.php | 2 - web/list/package/index.php | 3 - web/templates/admin/add_package.html | 318 +++++++++++++----- web/templates/admin/edit_package.html | 322 +++++++++++++----- web/templates/admin/list_backup.html | 370 +++++++++++++-------- web/templates/admin/list_packages.html | 347 ++++++++++++------- web/templates/admin/menu_add_package.html | 15 - web/templates/admin/menu_edit_package.html | 15 - web/templates/admin/menu_packages.html | 39 --- 11 files changed, 947 insertions(+), 486 deletions(-) delete mode 100644 web/templates/admin/menu_add_package.html delete mode 100644 web/templates/admin/menu_edit_package.html delete mode 100644 web/templates/admin/menu_packages.html diff --git a/web/add/package/index.php b/web/add/package/index.php index 0235d05bb..2e21f4a09 100644 --- a/web/add/package/index.php +++ b/web/add/package/index.php @@ -155,7 +155,6 @@ if ($_SESSION['user'] == 'admin') { if (empty($v_ns2)) $v_ns2 = 'ns2.example.ltd'; - include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/menu_add_package.html'); include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/add_package.html'); unset($_SESSION['error_msg']); unset($_SESSION['ok_msg']); diff --git a/web/edit/package/index.php b/web/edit/package/index.php index 5455e8539..e27140668 100644 --- a/web/edit/package/index.php +++ b/web/edit/package/index.php @@ -181,7 +181,6 @@ if ($_SESSION['user'] == 'admin') { } } - include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/menu_edit_package.html'); include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/edit_package.html'); unset($_SESSION['error_msg']); unset($_SESSION['ok_msg']); diff --git a/web/list/backup/index.php b/web/list/backup/index.php index 68d960677..8431b61ba 100644 --- a/web/list/backup/index.php +++ b/web/list/backup/index.php @@ -19,8 +19,6 @@ top_panel($user,$TAB); $data = json_decode(implode('', $output), true); $data = array_reverse($data); unset($output); - - include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/menu_backup.html'); include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_backup.html'); //} diff --git a/web/list/package/index.php b/web/list/package/index.php index 2f9824007..040a6bae7 100644 --- a/web/list/package/index.php +++ b/web/list/package/index.php @@ -13,14 +13,11 @@ top_panel($user,$TAB); // Data if ($_SESSION['user'] == 'admin') { - exec (VESTA_CMD."v_list_user_packages json", $output, $return_var); check_error($return_var); $data = json_decode(implode('', $output), true); $data = array_reverse($data); unset($output); - - include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/menu_packages.html'); include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_packages.html'); } diff --git a/web/templates/admin/add_package.html b/web/templates/admin/add_package.html index bdb611234..a80078dd0 100644 --- a/web/templates/admin/add_package.html +++ b/web/templates/admin/add_package.html @@ -1,85 +1,237 @@ - - - - + +
- - -
- 		- - -
- - - - - - - +
Package Name
Default Template
System Shell
+ + + +
Adding Package + → ".$_SESSION['error_msg'].""; + } else { + if (!empty($_SESSION['ok_msg'])) { + echo " → ".$_SESSION['ok_msg'].""; + } + } + ?> +
+
- Web Domains - Web Aliases (per domain) - DNS Domains - DNS Records (per domain) - Mail Domains - Mail Accounts (per domain) - Databases - Cron Jobs - Backups - Disk Quota (in Mb) - Bandwidth (in Mb) - Name Servers - - - - - - - - - +
+ + + + + +
+ + +
+ 		+ + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Package Name +
+ + Default Template +
+ +
+ System Shell +
+ +
+ Web Domains +
+ + Web Aliases (per domain) +
+ + DNS Domains +
+ + DNS Records (per domain) +
+ + Mail Domains +
+ + Mail Accounts (per domain) +
+ + Databases +
+ + Cron Jobs +
+ + Backups +
+ + Disk Quota (in Mb) +
+ + Bandwidth (in Mb) +
+ + Name Servers +
+ + + +
+
+
diff --git a/web/templates/admin/edit_package.html b/web/templates/admin/edit_package.html index 64707d681..e10a8c5dc 100644 --- a/web/templates/admin/edit_package.html +++ b/web/templates/admin/edit_package.html @@ -1,87 +1,239 @@ - - - - + +
- - - - -
- 		- - -
- - - - - - - +
Package Name
Default Template
System Shell
+ + + +
Editing Package + → ".$_SESSION['error_msg'].""; + } else { + if (!empty($_SESSION['ok_msg'])) { + echo " → ".$_SESSION['ok_msg'].""; + } + } + ?> +
+
- Web Domains - Web Aliases (per domain) - DNS Domains - DNS Records (per domain) - Mail Domains - Mail Accounts (per domain) - Databases - Cron Jobs - Backups - Disk Quota (in Mb) - Bandwidth (in Mb) - Name Servers - - - - - - - - - +
+ + + + + +
+ + + + +
+ 		+ + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Package Name +
+ + Default Template +
+ +
+ System Shell +
+ +
+ Web Domains +
+ + Web Aliases (per domain) +
+ + DNS Domains +
+ + DNS Records (per domain) +
+ + Mail Domains +
+ + Mail Accounts (per domain) +
+ + Databases +
+ + Cron Jobs +
+ + Backups +
+ + Disk Quota (in Mb) +
+ + Bandwidth (in Mb) +
+ + Name Servers +
+ + + +
+
+
diff --git a/web/templates/admin/list_backup.html b/web/templates/admin/list_backup.html index efa2831e4..d406803af 100644 --- a/web/templates/admin/list_backup.html +++ b/web/templates/admin/list_backup.html @@ -1,135 +1,243 @@ - - $value) { - ++$i; - $web = 'no'; - $dns = 'no'; - $mail = 'no'; - $db = 'no'; - - if (!empty($data[$key]['WEB'])) $web = 'yes ¨'; - if (!empty($data[$key]['DNS'])) $dns = 'yes ¨'; - if (!empty($data[$key]['MAIL'])) $mail = 'yes ¨'; - if (!empty($data[$key]['DB'])) $db = 'yes ¨'; -?> - - - - - - - -
- - - - -
">
active
- 		- - - - - -
download - - "> restore -
" title="Confirmation"> -

Are you sure you want to restore backup?

-
- 		- - delete -
-

Are you sure you want to delete backup?

-
-
- - - - - +
- - - - +
Run Time:
Backup Size:
+ + + +
+
+ +
+
+ + +
+
+ toggle all + + +
+
+
- 		- - - - -
SYS:
WEB:
DNS:
- 		- - - - -
MAIL:
DB:
CRON:
-
- - +
+ - -
-"; ?> - - - - -
→ - -
-
-"; ?> -"; ?> -"; ?> + $value) { + ++$i; + $web = 'no'; + $dns = 'no'; + $mail = 'no'; + $db = 'no'; + + if (!empty($data[$key]['WEB'])) $web = 'yes ¨'; + if (!empty($data[$key]['DNS'])) $dns = 'yes ¨'; + if (!empty($data[$key]['MAIL'])) $mail = 'yes ¨'; + if (!empty($data[$key]['DB'])) $db = 'yes ¨'; + ?> + + + + + + + + + +
">
active
+ + + + + + + + + +
download + + "> restore +
" title="Confirmation"> +

Are you sure you want to restore backup?

+
+ 		+ + delete +
+

Are you sure you want to delete backup?

+
+
+ + + + + + + + + + +
+ +
+ + + + + + + + + + +
+ +
+ Run Time: +
+ Backup Size: +
+ 		+ + + + + + + + + + + + + +
+ SYS: + + + + +
+ WEB: + + + + +
+ DNS: + + + + +
+ 		+ + + + + + + + + + + + + +
+ MAIL: + + + + +
+ DB: + + + + +
+ CRON: + + + + +
+
+ + + + + + + + "; ?> + + + + + + +
+ +
+ + + "; ?> + "; ?> + "; ?> diff --git a/web/templates/admin/list_packages.html b/web/templates/admin/list_packages.html index 7b1c9186c..8a1dc8efb 100644 --- a/web/templates/admin/list_packages.html +++ b/web/templates/admin/list_packages.html @@ -1,117 +1,242 @@ - - $value) { - ++$i; -?> +
+ + + +
+
+ +
+
+ + +
+
+ toggle all + + +
+
+ + + - - - - - - - -
">
active
- - - - - - -
edit - - delete -
-

Are you sure you want to delete package?

-
-
+
+ -
- - - - - -
- - - - - + $value) { + ++$i; + ?> - - -
Defaul Template:
System Shell:
Bandwidth: -
Disk: -
- 		- - - - - - - - - - - -
Web Domains:
Web Aliases: per domain
Dns Domains:
Dns Records: per domain
Name Servers:
 - - - - - - - - - - - -
Mail Domains:
Mail Accounts: per domain
Databases:
Cron Jobs:
Backups:
-
- - + + + + + + + +
">
active
+ + + + + + + + +
edit + + delete +
+

Are you sure you want to delete package?

+
+
+ + + + + + + + + +
+ +
+ + + + + + + + + + + + + + + +
+ Defaul Template: + + +
+ System Shell: + + +
+ Bandwidth: +
+
+
+
+ Disk: +
+
+
+
+ 		+ + + + + + + + + + + + + + + + + + + + + +
+ Web Domains: + + +
+ Web Aliases: + + per domain +
+ Dns Domains: + + +
+ Dns Records: + + per domain +
+ Name Servers: + + +
+ 		+ + + + + + + + + + + + + + + + + + + + + +
+ Mail Domains: + + +
+ Mail Accounts: + + per domain +
+ Databases: + + +
+ Cron Jobs: + + +
+ Backups: + + +
+
+ + - - -"; ?> + + - - - - -
→ - - listed
-"; ?> -"; ?> + "; ?> + + + + + + +
+ +
+
+ + "; ?> + "; ?> diff --git a/web/templates/admin/menu_add_package.html b/web/templates/admin/menu_add_package.html deleted file mode 100644 index b87a66545..000000000 --- a/web/templates/admin/menu_add_package.html +++ /dev/null @@ -1,15 +0,0 @@ - - - - -
Adding User Package - → ".$_SESSION['error_msg'].""; - } else { - if (!empty($_SESSION['ok_msg'])) { - echo " → ".$_SESSION['ok_msg'].""; - } - } - ?> -
diff --git a/web/templates/admin/menu_edit_package.html b/web/templates/admin/menu_edit_package.html deleted file mode 100644 index f13263bb7..000000000 --- a/web/templates/admin/menu_edit_package.html +++ /dev/null @@ -1,15 +0,0 @@ - - - - -
Editing User Package - → ".$_SESSION['error_msg'].""; - } else { - if (!empty($_SESSION['ok_msg'])) { - echo " → ".$_SESSION['ok_msg'].""; - } - } - ?> -
diff --git a/web/templates/admin/menu_packages.html b/web/templates/admin/menu_packages.html deleted file mode 100644 index 37cd833ea..000000000 --- a/web/templates/admin/menu_packages.html +++ /dev/null @@ -1,39 +0,0 @@ - - -
-

.

-
- - - - - - - - -
- - toggle all -
-