dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 6568
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sat 2012-04-14 00:38:23 +0200
message:
  Quickly fixed
modified:
  dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/NoAction.java
  dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module.properties
  dhis-2/dhis-web/dhis-web-importexport/src/main/resources/struts.xml
  dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/importDataValue.vm
  dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/index.vm
  dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/mainMenu.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 'dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/NoAction.java'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/NoAction.java	2012-04-11 13:49:03 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/NoAction.java	2012-04-13 22:38:23 +0000
@@ -47,6 +47,18 @@
         this.running = running;
     }
     
+    private String exportFormat;
+    
+    public String getExportFormat()
+    {
+        return exportFormat;
+    }
+    
+    public void setExportFormat( String exportFormat )
+    {
+        this.exportFormat = exportFormat;
+    }
+    
     public String execute()
     {
         return SUCCESS;

=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module.properties	2012-04-11 20:16:18 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module.properties	2012-04-13 22:38:23 +0000
@@ -262,7 +262,7 @@
 intro_pdf_metadata_export=Portable Document Format (PDF) is a commonly used file format for document exchange.
 intro_xls_metadata_export=Excel Spreadsheet (XLS) is a commonly used spreadsheet file format from Microsoft.
 intro_import=This is the regular import function which imports data from the DHIS 2 exchange format called DXF.
-intro_data_value_import=Import data values on the DXF format, which is used for data exchange by DHIS and other third-party software. 
+intro_data_import=Import data values on the DXF format, which is used for data exchange by DHIS and other third-party software. 
 intro_dhis14_import=Import data from DHIS 1.4 installations. DHIS 1.4 is the predecessor of DHIS 2.
 intro_data_export=Export data values. This is the regular export function which exports data to the DHIS 2 exchange format called DXF.
 intro_metadata_export=Export meta data to the DHIS 2 exchange format. Meta meta implies data elements and other objects describing the data.
@@ -274,7 +274,7 @@
 strategy=Strategy
 new_only=New only
 updates_only=Updates only
-data_value_import=Data value import
+data_import=Data Import
 import_summary=Import summary
 data_set_completed_on=Data set completed on
 import_count=Import count

=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/resources/struts.xml	2012-04-13 22:28:40 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/resources/struts.xml	2012-04-13 22:38:23 +0000
@@ -156,7 +156,7 @@
 	
     <!-- Export -->
 
-    <action name="displayMetaDataExportForm" class="org.hisp.dhis.importexport.action.exp.GetExportOptionsAction">
+    <action name="displayMetaDataExportForm" class="org.hisp.dhis.importexport.action.NoAction">
       <result name="success" type="velocity">/main.vm</result>
       <param name="page">/dhis-web-importexport/exportMetaDataForm.vm</param>
       <param name="menu">/dhis-web-importexport/mainMenu.vm</param>

=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/importDataValue.vm'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/importDataValue.vm	2012-04-11 20:16:18 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/importDataValue.vm	2012-04-13 22:38:23 +0000
@@ -1,5 +1,5 @@
 
-<h3>$i18n.getString( "data_value_import" )</h3>
+<h3>$i18n.getString( "data_import" )</h3>
 
 <div class="inputCriteria" style="height:130px">
 <form id="importForm" name="importForm" method="post" enctype="multipart/form-data" action="importDataValue.action">

=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/index.vm'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/index.vm	2012-04-11 14:33:18 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/index.vm	2012-04-13 22:38:23 +0000
@@ -9,7 +9,7 @@
 
 <ul class="introList">
 	#introListImgItem( "setImportFormat.action?importFormat=DXF" "import" "import" )
-	#introListImgItem( "displayImportDataValueForm.action" "data_value_import" "import" )
+	#introListImgItem( "displayImportDataValueForm.action" "data_import" "import" )
 	#introListImgItem( "displayExternalImportMenu.action" "dhis14_import" "import" )
 	
     #introListImgItem( "displayDataValueExportForm.action?exportFormat=DXF" "data_export" "export" )

=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/mainMenu.vm'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/mainMenu.vm	2012-04-11 14:33:18 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/mainMenu.vm	2012-04-13 22:38:23 +0000
@@ -3,7 +3,7 @@
 
 <ul>
   <li><a href="setImportFormat.action?importFormat=DXF">$i18n.getString( "import" )&nbsp;</a></li>
-  <li><a href="displayImportDataValueForm.action">$i18n.getString( "data_value_import" )&nbsp;</a></li>
+  <li><a href="displayImportDataValueForm.action">$i18n.getString( "data_import" )&nbsp;</a></li>
   <li><a href="displayExternalImportMenu.action">$i18n.getString( "dhis14_import" )&nbsp;</a></li>
 </ul>