merged headers for login and reset forms

web/login/index.php

@@ -5,6 +5,8 @@ if (isset($_GET['logout'])) {
     session_destroy();
 }
 
+$TAB = 'LOGIN';
+
 if (isset($_SESSION['user'])) {
     if ($_SESSION['user'] ==  'admin' && !empty($_GET['loginas'])) {
         if ($_GET['loginas'] == 'admin') {
@@ -38,6 +40,7 @@ if (isset($_SESSION['user'])) {
             }
         }
     }
+    require_once '../templates/header.html';
     require_once '../templates/login.html';
 }
 ?>

web/reset/index.php

@@ -1,6 +1,6 @@
 <?php
 session_start();
-
+$TAB = 'RESET PASSWORD';
 // 
 function send_email($to,$subject,$mailtext,$from) {
     $charset = "utf-8";
@@ -85,6 +85,7 @@ if ((!empty($_POST['user'])) && (!empty($_POST['code'])) && (!empty($_POST['pass
     }
 }
 
+require_once '../templates/header.html';
 if (empty($_GET['action'])) {
     require_once '../templates/reset_1.html';
 } else {

web/templates/admin/add_cron.html

@@ -1,3 +1,4 @@
+
                                 <?php
                                     $back = $_SESSION['back'];
                                     if (empty($back)) {

web/templates/admin/add_db.html

@@ -1,3 +1,4 @@
+
                                 <?php
                                     $back = $_SESSION['back'];
                                     if (empty($back)) {

web/templates/admin/add_dns.html

@@ -1,3 +1,4 @@
+
                                 <?php
                                     $back = $_SESSION['back'];
                                     if (empty($back)) {

web/templates/admin/add_dns_rec.html

@@ -1,3 +1,4 @@
+
                                 <?php
                                     $back = $_SESSION['back'];
                                     if (empty($back)) {

web/templates/admin/add_ip.html

@@ -1,3 +1,4 @@
+
                                 <?php
                                     $back = $_SESSION['back'];
                                     if (empty($back)) {

web/templates/admin/add_mail.html

@@ -1,3 +1,4 @@
+
                                 <?php
                                     $back = $_SESSION['back'];
                                     if (empty($back)) {

web/templates/admin/add_mail_acc.html

@@ -1,3 +1,4 @@
+
                                 <?php
                                     $back = $_SESSION['back'];
                                     if (empty($back)) {

web/templates/admin/add_package.html

@@ -1,3 +1,4 @@
+
                                 <?php
                                     $back = $_SESSION['back'];
                                     if (empty($back)) {

web/templates/admin/add_user.html

@@ -1,3 +1,4 @@
+
                                 <?php
                                     $back = $_SESSION['back'];
                                     if (empty($back)) {

web/templates/admin/add_web.html

@@ -1,3 +1,4 @@
+
                                 <?php
                                     $back = $_SESSION['back'];
                                     if (empty($back)) {

web/templates/admin/edit_cron.html

@@ -1,3 +1,4 @@
+
                                 <?php
                                     $back = $_SESSION['back'];
                                     if (empty($back)) {

web/templates/admin/panel.html

@@ -1,3 +1,10 @@
+    <center>
+        <table class="main">
+            <tr>
+                <td>
+                    <table class="fixed" >
+                        <tr>
+                            <td>
                                 <table class="top">
                                     <tr>
                                         <td width="179px"></td>

web/templates/header.html

@@ -657,6 +657,49 @@
                 min-height: 370px;
             }
 
+            .login {
+                font-family: Arial, sans-serif;
+                margin: 80px 0 80px 0;
+                padding: 0;
+                border-top: 1px solid #cccccc;
+                border-left: 1px solid #cccccc;
+                border-right: 1px solid #cccccc;
+                background: #ebe9dc;
+                text-align: left;
+                vertical-align:top;
+                width: 500px;
+                box-shadow: 0 0 2px 2px #d7d7d7;
+            }
+
+            .login-box {
+                text-align: left;
+                vertical-align:top;
+                padding: 0 0 10px 40px;
+                color: #333;
+            }
+
+            .login-bottom {
+                color: #574F51;
+                text-align: right;
+                width: 500px;
+                height: 50px;
+                background: #484243;
+                padding: 0 8px 0 0;
+                margin: 0;
+            }
+
+            .vestacp{
+                font-size: 8pt;
+                color: #CCCCB4;
+                text-align: right;
+                padding: 20px 0 0 0;
+            }
+
+            .error {
+                font-size: 10pt;
+                color: #DE6C5D;
+            }
+
         </style>
         <!--[if IE]>
             <style type="text/css">
@@ -725,10 +768,3 @@
         </script>
     </head>
     <body>
-    <center>
-        <table class="main">
-            <tr>
-                <td>
-                    <table class="fixed" >
-                        <tr>
-                            <td>

web/templates/login.html

@@ -1,131 +1,3 @@
-<html>
-    <head>
-        <link rel="icon" href="/images/favicon.ico" type="image/x-icon">
-        <title> Vesta - Login </title>
-        <style type="text/css">
-            body {
-                padding: 0;
-                margin: 0;
-                margin-left: auto;
-                margin-right: auto;
-                background-image: url(/images/b.png);
-                font-family: Arial, sans-serif;
-            }
-
-            .forgot {
-                color: #34536A;
-                font-family: Arial, sans-serif;
-                font-size: 8pt;
-                padding: 0 10px 0 0;
-            }
-
-            .forgot:hover {
-                color: #7fa1cb;
-            }
-
-            .login {
-                margin: 80px 0 80px 0;
-                padding: 0;
-                border-top: 1px solid #cccccc;
-                border-left: 1px solid #cccccc;
-                border-right: 1px solid #cccccc;
-                background: #ebe9dc;
-                text-align: left;
-                vertical-align:top;
-                width: 500px;
-                box-shadow: 0 0 2px 2px #d7d7d7;
-            }
-        
-            .login-box {
-                text-align: left;
-                vertical-align:top;
-                padding: 0 0 10px 40px;
-                color: #333;
-            }
-
-            .login-text1 {
-                padding: 10px 0 0 2px;
-                color: #433832;
-                font-family: Arial, sans-serif;
-                font-size: 12pt;
-            }
-
-            .login-text1 a {
-                padding: 0 6px;
-                font-family: Arial, sans-serif;
-                font-size: 10pt;
-                text-shadow: none;
-            }
-
-            .login-text2 {
-                padding: 12px 0 10px 0;
-                color: #484243;
-            }
-        
-            .login-bottom {
-                color: #574F51;
-                text-align: right;
-                width: 500px;
-                height: 50px;
-                background: #484243;
-                padding: 0 8px 0 0;
-                margin: 0;
-            }
-
-            .vestacp{
-                font-size: 8pt;
-                color: #CCCCB4;
-                text-align: right;
-                padding: 20px 0 0 0;
-            }
-
-            .error {
-                font-size: 10pt;
-                color: #DE6C5D;
-            }
-
-
-            .login-input {
-                color: #555;
-                background-color: #FFFFFF;
-                border: 1px solid #999999;
-                border-radius: 3px 3px 3px 3px;
-                color: #555555;
-                font-family: Arial,sans-serif;
-                font-size: 14pt;
-                padding: 6px;
-                width: 360px;
-                height: 36px;
-            }
-
-            .login-input:hover {
-                border: 1px solid #e5a907;
-            }
-
-            .login-button {
-                filter:chroma(color=#000000);
-                padding: 4px;
-                margin: 0 6px 0 0;
-                cursor: pointer;
-                color: #333333;
-                background-color: #f6f6f6;
-                border: 1px solid #ACACAC;
-                border-radius: 3px 3px 3px 3px;
-                font-size: 12px;
-                padding: 3px 16px;
-                width: 105px;
-            }
-
-            .login-button:hover {
-                background-color: #f0f0f0;
-            }
-
-            .login-button:active {
-                background-color: #EBE9DC;
-            }
-        </style>
-    </head>
-    <body>
         <center>
             <table class="login">
                 <tr>
@@ -139,23 +11,23 @@
                                     <form method="post" action="/login/" >
                                     <table class="login-box">
                                         <tr>
-                                            <td>
-                                                <p class="login-text1">Username</p>
+                                            <td style="padding: 12px 0 0 2px;">
+                                                Username
                                             </td>
                                         </tr>
                                         <tr>
                                             <td>
-                                                <input tabindex="1" type="text" size="20px" style="width:200px;" name="user" class="login-input">
+                                                <input tabindex="1" type="text" size="20px" style="width:200px;" name="user" class="add-input">
                                             </td>
                                         </tr>
                                         <tr>
-                                            <td>
-                                                <p class="login-text1">Password <a tabindex="5" class="forgot" href="/reset/" >forgot password</a></p>
+                                            <td style="padding: 12px 0 0 2px;">
+                                                Password <a tabindex="5" class="genpass" href="/reset/" style="padding: 0 0 0 14px;" >forgot password</a>
                                             </td>
                                         </tr>
                                         <tr>
                                             <td>
-                                                <input tabindex="2" type="password" size="20px"  style="width:200px;" name="password" class="login-input">
+                                                <input tabindex="2" type="password" size="20px"  style="width:200px;" name="password" class="add-input">
                                             </td>
                                         </tr>
                                         <tr>
@@ -163,8 +35,8 @@
                                             </td>
                                         </tr>
                                         <tr>
-                                            <td>
-                                                <input tabindex="3" type="submit" value="Log In" class="login-button">
+                                            <td style="padding: 0 0 12px 0;">
+                                                <input tabindex="3" type="submit" value="Log In" class="button">
                                             </td>
                                         </tr>
                                     </table>

web/templates/reset_1.html

@@ -1,130 +1,3 @@
-<html>
-    <head>
-        <link rel="icon" href="/images/favicon.ico" type="image/x-icon">
-        <title> Vesta - Reset Password </title>
-        <style type="text/css">
-            body {
-                padding: 0;
-                margin: 0;
-                margin-left: auto;
-                margin-right: auto;
-                background-image: url(/images/b.png);
-                font-family: Arial, sans-serif;
-            }
-
-            .forgot {
-                color: #484243;
-                font-family: Arial, sans-serif;
-                font-size: 8pt;
-                padding: 0 10px 0 0;
-            }
-
-            .forgot:hover {
-                color: #7fa1cb;
-            }
-
-            .login {
-                margin: 80px 0 80px 0;
-                padding: 0;
-                border-top: 1px solid #cccccc;
-                border-left: 1px solid #cccccc;
-                border-right: 1px solid #cccccc;
-                background: #ebe9dc;
-                text-align: left;
-                vertical-align:top;
-                width: 500px;
-                box-shadow: 0 0 2px 2px #d7d7d7;
-            }
-
-            .login-box {
-                text-align: left;
-                vertical-align:top;
-                padding: 0 0 10px 40px;
-                color: #333;
-            }
-
-            .login-text1 {
-                padding: 10px 0 0 2px;
-                color: #433832;
-                font-family: Arial, sans-serif;
-                font-size: 12pt;
-            }
-
-            .login-text1 a {
-                padding: 0 6px;
-                font-family: Arial, sans-serif;
-                font-size: 10pt;
-                text-shadow: none;
-            }
-
-            .login-text2 {
-                padding: 12px 0 10px 0;
-                color: #484243;
-            }
-
-            .login-bottom {
-                color: #574F51;
-                text-align: right;
-                width: 500px;
-                height: 50px;
-                background: #484243;
-                padding: 0 8px 0 0;
-                margin: 0;
-            }
-
-            .vestacp{
-                font-size: 8pt;
-                color: #CCCCB4;
-                text-align: right;
-                padding: 20px 0 0 0;
-            }
-
-            .error {
-                font-size: 10pt;
-                color: #DE6C5D;
-            }
-
-            .login-input {
-                color: #555;
-                background-color: #FFFFFF;
-                border: 1px solid #999999;
-                border-radius: 3px 3px 3px 3px;
-                color: #555555;
-                font-family: Arial,sans-serif;
-                font-size: 14pt;
-                padding: 4px;
-                width: 360px;
-                height: 36px;
-            }
-
-            .login-input:hover {
-                border: 1px solid #e5a907;
-            }
-
-            .login-button {
-                filter:chroma(color=#000000);
-                padding: 4px;
-                margin: 0 6px 0 0;
-                cursor: pointer;
-                color: #333333;
-                background-color: #f6f6f6;
-                border: 1px solid #ACACAC;
-                border-radius: 3px 3px 3px 3px;
-                font-size: 12px;
-                padding: 3px 16px;
-                width: 105px;
-            }
-
-            .login-button:hover {
-                background-color: #f0f0f0;
-            }
-
-            .login-button:active {
-                background-color: #EBE9DC;
-            }
-        </style>
-    </head>
-    <body>
         <center>
             <table class="login">
                 <tr>
@@ -138,23 +11,23 @@
                                     <form method="post" action="/reset/" >
                                         <table class="login-box">
                                             <tr>
-                                            <td style="padding: 6px 0 4px 0;">
+                                            <td style="padding: 12px 0 0 2px;">
                                                 To reset your password, enter your username and we'll send you instructions on how to create a new password.
                                             </td>
                                             </tr>
                                             <tr>
-                                                <td>
-                                                    <p class="login-text1">Username</p>
+                                                <td style="padding: 12px 0 0 2px;">
+                                                    Username
                                                 </td>
                                             </tr>
                                             <tr>
                                                 <td>
-                                                    <input tabindex="1" type="text" size="20px" style="width:200px" name="user" class="login-input">
+                                                    <input tabindex="1" type="text" size="20px" style="width:200px" name="user" class="add-input">
                                                 </td>
                                             </tr>
                                             <tr>
-                                                <td style="padding: 20px 0 0 0;">
-                                                    <input tabindex="2" type="submit" value="Submit" class="login-button">
+                                                <td style="padding: 20px 0 12px 0;">
+                                                    <input tabindex="2" type="submit" value="Submit" class="button">
                                                 </td>
                                             </tr>
                                         </table>

web/templates/reset_2.html

@@ -1,130 +1,3 @@
-<html>
-    <head>
-        <link rel="icon" href="/images/favicon.ico" type="image/x-icon">
-        <title> Vesta - Reset Password </title>
-        <style type="text/css">
-            body {
-                padding: 0;
-                margin: 0;
-                margin-left: auto;
-                margin-right: auto;
-                background-image: url(/images/b.png);
-                font-family: Arial, sans-serif;
-            }
-
-            .forgot {
-                color: #484243;
-                font-family: Arial, sans-serif;
-                font-size: 8pt;
-                padding: 0 10px 0 0;
-            }
-
-            .forgot:hover {
-                color: #7fa1cb;
-            }
-
-            .login {
-                margin: 80px 0 80px 0;
-                padding: 0;
-                border-top: 1px solid #cccccc;
-                border-left: 1px solid #cccccc;
-                border-right: 1px solid #cccccc;
-                background: #ebe9dc;
-                text-align: left;
-                vertical-align:top;
-                width: 500px;
-                box-shadow: 0 0 2px 2px #d7d7d7;
-            }
-
-            .login-box {
-                text-align: left;
-                vertical-align:top;
-                padding: 0 0 10px 40px;
-                color: #333;
-            }
-
-            .login-text1 {
-                padding: 10px 0 0 2px;
-                color: #433832;
-                font-family: Arial, sans-serif;
-                font-size: 12pt;
-            }
-
-            .login-text1 a {
-                padding: 0 6px;
-                font-family: Arial, sans-serif;
-                font-size: 10pt;
-                text-shadow: none;
-            }
-
-            .login-text2 {
-                padding: 12px 0 10px 0;
-                color: #484243;
-            }
-
-            .login-bottom {
-                color: #574F51;
-                text-align: right;
-                width: 500px;
-                height: 50px;
-                background: #484243;
-                padding: 0 8px 0 0;
-                margin: 0;
-            }
-
-            .vestacp{
-                font-size: 8pt;
-                color: #CCCCB4;
-                text-align: right;
-                padding: 20px 0 0 0;
-            }
-
-            .error {
-                font-size: 10pt;
-                color: #DE6C5D;
-            }
-
-            .login-input {
-                color: #555;
-                background-color: #FFFFFF;
-                border: 1px solid #999999;
-                border-radius: 3px 3px 3px 3px;
-                color: #555555;
-                font-family: Arial,sans-serif;
-                font-size: 14pt;
-                padding: 4px;
-                width: 360px;
-                height: 36px;
-            }
-
-            .login-input:hover {
-                border: 1px solid #e5a907;
-            }
-
-            .login-button {
-                filter:chroma(color=#000000);
-                padding: 4px;
-                margin: 0 6px 0 0;
-                cursor: pointer;
-                color: #333333;
-                background-color: #f6f6f6;
-                border: 1px solid #ACACAC;
-                border-radius: 3px 3px 3px 3px;
-                font-size: 12px;
-                padding: 3px 16px;
-                width: 105px;
-            }
-
-            .login-button:hover {
-                background-color: #f0f0f0;
-            }
-
-            .login-button:active {
-                background-color: #EBE9DC;
-            }
-        </style>
-    </head>
-    <body>
         <center>
             <table class="login">
                 <tr>
@@ -138,24 +11,24 @@
                                     <form method="get" action="/reset/" >
                                         <table class="login-box">
                                             <tr>
-                                                <td style="padding: 6px 0 4px 0;">
+                                                <td style="padding: 12px 0 0 2px;">
                                                     Reset code has been sent to your email address.
                                                      Please copy and paste that code in the verification box below.
                                                 </td>
                                             </tr>
                                             <tr>
-                                                <td><p class="login-text1">Reset Code</p></td>
+                                                <td style="padding: 12px 0 0 2px;">Reset Code</td>
                                             </tr>
                                             <tr>
                                                 <td>
                                                     <input type="hidden" name="action" value="confirm">
                                                     <input type="hidden" name="user" value="<?php echo $_GET['user'];?>">
-                                                    <input tabindex="1" type="text" size="20px" style="width:200px" name="code" class="login-input">
+                                                    <input tabindex="1" type="text" size="20px" style="width:200px" name="code" class="add-input">
                                                 </td>
                                             </tr>
                                             <tr>
-                                                <td style="padding: 20px 0 0 0;">
-                                                    <input tabindex="2" type="submit" value="Confirm" class="login-button">
+                                                <td style="padding: 20px 0 12px 0;">
+                                                    <input tabindex="2" type="submit" value="Confirm" class="button">
                                                 </td>
                                             </tr>
                                         </table>

web/templates/reset_3.html

@@ -1,130 +1,3 @@
-<html>
-    <head>
-        <link rel="icon" href="/images/favicon.ico" type="image/x-icon">
-        <title> Vesta - Reset Password </title>
-        <style type="text/css">
-            body {
-                padding: 0;
-                margin: 0;
-                margin-left: auto;
-                margin-right: auto;
-                background-image: url(/images/b.png);
-                font-family: Arial, sans-serif;
-            }
-
-            .forgot {
-                color: #484243;
-                font-family: Arial, sans-serif;
-                font-size: 8pt;
-                padding: 0 10px 0 0;
-            }
-
-            .forgot:hover {
-                color: #7fa1cb;
-            }
-
-            .login {
-                margin: 80px 0 80px 0;
-                padding: 0;
-                border-top: 1px solid #cccccc;
-                border-left: 1px solid #cccccc;
-                border-right: 1px solid #cccccc;
-                background: #ebe9dc;
-                text-align: left;
-                vertical-align:top;
-                width: 500px;
-                box-shadow: 0 0 2px 2px #d7d7d7;
-            }
-
-            .login-box {
-                text-align: left;
-                vertical-align:top;
-                padding: 0 0 10px 40px;
-                color: #333;
-            }
-
-            .login-text1 {
-                padding: 10px 0 0 2px;
-                color: #433832;
-                font-family: Arial, sans-serif;
-                font-size: 12pt;
-            }
-
-            .login-text1 a {
-                padding: 0 6px;
-                font-family: Arial, sans-serif;
-                font-size: 10pt;
-                text-shadow: none;
-            }
-
-            .login-text2 {
-                padding: 12px 0 10px 0;
-                color: #484243;
-            }
-
-            .login-bottom {
-                color: #574F51;
-                text-align: right;
-                width: 500px;
-                height: 50px;
-                background: #484243;
-                padding: 0 8px 0 0;
-                margin: 0;
-            }
-
-            .vestacp{
-                font-size: 8pt;
-                color: #CCCCB4;
-                text-align: right;
-                padding: 20px 0 0 0;
-            }
-
-            .error {
-                font-size: 10pt;
-                color: #DE6C5D;
-            }
-
-            .login-input {
-                color: #555;
-                background-color: #FFFFFF;
-                border: 1px solid #999999;
-                border-radius: 3px 3px 3px 3px;
-                color: #555555;
-                font-family: Arial,sans-serif;
-                font-size: 14pt;
-                padding: 4px;
-                width: 360px;
-                height: 36px;
-            }
-
-            .login-input:hover {
-                border: 1px solid #e5a907;
-            }
-
-            .login-button {
-                filter:chroma(color=#000000);
-                padding: 4px;
-                margin: 0 6px 0 0;
-                cursor: pointer;
-                color: #333333;
-                background-color: #f6f6f6;
-                border: 1px solid #ACACAC;
-                border-radius: 3px 3px 3px 3px;
-                font-size: 12px;
-                padding: 3px 16px;
-                width: 105px;
-            }
-
-            .login-button:hover {
-                background-color: #f0f0f0;
-            }
-
-            .login-button:active {
-                background-color: #EBE9DC;
-            }
-        </style>
-    </head>
-    <body>
         <center>
             <table class="login">
                 <tr>
@@ -134,32 +7,30 @@
                                 <td style="padding: 0 10 0 42;">
                                     <a href="/"><img border=0 src="/images/logo.png" width="124px" height="46px" alt="Vesta Control Panel" /></a>
                                 </td>
-                                <td style="padding: 4px 0 0 0;">
+                                <td style="padding: 20px 0 0 0;">
                                     <form method="post">
                                         <table class="login-box">
                                             <tr>
-                                                <td>
-                                                    <input type="hidden" name="action" value="confirm">
-                                                    <input type="hidden" name="user" value="<?php echo $_GET['user'];?>">
-                                                    <input type="hidden" name="code" value="<?php echo $_GET['code'];?>">
-                                                    <p class="login-text1">New Password</p>
+                                                <td style="padding: 12px 0 0 2px;">
+                                                    <input type="hidden" name="action" value="confirm" >
+                                                    <input type="hidden" name="user" value="<?php echo $_GET['user'];?>" >
+                                                    <input type="hidden" name="code" value="<?php echo $_GET['code'];?>" >
+                                                    New Password
                                                 </td>
                                             </tr>
                                             <tr>
                                                 <td>
-                                                    <input tabindex="1" type="password" size="20px" style="width:200px;" name="password" class="login-input">
+                                                    <input tabindex="1" type="password" size="20px" style="width:200px;" name="password" class="add-input">
                                                 </td>
                                             </tr>
                                             <tr>
-                                                <td>
-                                                    <p class="login-text1">
-                                                        Confirm Password <a tabindex="5" class="forgot" href="/reset/" ></a>
-                                                    </p>
+                                                <td style="padding: 12px 0 0 2px;">
+                                                    Confirm Password
                                                 </td>
                                             </tr>
                                             <tr>
                                                 <td>
-                                                    <input tabindex="2" type="password" size="20px"  style="width:200px;" name="password_confirm" class="login-input">
+                                                    <input tabindex="2" type="password" size="20px"  style="width:200px;" name="password_confirm" class="add-input">
                                                 </td>
                                             </tr>
                                             <tr>
@@ -167,8 +38,8 @@
                                                 </td>
                                             </tr>
                                             <tr>
-                                                <td>
-                                                    <input tabindex="3" type="submit" value="Reset" class="login-button">
+                                                <td style="padding: 0 0 12px 0;">
+                                                    <input tabindex="3" type="submit" value="Reset" class="button">
                                                 </td>
                                             </tr>
                                         </table>

web/templates/user/panel.html

@@ -1,3 +1,10 @@
+    <center>
+        <table class="main">
+            <tr>
+                <td>
+                    <table class="fixed" >
+                        <tr>
+                            <td>
                                 <table class="top">
                                     <tr>
                                         <td width="174px"></td>