Merged changes from stable branch up to 2.3.23.

[fa-stable.git] / themes / aqua / renderer.php

diff --git a/themes/aqua/renderer.php b/themes/aqua/renderer.php
index cd7075c5021ab3d3ac09022b5e209dcf6061da3b..7406d2443e3a8dde0f2ed6ce413a9f716b7df8f7 100644 (file)
--- a/themes/aqua/renderer.php
+++ b/themes/aqua/renderer.php
@@ -36,7 +36,7 @@
                {
                        global $path_to_root, $SysPrefs, $db_connections;
                        echo "<table class='callout_main' border='0' cellpadding='0' cellspacing='0'>\n";
-                       echo "<tr>";
+                       echo "<tr>\n";
                        echo "<td colspan='2' rowspan='2'>\n";
 
                        echo "<table class='main_page' border='0' cellpadding='0' cellspacing='0'>\n";
@@ -49,31 +49,29 @@
                        {
                                $applications = $_SESSION['App']->applications;
                                $local_path_to_root = $path_to_root;
-
                                $sel_app = $_SESSION['sel_app'];
-                               echo "<table cellpadding=0 cellspacing=0 width='100%'><tr><td>";
-                               echo "<div class=tabs>";
+                               echo "<table cellpadding='0' cellspacing='0' width='100%'><tr><td>";
+                               echo "<div class='tabs'>";
                                foreach($applications as $app)
                                {
                     if ($_SESSION["wa_current_user"]->check_application_access($app))
                     {
-                                               $acc = access_string($app->name);
-                                               echo "<a class='".($sel_app == $app->id ? 'selected' : 'menu_tab')
-                                                       ."' href='$local_path_to_root/index.php?application=".$app->id
-                                                       ."'$acc[1]>" .$acc[0] . "</a>";
-                                       }               
+                        $acc = access_string($app->name);
+                        echo "<a class='".($sel_app == $app->id ? 'selected' : 'menu_tab')
+                            ."' href='$local_path_to_root/index.php?application=".$app->id
+                            ."'$acc[1]>" .$acc[0] . "</a>";
+                    }
                                }
                                echo "</div>";
-
                                echo "</td></tr></table>";
                                // top status bar
                                $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;";
 
-                               echo "<table class=logoutBar>";
-                               echo "<tr><td class=headingtext3>" . $db_connections[user_company()]["name"] . " | " . $_SERVER['SERVER_NAME'] . " | " . $_SESSION["wa_current_user"]->name . "</td>";
+                               echo "<table class='logoutBar'>";
+                               echo "<tr><td class='headingtext3'>" . $db_connections[user_company()]["name"] . " | " . $_SERVER['SERVER_NAME'] . " | " . $_SESSION["wa_current_user"]->name . "</td>";
                                $indicator = "$path_to_root/themes/".user_theme(). "/images/ajax-loader.gif";
-                               echo "<td class='logoutBarRight'><img id='ajaxmark' src='$indicator' align='center' style='visibility:hidden;'></td>";
+                               echo "<td class='logoutBarRight'><img id='ajaxmark' src='$indicator' align='center' style='visibility:hidden;' alt='ajaxmark'></td>";
                                echo "  <td class='logoutBarRight'><a class='shortcut' href='$path_to_root/admin/display_prefs.php?'>" . _("Preferences") . "</a>&nbsp;&nbsp;&nbsp;\n";
                                echo "  <a class='shortcut' href='$path_to_root/admin/change_current_user_password.php?selected_id=" . $_SESSION["wa_current_user"]->username . "'>" . _("Change password") . "</a>&nbsp;&nbsp;&nbsp;\n";
 
@@ -89,17 +87,14 @@
                                echo "<br>";
                        elseif ($title && !$is_index)
                        {
-                                       echo "<center><table id='title'><tr><td width='100%' class='titletext'>$title</td>"
+                               echo "<center><table id='title'><tr><td width='100%' class='titletext'>$title</td>"
                                ."<td align=right>"
                                .(user_hints() ? "<span id='hints'></span>" : '')
                                ."</td>"
                                ."</tr></table></center>";
                        }
-
-
                }
 
-
                function menu_footer($no_menu, $is_index)
                {
                        global $version, $path_to_root, $Pagehelp, $Ajax, $SysPrefs;
@@ -107,20 +102,20 @@
                        include_once($path_to_root . "/includes/date_functions.inc");
 
                        echo "</td></tr></table>\n"; // 'main_page'
-                       if ($no_menu == false)  // bottom status line
+                       if ($no_menu == false) // bottom status line
                        {
                                if ($is_index)
-                                       echo "<table class=bottomBar>\n";
+                                       echo "<table class='bottomBar'>\n";
                                else
-                                       echo "<table class=bottomBar2>\n";
+                                       echo "<table class='bottomBar2'>\n";
                                echo "<tr>";
                                if (isset($_SESSION['wa_current_user'])) {
                                        $phelp = implode('; ', $Pagehelp);
-                                       echo "<td class=bottomBarCell>" . Today() . " | " . Now() . "</td>\n";
+                                       echo "<td class='bottomBarCell'>" . Today() . " | " . Now() . "</td>\n";
                                        $Ajax->addUpdate(true, 'hotkeyshelp', $phelp);
                                        echo "<td id='hotkeyshelp'>".$phelp."</td>";
                                }
-                               echo "</td></tr></table>\n";
+                               echo "</tr></table>\n";
                        }
                        echo "</td></tr> </table>\n"; // 'callout_main'
                        if ($no_menu == false)
@@ -137,6 +132,7 @@
                                if ($SysPrefs->allow_demo_mode==true)
                                {
                                        echo "<tr>\n";
+                                       //echo "<td><br><div align='center'><a href='http://sourceforge.net'><img src='http://sourceforge.net/sflogo.php?group_id=89967&amp;type=5' alt='SourceForge.net Logo' width='210' height='62' border='0' align='center' /></a></div></td>\n";
                                        echo "</tr>\n";
                                }
                                echo "</table><br><br>\n";
@@ -148,7 +144,6 @@
                        global $path_to_root;
 
                        $selected_app = $waapp->get_selected_application();
-
                        if (!$_SESSION["wa_current_user"]->check_application_access($selected_app))
                                return;
 
@@ -158,7 +153,7 @@
                                return;
                        }
 
-                       echo "<table width=100% cellpadding='0' cellspacing='0'>";
+                       echo "<table width='100%' cellpadding='0' cellspacing='0'>";
                        foreach ($selected_app->modules as $module)
                        {
                        if (!$_SESSION["wa_current_user"]->check_module_access($module))
@@ -215,5 +210,5 @@
                                echo "</tr></table></td></tr>";
                        }
                        echo "</table>";
-       }
+               }
        }