Additional cleanups in standard themes.

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

diff --git a/themes/default/renderer.php b/themes/default/renderer.php
index e32cbb46876460cd79495dce09593d8a09bfbaa1..438d87debd814313d47325cc6726937db237c720 100644 (file)
--- a/themes/default/renderer.php
+++ b/themes/default/renderer.php
@@ -9,7 +9,6 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-
        class renderer
        {
                function get_icon($category)
@@ -45,16 +44,14 @@
                        echo "<td>\n";
                        echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
                        echo "<tr>\n";
-                       echo "<td class='quick_menu'>\n";
+                       echo "<td class='quick_menu'>\n"; // tabs
                        if (!$no_menu)
                        {
                                $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>";
+                               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))
@@ -67,11 +64,14 @@
                                }
                                echo "</div>";
                                echo "</td></tr></table>";
+                               // top status bar
+                               $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;";
 
-                               echo "<table class=logoutBar>";
-                               echo "<tr><td class=headingtext3>" . $db_connections[$_SESSION["wa_current_user"]->company]["name"] . " | " . $_SERVER['SERVER_NAME'] . " | " . $_SESSION["wa_current_user"]->name . "</td>";
+                               echo "<table class='logoutBar'>";
+                               echo "<tr><td class='headingtext3'>" . $db_connections[$_SESSION["wa_current_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";
 
@@ -84,7 +84,6 @@
                                echo "</td></tr></table>";
                        }
                        echo "</td></tr></table>";
-
                        if ($no_menu)
                                echo "<br>";
                        elseif ($title && !$is_index)
@@ -99,32 +98,32 @@
 
                function menu_footer($no_menu, $is_index)
                {
-                       global $version, $allow_demo_mode, $app_title, $power_url, 
+                       global $version, $allow_demo_mode, $app_title, $power_url,
                                $power_by, $path_to_root, $Pagehelp, $Ajax;
                        include_once($path_to_root . "/includes/date_functions.inc");
 
-                       if ($no_menu == false)
+                       echo "</td></tr></table>\n"; // 'main_page'
+                       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 "</tr></table>\n";
                        }
-                       echo "</td></tr></table></td>\n";
-                       echo "</table>\n";
+                       echo "</td></tr> </table>\n"; // 'callout_main'
                        if ($no_menu == false)
                        {
                                echo "<table align='center' id='footer'>\n";
                                echo "<tr>\n";
-                               echo "<td align='center' class='footer'><a target='_blank' href='$power_url' tabindex='-1'><font color='#ffffff'>$app_title $version - " . _("Theme:") . " " . user_theme() . " - ".show_users_online()."</font></a></td>\n";
+                               echo "<td align='center' class='footer'><a target='_blank' href='$power_url' tabindex='-1'><font color='#ffffff'>$app_title $version - " . _("Theme:") . " " . user_theme() ." - ".show_users_online()."</font></a></td>\n";
                                echo "</tr>\n";
                                echo "<tr>\n";
                                echo "<td align='center' class='footer'><a target='_blank' href='$power_url' tabindex='-1'><font color='#ffff00'>$power_by</font></a></td>\n";
@@ -132,7 +131,7 @@
                                if ($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='middle' /></a></div></td>\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";
@@ -146,6 +145,14 @@
                        $selected_app = $waapp->get_selected_application();
                        if (!$_SESSION["wa_current_user"]->check_application_access($selected_app))
                                return;
+
+                       if (method_exists($selected_app, 'render_index'))
+                       {
+                               $selected_app->render_index();
+                               return;
+                       }
+
+                       echo "<table width='100%' cellpadding='0' cellspacing='0'>";
                        foreach ($selected_app->modules as $module)
                        {
                        if (!$_SESSION["wa_current_user"]->check_module_access($module))
@@ -200,11 +207,8 @@
                                }
 
                                echo "</tr></table></td></tr>";
-                       }       
+                       }
                        echo "</table>";
                }
-    }
-               
-
-
+       }
 ?>
\ No newline at end of file