dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 17445
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2014-11-11 22:16:01 +0100
message:
  Import, moved 1.4 config to 1.4 import index menu
modified:
  dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/externalImportMenu.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/webapp/dhis-web-importexport/externalImportMenu.vm'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/externalImportMenu.vm	2012-03-04 13:26:24 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/externalImportMenu.vm	2014-11-11 21:16:01 +0000
@@ -4,4 +4,5 @@
 <ul class="introList">
     #introListImgItem( "setImportFormat.action?importFormat=DHIS14XML" "DHIS14_xml_import" "dhis14" )
     #introListImgItem( "setImportFormat.action?importFormat=DHIS14FILE" "DHIS14_file_import" "dhis14" )
+    #introListImgItem( "displayConfigDhis14Form.action" "dhis14_file_configuration" "configuration" )
 </ul>

=== 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	2014-11-11 21:08:03 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/index.vm	2014-11-11 21:16:01 +0000
@@ -12,6 +12,4 @@
     #introListImgItem( "displayDataValueExportForm.action" "data_export" "export" )
     #introListImgItem( "displayEventExportForm.action" "event_export" "export" )
     #introListImgItem( "displayExternalExportMenu.action" "export_to_other_systems" "export" )
-       
-    #introListImgItem( "displayConfigDhis14Form.action" "dhis14_file_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	2014-11-11 21:08:03 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/mainMenu.vm	2014-11-11 21:16:01 +0000
@@ -18,9 +18,3 @@
   <li><a href="displayEventExportForm.action">$i18n.getString( "event_export" )&nbsp;</a></li>
   <li><a href="displayExternalExportMenu.action">$i18n.getString( "export_to_other_systems" )&nbsp;</a></li>
 </ul>
-
-<h2>$i18n.getString( "configuration" )&nbsp;</h2>
-
-<ul>
-  <li><a href="displayConfigDhis14Form.action">$i18n.getString( "dhis14_file_configuration" )&nbsp;</a></li>
-</ul>