Author: eschwert
Date: Thu Jan 19 13:19:00 2012
New Revision: 1233353
URL: http://svn.apache.org/viewvc?rev=1233353&view=rev
Log:
OPENMEETINGS-20
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/conferenceMicrophonesRoom.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/flexibleEventRoom.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/restrictedMicrophonesRoom.lzx
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/conferenceMicrophonesRoom.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/conferenceMicrophonesRoom.lzx?rev=1233353&r1=1233352&r2=1233353&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/conferenceMicrophonesRoom.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/conferenceMicrophonesRoom.lzx
Thu Jan 19 13:19:00 2012
@@ -108,7 +108,17 @@
</netRemoteCallHib>
<conferenceRoomSidebar name="_sidePanel" />
-
+
+ <view name="_videoviewcontent_hideWhiteboard"
id="_videoviewcontent_hideWhiteboard" y="0" x="${ parent._sidePanel.width }"
+ width="${canvas.width-parent._sidePanel.width}"
height="${canvas.height-(parent._chatPanelStrict.height) -
+ ((parent._chatPanelStrict.visibility == 'hidden') ? 5:28)}"
clip="true"
+ visibility="${((canvas.currentRoomObj.hideWhiteboard) ?
'visible':'hidden')}">
+ <commonVideoViewContentHideWhiteboard name="_inn"
width="${parent.width}">
+ <!--<wrappinglayout axis="x" spacing="10"/>-->
+ </commonVideoViewContentHideWhiteboard>
+ <vscrollbar name="_attenddeescrollbar"
visibility="visible"></vscrollbar>
+ </view>
+
<baseTabChatPanel name="_chatPanelStrict" labelid="616"
height="200" x="${ parent._sidePanel.width }"
y="${ canvas.height - (this.height) - 28 }"
@@ -119,15 +129,6 @@
width="${ canvas.width - parent._sidePanel.width }"
height="${ canvas.height - (parent._chatPanelStrict.height) -
((parent._chatPanelStrict.visibility == 'hidden') ? 0:28) }" />
- <view name="_videoviewcontent_hideWhiteboard"
id="_videoviewcontent_hideWhiteboard" y="0" x="${ parent._sidePanel.width }"
- width="${canvas.width-parent._sidePanel.width}"
height="${canvas.height-30}" clip="true"
- visibility="${((canvas.currentRoomObj.hideWhiteboard) ?
'visible':'hidden')}">
- <commonVideoViewContentHideWhiteboard name="_inn"
width="${parent.width}">
- <!--<wrappinglayout axis="x" spacing="10"/>-->
- </commonVideoViewContentHideWhiteboard>
- <vscrollbar name="_attenddeescrollbar"
visibility="visible"></vscrollbar>
- </view>
-
<!--
###############################
This is the container for all Videos
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx?rev=1233353&r1=1233352&r2=1233353&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx
Thu Jan 19 13:19:00 2012
@@ -115,6 +115,16 @@
<conferenceRoomSidebar name="_sidePanel" />
+ <view name="_videoviewcontent_hideWhiteboard"
id="_videoviewcontent_hideWhiteboard" y="0" x="${ parent._sidePanel.width }"
+ width="${canvas.width-parent._sidePanel.width}"
height="${canvas.height-(parent._chatPanelStrict.height) -
+ ((parent._chatPanelStrict.visibility == 'hidden') ? 5:28)}"
clip="true"
+ visibility="${((canvas.currentRoomObj.hideWhiteboard) ?
'visible':'hidden')}">
+ <commonVideoViewContentHideWhiteboard name="_inn"
width="${parent.width}">
+ <!--<wrappinglayout axis="x" spacing="10"/>-->
+ </commonVideoViewContentHideWhiteboard>
+ <vscrollbar name="_attenddeescrollbar"
visibility="visible"></vscrollbar>
+ </view>
+
<baseTabChatPanel name="_chatPanelStrict" labelid="616"
height="200" x="${ parent._sidePanel.width }"
y="${ canvas.height - (this.height) - 28 }"
@@ -132,15 +142,6 @@
-->
<commonVideoViewContent name="_videoviewcontent" />
- <view name="_videoviewcontent_hideWhiteboard"
id="_videoviewcontent_hideWhiteboard" y="0" x="${ parent._sidePanel.width }"
- width="${canvas.width-parent._sidePanel.width}"
height="${canvas.height-30}" clip="true"
- visibility="${((canvas.currentRoomObj.hideWhiteboard) ?
'visible':'hidden')}">
- <commonVideoViewContentHideWhiteboard name="_inn"
width="${parent.width}">
- <!--<wrappinglayout axis="x" spacing="10"/>-->
- </commonVideoViewContentHideWhiteboard>
- <vscrollbar name="_attenddeescrollbar"
visibility="visible"></vscrollbar>
- </view>
-
</class>
</library>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/flexibleEventRoom.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/flexibleEventRoom.lzx?rev=1233353&r1=1233352&r2=1233353&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/flexibleEventRoom.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/flexibleEventRoom.lzx
Thu Jan 19 13:19:00 2012
@@ -107,6 +107,16 @@
<eventRoomSidebar name="_sidePanel" />
+ <view name="_videoviewcontent_hideWhiteboard"
id="_videoviewcontent_hideWhiteboard" y="0" x="${ parent._sidePanel.width }"
+ width="${canvas.width-parent._sidePanel.width}"
height="${canvas.height-(parent._chatPanelStrict.height) -
+ ((parent._chatPanelStrict.visibility == 'hidden') ? 5:28)}"
clip="true"
+ visibility="${((canvas.currentRoomObj.hideWhiteboard) ?
'visible':'hidden')}">
+ <commonVideoViewContentHideWhiteboard name="_inn"
width="${parent.width}">
+ <!--<wrappinglayout axis="x" spacing="10"/>-->
+ </commonVideoViewContentHideWhiteboard>
+ <vscrollbar name="_attenddeescrollbar"
visibility="visible"></vscrollbar>
+ </view>
+
<baseTabChatPanel name="_chatPanelStrict" labelid="616"
height="200" x="${ parent._sidePanel.width }"
y="${ canvas.height - (this.height) - 28 }"
@@ -115,16 +125,7 @@
<fixedFileExplorerWhiteboardPanel name="_whiteboard" labelid="615"
y="0" x="${ parent._sidePanel.width }" restricted="true"
width="${ canvas.width - parent._sidePanel.width }"
- height="${ canvas.height - (parent._chatPanelStrict.height) - 28 }" />
-
- <view name="_videoviewcontent_hideWhiteboard"
id="_videoviewcontent_hideWhiteboard" y="0" x="${ parent._sidePanel.width }"
- width="${canvas.width-parent._sidePanel.width}"
height="${canvas.height-30}" clip="true"
- visibility="${((canvas.currentRoomObj.hideWhiteboard) ?
'visible':'hidden')}">
- <commonVideoViewContentHideWhiteboard name="_inn"
width="${parent.width}">
- <!--<wrappinglayout axis="x" spacing="10"/>-->
- </commonVideoViewContentHideWhiteboard>
- <vscrollbar name="_attenddeescrollbar"
visibility="visible"></vscrollbar>
- </view>
+ height="${ canvas.height - (parent._chatPanelStrict.height) - 28 }" />
<!--
###############################
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx?rev=1233353&r1=1233352&r2=1233353&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx
Thu Jan 19 13:19:00 2012
@@ -103,6 +103,16 @@
<restrictedRoomSidebar name="_sidePanel" restricted="true"
listType="eventUserListTableWithNames" />
+ <view name="_videoviewcontent_hideWhiteboard"
id="_videoviewcontent_hideWhiteboard" y="0" x="${ parent._sidePanel.width }"
+ width="${canvas.width-parent._sidePanel.width}"
height="${canvas.height-(parent._chatPanelStrict.height) -
+ ((parent._chatPanelStrict.visibility == 'hidden') ? 5:28)}"
clip="true"
+ visibility="${((canvas.currentRoomObj.hideWhiteboard) ?
'visible':'hidden')}">
+ <commonVideoViewContentHideWhiteboard name="_inn"
width="${parent.width}">
+ <!--<wrappinglayout axis="x" spacing="10"/>-->
+ </commonVideoViewContentHideWhiteboard>
+ <vscrollbar name="_attenddeescrollbar"
visibility="visible"></vscrollbar>
+ </view>
+
<baseTabChatPanel name="_chatPanelStrict" labelid="616"
height="200" x="${ parent._sidePanel.width }"
y="${ canvas.height - (this.height) - 28 }"
@@ -112,16 +122,7 @@
y="0" x="${ parent._sidePanel.width }" restricted="true"
width="${ canvas.width - parent._sidePanel.width }"
height="${ canvas.height - (parent._chatPanelStrict.height) -
((parent._chatPanelStrict.visibility == 'hidden') ? 0:28) }" />
-
- <view name="_videoviewcontent_hideWhiteboard"
id="_videoviewcontent_hideWhiteboard" y="0" x="${ parent._sidePanel.width }"
- width="${canvas.width-parent._sidePanel.width}"
height="${canvas.height-30}" clip="true"
- visibility="${((canvas.currentRoomObj.hideWhiteboard) ?
'visible':'hidden')}">
- <commonVideoViewContentHideWhiteboard name="_inn"
width="${parent.width}">
- <!--<wrappinglayout axis="x" spacing="10"/>-->
- </commonVideoViewContentHideWhiteboard>
- <vscrollbar name="_attenddeescrollbar"
visibility="visible"></vscrollbar>
- </view>
-
+
<!--
###############################
This is the container for all Videos
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/restrictedMicrophonesRoom.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/restrictedMicrophonesRoom.lzx?rev=1233353&r1=1233352&r2=1233353&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/restrictedMicrophonesRoom.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/restrictedMicrophonesRoom.lzx
Thu Jan 19 13:19:00 2012
@@ -102,7 +102,17 @@
<restrictedRoomSidebar name="_sidePanel" restricted="true"
listType="eventUserListTableWithNames" />
-
+
+ <view name="_videoviewcontent_hideWhiteboard"
id="_videoviewcontent_hideWhiteboard" y="0" x="${ parent._sidePanel.width }"
+ width="${canvas.width-parent._sidePanel.width}"
height="${canvas.height-(parent._chatPanelStrict.height) -
+ ((parent._chatPanelStrict.visibility == 'hidden') ? 5:28)}"
clip="true"
+ visibility="${((canvas.currentRoomObj.hideWhiteboard) ?
'visible':'hidden')}">
+ <commonVideoViewContentHideWhiteboard name="_inn"
width="${parent.width}">
+ <!--<wrappinglayout axis="x" spacing="10"/>-->
+ </commonVideoViewContentHideWhiteboard>
+ <vscrollbar name="_attenddeescrollbar"
visibility="visible"></vscrollbar>
+ </view>
+
<baseTabChatPanel name="_chatPanelStrict" labelid="616"
height="200" x="${ parent._sidePanel.width }"
y="${ canvas.height - (this.height) - 28 }"
@@ -113,15 +123,6 @@
width="${ canvas.width - parent._sidePanel.width }"
height="${ canvas.height - (parent._chatPanelStrict.height) -
((parent._chatPanelStrict.visibility == 'hidden') ? 0:28) }" />
- <view name="_videoviewcontent_hideWhiteboard"
id="_videoviewcontent_hideWhiteboard" y="0" x="${ parent._sidePanel.width }"
- width="${canvas.width-parent._sidePanel.width}"
height="${canvas.height-30}" clip="true"
- visibility="${((canvas.currentRoomObj.hideWhiteboard) ?
'visible':'hidden')}">
- <commonVideoViewContentHideWhiteboard name="_inn"
width="${parent.width}">
- <!--<wrappinglayout axis="x" spacing="10"/>-->
- </commonVideoViewContentHideWhiteboard>
- <vscrollbar name="_attenddeescrollbar"
visibility="visible"></vscrollbar>
- </view>
-
<!--
###############################
This is the container for all Videos
