Author: sebawagner
Date: Wed Apr 4 17:35:50 2012
New Revision: 1309497
URL: http://svn.apache.org/viewvc?rev=1309497&view=rev
Log:
OPENMEETINGS-134 make menu colors configurable
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/default-theme.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/panel/basePropertyPanel.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/upload/uploadWindowExplorer.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/navi/mainNavi.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/appointmentNotificationPopUp.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/openmeetings/default-theme.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/default-theme.xml?rev=1309497&r1=1309496&r2=1309497&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/default-theme.xml
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/default-theme.xml
Wed Apr 4 17:35:50 2012
@@ -25,7 +25,13 @@
description="main border color" />
<color name="menuBackgroundColor" value="0xEFEFEF"
- description="main border color" />
+ description="main border color" />
+
+ <color name="menuTextColor" value="0x666666"
+ description="color of text for menus" />
+
+ <color name="menuTextDisabledColor" value="0xBBBBBB"
+ description="color of text for menus" />
<!-- Icons -->
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=1309497&r1=1309496&r2=1309497&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
Wed Apr 4 17:35:50 2012
@@ -76,7 +76,7 @@
</handler>
<text fontsize="11" height="17" x="16" y="1" text="${
this.parent.parent.title }"
- fgcolor="0x666666" resize="true" fontstyle="bold" />
+ fgcolor="$once{ canvas.getThemeColor('menuTextColor')
}" resize="true" fontstyle="bold" />
<button visible="${ this.parent.parent.closable }" x="${
this.parent.parent.width-23 }"
y="1" text="X" height="18" width="20" >
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/upload/uploadWindowExplorer.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/upload/uploadWindowExplorer.lzx?rev=1309497&r1=1309496&r2=1309497&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/upload/uploadWindowExplorer.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/upload/uploadWindowExplorer.lzx
Wed Apr 4 17:35:50 2012
@@ -198,7 +198,7 @@
<labelText x="10" width="250" y="24" multiline="true" name="txtFileDescr"
labelid="594" />
<labelText x="10" fontsize="11" y="60" width="250" name="txtFile"
multiline="true"
- resize="false" fgcolor="0x666666" />
+ resize="false" fgcolor="$once{
canvas.getThemeColor('menuTextColor') }" />
<simpleLabelButton fontsize="11" name="browse" x="10" y="100"
labelid="596" width="250" height="20">
<handler name="onclick">
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx?rev=1309497&r1=1309496&r2=1309497&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
Wed Apr 4 17:35:50 2012
@@ -969,14 +969,20 @@
if ($debug) Debug.write("load Image by Name: ",tName);
var tPath =
canvas.mainTheme.getPointer().xpathQuery("theme/resource[@name='"+tName+"']/@src");
if ($debug) Debug.write("tPath "+tPath);
+ if (tPath == null) {
+ if ($debug) Debug.warn("getThemeImage - No Image found
for config: ",tName);
+ }
return tPath;
</method>
<method name="getThemeColor" args="tColor">
- if ($debug) Debug.write("load Color by Name: ",tColor);
- var tColor =
canvas.mainTheme.getPointer().xpathQuery("theme/color[@name='"+tColor+"']/@value");
- if ($debug) Debug.write("tColor "+tColor);
- return tColor;
+ //if ($debug) Debug.write("load Color by Name: ",tColor);
+ var tResColor =
canvas.mainTheme.getPointer().xpathQuery("theme/color[@name='"+tColor+"']/@value");
+ //if ($debug) Debug.write("tColor "+tColor);
+ if (tResColor == null) {
+ if ($debug) Debug.warn("getThemeColor - No Color found
for config: ",tColor);
+ }
+ return tResColor;
</method>
<method name="setBaseColors">
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/navi/mainNavi.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/navi/mainNavi.lzx?rev=1309497&r1=1309496&r2=1309497&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/navi/mainNavi.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/navi/mainNavi.lzx
Wed Apr 4 17:35:50 2012
@@ -50,10 +50,10 @@
<view name="_bg" visibility="hidden" width="${ parent.width-2 }" y="0"
x="1"
bgcolor="0xFFFFFF" opacity="0.5" height="36" />
- <text text="$once{ parent.text }" name="_ctext" fontstyle="bold"
fgcolor="0x666666"
+ <text text="$once{ parent.text }" name="_ctext" fontstyle="bold"
fgcolor="$once{ canvas.getThemeColor('menuTextColor') }"
fontsize="14" y="2" x="10" />
- <text text="$once{ parent.textToolTip }" name="_ctextTooltip"
fontstyle="plain" fgcolor="0x666666"
+ <text text="$once{ parent.textToolTip }" name="_ctextTooltip"
fontstyle="plain" fgcolor="$once{ canvas.getThemeColor('menuTextColor') }"
fontsize="10" y="20" x="10" />
</class>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx?rev=1309497&r1=1309496&r2=1309497&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx
Wed Apr 4 17:35:50 2012
@@ -146,12 +146,15 @@
<method name="setEnabled" args="e">
this.enabled = e;
+ if (!this.isinited) {
+ return;
+ }
if (this.enabled) {
- this._ctext.setAttribute("fgcolor",0x666666);
-
this._ctextTooltip.setAttribute("fgcolor",0x666666);
+
this._ctext.setAttribute("fgcolor",canvas.getThemeColor('menuTextColor'));
+
this._ctextTooltip.setAttribute("fgcolor",canvas.getThemeColor('menuTextColor'));
} else {
- this._ctext.setAttribute("fgcolor",0xBBBBBB);
-
this._ctextTooltip.setAttribute("fgcolor",0xBBBBBB);
+
this._ctext.setAttribute("fgcolor",canvas.getThemeColor('menuTextDisabledColor'));
+
this._ctextTooltip.setAttribute("fgcolor",canvas.getThemeColor('menuTextDisabledColor'));
}
if (this.command) {
this.command.enabled = this.enabled;
@@ -234,7 +237,8 @@
<conferencDropDownMenuItem labelid="239"
command="cmd_shareDesktop"
enabled="${ canvas.ismoderator
}" />
<horizontalDropDownSpacer />
- <conferencDropDownMenuItem labelid="306"
command="cmd_editCamMicSettings" />
+ <conferencDropDownMenuItem labelid="306"
command="cmd_editCamMicSettings"
+ enabled="true" />
<horizontalDropDownSpacer />
<conferencDropDownMenuItem labelid="784"
command="cmd_applyforMod"
enabled="${ !canvas.ismoderator
}" />
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/appointmentNotificationPopUp.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/appointmentNotificationPopUp.lzx?rev=1309497&r1=1309496&r2=1309497&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/appointmentNotificationPopUp.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/appointmentNotificationPopUp.lzx
Wed Apr 4 17:35:50 2012
@@ -67,16 +67,16 @@
</view>
<labelText name="l_sdatum" labelid="1143" y="150" width="50" />
- <labelText name="_timeZone" x="75" y="150" width="200" resize="false"
bgcolor="0xFFFFFF" fgcolor="0x666666"/>
+ <labelText name="_timeZone" x="75" y="150" width="200" resize="false"
bgcolor="0xFFFFFF" fgcolor="$once{ canvas.getThemeColor('menuTextColor') }"/>
<labelText name="appstartlabel" y="170" labelid="570" width="50"/>
- <labelText name="_appstart" x="75" y="170" width="200" resize="false"
bgcolor="0xFFFFFF" fgcolor="0x666666"/>
+ <labelText name="_appstart" x="75" y="170" width="200" resize="false"
bgcolor="0xFFFFFF" fgcolor="$once{ canvas.getThemeColor('menuTextColor') }"/>
<labelText name="l_edatum" labelid="571" y="190" width="50" />
- <labelText name="_append" y="190" x="75" width="200" text=""
resize="false" bgcolor="0xFFFFFF" fgcolor="0x666666"/>
+ <labelText name="_append" y="190" x="75" width="200" text=""
resize="false" bgcolor="0xFFFFFF" fgcolor="$once{
canvas.getThemeColor('menuTextColor') }"/>
<labelText name="l_createdby" labelid="1147" y="210" width="50" />
- <labelText name="_createdby" y="210" x="75" width="200" text=""
resize="false" bgcolor="0xFFFFFF" fgcolor="0x666666"/>
+ <labelText name="_createdby" y="210" x="75" width="200" text=""
resize="false" bgcolor="0xFFFFFF" fgcolor="$once{
canvas.getThemeColor('menuTextColor') }"/>
<simpleLabelButton labelid="1130" width="100" x="$once{ parent.width-105
}"
y="$once{ parent.height-24 }" onclick="this.parent.close();" />
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=1309497&r1=1309496&r2=1309497&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
Wed Apr 4 17:35:50 2012
@@ -596,13 +596,13 @@
<view name="_userSpace" height="40" valign="bottom" width="$once{
parent.width }">
- <labelText name="_userHomeSizeLabel" labelid="923" fgcolor="0x666666" />
+ <labelText name="_userHomeSizeLabel" labelid="923" fgcolor="$once{
canvas.getThemeColor('menuTextColor') }" />
- <labelText name="_userHomeSize" align="right" fgcolor="0x666666" />
+ <labelText name="_userHomeSize" align="right" fgcolor="$once{
canvas.getThemeColor('menuTextColor') }" />
- <labelText name="_roomHomeSizeLabel" labelid="924" y="20"
fgcolor="0x666666" />
+ <labelText name="_roomHomeSizeLabel" labelid="924" y="20"
fgcolor="$once{ canvas.getThemeColor('menuTextColor') }" />
- <labelText name="_roomHomeSize" align="right" y="20" fgcolor="0x666666"
/>
+ <labelText name="_roomHomeSize" align="right" y="20" fgcolor="$once{
canvas.getThemeColor('menuTextColor') }" />
</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=1309497&r1=1309496&r2=1309497&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
Wed Apr 4 17:35:50 2012
@@ -67,7 +67,7 @@
</handler>
<text fontsize="11" height="17" x="2" y="1" text="${ this.parent.title }"
- fgcolor="0x666666"
resize="true" fontstyle="bold" />
+ fgcolor="$once{
canvas.getThemeColor('menuTextColor') }" resize="true" fontstyle="bold" />
</class>
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=1309497&r1=1309496&r2=1309497&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/tabButtonMain.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/tabButtonMain.lzx
Wed Apr 4 17:35:50 2012
@@ -68,7 +68,7 @@
this._text.setAttribute("fontstyle","bold");
this._text.setAttribute("y",6);
this._icon.setAttribute("y",8);
- this._text.setAttribute("fgcolor","0x666666");
+
this._text.setAttribute("fgcolor",canvas.getThemeColor('menuTextColor'));
</method>
<method name="deselect">
@@ -79,7 +79,7 @@
this._text.setAttribute("y",8);
this._icon.setAttribute("y",10);
this._text.setAttribute("fontstyle","plain");
- this._text.setAttribute("fgcolor","0xBBBBBB");
+
this._text.setAttribute("fgcolor",canvas.getThemeColor('menuTextDisabledColor'));
</method>
<view name="_selectedView" bgcolor="$once{
canvas.getThemeColor('menuBackgroundColor') }" width="$once{ parent.width }"
