← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 3620: local vn - Removed non-existance of js file. And deactive unneccessary at some functionalities

 

------------------------------------------------------------
revno: 3620
committer: Hieu <hieu.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2011-05-16 13:30:16 +0700
message:
  local vn - Removed non-existance of js file. And deactive unneccessary at some functionalities
modified:
  local/vn/dhis-web-excel-reporting/src/main/resources/struts.xml
  local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/menu.vm


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'local/vn/dhis-web-excel-reporting/src/main/resources/struts.xml'
--- local/vn/dhis-web-excel-reporting/src/main/resources/struts.xml	2011-05-11 08:13:37 +0000
+++ local/vn/dhis-web-excel-reporting/src/main/resources/struts.xml	2011-05-16 06:30:16 +0000
@@ -1201,7 +1201,6 @@
 			<param name="page">/dhis-web-excel-reporting/excelTemplateList.vm</param>
 			<param name="menu">/dhis-web-excel-reporting/menu.vm</param>
 			<param name="javascripts">
-				javascript/commons.js,
 				javascript/exceltemplate.js,
 				javascript/ajaxfileupload.js			
 			</param>

=== modified file 'local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/menu.vm'
--- local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/menu.vm	2010-10-07 07:10:30 +0000
+++ local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/menu.vm	2011-05-16 06:30:16 +0000
@@ -3,13 +3,12 @@
 <h2><a href="selectExportReportParam.action">$i18n.getString( "generate_report" )&nbsp;</a></h2>
 <ul>
 	<li><a href="selectExportReportParam.action">$i18n.getString( "generate_report" )&nbsp;</a></li>
+	<!--
 	<li><a href="viewJCharts.action">$i18n.getString( "chart" )&nbsp;</a></li>
-	<!--
 	<li><a href="selectAdvancedExportForm.action">$i18n.getString( "generate_advanced_report" )&nbsp;</a></li>
- 	<li><a href="openIndividualReportExcel.action">$i18n.getString( "individual_report" )</a></li>
+	<li><a href="viewDataEntryStatus.action">$i18n.getString( "data_status" )</a></li>
+	<li><a href="dataSetCompletedReports.action">$i18n.getString( "dataset_completed_report" )&nbsp;</a></li>	
 	-->
-	<li><a href="dataSetCompletedReports.action">$i18n.getString( "dataset_completed_report" )&nbsp;</a></li>	
-	<li><a href="viewDataEntryStatus.action">$i18n.getString( "data_status" )</a></li>	
 	<li><a href="getImportingParams.action">$i18n.getString( "import" )&nbsp;</a></li>
 </ul>