Improved layout in standard themes (graphics)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 81911f1f1f46765c05838c049fb8c42c87ff9b5d..0e16b30debc604180ca39c2c5e4fc61c6e24e1db 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,22 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+28-Feb-2009 Joe Hunt
+! Improved layout in standard themes (graphics)
+$ /themes/aqua/renderer.php
+  /themes/aqua/help.gif (new file)
+  /themes/aqua/login.gif (new file)
+  /themes/aqua/right.gif (new file)
+  /themes/cool/renderer.php
+  /themes/cool/help.gif (new file)
+  /themes/cool/login.gif (new file)
+  /themes/cool/right.gif (new file)
+  /themes/default/renderer.php
+  /themes/default/help.gif (new file)
+  /themes/default/login.gif (new file)
+  /themes/default/right.gif (new file)
+  /themes/themes/login.css
+    
 27-Feb-2009 Janusz Dobrowolski
 # Security fix to my last commit.
 $ /frontaccounting.php

diff --git a/themes/aqua/images/help.gif b/themes/aqua/images/help.gif
new file mode 100644 (file)
index 0000000..58c0ffe
Binary files /dev/null and b/themes/aqua/images/help.gif differ

diff --git a/themes/aqua/images/login.gif b/themes/aqua/images/login.gif
new file mode 100644 (file)
index 0000000..bd3f47c
Binary files /dev/null and b/themes/aqua/images/login.gif differ

diff --git a/themes/aqua/images/right.gif b/themes/aqua/images/right.gif
new file mode 100644 (file)
index 0000000..eed1194
Binary files /dev/null and b/themes/aqua/images/right.gif differ

diff --git a/themes/aqua/renderer.php b/themes/aqua/renderer.php
index 48fd487ae32fe490aa802b1ee8ba7c80b74797c3..c671e8e6ef93208161e3de1f072bf53aa60cdb14 100644 (file)
--- a/themes/aqua/renderer.php
+++ b/themes/aqua/renderer.php
@@ -42,6 +42,8 @@
                        {
                                $applications = $_SESSION['App']->applications;
                                $local_path_to_root = $path_to_root;
+                               $img = "<img src='$local_path_to_root/themes/aqua/images/login.gif' width='14' height='14' border='0' alt='"._('Logout')."'>&nbsp;&nbsp;";
+                               $himg = "<img src='$local_path_to_root/themes/aqua/images/help.gif' width='14' height='14' border='0' alt='"._('Help')."'>&nbsp;&nbsp;";
                                $sel_app = $_SESSION['sel_app'];
                                echo "<table cellpadding=0 cellspacing=0 width='100%'><tr><td>";
                                echo "<div class=tabs>";
@@ -65,9 +67,9 @@
 
                                if ($help_base_url != null)
                                {
-                                       echo "<a target = '_blank' onclick=" .'"'."javascript:openWindow(this.href,this.target); return false;".'" '. "href='". help_url($title, $sel_app)."'>" . _("Help") . "</a>&nbsp;&nbsp;&nbsp;";
+                                       echo "$himg<a target = '_blank' onclick=" .'"'."javascript:openWindow(this.href,this.target); return false;".'" '. "href='". help_url($title, $sel_app)."'>" . _("Help") . "</a>&nbsp;&nbsp;&nbsp;";
                                }
-                               echo "<a href='$local_path_to_root/access/logout.php?'>" . _("Logout") . "</a>&nbsp;&nbsp;&nbsp;";
+                               echo "$img<a href='$local_path_to_root/access/logout.php?'>" . _("Logout") . "</a>&nbsp;&nbsp;&nbsp;";
                                echo "</td></tr></table>";
                        }
                        echo "</td></tr></table>";
@@ -125,9 +127,11 @@
 
                function display_applications(&$waapp)
                {
-
+                       global $path_to_root;
+                       
                        $selected_app = $waapp->get_selected_application();
 
+                       $img = "<img src='$path_to_root/themes/aqua/images/right.gif' style='vertical-align:middle;' width='17' height='17' border='0'>&nbsp;&nbsp;";
                        foreach ($selected_app->modules as $module)
                        {
                                // image
@@ -144,8 +148,13 @@
                                {
                                        if ($_SESSION["wa_current_user"]->can_access_page($appfunction->access)) 
                                        {
-                                               $lnk = access_string($appfunction->label);
-                                               echo "<a href='$appfunction->link'$lnk[1]>$lnk[0]</a><br>";
+                                               if ($appfunction->label == "")
+                                                       echo "&nbsp;<br>";
+                                               else
+                                               {
+                                                       $lnk = access_string($appfunction->label);
+                                                       echo "$img<a href='$appfunction->link'$lnk[1]>$lnk[0]</a><br>";
+                                               }       
                                        }
                                }
                                echo "</td>";
@@ -156,9 +165,14 @@
                                        {
                                                if ($_SESSION["wa_current_user"]->can_access_page($appfunction->access)) 
                                                {
-                                                       $lnk = access_string($appfunction->label);
-                                                       echo "<a href='$appfunction->link'$lnk[1]>$lnk[0]</a><br>";
-                                               }
+                                                       if ($appfunction->label == "")
+                                                               echo "&nbsp;<br>";
+                                                       else
+                                                       {
+                                                               $lnk = access_string($appfunction->label);
+                                                               echo "$img<a href='$appfunction->link'$lnk[1]>$lnk[0]</a><br>";
+                                                       }
+                                               }       
                                        }
                                        echo "</td>";
                                }

diff --git a/themes/cool/images/help.gif b/themes/cool/images/help.gif
new file mode 100644 (file)
index 0000000..58c0ffe
Binary files /dev/null and b/themes/cool/images/help.gif differ

diff --git a/themes/cool/images/login.gif b/themes/cool/images/login.gif
new file mode 100644 (file)
index 0000000..bd3f47c
Binary files /dev/null and b/themes/cool/images/login.gif differ

diff --git a/themes/cool/images/right.gif b/themes/cool/images/right.gif
new file mode 100644 (file)
index 0000000..eed1194
Binary files /dev/null and b/themes/cool/images/right.gif differ

diff --git a/themes/cool/renderer.php b/themes/cool/renderer.php
index 48fd487ae32fe490aa802b1ee8ba7c80b74797c3..34f1f3556c7585f54515001f31071e25f5d818ad 100644 (file)
--- a/themes/cool/renderer.php
+++ b/themes/cool/renderer.php
@@ -42,6 +42,8 @@
                        {
                                $applications = $_SESSION['App']->applications;
                                $local_path_to_root = $path_to_root;
+                               $img = "<img src='$local_path_to_root/themes/cool/images/login.gif' width='14' height='14' border='0' alt='"._('Logout')."'>&nbsp;&nbsp;";
+                               $himg = "<img src='$local_path_to_root/themes/cool/images/help.gif' width='14' height='14' border='0' alt='"._('Help')."'>&nbsp;&nbsp;";
                                $sel_app = $_SESSION['sel_app'];
                                echo "<table cellpadding=0 cellspacing=0 width='100%'><tr><td>";
                                echo "<div class=tabs>";
@@ -65,9 +67,9 @@
 
                                if ($help_base_url != null)
                                {
-                                       echo "<a target = '_blank' onclick=" .'"'."javascript:openWindow(this.href,this.target); return false;".'" '. "href='". help_url($title, $sel_app)."'>" . _("Help") . "</a>&nbsp;&nbsp;&nbsp;";
+                                       echo "$himg<a target = '_blank' onclick=" .'"'."javascript:openWindow(this.href,this.target); return false;".'" '. "href='". help_url($title, $sel_app)."'>" . _("Help") . "</a>&nbsp;&nbsp;&nbsp;";
                                }
-                               echo "<a href='$local_path_to_root/access/logout.php?'>" . _("Logout") . "</a>&nbsp;&nbsp;&nbsp;";
+                               echo "$img<a href='$local_path_to_root/access/logout.php?'>" . _("Logout") . "</a>&nbsp;&nbsp;&nbsp;";
                                echo "</td></tr></table>";
                        }
                        echo "</td></tr></table>";
@@ -125,9 +127,10 @@
 
                function display_applications(&$waapp)
                {
-
+                       global $path_to_root;
                        $selected_app = $waapp->get_selected_application();
 
+                       $img = "<img src='$path_to_root/themes/cool/images/right.gif' style='vertical-align:middle;' width='17' height='17' border='0'>&nbsp;&nbsp;";
                        foreach ($selected_app->modules as $module)
                        {
                                // image
@@ -144,8 +147,13 @@
                                {
                                        if ($_SESSION["wa_current_user"]->can_access_page($appfunction->access)) 
                                        {
-                                               $lnk = access_string($appfunction->label);
-                                               echo "<a href='$appfunction->link'$lnk[1]>$lnk[0]</a><br>";
+                                               if ($appfunction->label == "")
+                                                       echo "&nbsp;<br>";
+                                               else
+                                               {
+                                                       $lnk = access_string($appfunction->label);
+                                                       echo "$img<a href='$appfunction->link'$lnk[1]>$lnk[0]</a><br>";
+                                               }       
                                        }
                                }
                                echo "</td>";
@@ -156,8 +164,13 @@
                                        {
                                                if ($_SESSION["wa_current_user"]->can_access_page($appfunction->access)) 
                                                {
-                                                       $lnk = access_string($appfunction->label);
-                                                       echo "<a href='$appfunction->link'$lnk[1]>$lnk[0]</a><br>";
+                                                       if ($appfunction->label == "")
+                                                               echo "&nbsp;<br>";
+                                                       else
+                                                       {
+                                                               $lnk = access_string($appfunction->label);
+                                                               echo "$img<a href='$appfunction->link'$lnk[1]>$lnk[0]</a><br>";
+                                                       }       
                                                }
                                        }
                                        echo "</td>";

diff --git a/themes/default/images/help.gif b/themes/default/images/help.gif
new file mode 100644 (file)
index 0000000..58c0ffe
Binary files /dev/null and b/themes/default/images/help.gif differ

diff --git a/themes/default/images/login.gif b/themes/default/images/login.gif
new file mode 100644 (file)
index 0000000..bd3f47c
Binary files /dev/null and b/themes/default/images/login.gif differ

diff --git a/themes/default/images/right.gif b/themes/default/images/right.gif
new file mode 100644 (file)
index 0000000..eed1194
Binary files /dev/null and b/themes/default/images/right.gif differ

diff --git a/themes/default/login.css b/themes/default/login.css
index 1864b5dc834a9eef549d6769dbcad0177e3ff045..f4cd1e94e3f115c829e79659f46b8a0419194850 100644 (file)
--- a/themes/default/login.css
+++ b/themes/default/login.css
@@ -2,12 +2,12 @@
 |               |               | login.css         |
 |---------------------------------------------------|
 | For use with:                                     |
-| OpenAccounting                                                                       |
-| http://open-accounting.sourceforge.net/                      |
-| by KylieTech Consulting                           |
+| FrontAccounting                                                                      |
+| http://frontaccounting.net/                                  |
+| by FrontAccount, LLC                              |
 |---------------------------------------------------|
 | Developer:                                        |
-| Shane Barnaby                                     |
+| Joe Hunt                                          |
 |                                                   |
 |---------------------------------------------------|
 | Note:                                             |
@@ -41,5 +41,6 @@ input.small {
 }
 
 td.login {
-       background: #dddddd;
+       border: 1px solid #ccc;
+       background-color: #eee;
 }      
\ No newline at end of file

diff --git a/themes/default/renderer.php b/themes/default/renderer.php
index e3e58605486c246b56bcdbe8fb5f1f17c34b95f0..473cf82f279063963f8a6cfb6991212e02c23ead 100644 (file)
--- a/themes/default/renderer.php
+++ b/themes/default/renderer.php
@@ -43,6 +43,8 @@
                        {
                                $applications = $_SESSION['App']->applications;
                                $local_path_to_root = $path_to_root;
+                               $img = "<img src='$local_path_to_root/themes/default/images/login.gif' width='14' height='14' border='0' alt='"._('Logout')."'>&nbsp;&nbsp;";
+                               $himg = "<img src='$local_path_to_root/themes/default/images/help.gif' width='14' height='14' border='0' alt='"._('Help')."'>&nbsp;&nbsp;";
                                $sel_app = $_SESSION['sel_app'];
                                echo "<table cellpadding=0 cellspacing=0 width='100%'><tr><td>";
                                echo "<div class=tabs>";
@@ -65,9 +67,9 @@
 
                                if ($help_base_url != null)
                                {
-                                       echo "<a target = '_blank' onclick=" .'"'."javascript:openWindow(this.href,this.target); return false;".'" '. "href='". help_url($title, $sel_app)."'>" . _("Help") . "</a>&nbsp;&nbsp;&nbsp;";
+                                       echo "$himg<a target = '_blank' onclick=" .'"'."javascript:openWindow(this.href,this.target); return false;".'" '. "href='". help_url($title, $sel_app)."'>" . _("Help") . "</a>&nbsp;&nbsp;&nbsp;";
                                }
-                               echo "<a href='$local_path_to_root/access/logout.php?'>" . _("Logout") . "</a>&nbsp;&nbsp;&nbsp;";
+                               echo "$img<a href='$local_path_to_root/access/logout.php?'>" . _("Logout") . "</a>&nbsp;&nbsp;&nbsp;";
                                echo "</td></tr></table>";
                        }
                        echo "</td></tr></table>";
@@ -125,9 +127,11 @@
 
                function display_applications(&$waapp)
                {
+                       global $path_to_root;
 
                        $selected_app = $waapp->get_selected_application();
 
+                       $img = "<img src='$path_to_root/themes/default/images/right.gif' style='vertical-align:middle;' width='17' height='17' border='0'>&nbsp;&nbsp;";
                        foreach ($selected_app->modules as $module)
                        {
                                // image
@@ -144,8 +148,13 @@
                                {
                                        if ($_SESSION["wa_current_user"]->can_access_page($appfunction->access)) 
                                        {
-                                               $lnk = access_string($appfunction->label);
-                                               echo "<a href='$appfunction->link'$lnk[1]>$lnk[0]</a><br>";
+                                               if ($appfunction->label == "")
+                                                       echo "&nbsp;<br>";
+                                               else
+                                               {
+                                                       $lnk = access_string($appfunction->label);
+                                                       echo "$img<a href='$appfunction->link'$lnk[1]>$lnk[0]</a><br>";
+                                               }       
                                        }
                                }
                                echo "</td>";
@@ -156,8 +165,13 @@
                                        {
                                                if ($_SESSION["wa_current_user"]->can_access_page($appfunction->access)) 
                                                {
-                                                       $lnk = access_string($appfunction->label);
-                                                       echo "<a href='$appfunction->link'$lnk[1]>$lnk[0]</a><br>";
+                                                       if ($appfunction->label == "")
+                                                               echo "&nbsp;<br>";
+                                                       else
+                                                       {
+                                                               $lnk = access_string($appfunction->label);
+                                                               echo "$img<a href='$appfunction->link'$lnk[1]>$lnk[0]</a><br>";
+                                                       }       
                                                }
                                        }
                                        echo "</td>";