X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=themes%2Faqua%2Frenderer.php;h=a5036185273ef75e67cbf5b425208b82c331a89f;hb=5d3fcb9c57e586c20651594edf91a2dccb08df00;hp=5c3f531063732719d33f1cc5c7fea51ba78aec0d;hpb=ebc600101ceab69c06eac4b1bd4d1782af45de05;p=fa-stable.git

diff --git a/themes/aqua/renderer.php b/themes/aqua/renderer.php
index 5c3f5310..a5036185 100644
--- a/themes/aqua/renderer.php
+++ b/themes/aqua/renderer.php
@@ -11,6 +11,17 @@
 ***********************************************************************/
 	class renderer
 	{
+		function get_icon($category)
+		{
+			global  $path_to_root, $show_menu_category_icons;
+
+			if ($show_menu_category_icons)
+				$img = $category == '' ? 'right.gif' : $category.'.png';
+			else	
+				$img = 'right.gif';
+			return "<img src='$path_to_root/themes/aqua/images/$img' style='vertical-align:middle;' border='0'>&nbsp;&nbsp;";
+		}
+
 		function wa_header()
 		{
 			page(_($help_context = "Main Menu"), false, true);
@@ -24,10 +35,6 @@
 		function menu_header($title, $no_menu, $is_index)
 		{
 			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'";
-			//$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";
@@ -49,10 +56,13 @@
 				echo "<div class=tabs>";
 				foreach($applications as $app)
 				{
-					$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>";
+                    if ($_SESSION["wa_current_user"]->check_application_access($app))
+                    {
+						$acc = access_string($app->name);
+						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>";
 
@@ -62,14 +72,14 @@
 				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'><a href='$path_to_root/admin/display_prefs.php?'>" . _("Preferences") . "</a>&nbsp;&nbsp;&nbsp;\n";
-				echo "  <a href='$path_to_root/admin/change_current_user_password.php?selected_id=" . $_SESSION["wa_current_user"]->username . "'>" . _("Change password") . "</a>&nbsp;&nbsp;&nbsp;\n";
+				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";
 
 				if ($help_base_url != null)
 				{
 					echo "$himg<a target = '_blank' onclick=" .'"'."javascript:openWindow(this.href,this.target); return false;".'" '. "href='". help_url()."'>" . _("Help") . "</a>&nbsp;&nbsp;&nbsp;";
 				}
-				echo "$img<a href='$local_path_to_root/access/logout.php?'>" . _("Logout") . "</a>&nbsp;&nbsp;&nbsp;";
+				echo "$img<a class='shortcut' href='$local_path_to_root/access/logout.php?'>" . _("Logout") . "</a>&nbsp;&nbsp;&nbsp;";
 				echo "</td></tr></table>";
 			}
 			echo "</td></tr></table>";
@@ -134,10 +144,13 @@
 			global $path_to_root;
 			
 			$selected_app = $waapp->get_selected_application();
+			if (!$_SESSION["wa_current_user"]->check_application_access($selected_app))
+				return;
 
-			$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)
 			{
+        		if (!$_SESSION["wa_current_user"]->check_module_access($module))
+        			continue;
 				// image
 				echo "<tr>";
 				// values
@@ -150,13 +163,14 @@
 
 				foreach ($module->lappfunctions as $appfunction)
 				{
+					$img = $this->get_icon($appfunction->category);
 					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 
+					elseif (!$_SESSION["wa_current_user"]->hide_inaccessible_menu_items()) 
 					{
 							echo $img.'<span class="inactive">'
 								.access_string($appfunction->label, true)
@@ -169,13 +183,14 @@
 					echo "<td width='50%' class='menu_group_items'>";
 					foreach ($module->rappfunctions as $appfunction)
 					{
+						$img = $this->get_icon($appfunction->category);
 						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 
+						elseif (!$_SESSION["wa_current_user"]->hide_inaccessible_menu_items()) 
 						{
 								echo $img.'<span class="inactive">'
 									.access_string($appfunction->label, true)