From e7f7371efd950282157a6b30a81743bb1493f229 Mon Sep 17 00:00:00 2001
From: Serghey Rodin <serghey.rodin@gmail.com>
Date: Mon, 21 May 2012 15:29:08 +0300
Subject: [PATCH] design corrections

---
 web/css/jquery-custom-dialogs.css      | 2 +-
 web/templates/admin/list_backup.html   | 2 +-
 web/templates/admin/list_cron.html     | 2 +-
 web/templates/admin/list_db.html       | 2 +-
 web/templates/admin/list_dns.html      | 2 +-
 web/templates/admin/list_dns_rec.html  | 2 +-
 web/templates/admin/list_ip.html       | 2 +-
 web/templates/admin/list_log.html      | 2 +-
 web/templates/admin/list_mail.html     | 2 +-
 web/templates/admin/list_mail_acc.html | 2 +-
 web/templates/admin/list_user.html     | 4 ++--
 web/templates/admin/list_web.html      | 2 +-
 web/templates/admin/menu_user.html     | 7 +------
 web/templates/admin/panel.html         | 5 ++---
 web/templates/header.html              | 4 ++--
 15 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/web/css/jquery-custom-dialogs.css b/web/css/jquery-custom-dialogs.css
index d35e06ab4..1a8712d90 100644
--- a/web/css/jquery-custom-dialogs.css
+++ b/web/css/jquery-custom-dialogs.css
@@ -417,7 +417,7 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad
  */
 .ui-dialog { position: absolute; padding: .2em; width: 300px; overflow: hidden; }
 .ui-dialog .ui-dialog-titlebar { padding: .4em 10pt; position: relative;  }
-.ui-dialog .ui-dialog-title { float: left; margin: .10pt 16px .10pt 0;  font-family: Georgia; font-style: italic;} 
+.ui-dialog .ui-dialog-title { float: left; margin: .10pt 16px .10pt 0;  font-family: Georgia; font-style: italic; color: #c69c6d;} 
 .ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; }
 .ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; }
 .ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; }
diff --git a/web/templates/admin/list_backup.html b/web/templates/admin/list_backup.html
index 404e562dc..ba22df020 100644
--- a/web/templates/admin/list_backup.html
+++ b/web/templates/admin/list_backup.html
@@ -74,6 +74,6 @@ foreach ($data as $key => $value) {
             echo "$i backup archives ";
         }
     ?>
-    listed</i></td>
+    </i></td>
 </tr>
 </table>
diff --git a/web/templates/admin/list_cron.html b/web/templates/admin/list_cron.html
index 9263c1db8..cde780a2d 100644
--- a/web/templates/admin/list_cron.html
+++ b/web/templates/admin/list_cron.html
@@ -91,6 +91,6 @@ foreach ($data as $key => $value) {
             echo "$i cron jobs ";
         }
     ?>
-    listed</i></td>
+    </i></td>
 </tr>
 </table>
diff --git a/web/templates/admin/list_db.html b/web/templates/admin/list_db.html
index d3d191085..782705bf7 100644
--- a/web/templates/admin/list_db.html
+++ b/web/templates/admin/list_db.html
@@ -75,6 +75,6 @@ foreach ($data as $key => $value) {
             echo "$i databases ";
         }
     ?>
-    listed</i></td>
+    </i></td>
 </tr>
 </table>
diff --git a/web/templates/admin/list_dns.html b/web/templates/admin/list_dns.html
index afd06c454..763c4c83c 100644
--- a/web/templates/admin/list_dns.html
+++ b/web/templates/admin/list_dns.html
@@ -72,6 +72,6 @@ foreach ($data as $key => $value) {
             echo "$i dns domains ";
         }
     ?>
-    listed</i></td>
+    </i></td>
 </tr>
 </table>
diff --git a/web/templates/admin/list_dns_rec.html b/web/templates/admin/list_dns_rec.html
index b1a1f4851..d080ab5a7 100644
--- a/web/templates/admin/list_dns_rec.html
+++ b/web/templates/admin/list_dns_rec.html
@@ -55,6 +55,6 @@ foreach ($data as $key => $value) {
             echo "$i dns records ";
         }
     ?>
-    listed</i></td>
+    </i></td>
 </tr>
 </table>
diff --git a/web/templates/admin/list_ip.html b/web/templates/admin/list_ip.html
index 2c5446d8a..3b011c8d4 100644
--- a/web/templates/admin/list_ip.html
+++ b/web/templates/admin/list_ip.html
@@ -60,6 +60,6 @@ foreach ($data as $key => $value) {
             echo "$i ip addresses ";
         }
     ?>
-    listed</i></td>
+    </i></td>
 </tr>
 </table>
diff --git a/web/templates/admin/list_log.html b/web/templates/admin/list_log.html
index 16d3cee37..eb6e35233 100644
--- a/web/templates/admin/list_log.html
+++ b/web/templates/admin/list_log.html
@@ -41,6 +41,6 @@ foreach ($data as $key => $value) {
             echo "$i log records ";
         }
     ?>
-    listed</i></td>
+    </i></td>
 </tr>
 </table>
diff --git a/web/templates/admin/list_mail.html b/web/templates/admin/list_mail.html
index 0718c71f9..c98962887 100644
--- a/web/templates/admin/list_mail.html
+++ b/web/templates/admin/list_mail.html
@@ -78,6 +78,6 @@ foreach ($data as $key => $value) {
             echo "$i mail domains ";
         }
     ?>
-    listed</i></td>
+    </i></td>
 </tr>
 </table>
diff --git a/web/templates/admin/list_mail_acc.html b/web/templates/admin/list_mail_acc.html
index 20394bbc5..4fa31fde6 100644
--- a/web/templates/admin/list_mail_acc.html
+++ b/web/templates/admin/list_mail_acc.html
@@ -70,5 +70,5 @@ foreach ($data as $key => $value) {
             echo "$i mail accounts ";
         }
     ?>
-    listed</i></td>
+    </i></td>
 </tr>
diff --git a/web/templates/admin/list_user.html b/web/templates/admin/list_user.html
index 2ed65ef2f..5ac160822 100644
--- a/web/templates/admin/list_user.html
+++ b/web/templates/admin/list_user.html
@@ -83,7 +83,7 @@ foreach ($data as $key => $value) {
                                 });
                             </script>
                             <div id="dialog-message" title="Wellcome">
-                                <p>Your have logged in as <span style="color: #34536A;"><b><?php echo "$key" ?></b></span> user.</p>
+                                <p>You have logged in as user <?php echo "$key" ?>.</p>
                             </div>
                             <?php
                             unset($_SESSION['look_alert']);
@@ -188,6 +188,6 @@ foreach ($data as $key => $value) {
             echo "$i user accounts ";
         }
     ?>
-    listed</i></td>
+    </i></td>
 </tr>
 </table>
diff --git a/web/templates/admin/list_web.html b/web/templates/admin/list_web.html
index 539f3f870..403a83d24 100644
--- a/web/templates/admin/list_web.html
+++ b/web/templates/admin/list_web.html
@@ -80,6 +80,6 @@ foreach ($data as $key => $value) {
             echo "$i web domains ";
         }
     ?>
-    listed</i></td>
+    </i></td>
 </tr>
 </table>
diff --git a/web/templates/admin/menu_user.html b/web/templates/admin/menu_user.html
index 1f053dd70..d7b5162e7 100644
--- a/web/templates/admin/menu_user.html
+++ b/web/templates/admin/menu_user.html
@@ -6,12 +6,7 @@
     <td style="padding: 0 0 0 18px;"><input type="checkbox" onclick="checkAll(this)"> <a style="padding: 0 4px 0 2px"> toggle all</a>
     <select style="margin:0 0 0 8px">
         <option>apply to selected</option>
-        <option>rebuild user</option>
-        <option>rebuild web</option>
-        <option>rebuild dns</option>
-        <option>rebuild mail</option>
-        <option>rebuild db</option>
-        <option>rebuild cron</option>
+        <option>rebuild</option>
         <option>update counters</option>
         <option>suspend</option>
         <option>unsuspend</option>
diff --git a/web/templates/admin/panel.html b/web/templates/admin/panel.html
index 2a2d38ff6..a037b0206 100644
--- a/web/templates/admin/panel.html
+++ b/web/templates/admin/panel.html
@@ -1,8 +1,7 @@
 <table class="main"><tr><td>
 <table class="top">
 <tr>
-    <td width="192px"><p class="hostname"><?php echo exec('hostname') ?></p></td>
-    <td><a class="top-<?php if($TAB == 'PACKAGES' ) echo 's' ?>link" href="/list/packages/">Packages</a></td>
+    <td width="154px"><p class="hostname"><?php echo exec('hostname') ?></p></td>
     <td><a class="top-<?php if($TAB == 'IP' ) echo 's' ?>link" href="/list/ip/">IP Adresses </a></td>
     <td><a class="top-<?php if($TAB == 'RRD' ) echo 's' ?>link" href="/list/rrd/">RRD Graphics</a></td>
     <td><a class="top-<?php if($TAB == 'STATS' ) echo 's' ?>link" href="/list/stats/">Statistics</a></td>
@@ -40,7 +39,7 @@
             jobs: <? echo $panel[$user]['U_CRON_JOBS']?><br>
             suspended: <? echo $panel[$user]['SUSPENDED_CRON']?></p></li>
         <li><b><a class="nav-<?php if($TAB == 'BACKUP' ) echo 's' ?>link" href="/list/backup/">BACKUP</a></a></b><p class="counters">
-            available: <? echo $panel[$user]['U_BACKUPS']?><br>
+            backups: <? echo $panel[$user]['U_BACKUPS']?><br>
     <ul></div></td>
 </tr>
 </table>
diff --git a/web/templates/header.html b/web/templates/header.html
index 08c66971c..2187de37d 100644
--- a/web/templates/header.html
+++ b/web/templates/header.html
@@ -331,11 +331,11 @@ if (!empty($_SESSION['look'])) {
 
     .data-count {
         background: #EBE9DC;
-        color: #5C4D45;
+        color: #c69c6d;
         font-size:18 pt;
         font-family: Georgia;
         margin: 22px 0 0 0;
-        padding: 0 12px 0 162px;
+        padding: 0 12px 0 163px;
     }
 
     .chart1 {