From 1b2dc864ddb1bcf1297ae6908154c4c88d41007f Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Thu, 28 Aug 2014 09:40:04 +0300 Subject: [PATCH] new grid --- web/templates/admin/list_backup.html | 8 +-- web/templates/admin/list_backup_detail.html | 36 +++++------ web/templates/admin/list_db.html | 12 ++-- web/templates/admin/list_dns.html | 28 ++++---- web/templates/admin/list_ip.html | 2 +- web/templates/admin/list_log.html | 2 +- web/templates/admin/list_mail.html | 11 ++-- web/templates/admin/list_mail_acc.html | 16 +++-- web/templates/admin/list_packages.html | 56 +++++++--------- web/templates/admin/list_search.html | 2 +- web/templates/admin/list_services.html | 12 ++-- web/templates/admin/list_stats.html | 20 +++--- web/templates/admin/list_updates.html | 2 +- web/templates/admin/list_user.html | 71 ++++++++++----------- web/templates/admin/list_web.html | 49 +++++++------- web/templates/user/list_db.html | 12 ++-- web/templates/user/list_dns.html | 29 ++++----- web/templates/user/list_mail.html | 11 ++-- web/templates/user/list_mail_acc.html | 16 +++-- web/templates/user/list_search.html | 2 +- web/templates/user/list_stats.html | 20 +++--- web/templates/user/list_user.html | 71 ++++++++++----------- web/templates/user/list_web.html | 42 ++++++------ 23 files changed, 260 insertions(+), 270 deletions(-) diff --git a/web/templates/admin/list_backup.html b/web/templates/admin/list_backup.html index b532f6b4..2bc7bb56 100644 --- a/web/templates/admin/list_backup.html +++ b/web/templates/admin/list_backup.html @@ -91,15 +91,13 @@ -
: -
-
-
+ 		+ :
- + -
diff --git a/web/templates/admin/list_backup_detail.html b/web/templates/admin/list_backup_detail.html index 304f5775..6c0b4c10 100644 --- a/web/templates/admin/list_backup_detail.html +++ b/web/templates/admin/list_backup_detail.html @@ -58,11 +58,11 @@ - -
+ - + +
@@ -95,11 +95,11 @@ - -
+ - + +
@@ -132,11 +132,11 @@ - -
+ - + +
@@ -169,11 +169,11 @@ - -
+ - + +
@@ -206,11 +206,11 @@ - -
+ - + +
@@ -243,11 +243,11 @@ - -
+ - + +
diff --git a/web/templates/admin/list_db.html b/web/templates/admin/list_db.html index cb2c827f..81e88386 100644 --- a/web/templates/admin/list_db.html +++ b/web/templates/admin/list_db.html @@ -94,22 +94,24 @@ - diff --git a/web/templates/admin/list_ip.html b/web/templates/admin/list_ip.html index e675a4d3..b6955768 100644 --- a/web/templates/admin/list_ip.html +++ b/web/templates/admin/list_ip.html @@ -83,7 +83,7 @@
- +
+ -
: -
-
+
+ : +
+
+ - - +
diff --git a/web/templates/admin/list_dns.html b/web/templates/admin/list_dns.html index f71b754a..33c03308 100644 --- a/web/templates/admin/list_dns.html +++ b/web/templates/admin/list_dns.html @@ -92,7 +92,8 @@ @@ -104,25 +105,12 @@ - - -
- + +
- -
- 		- - - - - - - +
:
:
+ @@ -134,6 +122,14 @@
:
 + + + + + +
:
+
+
diff --git a/web/templates/admin/list_log.html b/web/templates/admin/list_log.html index 5fde622a..177e3829 100644 --- a/web/templates/admin/list_log.html +++ b/web/templates/admin/list_log.html @@ -32,7 +32,7 @@
- diff --git a/web/templates/admin/list_mail.html b/web/templates/admin/list_mail.html index f2b414da..6aa12afc 100644 --- a/web/templates/admin/list_mail.html +++ b/web/templates/admin/list_mail.html @@ -105,23 +105,24 @@
+
-
- +
+ -
+ : -
-
+
+
+
diff --git a/web/templates/admin/list_mail_acc.html b/web/templates/admin/list_mail_acc.html index b9fc82dc..2d91b5a0 100644 --- a/web/templates/admin/list_mail_acc.html +++ b/web/templates/admin/list_mail_acc.html @@ -86,21 +86,27 @@ - + + + - -
+ + +
+ -
+ : -
-
+
+
+ - + - + diff --git a/web/templates/admin/list_search.html b/web/templates/admin/list_search.html index 2d8434ca..f7d898a6 100644 --- a/web/templates/admin/list_search.html +++ b/web/templates/admin/list_search.html @@ -159,7 +159,7 @@
diff --git a/web/templates/admin/list_packages.html b/web/templates/admin/list_packages.html index 3cd36575..4e9a4363 100644 --- a/web/templates/admin/list_packages.html +++ b/web/templates/admin/list_packages.html @@ -60,8 +60,8 @@ - @@ -79,26 +79,10 @@ - - - - + + -
- + +
:
- : -
-
-
-
- : -
-
-
- 		:
- 		- @@ -107,6 +91,10 @@ +
: :
+ 		+ @@ -115,14 +103,6 @@ - - - - -
: :
:',$data[$key]['NS']) ?>
- 		- @@ -138,14 +118,26 @@ - - - - +
:
:
:
+ 		+ + + + + + + + + + + + +
:
:
:
:',$data[$key]['NS']) ?>
+
diff --git a/web/templates/admin/list_services.html b/web/templates/admin/list_services.html index ad0f6ba1..3098ca66 100644 --- a/web/templates/admin/list_services.html +++ b/web/templates/admin/list_services.html @@ -46,12 +46,12 @@ - - -
+
+
@@ -65,7 +65,7 @@
+ - - -
@@ -140,7 +140,7 @@
+
@@ -149,7 +149,7 @@
+
@@ -161,7 +161,7 @@
+
diff --git a/web/templates/admin/list_stats.html b/web/templates/admin/list_stats.html index a915e532..fe4860e4 100644 --- a/web/templates/admin/list_stats.html +++ b/web/templates/admin/list_stats.html @@ -56,23 +56,23 @@ - - - - -
- : % () -
-
+
+ : +
+
- : % () -
-
+
+ : +
+
+
@@ -95,7 +95,7 @@
+
diff --git a/web/templates/admin/list_updates.html b/web/templates/admin/list_updates.html index b6c03d66..12b7b9fe 100644 --- a/web/templates/admin/list_updates.html +++ b/web/templates/admin/list_updates.html @@ -89,7 +89,7 @@
+
diff --git a/web/templates/admin/list_user.html b/web/templates/admin/list_user.html index 2c07d3a2..773906f8 100644 --- a/web/templates/admin/list_user.html +++ b/web/templates/admin/list_user.html @@ -133,30 +133,31 @@ - +
- - + + - - - -
[]
: % () -
-
+
+ : +
+
: % () -
-
+
: +
+
- + - - + diff --git a/web/templates/admin/list_web.html b/web/templates/admin/list_web.html index 88aa0eba..022c3232 100644 --- a/web/templates/admin/list_web.html +++ b/web/templates/admin/list_web.html @@ -59,9 +59,9 @@ $ftp_user=$data[$key]['FTP_USER']; } - if (strlen($ftp_user) > 16 ) { + if (strlen($ftp_user) > 24 ) { $ftp_user = str_replace(':', ', ', $ftp_user); - $ftp_user = substr($ftp_user, 0, 16); + $ftp_user = substr($ftp_user, 0, 24); $ftp_user = trim($ftp_user, ":"); $ftp_user = str_replace(':', ', ', $ftp_user); $ftp_user = $ftp_user.", ..."; @@ -73,9 +73,9 @@ if (!empty($data[$key]['PROXY'])) { $proxy_support='yes'; } - if (strlen($data[$key]['PROXY_EXT']) > 16 ) { + if (strlen($data[$key]['PROXY_EXT']) > 24 ) { $proxy_ext_title = str_replace(',', ', ', $data[$key]['PROXY_EXT']); - $proxy_ext = substr($data[$key]['PROXY_EXT'], 0, 16); + $proxy_ext = substr($data[$key]['PROXY_EXT'], 0, 24); $proxy_ext = trim($proxy_ext, ","); $proxy_ext = str_replace(',', ', ', $proxy_ext); $proxy_ext = $proxy_ext.", ..."; @@ -141,7 +141,8 @@
+
: @@ -179,44 +180,20 @@
+ - - - - - - - - - + - - - - - - - - -
: /
:
:
:: /
:
:
',$data[$key]['NS']) ?>
- 		- - - - - @@ -225,6 +202,22 @@ + + + + +
: /
:
: / : /
: /
+ 		+ + + + + + + + + @@ -234,8 +227,8 @@ - - + +
:
:
:
: / :',$data[$key]['NS']) ?>
@@ -151,25 +152,27 @@ + + - - -
- + +
+ : -
-
+
+
: -
-
-
+ 		+ : +
+
+
+ @@ -179,30 +182,28 @@ - - - - + + + + + +
::
:
:
:
 - - - - - - + + diff --git a/web/templates/user/list_db.html b/web/templates/user/list_db.html index 9af5b521..008560cf 100644 --- a/web/templates/user/list_db.html +++ b/web/templates/user/list_db.html @@ -82,22 +82,24 @@
:
:
:>:
:
- diff --git a/web/templates/user/list_mail.html b/web/templates/user/list_mail.html index bd12bfdf..c13bd1e2 100644 --- a/web/templates/user/list_mail.html +++ b/web/templates/user/list_mail.html @@ -93,23 +93,24 @@
- +
+ -
: -
-
+
+ : +
+
+ - - +
diff --git a/web/templates/user/list_dns.html b/web/templates/user/list_dns.html index 0eb45a92..1a843e06 100644 --- a/web/templates/user/list_dns.html +++ b/web/templates/user/list_dns.html @@ -77,10 +77,12 @@ + @@ -92,25 +94,12 @@ - - -
- + +
- -
- 		- - - - - - - +
:
:
+ @@ -122,6 +111,14 @@
:
 + + + + + +
:
+
-
- +
+ -
+ : -
-
+
+
+
diff --git a/web/templates/user/list_mail_acc.html b/web/templates/user/list_mail_acc.html index 05bba2d3..0e74a617 100644 --- a/web/templates/user/list_mail_acc.html +++ b/web/templates/user/list_mail_acc.html @@ -74,21 +74,27 @@ - + + + - -
+ + +
+ -
+ : -
-
+
+
+
diff --git a/web/templates/user/list_search.html b/web/templates/user/list_search.html index 25be370d..908f6a61 100644 --- a/web/templates/user/list_search.html +++ b/web/templates/user/list_search.html @@ -136,7 +136,7 @@
+
diff --git a/web/templates/user/list_stats.html b/web/templates/user/list_stats.html index 4e7fb6b4..f1d3ac38 100644 --- a/web/templates/user/list_stats.html +++ b/web/templates/user/list_stats.html @@ -41,23 +41,23 @@ - - - -
- : % () -
-
+
+ : +
+
- : % () -
-
+
+ : +
+
+
@@ -80,7 +80,7 @@
+
diff --git a/web/templates/user/list_user.html b/web/templates/user/list_user.html index 02cb4209..2d3686b3 100644 --- a/web/templates/user/list_user.html +++ b/web/templates/user/list_user.html @@ -58,30 +58,31 @@ - +
- - + + - - - -
[]
: % () -
-
+
+ : +
+
: % () -
-
+
: +
+
- + - - + diff --git a/web/templates/user/list_web.html b/web/templates/user/list_web.html index 09a517bf..eedbdfb4 100644 --- a/web/templates/user/list_web.html +++ b/web/templates/user/list_web.html @@ -115,10 +115,12 @@ +
+
: @@ -104,44 +105,20 @@
+ - - - - - - - - - + - - - - - - - - -
: /
:
:
:: /
:
:
',$data[$key]['NS']) ?>
- 		- - - - - @@ -150,6 +127,22 @@ + + + + +
: /
:
: / : /
: /
+ 		+ + + + + + + + + @@ -159,8 +152,8 @@ - - + +
:
:
:
: / :',$data[$key]['NS']) ?>
@@ -128,25 +130,27 @@ + + - - -
- + +
+ : -
-
+
+
: -
-
-
+ 		+ : +
+
+
+ @@ -156,30 +160,28 @@ - - - - + + + + + +
::
:
:
:
 - - - - - - + +
:
:
:>:
: