diff --git a/web/css/main.css b/web/css/main.css
index 659ffbe11..8c90a54d3 100644
--- a/web/css/main.css
+++ b/web/css/main.css
@@ -136,8 +136,8 @@ label:active {
font-weight: bold;
text-decoration: none;
line-height: 22px;
- padding: 0px 19px 4px 17px;
- margin: 0px 0px 2px 0px;
+ padding: 0 4px 2px 4px;
+ margin: 0 14px 2px 0;
}
.top-logout:hover {
@@ -272,11 +272,7 @@ label:active {
font-size: 9pt;
font-family: Arial, Helvetica, sans-serif;
// color: #333;
-<<<<<<< HEAD
color: #666;
-=======
- color: #7E7D7F;
->>>>>>> 29caf7e3b5ca98e665b4b3c7c6be94ade368c484
decoration: none;
overflow: hidden;
}
@@ -601,9 +597,6 @@ label:active {
background-color: #eceff1;
border-bottom: 1px solid #e9e9e9;
}
-.data.mode-add {
- border-top: 5px solid #F79B44;
-}
.mode-add .data-add {
background-color: #f7f6ed;
@@ -800,11 +793,7 @@ label:active {
vertical-align: top;
line-height: 1.2em;
font-size: 10pt;
-<<<<<<< HEAD
color: #666;
-=======
- color: #626163; /* #7E7D7F;*/
->>>>>>> 29caf7e3b5ca98e665b4b3c7c6be94ade368c484
padding: 2px 4px 1px 0;
white-space: nowrap;
}
@@ -814,22 +803,14 @@ label:active {
line-height: 0.8em;
font-size: 8pt;
padding: 4px 0 0 0;
-<<<<<<< HEAD
color: #666;
-=======
- color: #7E7D7F;
->>>>>>> 29caf7e3b5ca98e665b4b3c7c6be94ade368c484
}
.counter-value {
vertical-align: top;
line-height: 1.2em;
font-size: 10pt;
-<<<<<<< HEAD
color: #555;
-=======
- color: #545355; /*#626163;*/
->>>>>>> 29caf7e3b5ca98e665b4b3c7c6be94ade368c484
padding: 2px 0 1px 2px;
}
@@ -924,11 +905,6 @@ label:active {
border: 1px solid #909090;
}
-.vst-input:disabled:hover {
- border: 1px solid #C0C0C0;
-}
-
-
.vst-input:focus {
border: 1px solid #f79b44;
background-color: #fffcd2;
@@ -951,21 +927,12 @@ label:active {
min-width: 138px;
margin: 2px 6px 0 0;
padding: 8px 1px 6px 10px;
-<<<<<<< HEAD
}
.vst-list option {
padding: 6px 1px 6px 15px;
}
-=======
-}
-
-.vst-list option {
- padding: 6px 1px 6px 15px;
-}
-
->>>>>>> 29caf7e3b5ca98e665b4b3c7c6be94ade368c484
/*
@-moz-document url-prefix() {
.vst-list {
@@ -1028,8 +995,8 @@ label:active {
}
.login-button:hover {
- border: 1px solid #6DB8D3;
- background-color: #6DB8D3;
+ border: 1px solid #adaeae;
+ background-color: #adaeae;
}
.login-button:active {
@@ -1273,3 +1240,12 @@ label:active {
.timer-container .timer-button.play{
background: url(/images/start.png) no-repeat;
}
+
+.confirmation {
+ vertical-align: top;
+ text-align: center;
+ line-height: 1.2em;
+ font-size: 10pt;
+ color: #555;
+ padding: 2px 0 1px 2px;
+}
diff --git a/web/templates/admin/add_firewall_banlist.html b/web/templates/admin/add_firewall_banlist.html
index 6815400d6..0da1a58be 100644
--- a/web/templates/admin/add_firewall_banlist.html
+++ b/web/templates/admin/add_firewall_banlist.html
@@ -53,15 +53,11 @@
|
diff --git a/web/templates/admin/list_backup.html b/web/templates/admin/list_backup.html
index 2bc7bb563..637340132 100644
--- a/web/templates/admin/list_backup.html
+++ b/web/templates/admin/list_backup.html
@@ -65,7 +65,7 @@
" />
diff --git a/web/templates/admin/list_backup_exclusions.html b/web/templates/admin/list_backup_exclusions.html
index 00d468a1c..19cfd43ca 100644
--- a/web/templates/admin/list_backup_exclusions.html
+++ b/web/templates/admin/list_backup_exclusions.html
@@ -45,7 +45,7 @@
" />
diff --git a/web/templates/admin/list_cron.html b/web/templates/admin/list_cron.html
index 124f1bfc3..d07400c21 100644
--- a/web/templates/admin/list_cron.html
+++ b/web/templates/admin/list_cron.html
@@ -72,7 +72,7 @@
@@ -82,7 +82,7 @@
diff --git a/web/templates/admin/list_db.html b/web/templates/admin/list_db.html
index e3de459d9..934d6cc09 100644
--- a/web/templates/admin/list_db.html
+++ b/web/templates/admin/list_db.html
@@ -65,7 +65,7 @@
" />
@@ -75,7 +75,7 @@
" />
diff --git a/web/templates/admin/list_dns.html b/web/templates/admin/list_dns.html
index 33c03308e..70437ece4 100644
--- a/web/templates/admin/list_dns.html
+++ b/web/templates/admin/list_dns.html
@@ -57,7 +57,7 @@
@@ -67,7 +67,7 @@
diff --git a/web/templates/admin/list_dns_rec.html b/web/templates/admin/list_dns_rec.html
index 81d565085..ec4326cc5 100644
--- a/web/templates/admin/list_dns_rec.html
+++ b/web/templates/admin/list_dns_rec.html
@@ -63,7 +63,7 @@
diff --git a/web/templates/admin/list_firewall.html b/web/templates/admin/list_firewall.html
index 9f1885c1d..90b20cabd 100644
--- a/web/templates/admin/list_firewall.html
+++ b/web/templates/admin/list_firewall.html
@@ -59,7 +59,7 @@
@@ -69,7 +69,7 @@
diff --git a/web/templates/admin/list_firewall_banlist.html b/web/templates/admin/list_firewall_banlist.html
index 3ba39383b..8b2ce48cd 100644
--- a/web/templates/admin/list_firewall_banlist.html
+++ b/web/templates/admin/list_firewall_banlist.html
@@ -53,7 +53,7 @@
diff --git a/web/templates/admin/list_ip.html b/web/templates/admin/list_ip.html
index b69557682..88c5b08cb 100644
--- a/web/templates/admin/list_ip.html
+++ b/web/templates/admin/list_ip.html
@@ -49,7 +49,7 @@
" />
diff --git a/web/templates/admin/list_mail.html b/web/templates/admin/list_mail.html
index 7de94f246..344372c24 100644
--- a/web/templates/admin/list_mail.html
+++ b/web/templates/admin/list_mail.html
@@ -64,7 +64,7 @@
@@ -74,7 +74,7 @@
diff --git a/web/templates/admin/list_mail_acc.html b/web/templates/admin/list_mail_acc.html
index 2d91b5a0a..a188707e5 100644
--- a/web/templates/admin/list_mail_acc.html
+++ b/web/templates/admin/list_mail_acc.html
@@ -65,7 +65,7 @@
@@ -75,7 +75,7 @@
diff --git a/web/templates/admin/list_packages.html b/web/templates/admin/list_packages.html
index 4e9a4363f..05ca162bc 100644
--- a/web/templates/admin/list_packages.html
+++ b/web/templates/admin/list_packages.html
@@ -47,7 +47,7 @@
" />
diff --git a/web/templates/admin/list_search.html b/web/templates/admin/list_search.html
index f7d898a6c..d53a4370b 100644
--- a/web/templates/admin/list_search.html
+++ b/web/templates/admin/list_search.html
@@ -46,23 +46,23 @@
@@ -71,7 +71,7 @@
@@ -80,23 +80,23 @@
if ($data[$key]['KEY'] == 'RECORD') {
$spnd_lnk = '/'.$spnd_action.'/'.$data[$key]['TYPE'].'/?domain='.$data[$key]['PARENT'].'&record_id='.$data[$key]['LINK'].'&user='.$data[$key]['USER'];
- $cnfrm = 'RECORD_ACTION_CONFIRMATION';
+ $cnfrm = 'SUSPEND_RECORD_CONFIRMATION';
}
if ($data[$key]['KEY'] == 'ACCOUNT') {
$spnd_lnk = '/'.$spnd_action.'/'.$data[$key]['TYPE'].'/?domain='.$data[$key]['PARENT'].'&account='.$data[$key]['LINK'].'&user='.$data[$key]['USER'];
- $cnfrm = 'USER_ACTION_CONFIRMATION';
+ $cnfrm = 'SUSPEND_USER_CONFIRMATION';
}
if ($data[$key]['KEY'] == 'JOB') {
$spnd_lnk = '/'.$spnd_action.'/'.$data[$key]['TYPE'].'/?job='.$data[$key]['LINK'].'&user='.$data[$key]['USER'];
- $cnfrm = 'CRON_ACTION_CONFIRMATION';
+ $cnfrm = 'SUSPEND_CRON_CONFIRMATION';
}
if ($data[$key]['KEY'] == 'DATABASE') {
$spnd_lnk = '/'.$spnd_action.'/'.$data[$key]['TYPE'].'/?database='.$data[$key]['RESULT'].'&user='.$data[$key]['USER'];
- $cnfrm = 'DATABASE_ACTION_CONFIRMATION';
+ $cnfrm = 'SUSPEND_DATABASE_CONFIRMATION';
}
if (($data[$key]['KEY'] != 'RECORD') && ($data[$key]['KEY'] != 'ACCOUNT') && ($data[$key]['KEY'] != 'JOB') && ($data[$key]['KEY'] != 'DATABASE') ) {
$spnd_lnk = '/'.$spnd_action.'/'.$data[$key]['TYPE'].'/?'.strtolower($data[$key]['KEY']).'='.$data[$key]['RESULT'].'&user='.$data[$key]['USER'];
- $cnfrm = 'DOMAIN_ACTION_CONFIRMATION';
+ $cnfrm = 'SUSPEND_DOMAIN_CONFIRMATION';
}
?>
@@ -105,7 +105,7 @@
diff --git a/web/templates/admin/list_services.html b/web/templates/admin/list_services.html
index 3098ca66e..3460f6c01 100644
--- a/web/templates/admin/list_services.html
+++ b/web/templates/admin/list_services.html
@@ -40,7 +40,7 @@
diff --git a/web/templates/admin/list_user.html b/web/templates/admin/list_user.html
index 773906f89..c233ca338 100644
--- a/web/templates/admin/list_user.html
+++ b/web/templates/admin/list_user.html
@@ -70,7 +70,7 @@
@@ -80,7 +80,7 @@
@@ -114,7 +114,7 @@
});
@@ -109,7 +109,7 @@
diff --git a/web/templates/user/list_cron.html b/web/templates/user/list_cron.html
index 6fc387a25..346227304 100644
--- a/web/templates/user/list_cron.html
+++ b/web/templates/user/list_cron.html
@@ -70,7 +70,7 @@
diff --git a/web/templates/user/list_db.html b/web/templates/user/list_db.html
index b7f7fb99c..fb4c67fc8 100644
--- a/web/templates/user/list_db.html
+++ b/web/templates/user/list_db.html
@@ -63,7 +63,7 @@
" />
diff --git a/web/templates/user/list_dns.html b/web/templates/user/list_dns.html
index 1a843e061..d1638ee16 100644
--- a/web/templates/user/list_dns.html
+++ b/web/templates/user/list_dns.html
@@ -55,7 +55,7 @@
diff --git a/web/templates/user/list_dns_rec.html b/web/templates/user/list_dns_rec.html
index 2ded30b96..c2bd88378 100644
--- a/web/templates/user/list_dns_rec.html
+++ b/web/templates/user/list_dns_rec.html
@@ -61,7 +61,7 @@
diff --git a/web/templates/user/list_mail.html b/web/templates/user/list_mail.html
index 7d45a00bb..d7e792871 100644
--- a/web/templates/user/list_mail.html
+++ b/web/templates/user/list_mail.html
@@ -62,7 +62,7 @@
diff --git a/web/templates/user/list_mail_acc.html b/web/templates/user/list_mail_acc.html
index 0e74a6174..28a38cb25 100644
--- a/web/templates/user/list_mail_acc.html
+++ b/web/templates/user/list_mail_acc.html
@@ -63,7 +63,7 @@
diff --git a/web/templates/user/list_search.html b/web/templates/user/list_search.html
index 908f6a612..c13e1ac49 100644
--- a/web/templates/user/list_search.html
+++ b/web/templates/user/list_search.html
@@ -71,7 +71,7 @@
diff --git a/web/templates/user/list_web.html b/web/templates/user/list_web.html
index eedbdfb42..2c4f57135 100644
--- a/web/templates/user/list_web.html
+++ b/web/templates/user/list_web.html
@@ -86,7 +86,7 @@