From ef1a5d748df594c51f1ae0edbadfe3614026f4f5 Mon Sep 17 00:00:00 2001
From: Serghey Rodin <serghey.rodin@gmail.com>
Date: Fri, 8 Jun 2012 00:36:05 +0300
Subject: [PATCH] new control menu

---
 web/templates/admin/add_user.html       |  4 ++--
 web/templates/admin/add_web.html        |  5 ++---
 web/templates/admin/edit_user.html      |  4 ++--
 web/templates/admin/edit_web.html       |  4 ++--
 web/templates/admin/menu_add_user.html  |  2 +-
 web/templates/admin/menu_backup.html    | 12 +++++++-----
 web/templates/admin/menu_cron.html      | 12 +++++++-----
 web/templates/admin/menu_db.html        | 12 +++++++-----
 web/templates/admin/menu_dns.html       | 12 +++++++-----
 web/templates/admin/menu_dns_rec.html   | 12 +++++++-----
 web/templates/admin/menu_edit_user.html |  2 +-
 web/templates/admin/menu_ip.html        | 12 +++++++-----
 web/templates/admin/menu_log.html       |  4 ++--
 web/templates/admin/menu_mail.html      | 12 +++++++-----
 web/templates/admin/menu_mail_acc.html  | 12 +++++++-----
 web/templates/admin/menu_rrd.html       | 12 ++++++------
 web/templates/admin/menu_stats.html     |  4 ++--
 web/templates/admin/menu_user.html      | 13 +++++++------
 web/templates/admin/menu_web.html       | 12 +++++++-----
 web/templates/header.html               | 10 +++++-----
 20 files changed, 95 insertions(+), 77 deletions(-)

diff --git a/web/templates/admin/add_user.html b/web/templates/admin/add_user.html
index 5a5ceb83..69965958 100644
--- a/web/templates/admin/add_user.html
+++ b/web/templates/admin/add_user.html
@@ -49,9 +49,9 @@ document.v_add_user.v_password.value = randomstring;
             <tr><td><input type="text" size="20" class="add-input" name="v_lname" <?php if (!empty($v_lname)) echo "value=".$v_lname; ?>></tr>
             <tr><td style="padding: 24px 0 0 0;">
                 <input type="submit" name="ok" value="OK" class="add-button">
-                <input type="submit" class="add-button" name="cancel" value="Cancel">
+                </form>
+                <input type="button" class="add-button" value="Cancel" onClick="location.href='/list/user/'">
             </td></tr>
-            </form>
         </table>
     </td>
 </tr>
diff --git a/web/templates/admin/add_web.html b/web/templates/admin/add_web.html
index b0ae1726..0f8f0a53 100644
--- a/web/templates/admin/add_web.html
+++ b/web/templates/admin/add_web.html
@@ -90,10 +90,9 @@
                 </table>
             </td></tr>
             <tr><td style="padding: 24px 0 0 0;">
-                <input type="submit" name="ok" value="OK" class="add-button">
-                <input type="submit" class="add-button" name="cancel" value="Cancel">
+                <input type="submit" name="ok" value="OK" class="add-button"></form>
+                <input type="button" class="add-button" value="Cancel" onClick="location.href='/list/web/'">
             </td></tr>
-            </form>
         </table>
     </td>
 </tr>
diff --git a/web/templates/admin/edit_user.html b/web/templates/admin/edit_user.html
index be89310d..ea0cef92 100644
--- a/web/templates/admin/edit_user.html
+++ b/web/templates/admin/edit_user.html
@@ -70,9 +70,9 @@ document.v_edit_user.v_password.value = randomstring;
             <tr><td><input type="text" size="20" class="add-input" name="v_ns4" <?php if (!empty($v_ns4)) echo "value=".$v_ns4; ?>></tr>
             <tr><td style="padding: 24px 0 0 0;">
                 <input type="submit" class="add-button" name="save" value="Save">
-                <input type="submit" class="add-button" name="cancel" value="Cancel">
+                </form>
+                <input type="button" class="add-button" value="Cancel" onClick="location.href='/list/user/'">
             </td></tr>
-            </form>
         </table>
     </td>
 </tr>
diff --git a/web/templates/admin/edit_web.html b/web/templates/admin/edit_web.html
index e4a8f8e5..9297e277 100644
--- a/web/templates/admin/edit_web.html
+++ b/web/templates/admin/edit_web.html
@@ -111,8 +111,8 @@
                 <tr><td><input type="text" size="20" class="add-input" name="v_stats_password" <?php if (!empty($v_stats_password)) echo "value=".$v_stats_password;  ?> id="v_password"></tr>
             </td></tr></tr></table>
             <tr><td style="padding: 24px 0 0 0;">
-                <input type="submit" class="add-button" name="save" value="Save">
-                <input type="submit" class="add-button" name="cancel" value="Cancel">
+                <input type="submit" class="add-button" name="save" value="Save"></form>
+                <input type="button" class="add-button" value="Cancel" onClick="location.href='/list/web/'">
             </td></tr>
             </form>
         </table>
diff --git a/web/templates/admin/menu_add_user.html b/web/templates/admin/menu_add_user.html
index 09563b65..69d23bbe 100644
--- a/web/templates/admin/menu_add_user.html
+++ b/web/templates/admin/menu_add_user.html
@@ -1,6 +1,6 @@
 <table class="sub-menu">
 <tr>
-    <td style="padding: 10px 2px 28px 0;" ><a class="add-name"><b>Adding User</b></a>
+    <td style="padding: 14px 2px 24px 0;" ><a class="add-name"><b>Adding User</b></a>
     <?php 
         if (!empty($_SESSION['error_msg'])) {
             echo "<a class=\"add-error\"> → ".$_SESSION['error_msg']."</a>";
diff --git a/web/templates/admin/menu_backup.html b/web/templates/admin/menu_backup.html
index 654d4db1..94674655 100644
--- a/web/templates/admin/menu_backup.html
+++ b/web/templates/admin/menu_backup.html
@@ -1,10 +1,9 @@
 <table class="sub-menu">
 <tr>
-    <td style="padding: 4px 0 10px 0;"><a href="#" class="add"><img style="padding: 0 4px 0 18px;" src="/images/plus.png" width="12px" height="12px"><b>Make Backup</b></a></td>
-    <td style="text-align: right;"><input type="text" size="30" style="padding: 2px 80px 3px 0;"> <button> Search </button></td>
-</tr><tr>
-    <td style="padding: 0 0 0 18px;"><a style="padding: 0 4px 0 4px" class="select-controls" href='javascript:checkedAll("vstobjects");'> toggle all </a>
-    <select style="margin:0 0 0 80px">
+    <td width="142px" style="padding: 16px 0 16px 6px">
+    <button style="width:120px; padding: 2px 0px 2px 0px;" onclick="location.href='/add/backup/'">Add Backup</button>
+    <td><a style="padding: 0 4px 0 12px" class="select-controls" href='javascript:checkedAll("vstobjects");'> toggle all </a>
+    <select style="margin:0 0 0 0px">
         <option>apply to selected</option>
         <option>rebuild</option>
         <option>update counters</option>
@@ -12,6 +11,9 @@
         <option>unsuspend</option>
         <option>delete</option>
     </select> <button> > </button></td>
+</td>
+    <td style="text-align: right;"><input type="text" size="30" style="padding: 3px 80px 3px 0;"> <button> Search </button></td>
+</tr><tr>
 </tr>
 </table>
 <form id="vstobjects">
diff --git a/web/templates/admin/menu_cron.html b/web/templates/admin/menu_cron.html
index 62971d4f..68d7dea6 100644
--- a/web/templates/admin/menu_cron.html
+++ b/web/templates/admin/menu_cron.html
@@ -1,10 +1,9 @@
 <table class="sub-menu">
 <tr>
-    <td style="padding: 4px 0 10px 0;"><a href="#" class="add"><img style="padding: 0 4px 0 18px;" border=0 src="/images/plus.png" width="12px" height="12px"><b>Add Cron Job</b></a></td>
-    <td style="text-align: right;"><input type="text" size="30" style="padding: 2px 80px 3px 0;"> <button> Search </button></td>
-</tr><tr>
-    <td style="padding: 0 0 0 18px;"><a style="padding: 0 4px 0 4px" class="select-controls" href='javascript:checkedAll("vstobjects");'> toggle all </a>
-    <select style="margin:0 0 0 80px">
+    <td width="142px" style="padding: 16px 0 16px 6px">
+    <button style="width:120px; padding: 2px 0px 2px 0px;" onclick="location.href='/add/cron/'">Add Job</button>
+    <td><a style="padding: 0 4px 0 12px" class="select-controls" href='javascript:checkedAll("vstobjects");'> toggle all </a>
+    <select style="margin:0 0 0 0px">
         <option>apply to selected</option>
         <option>rebuild</option>
         <option>update counters</option>
@@ -12,6 +11,9 @@
         <option>unsuspend</option>
         <option>delete</option>
     </select> <button> > </button></td>
+</td>
+    <td style="text-align: right;"><input type="text" size="30" style="padding: 3px 80px 3px 0;"> <button> Search </button></td>
+</tr><tr>
 </tr>
 </table>
 <form id="vstobjects">
diff --git a/web/templates/admin/menu_db.html b/web/templates/admin/menu_db.html
index db5fb80d..370b7b5e 100644
--- a/web/templates/admin/menu_db.html
+++ b/web/templates/admin/menu_db.html
@@ -1,10 +1,9 @@
 <table class="sub-menu">
 <tr>
-    <td style="padding: 4px 0 10px 0;"><a href="#" class="add"><img style="padding: 0 4px 0 18px;" src="/images/plus.png" width="12px" height="12px"><b>Add Database</b></a></td>
-    <td style="text-align: right;"><input type="text" size="30" style="padding: 2px 80px 3px 0;"> <button> Search </button></td>
-</tr><tr>
-    <td style="padding: 0 0 0 18px;"><a style="padding: 0 4px 0 4px" class="select-controls" href='javascript:checkedAll("vstobjects");'> toggle all </a>
-    <select style="margin:0 0 0 80px">
+    <td width="142px" style="padding: 16px 0 16px 6px">
+    <button style="width:120px; padding: 2px 0px 2px 0px;" onclick="location.href='/add/db/'">Add Database</button>
+    <td><a style="padding: 0 4px 0 12px" class="select-controls" href='javascript:checkedAll("vstobjects");'> toggle all </a>
+    <select style="margin:0 0 0 0px">
         <option>apply to selected</option>
         <option>rebuild</option>
         <option>update counters</option>
@@ -12,6 +11,9 @@
         <option>unsuspend</option>
         <option>delete</option>
     </select> <button> > </button></td>
+</td>
+    <td style="text-align: right;"><input type="text" size="30" style="padding: 3px 80px 3px 0;"> <button> Search </button></td>
+</tr><tr>
 </tr>
 </table>
 <form id="vstobjects">
diff --git a/web/templates/admin/menu_dns.html b/web/templates/admin/menu_dns.html
index 723cb7ba..33ab9231 100644
--- a/web/templates/admin/menu_dns.html
+++ b/web/templates/admin/menu_dns.html
@@ -1,10 +1,9 @@
 <table class="sub-menu">
 <tr>
-    <td style="padding: 4px 0 10px 0;"><a href="#" class="add"><img style="padding: 0 4px 0 18px;"src="/images/plus.png" width="12px" height="12px"><b>Add DNS Domain</b></a></td>
-    <td style="text-align: right;"><input type="text" size="30" style="padding: 2px 80px 3px 0;"> <button> Search </button></td>
-</tr><tr>
-    <td style="padding: 0 0 0 18px;"><a style="padding: 0 4px 0 4px" class="select-controls" href='javascript:checkedAll("vstobjects");'> toggle all </a>
-    <select style="margin:0 0 0 80px">
+    <td width="142px" style="padding: 16px 0 16px 6px">
+    <button style="width:120px; padding: 2px 0px 2px 0px;" onclick="location.href='/add/dns/'">Add Domain</button>
+    <td><a style="padding: 0 4px 0 12px" class="select-controls" href='javascript:checkedAll("vstobjects");'> toggle all </a>
+    <select style="margin:0 0 0 0px">
         <option>apply to selected</option>
         <option>rebuild</option>
         <option>update counters</option>
@@ -12,6 +11,9 @@
         <option>unsuspend</option>
         <option>delete</option>
     </select> <button> > </button></td>
+</td>
+    <td style="text-align: right;"><input type="text" size="30" style="padding: 3px 80px 3px 0;"> <button> Search </button></td>
+</tr><tr>
 </tr>
 </table>
 <form id="vstobjects">
diff --git a/web/templates/admin/menu_dns_rec.html b/web/templates/admin/menu_dns_rec.html
index c72e410d..523d7615 100644
--- a/web/templates/admin/menu_dns_rec.html
+++ b/web/templates/admin/menu_dns_rec.html
@@ -1,10 +1,9 @@
 <table class="sub-menu">
 <tr>
-    <td style="padding: 4px 0 10px 0;"><a href="#" class="add"><img style="padding: 0 4px 0 18px;" src="/images/plus.png" width="12px" height="12px"><b>Add DNS Record</b></a></td>
-    <td style="text-align: right;"><input type="text" size="30" style="padding: 2px 80px 3px 0;"> <button> Search </button></td>
-</tr><tr>
-    <td style="padding: 0 0 0 18px;"><a style="padding: 0 4px 0 4px" class="select-controls" href='javascript:checkedAll("vstobjects");'> toggle all </a>
-    <select style="margin:0 0 0 80px">
+    <td width="142px" style="padding: 16px 0 16px 6px">
+    <button style="width:120px; padding: 2px 0px 2px 0px;" onclick="location.href='/add/dns/'">Add Record</button>
+    <td><a style="padding: 0 4px 0 12px" class="select-controls" href='javascript:checkedAll("vstobjects");'> toggle all </a>
+    <select style="margin:0 0 0 0px">
         <option>apply to selected</option>
         <option>rebuild</option>
         <option>update counters</option>
@@ -12,6 +11,9 @@
         <option>unsuspend</option>
         <option>delete</option>
     </select> <button> > </button></td>
+</td>
+    <td style="text-align: right;"><input type="text" size="30" style="padding: 3px 80px 3px 0;"> <button> Search </button></td>
+</tr><tr>
 </tr>
 </table>
 <form id="vstobjects">
diff --git a/web/templates/admin/menu_edit_user.html b/web/templates/admin/menu_edit_user.html
index b69f1dad..3a180f4f 100644
--- a/web/templates/admin/menu_edit_user.html
+++ b/web/templates/admin/menu_edit_user.html
@@ -1,6 +1,6 @@
 <table class="sub-menu">
 <tr>
-    <td style="padding: 10px 2px 28px 0;" ><a class="add-name"><b>Editing User</b></a>
+    <td style="padding: 14px 2px 24px 0;" ><a class="add-name"><b>Editing User</b></a>
     <?php 
         if (!empty($_SESSION['error_msg'])) {
             echo "<a class=\"add-error\"> → ".$_SESSION['error_msg']."</a>";
diff --git a/web/templates/admin/menu_ip.html b/web/templates/admin/menu_ip.html
index 4c65c2c1..e9d759de 100644
--- a/web/templates/admin/menu_ip.html
+++ b/web/templates/admin/menu_ip.html
@@ -1,10 +1,9 @@
 <table class="sub-menu">
 <tr>
-    <td style="padding: 4px 0 10px 0;"><a href="#" class="add"><img style="padding: 0 4px 0 18px;" border=0 src="/images/plus.png" width="12px" height="12px"><b>Add IP</b></a></td>
-    <td style="text-align: right;"><input type="text" size="30" style="padding: 2px 80px 3px 0;"> <button> Search </button></td>
-</tr><tr>
-    <td style="padding: 0 0 0 18px;"><a style="padding: 0 4px 0 4px" class="select-controls" href='javascript:checkedAll("vstobjects");'> toggle all </a>
-    <select style="margin:0 0 0 80px">
+    <td width="142px" style="padding: 16px 0 16px 6px">
+    <button style="width:120px; padding: 2px 0px 2px 0px;" onclick="location.href='/add/ip/'">Add IP</button>
+    <td><a style="padding: 0 4px 0 12px" class="select-controls" href='javascript:checkedAll("vstobjects");'> toggle all </a>
+    <select style="margin:0 0 0 0px">
         <option>apply to selected</option>
         <option>rebuild</option>
         <option>update counters</option>
@@ -12,6 +11,9 @@
         <option>unsuspend</option>
         <option>delete</option>
     </select> <button> > </button></td>
+</td>
+    <td style="text-align: right;"><input type="text" size="30" style="padding: 3px 80px 3px 0;"> <button> Search </button></td>
+</tr><tr>
 </tr>
 </table>
 <form id="vstobjects">
diff --git a/web/templates/admin/menu_log.html b/web/templates/admin/menu_log.html
index 9878addf..dd978cee 100644
--- a/web/templates/admin/menu_log.html
+++ b/web/templates/admin/menu_log.html
@@ -1,6 +1,6 @@
 <table class="sub-menu">
 <tr>
-    <td style="padding: 0 0 34px 0;"></td>
-    <td style="text-align: right;"><input type="text" size="30" style="padding: 2px 80px 3px 0;"> <button> Search </button></td>
+    <td width="142px" style="padding: 28px 0 32px 6px">
+    <td style="text-align: right;"><input type="text" size="30" style="padding: 3px 80px 3px 0;"> <button> Search </button></td>
 </tr>
 </table>
diff --git a/web/templates/admin/menu_mail.html b/web/templates/admin/menu_mail.html
index 6f430676..25ee8506 100644
--- a/web/templates/admin/menu_mail.html
+++ b/web/templates/admin/menu_mail.html
@@ -1,10 +1,9 @@
 <table class="sub-menu">
 <tr>
-    <td style="padding: 4px 0 10px 0;"><a href="#" class="add"><img style="padding: 0 4px 0 18px;" src="/images/plus.png" width="12px" height="12px"><b>Add Mail Domain<b></a></td>
-    <td style="text-align: right;"><input type="text" size="30" style="padding: 2px 80px 3px 0;"> <button> Search </button></td>
-</tr><tr>
-    <td style="padding: 0 0 0 18px;"><a style="padding: 0 4px 0 4px" class="select-controls" href='javascript:checkedAll("vstobjects");'> toggle all </a>
-    <select style="margin:0 0 0 80px">
+    <td width="142px" style="padding: 16px 0 16px 6px">
+    <button style="width:120px; padding: 2px 0px 2px 0px;" onclick="location.href='/add/mail/'">Add Domain</button>
+    <td><a style="padding: 0 4px 0 12px" class="select-controls" href='javascript:checkedAll("vstobjects");'> toggle all </a>
+    <select style="margin:0 0 0 0px">
         <option>apply to selected</option>
         <option>rebuild</option>
         <option>update counters</option>
@@ -12,6 +11,9 @@
         <option>unsuspend</option>
         <option>delete</option>
     </select> <button> > </button></td>
+</td>
+    <td style="text-align: right;"><input type="text" size="30" style="padding: 3px 80px 3px 0;"> <button> Search </button></td>
+</tr><tr>
 </tr>
 </table>
 <form id="vstobjects">
diff --git a/web/templates/admin/menu_mail_acc.html b/web/templates/admin/menu_mail_acc.html
index d4da020d..25ee8506 100644
--- a/web/templates/admin/menu_mail_acc.html
+++ b/web/templates/admin/menu_mail_acc.html
@@ -1,10 +1,9 @@
 <table class="sub-menu">
 <tr>
-    <td style="padding: 4px 0 10px 0;"><a href="#" class="add"><img style="padding: 0 4px 0 18px;" src="/images/plus.png" width="12px" height="12px"><b>Add Mail Account<b></a></td>
-    <td style="text-align: right;"><input type="text" size="30" style="padding: 2px 80px 3px 0;"> <button> Search </button></td>
-</tr><tr>
-    <td style="padding: 0 0 0 18px;"><a style="padding: 0 4px 0 4px" class="select-controls" href='javascript:checkedAll("vstobjects");'> toggle all </a>
-    <select style="margin:0 0 0 80px">
+    <td width="142px" style="padding: 16px 0 16px 6px">
+    <button style="width:120px; padding: 2px 0px 2px 0px;" onclick="location.href='/add/mail/'">Add Domain</button>
+    <td><a style="padding: 0 4px 0 12px" class="select-controls" href='javascript:checkedAll("vstobjects");'> toggle all </a>
+    <select style="margin:0 0 0 0px">
         <option>apply to selected</option>
         <option>rebuild</option>
         <option>update counters</option>
@@ -12,6 +11,9 @@
         <option>unsuspend</option>
         <option>delete</option>
     </select> <button> > </button></td>
+</td>
+    <td style="text-align: right;"><input type="text" size="30" style="padding: 3px 80px 3px 0;"> <button> Search </button></td>
+</tr><tr>
 </tr>
 </table>
 <form id="vstobjects">
diff --git a/web/templates/admin/menu_rrd.html b/web/templates/admin/menu_rrd.html
index d860f707..a213ac19 100644
--- a/web/templates/admin/menu_rrd.html
+++ b/web/templates/admin/menu_rrd.html
@@ -1,11 +1,11 @@
 <table class="sub-menu">
 <tr >
-    <td style="padding: 4px 0 10px 0;"><img style="padding: 0 6px 0 18px;" src="/images/period.png" width="12px" height="12px">
-        <b><a class="add" href="?period=daily">Daily</a></b>
-        <b><a class="add" href="?period=weekly">Weekly</a></b>
-        <b><a class="add" href="?period=monthly">Monthly</a></b>
-        <b><a class="add" href="?period=yearly">Yearly</a></b>
+    <td style="padding: 24px 0 16px 24px">
+        <a class="add" href="?period=daily">Daily</a>
+        <a class="add" href="?period=weekly">Weekly</a>
+        <a class="add" href="?period=monthly">Monthly</a>
+        <a class="add" href="?period=yearly">Yearly</a>
     </td>
-    <td style="text-align: right;" ><input type="text" size="30" style="padding: 2px 80px 3px 0;"> <button> Search </button></td>
+    <td style="text-align: right;" ><input type="text" size="30" style="padding: 3px 80px 3px 0;"> <button> Search </button></td>
 </tr>
 </table>
diff --git a/web/templates/admin/menu_stats.html b/web/templates/admin/menu_stats.html
index 9878addf..dd978cee 100644
--- a/web/templates/admin/menu_stats.html
+++ b/web/templates/admin/menu_stats.html
@@ -1,6 +1,6 @@
 <table class="sub-menu">
 <tr>
-    <td style="padding: 0 0 34px 0;"></td>
-    <td style="text-align: right;"><input type="text" size="30" style="padding: 2px 80px 3px 0;"> <button> Search </button></td>
+    <td width="142px" style="padding: 28px 0 32px 6px">
+    <td style="text-align: right;"><input type="text" size="30" style="padding: 3px 80px 3px 0;"> <button> Search </button></td>
 </tr>
 </table>
diff --git a/web/templates/admin/menu_user.html b/web/templates/admin/menu_user.html
index 3192fb09..2de7ab49 100644
--- a/web/templates/admin/menu_user.html
+++ b/web/templates/admin/menu_user.html
@@ -1,11 +1,9 @@
 <table class="sub-menu">
 <tr>
-    <td style="padding: 4px 0 10px 0;"><a href="/add/user/" class="add"><img style="padding: 0 4px 0 18px;" src="/images/plus.png" width="12px" height="12px"><b>Add User</a></b></td>
-    <td style="text-align: right;"><input type="text" size="30" style="padding: 2px 80px 3px 0;"> <button> Search </button></td>
-</tr><tr>
-
-    <td style="padding: 0 0 0 18px;"><a style="padding: 0 4px 0 4px" class="select-controls" href='javascript:checkedAll("vstobjects");'> toggle all </a>
-    <select style="margin:0 0 0 80px">
+    <td width="142px" style="padding: 16px 0 16px 6px">
+    <button style="width:120px; padding: 2px 0px 2px 0px;" onclick="location.href='/add/user/'">Add User</button>
+    <td><a style="padding: 0 4px 0 12px" class="select-controls" href='javascript:checkedAll("vstobjects");'> toggle all </a>
+    <select style="margin:0 0 0 0px">
         <option>apply to selected</option>
         <option>rebuild</option>
         <option>update counters</option>
@@ -13,6 +11,9 @@
         <option>unsuspend</option>
         <option>delete</option>
     </select> <button> > </button></td>
+</td>
+    <td style="text-align: right;"><input type="text" size="30" style="padding: 3px 80px 3px 0;"> <button> Search </button></td>
+</tr><tr>
 </tr>
 </table>
 <form id="vstobjects">
diff --git a/web/templates/admin/menu_web.html b/web/templates/admin/menu_web.html
index faa0e980..60b5a127 100644
--- a/web/templates/admin/menu_web.html
+++ b/web/templates/admin/menu_web.html
@@ -1,10 +1,9 @@
 <table class="sub-menu">
 <tr>
-    <td style="padding: 4px 0 10px 0;"><a href="/add/web/" class="add"><img style="padding: 0 4px 0 18px;" src="/images/plus.png" width="12px" height="12px"><b>Add Web Domain</b></a></td>
-    <td style="text-align: right;"><input type="text" size="30" style="padding: 2px 80px 3px 0;"> <button> Search </button></td>
-</tr><tr>
-    <td style="padding: 0 0 0 18px;"><a style="padding: 0 4px 0 4px" class="select-controls" href='javascript:checkedAll("vstobjects");'> toggle all </a>
-    <select style="margin:0 0 0 80px">
+    <td width="142px" style="padding: 16px 0 16px 6px">
+    <button style="width:120px; padding: 2px 0px 2px 0px;" onclick="location.href='/add/web/'">Add Domain</button>
+    <td><a style="padding: 0 4px 0 12px" class="select-controls" href='javascript:checkedAll("vstobjects");'> toggle all </a>
+    <select style="margin:0 0 0 0px">
         <option>apply to selected</option>
         <option>rebuild</option>
         <option>update counters</option>
@@ -12,6 +11,9 @@
         <option>unsuspend</option>
         <option>delete</option>
     </select> <button> > </button></td>
+</td>
+    <td style="text-align: right;"><input type="text" size="30" style="padding: 3px 80px 3px 0;"> <button> Search </button></td>
+</tr><tr>
 </tr>
 </table>
 <form id="vstobjects">
diff --git a/web/templates/header.html b/web/templates/header.html
index 9dafdd07..144b6da7 100644
--- a/web/templates/header.html
+++ b/web/templates/header.html
@@ -27,7 +27,7 @@ if (!empty($_SESSION['look'])) {
 ?>
      }
     .top {
-        background: #574f51;
+        background: #555;
         color: #cce4f0;
         padding: 0 10 0 0;
         margin-left: auto;
@@ -42,12 +42,12 @@ if (!empty($_SESSION['look'])) {
     .top-link {
         font-family: Arial, sans-serif;
         text-decoration: none;
-        color: #dbdbdb;
+        color: #e6e6e6;
      }
 
     .top-link:visited {
         text-decoration: none;
-        color: #dbdbdb;
+        color: #e6e6e6;
      }
 
     .top-link:hover {
@@ -151,7 +151,7 @@ if (!empty($_SESSION['look'])) {
     .nav-link {
         letter-spacing: -1.2px;
         font-size: 16pt;
-        color: #574F51;
+        color: #555;
         font-family: Arial, sans-serif;
         text-decoration: none;
     }
@@ -454,7 +454,7 @@ if (!empty($_SESSION['look'])) {
     .add-name {
         font-family: Arial;
         font-size: 16pt;
-        color: #a3a299;
+        color: #777;
         padding: 0 0 0 28px;
     }