X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=themes%2Fdefault%2Frenderer.php;h=aaee7125ccff889b85c497fae961ef5b99e534f3;hb=20c9b5846824f0489c6791d74a6c78e2bfb0b2fc;hp=21c263fb250b52468723a53b344760ad7e879310;hpb=818719f38b8327cdca616d58b13913dbd174d96a;p=fa-stable.git

diff --git a/themes/default/renderer.php b/themes/default/renderer.php
index 21c263fb..aaee7125 100644
--- a/themes/default/renderer.php
+++ b/themes/default/renderer.php
@@ -1,19 +1,20 @@
 <?php
 /**********************************************************************
     Copyright (C) FrontAccounting, LLC.
-	Released under the terms of the GNU Affero General Public License,
-	AGPL, as published by the Free Software Foundation, either version 
-	3 of the License, or (at your option) any later version.
+	Released under the terms of the GNU General Public License, GPL, 
+	as published by the Free Software Foundation, either version 3 
+	of the License, or (at your option) any later version.
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
-    See the License here <http://www.gnu.org/licenses/agpl-3.0.html>.
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
 	class renderer
 	{
 		function wa_header()
 		{
-			page(_("Main Menu"), false, true);
+//			add_js_ufile("themes/default/renderer.js");
+			page(_($help_context = "Main Menu"), false, true);
 		}
 
 		function wa_footer()
@@ -23,11 +24,7 @@
 
 		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'";
+			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 "<td colspan='2' rowspan='2'>\n";
@@ -40,16 +37,20 @@
 			echo "<td class='quick_menu'>\n";
 			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>";
-				foreach($applications as $app => $name)
+				foreach($applications as $app)
 				{
-					$acc = access_string($name);
-					echo "<a ".($sel_app == $app ? "class='selected' " : "").
-					"href='$local_path_to_root/index.php?application=".$app.
-						SID ."'$acc[1]>" .$acc[0] . "</a>";
+					$acc = access_string($app->name);
+					echo "<a ".($sel_app == $app->id ? 
+						("class='selected'") : "")
+						." href='$local_path_to_root/index.php?application=".$app->id
+						."'$acc[1]>" .$acc[0] . "</a>";
 				}
 				echo "</div>";
 				echo "</td></tr></table>";
@@ -63,30 +64,30 @@
 
 				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()."'>" . _("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><tr><td colspan=3>";
 				echo "</td></tr></table>";
 			}
 			echo "</td></tr></table>";
 
-			if ($title && !$no_menu && !$is_index)
+			if ($no_menu)
+				echo "<br>";
+			elseif ($title && !$is_index)
 			{
-				echo "<center><table width='100%'><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>";
 			}
-
-			if (!$is_index)
-				echo "<br>";
-
 		}
 
 		function menu_footer($no_menu, $is_index)
 		{
-			global $version, $allow_demo_mode, $app_title, $power_url, $power_by, $path_to_root;
+			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)
@@ -96,8 +97,12 @@
 				else
 					echo "<table class=bottomBar2>\n";
 				echo "<tr>";
-				if (isset($_SESSION['wa_current_user']))
+				if (isset($_SESSION['wa_current_user'])) {
+					$phelp = implode('; ', $Pagehelp);
 					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";
@@ -106,7 +111,7 @@
 			{
 				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() . "</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";
@@ -123,9 +128,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
@@ -140,10 +147,17 @@
 
 				foreach ($module->lappfunctions as $appfunction)
 				{
-					if ($_SESSION["wa_current_user"]->can_access_page($appfunction->access)) 
+					if ($appfunction->label == "")
+						echo "&nbsp;<br>";
+					elseif ($_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>";
+							echo $img.menu_link($appfunction->link, $appfunction->label)."<br>\n";
+					}
+					else 
+					{
+							echo $img.'<span class="inactive">'
+								.access_string($appfunction->label, true)
+								."</span><br>\n";
 					}
 				}
 				echo "</td>";
@@ -152,10 +166,17 @@
 					echo "<td width='50%' class='menu_group_items'>";
 					foreach ($module->rappfunctions as $appfunction)
 					{
-						if ($_SESSION["wa_current_user"]->can_access_page($appfunction->access)) 
+						if ($appfunction->label == "")
+							echo "&nbsp;<br>";
+						elseif ($_SESSION["wa_current_user"]->can_access_page($appfunction->access)) 
+						{
+								echo $img.menu_link($appfunction->link, $appfunction->label)."<br>\n";
+						}
+						else 
 						{
-							$lnk = access_string($appfunction->label);
-							echo "<a href='$appfunction->link'$lnk[1]>$lnk[0]</a><br>";
+								echo $img.'<span class="inactive">'
+									.access_string($appfunction->label, true)
+									."</span><br>\n";
 						}
 					}
 					echo "</td>";