X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=themes%2Faqua%2Frenderer.php;h=9e4f2c0d5f7d8d4eb86b39562e75104e25c552bc;hb=cf7be1f00c6abe59755286e0c3108d9d3c0356da;hp=2d85a4e2f90551a29e0ebf7b3a90f26fce5ea616;hpb=c90a35443b643a998ed1a06727e1743cbb8ddd89;p=fa-stable.git

diff --git a/themes/aqua/renderer.php b/themes/aqua/renderer.php
index 2d85a4e2..9e4f2c0d 100644
--- a/themes/aqua/renderer.php
+++ b/themes/aqua/renderer.php
@@ -1,5 +1,14 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+	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/gpl-3.0.html>.
+***********************************************************************/
 	class renderer
 	{
 		function wa_header()
@@ -14,7 +23,7 @@
 
 		function menu_header($title, $no_menu, $is_index)
 		{
-			global $path_to_root, $applications, $help_base_url, $db_connections;
+			global $path_to_root, $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'";
@@ -31,16 +40,19 @@
 			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/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>";
-				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>";
 
@@ -55,30 +67,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($title, $sel_app)."'>" . _("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></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)
@@ -88,8 +100,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";
@@ -115,9 +131,11 @@
 
 		function display_applications(&$waapp)
 		{
-
+			global $path_to_root;
+			
 			$selected_app = $waapp->get_selected_application();
 
+			$img = "<img src='$path_to_root/themes/aqua/images/right.gif' style='vertical-align:middle;' width='17' height='17' border='0'>&nbsp;&nbsp;";
 			foreach ($selected_app->modules as $module)
 			{
 				// image
@@ -134,8 +152,10 @@
 				{
 					if ($_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>";
+						if ($appfunction->label == "")
+							echo "&nbsp;<br>";
+						else
+							echo $img.menu_link($appfunction->link, $appfunction->label)."<br>\n";
 					}
 				}
 				echo "</td>";
@@ -146,9 +166,11 @@
 					{
 						if ($_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>";
-						}
+							if ($appfunction->label == "")
+								echo "&nbsp;<br>";
+							else
+								echo $img.menu_link($appfunction->link, $appfunction->label)."<br>\n";
+						}	
 					}
 					echo "</td>";
 				}