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/01 12:35:00 UTC
svn commit: r1308062 - in
/incubator/openmeetings/trunk/singlewebapp/WebContent/src:
base/components/panel/ base/components/panel/resources/
modules/conference/flexibleConferenceRoom/activitylist/
modules/conference/flexibleConferenceRoom/resources/ mo...
Author: sebawagner
Date: Sun Apr 1 10:34:59 2012
New Revision: 1308062
URL: http://svn.apache.org/viewvc?rev=1308062&view=rev
Log:
OPENMEETINGS-117 Refactor Conference Coloring and Layout - Fixed to bring in line with the rest of the styling
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/panel/basePropertyPanel.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/panel/resources/box_closed_small.fla
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/panel/resources/box_closed_small.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/panel/resources/box_open_small.fla
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/panel/resources/box_open_small.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/activitylist/activityList.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/resources/sidebar_close.fla
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/resources/sidebar_close.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/resources/sidebar_open.fla
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/resources/sidebar_open.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/roomSidebar/conferenceRoomSidebar.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/roomSidebar/interviewRoomSidebar.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/roomSidebar/restrictedRoomSidebar.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/fileExplorer.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/basePropertyPanelWhiteboard.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/tabButtonMain.lzx
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/panel/basePropertyPanel.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/panel/basePropertyPanel.lzx?rev=1308062&r1=1308061&r2=1308062&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/panel/basePropertyPanel.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/panel/basePropertyPanel.lzx Sun Apr 1 10:34:59 2012
@@ -20,8 +20,7 @@
-->
<library>
-<class name="basePropertyPanel" extends="view"
- bgcolor="$once{ canvas.basebgcolorizer }" >
+<class name="basePropertyPanel" extends="view" >
<!--- @keywords private is the Box minimized -->
<attribute name="isopen" value="true" type="boolean" />
@@ -61,60 +60,45 @@
</handler>
<view width="${ this.parent.width }" height="${ this.parent.height-2 }"
- x="0" y="1" bgcolor="0xFFFFFF" />
+ x="0" y="1" />
+
+ <view x="0" y="1" width="${ this.parent.width }" height="20" bgcolor="0xE0E1EB" />
+
+ <view x="0" y="0" width="${ this.parent.width }" height="1" bgcolor="0xCCCCCC" />
+
+ <view x="0" y="19" width="${ this.parent.width }" height="1" bgcolor="0xCCCCCC" />
+
- <view x="0" y="1" width="${ this.parent.width }" height="20">
+ <view x="0" y="1" width="${ this.parent.width }" height="20" >
<handler name="onclick">
this.parent.toggleopen();
</handler>
-
- <view width="${ this.parent.parent.width }" y="0" stretches="width"
- resource="presenter_thumb_rsc" >
-
- <handler name="oninit">
- <![CDATA[
- this.setTintRGB(canvas.basebgcolorizer,90);
- //this.setColor(canvas.basebgcolorizer);
- ]]>
- </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 } );
-
- if($debug) Debug.write("explorerBox/setTintRGB",this);
- if($debug) Debug.write("explorerBox/setTintRGB", { ra : red, ga : green, ba : blue, rb : 0, gb : 0, bb : 0 } );
- }
- ]]>
- </method>
- </view>
+
<text fontsize="11" height="17" x="16" y="1" text="${ this.parent.parent.title }"
- fgcolor="0xFFFFFF" resize="true" fontstyle="bold" />
+ fgcolor="0x666666" resize="true" fontstyle="bold" />
+
<button visible="${ this.parent.parent.closable }" x="${ this.parent.parent.width-23 }"
y="1" text="X" height="18" width="20" >
<handler name="onmouseup">
this.parent.parent.close();
</handler>
</button>
+
<view visible="${ !this.parent.parent.isopen }" x="2" y="2" resource="conferenceBox_button_min_small_rsc">
<handler name="onmouseup">
this.parent.parent.toggleopen();
- </handler>
+ </handler>
+ <labelTooltip name="_labelTooltip" labelid="857" />
</view>
+
<view visible="${ this.parent.parent.isopen }" x="2" y="2" resource="conferenceBox_button_max_small_rsc">
<handler name="onmouseup">
this.parent.parent.toggleopen();
- </handler>
+ </handler>
+ <labelTooltip name="_labelTooltip" labelid="856" />
</view>
+
</view>
</class>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/panel/resources/box_closed_small.fla
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/panel/resources/box_closed_small.fla?rev=1308062&r1=1308061&r2=1308062&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/panel/resources/box_closed_small.png
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/panel/resources/box_closed_small.png?rev=1308062&r1=1308061&r2=1308062&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/panel/resources/box_open_small.fla
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/panel/resources/box_open_small.fla?rev=1308062&r1=1308061&r2=1308062&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/panel/resources/box_open_small.png
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/panel/resources/box_open_small.png?rev=1308062&r1=1308061&r2=1308062&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/activitylist/activityList.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/activitylist/activityList.lzx?rev=1308062&r1=1308061&r2=1308062&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/activitylist/activityList.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/activitylist/activityList.lzx Sun Apr 1 10:34:59 2012
@@ -302,7 +302,7 @@
<class name="activityList" y="${ parent.height - 200 }" x="0"
extends="basePropertyPanelWhiteboard" height="200"
- width="$once{ parent.width-18 }" labelid="1363"
+ width="$once{ parent.width-10 }" labelid="1363"
visibility="${((canvas.currentRoomObj.hideActivitiesAndActions == true) ? 'hidden':'visible')}">
<handler name="oninit">
@@ -567,8 +567,8 @@
]]>
</method>
- <view name="_list" y="20" height="180" bgcolor="0xEEF0EB"
- width="$once{ parent.width+8 }" clip="true">
+ <view name="_list" y="21" height="179" bgcolor="0xEEF0EB"
+ width="$once{ parent.width }" clip="true">
<view name="_list">
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/resources/sidebar_close.fla
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/resources/sidebar_close.fla?rev=1308062&r1=1308061&r2=1308062&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/resources/sidebar_close.png
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/resources/sidebar_close.png?rev=1308062&r1=1308061&r2=1308062&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/resources/sidebar_open.fla
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/resources/sidebar_open.fla?rev=1308062&r1=1308061&r2=1308062&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/resources/sidebar_open.png
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/resources/sidebar_open.png?rev=1308062&r1=1308061&r2=1308062&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/roomSidebar/conferenceRoomSidebar.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/roomSidebar/conferenceRoomSidebar.lzx?rev=1308062&r1=1308061&r2=1308062&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/roomSidebar/conferenceRoomSidebar.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/roomSidebar/conferenceRoomSidebar.lzx Sun Apr 1 10:34:59 2012
@@ -57,44 +57,37 @@
this._doClose.doStart();
this.isOpen = false;
this._minimizeSidebar._icon.setAttribute("frame",2);
+ this._minimizeSidebar._icon._labelTooltip.setAttribute("labelid",857);
} else {
this._doOpen.doStart();
this.isOpen = true;
this._minimizeSidebar._icon.setAttribute("frame",1);
+ this._minimizeSidebar._icon._labelTooltip.setAttribute("labelid",856);
}
</method>
- <view name="_head" width="$once{ parent.width-2 }" height="34">
- <view width="${ parent.width }" height="$once{ parent.height }"
- stretches="both" resource="presenter_thumb_rsc" >
- <handler name="oninit">
- <![CDATA[
- this.setTintRGB(canvas.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 name="borderBarTop" y="0"
+ width="${ parent.width }" bgcolor="0xCCCCCC" height="1" />
+ <view name="_tabbarBg" width="${ parent.width }" height="32" y="1" bgcolor="0xFAFAFA" />
+ <view name="borderBarBottom" y="34"
+ width="${ parent.width }" bgcolor="0xCCCCCC" height="1" />
+
+ <view name="_head" y="1" width="${ parent.width-10 }" height="32"
+ layout="axis:x;spacing:2;inset:2" >
+
+ <handler name="oninit">
+ for (var eg in this.subviews) {
+ this.subviews[eg].deselect();
+ }
+ this.userTabButton.doSelection();
+ </handler>
+
+ <tabButtonMain name="userTabButton" height="$once{ parent.height }" width="$once{ (parent.width-6)/2 }"
+ currentIconRsc="users_tab_btn" labelid="613" />
- <conferenceRoomSidebarTabButton name="userTabButton" selected="true"
- currentIconRsc="users_tab_btn" x="0" labelid="613" />
-
- <conferenceRoomSidebarTabButton name="filesTabButton" currentIconRsc="files_tab_btn"
- x="$once{ ((parent.width-2)/2)+2 }" labelid="614" visible="${(canvas.currentRoomObj.hideFilesExplorer ? false:true)}"/>
+ <tabButtonMain name="filesTabButton" currentIconRsc="files_tab_btn" height="$once{ parent.height }"
+ labelid="614" width="$once{ (parent.width-6)/2 }"
+ visible="${(canvas.currentRoomObj.hideFilesExplorer ? false:true)}"/>
</view>
@@ -105,54 +98,25 @@
width="$once{ parent.width-10 }"
height="${ parent.height-((canvas.currentRoomObj.hideActivitiesAndActions == true) ? 36:236) }" />
- <view y="${ parent.height - 201 }" width="$once{ parent.width-10 }" height="2"
- name="_border" bgcolor="$once{ canvas.basebgcolorizer }"
- visibility="${((canvas.currentRoomObj.hideActivitiesAndActions == true) ? 'hidden':'visible')}"/>
-
<activityList name="_activityList" />
- <view name="_minimizeSidebar" x="${ parent.width - 10 }" width="10"
- bgcolor="$once{ canvas.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.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;
+ <view width="${ parent.width }" height="$once{ parent.height }"
+ bgcolor="0xE0E1EB" >
+ </view>
- this.setColorTransform( { ra : red, ga : green, ba : blue,
- rb : 0, gb : 0, bb : 0 } );
-
- }
- ]]>
- </method>
+ <view name="_icon" resource="sidebar_tab_btn" y="0">
+ <handler name="onclick">
+ parent.parent.toggleStatus();
+ </handler>
+ <labelTooltip name="_labelTooltip" labelid="856" />
</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>
<animator name="_doOpen" attribute="width" to="$once{ parent.width }"
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/roomSidebar/interviewRoomSidebar.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/roomSidebar/interviewRoomSidebar.lzx?rev=1308062&r1=1308061&r2=1308062&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/roomSidebar/interviewRoomSidebar.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/roomSidebar/interviewRoomSidebar.lzx Sun Apr 1 10:34:59 2012
@@ -48,41 +48,33 @@
this._doClose.doStart();
this.isOpen = false;
this._minimizeSidebar._icon.setAttribute("frame",2);
+ this._minimizeSidebar._icon._labelTooltip.setAttribute("labelid",857);
} else {
this._doOpen.doStart();
this.isOpen = true;
this._minimizeSidebar._icon.setAttribute("frame",1);
+ this._minimizeSidebar._icon._labelTooltip.setAttribute("labelid",856);
}
</method>
- <view name="_head" width="$once{ parent.width-2 }" height="34">
- <view width="${ parent.width }" height="$once{ parent.height }"
- stretches="both" resource="presenter_thumb_rsc" >
- <handler name="oninit">
- <![CDATA[
- this.setTintRGB(canvas.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 name="borderBarTop" y="0"
+ width="${ parent.width }" bgcolor="0xCCCCCC" height="1" />
+ <view name="_tabbarBg" width="${ parent.width }" height="32" y="1" bgcolor="0xFAFAFA" />
+ <view name="borderBarBottom" y="34"
+ width="${ parent.width }" bgcolor="0xCCCCCC" height="1" />
+
+ <view name="_head" y="1" width="${ parent.width-10 }" height="32"
+ layout="axis:x;spacing:2;inset:2" >
+
+ <handler name="oninit">
+ for (var eg in this.subviews) {
+ this.subviews[eg].deselect();
+ }
+ this.userTabButton.doSelection();
+ </handler>
- <conferenceRoomSidebarTabButton name="userTabButton" selected="true"
- currentIconRsc="users_tab_btn" x="0" labelid="613" />
+ <tabButtonMain name="userTabButton" height="$once{ parent.height }" width="$once{ (parent.width-6)/2 }"
+ currentIconRsc="users_tab_btn" labelid="613" />
</view>
@@ -90,54 +82,25 @@
width="$once{ parent.width-10 }"
height="${ parent.height-((canvas.currentRoomObj.hideActivitiesAndActions == true) ? 36:236) }" />
- <view y="${ parent.height - 201 }" width="$once{ parent.width-10 }" height="2"
- name="_border" bgcolor="$once{ canvas.basebgcolorizer }"
- visibility="${((canvas.currentRoomObj.hideActivitiesAndActions == true) ? 'hidden':'visible')}"/>
-
<activityList name="_activityList" />
- <view name="_minimizeSidebar" x="${ parent.width - 10 }" width="10"
- bgcolor="$once{ canvas.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.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;
+ <view width="${ parent.width }" height="$once{ parent.height }"
+ bgcolor="0xE0E1EB" >
+ </view>
- this.setColorTransform( { ra : red, ga : green, ba : blue,
- rb : 0, gb : 0, bb : 0 } );
-
- }
- ]]>
- </method>
+ <view name="_icon" resource="sidebar_tab_btn" y="0">
+ <handler name="onclick">
+ parent.parent.toggleStatus();
+ </handler>
+ <labelTooltip name="_labelTooltip" labelid="856" />
</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>
<animator name="_doOpen" attribute="width" to="$once{ parent.width }"
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/roomSidebar/restrictedRoomSidebar.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/roomSidebar/restrictedRoomSidebar.lzx?rev=1308062&r1=1308061&r2=1308062&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/roomSidebar/restrictedRoomSidebar.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/roomSidebar/restrictedRoomSidebar.lzx Sun Apr 1 10:34:59 2012
@@ -69,46 +69,37 @@
this._doClose.doStart();
this.isOpen = false;
this._minimizeSidebar._icon.setAttribute("frame",2);
+ this._minimizeSidebar._icon._labelTooltip.setAttribute("labelid",857);
} else {
this._doOpen.doStart();
this.isOpen = true;
this._minimizeSidebar._icon.setAttribute("frame",1);
+ this._minimizeSidebar._icon._labelTooltip.setAttribute("labelid",856);
}
</method>
- <view name="_head" width="$once{ parent.width-2 }" height="34">
- <view width="${ parent.width }" height="$once{ parent.height }"
- stretches="both" resource="presenter_thumb_rsc" >
- <handler name="oninit">
- <![CDATA[
- this.setTintRGB(canvas.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 name="borderBarTop" y="0"
+ width="${ parent.width }" bgcolor="0xCCCCCC" height="1" />
+ <view name="_tabbarBg" width="${ parent.width }" height="32" y="1" bgcolor="0xFAFAFA" />
+ <view name="borderBarBottom" y="34"
+ width="${ parent.width }" bgcolor="0xCCCCCC" height="1" />
+
+ <view name="_head" y="1" width="${ parent.width-10 }" height="32"
+ layout="axis:x;spacing:2;inset:2" >
+
+ <handler name="oninit">
+ for (var eg in this.subviews) {
+ this.subviews[eg].deselect();
+ }
+ this.userTabButton.doSelection();
+ </handler>
+
+ <tabButtonMain name="userTabButton" height="$once{ parent.height }" width="$once{ (parent.width-6)/2 }"
+ currentIconRsc="users_tab_btn" labelid="613" />
- <conferenceRoomSidebarTabButton name="userTabButton" selected="true"
- currentIconRsc="users_tab_btn" x="0" labelid="613" />
-
- <conferenceRoomSidebarTabButton name="filesTabButton"
- visible="${ (!parent.parent.restricted) ? true : ((canvas.currentRoomObj.hideFilesExplorer) ? false : ((canvas.ismoderator) ? true : ((canvas.isAllowedToDraw) ? true : false ))) }"
- currentIconRsc="files_tab_btn"
- x="$once{ ((parent.width-2)/2)+2 }" labelid="614" />
+ <tabButtonMain name="filesTabButton" currentIconRsc="files_tab_btn" height="$once{ parent.height }"
+ labelid="614" width="$once{ (parent.width-6)/2 }"
+ visible="${(canvas.currentRoomObj.hideFilesExplorer ? false:true)}"/>
</view>
@@ -119,54 +110,25 @@
width="$once{ parent.width-10 }"
height="${ parent.height-((canvas.currentRoomObj.hideActivitiesAndActions == true) ? 36:236) }" />
- <view y="${ parent.height - 201 }" width="$once{ parent.width-10 }" height="2"
- name="_border" bgcolor="$once{ canvas.basebgcolorizer }"
- visibility="${((canvas.currentRoomObj.hideActivitiesAndActions == true) ? 'hidden':'visible')}"/>
-
<activityList name="_activityList" />
- <view name="_minimizeSidebar" x="${ parent.width - 10 }" width="10"
- bgcolor="$once{ canvas.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.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;
+ <view width="${ parent.width }" height="$once{ parent.height }"
+ bgcolor="0xE0E1EB" >
+ </view>
- this.setColorTransform( { ra : red, ga : green, ba : blue,
- rb : 0, gb : 0, bb : 0 } );
-
- }
- ]]>
- </method>
+ <view name="_icon" resource="sidebar_tab_btn" y="0">
+ <handler name="onclick">
+ parent.parent.toggleStatus();
+ </handler>
+ <labelTooltip name="_labelTooltip" labelid="856" />
</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>
<animator name="_doOpen" attribute="width" to="$once{ parent.width }"
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/fileExplorer.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/fileExplorer.lzx?rev=1308062&r1=1308061&r2=1308062&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/fileExplorer.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/fileExplorer.lzx Sun Apr 1 10:34:59 2012
@@ -596,13 +596,13 @@
<view name="_userSpace" height="40" valign="bottom" width="$once{ parent.width }">
- <labelText name="_userHomeSizeLabel" labelid="923" />
+ <labelText name="_userHomeSizeLabel" labelid="923" fgcolor="0x666666" />
- <labelText name="_userHomeSize" align="right" />
+ <labelText name="_userHomeSize" align="right" fgcolor="0x666666" />
- <labelText name="_roomHomeSizeLabel" labelid="924" y="20" />
+ <labelText name="_roomHomeSizeLabel" labelid="924" y="20" fgcolor="0x666666" />
- <labelText name="_roomHomeSize" align="right" y="20" />
+ <labelText name="_roomHomeSize" align="right" y="20" fgcolor="0x666666" />
</view>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/basePropertyPanelWhiteboard.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/basePropertyPanelWhiteboard.lzx?rev=1308062&r1=1308061&r2=1308062&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/basePropertyPanelWhiteboard.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/basePropertyPanelWhiteboard.lzx Sun Apr 1 10:34:59 2012
@@ -20,8 +20,7 @@
-->
<library>
-<class name="basePropertyPanelWhiteboard" extends="view"
- bgcolor="$once{ canvas.basebgcolorizer }" >
+<class name="basePropertyPanelWhiteboard" extends="view" >
<!--- @keywords private is the Box minimized -->
<attribute name="isopen" value="true" type="boolean" />
@@ -57,45 +56,19 @@
this.initheight=this.height;
</handler>
- <view width="${ this.parent.width }" height="${ this.parent.height-2 }"
- x="0" y="1" bgcolor="0xFFFFFF" />
-
- <view x="0" y="1" width="${ this.parent.width }" height="20" />
+ <view x="0" y="1" width="${ this.parent.width }" height="20" bgcolor="0xE0E1EB" />
+
+ <view x="0" y="0" width="${ this.parent.width }" height="1" bgcolor="0xCCCCCC" />
+
+ <view x="0" y="19" width="${ this.parent.width }" height="1" bgcolor="0xCCCCCC" />
<handler name="onclick">
this.parent.toggleopen();
</handler>
-
- <view width="${ this.parent.parent.width }" y="0" stretches="width"
- resource="presenter_thumb_rsc" >
-
- <handler name="oninit">
- <![CDATA[
- this.setTintRGB(canvas.basebgcolorizer,90);
- //this.setColor(canvas.basebgcolorizer);
- ]]>
- </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 } );
-
- if($debug) Debug.write("explorerBox/setTintRGB",this);
- if($debug) Debug.write("explorerBox/setTintRGB", { ra : red, ga : green, ba : blue, rb : 0, gb : 0, bb : 0 } );
- }
- ]]>
- </method>
- </view>
+
<text fontsize="11" height="17" x="2" y="1" text="${ this.parent.title }"
- fgcolor="0xFFFFFF" resize="true" fontstyle="bold" />
+ fgcolor="0x666666" resize="true" fontstyle="bold" />
+
</class>
</library>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/tabButtonMain.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/tabButtonMain.lzx?rev=1308062&r1=1308061&r2=1308062&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/tabButtonMain.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/tabButtonMain.lzx Sun Apr 1 10:34:59 2012
@@ -35,14 +35,18 @@
<handler name="oninit">
if (this.selected) {
- parent.parent.doSelection(this);
+ this.doSelection();
}
</handler>
<handler name="onclick">
- parent.parent.doSelection(this);
+ this.doSelection();
</handler>
+ <method name="doSelection">
+ parent.parent.doSelection(this);
+ </method>
+
<handler name="onmouseover">
if (!this.selected) {
this._bg2.setAttribute("visibility","visible");