dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #19517
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 8542: Improved user setting screen
------------------------------------------------------------
revno: 8542
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2012-10-16 15:26:20 +0200
message:
Improved user setting screen
removed:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/settings/userMessageSettings.vm
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/settings/user/action/GetMessageSettingsAction.java
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/settings/user/action/SetMessageSettingsAction.java
modified:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/settings/userGeneralSettings.vm
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/settings/user/action/GetGeneralSettingsAction.java
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/settings/user/action/SetGeneralSettingsAction.java
dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml
dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties
--
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-commons-resources/src/main/webapp/dhis-web-commons/settings/userGeneralSettings.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/settings/userGeneralSettings.vm 2012-10-07 07:26:14 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/settings/userGeneralSettings.vm 2012-10-16 13:26:20 +0000
@@ -1,13 +1,13 @@
-#if( $availableLocales )
-<script type="text/javascript">
-
+<script type="text/javascript">
jQuery(document).ready(function() {
jQuery("input[type=button]").click(function() {
- jQuery.postJSON( 'setUserGeneralSettings.action', {
+ jQuery.postJSON( 'setUserSettings.action', {
currentLocale: getFieldValue( 'currentLocale' ),
currentLocaleDb: getFieldValue( 'currentLocaleDb' ),
currentStyle: getFieldValue( 'currentStyle' ),
- autoSave: jQuery( '#autoSave' ).is(':checked' )
+ autoSave: jQuery( '#autoSave' ).is(':checked' ),
+ messageEmailNotification: jQuery( '#messageEmailNotification' ).is(':checked' ),
+ messageSmsNotification: jQuery( '#messageSmsNotification' ).is(':checked' )
}, function ( json ) {
if ( json.response == "success" )
setHeaderDelayMessage( json.message );
@@ -16,36 +16,52 @@
});
</script>
-<h3>$i18n.getString("user_general_settings") #openHelp( "userGeneralSettings" )</h3>
-
-<h4>$i18n.getString( "language" )</h4>
-
-<select id="currentLocale" name="currentLocale" style="min-width:250px">
+<h3>$i18n.getString( "settings" ) #openHelp( "userGeneralSettings" )</h3>
+
+<div class="settingLabel">$i18n.getString( "language" )</div>
+
+<div class="setting">
+<select id="currentLocale" name="currentLocale">
#foreach( $locale in $availableLocales )
<option value="$locale.toString()" #if( $locale == $currentLocale )selected="selected"#end>$locale.getDisplayName()</option>
#end
</select>
-
-<h4>$i18n.getString( "db_language" )</h4>
-
-<select id="currentLocaleDb" name="currentLocaleDb" style="min-width:250px">
+</div>
+
+<div class="settingLabel">$i18n.getString( "db_language" )</div>
+
+<div class="setting">
+<select id="currentLocaleDb" name="currentLocaleDb">
<option value="">[$i18n.getString( "use_db_locale_no_translation" )]</option>
#foreach( $locale in $availableLocalesDb )
<option value="$locale.toString()" #if( $locale == $currentLocaleDb )selected="selected"#end>$locale.getDisplayName()</option>
#end
</select>
-
-<h4>$i18n.getString( "style" )</h4>
-
-<select id="currentStyle" name="currentStyle" style="min-width:250px">
+</div>
+
+<div class="settingLabel">$i18n.getString( "interface_style" )</div>
+
+<div class="setting">
+<select id="currentStyle" name="currentStyle">
#foreach( $style in $styles.entrySet() )
<option value="$style.value" #if( $style.value == $currentStyle )selected="selected"#end>$i18n.getString( $style.key )</option>
#end
</select>
-
-<h4>$i18n.getString( "auto_save_data_entry_form" )</h4>
-<input type="checkbox" id="autoSave" name="autoSave" #if( $autoSave ) checked="checked"#end/>
-
-<p><input type="button" value="$i18n.getString( 'save' )" style="width:10em"/></p>
-
-#end
\ No newline at end of file
+</div>
+
+<div class="setting">
+ <input type="checkbox" id="autoSave" name="autoSave" #if( $autoSave ) checked="checked"#end/>
+ <label for="autoSave">$i18n.getString( "auto_save_data_entry_forms" )</label>
+</div>
+
+<div class="setting">
+ <input type="checkbox" id="messageEmailNotification" name="messageEmailNotification" #if( $messageEmailNotification ) checked="checked"#end/>
+ <label for="messageEmailNotification">$i18n.getString( "enable_message_email_notifications" )</label>
+</div>
+
+<div class="setting">
+ <input type="checkbox" id="messageSmsNotification" name="messageSmsNotification" #if( $messageSmsNotification ) checked="checked"#end/>
+ <label for="messageSmsNotification">$i18n.getString( "enable_message_sms_notifications" )</label>
+</div>
+
+<div class="setting"><input type="button" value="$i18n.getString( 'save' )" style="width:10em"/></div>
=== removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/settings/userMessageSettings.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/settings/userMessageSettings.vm 2012-10-07 07:26:14 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/settings/userMessageSettings.vm 1970-01-01 00:00:00 +0000
@@ -1,23 +0,0 @@
-<script type="text/javascript">
- jQuery(document).ready(function() {
- jQuery("input[type=button]").click(function() {
- jQuery.post( 'setUserMessageSettings.action', {
- messageEmailNotification: jQuery( '#messageEmailNotification' ).is(':checked' ),
- messageSmsNotification: jQuery( '#messageSmsNotification' ).is(':checked' )
- }, function ( json ) {
- if ( json.response == "success" )
- setHeaderDelayMessage( json.message );
- });
- });
- });
-</script>
-
-<h3>$i18n.getString( "user_message_settings" ) #openHelp( "userMessageSettings" )</h3>
-
-<h4>$i18n.getString( "message_email_notification" )</h4>
-<p><input type="checkbox" id="messageEmailNotification" name="messageEmailNotification" #if( $messageEmailNotification ) checked="checked"#end/></p>
-
-<h4>$i18n.getString( "message_sms_notification" )</h4>
-<p><input type="checkbox" id="messageSmsNotification" name="messageSmsNotification" #if( $messageSmsNotification ) checked="checked"#end/></p>
-
-<p><input type="button" value="$i18n.getString( 'save' )" style="width:10em"/></p>
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm 2012-10-16 11:08:57 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm 2012-10-16 13:26:20 +0000
@@ -107,8 +107,7 @@
<div id="menuDropDown4" class="menuDropDownArea">
<ul class="menuDropDownBox">
- <li><a href="../dhis-web-commons-about/userGeneralSettings.action">$i18n.getString( "general_settings" ) </a></li>
- <li><a href="../dhis-web-commons-about/userMessageSettings.action">$i18n.getString( "message_settings" ) </a></li>
+ <li><a href="../dhis-web-commons-about/userSettings.action">$i18n.getString( "settings" ) </a></li>
<li><a href="../dhis-web-commons-about/showUpdateUserProfileForm.action">$i18n.getString( "profile" ) </a></li>
<li><a href="../dhis-web-commons-about/showUpdateUserAccountForm.action">$i18n.getString( "account" ) </a></li>
<li><a href="../dhis-web-commons-security/logout.action">$i18n.getString( "log_out" ) </a></li>
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/settings/user/action/GetGeneralSettingsAction.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/settings/user/action/GetGeneralSettingsAction.java 2012-10-07 07:26:14 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/settings/user/action/GetGeneralSettingsAction.java 2012-10-16 13:26:20 +0000
@@ -28,6 +28,8 @@
*/
import static org.hisp.dhis.user.UserSettingService.AUTO_SAVE_DATA_ENTRY_FORM;
+import static org.hisp.dhis.user.UserSettingService.KEY_MESSAGE_EMAIL_NOTIFICATION;
+import static org.hisp.dhis.user.UserSettingService.KEY_MESSAGE_SMS_NOTIFICATION;
import java.util.ArrayList;
import java.util.Collections;
@@ -123,48 +125,6 @@
return currentLocaleDb;
}
- private List<String> sortOrders;
-
- public List<String> getSortOrders()
- {
- return sortOrders;
- }
-
- private String currentSortOrder;
-
- public String getCurrentSortOrder()
- {
- return currentSortOrder;
- }
-
- private List<Integer> chartsInDashboardOptions;
-
- public List<Integer> getChartsInDashboardOptions()
- {
- return chartsInDashboardOptions;
- }
-
- private List<String> displayProperties;
-
- public List<String> getDisplayProperties()
- {
- return displayProperties;
- }
-
- private String currentDisplayProperty;
-
- public String getCurrentDisplayProperty()
- {
- return currentDisplayProperty;
- }
-
- private Boolean autoSave;
-
- public Boolean getAutoSave()
- {
- return autoSave;
- }
-
private String currentStyle;
public String getCurrentStyle()
@@ -179,6 +139,27 @@
return styles;
}
+ private Boolean autoSave;
+
+ public Boolean getAutoSave()
+ {
+ return autoSave;
+ }
+
+ private Boolean messageEmailNotification;
+
+ public Boolean getMessageEmailNotification()
+ {
+ return messageEmailNotification;
+ }
+
+ private Boolean messageSmsNotification;
+
+ public Boolean getMessageSmsNotification()
+ {
+ return messageSmsNotification;
+ }
+
// -------------------------------------------------------------------------
// Action implementation
// -------------------------------------------------------------------------
@@ -232,6 +213,10 @@
currentStyle = styleManager.getCurrentStyle();
+ messageEmailNotification = (Boolean) userSettingService.getUserSetting( KEY_MESSAGE_EMAIL_NOTIFICATION, false );
+
+ messageSmsNotification = (Boolean) userSettingService.getUserSetting( KEY_MESSAGE_SMS_NOTIFICATION, false );
+
return SUCCESS;
}
}
=== removed file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/settings/user/action/GetMessageSettingsAction.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/settings/user/action/GetMessageSettingsAction.java 2012-10-07 07:26:14 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/settings/user/action/GetMessageSettingsAction.java 1970-01-01 00:00:00 +0000
@@ -1,90 +0,0 @@
-package org.hisp.dhis.settings.user.action;
-
-/*
- * Copyright (c) 2004-2012, 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 static org.hisp.dhis.user.UserSettingService.KEY_MESSAGE_EMAIL_NOTIFICATION;
-import static org.hisp.dhis.user.UserSettingService.KEY_MESSAGE_SMS_NOTIFICATION;
-
-import org.hisp.dhis.user.UserSettingService;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Dang Duy Hieu
- * @version $Id$
- */
-public class GetMessageSettingsAction
- implements Action
-{
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private UserSettingService userSettingService;
-
- public void setUserSettingService( UserSettingService userSettingService )
- {
- this.userSettingService = userSettingService;
- }
-
- // -------------------------------------------------------------------------
- // Output
- // -------------------------------------------------------------------------
-
- private Boolean messageEmailNotification;
-
- public Boolean getMessageEmailNotification()
- {
- return messageEmailNotification;
- }
-
- private Boolean messageSmsNotification;
-
- public Boolean getMessageSmsNotification()
- {
- return messageSmsNotification;
- }
-
- // -------------------------------------------------------------------------
- // Action implementation
- // -------------------------------------------------------------------------
-
- public String execute()
- throws Exception
- {
- // ---------------------------------------------------------------------
- // Get Message-email-notification
- // ---------------------------------------------------------------------
-
- messageEmailNotification = (Boolean) userSettingService.getUserSetting( KEY_MESSAGE_EMAIL_NOTIFICATION, false );
-
- messageSmsNotification = (Boolean) userSettingService.getUserSetting( KEY_MESSAGE_SMS_NOTIFICATION, false );
-
- return SUCCESS;
- }
-}
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/settings/user/action/SetGeneralSettingsAction.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/settings/user/action/SetGeneralSettingsAction.java 2012-10-07 07:26:14 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/settings/user/action/SetGeneralSettingsAction.java 2012-10-16 13:26:20 +0000
@@ -29,6 +29,8 @@
import static org.hisp.dhis.user.UserSettingService.AUTO_SAVE_DATA_ENTRY_FORM;
import static org.hisp.dhis.user.UserSettingService.KEY_DB_LOCALE;
+import static org.hisp.dhis.user.UserSettingService.KEY_MESSAGE_EMAIL_NOTIFICATION;
+import static org.hisp.dhis.user.UserSettingService.KEY_MESSAGE_SMS_NOTIFICATION;
import java.util.Locale;
@@ -104,6 +106,20 @@
this.currentStyle = style;
}
+ private Boolean messageEmailNotification;
+
+ public void setMessageEmailNotification( Boolean messageEmailNotification )
+ {
+ this.messageEmailNotification = messageEmailNotification;
+ }
+
+ private Boolean messageSmsNotification;
+
+ public void setMessageSmsNotification( Boolean messageSmsNotification )
+ {
+ this.messageSmsNotification = messageSmsNotification;
+ }
+
private String message;
public String getMessage()
@@ -133,7 +149,11 @@
styleManager.setUserStyle( currentStyle );
userSettingService.saveUserSetting( AUTO_SAVE_DATA_ENTRY_FORM, autoSave );
-
+
+ userSettingService.saveUserSetting( KEY_MESSAGE_EMAIL_NOTIFICATION, messageEmailNotification );
+
+ userSettingService.saveUserSetting( KEY_MESSAGE_SMS_NOTIFICATION, messageSmsNotification );
+
message = i18n.getString( "settings_updated" );
return SUCCESS;
=== removed file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/settings/user/action/SetMessageSettingsAction.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/settings/user/action/SetMessageSettingsAction.java 2012-10-07 07:26:14 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/settings/user/action/SetMessageSettingsAction.java 1970-01-01 00:00:00 +0000
@@ -1,102 +0,0 @@
-package org.hisp.dhis.settings.user.action;
-
-/*
- * Copyright (c) 2004-2012, 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 static org.hisp.dhis.user.UserSettingService.KEY_MESSAGE_EMAIL_NOTIFICATION;
-import static org.hisp.dhis.user.UserSettingService.KEY_MESSAGE_SMS_NOTIFICATION;
-
-import org.hisp.dhis.i18n.I18n;
-import org.hisp.dhis.user.UserSettingService;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Dang Duy Hieu
- */
-public class SetMessageSettingsAction
- implements Action
-{
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private UserSettingService userSettingService;
-
- public void setUserSettingService( UserSettingService userSettingService )
- {
- this.userSettingService = userSettingService;
- }
-
- // -------------------------------------------------------------------------
- // Input
- // -------------------------------------------------------------------------
-
- private Boolean messageEmailNotification;
-
- public void setMessageEmailNotification( Boolean messageEmailNotification )
- {
- this.messageEmailNotification = messageEmailNotification;
- }
-
- private Boolean messageSmsNotification;
-
- public void setMessageSmsNotification( Boolean messageSmsNotification )
- {
- this.messageSmsNotification = messageSmsNotification;
- }
-
- private String message;
-
- public String getMessage()
- {
- return message;
- }
-
- private I18n i18n;
-
- public void setI18n( I18n i18n )
- {
- this.i18n = i18n;
- }
-
- // -------------------------------------------------------------------------
- // Action implementation
- // -------------------------------------------------------------------------
-
- public String execute()
- throws Exception
- {
- userSettingService.saveUserSetting( KEY_MESSAGE_EMAIL_NOTIFICATION, messageEmailNotification );
-
- userSettingService.saveUserSetting( KEY_MESSAGE_SMS_NOTIFICATION, messageSmsNotification );
-
- message = i18n.getString( "settings_updated" );
-
- return SUCCESS;
- }
-}
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml 2012-10-07 20:10:20 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml 2012-10-16 13:26:20 +0000
@@ -622,22 +622,6 @@
</property>
</bean>
- <bean id="org.hisp.dhis.settings.user.action.GetMessageSettingsAction"
- class="org.hisp.dhis.settings.user.action.GetMessageSettingsAction"
- scope="prototype">
- <property name="userSettingService">
- <ref bean="org.hisp.dhis.user.UserSettingService" />
- </property>
- </bean>
-
- <bean id="org.hisp.dhis.settings.user.action.SetMessageSettingsAction"
- class="org.hisp.dhis.settings.user.action.SetMessageSettingsAction"
- scope="prototype">
- <property name="userSettingService">
- <ref bean="org.hisp.dhis.user.UserSettingService" />
- </property>
- </bean>
-
<bean id="org.hisp.dhis.commons.action.GetPingAction" class="org.hisp.dhis.commons.action.GetPingAction">
<property name="currentUserService" ref="org.hisp.dhis.user.CurrentUserService" />
</bean>
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml 2012-10-16 11:08:57 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml 2012-10-16 13:26:20 +0000
@@ -885,29 +885,17 @@
<!-- User settings -->
- <action name="userGeneralSettings" class="org.hisp.dhis.settings.user.action.GetGeneralSettingsAction">
+ <action name="userSettings" class="org.hisp.dhis.settings.user.action.GetGeneralSettingsAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-commons/settings/userGeneralSettings.vm</param>
<param name="menu">/dhis-web-commons/about/menuDashboard.vm</param>
</action>
- <action name="setUserGeneralSettings" class="org.hisp.dhis.settings.user.action.SetGeneralSettingsAction">
+ <action name="setUserSettings" class="org.hisp.dhis.settings.user.action.SetGeneralSettingsAction">
<result name="success" type="velocity-json">
/dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
<param name="onExceptionReturn">plainTextError</param>
</action>
- <action name="userMessageSettings" class="org.hisp.dhis.settings.user.action.GetMessageSettingsAction">
- <result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-commons/settings/userMessageSettings.vm</param>
- <param name="menu">/dhis-web-commons/about/menuDashboard.vm</param>
- </action>
-
- <action name="setUserMessageSettings" class="org.hisp.dhis.settings.user.action.SetMessageSettingsAction">
- <result name="success" type="velocity-json">
- /dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
- <param name="onExceptionReturn">plainTextError</param>
- </action>
-
</package>
</struts>
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties 2012-10-16 11:08:57 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties 2012-10-16 13:26:20 +0000
@@ -320,12 +320,12 @@
db_language=Database Language
language=Interface Language
use_db_locale_no_translation=Use database locale / no translation
-auto_save_data_entry_form=Auto-save data entry form
+auto_save_data_entry_forms=Auto-save data entry forms
style=Style
user_general_settings=User General Settings
user_message_settings=User Message Settings
-message_email_notification=Message email notification
-message_sms_notification=Message sms notification
+enable_message_email_notifications=Enable message email notifications
+enable_message_sms_notifications=Enable message SMS notifications
intro_user_general_settings=Customize the system with user specific settings for locale, style and more.
intro_user_message_settings=Customize the system with user specific settings for message email and sms notification.
light_blue=Light Blue
@@ -336,8 +336,7 @@
dashboard=Dashboard
messages=Messages
interpretations=Interpretations
-general_settings=General Settings
-message_settings=Message Settings
+interface_style=Interface style
#-- Change Log------------------------------------------------------------------#
