Changes in standard themes: fixed html, menu index can be rendered by extension module

diff --git a/themes/aqua/renderer.php b/themes/aqua/renderer.php
index a5036185273ef75e67cbf5b425208b82c331a89f..a1b6d852efe2c77da8e00af01f93f0d0a472f326 100644 (file)
--- a/themes/aqua/renderer.php
+++ b/themes/aqua/renderer.php
@@ -36,7 +36,7 @@
                {
                        global $path_to_root, $help_base_url, $db_connections;
                        echo "<table class='callout_main' border='0' cellpadding='0' cellspacing='0'>\n";
-                       echo "<tr>\n";
+                       echo "<tr>";
                        echo "<td colspan='2' rowspan='2'>\n";
 
                        echo "<table class='main_page' border='0' cellpadding='0' cellspacing='0'>\n";
@@ -44,13 +44,12 @@
                        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/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>";
@@ -67,6 +66,9 @@
                                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[$_SESSION["wa_current_user"]->company]["name"] . " | " . $_SERVER['SERVER_NAME'] . " | " . $_SESSION["wa_current_user"]->name . "</td>";
@@ -97,13 +99,15 @@
 
                }
 
+
                function menu_footer($no_menu, $is_index)
                {
                        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";
@@ -116,10 +120,9 @@
                                        $Ajax->addUpdate(true, 'hotkeyshelp', $phelp);
                                        echo "<td id='hotkeyshelp'>".$phelp."</td>";
                                }
-                               echo "</tr></table>\n";
+                               echo "</td></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";
@@ -142,11 +145,18 @@
                function display_applications(&$waapp)
                {
                        global $path_to_root;
-                       
+
                        $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))
@@ -170,7 +180,7 @@
                                        {
                                                        echo $img.menu_link($appfunction->link, $appfunction->label)."<br>\n";
                                        }
-                                       elseif (!$_SESSION["wa_current_user"]->hide_inaccessible_menu_items()) 
+                                       elseif (!$_SESSION["wa_current_user"]->hide_inaccessible_menu_items())
                                        {
                                                        echo $img.'<span class="inactive">'
                                                                .access_string($appfunction->label, true)
@@ -190,7 +200,7 @@
                                                {
                                                                echo $img.menu_link($appfunction->link, $appfunction->label)."<br>\n";
                                                }
-                                               elseif (!$_SESSION["wa_current_user"]->hide_inaccessible_menu_items()) 
+                                               elseif (!$_SESSION["wa_current_user"]->hide_inaccessible_menu_items())
                                                {
                                                                echo $img.'<span class="inactive">'
                                                                        .access_string($appfunction->label, true)
@@ -202,9 +212,7 @@
 
                                echo "</tr></table></td></tr>";
                        }
-
                        echo "</table>";
-               }
+       }
        }
-
 ?>
\ No newline at end of file

diff --git a/themes/cool/renderer.php b/themes/cool/renderer.php
index bb5621356f31fe1f3b428d200fb267ae682ec22b..cb3ac0cabba15aa6cdeb1a12c76766ad725544f6 100644 (file)
--- a/themes/cool/renderer.php
+++ b/themes/cool/renderer.php
@@ -36,7 +36,7 @@
                {
                        global $path_to_root, $help_base_url, $db_connections;
                        echo "<table class='callout_main' border='0' cellpadding='0' cellspacing='0'>\n";
-                       echo "<tr>\n";
+                       echo "<tr>";
                        echo "<td colspan='2' rowspan='2'>\n";
 
                        echo "<table class='main_page' border='0' cellpadding='0' cellspacing='0'>\n";
@@ -44,13 +44,12 @@
                        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/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>";
@@ -62,11 +61,14 @@
                                                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[$_SESSION["wa_current_user"]->company]["name"] . " | " . $_SERVER['SERVER_NAME'] . " | " . $_SESSION["wa_current_user"]->name . "</td>";
@@ -103,7 +105,8 @@
                                $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";
@@ -116,10 +119,9 @@
                                        $Ajax->addUpdate(true, 'hotkeyshelp', $phelp);
                                        echo "<td id='hotkeyshelp'>".$phelp."</td>";
                                }
-                               echo "</tr></table>\n";
+                               echo "</td></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";
@@ -142,11 +144,19 @@
                function display_applications(&$waapp)
                {
                        global $path_to_root;
+
                        $selected_app = $waapp->get_selected_application();
                        if (!$_SESSION["wa_current_user"]->check_application_access($selected_app))
                                return;
 
-                       foreach ($selected_app->modules as $module)
+                       if (method_exists($selected_app, 'render_index'))
+                       {
+                               $selected_app->render_index();
+                               return;
+                       }
+
+                       echo "<table width=100% cellpadding='0' cellspacing='0'>";
+                       foreach ($elected_app->modules as $module)
                        {
                        if (!$_SESSION["wa_current_user"]->check_module_access($module))
                                continue;
@@ -169,7 +179,7 @@
                                        {
                                                        echo $img.menu_link($appfunction->link, $appfunction->label)."<br>\n";
                                        }
-                                       elseif (!$_SESSION["wa_current_user"]->hide_inaccessible_menu_items()) 
+                                       elseif (!$_SESSION["wa_current_user"]->hide_inaccessible_menu_items())
                                        {
                                                        echo $img.'<span class="inactive">'
                                                                .access_string($appfunction->label, true)
@@ -189,7 +199,7 @@
                                                {
                                                                echo $img.menu_link($appfunction->link, $appfunction->label)."<br>\n";
                                                }
-                                               elseif (!$_SESSION["wa_current_user"]->hide_inaccessible_menu_items()) 
+                                               elseif (!$_SESSION["wa_current_user"]->hide_inaccessible_menu_items())
                                                {
                                                                echo $img.'<span class="inactive">'
                                                                        .access_string($appfunction->label, true)
@@ -201,9 +211,8 @@
 
                                echo "</tr></table></td></tr>";
                        }
-
                        echo "</table>";
-               }
+       }
        }
 
 ?>
\ No newline at end of file

diff --git a/themes/default/renderer.php b/themes/default/renderer.php
index e32cbb46876460cd79495dce09593d8a09bfbaa1..ae0cb59e544856495578bc93f9844235975e435a 100644 (file)
--- a/themes/default/renderer.php
+++ b/themes/default/renderer.php
@@ -45,13 +45,11 @@
                        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>";
@@ -68,6 +66,9 @@
                                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>";
                                $indicator = "$path_to_root/themes/".user_theme(). "/images/ajax-loader.gif";
@@ -103,7 +104,8 @@
                                $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";
@@ -116,9 +118,9 @@
                                        $Ajax->addUpdate(true, 'hotkeyshelp', $phelp);
                                        echo "<td id='hotkeyshelp'>".$phelp."</td>";
                                }
-                               echo "</tr></table>\n";
+                               echo "</td></tr></table>\n";
                        }
-                       echo "</td></tr></table></td>\n";
+                       echo "</td></tr> </table>\n"; // 'callout_main'
                        echo "</table>\n";
                        if ($no_menu == false)
                        {
@@ -146,6 +148,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 +210,8 @@
                                }
 
                                echo "</tr></table></td></tr>";
-                       }       
+                       }
                        echo "</table>";
-               }
-    }
-               
-
-
+       }
+}
 ?>
\ No newline at end of file