dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 10229
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2013-03-14 19:14:45 +0100
message:
  Import-export ui fix
modified:
  dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/dxf2/MetaDataImportAction.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/webapp/dhis-web-importexport/dxf2MetaDataExport.vm
  dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/dxf2MetaDataImport.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/dxf2/MetaDataImportAction.java'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/dxf2/MetaDataImportAction.java	2012-07-04 20:16:23 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/dxf2/MetaDataImportAction.java	2013-03-14 18:14:45 +0000
@@ -27,9 +27,10 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-import com.opensymphony.xwork2.Action;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+
 import org.hisp.dhis.dxf2.metadata.ImportOptions;
 import org.hisp.dhis.dxf2.metadata.ImportService;
 import org.hisp.dhis.importexport.ImportStrategy;
@@ -41,9 +42,7 @@
 import org.hisp.dhis.user.CurrentUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
+import com.opensymphony.xwork2.Action;
 
 /**
  * @author Morten Olav Hansen <mortenoh@xxxxxxxxx>
@@ -51,8 +50,6 @@
 public class MetaDataImportAction
     implements Action
 {
-    private static final Log log = LogFactory.getLog( MetaDataImportAction.class );
-
     // -------------------------------------------------------------------------
     // Dependencies
     // -------------------------------------------------------------------------

=== 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	2013-02-22 06:30:40 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module.properties	2013-03-14 18:14:45 +0000
@@ -261,22 +261,21 @@
 intro_DHIS14_data_export=Do an export of data values or facts. DHIS 1.4 is the predecessor of DHIS 2.
 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_xml_data_import=Import data values on the DXF XML format which is used for data exchange by DHIS and other software.
-intro_csv_data_import=Import data values on the CSV format which is used for data exchange by DHIS and other third-party software.
+intro_xml_data_import=Import data values on the DXF 2 XML format which is used for data exchange by DHIS 2 and other software.
+intro_csv_data_import=Import data values on the CSV format which is used for data exchange by DHIS 2 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.
-intro_detailed_metadata_export=Do a detailed meta data export of data elements and indicators to the DHIS 2 exchange format.
-intro_export_to_other_systems=Export data and meta data to formats such as PDF, Excel and DHIS 1.4.
+intro_data_export=Export data values. This is the regular export function which exports data to the DHIS 2 exchange format called DXF 2.
+intro_metadata_export=Export meta data like data elements and organisation units to the standard DHIS 2 exchange format.
+intro_export_to_other_systems=Export data and meta data to formats such as PDF, Excel and the DHIS 1.4 exchange format.
 intro_dhis14_file_configuration=Set the configuration for the DHIS 1.4 file import process, such as the location of the data file.
-no_item_to_match=Sorry, there is no any selected item to match
+intro_metadata_import=Import meta-data like data elements and organisation units using the standard DHIS 2 exchange format called DXF 2.
+intro_integration_configuration=Configure and upload flexible routes for automated integration with other systems.
+no_item_to_match=There is no selected item to match
 dry_run=Dry run
 strategy=Strategy
 new_only=New only
 updates_only=Updates only
 data_import=Data Import
-meta_data_import=Meta-Data Import
 import_summary=Import summary
 data_set_completed_on=Data set completed on
 import_count=Import count
@@ -312,5 +311,5 @@
 check_safe_recommended=Check (safe + recommended)
 skip_check_fast=Skip check (fast)
 dxf2=DXF2
-dxf2_metadata_import=DXF2 MetaData Import
-dxf2_metadata_export=DXF2 MetaData Export
+metadata_import=Meta-Data Import
+metadata_export=Meta-Data Export

=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/dxf2MetaDataExport.vm'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/dxf2MetaDataExport.vm	2012-06-27 14:35:19 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/dxf2MetaDataExport.vm	2013-03-14 18:14:45 +0000
@@ -38,12 +38,11 @@
     }
 </script>
 
-<h3>$i18n.getString( "dxf2_metadata_export" )</h3>
+<h3>$i18n.getString( "metadata_export" )</h3>
 
 <form id="exportForm" name="exportForm">
 
-<fieldset style="width: 80%;">
-    <legend>$i18n.getString( "elements" )</legend>
+<fieldset style="width: 80%; border: 1px solid #ccc; padding: 15px;">
     #foreach( $key in $exportClasses.keySet() )
         <div style="width: 200px; float: left;"><input id="$key" name="$key" type="checkbox" value="true" /> <label for="$key">$exportClasses.get( $key )</label></div>
     #end

=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/dxf2MetaDataImport.vm'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/dxf2MetaDataImport.vm	2012-07-04 20:16:23 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/dxf2MetaDataImport.vm	2013-03-14 18:14:45 +0000
@@ -1,5 +1,5 @@
 
-<h3>$i18n.getString( "meta_data_import" )</h3>
+<h3>$i18n.getString( "metadata_import" )</h3>
 
 <div id="inputCriteria" class="inputCriteria" style="height:144px">
 <form id="importForm" name="importForm" method="post" enctype="multipart/form-data" action="importMetaData.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	2013-01-01 02:14:39 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/index.vm	2013-03-14 18:14:45 +0000
@@ -8,13 +8,15 @@
 <h3>$i18n.getString( "dhis-web-maintenance-datadictionary" )</h3>
 
 <ul class="introList">
-    #introListImgItem( "setImportFormat.action?importFormat=DXF" "import" "import" )
+    #introListImgItem( "dxf2MetaDataImport.action" "metadata_import" "import" )
     #introListImgItem( "displayImportDataValueForm.action?importFormat=xml" "xml_data_import" "import" )
     #introListImgItem( "displayImportDataValueForm.action?importFormat=csv" "csv_data_import" "import" )
-    #introListImgItem( "displayExternalImportMenu.action" "dhis14_import" "import" )	
+    #introListImgItem( "displayExternalImportMenu.action" "dhis14_import" "import" )
+    	
+    #introListImgItem( "dxf2MetaDataExport.action" "metadata_export" "export" )
     #introListImgItem( "displayDataValueExportForm.action" "data_export" "export" )
-    #introListImgItem( "displayMetaDataExportForm.action?exportFormat=DXF" "metadata_export" "export" )
-    #introListImgItem( "displayDetailedMetaDataExportForm.action?exportFormat=DXF" "detailed_metadata_export" "export" )
-    #introListImgItem( "displayExternalExportMenu.action" "export_to_other_systems" "export" )    
+    #introListImgItem( "displayExternalExportMenu.action" "export_to_other_systems" "export" )
+       
     #introListImgItem( "displayConfigDhis14Form.action" "dhis14_file_configuration" "configuration" )
+    #introListImgItem( "displayRoutes.action" "integration_configuration" "configuration" )
 </ul>

=== 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	2013-02-22 06:30:40 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/mainMenu.vm	2013-03-14 18:14:45 +0000
@@ -2,8 +2,7 @@
 <h2>$i18n.getString( "import" )&nbsp;</h2>
 
 <ul>
-    <li><a href="dxf2MetaDataImport.action">$i18n.getString( "dxf2_metadata_import" )&nbsp;</a></li>
-  <li><a href="setImportFormat.action?importFormat=DXF">$i18n.getString( "import" )&nbsp;</a></li>
+  <li><a href="dxf2MetaDataImport.action">$i18n.getString( "metadata_import" )&nbsp;</a></li>
   <li><a href="displayImportDataValueForm.action?importFormat=xml">$i18n.getString( "xml_data_import" )&nbsp;</a></li>
   <li><a href="displayImportDataValueForm.action?importFormat=csv">$i18n.getString( "csv_data_import" )&nbsp;</a></li>
   <li><a href="displayExternalImportMenu.action">$i18n.getString( "dhis14_import" )&nbsp;</a></li>
@@ -12,10 +11,8 @@
 <h2>$i18n.getString( "export" )&nbsp;</h2>
 
 <ul>
-    <li><a href="dxf2MetaDataExport.action">$i18n.getString( "dxf2_metadata_export" )&nbsp;</a></li>
+  <li><a href="dxf2MetaDataExport.action">$i18n.getString( "metadata_export" )&nbsp;</a></li>
   <li><a href="displayDataValueExportForm.action">$i18n.getString( "data_export" )&nbsp;</a></li>
-  <li><a href="displayMetaDataExportForm.action?exportFormat=DXF">$i18n.getString( "metadata_export" )&nbsp;</a></li>
-  <li><a href="displayDetailedMetaDataExportForm.action?exportFormat=DXF">$i18n.getString( "detailed_metadata_export" )&nbsp;</a></li> 
   <li><a href="displayExternalExportMenu.action">$i18n.getString( "export_to_other_systems" )&nbsp;</a></li>
 </ul>