projects / fa-stable.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: bf897e3)
Changed login to be dependent only by login.css
authorJoe Hunt <joe.hunt.consulting@gmail.com>
Thu, 24 Sep 2009 00:08:06 +0000 (00:08 +0000)
committerJoe Hunt <joe.hunt.consulting@gmail.com>
Thu, 24 Sep 2009 00:08:06 +0000 (00:08 +0000)
CHANGELOG.txt patch | blob | history
access/login.php patch | blob | history
themes/default/login.css patch | blob | history

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 5703497af0fa5345d9cf26c8ad1bde42ea779862..e9cdf99335bbb885f3b6fb4468d060bd5c6138b5 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -29,6 +29,8 @@ $ /access/login.php
   /admin/fiscalyears.php
 # missing unset of post variable (DayNumber).
 $ /admin/payment_terms.php
+! Changed login to be dependent only by login.css
+$ /themes/default/login.css
   
 22-Sep-2009 Joe Hunt
 ! Changed copyright notice in installer files to credit the original copyrighter. GPLv3.
diff --git a/access/login.php b/access/login.php
index 18a233b42c246662586200831cff570714cce18b..e8a9e9dcbca22cde8c26790eaa933e58140c7a00 100644 (file)
--- a/access/login.php
+++ b/access/login.php
@@ -38,7 +38,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;
 
@@ -51,7 +51,7 @@ function set_fullmode() {
        echo "<html dir='$rtl' >\n";
        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 "<link href='$path_to_root/themes/$def_theme/login.css' rel='stylesheet' type='text/css'> \n";
        echo $js2;
        if (!$login_timeout)
        {
@@ -59,14 +59,14 @@ function set_fullmode() {
        }       
        echo "</head>\n";
 
-       echo "<body style='background-color:#f9f9f9;' $onload>\n";
+       echo "<body $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";
        
        br();br();
-       start_table("$table_style2 width=400");
+       start_table($table_style2);
        start_row();
-       echo "<td align='center' valign='bottom'>";
+       echo "<td align='center'>";
        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 { 
@@ -77,7 +77,7 @@ function set_fullmode() {
 
        br();
        start_form(false, false, $_SESSION['timeout']['uri'], "loginform");
-       start_table("$table_style2 width=400 style='background-color:#eeeeee;'");
+       start_table($table_style2);
        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"));
@@ -105,7 +105,7 @@ function set_fullmode() {
                end_row();
        }; 
        end_table(1);
-       echo "<center><input type='submit' value='"._("Login -->")."' name='SubmitUser' onclick='set_fullmode();' /></center>\n";
+       echo "<center><input type='submit' value='&nbsp;&nbsp;"._("Login -->")."&nbsp;&nbsp;' name='SubmitUser' onclick='set_fullmode();' /></center>\n";
        end_form(1);
 
        foreach($_SESSION['timeout']['post'] as $p => $val) {
@@ -123,20 +123,20 @@ function set_fullmode() {
             //-->
     //]]>
     </script>";
-       echo "<table width=100%>\n";
+       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";
diff --git a/themes/default/login.css b/themes/default/login.css
index f4cd1e94e3f115c829e79659f46b8a0419194850..5902a92e6bbe871272e6aebff334a92708751e3e 100644 (file)
--- a/themes/default/login.css
+++ b/themes/default/login.css
@@ -18,29 +18,95 @@
 \--------------------------------------------------*/
 
 body {
-       background: #518fad;
-       font-family: arial, verdana;
+       font-family: Verdana, Arial, Helvetica;
+       background: #f9f9f9;
        font-size: 10px;
+       margin: 5px 0 0 5px;
+       padding: 0;
 }
 
-.loginText {
-       font-family: arial, verdana;
-       font-size: 10px;
+tr, td, th {
+       font-size: 11px;
+       line-height: 19px;
+}
+
+table {
+       text-align: left;
+}
+
+input, select {
+       font-size: 11px;
+       padding: 1px;
+}
+
+select {
+    max-width: 200px;
+}
+
+a {
+       color: #0000bb;
+       font-size: 11px;
+       text-decoration: none;
 }
 
-a:hover {
+a:link {
+       color: #0000bb;
+       text-decoration: none;
+}
+
+a:active {
+       color: #000000;
+       text-decoration: none;
+}
+
+a:hover, a:focus {
+       color: #2d8628;
        text-decoration: underline;
 }
 
-input.big {
-       width: 100px;
+.tableheader {
+       font-weight: bold;
+       /*background-color: #dee7ec;*/
+       background-color: #d1dfec;
+       color: black;
+       text-align: center;
+}
+
+.bottomBar {
+       padding-right: 1em;
+       /*background-color: #dee7ec;*/
+       background-color: #d1dfec;
+       color: black;
+       border-bottom: 1px solid #8cacbb;
+       width: 100%;
+}
+
+.bottomBarCell {
+       font-size: 10px;
+       line-height: 12px;
 }
 
-input.small {
-       width: 50px;
+.footer {
+       text-align: center;
+       margin-top: 5px;
+       width: 100%;
 }
 
-td.login {
-       border: 1px solid #ccc;
-       background-color: #eee;
-}      
\ No newline at end of file
+.footer td a {
+       color: #666666;
+       font-size: 9px;
+}
+
+.titletext {
+       font-weight: bold;
+       font-size: 13px;
+       border-bottom: 1px solid #8cacbb;
+       padding: 5px;
+       width: 100%;
+}
+
+.tablestyle2 {
+       width: 350px;
+       border-collapse: collapse;
+       background-color: #eeeeee;
+}
FrontAccounting stable branch