dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #26211
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 12983: minor
------------------------------------------------------------
revno: 12983
committer: Lai <lai.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2013-11-20 11:49:25 +0700
message:
minor
modified:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/smscommand/CreateSMSCommandForm.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/org/hisp/dhis/mobile/i18n_module.properties
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/smscommand/edit-sms-command.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-mobile/src/main/java/org/hisp/dhis/mobile/action/smscommand/CreateSMSCommandForm.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/smscommand/CreateSMSCommandForm.java 2013-11-20 04:03:42 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/smscommand/CreateSMSCommandForm.java 2013-11-20 04:49:25 +0000
@@ -126,13 +126,6 @@
userGroup = userGroupService.getUserGroup( userGroupID );
command.setUserGroup( userGroup );
}
- /*Set<SMSSpecialCharacter> specialCharacterSet = new HashSet<SMSSpecialCharacter>();
- SMSSpecialCharacter smsSpecialCharacter1 = new SMSSpecialCharacter( "lai", "cool" );
- SMSSpecialCharacter smsSpecialCharacter2 = new SMSSpecialCharacter( "trinh", "sexy" );
- specialCharacterSet.add( smsSpecialCharacter1 );
- specialCharacterSet.add( smsSpecialCharacter2 );
- smsCommandService.saveSpecialCharacterSet( specialCharacterSet );
- command.setSpecialCharacters( specialCharacterSet );*/
smsCommandService.save( command );
return SUCCESS;
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/org/hisp/dhis/mobile/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/org/hisp/dhis/mobile/i18n_module.properties 2013-08-30 07:09:29 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/org/hisp/dhis/mobile/i18n_module.properties 2013-11-20 04:49:25 +0000
@@ -126,4 +126,7 @@
mobile_phones_pattern=Mobile Phones Pattern
phone_number = Phone Number
filter_by_phone_number = Filter by Phone Number
-total_number_of_result = Total Number of Result
\ No newline at end of file
+total_number_of_result = Total Number of Result
+special_characters = Special Characters
+value = Value
+add_more = Add More
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/smscommand/edit-sms-command.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/smscommand/edit-sms-command.vm 2013-11-20 04:03:42 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/smscommand/edit-sms-command.vm 2013-11-20 04:49:25 +0000
@@ -102,7 +102,7 @@
</br>
#if( $smsCommand.parserType == 'KEY_VALUE_PARSER' || $smsCommand.parserType == 'J2ME_PARSER' )
<table id="codes">
- <col style="width:450px"/><col/>
+ <col style="width:350px"/><col/>
<thead>
<tr>
<th>$i18n.getString( "data_element_category_combination")</th>
@@ -131,7 +131,7 @@
#end
</table>
<table border="0">
- <col style="width:320px"/><col/>
+ <col style="width:350px"/><col/>
<thead>
<tr>
<th>$i18n.getString( "special_characters" )</th>