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 2012/04/12 14:28:29 UTC
svn commit: r1325220 - in
/incubator/openmeetings/trunk/singlewebapp/WebContent/src:
base/components/conferencebox/ modules/lzrecordcontent/
modules/lzrecordcontent/contentviews/
Author: sebawagner
Date: Thu Apr 12 12:28:28 2012
New Revision: 1325220
URL: http://svn.apache.org/viewvc?rev=1325220&view=rev
Log:
OPENMEETINGS-130 Bring recording UI in-line with new theme
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/conferencebox/conferenceBox.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/contentviews/lzRecordingsViewBottom.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/contentviews/lzRecordingsViewMain.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/lzRecordNavigation.lzx
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/conferencebox/conferenceBox.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/conferencebox/conferenceBox.lzx?rev=1325220&r1=1325219&r2=1325220&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/conferencebox/conferenceBox.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/conferencebox/conferenceBox.lzx Thu Apr 12 12:28:28 2012
@@ -64,7 +64,7 @@
}
</method>
- <view name="_head" x="0" y="0" width="${ parent.width }" height="34"
+ <view name="_head" x="0" y="0" width="${ parent.width }" height="24"
clickable="$once{ this.parent.closeable }" >
<handler name="onclick">
@@ -73,32 +73,6 @@
}
</handler>
- <view width="${ parent.width }" height="$once{ parent.height }"
- stretches="both" resource="presenter_thumb_rsc" >
-
- <handler name="oninit">
- <![CDATA[
- this.setTintRGB(canvas.getThemeColor('basebgcolorizer'),90);
- ]]>
- </handler>
- <method name="setTintRGB" args="color, brightness">
- <![CDATA[
- if (color != "" && color != null){
-
- if (brightness == null) { brightness = 0; }
- var rgb = color;
- var red=(rgb >> 16) & 0xFF;
- var green=(rgb >> 8) & 0xFF;
- var blue=rgb & 0xFF;
-
- this.setColorTransform( { ra : red, ga : green, ba : blue,
- rb : 0, gb : 0, bb : 0 } );
-
- }
- ]]>
- </method>
- </view>
-
<view x="8" y="4" visible="${ this.parent.parent.closeable }">
<view visible="${ !this.parent.parent.parent.isopen }" x="2" y="3" resource="conferenceBox_button_min_rsc">
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/contentviews/lzRecordingsViewBottom.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/contentviews/lzRecordingsViewBottom.lzx?rev=1325220&r1=1325219&r2=1325220&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/contentviews/lzRecordingsViewBottom.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/contentviews/lzRecordingsViewBottom.lzx Thu Apr 12 12:28:28 2012
@@ -21,7 +21,7 @@
<library>
<class name="flvMetaInfoContentArea" extends="view"
- width="${ parent.width }" height="168" clip="true">
+ width="${ parent.width }" height="178" clip="true">
<attribute name="baseWidthForPointer" value="0" type="number"/>
@@ -40,7 +40,7 @@
this.contentDevider._pointer.setAttribute("x",0);
</method>
- <view name="content" width="${ parent.width }" height="168">
+ <view name="content" width="${ parent.width }" height="178">
<view name="content" layout="axis:y;spacing:2" />
@@ -100,9 +100,8 @@
View for recorded contents list.
When you select 'Recordings' on the top menu, this class shows the list.
-->
-<class name="lzRecordingsViewBottom" extends="conferenceBox" labelid="859"
- y="${ canvas.height - canvas.naviHeightDelta - this.height }" initHeight="200"
- height="32" textInset="30" closeable="true" isopen="false" closedHeight="32"
+<class name="lzRecordingsViewBottom" extends="basePropertyPanel" labelid="859" height="200"
+ y="${ canvas.height - canvas.naviHeightDelta - this.height }"
x="${ parent._navigationArea.width + parent._navigationArea.x }"
width="${ canvas.width - parent._navigationArea.width - parent._navigationArea.x }">
@@ -143,11 +142,6 @@
var widthItem = Math.round(deltaInSeconds/this.pixelFactor);
- //new lz.userActivityItem(this.content._content.content.content,{
- // width:widthItem,
- // userText:canvas.getLabelName(868)
- // });
-
if ($debug) Debug.write("widthItem ",widthItem);
for (var i=0;i<rec.flvRecordingMetaData.length;i++) {
@@ -217,8 +211,8 @@
]]>
</method>
- <view name="content" visibility="hidden" y="32" bgcolor="0xFFFFFF"
- width="${ parent.width }" height="168">
+ <view name="content" visibility="hidden" y="22" bgcolor="0xFFFFFF"
+ width="${ parent.width }" height="178">
<method name="clearContent">
this._content.destroy();
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/contentviews/lzRecordingsViewMain.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/contentviews/lzRecordingsViewMain.lzx?rev=1325220&r1=1325219&r2=1325220&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/contentviews/lzRecordingsViewMain.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/contentviews/lzRecordingsViewMain.lzx Thu Apr 12 12:28:28 2012
@@ -25,7 +25,7 @@
View for recorded contents list.
When you select 'Recordings' on the top menu, this class shows the list.
-->
-<class name="lzRecordingsViewMain" extends="conferenceBox" labelid="858"
+<class name="lzRecordingsViewMain" extends="basePropertyPanel" labelid="858"
x="${ parent._navigationArea.width + parent._navigationArea.x }"
height="${ canvas.height - canvas.naviHeightDelta - parent._recordingsViewBottom.height }"
width="${ canvas.width - parent._navigationArea.width - parent._navigationArea.x }">
@@ -339,7 +339,7 @@
this._progress._progressbar._pointer.setAttribute("x",0);
</method>
- <view name="_content" height="${ parent.height-32-18 }" y="32">
+ <view name="_content" height="${ parent.height-22-18 }" y="22">
<attribute name="initH" value="480" type="number" />
<attribute name="initW" value="640" type="number" />
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/lzRecordNavigation.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/lzRecordNavigation.lzx?rev=1325220&r1=1325219&r2=1325220&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/lzRecordNavigation.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/lzRecordNavigation.lzx Thu Apr 12 12:28:28 2012
@@ -387,12 +387,11 @@
</view>
- <conferenceBox name="_recordingsInfo" labelid="862" valign="bottom"
- textInset="30" closeable="true" isopen="true" closedHeight="32"
+ <basePropertyPanel name="_recordingsInfo" labelid="862" valign="bottom"
width="$once{ parent.width - 12 }" height="180">
- <view name="content" y="34"
- width="$once{ parent.width }" height="$once{ parent.height - 34 }">
+ <view name="content" y="24"
+ width="$once{ parent.width }" height="$once{ parent.height - 24 }">
<attribute name="recordingName" value="" type="string" />
<attribute name="alternateName" value="" type="string" />
@@ -459,7 +458,7 @@
<labelText labelid="874" y="98" />
<labelText name="_flvRoom" y="98" x="80" />
- <simpleLabelButton y="120" align="right" text_padding_x="40"
+ <simpleLabelButton y="130" align="right" text_padding_x="40"
height="26" width="$once{ parent.width / 2 }" labelid="883">
<view resource="flv_download_rsc" x="4" y="2" />
<handler name="onclick">
@@ -484,7 +483,7 @@
</simpleLabelButton>
- <simpleLabelButton y="120" align="left" text_padding_x="40"
+ <simpleLabelButton y="130" align="left" text_padding_x="40"
height="26" width="$once{ parent.width / 2 }" labelid="884">
<view resource="flv_download_rsc" x="4" y="2" />
<handler name="onclick">
@@ -512,54 +511,29 @@
- </conferenceBox>
+ </basePropertyPanel>
<!--
Sidebar to minimize
-->
- <view name="_minimizeSidebar" x="$once{ parent.width - 10 }" width="10"
- bgcolor="$once{ canvas.getThemeColor('baseMousecolorizer') }" height="${ parent.height }">
+ <view name="_minimizeSidebar" x="${ parent.width - 10 }" width="10" y="1"
+ bgcolor="0xE0E1EB" height="${ parent.height-1 }">
<handler name="onclick">
parent.toggleStatus();
</handler>
- <handler name="onmouseover">
- this._bg1.setAttribute("visibility","visible");
- </handler>
- <handler name="onmouseout">
- this._bg1.setAttribute("visibility","hidden");
- </handler>
- <view width="${ parent.width }" height="$once{ parent.height*1.4 }"
- stretches="both" resource="presenter_thumb_rsc" >
- <handler name="oninit">
- <![CDATA[
- this.setTintRGB(canvas.getThemeColor('basebgcolorizer'),90);
- ]]>
- </handler>
- <method name="setTintRGB" args="color, brightness">
- <![CDATA[
- if (color != "" && color != null){
-
- if (brightness == null) { brightness = 0; }
- var rgb = color;
- var red=(rgb >> 16) & 0xFF;
- var green=(rgb >> 8) & 0xFF;
- var blue=rgb & 0xFF;
-
- this.setColorTransform( { ra : red, ga : green, ba : blue,
- rb : 0, gb : 0, bb : 0 } );
-
- }
- ]]>
- </method>
+ <view width="${ parent.width }" height="$once{ parent.height }"
+ bgcolor="0xE0E1EB" >
</view>
-
- <view name="_bg1" bgcolor="0xFFFFFF" width="$once{ parent.width }"
- height="$once{ parent.height }" opacity="0.7" visibility="hidden"/>
- <view name="_icon" resource="sidebar_tab_btn"
- valign="middle" align="center" />
+ <view name="_icon" resource="sidebar_tab_btn" y="0">
+ <handler name="onclick">
+ parent.parent.toggleStatus();
+ </handler>
+ <labelTooltip name="_labelTooltip" labelid="856" />
+ </view>
+
</view>
<animator name="_doOpen" attribute="x" to="0"