You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by vd...@apache.org on 2013/04/02 12:49:26 UTC
svn commit: r1463476 - in
/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom:
interviewConferenceRoom.lzx restrictedConferenceRoom.lzx
Author: vdegtyarev
Date: Tue Apr 2 10:49:26 2013
New Revision: 1463476
URL: http://svn.apache.org/r1463476
Log:
OPENMEETINGS-575 bug is fixed. Name of the restricted and interview rooms is displayed when user enters to this room.
Modified:
openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/interviewConferenceRoom.lzx
openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx
Modified: openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/interviewConferenceRoom.lzx
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/interviewConferenceRoom.lzx?rev=1463476&r1=1463475&r2=1463476&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/interviewConferenceRoom.lzx (original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/interviewConferenceRoom.lzx Tue Apr 2 10:49:26 2013
@@ -53,6 +53,12 @@
canvas.currentBaseConferenceRoom = this;
+ canvas.currentRoomObj.hideScreenSharing = true;
+ new lz.moderationPanel(canvas._moderatormenu,{
+ name:'_moderationPanel',align:'right',
+ roomName:this.roomobj.name
+ });
+
</handler>
<handler name="ontabcontentleave">
Modified: openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx?rev=1463476&r1=1463475&r2=1463476&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx (original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx Tue Apr 2 10:49:26 2013
@@ -27,7 +27,8 @@
new lz.moderationPanel(canvas._conferencemenu,{
name:'_moderationPanel',align:'right',
- allowUserQuestions:this.roomobj.allowUserQuestions
+ allowUserQuestions:this.roomobj.allowUserQuestions,
+ roomName:this.roomobj.name
});
canvas._conferencemenu.setAttribute('visibility','visible');