=== modified file 'local/vn/dhis-web-dataentry-hospital/src/main/webapp/main.vm'
--- local/vn/dhis-web-dataentry-hospital/src/main/webapp/main.vm	2012-03-26 02:41:46 +0000
+++ local/vn/dhis-web-dataentry-hospital/src/main/webapp/main.vm	2012-04-16 06:38:26 +0000
@@ -5,36 +5,35 @@
 	<link type="text/css" rel="stylesheet" media="screen" href="../dhis-web-commons/javascripts/jQuery/ui/css/redmond/jquery-ui-1.8.12.custom.css" />
     <link type="text/css" rel="stylesheet" media="screen" href="../dhis-web-commons/css/${stylesheet}" />
     <link type="text/css" rel="stylesheet" media="screen" href="../dhis-web-commons/css/widgets.css" />
-
+    #foreach ( $style in $stylesheets )
+    <link type="text/css" rel="stylesheet" href="$style">
+    #end    
     <link type="image/png" rel="icon" href="../images/favicon.png" />
-
-    #foreach ( $style in $stylesheets )
-      <link type="text/css" rel="stylesheet" href="$style">
-    #end
-    
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 
     <script type="text/javascript">
-		var dateFormat = 'yy-mm-dd';
-	</script>
+      var dateFormat = 'yy-mm-dd';
+      var maintenanceModulesNo = ${maintenanceModules.size()};
+      var serviceModulesNo = ${serviceModules.size()};
+    </script>
 
     <script type="text/javascript" src="../dhis-web-commons/javascripts/jQuery/jquery.min.js"></script>
     <script type="text/javascript" src="../dhis-web-commons/javascripts/jQuery/jquery.ext.js"></script>
-	<script type="text/javascript" src="../dhis-web-commons/javascripts/jQuery/jquery.metadata.js"></script>	
-	<script type="text/javascript" src="../dhis-web-commons/javascripts/jQuery/jquery.tablesorter.min.js"></script>
-	<script type="text/javascript" src="../dhis-web-commons/javascripts/jQuery/jquery.upload-1.0.2.min.js"></script>
-	<script type="text/javascript" src="../dhis-web-commons/javascripts/jQuery/jquery.dhisAjaxSelect.js"></script>
-	<script type="text/javascript" src="../dhis-web-commons/javascripts/jQuery/jquery.utils.js"></script>
-	<script type="text/javascript" src="../dhis-web-commons/javascripts/jQuery/ui/jquery-ui-1.8.12.custom.min.js"></script>
-	<script type="text/javascript" src="../dhis-web-commons/javascripts/jQuery/ui/jquery.blockUI.js"></script>
-	<script type="text/javascript" src="../dhis-web-commons/javascripts/jQuery/jquery.validate.js"></script>
-	<script type="text/javascript" src="../dhis-web-commons/javascripts/jQuery/jquery.validate.ext.js"></script>
-	<script type="text/javascript" src="../dhis-web-commons/javascripts/jQuery/jquery.cookie.js"></script>
-	<script type="text/javascript" src="../dhis-web-commons/javascripts/jQuery/jquery.glob.js"></script>
-	<script type="text/javascript" src="../dhis-web-commons/javascripts/jQuery/jquery.date.js"></script>
-	<script type="text/javascript" src="../dhis-web-commons/javascripts/jQuery/jquery.tmpl.js"></script>
-	<script type="text/javascript" src="../dhis-web-commons/i18nJavaScript.action"></script>
-	<script type="text/javascript" src="../dhis-web-commons/messagesJavaScript.action"></script>
+    <script type="text/javascript" src="../dhis-web-commons/javascripts/jQuery/jquery.metadata.js"></script>	
+    <script type="text/javascript" src="../dhis-web-commons/javascripts/jQuery/jquery.tablesorter.min.js"></script>
+    <script type="text/javascript" src="../dhis-web-commons/javascripts/jQuery/jquery.upload-1.0.2.min.js"></script>
+    <script type="text/javascript" src="../dhis-web-commons/javascripts/jQuery/jquery.dhisAjaxSelect.js"></script>
+    <script type="text/javascript" src="../dhis-web-commons/javascripts/jQuery/jquery.utils.js"></script>
+    <script type="text/javascript" src="../dhis-web-commons/javascripts/jQuery/ui/jquery-ui-1.8.12.custom.min.js"></script>
+    <script type="text/javascript" src="../dhis-web-commons/javascripts/jQuery/ui/jquery.blockUI.js"></script>
+    <script type="text/javascript" src="../dhis-web-commons/javascripts/jQuery/jquery.validate.js"></script>
+    <script type="text/javascript" src="../dhis-web-commons/javascripts/jQuery/jquery.validate.ext.js"></script>
+    <script type="text/javascript" src="../dhis-web-commons/javascripts/jQuery/jquery.cookie.js"></script>
+    <script type="text/javascript" src="../dhis-web-commons/javascripts/jQuery/jquery.glob.js"></script>
+    <script type="text/javascript" src="../dhis-web-commons/javascripts/jQuery/jquery.date.js"></script>
+    <script type="text/javascript" src="../dhis-web-commons/javascripts/jQuery/jquery.tmpl.js"></script>
+    <script type="text/javascript" src="../dhis-web-commons/i18nJavaScript.action"></script>
+    <script type="text/javascript" src="../dhis-web-commons/messagesJavaScript.action"></script>
     <script type="text/javascript" src="../dhis-web-commons/javascripts/commons.js"></script>
     <script type="text/javascript" src="../dhis-web-commons/javascripts/commons.ajax.js"></script>
     <script type="text/javascript" src="../dhis-web-commons/javascripts/lists.js"></script>
@@ -42,64 +41,21 @@
     <script type="text/javascript" src="../dhis-web-commons/javascripts/date.js"></script>
     <script type="text/javascript" src="../dhis-web-commons/javascripts/json2.js"></script>
     <script type="text/javascript" src="../dhis-web-commons/javascripts/validationRules.js"></script>
-
     <script type="text/javascript" src="../dhis-web-commons/javascripts/dhis2/dhis2.util.js"></script>
     <script type="text/javascript" src="../dhis-web-commons/javascripts/dhis2/dhis2.array.js"></script>
     <script type="text/javascript" src="../dhis-web-commons/javascripts/dhis2/dhis2.select.js"></script>
     <script type="text/javascript" src="../dhis-web-commons/javascripts/dhis2/dhis2.comparator.js"></script>
     <script type="text/javascript" src="../dhis-web-commons/javascripts/dhis2/dhis2.availability.js"></script>
-
-    <script type="text/javascript" src="../dhis-web-commons/css/${stylesheetDirectory}/dom.js"></script>
-		
-    <script type="text/javascript" src="../main.js"></script>
-  
+    <script type="text/javascript" src="../dhis-web-commons/css/${stylesheetDirectory}/dom.js"></script>		
+    <script type="text/javascript" src="../main.js"></script>  
     <script type="text/javascript" src="../request.js"></script>
     #foreach( $javascript in $javascripts )
-      <script type="text/javascript" src="$javascript"></script>
+    <script type="text/javascript" src="$javascript"></script>
     #end
-
-	<script type="text/javascript">
-		jQuery(document).ready(function() {
-			#if ( $maintenanceModules.size() > 0 )
-			jQuery("#menuLink1").hover(function() {
-				showDropDown( 'menuDropDown1' );
-			}, function() {
-				hideDropDownTimeout();
-			});
-			#end
-
-			#if ( $serviceModules.size() > 0 )
-			jQuery("#menuLink2").hover(function() {
-				showDropDown( 'menuDropDown2' );
-			}, function() {
-				hideDropDownTimeout();
-			});
-			#end
-
-			jQuery("#menuLink3").hover(function() {
-				showDropDown( 'menuDropDown3' );
-			}, function() {
-				hideDropDownTimeout();
-			});
-
-			jQuery("#menuLink4").click( function() {
-				jQuery.cookie('pageSize', null, {path:'/'});
-				window.location.href='../dhis-web-commons-security/logout.action';
-			});
-
-			jQuery("#menuDropDown1, #menuDropDown2, #menuDropDown3").hover(function() {
-				cancelHideDropDownTimeout();
-			}, function() {
-				hideDropDownTimeout();
-			});
-		});
-	</script>
   </head>
   
-  <body>
-    
-    #parse( "macros.vm" )
-        
+  <body>    
+    #parse( "macros.vm" )        
     <div id="header">
       <img id="headerBanner" src="../dhis-web-commons/css/${stylesheetDirectory}/logo_banner.png" 
         onclick="window.location.href='../dhis-web-commons-about/modules.action'" style="cursor:pointer" title="$i18n.getString( 'go_to_system_overview' )">
@@ -116,41 +72,41 @@
       <div id="menuLink4" class="menuLink">$i18n.getString( "log_out" )</div>
 
       <div id="menuDropDown1" class="menuDropDownArea" >
-        <ul class="menuDropDownBox">
-        #foreach( $module in $maintenanceModules )
-          #if( $auth.hasAccess( $module.name, "index" ) )
-            <li class="menuDropDownItem" onclick="window.location.href='${module.defaultAction}'">
-            	<a href="${module.defaultAction}">$i18n.getString( $module.name )&nbsp;</a>
-            </li>
-          #end
-        #end
-        </ul>      
+      <ul class="menuDropDownBox">
+      #foreach( $module in $maintenanceModules )
+      #if( $auth.hasAccess( $module.name, "index" ) )
+			#if( $module.name!='dhis-web-dataentry-hospital' )
+				<li class="menuDropDownItem" onclick="window.location.href='${module.defaultAction}'">
+				<a href="${module.defaultAction}">$i18n.getString( $module.name )&nbsp;</a></li>
+			#end
+      #end
+      #end
+      </ul>      
       </div>
 
       <div id="menuDropDown2" class="menuDropDownArea">
-        <ul class="menuDropDownBox">
-        #foreach( $module in $serviceModules )
-          #if( $auth.hasAccess( $module.name, "index" ) )
-            #if( $module.name!='dhis-web-dataentry-hospital' )
-				<li class="menuDropDownItem" onclick="window.location.href='${module.defaultAction}'">
-					<a href="${module.defaultAction}">$i18n.getString( $module.name )&nbsp;</a>
-				</li>
-			#end
-          #end
-        #end
-        </ul>      
+      <ul class="menuDropDownBox">
+      #foreach( $module in $serviceModules )
+      #if( $auth.hasAccess( $module.name, "index" ) )
+		#if( $module.name!='dhis-web-dataentry-hospital' )
+        <li class="menuDropDownItem" onclick="window.location.href='${module.defaultAction}'">
+          <a href="${module.defaultAction}">$i18n.getString( $module.name )&nbsp;</a></li>
+		#end
+      #end
+      #end
+      </ul>      
       </div>
 	  
       <div id="menuDropDown3" class="menuDropDownArea">
-        <ul class="menuDropDownBox">
-		  <li class="menuDropDownItem" id="menuDropDownHelpCenter">$i18n.getString( "help_center" )&nbsp;</li>
-          <li class="menuDropDownItem" id="menuDropDownChangeLog">$i18n.getString( "change_log" )&nbsp;</li>
-          <li class="menuDropDownItem" id="menuDropDownSupportiveSoftware">$i18n.getString( "supportive_software" )&nbsp;</li>
-          <li class="menuDropDownItem" id="menuDropDownUserAccount">$i18n.getString( "user_account" )&nbsp;</li>
-          <li class="menuDropDownItem" id="menuDropDownModuleOverview">$i18n.getString( "system_overview" )&nbsp;</li>
-          <li class="menuDropDownItem" id="menuDropDownWebApi">$i18n.getString( "web_api" )&nbsp;</li>
-          <li class="menuDropDownItem" id="menuDropDownAboutDHIS2">$i18n.getString( "about_dhis2" )&nbsp;</li>
-        </ul>
+      <ul class="menuDropDownBox">
+        <li class="menuDropDownItem" id="menuDropDownHelpCenter">$i18n.getString( "help_center" )&nbsp;</li>
+        <li class="menuDropDownItem" id="menuDropDownChangeLog">$i18n.getString( "change_log" )&nbsp;</li>
+        <li class="menuDropDownItem" id="menuDropDownSupportiveSoftware">$i18n.getString( "supportive_software" )&nbsp;</li>
+        <li class="menuDropDownItem" id="menuDropDownUserAccount">$i18n.getString( "user_account" )&nbsp;</li>
+        <li class="menuDropDownItem" id="menuDropDownModuleOverview">$i18n.getString( "system_overview" )&nbsp;</li>
+        <li class="menuDropDownItem" id="menuDropDownWebApi">$i18n.getString( "web_api" )&nbsp;</li>
+        <li class="menuDropDownItem" id="menuDropDownAboutDHIS2">$i18n.getString( "about_dhis2" )&nbsp;</li>
+      </ul>
       </div>
 	  
       <span id="headerText" onclick="window.location.href='../dhis-web-commons-about/modules.action'" style="cursor:pointer">