You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2013/03/01 09:41:51 UTC
svn commit: r1451523 -
/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx
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' && 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' && canvas.currentRoomObject.sipEnabled }"
+ enabled="$once{ canvas.RED5_SIP_ENABLE == 'yes' && canvas.currentRoomObject.sipEnabled }"/>
<horizontalDropDownSpacer />
<conferencDropDownMenuItem labelid="1126" command="cmd_editWhiteboardDefault"
enabled="true"/>