dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 13338
committer: Hong Em <em.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2013-12-20 15:11:29 +0700
message:
  fixed display style for quick send function
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/receiveSMSPage.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/webapp/dhis-web-maintenance-mobile/receiveSMSPage.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/receiveSMSPage.vm	2013-12-20 04:29:12 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/receiveSMSPage.vm	2013-12-20 08:11:29 +0000
@@ -182,17 +182,25 @@
 
 	var i18n_confirm_delete = '$encoder.jsEscape( $i18n.getString( "confirm_delete_sms" ) , "'")';
 	
-	function conceal() {      
-        if(document.getElementById('idDiv').style.display=='block') {
-          document.getElementById('idDiv').style.display='none';
+	function conceal(divId) {      
+        if(document.getElementById('dv' + divId).style.display=='block') {
+          document.getElementById('dv' + divId).style.display='none';
         }
 		}  
 
+	
 	function show(divId) {
-    if(document.getElementById('dv' + divId).style.display=='none') {
-      document.getElementById('dv' + divId).style.display='block';
-		}
-		}
+	
+		$(".list").hide();
+	
+		if(document.getElementById('dv' + divId).style.display=='none') 
+		{
+		document.getElementById('dv' + divId).style.display='block';
+		
+		}
+	}
+
+			
 
 
 	
@@ -258,11 +266,11 @@
 				
 				<td>
 				
-				<a id="$incomingSms.id" href="#" onclick="show($velocityCount)" >$incomingSms.originator</a><br/>
-				<div id="dv$velocityCount" style="display: none;">
+				<a id="$incomingSms.id" href="#" onclick="show($velocityCount)">$incomingSms.originator</a><br/>
+				<div id="dv$velocityCount" style="display: none;" class="list">
 				<textarea  name="textArea"  id="sm$velocityCount" rows="3" style="width:160px;"></textarea><br/>
 				<input type="button" name="send" value="$i18n.getString( 'send' )" style="float: center;" onclick="sendQuickSMS($velocityCount, $incomingSms.originator)"/>
-				<input type="submit" name="btnClose" value="$i18n.getString( 'close' )" style="float: center;"/>
+				<input type="button" name="btnClose" value="$i18n.getString( 'close' )" onclick="conceal($velocityCount)" style="float: center;"/>
 				</div>
 				
 				</td>