dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #30064
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 15255: moved calendar settings from general to its own section
------------------------------------------------------------
revno: 15255
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2014-05-13 13:15:35 +0200
message:
moved calendar settings from general to its own section
added:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/GetCalendarSettingsAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemCalendarSettings.vm
modified:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/GetGeneralSettingsAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/META-INF/dhis/beans.xml
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
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemGeneralSettings.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
=== added file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/GetCalendarSettingsAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/GetCalendarSettingsAction.java 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/GetCalendarSettingsAction.java 2014-05-13 11:15:35 +0000
@@ -0,0 +1,74 @@
+package org.hisp.dhis.settings.action.system;
+
+/*
+ * Copyright (c) 2004-2014, University of Oslo
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * Neither the name of the HISP project nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+import com.opensymphony.xwork2.Action;
+import org.hisp.dhis.calendar.Calendar;
+import org.hisp.dhis.calendar.CalendarService;
+import org.hisp.dhis.calendar.DateFormat;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.List;
+
+/**
+ * @author Morten Olav Hansen <mortenoh@xxxxxxxxx>
+ */
+public class GetCalendarSettingsAction
+ implements Action
+{
+ // -------------------------------------------------------------------------
+ // Dependencies
+ // -------------------------------------------------------------------------
+
+ @Autowired
+ private CalendarService calendarService;
+
+ // -------------------------------------------------------------------------
+ // Output
+ // -------------------------------------------------------------------------
+
+ public List<Calendar> getCalendars()
+ {
+ return calendarService.getAllCalendars();
+ }
+
+ public List<DateFormat> getDateFormats()
+ {
+ return calendarService.getAllDateFormats();
+ }
+
+ // -------------------------------------------------------------------------
+ // Action implementation
+ // -------------------------------------------------------------------------
+
+ public String execute()
+ {
+ return SUCCESS;
+ }
+}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/GetGeneralSettingsAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/GetGeneralSettingsAction.java 2014-04-29 10:10:17 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/GetGeneralSettingsAction.java 2014-05-13 11:15:35 +0000
@@ -29,9 +29,6 @@
*/
import com.opensymphony.xwork2.Action;
-import org.hisp.dhis.calendar.Calendar;
-import org.hisp.dhis.calendar.CalendarService;
-import org.hisp.dhis.calendar.DateFormat;
import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
import org.hisp.dhis.configuration.Configuration;
import org.hisp.dhis.configuration.ConfigurationService;
@@ -45,7 +42,6 @@
import org.hisp.dhis.user.UserGroup;
import org.hisp.dhis.user.UserGroupService;
import org.hisp.dhis.user.comparator.UserGroupComparator;
-import org.springframework.beans.factory.annotation.Autowired;
import java.util.ArrayList;
import java.util.Collection;
@@ -98,9 +94,6 @@
this.organisationUnitService = organisationUnitService;
}
- @Autowired
- private CalendarService calendarService;
-
// -------------------------------------------------------------------------
// Output
// -------------------------------------------------------------------------
@@ -166,16 +159,6 @@
return configuration;
}
- public List<Calendar> getCalendars()
- {
- return calendarService.getAllCalendars();
- }
-
- public List<DateFormat> getDateFormats()
- {
- return calendarService.getAllDateFormats();
- }
-
// -------------------------------------------------------------------------
// Action implementation
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/META-INF/dhis/beans.xml 2014-04-09 04:27:35 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/META-INF/dhis/beans.xml 2014-05-13 11:15:35 +0000
@@ -1,12 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd";>
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd";>
<!-- System settings -->
+ <bean id="org.hisp.dhis.settings.action.system.GetCalendarSettingsAction"
+ class="org.hisp.dhis.settings.action.system.GetCalendarSettingsAction" scope="prototype" />
+
<bean id="org.hisp.dhis.settings.action.system.GetGeneralSettingsAction"
- class="org.hisp.dhis.settings.action.system.GetGeneralSettingsAction"
- scope="prototype">
+ class="org.hisp.dhis.settings.action.system.GetGeneralSettingsAction"
+ scope="prototype">
<property name="configurationService" ref="org.hisp.dhis.configuration.ConfigurationService" />
<property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
<property name="userGroupService" ref="org.hisp.dhis.user.UserGroupService" />
@@ -15,8 +18,8 @@
</bean>
<bean id="org.hisp.dhis.settings.action.system.SetGeneralSettingsAction"
- class="org.hisp.dhis.settings.action.system.SetGeneralSettingsAction"
- scope="prototype">
+ class="org.hisp.dhis.settings.action.system.SetGeneralSettingsAction"
+ scope="prototype">
<property name="systemSettingManager" ref="org.hisp.dhis.setting.SystemSettingManager" />
<property name="configurationService" ref="org.hisp.dhis.configuration.ConfigurationService" />
<property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
@@ -26,8 +29,8 @@
</bean>
<bean id="org.hisp.dhis.settings.action.system.GetAppearanceSettingsAction"
- class="org.hisp.dhis.settings.action.system.GetAppearanceSettingsAction"
- scope="prototype">
+ class="org.hisp.dhis.settings.action.system.GetAppearanceSettingsAction"
+ scope="prototype">
<property name="systemSettingManager" ref="org.hisp.dhis.setting.SystemSettingManager" />
<property name="moduleManager" ref="org.hisp.dhis.webportal.module.ModuleManager" />
<property name="styleManager" ref="org.hisp.dhis.setting.StyleManager" />
@@ -35,80 +38,80 @@
</bean>
<bean id="org.hisp.dhis.settings.action.system.SetAppearanceSettingsAction"
- class="org.hisp.dhis.settings.action.system.SetAppearanceSettingsAction"
- scope="prototype">
+ class="org.hisp.dhis.settings.action.system.SetAppearanceSettingsAction"
+ scope="prototype">
<property name="systemSettingManager" ref="org.hisp.dhis.setting.SystemSettingManager" />
<property name="styleManager" ref="org.hisp.dhis.setting.StyleManager" />
</bean>
<bean id="org.hisp.dhis.settings.action.system.GetAppearanceSettingsStringAction"
- class="org.hisp.dhis.settings.action.system.GetAppearanceSettingsStringAction"
- scope="prototype">
+ class="org.hisp.dhis.settings.action.system.GetAppearanceSettingsStringAction"
+ scope="prototype">
<property name="translateSystemSettingManager" ref="org.hisp.dhis.setting.TranslateSystemSettingManager" />
</bean>
-
+
<bean id="org.hisp.dhis.settings.action.system.GetSMTPSettingsAction"
- class="org.hisp.dhis.settings.action.system.GetSMTPSettingsAction"
- scope="prototype">
+ class="org.hisp.dhis.settings.action.system.GetSMTPSettingsAction"
+ scope="prototype">
<property name="systemSettingManager" ref="org.hisp.dhis.setting.SystemSettingManager" />
</bean>
<bean id="org.hisp.dhis.settings.action.system.SetSMTPSettingsAction"
- class="org.hisp.dhis.settings.action.system.SetSMTPSettingsAction"
- scope="prototype">
+ class="org.hisp.dhis.settings.action.system.SetSMTPSettingsAction"
+ scope="prototype">
<property name="systemSettingManager" ref="org.hisp.dhis.setting.SystemSettingManager" />
</bean>
<bean id="org.hisp.dhis.settings.action.system.GetAccessSettingsAction"
- class="org.hisp.dhis.settings.action.system.GetAccessSettingsAction"
- scope="prototype" />
+ class="org.hisp.dhis.settings.action.system.GetAccessSettingsAction"
+ scope="prototype" />
<bean id="org.hisp.dhis.settings.action.system.SetAccessSettingsAction"
- class="org.hisp.dhis.settings.action.system.SetAccessSettingsAction"
- scope="prototype" />
+ class="org.hisp.dhis.settings.action.system.SetAccessSettingsAction"
+ scope="prototype" />
<bean id="org.hisp.dhis.settings.action.system.GetApprovalSettingsAction"
- class="org.hisp.dhis.settings.action.system.GetApprovalSettingsAction"
- scope="prototype">
+ class="org.hisp.dhis.settings.action.system.GetApprovalSettingsAction"
+ scope="prototype">
<property name="systemSettingManager" ref="org.hisp.dhis.setting.SystemSettingManager" />
<property name="dataApprovalLevelService" ref="org.hisp.dhis.dataapproval.DataApprovalLevelService" />
</bean>
<bean id="org.hisp.dhis.settings.action.system.SetApprovalSettingsAction"
- class="org.hisp.dhis.settings.action.system.SetApprovalSettingsAction"
- scope="prototype" />
+ class="org.hisp.dhis.settings.action.system.SetApprovalSettingsAction"
+ scope="prototype" />
<bean id="org.hisp.dhis.settings.action.system.AddApprovalLevelAction"
- class="org.hisp.dhis.settings.action.system.AddApprovalLevelAction"
- scope="prototype">
+ class="org.hisp.dhis.settings.action.system.AddApprovalLevelAction"
+ scope="prototype">
</bean>
<bean id="org.hisp.dhis.settings.action.system.GetAddApprovalLevelFormParameters"
- class="org.hisp.dhis.settings.action.system.GetAddApprovalLevelFormParameters"
- scope="prototype">
+ class="org.hisp.dhis.settings.action.system.GetAddApprovalLevelFormParameters"
+ scope="prototype">
<property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
<property name="categoryService" ref="org.hisp.dhis.dataelement.DataElementCategoryService" />
</bean>
<bean id="org.hisp.dhis.settings.action.system.ValidateApprovalLevelAction"
- class="org.hisp.dhis.settings.action.system.ValidateApprovalLevelAction"
- scope="prototype"/>
+ class="org.hisp.dhis.settings.action.system.ValidateApprovalLevelAction"
+ scope="prototype" />
<bean id="org.hisp.dhis.settings.action.system.MoveApprovalLevelDownAction"
- class="org.hisp.dhis.settings.action.system.MoveApprovalLevelDownAction"
- scope="prototype">
+ class="org.hisp.dhis.settings.action.system.MoveApprovalLevelDownAction"
+ scope="prototype">
<property name="dataApprovalLevelService" ref="org.hisp.dhis.dataapproval.DataApprovalLevelService" />
</bean>
<bean id="org.hisp.dhis.settings.action.system.MoveApprovalLevelUpAction"
- class="org.hisp.dhis.settings.action.system.MoveApprovalLevelUpAction"
- scope="prototype">
+ class="org.hisp.dhis.settings.action.system.MoveApprovalLevelUpAction"
+ scope="prototype">
<property name="dataApprovalLevelService" ref="org.hisp.dhis.dataapproval.DataApprovalLevelService" />
</bean>
<bean id="org.hisp.dhis.settings.action.system.RemoveApprovalLevelAction"
- class="org.hisp.dhis.settings.action.system.RemoveApprovalLevelAction"
- scope="prototype">
+ class="org.hisp.dhis.settings.action.system.RemoveApprovalLevelAction"
+ scope="prototype">
<property name="dataApprovalLevelService" ref="org.hisp.dhis.dataapproval.DataApprovalLevelService" />
</bean>
=== 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-04-30 15:46:01 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties 2014-05-13 11:15:35 +0000
@@ -3,6 +3,7 @@
code=Code
system_settings=System settings
general_settings=General settings
+calendar_settings=Calendar settings
appearance_settings=Appearance settings
smtp_settings=Email settings
approval_settings=Approval settings
@@ -22,10 +23,12 @@
intro_system_email_settings=Configure the email SMTP setup with regard to host name, user name and password.
intro_system_approval_settings=Configure the levels at which data is approved according to organisation unit level and category option group.
intro_system_access_settings=Configure access to the system, like which user role should be used for user self registration.
+intro_system_calendar_settings=Configure system calendar and date format
system_general_settings=System General Settings
system_appearance_settings=System Appearance Settings
system_email_settings=System Email Settings
system_approval_settings=System Approval Settings
+system_calendar_settings=System Calendar Settings
system_access_settings=System Access Settings
general=General
appearance=Appearance
=== 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-04-09 04:27:35 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/struts.xml 2014-05-13 11:15:35 +0000
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE struts PUBLIC
-"-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
-"http://struts.apache.org/dtds/struts-2.0.dtd";>
+ "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
+ "http://struts.apache.org/dtds/struts-2.0.dtd";>
<struts>
<include file="dhis-web-commons.xml" />
@@ -13,7 +13,16 @@
<param name="page">/dhis-web-maintenance-settings/index.vm</param>
<param name="menu">/dhis-web-maintenance-settings/settingsMenu.vm</param>
</action>
-
+
+ <!-- Calendar settings -->
+
+ <action name="systemCalendarSettings" class="org.hisp.dhis.settings.action.system.GetCalendarSettingsAction">
+ <result name="success" type="velocity">/main.vm</result>
+ <param name="page">/dhis-web-maintenance-settings/systemCalendarSettings.vm</param>
+ <param name="menu">/dhis-web-maintenance-settings/settingsMenu.vm</param>
+ <param name="requiredAuthorities">F_SYSTEM_SETTING</param>
+ </action>
+
<!-- General settings -->
<action name="systemGeneralSettings" class="org.hisp.dhis.settings.action.system.GetGeneralSettingsAction">
@@ -25,12 +34,13 @@
<action name="setSystemGeneralSettings" class="org.hisp.dhis.settings.action.system.SetGeneralSettingsAction">
<result name="success" type="velocity-json">
- /dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
- <param name="onExceptionReturn">plainTextError</param>
- <param name="requiredAuthorities">F_SYSTEM_SETTING</param>
+ /dhis-web-commons/ajax/jsonResponseSuccess.vm
+ </result>
+ <param name="onExceptionReturn">plainTextError</param>
+ <param name="requiredAuthorities">F_SYSTEM_SETTING</param>
</action>
-
- <!-- Appearance settings -->
+
+ <!-- Appearance settings -->
<action name="systemAppearanceSettings" class="org.hisp.dhis.settings.action.system.GetAppearanceSettingsAction">
<result name="success" type="velocity">/main.vm</result>
@@ -42,16 +52,17 @@
<action name="setSystemAppearanceSettings" class="org.hisp.dhis.settings.action.system.SetAppearanceSettingsAction">
<result name="success" type="velocity-json">
- /dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
- <param name="onExceptionReturn">plainTextError</param>
- <param name="requiredAuthorities">F_SYSTEM_SETTING</param>
+ /dhis-web-commons/ajax/jsonResponseSuccess.vm
+ </result>
+ <param name="onExceptionReturn">plainTextError</param>
+ <param name="requiredAuthorities">F_SYSTEM_SETTING</param>
</action>
-
- <action name="systemAppearanceSettingsString" class="org.hisp.dhis.settings.action.system.GetAppearanceSettingsStringAction">
+
+ <action name="systemAppearanceSettingsString" class="org.hisp.dhis.settings.action.system.GetAppearanceSettingsStringAction">
<result name="success" type="velocity-json">/dhis-web-maintenance-settings/systemAppearanceSettingsString.vm</result>
</action>
-
- <!-- Email settings -->
+
+ <!-- Email settings -->
<action name="systemEmailSettings" class="org.hisp.dhis.settings.action.system.GetSMTPSettingsAction">
<result name="success" type="velocity">/main.vm</result>
@@ -62,9 +73,10 @@
<action name="setSystemEmailSettings" class="org.hisp.dhis.settings.action.system.SetSMTPSettingsAction">
<result name="success" type="velocity-json">
- /dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
- <param name="onExceptionReturn">plainTextError</param>
- <param name="requiredAuthorities">F_SYSTEM_SETTING</param>
+ /dhis-web-commons/ajax/jsonResponseSuccess.vm
+ </result>
+ <param name="onExceptionReturn">plainTextError</param>
+ <param name="requiredAuthorities">F_SYSTEM_SETTING</param>
</action>
<!-- Access settings -->
@@ -78,7 +90,8 @@
<action name="setSystemAccessSettings" class="org.hisp.dhis.settings.action.system.SetAccessSettingsAction">
<result name="success" type="velocity-json">
- /dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
+ /dhis-web-commons/ajax/jsonResponseSuccess.vm
+ </result>
<param name="onExceptionReturn">plainTextError</param>
<param name="requiredAuthorities">F_SYSTEM_SETTING</param>
</action>
@@ -95,7 +108,8 @@
<action name="setSystemApprovalSettings" class="org.hisp.dhis.settings.action.system.SetApprovalSettingsAction">
<result name="success" type="velocity-json">
- /dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
+ /dhis-web-commons/ajax/jsonResponseSuccess.vm
+ </result>
<param name="onExceptionReturn">plainTextError</param>
<param name="requiredAuthorities">F_SYSTEM_SETTING</param>
</action>
@@ -133,12 +147,12 @@
<param name="onExceptionReturn">plainTextError</param>
<param name="requiredAuthorities">F_SYSTEM_SETTING</param>
</action>
-
+
<action name="validateApprovalLevel" class="org.hisp.dhis.settings.action.system.ValidateApprovalLevelAction">
<result name="success" type="velocity-json">../dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
<result name="error" type="velocity-json">../dhis-web-commons/ajax/jsonResponseError.vm</result>
- <param name="onExceptionReturn">plainTextError</param>
+ <param name="onExceptionReturn">plainTextError</param>
</action>
-
+
</package>
</struts>
=== 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-03-31 10:35:11 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/index.vm 2014-05-13 11:15:35 +0000
@@ -6,4 +6,5 @@
#introListImgItem( "systemEmailSettings.action" "system_email_settings" "systemsettings" )
#introListImgItem( "systemAccessSettings.action" "system_access_settings" "systemsettings" )
#introListImgItem( "systemApprovalSettings.action" "system_approval_settings" "systemsettings" )
+ #introListImgItem( "systemCalendarSettings.action" "system_calendar_settings" "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-03-31 10:35:11 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/settingsMenu.vm 2014-05-13 11:15:35 +0000
@@ -5,4 +5,5 @@
<li><a href="systemEmailSettings.action">$i18n.getString( "email" ) </a></li>
<li><a href="systemAccessSettings.action">$i18n.getString( "access" ) </a></li>
<li><a href="systemApprovalSettings.action">$i18n.getString( "approval" ) </a></li>
+ <li><a href="systemCalendarSettings.action">$i18n.getString( "calendar" ) </a></li>
</ul>
=== added file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemCalendarSettings.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemCalendarSettings.vm 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemCalendarSettings.vm 2014-05-13 11:15:35 +0000
@@ -0,0 +1,38 @@
+<script>
+ jQuery(document).ready(function() {
+ jQuery("input[type=button]").click(function() {
+ jQuery.postUTF8('setSystemGeneralSettings.action', {
+ calendar: getFieldValue('calendar'),
+ dateFormat: getFieldValue('dateFormat')
+ }, function( json ) {
+ if( json.response == "success" ) {
+ setHeaderDelayMessage(json.message);
+ }
+ });
+ });
+ });
+</script>
+
+<h3>$i18n.getString( "calendar_settings" ) #openHelp( "systemCalendarSettings" )</h3>
+
+<div class="settingLabel">$i18n.getString( "calendar" )</div>
+
+<div class="setting">
+<select id="calendar" name="calendar">
+#foreach( $calendar in $calendars )
+ <option value="$calendar.name()" #if( $keyCalendar == $calendar.name() )selected="selected"#end>$i18n.getString( $calendar.name() )</option>
+#end
+</select>
+</div>
+
+<div class="settingLabel">$i18n.getString( "date_format" )</div>
+
+<div class="setting">
+<select id="dateFormat" name="dateFormat">
+#foreach( $dateFormat in $dateFormats )
+ <option value="$dateFormat.name()" #if( $keyDateFormat == $dateFormat.name() )selected="selected"#end>$i18n.getString( $dateFormat.name() )</option>
+#end
+</select>
+</div>
+
+<div class="setting"><input type="button" value="$i18n.getString( 'save' )" style="width:10em"/></div>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemGeneralSettings.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemGeneralSettings.vm 2014-04-30 15:46:01 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemGeneralSettings.vm 2014-05-13 11:15:35 +0000
@@ -4,8 +4,6 @@
jQuery.postUTF8('setSystemGeneralSettings.action', {
cacheStrategy: getFieldValue('cacheStrategy'),
analyticsMaxLimit: getFieldValue('analyticsMaxLimit'),
- calendar: getFieldValue('calendar'),
- dateFormat: getFieldValue('dateFormat'),
infrastructuralDataElements: getFieldValue('infrastructuralDataElements'),
infrastructuralPeriodType: getFieldValue('infrastructuralPeriodType'),
feedbackRecipients: getFieldValue('feedbackRecipients'),
@@ -47,26 +45,6 @@
</select>
</div>
-<div class="settingLabel">$i18n.getString( "calendar" )</div>
-
-<div class="setting">
-<select id="calendar" name="calendar">
-#foreach( $calendar in $calendars )
- <option value="$calendar.name()" #if( $keyCalendar == $calendar.name() )selected="selected"#end>$i18n.getString( $calendar.name() )</option>
-#end
-</select>
-</div>
-
-<div class="settingLabel">$i18n.getString( "date_format" )</div>
-
-<div class="setting">
-<select id="dateFormat" name="dateFormat">
-#foreach( $dateFormat in $dateFormats )
- <option value="$dateFormat.name()" #if( $keyDateFormat == $dateFormat.name() )selected="selected"#end>$i18n.getString( $dateFormat.name() )</option>
-#end
-</select>
-</div>
-
<div class="settingLabel">$i18n.getString( "infrastructural_data_elements" )</div>
<div class="setting">
