dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 10158
committer: Hieu <hieu.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2013-03-13 01:13:59 +0700
message:
  (mobile) - Sending SMS - Fixed bug link to the blank page and remove the "Test input form" item from the menu
modified:
  dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/menu.vm
  dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/sendBeneficiarySMSPage.vm
  dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/sendSMSPage.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-sms/src/main/webapp/dhis-web-sms/menu.vm'
--- dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/menu.vm	2013-03-12 05:40:42 +0000
+++ dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/menu.vm	2013-03-12 18:13:59 +0000
@@ -1,5 +1,4 @@
 <h2>$i18n.getString( "sms_functions" )</h2>
 <ul>
     <li><a href="showSendingSMSForm.action">$i18n.getString( "show_send_sms_form" )</a></li>
-	<li><a href="testSMS.action">$i18n.getString( "test_sms_input" )</a></li>
 </ul>
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/sendBeneficiarySMSPage.vm'
--- dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/sendBeneficiarySMSPage.vm	2013-03-12 05:40:42 +0000
+++ dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/sendBeneficiarySMSPage.vm	2013-03-12 18:13:59 +0000
@@ -62,7 +62,7 @@
 		</tbody>
 	</table>
 
-	#parse( "dhis-web-maintenance-mobile/searchPatientCritetia.vm" )
+	#parse( "dhis-web-sms/searchPatientCritetia.vm" )
 	
 	<!-- List searching patients -->
 	#parse( "dhis-web-commons/loader/loader.vm" )

=== modified file 'dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/sendSMSPage.vm'
--- dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/sendSMSPage.vm	2013-03-12 05:40:42 +0000
+++ dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/sendSMSPage.vm	2013-03-12 18:13:59 +0000
@@ -38,6 +38,7 @@
 <h3>$i18n.getString( "send_sms" )</h3>
 #if ( $!gatewayMap && $!gatewayMap.size() > 0 )
 <form id="sendSMSForm" name="sendSMSForm" action="sendSMS.action">
+
 	<table id="detailsList">
 		<tbody>
 			<!--tr>
@@ -78,18 +79,10 @@
 				<td>$i18n.getString( "phone_number" ): <input type="text" id="recipient" name="recipient" style="width:53%"/></td>
 			</tr>
 			
+			<tr id="orgunitType" style="display:none"><td>#organisationUnitSelectionTree( true, true, false )</td></tr>
+			
 			<tr><th>$i18n.getString( "message" )</th></tr>
 			<tr><td><textarea id="smsMessage" name="smsMessage" cols="86" rows="5" class="{validate:{required:true}}"></textarea></td></tr>
-		</tbody>
-	</table>
-
-	<table id="detailsList">
-		<col width="300px"/>
-		<tbody id="orgunitType" style="display:none">
-			<tr><td>#organisationUnitSelectionTree( true, true, false )</td></tr>
-		</tbody>
-		
-		<tbody>
 			<tr>
 				<td><input type="submit" name="send" value="$i18n.getString( 'send_sms' )"/>				
 			</tr>