Moved menu-system from header.inc/footer.inc to renderer.php for relevant theme....
authorJoe Hunt <joe.hunt.consulting@gmail.com>
Fri, 23 May 2008 14:15:14 +0000 (14:15 +0000)
committerJoe Hunt <joe.hunt.consulting@gmail.com>
Fri, 23 May 2008 14:15:14 +0000 (14:15 +0000)
CHANGELOG.txt
frontaccounting.php
includes/page/footer.inc
includes/page/header.inc
themes/aqua/renderer.php
themes/cool/renderer.php
themes/default/renderer.php

index d1d86dbdb7178771c7dc98311682c03865baf639..91582330aeda992d247a0048614f5e64d5e803ee 100644 (file)
@@ -19,12 +19,15 @@ Legend:
 ! -> Note
 $ -> Affected files
 
-22-May-2008 Janusz Dobrowolski
-! Error handler switching moved to session.inc for early error catching
-$ /includes/main.inc
-  /includes/session.inc
-! Cosmetic cleanup
-  /js/utils.js
+23-May-2008 Joe Hunt
+! Moved menu-system from header.inc/footer.inc to renderer.php for relevant theme. Fixed frontaccounting.php to get the
+  correct renderer.php.
+$ frontaccounting.php
+  /includes/page/header.inc
+  /includes/page/footer.inc
+  /themes/default/renderer.php
+  /themes/cool/renderer.php
+  /themes/aqua/renderer.php
   
 18-May-2008 Janusz Dobrowolski
 # Added explicit ob_end_flush() on shutdown needed for php5
index 409186c12d9f73cea4f1b1e895324a628b14c4c8..6f3ad3335bd5786fbf0e07ec9db99d6d97912f3e 100644 (file)
@@ -7,11 +7,10 @@
        include_once('applications/dimensions.php');
        include_once('applications/generalledger.php');
        include_once('applications/setup.php');
-       include_once('themes/default/renderer.php');
        $path_to_root=".";
        include_once($path_to_root . "/includes/session.inc");
 
-       class front_accounting 
+       class front_accounting
                {
                var $user;
                var $settings;
                var $selected_application;
                // GUI
                var $menu;
-               var $renderer;
-               function front_accounting() 
-                               {
-                                                       $this->renderer = new renderer();
-                               }
-               function add_application($app) 
+               //var $renderer;
+               function front_accounting()
+               {
+                       //$this->renderer =& new renderer();
+               }
+               function add_application($app)
                                {
                                                        $this->applications[$app->id] = &$app;
                                }
-               function get_application($id) 
+               function get_application($id)
                                {
                                 if (isset($this->applications[$id]))
                                        return $this->applications[$id];
                                 return null;
                                }
-               function get_selected_application() 
-                               {
-                                                       if (isset($this->selected_application))
+               function get_selected_application()
+               {
+                       if (isset($this->selected_application))
                                 return $this->applications[$this->selected_application];
                        foreach ($this->applications as $application)
                                return $application;
                        return null;
-                                       }
-               function display() 
-                               {
-                                                       $this->init();
-                       $this->renderer->wa_header();
-                       $this->renderer->menu_header($this->menu);
-                       $this->renderer->display_applications($this);
-                       $this->renderer->menu_footer($this->menu);
-                       $this->renderer->wa_footer();
-                               }
-               function init() 
+               }
+               function display()
+               {
+                       global $path_to_root;
+                       include($path_to_root . "/themes/".user_theme()."/renderer.php");
+                       $this->init();
+                       $rend = new renderer();
+                       $rend->wa_header();
+                       //$rend->menu_header($this->menu);
+                       $rend->display_applications($this);
+                       //$rend->menu_footer($this->menu);
+                       $rend->wa_footer();
+               }
+               function init()
                                {
                        $this->menu = new menu(_("Main  Menu"));
                        $this->menu->add_item(_("Main  Menu"), "index.php");
@@ -64,6 +66,6 @@
                        $this->add_application(new dimensions_app());
                        $this->add_application(new general_ledger_app());
                        $this->add_application(new setup_app());
-                       }       
+                       }
 }
 ?>
\ No newline at end of file
index f0a9b65e92435dc16b97669dfa8dd0e68ccc3db5..d597ab3bc11e60bd138ec95bd233e4adcf86c8cb 100644 (file)
@@ -1,46 +1,17 @@
 <?php
 
-include_once($path_to_root . "/includes/date_functions.inc");
-
 function page_footer($no_menu=false, $is_index=false)
 {
-       global $version, $allow_demo_mode;
-       global $app_title, $power_url, $power_by;
+       global $path_to_root;
 
-  if(in_ajax()) return;// just for speed up
+       if (in_ajax())
+               return;// just for speed up
 
-  if (function_exists('hyperlink_back'))
+       if (function_exists('hyperlink_back'))
                hyperlink_back();
-       if ($no_menu == false) 
-       {
-       if ($is_index)
-               echo "<table class=bottomBar>\n";
-       else
-               echo "<table class=bottomBar2>\n";
-       echo "<tr>";
-       if (isset($_SESSION['wa_current_user']))
-               echo "<td class=bottomBarCell>" . Today() . " | " . Now() . "</td>\n";
-       echo "</tr></table>\n";
-       }
-       echo "</td></tr></table></td>\n";
-    echo "</table>\n";
-    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'><font color='#ffffff'>$app_title $version - " . _("Theme:") . " " . user_theme() . "</font></a></td>\n";
-       echo "</tr>\n";
-       echo "<tr>\n";
-       echo "<td align='center' class='footer'><a target='_blank' href='$power_url'><font color='#ffff00'>$power_by</font></a></td>\n";
-       echo "</tr>\n";
-       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 "</tr>\n";
-       }
-       echo "</table><br><br>\n";
-    }
+       include_once($path_to_root."/themes/".user_theme()."/renderer.php");
+       $rend = new renderer();
+       $rend->menu_footer($no_menu, $is_index);
     echo "</body></html>\n";
 }
 
index 50c562521d2e72d7d277b42a463aecef03d4d6b4..7d52f410bb77fbe25553f38681bbae94e6c27f99 100644 (file)
@@ -27,41 +27,44 @@ function help_url($title, $app)
        return $help_base_url.urlencode(str_replace(' ', '', ucwords($help_page_url)));
 }
 
-function send_scripts() 
+function send_scripts()
 {
     global $js_lib, $js_static, $js_path, $js_userlib, $comp_path,
        $path_to_root, $go_debug;
-    
-       add_user_js_data();
+
+       add_user_js_data();
 
        $js ='';
-       foreach($js_static as $jsfile) {
+       foreach($js_static as $jsfile)
+       {
            $fpath = $comp_path.'/'.user_company().'/js_cache/'.$jsfile;
            // compress also static files
-         if (!file_exists($fpath) || $go_debug)
-               cache_js_file($fpath, file_get_contents($js_path.$jsfile));
-       
-         $js .= '<script language="javascript" type="text/javascript" src="'.
-               $fpath . '"></script>';
+               if (!file_exists($fpath) || $go_debug)
+                       cache_js_file($fpath, file_get_contents($js_path.$jsfile));
+
+               $js .= '<script language="javascript" type="text/javascript" src="'.
+                       $fpath . '"></script>';
        }
-       foreach($js_userlib as $jsfile) {
-         $js .= '<script language="javascript" type="text/javascript" src="'.
-           $jsfile . '"></script>';
+       foreach($js_userlib as $jsfile)
+       {
+               $js .= '<script language="javascript" type="text/javascript" src="'.
+               $jsfile . '"></script>';
        }
 
-       foreach($js_lib as $text) {
-         $js .= $text;
+       foreach($js_lib as $text)
+       {
+               $js .= $text;
        }
-        echo $js;
+    echo $js;
 }
 
 function page_header($title, $no_menu=false, $is_index=false, $onload="", $js="")
 {
        // titles and screen header
-       global $db_connections, $path_to_root, $def_app, $applications,
-               $help_base_url, $help_page_url, $use_popup_windows;
+       global $path_to_root, $def_app, $use_popup_windows, $help_base_url;
 
-       if (in_ajax()) return; // just for speed up
+       if (in_ajax())
+               return; // just for speed up
 
        $theme = user_theme();
        $local_path_to_root = $path_to_root;
@@ -110,51 +113,9 @@ function page_header($title, $no_menu=false, $is_index=false, $onload="", $js=""
                echo "<body>";
        else
                echo "<body onload=\"$onload\">";
-
-       echo "<table class='callout_main' border='0' cellpadding='0' cellspacing='0'>\n";
-       echo "<tr>\n";
-       echo "<td colspan='2' rowspan='2'>\n";
-
-       echo "<table class='main_page' border='0' cellpadding='0' cellspacing='0'>\n";
-       echo "<tr>\n";
-       echo "<td>\n";
-       echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
-       echo "<tr>\n";
-       echo "<td class='quick_menu'>\n";
-       if (!$no_menu)
-       {
-               echo "<table cellpadding=0 cellspacing=0 width='100%'><tr><td>";
-               echo "<div class=tabs>";
-               foreach($applications as $app => $name)
-               {
-                       echo "<a ".($sel_app == $app ? "class='selected' " : "").
-                       "href='$local_path_to_root/index.php?application=".$app.
-                               SID ."'>" .$name . "</a>";
-               }
-               echo "</div>";
-
-               echo "</td></tr></table>";
-
-               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>";
-               if ($help_base_url != null)
-               {
-
-                       echo "<td align=right ><a target = '_blank' onclick=" .'"'."javascript:openWindow(this.href,this.target); return false;".'" '. "href='". help_url($title, $sel_app)."'>" . _("Help") . "</a></td>";
-               }
-               echo "<td class=logoutBarRight><a href='$local_path_to_root/access/logout.php?'>" . _("Logout") . "</a>";
-               echo "</td></tr></table>";
-       }
-
-       echo "</td></tr></table>";
-
-       if ($title && !$no_menu && !$is_index)
-       {
-               echo "<center><table width='100%'><tr><td width='100%' class='titletext'>$title</td></tr></table></center>";
-       }
-
-       if (!$is_index)
-               echo "<br>";
+       include_once($local_path_to_root."/themes/".user_theme()."/renderer.php");
+       $rend = new renderer();
+       $rend->menu_header($title, $no_menu, $is_index);
 }
 
 ?>
\ No newline at end of file
index ae08478787741183654a1ab3359045c1b2e79d7b..924c82e2208aeeb154ab9b5a58455adf9e8b6b3f 100644 (file)
 <?php
-       class renderer 
+
+       class renderer
        {
-               function wa_header() 
+               function wa_header()
                {
                        page(_("Main Menu"), false, true);
                }
 
-               function wa_footer() 
+               function wa_footer()
                {
                        end_page(false, true);
                }
 
-               function menu_header(&$menu) 
+               function menu_header($title, $no_menu, $is_index)
                {
+                       global $path_to_root, $applications, $help_base_url, $db_connections;
+                       // you can owerride the table styles from config.php here, if you want.
+                       //global $table_style, $table_style2;
+                       //$table_style  = "cellpadding=3 border=1 bordercolor='#8cacbb' style='border-collapse: collapse'";
+                       //$table_style2 = "cellpadding=3 border=1 bordercolor='#cccccc' style='border-collapse: collapse'";
+                       echo "<table class='callout_main' border='0' cellpadding='0' cellspacing='0'>\n";
+                       echo "<tr>\n";
+                       echo "<td colspan='2' rowspan='2'>\n";
+
+                       echo "<table class='main_page' border='0' cellpadding='0' cellspacing='0'>\n";
+                       echo "<tr>\n";
+                       echo "<td>\n";
+                       echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
+                       echo "<tr>\n";
+                       echo "<td class='quick_menu'>\n";
+                       if (!$no_menu)
+                       {
+                               $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>";
+                               foreach($applications as $app => $name)
+                               {
+                                       echo "<a ".($sel_app == $app ? "class='selected' " : "").
+                                       "href='$local_path_to_root/index.php?application=".$app.
+                                               SID ."'>" .$name . "</a>";
+                               }
+                               echo "</div>";
+
+                               echo "</td></tr></table>";
+
+                               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>";
+                               if ($help_base_url != null)
+                               {
+                                       echo "<td align=right ><a target = '_blank' onclick=" .'"'."javascript:openWindow(this.href,this.target); return false;".'" '. "href='". help_url($title, $sel_app)."'>" . _("Help") . "</a></td>";
+                               }
+                               echo "<td class=logoutBarRight><a href='$local_path_to_root/access/logout.php?'>" . _("Logout") . "</a>";
+                               echo "</td></tr></table>";
+                       }
+                       echo "</td></tr></table>";
+
+                       if ($title && !$no_menu && !$is_index)
+                       {
+                               echo "<center><table width='100%'><tr><td width='100%' class='titletext'>$title</td></tr></table></center>";
+                       }
+
+                       if (!$is_index)
+                               echo "<br>";
+
                }
 
-               function menu_footer(&$menu) 
+               function menu_footer($no_menu, $is_index)
                {
+                       global $version, $allow_demo_mode, $app_title, $power_url, $power_by, $path_to_root;
+                       include_once($path_to_root . "/includes/date_functions.inc");
+
+                       if ($no_menu == false)
+                       {
+                               if ($is_index)
+                                       echo "<table class=bottomBar>\n";
+                               else
+                                       echo "<table class=bottomBar2>\n";
+                               echo "<tr>";
+                               if (isset($_SESSION['wa_current_user']))
+                                       echo "<td class=bottomBarCell>" . Today() . " | " . Now() . "</td>\n";
+                               echo "</tr></table>\n";
+                       }
+                       echo "</td></tr></table></td>\n";
+                       echo "</table>\n";
+                       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'><font color='#ffffff'>$app_title $version - " . _("Theme:") . " " . user_theme() . "</font></a></td>\n";
+                               echo "</tr>\n";
+                               echo "<tr>\n";
+                               echo "<td align='center' class='footer'><a target='_blank' href='$power_url'><font color='#ffff00'>$power_by</font></a></td>\n";
+                               echo "</tr>\n";
+                               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 "</tr>\n";
+                               }
+                               echo "</table><br><br>\n";
+                       }
                }
 
-               function display_applications(&$waapp) 
+               function display_applications(&$waapp)
                {
 
-                       $selected_app = &$waapp->get_selected_application();
+                       $selected_app = $waapp->get_selected_application();
 
-                       foreach ($selected_app->modules as $module) 
+                       foreach ($selected_app->modules as $module)
                        {
                                // image
                                echo "<tr>";
                                echo "</td></tr><tr>";
                                echo "<td class='menu_group_items'>";
 
-                               foreach ($module->lappfunctions as $appfunction) 
+                               foreach ($module->lappfunctions as $appfunction)
                                {
                                        if ($_SESSION["wa_current_user"]->can_access_page($appfunction->access))
                                                echo "<a href='$appfunction->link'> " . $appfunction->label . "</a><br>";
                                }
                                echo "</td>";
-                               //echo "\nOA_current_user name = " . $_SESSION["wa_current_user"]->username;
-                               if (sizeof($module->rappfunctions) > 0) 
+                               if (sizeof($module->rappfunctions) > 0)
                                {
                                        echo "<td width='50%' class='menu_group_items'>";
-                                       foreach ($module->rappfunctions as $appfunction) 
+                                       foreach ($module->rappfunctions as $appfunction)
                                        {
                                                if ($_SESSION["wa_current_user"]->can_access_page($appfunction->access))
                                                        echo "<a href='$appfunction->link'> " . $appfunction->label . "</a><br>";
index 099ddda4b28240664fd9d273fe4cbd244591f0e2..924c82e2208aeeb154ab9b5a58455adf9e8b6b3f 100644 (file)
 <?php
 
-       class renderer 
+       class renderer
        {
-               function wa_header() 
+               function wa_header()
                {
                        page(_("Main Menu"), false, true);
                }
 
-               function wa_footer() 
+               function wa_footer()
                {
                        end_page(false, true);
                }
 
-               function menu_header(&$menu) 
+               function menu_header($title, $no_menu, $is_index)
                {
+                       global $path_to_root, $applications, $help_base_url, $db_connections;
+                       // you can owerride the table styles from config.php here, if you want.
+                       //global $table_style, $table_style2;
+                       //$table_style  = "cellpadding=3 border=1 bordercolor='#8cacbb' style='border-collapse: collapse'";
+                       //$table_style2 = "cellpadding=3 border=1 bordercolor='#cccccc' style='border-collapse: collapse'";
+                       echo "<table class='callout_main' border='0' cellpadding='0' cellspacing='0'>\n";
+                       echo "<tr>\n";
+                       echo "<td colspan='2' rowspan='2'>\n";
+
+                       echo "<table class='main_page' border='0' cellpadding='0' cellspacing='0'>\n";
+                       echo "<tr>\n";
+                       echo "<td>\n";
+                       echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
+                       echo "<tr>\n";
+                       echo "<td class='quick_menu'>\n";
+                       if (!$no_menu)
+                       {
+                               $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>";
+                               foreach($applications as $app => $name)
+                               {
+                                       echo "<a ".($sel_app == $app ? "class='selected' " : "").
+                                       "href='$local_path_to_root/index.php?application=".$app.
+                                               SID ."'>" .$name . "</a>";
+                               }
+                               echo "</div>";
+
+                               echo "</td></tr></table>";
+
+                               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>";
+                               if ($help_base_url != null)
+                               {
+                                       echo "<td align=right ><a target = '_blank' onclick=" .'"'."javascript:openWindow(this.href,this.target); return false;".'" '. "href='". help_url($title, $sel_app)."'>" . _("Help") . "</a></td>";
+                               }
+                               echo "<td class=logoutBarRight><a href='$local_path_to_root/access/logout.php?'>" . _("Logout") . "</a>";
+                               echo "</td></tr></table>";
+                       }
+                       echo "</td></tr></table>";
+
+                       if ($title && !$no_menu && !$is_index)
+                       {
+                               echo "<center><table width='100%'><tr><td width='100%' class='titletext'>$title</td></tr></table></center>";
+                       }
+
+                       if (!$is_index)
+                               echo "<br>";
+
                }
 
-               function menu_footer(&$menu) 
+               function menu_footer($no_menu, $is_index)
                {
+                       global $version, $allow_demo_mode, $app_title, $power_url, $power_by, $path_to_root;
+                       include_once($path_to_root . "/includes/date_functions.inc");
+
+                       if ($no_menu == false)
+                       {
+                               if ($is_index)
+                                       echo "<table class=bottomBar>\n";
+                               else
+                                       echo "<table class=bottomBar2>\n";
+                               echo "<tr>";
+                               if (isset($_SESSION['wa_current_user']))
+                                       echo "<td class=bottomBarCell>" . Today() . " | " . Now() . "</td>\n";
+                               echo "</tr></table>\n";
+                       }
+                       echo "</td></tr></table></td>\n";
+                       echo "</table>\n";
+                       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'><font color='#ffffff'>$app_title $version - " . _("Theme:") . " " . user_theme() . "</font></a></td>\n";
+                               echo "</tr>\n";
+                               echo "<tr>\n";
+                               echo "<td align='center' class='footer'><a target='_blank' href='$power_url'><font color='#ffff00'>$power_by</font></a></td>\n";
+                               echo "</tr>\n";
+                               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 "</tr>\n";
+                               }
+                               echo "</table><br><br>\n";
+                       }
                }
 
-               function display_applications(&$waapp) 
+               function display_applications(&$waapp)
                {
 
-                       $selected_app = &$waapp->get_selected_application();
+                       $selected_app = $waapp->get_selected_application();
 
-                       foreach ($selected_app->modules as $module) 
+                       foreach ($selected_app->modules as $module)
                        {
                                // image
                                echo "<tr>";
                                echo "</td></tr><tr>";
                                echo "<td class='menu_group_items'>";
 
-                               foreach ($module->lappfunctions as $appfunction) 
+                               foreach ($module->lappfunctions as $appfunction)
                                {
                                        if ($_SESSION["wa_current_user"]->can_access_page($appfunction->access))
                                                echo "<a href='$appfunction->link'> " . $appfunction->label . "</a><br>";
                                }
                                echo "</td>";
-                               //echo "\nOA_current_user name = " . $_SESSION["wa_current_user"]->username;
-                               if (sizeof($module->rappfunctions) > 0) 
+                               if (sizeof($module->rappfunctions) > 0)
                                {
                                        echo "<td width='50%' class='menu_group_items'>";
-                                       foreach ($module->rappfunctions as $appfunction) 
+                                       foreach ($module->rappfunctions as $appfunction)
                                        {
                                                if ($_SESSION["wa_current_user"]->can_access_page($appfunction->access))
                                                        echo "<a href='$appfunction->link'> " . $appfunction->label . "</a><br>";
index ad3ccc578da603f1b65a6051602628d593d70498..924c82e2208aeeb154ab9b5a58455adf9e8b6b3f 100644 (file)
 <?php
 
-       class renderer 
+       class renderer
        {
-               function wa_header() 
+               function wa_header()
                {
                        page(_("Main Menu"), false, true);
                }
 
-               function wa_footer() 
+               function wa_footer()
                {
                        end_page(false, true);
                }
 
-               function menu_header(&$menu) 
+               function menu_header($title, $no_menu, $is_index)
                {
+                       global $path_to_root, $applications, $help_base_url, $db_connections;
+                       // you can owerride the table styles from config.php here, if you want.
+                       //global $table_style, $table_style2;
+                       //$table_style  = "cellpadding=3 border=1 bordercolor='#8cacbb' style='border-collapse: collapse'";
+                       //$table_style2 = "cellpadding=3 border=1 bordercolor='#cccccc' style='border-collapse: collapse'";
+                       echo "<table class='callout_main' border='0' cellpadding='0' cellspacing='0'>\n";
+                       echo "<tr>\n";
+                       echo "<td colspan='2' rowspan='2'>\n";
+
+                       echo "<table class='main_page' border='0' cellpadding='0' cellspacing='0'>\n";
+                       echo "<tr>\n";
+                       echo "<td>\n";
+                       echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
+                       echo "<tr>\n";
+                       echo "<td class='quick_menu'>\n";
+                       if (!$no_menu)
+                       {
+                               $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>";
+                               foreach($applications as $app => $name)
+                               {
+                                       echo "<a ".($sel_app == $app ? "class='selected' " : "").
+                                       "href='$local_path_to_root/index.php?application=".$app.
+                                               SID ."'>" .$name . "</a>";
+                               }
+                               echo "</div>";
+
+                               echo "</td></tr></table>";
+
+                               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>";
+                               if ($help_base_url != null)
+                               {
+                                       echo "<td align=right ><a target = '_blank' onclick=" .'"'."javascript:openWindow(this.href,this.target); return false;".'" '. "href='". help_url($title, $sel_app)."'>" . _("Help") . "</a></td>";
+                               }
+                               echo "<td class=logoutBarRight><a href='$local_path_to_root/access/logout.php?'>" . _("Logout") . "</a>";
+                               echo "</td></tr></table>";
+                       }
+                       echo "</td></tr></table>";
+
+                       if ($title && !$no_menu && !$is_index)
+                       {
+                               echo "<center><table width='100%'><tr><td width='100%' class='titletext'>$title</td></tr></table></center>";
+                       }
+
+                       if (!$is_index)
+                               echo "<br>";
+
                }
 
-               function menu_footer(&$menu) 
+               function menu_footer($no_menu, $is_index)
                {
+                       global $version, $allow_demo_mode, $app_title, $power_url, $power_by, $path_to_root;
+                       include_once($path_to_root . "/includes/date_functions.inc");
+
+                       if ($no_menu == false)
+                       {
+                               if ($is_index)
+                                       echo "<table class=bottomBar>\n";
+                               else
+                                       echo "<table class=bottomBar2>\n";
+                               echo "<tr>";
+                               if (isset($_SESSION['wa_current_user']))
+                                       echo "<td class=bottomBarCell>" . Today() . " | " . Now() . "</td>\n";
+                               echo "</tr></table>\n";
+                       }
+                       echo "</td></tr></table></td>\n";
+                       echo "</table>\n";
+                       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'><font color='#ffffff'>$app_title $version - " . _("Theme:") . " " . user_theme() . "</font></a></td>\n";
+                               echo "</tr>\n";
+                               echo "<tr>\n";
+                               echo "<td align='center' class='footer'><a target='_blank' href='$power_url'><font color='#ffff00'>$power_by</font></a></td>\n";
+                               echo "</tr>\n";
+                               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 "</tr>\n";
+                               }
+                               echo "</table><br><br>\n";
+                       }
                }
 
-               function display_applications(&$waapp) 
+               function display_applications(&$waapp)
                {
 
                        $selected_app = $waapp->get_selected_application();
-                       foreach ($selected_app->modules as $module) 
+
+                       foreach ($selected_app->modules as $module)
                        {
                                // image
                                echo "<tr>";
                                echo "</td></tr><tr>";
                                echo "<td class='menu_group_items'>";
 
-                               foreach ($module->lappfunctions as $appfunction) 
+                               foreach ($module->lappfunctions as $appfunction)
                                {
                                        if ($_SESSION["wa_current_user"]->can_access_page($appfunction->access))
                                                echo "<a href='$appfunction->link'> " . $appfunction->label . "</a><br>";
                                }
                                echo "</td>";
-                               //echo "\nOA_current_user name = " . $_SESSION["wa_current_user"]->username;
-                               if (sizeof($module->rappfunctions) > 0) 
+                               if (sizeof($module->rappfunctions) > 0)
                                {
                                        echo "<td width='50%' class='menu_group_items'>";
-                                       foreach ($module->rappfunctions as $appfunction) 
+                                       foreach ($module->rappfunctions as $appfunction)
                                        {
                                                if ($_SESSION["wa_current_user"]->can_access_page($appfunction->access))
                                                        echo "<a href='$appfunction->link'> " . $appfunction->label . "</a><br>";