Revision: 2511
Author: seba.wagner
Date: Sun Oct 25 08:47:11 2009
Log: New RoomType "Restricted"
Add menu Options
Disabe Back Button when direct Room Init
http://code.google.com/p/openmeetings/source/detail?r=2511
Added:
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx
Modified:
/trunk/singlewebapp/WebContent/openmeetings/modules/admin/roomadmin/roomAdmin.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/conference/conferenceMenubar.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/conference/roomListItem.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/flexibleConferenceRoom/library.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/flexibleConferenceRoom/roomSidebar/eventRoomSidebar.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/meetings/allmeetings.lzx
=======================================
--- /dev/null
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx
Sun Oct 25 08:47:11 2009
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<library>
+
+<class name="restrictedConferenceRoom" extends="baseContentView"
destroyByMethod="true" >
+
+ <attribute name="roomobj" value="null" />
+
+ <attribute name="meetingTimer" value="null" />
+
+ <handler name="oninit">
+
+ _mainScrollBar.setAttribute("visibility","hidden");
+
+ if ($debug) Debug.write("roomobj: ",this.roomobj);
+ canvas._mainbgcontentNavi.setAttribute('height',0);
+ canvas.setAttribute('naviHeightDelta',28);
+ new lz.restrictedConferenceMenubar(canvas._conferencemenu);
+ //,{x:this.roomobj.moderationPanelXPosition}
+ new lz.moderationPanel(canvas._conferencemenu,{align:'right'});
+ canvas._conferencemenu.setAttribute('visibility','visible');
+
+ if(roomobj.appointment){
+ new lz.winni(canvas.conferenceView,{ name:'appDetail',
+ width:350, height:160, resizable:true, closeable:true,
x:300,y:200, roomobj:this.roomobj });
+ } else{
+ if ($debug) Debug.write("no appointed meeting");
+ }
+
+ if (this.roomobj.isDemoRoom) {
+ if (this.roomobj.demoTime != null) {
+ if ($debug) Debug.warn("THIS IS A DEMO ROOM THAT SHOULD
CLOSE AFTER SEC: ",this.roomobj.demoTime);
+ this.meetingTimer = new
lz.meetingTimer(canvas,{refObj:this,roomobj:this.roomobj});
+ }
+ }
+
+ this._chatPanelStrict.toggleopen();
+
+ </handler>
+
+ <handler name="ontabcontentleave">
+ if ($debug) Debug.write("#################
ontabcontentleave:",this);
+
+ //reset the right to draw on WHiteboard as the RoomClient Object
will be destroyed also
+ //on server-Side the canDraw status will be false again when you
relogin the same room
+ canvas.isAllowedToDraw = true;
+
+ _mainScrollBar.setAttribute("visibility","visible");
+
+ if (canvas._videocontainer!=null){
+ canvas._videocontainer.resetAllValues();
+ canvas._videocontainer = null;
+ }
+ if (canvas._chatcontent!=null){
+ canvas._chatcontent = null;
+ }
+ if (canvas._mymod!=null){
+ canvas._mymod = null;
+ }
+
+ if (this.meetingTimer != null) {
+ this.meetingTimer.close();
+ }
+
+ if (canvas._drawarea.letterObjectIsActive){
+ canvas._drawarea.currentletterObj.destroy();
+ }
+
+ canvas._screens.clearAllSessions();
+ this.logicalRoomLeave.doCall();
+ if ($debug) Debug.write("############
this.logicalRoomLeave ",this.logicalRoomLeave);
+ </handler>
+
+ <netRemoteCallHib name="logicalRoomLeave" funcname="logicalRoomLeave"
remotecontext="$once{ canvas.thishib }" >
+ <handler name="ondata" args="value">
+ if ($debug) Debug.write("############# logicalRoomLeave:
",value);
+ //this.parent.destroy();
+ canvas.thishib.reconnectAfterRoomleft = true;
+ canvas.thishib.reconnectedRoomInstance = this.parent;
+
+ // Reconnect User to default Scope
+ canvas.thishib.userScope = "hibernate";
+ var src =
hib.protocollName+'://'+canvas.rtmphostlocal+':'+hib.protocollPort+'/'+canvas.webAppRootKey+'/'+hib.userScope;
+ canvas.thishib.setAttribute('src',src);
+ canvas.thishib.disconnect();
+
canvas._mainbgcontentNavi.setAttribute('height',canvas.naviHeight);
+ canvas.setAttribute('naviHeightDelta',canvas.naviHeight);
+ canvas._conferencemenu.removeAll();
+ canvas._conferencemenu.setAttribute('visibility','hidden');
+ </handler>
+ </netRemoteCallHib>
+
+ <eventRoomSidebar name="_sidePanel" restricted="true" />
+
+ <conferenceBox name="_chatPanelStrict" labelid="616" textInset="30"
closeable="true"
+ height="200" x="${ parent._sidePanel.width }"
+ y="${ canvas.height - (this.height+22) }"
+ width="${ canvas.width - parent._sidePanel.width }">
+ <!--
+ <handler name="onwidth" args="w">
+ if ($debug) Debug.write("ON WIDTH",w);
+ </handler>
+ -->
+ <chatTab name="content" y="40" height="${ parent.height-40 }"
width="${ parent.width }" />
+ </conferenceBox>
+
+ <fixedWhiteboardPanel name="_whiteboard" labelid="615"
+ y="0" x="${ parent._sidePanel.width }"
+ width="${ canvas.width - parent._sidePanel.width }"
+ height="${ canvas.height - (parent._chatPanelStrict.height+22) }"
/>
+
+ <!--
+ ###############################
+ This is the container for all Videos
+ -->
+ <view name="_videoviewcontent" />
+
+</class>
+
+</library>
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/admin/roomadmin/roomAdmin.lzx
Mon Oct 12 03:58:23 2009
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/admin/roomadmin/roomAdmin.lzx
Sun Oct 25 08:47:11 2009
@@ -4,7 +4,7 @@
<!--- Admin module to configure the Conference or Audience room.-->
<class name="roomAdmin" extends="baseContentView">
- <turnOverList name="_turnoverlist" width="400" height="600" x="2" y="0"
+ <turnOverList name="_turnoverlist" width="400" height="${ canvas.height
-
130 }" x="2" y="0"
orderby="rooms_id" step="50" asc="true">
<handler name="oninit">
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/conference/conferenceMenubar.lzx
Mon Oct 12 03:58:23 2009
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/conference/conferenceMenubar.lzx
Sun Oct 25 08:47:11 2009
@@ -33,7 +33,9 @@
<handler name="oninit">
<![CDATA[
if (canvas.isinitRoomDirect || canvas.remoteUserLogin)
{
- this.parent.mbarcontent.subviews[9].destroy();
+ if ($debug) Debug.write("this mbarcontent ",this);
+ this.flist.removeItemAt(8);
+ this.flist.removeItemAt(7);
}
]]>
</handler>
@@ -45,7 +47,7 @@
<_labelMenuItem labelid="560" command="cmd_exportFileSVG" />
<_labelMenuItem labelid="564" command="cmd_exportFileTIF" />
<menuseparator/>
- <_labelMenuItem labelid="309" command="cmd_quit" />
+ <_labelMenuItem name="_exitItem" labelid="309"
command="cmd_quit" value="quit" />
</_labelMenu>
<_labelMenu labelid="635" width="250">
@@ -55,8 +57,37 @@
<_labelMenuItem labelid="306" command="cmd_editCamMicSettings"
/>
<_labelMenuItem labelid="307" command="cmd_editBoardSettings"
/>
<menuseparator/>
+ <_labelMenuItem labelid="784" enabled="${ !canvas.ismoderator
}">
+ <handler name="onselect" args="sel">
+ //Apply for Moderation
+ canvas.thishib.applyForModeration.doCall();
+ </handler>
+ </_labelMenuItem>
+ <_labelMenuItem labelid="785" enabled="${ !canvas.ismoderator
}" >
+ <handler name="onselect" args="sel">
+ //Ask for Right to Draw on Whiteboard
+
canvas.thishib.sendMessageWithClient.sendMessage("applyForWhiteboard",null);
+ </handler>
+ </_labelMenuItem>
+ <_labelMenuItem labelid="786" enabled="${ !canvas.ismoderator
}" >
+ <handler name="onselect" args="sel">
+ if (canvas.ismoderator) {
+ //Do directly send confirmation to share
Audio/Video to
SELF! so that all users get
+ //the notification and the broadcasting Bit is
set for
this User
+
canvas.thishib.setBroadCastingFlag.publicSIDOfNewModerator =
canvas.publicSID;
+
canvas.thishib.setBroadCastingFlag.isAllowedToBroadCastAV = true;
+ canvas.thishib.setBroadCastingFlag.doCall();
+ } else {
+ //Apply for Right to Share Audio/Video
+
canvas.thishib.sendMessageWithClient.sendMessage("applyForAV",null);
+ }
+ </handler>
+ </_labelMenuItem>
+ <menuseparator/>
+ <!--
<_labelMenuItem labelid="749" command="cmd_coBrowser"
enabled="${ canvas.ismoderator }" />
<menuseparator/>
+ -->
<_labelMenuItem width="250" labelid="24"
command="cmd_createPoll" enabled="${ canvas.ismoderator }" />
<_labelMenuItem width="250" labelid="37"
command="cmd_pollResults" enabled="${ canvas.ismoderator }" />
<_labelMenuItem width="250" labelid="42"
command="cmd_checkPollVoted" />
@@ -83,6 +114,74 @@
-->
</class>
+ <class name="restrictedConferenceMenubar" extends="menubar" height="28"
style="itemStyle">
+
+ <!-- file menu -->
+ <_labelMenu labelid="245" width="250">
+ <handler name="oninit">
+ <![CDATA[
+ if (canvas.isinitRoomDirect || canvas.remoteUserLogin)
{
+ if ($debug) Debug.write("this mbarcontent ",this);
+ this.flist.removeItemAt(8);
+ this.flist.removeItemAt(7);
+ }
+ ]]>
+ </handler>
+ <_labelMenuItem labelid="15" command="cmd_importFile" />
+ <menuseparator/>
+ <_labelMenuItem labelid="561" command="cmd_exportFilePNG" />
+ <_labelMenuItem labelid="562" command="cmd_exportFileJPG" />
+ <_labelMenuItem labelid="563" command="cmd_exportFilePDF" />
+ <_labelMenuItem labelid="560" command="cmd_exportFileSVG" />
+ <_labelMenuItem labelid="564" command="cmd_exportFileTIF" />
+ <menuseparator/>
+ <_labelMenuItem name="_exitItem" labelid="309"
command="cmd_quit" value="quit" />
+ </_labelMenu>
+
+ <_labelMenu labelid="635" width="250">
+ <_labelMenuItem labelid="302" command="cmd_applyforMod"
enabled="${ canvas.ismoderator }" />
+ <_labelMenuItem labelid="213" command="cmd_invitation"
enabled="${ canvas.ismoderator }" />
+ <menuseparator/>
+ <_labelMenuItem labelid="306" command="cmd_editCamMicSettings"
enabled="${ canvas.ismoderator }" />
+ <_labelMenuItem labelid="307" command="cmd_editBoardSettings"
enabled="${ canvas.ismoderator }" />
+ <menuseparator/>
+ <_labelMenuItem labelid="784" enabled="${ !canvas.ismoderator
}">
+ <handler name="onselect" args="sel">
+ //Apply for Moderation
+ canvas.thishib.applyForModeration.doCall();
+ </handler>
+ </_labelMenuItem>
+ <_labelMenuItem labelid="785" enabled="${ !canvas.ismoderator
}" >
+ <handler name="onselect" args="sel">
+ //Ask for Right to Draw on Whiteboard
+
canvas.thishib.sendMessageWithClient.sendMessage("applyForWhiteboard",null);
+ </handler>
+ </_labelMenuItem>
+ <_labelMenuItem labelid="786" enabled="${ !canvas.ismoderator
}" >
+ <handler name="onselect" args="sel">
+ if (canvas.ismoderator) {
+ //Do directly send confirmation to share
Audio/Video to
SELF! so that all users get
+ //the notification and the broadcasting Bit is
set for
this User
+
canvas.thishib.setBroadCastingFlag.publicSIDOfNewModerator =
canvas.publicSID;
+
canvas.thishib.setBroadCastingFlag.isAllowedToBroadCastAV = true;
+ canvas.thishib.setBroadCastingFlag.doCall();
+ } else {
+ //Apply for Right to Share Audio/Video
+
canvas.thishib.sendMessageWithClient.sendMessage("applyForAV",null);
+ }
+ </handler>
+ </_labelMenuItem>
+ <menuseparator/>
+ <!--
+ <_labelMenuItem labelid="749" command="cmd_coBrowser"
enabled="${ canvas.ismoderator }" />
+ <menuseparator/>
+ -->
+ <_labelMenuItem width="250" labelid="24"
command="cmd_createPoll" enabled="${ canvas.ismoderator }" />
+ <_labelMenuItem width="250" labelid="37"
command="cmd_pollResults" enabled="${ canvas.ismoderator }" />
+ <_labelMenuItem width="250" labelid="42"
command="cmd_checkPollVoted" />
+ </_labelMenu>
+
+ </class>
</library>
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/conference/roomListItem.lzx
Mon Oct 12 03:58:23 2009
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/conference/roomListItem.lzx
Sun Oct 25 08:47:11 2009
@@ -17,6 +17,8 @@
<attribute name="currentusers" value="null" />
<attribute name="maxUsers" value="4" type="number" />
+
+ <attribute name="roomType" value="0" type="number" />
<attribute name="checkForMaxUsers" value="false" type="boolean"
/>
@@ -91,9 +93,20 @@
//Debug.write("non ispublic");
}
+ if (this.roomType == 1) {
+ this.roomClassName =
canvas.conferenceRoomModule;
+ } else if (this.roomType == 2) {
+ this.roomClassName = canvas.eventRoomModule;
+ } else if (this.roomType == 3) {
+ this.roomClassName = "restrictedConferenceRoom";
+ } else {
+ if ($debug) Debug.warn("Not known RoomType:
",this.roomType);
+ }
//the conferencedomain is no more interesting, swagner
07.10.2009
//if ($debug) Debug.write("hib.conferencedomain: ",
hib.conferencedomain);
+ if ($debug) Debug.write("Test Setup
",this.roomClassName);
+
new
lz.testSetup(canvas,{roomClassName:this.roomClassName,roomObj:roomObj});
</method>
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/flexibleConferenceRoom/library.lzx
Mon Oct 12 03:58:23 2009
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/flexibleConferenceRoom/library.lzx
Sun Oct 25 08:47:11 2009
@@ -14,5 +14,6 @@
<include href="fixedWhiteboardPanel.lzx" />
<include href="flexibleConferenceRoom.lzx" />
<include href="flexibleEventRoom.lzx" />
+ <include href="restrictedConferenceRoom.lzx" />
</library>
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/flexibleConferenceRoom/roomSidebar/eventRoomSidebar.lzx
Mon Oct 12 03:58:23 2009
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/flexibleConferenceRoom/roomSidebar/eventRoomSidebar.lzx
Sun Oct 25 08:47:11 2009
@@ -8,8 +8,20 @@
<attribute name="isOpen" value="true" type="boolean"/>
+ <attribute name="restricted" value="false" type="boolean" />
+
<method name="doSelection" args="itemRef">
<![CDATA[
+ if (itemRef.name == "filesTabButton") {
+ if (this.restricted) {
+ if (!canvas.ismoderator && !canvas.isAllowedToDraw) {
+ //Do not allow
+ new
lz.labelerrorPopup(canvas,{errorlabelid:783});
+ return;
+ }
+ }
+ }
+
if (this.selected != null) {
this.selected.deselect();
}
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/meetings/allmeetings.lzx
Sat Oct 24 04:25:40 2009
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/meetings/allmeetings.lzx
Sun Oct 25 08:47:11 2009
@@ -136,7 +136,7 @@
new lz.roomListItem(parent.inn.inn.inn,
{
-
roomClassName:canvas.conferenceRoomModule,
+
roomType:value[eg].roomtype.roomtypes_id,
currentusers : value[eg].currentusers,
obj : value[eg],
ispublic : true,
@@ -193,7 +193,7 @@
if (value != null) {
for (var eg =
0; eg < value.length; eg++) {
new
lz.roomListItem(parent.inn.inn.inn,{
-
roomClassName:canvas.conferenceRoomModule,
+
roomType:value[eg].room.roomtype.roomtypes_id,
currentusers : value[eg].room.currentusers,
obj : value[eg],
ispublic : false,
@@ -261,7 +261,7 @@
+ value[eg].starttime.getFullYear();
new
lz.roomListItem(parent.inn.inn.inn,
{
-
roomClassName:canvas.conferenceRoomModule,
+
roomType:value[eg].roomtype.roomtypes_id,
currentusers : value[eg].currentusers,
obj : value[eg],
ispublic : true,
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"OpenMeetings developers" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/openmeetings-dev?hl=en
-~----------~----~----~----~------~----~------~--~---
