dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Lars Helge Øverland (larshelge)
------------------------------------------------------------
revno: 5435 [merge]
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2011-12-15 15:49:15 +0100
message:
  Made user message setting stuff consistent with the rest
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregatedDataValue.java
  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/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/userMessageSettings.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-api/src/main/java/org/hisp/dhis/aggregation/AggregatedDataValue.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregatedDataValue.java	2011-12-15 14:24:21 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregatedDataValue.java	2011-12-15 14:49:15 +0000
@@ -96,7 +96,7 @@
         this.modified = new Date();
     }
 
-        /**
+    /**
      * @param dataElementId data element id
      * @param categoryOptionComboId category option combo id
      * @param periodId period id

=== 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	2011-12-14 08:10:22 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties	2011-12-15 14:08:46 +0000
@@ -91,13 +91,14 @@
 intro_system_appearance_settings=Customize the system behavior with regard to application title, style, flag, start page.
 intro_system_email_settings=Configure the email SMTP setup with regard to host name, user name and password.
 user_general_settings=User General Settings
-user_message_settings=User Message Notification Settings
+user_message_settings=User Message Settings
 system_general_settings=System General Settings
 system_appearance_settings=System Appearance Settings
 system_email_settings=System Email Settings
 general=General
 appearance=Appearance
 email=Email
+message=Message
 disable_dataentry_when_dataset_completed=Disable data entry when data set completed
 max_attempts=Max number of login attempts
 lockout_timeframe=Lockout minutes after max number of login attempts

=== 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	2011-12-10 12:23:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/settingsMenu.vm	2011-12-15 14:08:46 +0000
@@ -1,7 +1,7 @@
 <h2>$i18n.getString( "user_settings" )&nbsp;</h2>
 <ul>
 	<li><a href="userGeneralSettings.action">$i18n.getString( "general" )&nbsp;</a></li>
-	<li><a href="userMessageSettings.action">$i18n.getString( "user_message_settings" )&nbsp;</a></li>
+	<li><a href="userMessageSettings.action">$i18n.getString( "message" )&nbsp;</a></li>
 </ul>
 
 <h2>$i18n.getString( "system_settings" )&nbsp;</h2>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/userMessageSettings.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/userMessageSettings.vm	2011-12-10 12:23:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/userMessageSettings.vm	2011-12-15 14:08:46 +0000
@@ -15,12 +15,11 @@
 
 <h3>$i18n.getString("user_message_settings")</h3>
 
-<ul style="list-style-type:none">
-<li><input type="checkbox" id="messageEmailNotification" name="messageEmailNotification" #if( $messageEmailNotification ) checked="checked"#end/>
-$i18n.getString( "message_email_notification" )</li>
-
-<li><input type="checkbox" id="messageSmsNotification" name="messageSmsNotification" #if( $messageSmsNotification ) checked="checked"#end/>
-$i18n.getString( "message_sms_notification" )</li>
-</ul>
+<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