dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 8173
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2012-09-21 14:05:52 +0700
message:
  Limit maxlengh of sms message in program tracking.
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/anonymousRegistration.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/smsReminder.js
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/sendSmsForm.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-caseentry/src/main/webapp/dhis-web-caseentry/anonymousRegistration.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/anonymousRegistration.vm	2012-09-21 01:10:53 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/anonymousRegistration.vm	2012-09-21 07:05:52 +0000
@@ -77,7 +77,7 @@
 				</td>
 			</tr>
 			<tr>
-				<td><span id="reportDateDescriptionField"></span>$i18n.getString('from_to')</td>
+				<td><span id="reportDateDescriptionField"></span> $i18n.getString('from_to')</td>
 				<td><input type="text" id='startDate' name='startDate' style='width:240px'></td>
 				<td><input type="text" id='endDate' name='endDate' style='width:240px'></td>
 				<td><input type="button" id='searchBtn' value='$i18n.getString( "search" )' onclick='setFieldValue("isShowEventList", false);validateSearchEvents( false )'></td>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/smsReminder.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/smsReminder.js	2012-09-21 01:28:20 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/smsReminder.js	2012-09-21 07:05:52 +0000
@@ -172,6 +172,7 @@
 			else{
 				commentDivToggle(false);
 			}
+			jQuery('#sendSmsFormDiv').dialog('close');
 		}); 
 }
 
@@ -197,6 +198,7 @@
 			else {
 				showErrorMessage( json.message );
 			}
+			jQuery('#sendSmsFormDiv').dialog('close')
 		}
 	});
 }

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/sendSmsForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/sendSmsForm.vm	2012-09-07 07:57:47 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/sendSmsForm.vm	2012-09-21 07:05:52 +0000
@@ -25,12 +25,15 @@
 				
 				<tr>
 					<td>$i18n.getString( "message" )</td>
-					<td><textarea id="smsMessage" name="smsMessage" style="width:260px;height:100px;" class="{validate:{required:true}}"></textarea></td>
+					<td><textarea id="smsMessage" name="smsMessage" style="width:260px;height:100px;" class="{validate:{required:true,maxlength:160}}"></textarea></td>
 				</tr>
 			
 				<tr>
 					<td></td>
-					<td><input type="submit" name="send" value="$i18n.getString( 'send_sms' )" onclick="jQuery('#sendSmsFormDiv').dialog('close')"/></td>
+					<td>
+						<input type="submit" value="$i18n.getString( 'send_sms' )"/>
+						<input type="button" value="$i18n.getString( 'cancel' )" onclick="jQuery('#sendSmsFormDiv').dialog('close')"/>
+					</td>
 				</tr>
 				
 			</tbody>