projects / fa-stable.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merged changes up to version 2.3.4 into unstable.
[fa-stable.git] / access / login.php
diff --git a/access/login.php b/access/login.php
index 18a233b42c246662586200831cff570714cce18b..3bbf0060ec37fcab5ebe32d4a7ee4ad04be2267a 100644 (file)
--- a/access/login.php
+++ b/access/login.php
@@ -12,21 +12,15 @@
        if (!isset($path_to_root) || isset($_GET['path_to_root']) || isset($_POST['path_to_root']))
                die(_("Restricted access"));
        include_once($path_to_root . "/includes/ui.inc");
-       
+       include_once($path_to_root . "/includes/page/header.inc");
+
        $js = "<script language='JavaScript' type='text/javascript'>
 function defaultCompany()
 {
        document.forms[0].company_login_name.options[".$_SESSION["wa_current_user"]->company."].selected = true;
 }
-".get_js_png_fix()."</script>";
-       $js2 = "<script language='JavaScript' type='text/javascript'>
-function set_fullmode() {
-       document.getElementById('ui_mode').value = 1;
-       document.loginform.submit();
-       return true;
-}
 </script>";
-
+       add_js_file('login.js');
        // Display demo user name and password within login form if "$allow_demo_mode" is true
        if ($allow_demo_mode == true)
        {
@@ -38,7 +32,7 @@ function set_fullmode() {
        }
        if (!isset($def_coy))
                $def_coy = 0;
-       $def_theme = isset($_SESSION["wa_current_user"]) ? user_theme() : "default";
+       $def_theme = "default";
 
        $login_timeout = $_SESSION["wa_current_user"]->last_act;
 
@@ -52,21 +46,23 @@ function set_fullmode() {
        echo "<head><title>$title</title>\n";
        echo "<meta http-equiv='Content-type' content='text/html; charset=$encoding' />\n";
        echo "<link href='$path_to_root/themes/$def_theme/default.css' rel='stylesheet' type='text/css'> \n";
-       echo $js2;
+       send_scripts();
        if (!$login_timeout)
        {
                echo $js;
-       }       
+       }
        echo "</head>\n";
 
-       echo "<body style='background-color:#f9f9f9;' $onload>\n";
+       echo "<body id='loginscreen' $onload>\n";
 
-       echo "<table id='title'><tr><td class='titletext'>$title</td></tr></table>\n";
+       echo "<table class='titletext'><tr><td>$title</td></tr></table>\n";
        
+       div_start('_page_body');
        br();br();
-       start_table("$table_style2 width=400");
+       start_form(false, false, $_SESSION['timeout']['uri'], "loginform");
+       start_table(false, "class='login'");
        start_row();
-       echo "<td align='center' valign='bottom'>";
+       echo "<td align='center' colspan=2>";
        if (!$login_timeout) { // FA logo
        echo "<a target='_blank' href='$power_url'><img src='$path_to_root/themes/$def_theme/images/logo_frontaccounting.png' alt='FrontAccounting' height='50' onload='fixPNG(this)' border='0' /></a>";
        } else { 
@@ -75,9 +71,6 @@ function set_fullmode() {
        echo "</td>\n";
        end_row();
 
-       br();
-       start_form(false, false, $_SESSION['timeout']['uri'], "loginform");
-       start_table("$table_style2 width=400 style='background-color:#eeeeee;'");
        echo "<input type='hidden' id=ui_mode name='ui_mode' value='".$_SESSION["wa_current_user"]->ui_mode."' />\n";
        if (!$login_timeout)
                table_section_title(_("Version")." $version   Build $build_version - "._("Login"));
@@ -87,7 +80,7 @@ function set_fullmode() {
 
        $password = $allow_demo_mode ? "password":"";
 
-       echo "<tr><td>"._("Password")."</td><td><input type='password' name='password'  value='$password' /></td></tr>\n";
+       password_row(_("Password:"), 'password', $password);
 
        if ($login_timeout) {
                hidden('company_login_name', $_SESSION["wa_current_user"]->company);
@@ -105,8 +98,8 @@ function set_fullmode() {
                end_row();
        }; 
        end_table(1);
-       echo "<center><input type='submit' value='"._("Login -->")."' name='SubmitUser' onclick='set_fullmode();' /></center>\n";
-       end_form(1);
+       echo "<center><input type='submit' value='&nbsp;&nbsp;"._("Login -->")."&nbsp;&nbsp;' name='SubmitUser'"
+               .($login_timeout ? '':" onclick='set_fullmode();'")." /></center>\n";
 
        foreach($_SESSION['timeout']['post'] as $p => $val) {
                // add all request variables to be resend together with login data
@@ -114,7 +107,9 @@ function set_fullmode() {
                        'password', 'SubmitUser', 'company_login_name'))) 
                        echo "<input type='hidden' name='$p' value='$val'>";
        }
-       end_table();
+       end_form(1);
+       $Ajax->addScript(true, "document.forms[0].password.focus();");
+
     echo "<script language='JavaScript' type='text/javascript'>
     //<![CDATA[
             <!--
@@ -123,20 +118,21 @@ function set_fullmode() {
             //-->
     //]]>
     </script>";
-       echo "<table width=100%>\n";
+    div_end();
+       echo "<table class='bottomBar'>\n";
        echo "<tr>";
        if (isset($_SESSION['wa_current_user'])) 
                $date = Today() . " | " . Now();
        else    
                $date = date("m/d/Y") . " | " . date("h.i am");
-       echo "<td style='font-family:Verdana,Arial,Helvetica;font-size:9px;background:#dee7ec;color:black;border-bottom:1px solid #8cacbb;width:100%;'>$date</td>\n";
+       echo "<td class='bottomBarCell'>$date</td>\n";
        echo "</tr></table>\n";
-       echo "<table align='center' style='margin-top:5px;'>\n";
+       echo "<table class='footer'>\n";
        echo "<tr>\n";
-       echo "<td align='center' ><a style='color:#666666;font-size:9px;' target='_blank' href='$power_url' tabindex='-1'>$app_title $version - " . _("Theme:") . " " . $def_theme . "</a></td>\n";
+       echo "<td><a target='_blank' href='$power_url' tabindex='-1'>$app_title $version - " . _("Theme:") . " " . $def_theme . "</a></td>\n";
        echo "</tr>\n";
        echo "<tr>\n";
-       echo "<td align='center'><a style='color:#666666;font-size:9px;' target='_blank' href='$power_url' tabindex='-1'>$power_by</a></td>\n";
+       echo "<td><a target='_blank' href='$power_url' tabindex='-1'>$power_by</a></td>\n";
        echo "</tr>\n";
        echo "</table><br><br>\n";
        echo "</body></html>\n";
FrontAccounting stable branch