From f16935257a09d78031cff105e38668b85d145b60 Mon Sep 17 00:00:00 2001
From: Serghey Rodin <serghey.rodin@gmail.com>
Date: Sat, 22 Dec 2012 17:06:12 +0200
Subject: [PATCH] show selected tab

---
 web/templates/admin/panel.html | 18 +++++------
 web/templates/header.html      | 58 +++++++++++++++++++---------------
 web/templates/user/panel.html  | 22 ++++++-------
 3 files changed, 51 insertions(+), 47 deletions(-)

diff --git a/web/templates/admin/panel.html b/web/templates/admin/panel.html
index ef359f51..4998543a 100644
--- a/web/templates/admin/panel.html
+++ b/web/templates/admin/panel.html
@@ -17,18 +17,18 @@
                                     </tr>
                                 </table>
                                 <table class="nav">
-                                    <tr id="nav-block">
-                                        <td class="logotd" style="padding: 24px 0px 0px 4px; float: left;">
+                                    <tr>
+                                        <td class="logo">
                                             <img src="/images/logo.png" width="124px" height="46px" alt="Vesta logo">
                                         </td>
-                                        <td>
+                                        <td class="nav-<?php if($TAB == 'USER' ) echo 's' ?>block">
                                             <a class="nav-<?php if($TAB == 'USER' ) echo 's' ?>link" href="/list/user/"><b>USER</b></a>
                                             <p class="counters">
                                                 users: <? echo $panel[$user]['U_USERS'] ?><br>
                                                 suspended: <? echo $panel[$user]['SUSPENDED_USERS']?> 
                                             </p>
                                         </td>
-                                        <td>
+                                        <td class="nav-<?php if($TAB == 'WEB' ) echo 's' ?>block">
                                             <a class="nav-<?php if($TAB == 'WEB' ) echo 's' ?>link" href="/list/web/"><b>WEB</b></a>
                                             <p class="counters">
                                                 domains: <? echo $panel[$user]['U_WEB_DOMAINS']?><br>
@@ -36,7 +36,7 @@
                                                 suspended: <? echo $panel[$user]['SUSPENDED_WEB']?> 
                                             </p>
                                         </td>
-                                        <td>
+                                        <td class="nav-<?php if($TAB == 'DNS' ) echo 's' ?>block">
                                             <a class="nav-<?php if($TAB == 'DNS' ) echo 's' ?>link" href="/list/dns/"><b>DNS</b></a>
                                             <p class="counters">
                                                 domains: <? echo $panel[$user]['U_DNS_DOMAINS']?><br>
@@ -44,7 +44,7 @@
                                                 suspended: <? echo $panel[$user]['SUSPENDED_DNS']?> 
                                             </p>
                                         </td>
-                                        <td>
+                                        <td class="nav-<?php if($TAB == 'MAIL' ) echo 's' ?>block">
                                             <a class="nav-<?php if($TAB == 'MAIL' ) echo 's' ?>link" href="/list/mail/"><b>MAIL</b></a>
                                             <p class="counters">
                                                 domains: <? echo $panel[$user]['U_MAIL_DOMAINS']?><br>
@@ -52,21 +52,21 @@
                                                 suspended: <? echo $panel[$user]['SUSPENDED_MAIL']?> 
                                             </p>
                                         </td>
-                                        <td>
+                                        <td class="nav-<?php if($TAB == 'DB' ) echo 's' ?>block">
                                             <a class="nav-<?php if($TAB == 'DB' ) echo 's' ?>link" href="/list/db/"><b>DB</b></a>
                                             <p class="counters">
                                                 databases: <? echo $panel[$user]['U_DATABASES']?><br>
                                                 suspended: <? echo $panel[$user]['SUSPENDED_DB']?> 
                                             </p>
                                         </td>
-                                        <td>
+                                        <td class="nav-<?php if($TAB == 'CRON' ) echo 's' ?>block">
                                             <a class="nav-<?php if($TAB == 'CRON' ) echo 's' ?>link" href="/list/cron/"><b>CRON</b></a>
                                             <p class="counters">
                                                 jobs: <? echo $panel[$user]['U_CRON_JOBS']?><br>
                                                 suspended: <? echo $panel[$user]['SUSPENDED_CRON']?> 
                                             </p>
                                         </td>
-                                        <td>
+                                        <td class="nav-<?php if($TAB == 'BACKUP' ) echo 's' ?>block">
                                             <a class="nav-<?php if($TAB == 'BACKUP' ) echo 's' ?>link" href="/list/backup/"><b>BACKUP</b></a>
                                             <p class="counters">
                                                 backups: <? echo $panel[$user]['U_BACKUPS']?><br> 
diff --git a/web/templates/header.html b/web/templates/header.html
index be23b3f5..4ba8c35f 100644
--- a/web/templates/header.html
+++ b/web/templates/header.html
@@ -108,45 +108,51 @@
                 border-bottom: 8px solid #F7F6ED;
             }
 
-            .nav td {
-                text-align: left;
+            .logo {
+                width: 147px !important;
+                padding: 0 0 0 4px;
+            }
+
+            .nav-block {
                 vertical-align:top;
                 margin: 0;
-                padding: 0;
-                width: 103px;
-            }
-
-            #nav-block {
-                padding: 0;
-            }
-
-            .logotd{
-                width: 152px !important;
-            }
-
-            .logotd:hover{
-                background: #ebe9dc !important;
-            }
-
-            #nav-block td {
+                text-align: left;
                 display: inline;
                 list-style: none outside none;
                 float: left;
-                padding: 16px 7 2px 8px;
+                padding: 16px 4px 2px 10px;
+                width: 102px;
                 line-height: 1.0em;
                 font-size: 9pt;
                 font-family: Arial, sans-serif;
                 color: #2d2d2d;
-                background: url(/images/transparent-image.png) no-repeat;
+                border-left:1px dotted #ebe9dc;
+                border-right:1px dotted #ebe9dc;
             }
 
-            #nav-block td:hover {
+            .nav-block:hover {
                 background: #fafafa;
-                color: black;
+                border-left:1px dotted #ccc;
+                border-right:1px dotted #ccc;
             }
 
-            .nav-active{
-                background: #fafafa !important;
+            .nav-sblock {
+                vertical-align:top;
+                margin: 0;
+                text-align: left;
+                display: inline;
+                list-style: none outside none;
+                float: left;
+                padding: 16px 4px 2px 10px;
+                width: 102px;
+                line-height: 1.0em;
+                font-size: 9pt;
+                font-family: Arial, sans-serif;
+                color: #2d2d2d;
+                background: #fafafa;
+                border-left:1px dotted #fafafa;
+                border-right:1px dotted #fafafa;
+
             }
 
             .nav-link {
@@ -171,7 +177,7 @@
             .nav-slink {
                 letter-spacing: -1.0px;
                 font-size: 16pt;
-                color: #58a3ca;
+                color: #7fa1cb;
                 font-family: Arial, sans-serif;
                 text-decoration: none;
             }
diff --git a/web/templates/user/panel.html b/web/templates/user/panel.html
index 9eeb1f7d..f381630c 100644
--- a/web/templates/user/panel.html
+++ b/web/templates/user/panel.html
@@ -17,19 +17,17 @@
                                     </tr>
                                 </table>
                                 <table class="nav">
-                                    <tr id="nav-block">
-                                        <td class="logotd" style="padding: 24px 0px 0px 4px; float: left;">
+                                        <td class="logo">
                                             <img src="/images/logo.png" width="124px" height="46px" alt="Vesta logo">
                                         </td>
-                                        <td>
+                                        <td class="nav-<?php if($TAB == 'USER' ) echo 's' ?>block">
                                             <a class="nav-<?php if($TAB == 'USER' ) echo 's' ?>link" href="/list/user/"><b>USER</b></a>
                                             <p class="counters">
-                                                disk: <? echo humanize_usage($panel[$user]['U_DISK']) ?> <br>
-                                                traffic: <? echo humanize_usage($panel[$user]['U_BANDWIDTH']) ?><br>
-                                                suspended: <? echo $panel[$user]['SUSPENDED']?> 
+                                                users: <? echo $panel[$user]['U_USERS'] ?><br>
+                                                suspended: <? echo $panel[$user]['SUSPENDED_USERS']?> 
                                             </p>
                                         </td>
-                                        <td>
+                                        <td class="nav-<?php if($TAB == 'WEB' ) echo 's' ?>block">
                                             <a class="nav-<?php if($TAB == 'WEB' ) echo 's' ?>link" href="/list/web/"><b>WEB</b></a>
                                             <p class="counters">
                                                 domains: <? echo $panel[$user]['U_WEB_DOMAINS']?><br>
@@ -37,7 +35,7 @@
                                                 suspended: <? echo $panel[$user]['SUSPENDED_WEB']?> 
                                             </p>
                                         </td>
-                                        <td>
+                                        <td class="nav-<?php if($TAB == 'DNS' ) echo 's' ?>block">
                                             <a class="nav-<?php if($TAB == 'DNS' ) echo 's' ?>link" href="/list/dns/"><b>DNS</b></a>
                                             <p class="counters">
                                                 domains: <? echo $panel[$user]['U_DNS_DOMAINS']?><br>
@@ -45,7 +43,7 @@
                                                 suspended: <? echo $panel[$user]['SUSPENDED_DNS']?> 
                                             </p>
                                         </td>
-                                        <td>
+                                        <td class="nav-<?php if($TAB == 'MAIL' ) echo 's' ?>block">
                                             <a class="nav-<?php if($TAB == 'MAIL' ) echo 's' ?>link" href="/list/mail/"><b>MAIL</b></a>
                                             <p class="counters">
                                                 domains: <? echo $panel[$user]['U_MAIL_DOMAINS']?><br>
@@ -53,21 +51,21 @@
                                                 suspended: <? echo $panel[$user]['SUSPENDED_MAIL']?> 
                                             </p>
                                         </td>
-                                        <td>
+                                        <td class="nav-<?php if($TAB == 'DB' ) echo 's' ?>block">
                                             <a class="nav-<?php if($TAB == 'DB' ) echo 's' ?>link" href="/list/db/"><b>DB</b></a>
                                             <p class="counters">
                                                 databases: <? echo $panel[$user]['U_DATABASES']?><br>
                                                 suspended: <? echo $panel[$user]['SUSPENDED_DB']?> 
                                             </p>
                                         </td>
-                                        <td>
+                                        <td class="nav-<?php if($TAB == 'CRON' ) echo 's' ?>block">
                                             <a class="nav-<?php if($TAB == 'CRON' ) echo 's' ?>link" href="/list/cron/"><b>CRON</b></a>
                                             <p class="counters">
                                                 jobs: <? echo $panel[$user]['U_CRON_JOBS']?><br>
                                                 suspended: <? echo $panel[$user]['SUSPENDED_CRON']?> 
                                             </p>
                                         </td>
-                                        <td>
+                                        <td class="nav-<?php if($TAB == 'BACKUP' ) echo 's' ?>block">
                                             <a class="nav-<?php if($TAB == 'BACKUP' ) echo 's' ?>link" href="/list/backup/"><b>BACKUP</b></a>
                                             <p class="counters">
                                                 backups: <? echo $panel[$user]['U_BACKUPS']?><br>