You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by se...@apache.org on 2011/12/22 10:29:32 UTC
svn commit: r1222123 - in
/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/video:
baseVideoObject.lzx videoObjectBroadcast.lzx videoObjectPlayBroadcast.lzx
Author: sebawagner
Date: Thu Dec 22 09:29:32 2011
New Revision: 1222123
URL: http://svn.apache.org/viewvc?rev=1222123&view=rev
Log:
OPENMEETINGS-4 Microphone rooms
microphone-rooms.patch applied
rename bottomBarWidth to bottomBarHeight
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/video/baseVideoObject.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/video/videoObjectBroadcast.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/video/videoObjectPlayBroadcast.lzx
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/video/baseVideoObject.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/video/baseVideoObject.lzx?rev=1222123&r1=1222122&r2=1222123&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/video/baseVideoObject.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/video/baseVideoObject.lzx Thu Dec 22 09:29:32 2011
@@ -355,8 +355,7 @@
&& this.subviews[eg].name != "_innertop"
&& this.subviews[eg].name != "_loudness"
&& this.subviews[eg].name != "_micView"
- && this.subviews[eg].name != "_innerbottom"
- && this.subviews[eg].name != "_resizeview") {
+ && this.subviews[eg].name != "_innerbottom") {
this.subviews[eg].setAttribute("visibility","visible");
}
}
@@ -389,7 +388,7 @@
</text>
</view>
- <view name="_innerbottom" width="${parent.width }" y="${parent.height - 18 }"
+ <view name="_innerbottom" width="${parent.width - 2}" x="1" y="${parent.height - 19}"
height="18" bgcolor="$once{ canvas.basebgcolorizer }">
<text text="${canvas.getLabelName(1434)}"
width="${ parent.width-2 }" fgcolor="white"
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/video/videoObjectBroadcast.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/video/videoObjectBroadcast.lzx?rev=1222123&r1=1222122&r2=1222123&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/video/videoObjectBroadcast.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/video/videoObjectBroadcast.lzx Thu Dec 22 09:29:32 2011
@@ -15,12 +15,11 @@
<attribute name="videoInsetX" value="2" type="number" />
<attribute name="videoInsetY" value="21" type="number" />
- <attribute name="bottomBarWidth" value="0" type="number" />
+ <attribute name="bottomBarHeight" value="0" type="number" />
<handler name="oninit">
<![CDATA[
this._loudness.bringToFront();
- this.showuser.bringToFront();
this._resizeview.bringToFront();
]]>
</handler>
@@ -33,14 +32,14 @@
var roomType = canvas.currentRoomObject.roomtype;
this.isMicrophonesRoom = ('true' == roomType.microphones);
if (isMicrophonesRoom) {
- this.setAttribute("bottomBarWidth",this._innertop.height);
+ this.setAttribute("bottomBarHeight",this._innertop.height + 1);
}
- this.setAttribute("height",h+this.videoInsetY+this.bottomBarWidth);
+ this.setAttribute("height",h+this.videoInsetY+this.bottomBarHeight);
</method>
<view name="_chatvideoinner" x="$once{ parent.videoInsetX-1 }"
y="$once{ parent.videoInsetY-1 }"
- height="${parent.height-parent.videoInsetY-parent.bottomBarWidth}"
+ height="${parent.height-parent.videoInsetY-parent.bottomBarHeight}"
width="${parent.width-parent.videoInsetX}">
<view name="r" resource="chatbgitem" x="1" y="2" stretches="both"
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/video/videoObjectPlayBroadcast.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/video/videoObjectPlayBroadcast.lzx?rev=1222123&r1=1222122&r2=1222123&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/video/videoObjectPlayBroadcast.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/video/videoObjectPlayBroadcast.lzx Thu Dec 22 09:29:32 2011
@@ -15,14 +15,13 @@
<attribute name="videoInsetX" value="2" type="number" />
<attribute name="videoInsetY" value="21" type="number" />
- <attribute name="bottomBarWidth" value="0" type="number" />
+ <attribute name="bottomBarHeight" value="0" type="number" />
<handler name="oninit">
<![CDATA[
if ($debug) Debug.write("Init videoObjectPlayBroadcast ",this.name);
//Display widget defined in mother class
this._loudness.bringToFront();
- this.showuser.bringToFront();
this._resizeview.bringToFront();
]]>
</handler>
@@ -36,15 +35,15 @@
var roomType = canvas.currentRoomObject.roomtype;
this.isMicrophonesRoom = ('true' == roomType.microphones);
if (isMicrophonesRoom) {
- this.setAttribute("bottomBarWidth",this._innertop.height);
+ this.setAttribute("bottomBarHeight",this._innertop.height + 1);
}
- this.setAttribute("height",h+this.videoInsetY+this.bottomBarWidth);
+ this.setAttribute("height",h+this.videoInsetY+this.bottomBarHeight);
</method>
<view name="_chatvideoinner" x="$once{ parent.videoInsetX-1 }"
y="$once{ parent.videoInsetY-1 }"
- height="${parent.height-parent.videoInsetY-parent.bottomBarWidth}"
+ height="${parent.height-parent.videoInsetY-parent.bottomBarHeight}"
width="${parent.width-parent.videoInsetX}" >
<attribute name="initH"/>