openmeetings-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From solo...@apache.org
Subject svn commit: r1451523 - /openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx
Date Fri, 01 Mar 2013 08:41:51 GMT
Author: solomax
Date: Fri Mar  1 08:41:51 2013
New Revision: 1451523

URL: http://svn.apache.org/r1451523
Log:
SIP: sip-dialer is hidden in the "sip disabled" rooms

Modified:
    openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx

Modified: openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx?rev=1451523&r1=1451522&r2=1451523&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx
(original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx
Fri Mar  1 08:41:51 2013
@@ -250,10 +250,10 @@
 			<conferencDropDownMenuItem labelid="42" command="cmd_checkPollVoted" 
 						 enabled="true"/>
 			<horizontalDropDownSpacer
-						 visible="$once{ (canvas.RED5_SIP_ENABLE == 'yes') ? true : false }" />
+						 visible="$once{ canvas.RED5_SIP_ENABLE == 'yes' &amp;&amp; canvas.currentRoomObject.sipEnabled
}" />
             <conferencDropDownMenuItem labelid="1447" command="cmd_showSipDialer" 
-            			 visible="$once{ (canvas.RED5_SIP_ENABLE == 'yes') ? true : false }"
-            			 enabled="$once{ (canvas.RED5_SIP_ENABLE == 'yes') ? true : false }"/>
+            			 visible="$once{ canvas.RED5_SIP_ENABLE == 'yes' &amp;&amp; canvas.currentRoomObject.sipEnabled
}"
+            			 enabled="$once{ canvas.RED5_SIP_ENABLE == 'yes' &amp;&amp; canvas.currentRoomObject.sipEnabled
}"/>
             <horizontalDropDownSpacer />
 			<conferencDropDownMenuItem labelid="1126" command="cmd_editWhiteboardDefault" 
 						 enabled="true"/>



Mime
View raw message