dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 7885
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2012-08-09 17:57:35 +0700
message:
  Minor fix.
modified:
  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/smsReminderList.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/smsReminderSelect.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/javascript/smsReminder.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/smsReminder.js	2012-08-09 10:13:33 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/smsReminder.js	2012-08-09 10:57:35 +0000
@@ -68,25 +68,11 @@
 			closable:true,
 			modal:false,
 			overlay:{background:'#000000', opacity:0.1},
-			width:700,
+			width:800,
 			height:400
 		});
 }
 
-function showSendSMSForm()
-{
-	$('#sendSmsFormFiv' ).load( "showSendSMSForm.action",{} ).dialog(
-		{
-			title:i18n_send_sms,
-			maximize:true, 
-			closable:true,
-			modal:true,
-			overlay:{background:'#000000', opacity:0.1},
-			width:400,
-			height:250
-		});
-}
-
 function sendSMS()
 {
 	programStageInstanceId = getFieldValue( 'programStageInstanceId' );
@@ -100,7 +86,6 @@
 		if ( json.response == "success" ) {
 			showSuccessMessage( json.message );
 			jQuery('#smsManagementList').prepend("<tr><td>" + getFieldValue('currentDate') + "</td><td>" + getFieldValue('smsMessage') + "</td></tr>");
-			$('#sendSmsFormFiv' ).dialog("close");
 			var noMessage = eval( getInnerHTML('noMessageDiv_' + programStageInstanceId)) + 1;
 			jQuery('#noMessageDiv_' + programStageInstanceId).html(noMessage);
 		}

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/smsReminderList.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/smsReminderList.vm	2012-08-09 10:47:22 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/smsReminderList.vm	2012-08-09 10:57:35 +0000
@@ -33,9 +33,6 @@
 	<div id="tab-1">
 		<table class="mainPageTable">
 			<tr>
-				<td colspan='3' align='right'><input type='button' value="$i18n.getString('send_sms')" onclick='showSendSMSForm();'></td>
-			</tr>
-			<tr>
 				<th>$i18n.getString( "date" )</th>
 				<th>$i18n.getString( "message" )</th>
 			</tr>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/smsReminderSelect.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/smsReminderSelect.vm	2012-08-09 10:47:22 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/smsReminderSelect.vm	2012-08-09 10:57:35 +0000
@@ -29,7 +29,6 @@
 
 <div id='listPatientDiv'></div>
 <div id='smsManagementDiv'></div>
-<div id='sendSmsFormFiv'></div>
 
 <script>
 	unSave = false;