merged headers for login and reset forms

serghey-rodin · serghey-rodin · commit 6ae9520b57a4 · 2012-10-22T13:12:06.000+03:00
diff --git a/web/login/index.php b/web/login/index.php
@@ -5,6 +5,8 @@
     session_destroy();
 }
 
+$TAB = 'LOGIN';
+
 if (isset($_SESSION['user'])) {
     if ($_SESSION['user'] ==  'admin' && !empty($_GET['loginas'])) {
         if ($_GET['loginas'] == 'admin') {
@@ -38,6 +40,7 @@
             }
         }
     }
+    require_once '../templates/header.html';
     require_once '../templates/login.html';
 }
 ?>
diff --git a/web/reset/index.php b/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 @@ function send_email($to,$subject,$mailtext,$from) {
     }
 }
 
+require_once '../templates/header.html';
 if (empty($_GET['action'])) {
     require_once '../templates/reset_1.html';
 } else {
diff --git a/web/templates/admin/add_cron.html b/web/templates/admin/add_cron.html
@@ -1,3 +1,4 @@
+
                                 <?php
                                     $back = $_SESSION['back'];
                                     if (empty($back)) {
diff --git a/web/templates/admin/add_db.html b/web/templates/admin/add_db.html
@@ -1,3 +1,4 @@
+
                                 <?php
                                     $back = $_SESSION['back'];
                                     if (empty($back)) {
diff --git a/web/templates/admin/add_dns.html b/web/templates/admin/add_dns.html
@@ -1,3 +1,4 @@
+
                                 <?php
                                     $back = $_SESSION['back'];
                                     if (empty($back)) {
diff --git a/web/templates/admin/add_dns_rec.html b/web/templates/admin/add_dns_rec.html
@@ -1,3 +1,4 @@
+
                                 <?php
                                     $back = $_SESSION['back'];
                                     if (empty($back)) {
diff --git a/web/templates/admin/add_ip.html b/web/templates/admin/add_ip.html
@@ -1,3 +1,4 @@
+
                                 <?php
                                     $back = $_SESSION['back'];
                                     if (empty($back)) {
diff --git a/web/templates/admin/add_mail.html b/web/templates/admin/add_mail.html
@@ -1,3 +1,4 @@
+
                                 <?php
                                     $back = $_SESSION['back'];
                                     if (empty($back)) {
diff --git a/web/templates/admin/add_mail_acc.html b/web/templates/admin/add_mail_acc.html
@@ -1,3 +1,4 @@
+
                                 <?php
                                     $back = $_SESSION['back'];
                                     if (empty($back)) {
diff --git a/web/templates/admin/add_package.html b/web/templates/admin/add_package.html
@@ -1,3 +1,4 @@
+
                                 <?php
                                     $back = $_SESSION['back'];
                                     if (empty($back)) {
diff --git a/web/templates/admin/add_user.html b/web/templates/admin/add_user.html
@@ -1,3 +1,4 @@
+
                                 <?php
                                     $back = $_SESSION['back'];
                                     if (empty($back)) {
diff --git a/web/templates/admin/add_web.html b/web/templates/admin/add_web.html
@@ -1,3 +1,4 @@
+
                                 <?php
                                     $back = $_SESSION['back'];
                                     if (empty($back)) {
diff --git a/web/templates/admin/edit_cron.html b/web/templates/admin/edit_cron.html
@@ -1,3 +1,4 @@
+
                                 <?php
                                     $back = $_SESSION['back'];
                                     if (empty($back)) {
diff --git a/web/templates/admin/panel.html b/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>
diff --git a/web/templates/header.html b/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>
diff --git a/web/templates/login.html b/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,32 +11,32 @@
                                     <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>
                                             <td height="28px">
                                             </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>
diff --git a/web/templates/reset_1.html b/web/templates/reset_1.html
diff --git a/web/templates/reset_2.html b/web/templates/reset_2.html
diff --git a/web/templates/reset_3.html b/web/templates/reset_3.html
diff --git a/web/templates/user/panel.html b/web/templates/user/panel.html

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,8 @@`
`5`	`5`	`session_destroy();`
`6`	`6`	`}`
`7`	`7`
	`8`	`+$TAB = 'LOGIN';`
	`9`	`+`
`8`	`10`	`if (isset($_SESSION['user'])) {`
`9`	`11`	`if ($_SESSION['user'] == 'admin' && !empty($_GET['loginas'])) {`
`10`	`12`	`if ($_GET['loginas'] == 'admin') {`
`@@ -38,6 +40,7 @@`
`38`	`40`	`}`
`39`	`41`	`}`
`40`	`42`	`}`
	`43`	`+ require_once '../templates/header.html';`
`41`	`44`	`require_once '../templates/login.html';`
`42`	`45`	`}`
`43`	`46`	`?>`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`<?php`
`2`	`2`	`session_start();`
`3`		`-`
	`3`	`+$TAB = 'RESET PASSWORD';`
`4`	`4`	`//`
`5`	`5`	`function send_email($to,$subject,$mailtext,$from) {`
`6`	`6`	`$charset = "utf-8";`
`@@ -85,6 +85,7 @@ function send_email($to,$subject,$mailtext,$from) {`
`85`	`85`	`}`
`86`	`86`	`}`
`87`	`87`
	`88`	`+require_once '../templates/header.html';`
`88`	`89`	`if (empty($_GET['action'])) {`
`89`	`90`	`require_once '../templates/reset_1.html';`
`90`	`91`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+`
`1`	`2`	`<?php`
`2`	`3`	`$back = $_SESSION['back'];`
`3`	`4`	`if (empty($back)) {`