Author: sebawagner
Date: Fri Mar 30 18:24:52 2012
New Revision: 1307570
URL: http://svn.apache.org/viewvc?rev=1307570&view=rev
Log:
OPENMEETINGS-110 Refactor explorerBox header bar coloring, replace favicon with
Apache favicon
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/explorer/resources/feather-1.png
(with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/explorer/resources/feather-16x16.png
(with props)
Removed:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/explorer/resources/cancel.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/explorer/resources/explorbar_close_dn.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/explorer/resources/explorbar_close_dn.swf
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/explorer/resources/explorbar_close_mo.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/explorer/resources/explorbar_close_mo.swf
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/explorer/resources/explorbar_close_no.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/explorer/resources/explorbar_close_no.swf
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/favicon.ico
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/explorer/explorerBox.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/explorer/library.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/explorer/resources/library.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/presenter/guiPresenter.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/components/explorer/explorerBox.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/components/explorer/library.lzx
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/favicon.ico
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/favicon.ico?rev=1307570&r1=1307569&r2=1307570&view=diff
==============================================================================
Binary files - no diff available.
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/explorer/explorerBox.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/explorer/explorerBox.lzx?rev=1307570&r1=1307569&r2=1307570&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/explorer/explorerBox.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/explorer/explorerBox.lzx
Fri Mar 30 18:24:52 2012
@@ -21,7 +21,7 @@
<library>
<class name="explorerBox" extends="view" width="250" y="100"
visibility="hidden"
- height="400" bgcolor="$once{ canvas.basebgcolorizer }"
+ height="400" bgcolor="$once{ canvas.styleMenuBarBaseColor }"
onmousedown="this._startDragState(this)"
onmouseup="this._removeDragState(this)" >
<attribute name="showWindowEffect" value="false" type="boolean" />
@@ -365,34 +365,15 @@
<view width="${ this.parent.width-2 }" height="${ this.parent.height-2
}"
x="1" y="1" bgcolor="0xEEF0EB" />
<view x="1" y="1" width="${ this.parent.width-2 }" height="20" >
- <view width="${ this.parent.parent.width-2 }"
y="0" stretches="width"
- 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;
+
+ <gradientview x="0" width="${ this.parent.width }" height="20"
+ colorFrom="$once{ canvas.baseMousecolorizer }"
+ colorTo="$once{ canvas.styleMenuBarBaseColor }"
>
+ </gradientview>
- 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="10" y="1" text="${
this.parent.parent.title }"
+ <text fontsize="10" height="17" x="6" y="1" text="${
this.parent.parent.title }"
fgcolor="0xFFFFFF" resize="true" fontstyle="bold" />
+
<view visible="${ this.parent.parent.closable }" x="${
this.parent.parent.width-20 }"
y="2" resource="btn_presenter_close"
onmouseover="this.setAttribute('frame',2)"
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/explorer/library.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/explorer/library.lzx?rev=1307570&r1=1307569&r2=1307570&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/explorer/library.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/explorer/library.lzx
Fri Mar 30 18:24:52 2012
@@ -20,7 +20,7 @@
-->
<library>
-<!-- Basecolor: C6CEDF -->
+ <include href="incubator/gradientview.lzx" />
<include href="resources/" />
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/explorer/resources/feather-1.png
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/explorer/resources/feather-1.png?rev=1307570&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/explorer/resources/feather-1.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/explorer/resources/feather-16x16.png
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/explorer/resources/feather-16x16.png?rev=1307570&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/explorer/resources/feather-16x16.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/explorer/resources/library.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/explorer/resources/library.lzx?rev=1307570&r1=1307569&r2=1307570&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/explorer/resources/library.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/explorer/resources/library.lzx
Fri Mar 30 18:24:52 2012
@@ -22,13 +22,8 @@
<resource src="explorerbar.png" name="explorer_thumb_rsc" />
-<resource src="cancel.png" name="close_explorer_window_new_rsc" />
+<resource name="explorer_thumb_rsc" src="feather-16x16.png"/>
-<resource name="explorer_button_rsc" >
- <frame src="explorbar_close_no.png" />
- <frame src="explorbar_close_mo.png" />
- <frame src="explorbar_close_dn.png" />
-</resource>
<resource name="explorer_button_min_rsc" >
<frame src="explorbar_minimize_no.png" />
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/presenter/guiPresenter.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/presenter/guiPresenter.lzx?rev=1307570&r1=1307569&r2=1307570&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/presenter/guiPresenter.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/presenter/guiPresenter.lzx
Fri Mar 30 18:24:52 2012
@@ -449,35 +449,14 @@
<view x="1" y="1" width="${ this.parent.width-1 }" height="20"
name="_titlebar" >
<!-- stretches="width" -->
- <view width="${ this.parent.parent.width-2 }" y="0"
stretches="width"
- resource="presenter_thumb_rsc" >
- <handler name="oninit">
- <![CDATA[
- this.setTintRGB(canvas.basebgcolorizer,80);
- ]]>
- </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;
+ <gradientview x="0" width="${ this.parent.width }" height="20"
+ colorFrom="$once{ canvas.baseMousecolorizer }"
+ colorTo="$once{ canvas.styleMenuBarBaseColor }"
>
+ </gradientview>
- this.setColorTransform( { ra : red, ga : green,
ba : blue,
- rb : 0, gb : 0,
bb : 0 } );
-
- //Debug.write(this);
- //Debug.write( { ra : red, ga : green, ba :
blue,
- // rb : 0, gb : 0,
bb : 0 } );
- }
- ]]>
- </method>
- </view>
- <text fontsize="10" name="_title" height="17" x="6" y="1"
text="${ this.parent.parent.title }"
- resize="true" fontstyle="bold" fgcolor="white" />
+ <text fontsize="10" height="17" x="6" y="1" text="${
this.parent.parent.title }"
+ fgcolor="0xFFFFFF" resize="true" fontstyle="bold" />
+
<view name="_toolbar" visibility="$once{
((parent.parent.fullToolBar) ? 'visible' : 'hidden' ) }"
x="${ parent.width-this.width-2 }" layout="axis:x;spacing:0"
y="2">
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/components/explorer/explorerBox.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/components/explorer/explorerBox.lzx?rev=1307570&r1=1307569&r2=1307570&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/components/explorer/explorerBox.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/components/explorer/explorerBox.lzx
Fri Mar 30 18:24:52 2012
@@ -21,7 +21,7 @@
<library>
<class name="explorerBox" extends="view" width="250" y="100"
visibility="hidden"
- height="400" bgcolor="$once{ canvas.basebgcolorizer }"
+ height="400" bgcolor="0x000088"
onmousedown="this._startDragState(this)"
onmouseup="this._removeDragState(this)" >
<switch>
@@ -327,34 +327,15 @@
<view width="${ this.parent.width-2 }" height="${ this.parent.height-2
}"
x="1" y="1" bgcolor="0xEEF0EB" />
<view x="1" y="1" width="${ this.parent.width-2 }" height="20" >
- <view width="${ this.parent.parent.width-2 }"
y="0" stretches="width"
- 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 } );
-
- //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="10" y="1" text="${
this.parent.parent.title }"
+ <gradientview x="0" width="${ this.parent.width }" height="20"
+ colorFrom="$once{ canvas.baseMousecolorizer }"
+ colorTo="0x000088" >
+ </gradientview>
+
+ <text fontsize="10" height="17" x="6" y="1" text="${
this.parent.parent.title }"
fgcolor="0xFFFFFF" resize="true" fontstyle="bold" />
+
<view visible="${ this.parent.parent.closable }" x="${
this.parent.parent.width-20 }"
y="2" resource="btn_presenter_close"
onmouseover="this.setAttribute('frame',2)"
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/components/explorer/library.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/components/explorer/library.lzx?rev=1307570&r1=1307569&r2=1307570&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/components/explorer/library.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/components/explorer/library.lzx
Fri Mar 30 18:24:52 2012
@@ -20,7 +20,7 @@
-->
<library>
-<!-- Basecolor: C6CEDF -->
+ <include href="incubator/gradientview.lzx" />
<include href="resources/" />
