dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 16006
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2014-07-08 08:53:57 +0800
message:
  Minor fix.
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/struts.xml
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/index.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/settingsMenu.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-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties	2014-07-07 14:47:03 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties	2014-07-08 00:53:57 +0000
@@ -111,4 +111,4 @@
 remote_server_url=Remote server URL
 remote_server_username=Remote server username
 remote_server_password=Remote server password
-intro_synchronization = A data synchronization with remote server functionality
\ No newline at end of file
+intro_data_synchronization = A data synchronization with remote server functionality
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/struts.xml	2014-07-07 16:48:48 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/struts.xml	2014-07-08 00:53:57 +0000
@@ -156,7 +156,7 @@
     
     <!-- Synchronization -->
 
-	<action name="synchronization" class="org.hisp.dhis.settings.action.system.GetSynchronizationSettingsAction">
+	<action name="synchronizationSettings" class="org.hisp.dhis.settings.action.system.GetSynchronizationSettingsAction">
       <result name="success" type="velocity">/main.vm</result>
       <param name="page">/dhis-web-maintenance-settings/systemSynchronizationSettings.vm</param>
       <param name="menu">/dhis-web-maintenance-settings/settingsMenu.vm</param>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/index.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/index.vm	2014-07-07 14:47:03 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/index.vm	2014-07-08 00:53:57 +0000
@@ -7,5 +7,5 @@
     #introListImgItem( "systemAccessSettings.action" "system_access_settings" "systemsettings" )
     #introListImgItem( "systemApprovalSettings.action" "system_approval_settings" "systemsettings" )
     #introListImgItem( "systemCalendarSettings.action" "system_calendar_settings" "systemsettings" )
-    #introListImgItem( "synchronization.action" "system_calendar_settings" "systemsettings" )
+    #introListImgItem( "synchronizationSettings.action" "data_synchronization" "systemsettings" )
 </ul>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/settingsMenu.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/settingsMenu.vm	2014-07-07 14:47:03 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/settingsMenu.vm	2014-07-08 00:53:57 +0000
@@ -6,5 +6,5 @@
     <li><a href="systemAccessSettings.action">$i18n.getString( "access" )&nbsp;</a></li>
     <li><a href="systemApprovalSettings.action">$i18n.getString( "approval" )&nbsp;</a></li>
     <li><a href="systemCalendarSettings.action">$i18n.getString( "calendar" )&nbsp;</a></li>
-    <li><a href="synchronization.action">$i18n.getString( "synchronization" )&nbsp;</a></li>
+    <li><a href="synchronizationSettings.action">$i18n.getString( "synchronization" )&nbsp;</a></li>
 </ul>