From 34ca6ac865ee22bdc49abc3d80528aa5bef3a01b Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Thu, 20 Sep 2012 18:24:58 +0300 Subject: [PATCH] refactoring code: new html formating --- web/list/backup/index.php | 14 +- web/list/dns/index.php | 4 - web/list/ip/index.php | 1 - web/list/mail/index.php | 4 - web/list/package/index.php | 1 - web/list/stats/index.php | 16 +- web/list/web/index.php | 2 - web/templates/admin/list_log.html | 116 ++++++---- web/templates/admin/list_rrd.html | 109 ++++++---- web/templates/admin/list_stats.html | 294 ++++++++++++++++++-------- web/templates/admin/menu_log.html | 29 --- web/templates/admin/menu_stats.html | 29 --- web/templates/admin/panel.html | 2 +- web/templates/login.html | 34 +-- web/templates/reset_1.html | 301 ++++++++++++++------------ web/templates/reset_2.html | 304 +++++++++++++++------------ web/templates/reset_3.html | 314 +++++++++++++++------------- web/templates/user/panel.html | 2 +- 18 files changed, 878 insertions(+), 698 deletions(-) delete mode 100644 web/templates/admin/menu_log.html delete mode 100644 web/templates/admin/menu_stats.html diff --git a/web/list/backup/index.php b/web/list/backup/index.php index 8431b61ba..38cc060dc 100644 --- a/web/list/backup/index.php +++ b/web/list/backup/index.php @@ -12,15 +12,11 @@ include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html'); top_panel($user,$TAB); // Data -//if ($_SESSION['user'] == 'admin') { - - exec (VESTA_CMD."v_list_user_backups $user 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/list_backup.html'); -//} +exec (VESTA_CMD."v_list_user_backups $user json", $output, $return_var); +$data = json_decode(implode('', $output), true); +$data = array_reverse($data); +unset($output); +include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_backup.html'); // Footer include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html'); diff --git a/web/list/dns/index.php b/web/list/dns/index.php index c5413f38b..46ab3cd58 100644 --- a/web/list/dns/index.php +++ b/web/list/dns/index.php @@ -16,14 +16,12 @@ if ($_SESSION['user'] == 'admin') { if (empty($_GET['domain'])){ exec (VESTA_CMD."v_list_dns_domains $user 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/list_dns.html'); } else { exec (VESTA_CMD."v_list_dns_domain_records '".$user."' '".$_GET['domain']."' 'json'", $output, $return_var); - check_error($return_var); $data = json_decode(implode('', $output), true); $data = array_reverse($data); unset($output); @@ -32,14 +30,12 @@ if ($_SESSION['user'] == 'admin') { } else { if (empty($_GET['domain'])){ exec (VESTA_CMD."v_list_dns_domains $user 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/user/list_dns.html'); } else { exec (VESTA_CMD."v_list_dns_domain_records '".$user."' '".$_GET['domain']."' 'json'", $output, $return_var); - check_error($return_var); $data = json_decode(implode('', $output), true); $data = array_reverse($data); unset($output); diff --git a/web/list/ip/index.php b/web/list/ip/index.php index 11332b316..9d0b30ca0 100644 --- a/web/list/ip/index.php +++ b/web/list/ip/index.php @@ -16,7 +16,6 @@ top_panel($user,$TAB); // Data if ($_SESSION['user'] == 'admin') { exec (VESTA_CMD."v_list_sys_ips json", $output, $return_var); - check_error($return_var); $data = json_decode(implode('', $output), true); $data = array_reverse($data); unset($output); diff --git a/web/list/mail/index.php b/web/list/mail/index.php index 5d80f3f63..add148b12 100644 --- a/web/list/mail/index.php +++ b/web/list/mail/index.php @@ -16,14 +16,12 @@ if ($_SESSION['user'] == 'admin') { if (empty($_GET['domain'])){ exec (VESTA_CMD."v_list_mail_domains $user 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/list_mail.html'); } else { exec (VESTA_CMD."v_list_mail_accounts '".$user."' '".$_GET['domain']."' 'json'", $output, $return_var); - check_error($return_var); $data = json_decode(implode('', $output), true); $data = array_reverse($data); unset($output); @@ -33,7 +31,6 @@ if ($_SESSION['user'] == 'admin') { if (empty($_GET['domain'])){ exec (VESTA_CMD."v_list_mail_domains $user json", $output, $return_var); - check_error($return_var); $data = json_decode(implode('', $output), true); $data = array_reverse($data); unset($output); @@ -41,7 +38,6 @@ if ($_SESSION['user'] == 'admin') { include($_SERVER['DOCUMENT_ROOT'].'/templates/user/list_mail.html'); } else { exec (VESTA_CMD."v_list_mail_accounts '".$user."' '".$_GET['domain']."' 'json'", $output, $return_var); - check_error($return_var); $data = json_decode(implode('', $output), true); $data = array_reverse($data); unset($output); diff --git a/web/list/package/index.php b/web/list/package/index.php index 040a6bae7..51b5ec4fb 100644 --- a/web/list/package/index.php +++ b/web/list/package/index.php @@ -14,7 +14,6 @@ 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); diff --git a/web/list/stats/index.php b/web/list/stats/index.php index 4c661a67c..40b5de1b1 100644 --- a/web/list/stats/index.php +++ b/web/list/stats/index.php @@ -12,17 +12,11 @@ include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html'); top_panel($user,$TAB); // Data -//if ($_SESSION['user'] == 'admin') { - - exec (VESTA_CMD."v_list_user_stats $user 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_stats.html'); - include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_stats.html'); -//} +exec (VESTA_CMD."v_list_user_stats $user json", $output, $return_var); +$data = json_decode(implode('', $output), true); +$data = array_reverse($data); +unset($output); +include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_stats.html'); // Footer include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html'); diff --git a/web/list/web/index.php b/web/list/web/index.php index 22c8dbaf5..30876a7a0 100644 --- a/web/list/web/index.php +++ b/web/list/web/index.php @@ -14,13 +14,11 @@ top_panel($user,$TAB); // Data if ($_SESSION['user'] == 'admin') { exec (VESTA_CMD."v_list_web_domains $user json", $output, $return_var); - check_error($return_var); $data = json_decode(implode('', $output), true); $data = array_reverse($data); include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_web.html'); } else { exec (VESTA_CMD."v_list_web_domains $user json", $output, $return_var); - check_error($return_var); $data = json_decode(implode('', $output), true); $data = array_reverse($data); include($_SERVER['DOCUMENT_ROOT'].'/templates/user/list_web.html'); diff --git a/web/templates/admin/list_log.html b/web/templates/admin/list_log.html index b58ff2805..559912c31 100644 --- a/web/templates/admin/list_log.html +++ b/web/templates/admin/list_log.html @@ -1,49 +1,77 @@ - - $value) { - ++$i; - ?> +
+ + + +
+
+
+
+ + +
+
+ + + - - - - - -
">
">
- - +
+ -
- -
+ $value) { + ++$i; + ?> - - -
-
- - + + + + + +
">
">
+ + + + + + +
+ + + + +
+ + +
+ + - - -"; ?> - - - - -
→ - -
-"; ?> -"; ?> -"; ?> -"; ?> + + + + + "; ?> + + + + + + +
+ +
+
+ + "; ?> + "; ?> + "; ?> + "; ?> diff --git a/web/templates/admin/list_rrd.html b/web/templates/admin/list_rrd.html index de4e99ac3..304f9ad6c 100644 --- a/web/templates/admin/list_rrd.html +++ b/web/templates/admin/list_rrd.html @@ -1,46 +1,71 @@ - - $value) { -?> - - - - - - -
- - - - -
">
active
- 		- - - -
" target="_blank"> download
- - - - - +
- - +
">
+ + + +
+ +
+ + +
+
+
- 		-
- - +
+ + $value) { + ?> - -
+ + + + + + +
">
active
+ + + + + + + +
" target="_blank"> download
+ + + + + + +
+ + + + +
+ "> +
+ 		+
+ + + + + +
diff --git a/web/templates/admin/list_stats.html b/web/templates/admin/list_stats.html index 5b3181fba..2a8744fc9 100644 --- a/web/templates/admin/list_stats.html +++ b/web/templates/admin/list_stats.html @@ -1,95 +1,207 @@ - - $value) { - ++$i; -?> - - - - - + +
- - - - -
">
active
- 		- - -
- - - - - - - -
- - - - - - -
[] package
Bandwidth: % () -
Disk: % () -
- - -
- Web:
- Mail:
- 		- Databases:
- User Dirs:
+ + + + +
+
+
+
+ + +
+
- 		- - - - - - - - - - - -
Web Domains:
Web SSL:
Web Aliases:
Dns Domains:
Dns Records:
 - - - - - - - - - - - -
Mail Domains:
Mail Accounts:
Databases:
Cron Jobs:
Dedicated IP:
-
-
- - -"; ?> +
+ -
- - - -
→ - - listed
-"; ?> -"; ?> + $value) { + ++$i; + ?> + + + + + + + +
">
active
+ + + + + + +
+ + + + + + + + + + +
+ +
+ + + + + + + + + + + + + +
+ [] package +
+ Bandwidth: % () +
+
+
+
+ Disk: % () +
+
+
+
+ + + + + +
+ Web:
+ Mail:
+ 		+ Databases:
+ User Dirs:
+
+
+ 		+ + + + + + + + + + + + + + + + + + + + + +
+ Web Domains: + + +
+ Web SSL: + + +
+ Web Aliases: + + +
+ Dns Domains: + + +
+ Dns Records: + + +
+ 		+ + + + + + + + + + + + + + + + + + + + + +
+ Mail Domains: + + +
+ Mail Accounts: + + +
+ Databases: + + +
+ Cron Jobs: + + +
+ Dedicated IP: + + +
+
+ + + + + + + + "; ?> + + + + + + +
+ +
+
+ + "; ?> + "; ?> diff --git a/web/templates/admin/menu_log.html b/web/templates/admin/menu_log.html deleted file mode 100644 index a68641121..000000000 --- a/web/templates/admin/menu_log.html +++ /dev/null @@ -1,29 +0,0 @@ - - -
-

.

-
- - - - - -
-
diff --git a/web/templates/admin/menu_stats.html b/web/templates/admin/menu_stats.html deleted file mode 100644 index a68641121..000000000 --- a/web/templates/admin/menu_stats.html +++ /dev/null @@ -1,29 +0,0 @@ - - -
-

.

-
- - - - - -
-
diff --git a/web/templates/admin/panel.html b/web/templates/admin/panel.html index a2efc4985..7fb711236 100644 --- a/web/templates/admin/panel.html +++ b/web/templates/admin/panel.html @@ -6,7 +6,7 @@ RRD Graphics Statistics History Log - Log out + Log out diff --git a/web/templates/login.html b/web/templates/login.html index a09c4ff74..b8c23a2a4 100644 --- a/web/templates/login.html +++ b/web/templates/login.html @@ -13,12 +13,16 @@ } .forgot { - color: #484243; + color: #34536A; font-family: Arial, sans-serif; font-size: 8pt; padding: 0 10px 0 0; } + .forgot:hover { + color: #7fa1cb; + } + .login { margin: 80px 0 80px 0; padding: 0; @@ -79,7 +83,7 @@ color: #DE6C5D; } - .loggin-input { + .login-input { color: #555; background-color: #FFFFFF; border: 1px solid #999999; @@ -91,7 +95,11 @@ width: 360px; } - .loggin-button { + .login-input:hover { + border: 1px solid #e5a907; + } + + .login-button { padding: 4px; margin: 0 6px 0 0; cursor: pointer; @@ -104,11 +112,11 @@ width: 105px; } - .loggin-button:hover { + .login-button:hover { background-color: #f0f0f0; } - .loggin-button:active { + .login-button:active { background-color: #EBE9DC; } @@ -133,17 +141,17 @@ @@ -153,7 +161,7 @@
- +
- +
- +
- +
@@ -163,12 +171,8 @@ - - - - - - + +
.
vestacp.com
.
vestacp.com
diff --git a/web/templates/reset_1.html b/web/templates/reset_1.html index b9227af4a..7e390a06b 100644 --- a/web/templates/reset_1.html +++ b/web/templates/reset_1.html @@ -1,145 +1,176 @@ - - VestaCP - Reset Password - - - -
- - - -
- + + + diff --git a/web/templates/reset_2.html b/web/templates/reset_2.html index 48848ee7c..7ac52e7c7 100644 --- a/web/templates/reset_2.html +++ b/web/templates/reset_2.html @@ -1,150 +1,176 @@ - - VestaCP - Reset Password - - - -
- - - -
- + + diff --git a/web/templates/reset_3.html b/web/templates/reset_3.html index 6d3fbd0e3..f1b6adff2 100644 --- a/web/templates/reset_3.html +++ b/web/templates/reset_3.html @@ -1,151 +1,185 @@ - - VestaCP - Reset Password - - - -
- - - - +