X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=themes%2Faqua%2Frenderer.php;h=2734ad08f644bbb5efa908346c47f95f91648042;hb=c7677cfbba820ec8d7a6f224d51fe64d4850a2a3;hp=300f90f330b82151915052ec253ae3335b0f27d0;hpb=d9b4de9d7e9d3ba77f6ece752fd6cc988effd8f1;p=fa-stable.git

diff --git a/themes/aqua/renderer.php b/themes/aqua/renderer.php
index 300f90f3..2734ad08 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/cool/images/$img' style='vertical-align:middle;' border='0'>&nbsp;&nbsp;";
+		}
+
 		function wa_header()
 		{
 			page(_($help_context = "Main Menu"), false, true);
@@ -46,8 +57,8 @@
 				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
+					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>";
@@ -58,14 +69,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>";
@@ -131,7 +142,6 @@
 			
 			$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
@@ -146,6 +156,7 @@
 
 				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)) 
@@ -165,6 +176,7 @@
 					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))