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/04 19:02:44 UTC
svn commit: r1309491 [1/2] - in
/incubator/openmeetings/trunk/singlewebapp/WebContent: openmeetings/
openmeetings/public/themes/basic-theme/general/ src/ src/base/
src/base/auth/ src/base/components/button/ src/base/components/calendar/
src/base/compon...
Author: sebawagner
Date: Wed Apr 4 17:02:40 2012
New Revision: 1309491
URL: http://svn.apache.org/viewvc?rev=1309491&view=rev
Log:
OPENMEETINGS-134 Themes: Add Color definitions to default-theme.xml file and enhance with more color definitions
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/add.png (with props)
Removed:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/reload_page.png
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/default-theme.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/auth/checkLoginData.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/button/baseChooseIcon.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/button/blueButton.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/calendar/calendarWindow.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/calendar/dateSelector.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/conferencebox/conferenceBox.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/explorer/explorerBox.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/lps/changeWidthLetterSlider.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/lps/changeWidthSlider.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/panel/baseLeftPanel.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/panel/basePanel.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/panel/basePropertyPanel.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/panel/baseTopPanel.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/panel/panelBoundBox.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/presenter/boxInitEffect.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/presenter/guiPresenter.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/simplevaluelist/simpleValueList.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/text/borderedInputtext.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/text/customEdittext.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/text/customscrollEdittext.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/turnoverlist/baseContentListItem.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/turnoverlist/turnOverList.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/contentviews/baseContentSaveView.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/navi/helpAndBugs.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/navi/mainNavi.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/main.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/maindebug.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/languageseditor/languagesEditor.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/emotIconsSelector.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/inviteuser/chatParticipantsInviteConference.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/overAllChat.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/roomListDetails.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/activitylist/activityList.lzx
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/interviewuserlist/interviewListInner.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/interviewuserlist/interviewUserListItem.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/moderation/applyForModeration.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participantList.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participantListItem.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/popups/autoLoader.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/chatTab.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/chatTabBottomRoomList.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/fileExplorer.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/presentations/items/baseListPresentationItemExplorer.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/presentations/items/imageListInnerTableExplorer.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/presentations/presentationFilesList.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/tabbar/baseChooseIconView.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/tabbar/documentsLoaderIcon.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/tabbar/documentsTabBar.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/baseFileExplorerItem.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/whiteboardVideoPlayer.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/basePropertyPanelWhiteboard.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/panels/documentpanel/documentPanel.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/panels/maintoolspanel/mainToolsPanelItem.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/panels/maintoolspanel/subMenuIconToolsToUpload.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/panels/propertypanel/propertyPanel.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/panels/propertypanel/propertyPanelLetterButton.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/whiteboardBarMenu.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/whiteboardMiniButton.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/mainDashboard.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/rssPanel.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/tabButtonMain.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/compontents/attendeeListItem.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/compontents/layouts/lzDayView.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/compontents/layouts/lzMonthView.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/compontents/lzEditCalendarEvent.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/compontents/userContactsCalendar.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/baseChooseIconFLVView.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/contentviews/lzRecordingsViewMain.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/lzRecordNavigation.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/treeitems/baseFLVExplorerItem.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/meetings/allmeetings.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/privatemessages/pendingUserStatus.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/privatemessages/privateMessages.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/privatemessages/roomAccessMessage.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/searchuserprofile/searchUserProfile.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/searchuserprofile/searchUserProfileImage.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/userSettings.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/usercontacts/editUserContacts.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/components/explorer/explorerBox.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/components/lps/changeWidthSlider.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/components/miniIconsPresenter.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/components/text/borderedInputtext.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainAttributes.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainDatasets.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainMethods.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/baseVideoObject.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=1309491&r1=1309490&r2=1309491&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:02:40 2012
@@ -1,5 +1,33 @@
<?xml version="1.0" encoding="UTF-8" ?>
<theme>
+
+ <!-- Colors -->
+
+ <color name="mainBackgroundColor" value="0xEEF0EB"
+ description="main background color" />
+
+ <color name="basebgcolorizer" value="0xBDC0DB"
+ description="Color for background" />
+
+ <color name="baseMousecolorizer" value="0xBDC0DB"
+ description="Color Mouseover color for list items" />
+
+ <color name="baseMouseOvercolorizer" value="0xBDC0DB"
+ description="Color Mouseover color for list items" />
+
+ <color name="styleMenuBarBaseColor" value="0x000088"
+ description="menu bar background color" />
+
+ <color name="mainBorderColor" value="0xCCCCCC"
+ description="main border color" />
+
+ <color name="secondBorderColor" value="0xE0E0E0"
+ description="main border color" />
+
+ <color name="menuBackgroundColor" value="0xEFEFEF"
+ description="main border color" />
+
+ <!-- Icons -->
<resource name="icon_facebook_rsc_png"
description="Icon for facebook button in login"
@@ -26,7 +54,7 @@
license="APL Author sebawagner"
src="public/themes/basic-theme/general/cancel_icon.png" />
- <resource name="edit_add_rsc"
+ <resource name="add_rsc"
description="Edit Add Icon"
license="APL Author sebawagner"
src="public/themes/basic-theme/general/add.png" />
Added: incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/add.png
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/add.png?rev=1309491&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/add.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/auth/checkLoginData.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/auth/checkLoginData.lzx?rev=1309491&r1=1309490&r2=1309491&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/auth/checkLoginData.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/auth/checkLoginData.lzx Wed Apr 4 17:02:40 2012
@@ -86,8 +86,8 @@
</handler>
</customEdittext>
- <labelText name="n2" labelid="110" width="300" y="56" resize="false" x="2" fontstyle="bold"/>
- <customEdittext name="userpass" y="54" password="true" x="120" width="330" >
+ <labelText name="n2" labelid="110" width="300" y="48" resize="false" x="2" fontstyle="bold"/>
+ <customEdittext name="userpass" y="48" password="true" x="120" width="330" >
<handler name="oninit">
var g = canvas.getUserData();
if (g["userpass"]!=null) this.setAttribute('text',g["userpass"]);
@@ -108,96 +108,8 @@
</handler>
</customEdittext>
- <labelText name="n5" labelid="1370" width="300" y="86" resize="false" x="2" fontstyle="bold"/>
-
- <resetCombobox name="colors" width="330" y="84" x="120">
- <attribute name="initselect" value="true" type="boolean" />
-
- <handler name="oninit">
- this.addItem(canvas.getLabelName(1374),'redorange');
- this.addItem(canvas.getLabelName(1375),'mediumseagreen');
- this.addItem(canvas.getLabelName(1376),'steelblue');
- this.addItem(canvas.getLabelName(1377),'lightsteelblue');
- this.addItem(canvas.getLabelName(1378),'goldenrod');
- this.addItem(canvas.getLabelName(1379),'silvergray');
- this.addItem(canvas.getLabelName(1380),'userdefined');
-
- var g = canvas.getUserData();
- if($debug) Debug.write("checkLoginData/g: ",g);
- this.selectItem((g["usercolor"] != null) ? g["usercolor"] : canvas.baseColorScheme);
- </handler>
- <handler name="onselect" args="v">
- //Debug.write("onselect: ",v.value);
- if (this.initselect){
- this.initselect=false;
- } else {
- var val = canvas.setColorStyle(v.value);
- var g = canvas.getUserData();
- g["usercolor"] = val;
- canvas.setUserData(g);
-
- var uName = parent.username.getText();
- var uPass = parent.userpass.getText();
- var uSave = parent._savelogindata.getValue();
- var uDomain = parent.domain.getValue();
- this.parent.close();
- var login = new lz.checkLoginData(canvas.main_content._content.inner);
- login.username.setText(uName);
- login.userpass.setText(uPass);
- login._savelogindata.setValue(uSave);
- login.domain.setValue(uDomain);
- }
- </handler>
- <handler name="onkeyup" args="key">
- <![CDATA[
- if ( this.parent.enterPressed && ( key == 13 ) )
- {
- parent.login();
- }
- ]]>
- </handler>
- <handler name="onkeydown" args="key">
- if ( key == 13 )
- {
- this.parent.enterPressed = true;
- }
- </handler>
- </resetCombobox>
-
- <labelText name="nlabelquality" labelid="1371" y="116" x="2" visible="true" width="140" fontstyle="bold"/>
- <resetCombobox name="ncomboquality" width="330" y="114" x="120" editable="false" >
- <handler name="oninit">
- this.addItem(canvas.getLabelName(1381) + " ~ 16KB " + canvas.getLabelName(1382),"best");
- this.addItem(canvas.getLabelName(1383) + " ~ 10KB " + canvas.getLabelName(1382),"medium");
- var g = canvas.getUserData();
- if($debug) Debug.write("checkLoginData/g: ",g);
- if (g["userquality"] != null) {
- this.selectItem(g["userquality"]);
- } else {
- this.selectItem("best");
- }
- </handler>
- <handler name="onselect">
- canvas.vaquality = this.getValue();
- </handler>
- <handler name="onkeyup" args="key">
- <![CDATA[
- if ( this.parent.enterPressed && ( key == 13 ) )
- {
- parent.login();
- }
- ]]>
- </handler>
- <handler name="onkeydown" args="key">
- if ( key == 13 )
- {
- this.parent.enterPressed = true;
- }
- </handler>
- </resetCombobox>
-
- <labelText name="domain_label" labelid="1372" width="300" y="144" resize="false" x="2" fontstyle="bold"/>
- <resetCombobox name="domain" width="330" y="144" x="120" editable="false">
+ <labelText name="domain_label" labelid="1372" width="300" y="72" resize="false" x="2" fontstyle="bold"/>
+ <resetCombobox name="domain" width="330" y="72" x="120" editable="false">
<handler name="oninit">
//this.selectItemAt(0);
this.getActiveLdapConfigs.doCall();
@@ -326,8 +238,6 @@
if (this.parent._savelogindata.getValue()) {
g["username"] = parent.username.getText();
g["userpass"] = parent.userpass.getText();
- g["userquality"] = parent.ncomboquality.getValue();
- g["usercolor"] = parent.colors.getValue();
g["userlang"] = hib.userlang;
g["userdomain"] = parent.domain.getValue();
g["saveuserdata"]=true;
@@ -335,8 +245,6 @@
} else {
g["username"] = '';
g["userpass"] = '';
- g["userquality"] = null;
- g["usercolor"] = null;
g["userlang"] = null;
g["userdomain"] = null;
g["saveuserdata"]=false;
@@ -421,8 +329,6 @@
parent.organisation_label.setAttribute('visible',true);
parent.organisation.setAttribute('visible',true);
parent.b3.setAttribute('visible',true);
- parent.nlabelquality.setAttribute('visible',false);
- parent.ncomboquality.setAttribute('visible',false);
parent.domain_label.setAttribute('visible',false);
parent.domain.setAttribute('visible',false);
@@ -430,7 +336,6 @@
parent.organisation.addItem(value.organisation_users[i].organisation.name,String(i));
}
parent.organisation.selectItem(String(i-1));
- //Debug.write("multiple organisations Issue 31 http://code.google.com/p/openmeetings/issues/detail?id=31");
}
}
@@ -462,8 +367,8 @@
</handler>
</netRemoteCallHib>
- <labelCheckbox x="120" y="$once{ parent.height-62 }" fontsize="11"
- name="_savelogindata" labelid="288" >
+ <labelCheckbox x="120" y="96" fontsize="11"
+ name="_savelogindata" labelid="288" >
<handler name="oninit">
var g = canvas.getUserData();
if($debug) Debug.write("checkLoginData/g: ",g);
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/button/baseChooseIcon.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/button/baseChooseIcon.lzx?rev=1309491&r1=1309490&r2=1309491&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/button/baseChooseIcon.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/button/baseChooseIcon.lzx Wed Apr 4 17:02:40 2012
@@ -27,11 +27,11 @@
</resource>
<class name="baseChooseIcon" extends="view" width="24" height="24"
- bgcolor="$once{ canvas.basebgcolorizer }" >
+ bgcolor="$once{ canvas.getThemeColor('basebgcolorizer') }" >
<attribute name="resourceN" value="" type="string" />
<view name="_bg" x="1" y="1" height="$once{ parent.height - 2 }"
- width="$once{ parent.width - 2 }" bgcolor="$once{ canvas.baseMousecolorizer }" />
+ width="$once{ parent.width - 2 }" bgcolor="$once{ canvas.getThemeColor('baseMousecolorizer') }" />
<image name="_icon" src="$once{ canvas.getThemeImage(parent.resourceN) }"
x="$once{ (parent.width-this.width) / 2 }"
@@ -46,14 +46,14 @@
<attribute name="labelid" value="0" type="number" />
<handler name="onmouseover">
this.isOut = false;
- this._bg.setAttribute("bgcolor",canvas.baseMouseOvercolorizer);
+ this._bg.setAttribute("bgcolor",canvas.getThemeColor('baseMouseOvercolorizer'));
this._icon.setAttribute("x",this._icon.x-1);
this._icon.setAttribute("y",this._icon.y-1);
this._icon.setAttribute("width",this._icon.width+2);
this._icon.setAttribute("height",this._icon.height+2);
</handler>
<handler name="onmouseout">
- this._bg.setAttribute("bgcolor",canvas.baseMousecolorizer);
+ this._bg.setAttribute("bgcolor",canvas.getThemeColor('baseMousecolorizer'));
if (this.initX == this._icon.x) {
return;
}
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/button/blueButton.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/button/blueButton.lzx?rev=1309491&r1=1309490&r2=1309491&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/button/blueButton.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/button/blueButton.lzx Wed Apr 4 17:02:40 2012
@@ -21,7 +21,7 @@
<library>
<class name="blueButton" extends="basecomponent" width="200" height="18"
- bgcolor="0xE0E0E0" focusable="true">
+ bgcolor="$once{ canvas.getThemeColor('secondBorderColor') }" focusable="true">
<attribute name="resourceItem" value="" type="string" />
@@ -34,7 +34,7 @@
<method name="setText" args="txt">
this.setAttribute('text',txt);
</method>
- <view name="_bg" x="1" y="1" bgcolor="0xEEF0EB"
+ <view name="_bg" x="1" y="1" bgcolor="$once{ canvas.getThemeColor('mainBackgroundColor') }"
width="${ parent.width-2 }" height="${ parent.height-2 }" />
<view name="_bgOver" x="1" y="1" bgcolor="0xFFFFFF" opacity="0.5" visibility="hidden"
width="${ parent.width-2 }" height="${ parent.height-2 }" />
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/calendar/calendarWindow.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/calendar/calendarWindow.lzx?rev=1309491&r1=1309490&r2=1309491&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/calendar/calendarWindow.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/calendar/calendarWindow.lzx Wed Apr 4 17:02:40 2012
@@ -21,7 +21,7 @@
<library>
<class name="calendarWindow" extends="view" clickable="true"
- bgcolor="$once{ canvas.basebgcolorizer }">
+ bgcolor="$once{ canvas.getThemeColor('basebgcolorizer') }">
<attribute name="fieldRef" value="null" />
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/calendar/dateSelector.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/calendar/dateSelector.lzx?rev=1309491&r1=1309490&r2=1309491&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/calendar/dateSelector.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/calendar/dateSelector.lzx Wed Apr 4 17:02:40 2012
@@ -86,7 +86,7 @@
</class>
-<class name="dateSelectorWeekNumber" extends="view" width="24" bgcolor="$once{ canvas.basebgcolorizer }">
+<class name="dateSelectorWeekNumber" extends="view" width="24" bgcolor="$once{ canvas.getThemeColor('basebgcolorizer') }">
<attribute name="weeknumber" value="0" type="number" />
<text name="_date" fgcolor="white" fontsize="10" text="$once{ parent.weeknumber }"
@@ -94,7 +94,7 @@
</class>
-<class name="dateSelectorWeekNumberHeader" extends="view" width="24" bgcolor="$once{ canvas.basebgcolorizer }">
+<class name="dateSelectorWeekNumberHeader" extends="view" width="24" bgcolor="$once{ canvas.getThemeColor('basebgcolorizer') }">
<attribute name="labelWeekHeader" value="" type="string" />
<text name="_date" fgcolor="white" fontsize="10" text="$once{ parent.labelWeekHeader }"
@@ -105,7 +105,8 @@
</class>
-<class name="dateSelectorWeek" extends="baseDateSelectorComponent" bgcolor="0xE0E0E0">
+<class name="dateSelectorWeek" extends="baseDateSelectorComponent"
+ bgcolor="$once{ canvas.getThemeColor('secondBorderColor') }">
<attribute name="weekIndexNumber" value="-1" type="number" />
@@ -129,7 +130,8 @@
</class>
-<class name="dateSelectorMonth" extends="baseDateSelectorComponent" bgcolor="0xE0E0E0" height="137" width="176">
+<class name="dateSelectorMonth" extends="baseDateSelectorComponent"
+ bgcolor="$once{ canvas.getThemeColor('secondBorderColor') }" height="137" width="176">
<attribute name="month" value="0" type="number" />
<attribute name="firstweekNumber" value="0" type="number" />
@@ -141,15 +143,13 @@
var dateRoot = parent.parent;
//if ($debug) Debug.write("dateRoot: ",dateRoot);
this.setAttribute('currentMonthName',dateRoot.monthnames[month]);
- //new lz.dateSelectorWeekNumberHeader(this.weekheader,{labelWeekHeader:canvas.getLabelName(467),bgcolor:canvas.basebgcolorizer});
for( var i = 0 ; i < 6 ; i++ ) new lz.dateSelectorWeek(this.content,{firstweekddaydate:new Date(this.showingdate.getTime()+(604800000*i)),dayclass:dayclass,month:month,weekIndexNumber:i});
for( var i = 0 ; i < 7 ; i++ ) new lz.dateSelectorDayHeader(this.weekheader,{daynumber:(this.showingdate.getDay()+i)});
- //for( var i = 0 ; i < 6 ; i++ ) new lz.dateSelectorWeekNumber(this.weekNumber,{weeknumber:( (this.firstweekNumber+i<54) ? (this.firstweekNumber+i) : ((this.firstweekNumber+i)-53) )});
]]>
</method>
- <view name="header" layout="axis:x" height="18" bgcolor="0xE0E0E0">
+ <view name="header" layout="axis:x" height="18" bgcolor="$once{ canvas.getThemeColor('secondBorderColor') }">
<text width="20" fgcolor="0x000000" height="18"
- onmouseover="this.setAttribute('bgcolor',0xFFFFFF)" onmouseout="this.setAttribute('bgcolor',0xE0E0E0)">
+ onmouseover="this.setAttribute('bgcolor',0xFFFFFF)" onmouseout="this.setAttribute('bgcolor',canvas.getThemeColor('secondBorderColor'))">
<handler name="oninit"><![CDATA[
this.setAttribute('text','<');]]>
</handler>
@@ -158,7 +158,7 @@
</handler>
</text>
<text width="22" fgcolor="0x000000" height="18"
- onmouseover="this.setAttribute('bgcolor',0xFFFFFF)" onmouseout="this.setAttribute('bgcolor',0xE0E0E0)">
+ onmouseover="this.setAttribute('bgcolor',0xFFFFFF)" onmouseout="this.setAttribute('bgcolor',canvas.getThemeColor('secondBorderColor'))">
<handler name="oninit"><![CDATA[
this.setAttribute('text','<<');]]>
</handler>
@@ -170,19 +170,19 @@
<text fontsize="10" fgcolor="0x000000" align="center" text="${ parent.parent.parent.currentMonthName+' '+parent.parent.parent.parent.parent.year }" resize="true" />
</view>
<text width="22" fgcolor="0x000000" text=">>" height="18"
- onmouseover="this.setAttribute('bgcolor',0xFFFFFF)" onmouseout="this.setAttribute('bgcolor',0xE0E0E0)">
+ onmouseover="this.setAttribute('bgcolor',0xFFFFFF)" onmouseout="this.setAttribute('bgcolor',canvas.getThemeColor('secondBorderColor'))">
<handler name="onclick">
this.parent.parent.parent.parent.showNextYear();
</handler>
</text>
<text width="20" fgcolor="0x000000" text=" >" height="18"
- onmouseover="this.setAttribute('bgcolor',0xFFFFFF)" onmouseout="this.setAttribute('bgcolor',0xE0E0E0)">
+ onmouseover="this.setAttribute('bgcolor',0xFFFFFF)" onmouseout="this.setAttribute('bgcolor',canvas.getThemeColor('secondBorderColor'))">
<handler name="onclick">
this.parent.parent.parent.parent.showNextMonth();
</handler>
</text>
</view>
- <view name="weekheader" layout="axis:x;spacing:1" x="1" y="18" bgcolor="0xE0E0E0"/>
+ <view name="weekheader" layout="axis:x;spacing:1" x="1" y="18" bgcolor="$once{ canvas.getThemeColor('secondBorderColor') }"/>
<!--
<view name="weekNumber" layout="axis:y;spacing:1" x="1" y="35" />
-->
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=1309491&r1=1309490&r2=1309491&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 Wed Apr 4 17:02:40 2012
@@ -78,7 +78,7 @@
<handler name="oninit">
<![CDATA[
- this.setTintRGB(canvas.basebgcolorizer,90);
+ this.setTintRGB(canvas.getThemeColor('basebgcolorizer'),90);
]]>
</handler>
<method name="setTintRGB" args="color, brightness">
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=1309491&r1=1309490&r2=1309491&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 Wed Apr 4 17:02:40 2012
@@ -21,14 +21,14 @@
<library>
<class name="explorerBox" extends="view" width="250" y="100" visibility="hidden"
- height="400" bgcolor="$once{ canvas.styleMenuBarBaseColor }"
+ height="400" bgcolor="$once{ canvas.getThemeColor('styleMenuBarBaseColor') }"
onmousedown="this._startDragState(this)" onmouseup="this._removeDragState(this)" >
<attribute name="showWindowEffect" value="false" type="boolean" />
<attribute name="annimationStartStyle" value="center" type="string" />
- <attribute name="annimationColor" value="$once{ canvas.basebgcolorizer }" type="string" />
+ <attribute name="annimationColor" value="$once{ canvas.getThemeColor('basebgcolorizer') }" type="string" />
<event name="animationInited" />
@@ -363,12 +363,12 @@
</method>
<view width="${ this.parent.width-2 }" height="${ this.parent.height-2 }"
- x="1" y="1" bgcolor="0xEEF0EB" />
+ x="1" y="1" bgcolor="$once{ canvas.getThemeColor('mainBackgroundColor') }" />
<view x="1" y="1" width="${ this.parent.width-2 }" height="20" >
<gradientview x="0" width="${ this.parent.width }" height="20"
- colorFrom="$once{ canvas.baseMousecolorizer }"
- colorTo="$once{ canvas.styleMenuBarBaseColor }" >
+ colorFrom="$once{ canvas.getThemeColor('baseMousecolorizer') }"
+ colorTo="$once{ canvas.getThemeColor('styleMenuBarBaseColor') }" >
</gradientview>
<text fontsize="10" height="17" x="6" y="1" text="${ this.parent.parent.title }"
@@ -384,38 +384,6 @@
this.parent.parent.close();
</handler>
</view>
- <!--
- <view visible="${ !this.parent.parent.isopen }" x="2" y="3" resource="explorer_button_min_rsc">
- <handler name="onmouseover">
- this.setAttribute('frame',2);
- </handler>
- <handler name="onmouseout">
- this.setAttribute('frame',1);
- </handler>
- <handler name="onmousedown">
- this.setAttribute('frame',3);
- </handler>
- <handler name="onmouseup">
- this.setAttribute('frame',1);
- this.parent.parent.toggleopen();
- </handler>
- </view>
- <view visible="${ this.parent.parent.isopen }" x="2" y="3" resource="explorer_button_max_rsc">
- <handler name="onmouseover">
- this.setAttribute('frame',2);
- </handler>
- <handler name="onmouseout">
- this.setAttribute('frame',1);
- </handler>
- <handler name="onmousedown">
- this.setAttribute('frame',3);
- </handler>
- <handler name="onmouseup">
- this.setAttribute('frame',1);
- this.parent.parent.toggleopen();
- </handler>
- </view>
- -->
</view>
<handler name="onaddsubview" args="v">
////Debug.write("onaddsubview",v);
@@ -430,7 +398,7 @@
//if ($debug) Debug.write("setTint");
//TODO: Fix this, does not work at the moment
//http://code.google.com/p/openmeetings/issues/detail?id=470
- this.setColor(canvas.baseMousecolorizer);
+ this.setColor(canvas.getThemeColor('baseMousecolorizer'));
</handler>
</view>
<resizestate name="rs"/>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/lps/changeWidthLetterSlider.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/lps/changeWidthLetterSlider.lzx?rev=1309491&r1=1309490&r2=1309491&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/lps/changeWidthLetterSlider.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/lps/changeWidthLetterSlider.lzx Wed Apr 4 17:02:40 2012
@@ -114,7 +114,7 @@
]]>
</method>
- <view bgcolor="$once{ canvas.baseMousecolorizer }" width="58" height="138" x="1" y="1" />
+ <view bgcolor="$once{ canvas.getThemeColor('baseMousecolorizer') }" width="58" height="138" x="1" y="1" />
<vslider name="_slider" height="120" y="10" x="10" minvalue="4" maxvalue="100"
initvalue="$once{ parent.initialNumber }" showrange="false" >
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/lps/changeWidthSlider.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/lps/changeWidthSlider.lzx?rev=1309491&r1=1309490&r2=1309491&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/lps/changeWidthSlider.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/lps/changeWidthSlider.lzx Wed Apr 4 17:02:40 2012
@@ -135,7 +135,7 @@
]]>
</method>
- <view bgcolor="$once{ canvas.baseMousecolorizer }" width="58" height="138" x="1" y="1" />
+ <view bgcolor="$once{ canvas.getThemeColor('baseMousecolorizer') }" width="58" height="138" x="1" y="1" />
<vslider name="_slider" height="120" y="10" x="10" minvalue="1" maxvalue="$once{ parent.maxvalue }"
initvalue="$once{ parent.initialNumber }" showrange="false" showvalue="true">
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/panel/baseLeftPanel.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/panel/baseLeftPanel.lzx?rev=1309491&r1=1309490&r2=1309491&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/panel/baseLeftPanel.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/panel/baseLeftPanel.lzx Wed Apr 4 17:02:40 2012
@@ -21,7 +21,7 @@
<library>
<class name="baseLeftPanel" extends="baseBoundingBorderView"
- bgcolor="$once{ canvas.basebgcolorizer }" hasshadow="false">
+ bgcolor="$once{ canvas.getThemeColor('basebgcolorizer') }" hasshadow="false">
<!--- if this Box should be closeable -->
<attribute name="closable" value="false" type="boolean" />
@@ -37,16 +37,11 @@
<!-- basebgcolorizer -->
- <view name="_bgItem" x="1" y="1" bgcolor="0xEEF0EB"
+ <view name="_bgItem" x="1" y="1" bgcolor="$once{ canvas.getThemeColor('mainBackgroundColor') }"
width="$once{ this.parent.width-2 }" height="$once{ this.parent.height-2 }" />
<view x="1" y="1" width="$once{ this.parent.width-2 }" height="17"
- bgcolor="$once{ canvas.baseMousecolorizer }">
- <handler name="oninit">
- <![CDATA[
- //this.setColor(canvas.baseMousecolorizer);
- ]]>
- </handler>
+ bgcolor="$once{ canvas.getThemeColor('baseMousecolorizer') }">
<handler name="onmousedown">
parent.onmousedown.sendEvent(parent);
</handler>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/panel/basePanel.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/panel/basePanel.lzx?rev=1309491&r1=1309490&r2=1309491&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/panel/basePanel.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/panel/basePanel.lzx Wed Apr 4 17:02:40 2012
@@ -21,7 +21,7 @@
<library>
<class name="basePanel" extends="baseBoundingBorderView"
- bgcolor="$once{ canvas.basebgcolorizer }" >
+ bgcolor="$once{ canvas.getThemeColor('basebgcolorizer') }" >
<!--- if this Box should be closeable -->
<attribute name="closable" value="false" type="boolean" />
@@ -41,8 +41,7 @@
resource="presenter_thumb_rsc" >
<handler name="oninit">
<![CDATA[
- //this.setTintRGB(canvas.basebgcolorizer,90);
- this.setColor(canvas.basebgcolorizer);
+ this.setColor(canvas.getThemeColor('basebgcolorizer'));
]]>
</handler>
<method name="setTintRGB" args="color, brightness">
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=1309491&r1=1309490&r2=1309491&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:02:40 2012
@@ -64,9 +64,9 @@
<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="0" width="${ this.parent.width }" height="1" bgcolor="$once{ canvas.getThemeColor('mainBorderColor') }" />
- <view x="0" y="19" width="${ this.parent.width }" height="1" bgcolor="0xCCCCCC" />
+ <view x="0" y="19" width="${ this.parent.width }" height="1" bgcolor="$once{ canvas.getThemeColor('mainBorderColor') }" />
<view x="0" y="1" width="${ this.parent.width }" height="20" >
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/panel/baseTopPanel.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/panel/baseTopPanel.lzx?rev=1309491&r1=1309490&r2=1309491&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/panel/baseTopPanel.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/panel/baseTopPanel.lzx Wed Apr 4 17:02:40 2012
@@ -21,7 +21,7 @@
<library>
<class name="baseTopPanel" extends="baseBoundingBorderView"
- bgcolor="$once{ canvas.basebgcolorizer }" hasshadow="false">
+ bgcolor="$once{ canvas.getThemeColor('basebgcolorizer') }" hasshadow="false">
<!--- if this Box should be closeable -->
<attribute name="closable" value="false" type="boolean" />
@@ -35,16 +35,11 @@
this.title=canvas.getLabelName(this.labelid);
</method>
- <view name="_bgItem" x="1" y="1" bgcolor="0xEEF0EB"
+ <view name="_bgItem" x="1" y="1" bgcolor="$once{ canvas.getThemeColor('mainBackgroundColor') }"
width="$once{ this.parent.width-2 }" height="$once{ this.parent.height-2 }" />
<view x="1" y="1" height="$once{ this.parent.height-2 }" width="17"
- bgcolor="$once{ canvas.baseMousecolorizer }">
- <handler name="oninit">
- <![CDATA[
- //this.setColor(canvas.baseMousecolorizer);
- ]]>
- </handler>
+ bgcolor="$once{ canvas.getThemeColor('baseMousecolorizer') }">
<handler name="onmousedown">
parent.onmousedown.sendEvent(parent);
</handler>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/panel/panelBoundBox.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/panel/panelBoundBox.lzx?rev=1309491&r1=1309490&r2=1309491&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/panel/panelBoundBox.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/panel/panelBoundBox.lzx Wed Apr 4 17:02:40 2012
@@ -27,8 +27,8 @@
<class name="panelBoundBox" extends="drawview" cachebitmap="false" >
<handler name="oncontext">
- var numberColor = this.stringRgbToInteger(canvas.basebgcolorizer);
- var fillColor = this.stringRgbToInteger(canvas.baseMousecolorizer);
+ var numberColor = this.stringRgbToInteger(canvas.getThemeColor('basebgcolorizer'));
+ var fillColor = this.stringRgbToInteger(canvas.getThemeColor('baseMousecolorizer'));
this.drawBody(this,0,0,this.width,this.height,fillColor,2);
this.drawDottedLine(this,0,0,this.width,0,numberColor,2);
this.drawDottedLine(this,this.width,0,this.width,this.height,numberColor,2);
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/presenter/boxInitEffect.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/presenter/boxInitEffect.lzx?rev=1309491&r1=1309490&r2=1309491&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/presenter/boxInitEffect.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/presenter/boxInitEffect.lzx Wed Apr 4 17:02:40 2012
@@ -21,7 +21,7 @@
<library>
<class name="boxInitEffect" extends="view" width="100" height="20"
- opacity="0.3" bgcolor="$once{ canvas.basebgcolorizer }" >
+ opacity="0.3" bgcolor="$once{ canvas.getThemeColor('basebgcolorizer') }" >
<attribute name="zielx" value="200" type="number" />
<attribute name="ziely" value="200" type="number" />
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=1309491&r1=1309490&r2=1309491&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 Wed Apr 4 17:02:40 2012
@@ -442,16 +442,16 @@
<dragstate name="dragger" />
<view name="_bg" width="${ this.parent.width }" height="${ this.parent.height }"
- bgcolor="$once{ canvas.basebgcolorizer }" >
+ bgcolor="$once{ canvas.getThemeColor('basebgcolorizer') }" >
<view width="${ this.parent.width-2 }" height="${ this.parent.height-2 }"
- x="1" y="1" bgcolor="0xEEF0EB" />
+ x="1" y="1" bgcolor="$once{ canvas.getThemeColor('mainBackgroundColor') }" />
</view>
<view x="1" y="1" width="${ this.parent.width-1 }" height="20" name="_titlebar" >
<!-- stretches="width" -->
<gradientview x="0" width="${ this.parent.width }" height="20"
- colorFrom="$once{ canvas.baseMousecolorizer }"
- colorTo="$once{ canvas.styleMenuBarBaseColor }" >
+ colorFrom="$once{ canvas.getThemeColor('baseMousecolorizer') }"
+ colorTo="$once{ canvas.getThemeColor('styleMenuBarBaseColor') }" >
</gradientview>
<text fontsize="10" height="17" x="6" y="1" text="${ this.parent.parent.title }"
@@ -524,7 +524,7 @@
</handler>
<handler name="onmousedown">
- this._bg.setAttribute("bgcolor",canvas.basebgcolorizer);
+ this._bg.setAttribute("bgcolor",canvas.getThemeColor('basebgcolorizer'));
this._bg.setAttribute("visibility","visible");
</handler>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/simplevaluelist/simpleValueList.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/simplevaluelist/simpleValueList.lzx?rev=1309491&r1=1309490&r2=1309491&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/simplevaluelist/simpleValueList.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/simplevaluelist/simpleValueList.lzx Wed Apr 4 17:02:40 2012
@@ -24,13 +24,13 @@
bgcolor="0xFFFFFF" onmouseup="this.parent.parent.parent.parent.toggleSelected(this)" >
<handler name="onmouseover">
<![CDATA[
- if (this.selected) this.setAttribute('bgcolor',canvas.baseMouseOvercolorizer)
- else this.setAttribute('bgcolor',canvas.baseMouseOvercolorizer);
+ if (this.selected) this.setAttribute('bgcolor',canvas.getThemeColor('baseMouseOvercolorizer'))
+ else this.setAttribute('bgcolor',canvas.getThemeColor('baseMouseOvercolorizer'));
]]>
</handler>
<handler name="onmouseout">
<![CDATA[
- if (this.selected) this.setAttribute('bgcolor',canvas.baseMouseOvercolorizer)
+ if (this.selected) this.setAttribute('bgcolor',canvas.getThemeColor('baseMouseOvercolorizer'))
else this.setAttribute('bgcolor',0xFFFFFF);
]]>
</handler>
@@ -41,7 +41,7 @@
</class>
-<class name="simpleValueList" extends="view" bgcolor="0xCCCCCC" >
+<class name="simpleValueList" extends="view" bgcolor="$once{ canvas.getThemeColor('mainBorderColor') }" >
<attribute name="_selected" value="null" />
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/text/borderedInputtext.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/text/borderedInputtext.lzx?rev=1309491&r1=1309490&r2=1309491&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/text/borderedInputtext.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/text/borderedInputtext.lzx Wed Apr 4 17:02:40 2012
@@ -20,7 +20,7 @@
-->
<library>
-<class name="borderedInputtext" extends="view" bgcolor="$once{ canvas.basebgcolorizer }" >
+<class name="borderedInputtext" extends="view" bgcolor="$once{ canvas.getThemeColor('basebgcolorizer') }" >
<!---@keywords private -->
<attribute name="width" value="200" type="size" />
<!---@keywords private -->
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/text/customEdittext.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/text/customEdittext.lzx?rev=1309491&r1=1309490&r2=1309491&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/text/customEdittext.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/text/customEdittext.lzx Wed Apr 4 17:02:40 2012
@@ -22,8 +22,8 @@
<class name="customEdittext" extends="inputtext" bgcolor="0xFFFFFF" fontsize="11" height="20" >
- <view name="v_border" height="1" bgcolor="0xE0E0E0" width="$once{parent.width}" />
- <view name="h_border" width="1" y="1" bgcolor="0xE0E0E0" height="$once{parent.height -1}" />
+ <view name="v_border" height="1" bgcolor="$once{ canvas.getThemeColor('secondBorderColor') }" width="$once{parent.width}" />
+ <view name="h_border" width="1" y="1" bgcolor="$once{ canvas.getThemeColor('secondBorderColor') }" height="$once{parent.height -1}" />
<attribute name="labelid" type="number" setter="setLabelId(labelid)" />
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/text/customscrollEdittext.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/text/customscrollEdittext.lzx?rev=1309491&r1=1309490&r2=1309491&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/text/customscrollEdittext.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/text/customscrollEdittext.lzx Wed Apr 4 17:02:40 2012
@@ -42,8 +42,8 @@
width="$once{parent.width}"
height="$once{parent.height}" />
- <view name="v_border" height="1" bgcolor="0xE0E0E0" width="$once{parent.width}" />
- <view name="h_border" width="1" y="1" bgcolor="0xE0E0E0" height="$once{parent.height -1}" />
+ <view name="v_border" height="1" bgcolor="$once{ canvas.getThemeColor('secondBorderColor') }" width="$once{parent.width}" />
+ <view name="h_border" width="1" y="1" bgcolor="$once{ canvas.getThemeColor('secondBorderColor') }" height="$once{parent.height -1}" />
<scrolledittext name="_cbtext" width="$once{ parent.width-1 }" x="1" y="1" bgcolor="0xFFFFFF" styleable="false"
height="$once{ parent.height-1 }" text="${ parent.text }" vscrollbarclassname="om_vscrollbar"
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/turnoverlist/baseContentListItem.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/turnoverlist/baseContentListItem.lzx?rev=1309491&r1=1309490&r2=1309491&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/turnoverlist/baseContentListItem.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/turnoverlist/baseContentListItem.lzx Wed Apr 4 17:02:40 2012
@@ -28,7 +28,7 @@
<method name="select">
this.isselected = true;
- this.setAttribute('bgcolor',canvas.baseMouseOvercolorizer);
+ this.setAttribute('bgcolor',canvas.getThemeColor('baseMouseOvercolorizer'));
</method>
<method name="deselect">
@@ -42,7 +42,7 @@
<handler name="onmouseover">
if (!this.isselected) {
- this.setAttribute('bgcolor',canvas.baseMouseOvercolorizer);
+ this.setAttribute('bgcolor',canvas.getThemeColor('baseMouseOvercolorizer'));
}
</handler>
@@ -50,7 +50,7 @@
if (!this.isselected) {
this.setAttribute('bgcolor',0xFFFFFF);
} else {
- this.setAttribute('bgcolor',canvas.baseMouseOvercolorizer);
+ this.setAttribute('bgcolor',canvas.getThemeColor('baseMouseOvercolorizer'));
}
</handler>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/turnoverlist/turnOverList.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/turnoverlist/turnOverList.lzx?rev=1309491&r1=1309490&r2=1309491&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/turnoverlist/turnOverList.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/turnoverlist/turnOverList.lzx Wed Apr 4 17:02:40 2012
@@ -251,7 +251,7 @@
</miniIcons>
<!-- ========= BgArea area =========-->
- <view width="$once{ parent.width }" bgcolor="0xCCCCCC"
+ <view width="$once{ parent.width }" bgcolor="$once{ canvas.getThemeColor('mainBorderColor') }"
height="$once{ parent.height-20 }" x="0" y="20">
<view width="$once{ parent.width-2 }" bgcolor="$once{ parent.parent.mainBgColor }"
height="$once{ parent.height-2 }" x="1" y="1"></view>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/contentviews/baseContentSaveView.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/contentviews/baseContentSaveView.lzx?rev=1309491&r1=1309490&r2=1309491&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/contentviews/baseContentSaveView.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/contentviews/baseContentSaveView.lzx Wed Apr 4 17:02:40 2012
@@ -44,7 +44,7 @@
<event name="onreload" />
<view name="_savecontentbar" layout="axis:x;spacing:2;inset:2" x="2" height="28" width="$once{ parent.width }"
- bgcolor="$once{ canvas.baseMousecolorizer }">
+ bgcolor="$once{ canvas.getThemeColor('baseMousecolorizer') }">
<baseChooseIcon resourceN="filesave_rsc" labelid="144" y="2"
onclick="this.parent.parent.doSaveEvent()" visible="$once{ parent.parent.saveIsVisible }" />
<baseChooseIcon resourceN="edit_add_rsc" labelid="155" y="2"
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx?rev=1309491&r1=1309490&r2=1309491&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx Wed Apr 4 17:02:40 2012
@@ -78,16 +78,11 @@ these properties will be overwritten by
<!---
These colors are the main colors and style the hole application
-->
-<attribute name="baseColorScheme" value="lightsteelblue" type="string" />
<attribute name="basebgcolorizer" value="" type="string" />
<attribute name="baseMousecolorizer" value="" type="string" />
<attribute name="baseMouseOvercolorizer" value="" type="string" />
-<attribute name="userbgcolorizer" value="0x3F5B9E" type="string" />
-<attribute name="userMousecolorizer" value="0xC4D5E6" type="string" />
-<attribute name="userMouseOvercolorizer" value="0xC4D5E6" type="string" />
<attribute name="styleMenuBarBaseColor" value="0xFFFFFF" type="string" />
-<attribute name="bgColorMenu" value="0xEEF0EB" type="string" />
<attribute name="fontColorHeader" value="0x000000" type="string" />
<attribute name="bgColorMenuItems" value="0xEAEAEA" type="string" />
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=1309491&r1=1309490&r2=1309491&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:02:40 2012
@@ -138,18 +138,6 @@
}
this.setAttribute('red5httpport',Number(canvas.myConfigSet.getPointer().xpathQuery('config/red5httpport/text()')));
- this.setAttribute('userbgcolorizer',canvas.myConfigSet.getPointer().xpathQuery('config/basebgcolorizer/text()'));
- this.setAttribute('userMousecolorizer',canvas.myConfigSet.getPointer().xpathQuery('config/baseMousecolorizer/text()'));
- this.setAttribute('userMouseOvercolorizer',canvas.myConfigSet.getPointer().xpathQuery('config/baseMouseOvercolorizer/text()'));
- this.setAttribute('styleMenuBarBaseColor',canvas.myConfigSet.getPointer().xpathQuery('config/styleMenuBarBaseColor/text()'));
- if (this.baseColorScheme == "lightsteelblue" &&
- (this.userbgcolorizer != "0x3F5B9E"
- || this.baseMousecolorizer != "0xC4D5E6"
- || this.baseMouseOvercolorizer != "0xC4D5E6"))
- {
- this.setAttribute('baseColorScheme', "userdefined");
- }
- this.setColorStyle(this.baseColorScheme);
this.setAttribute('currentappname',canvas.myConfigSet.getPointer().xpathQuery('config/currentappname/text()'));
this.setAttribute('currentappnameurl',canvas.myConfigSet.getPointer().xpathQuery('config/currentappnameurl/text()'));
@@ -360,6 +348,8 @@
if (scopeRoomId != undefined){
hib.userScope = scopeRoomId;
}
+
+ this.setBaseColors();
//Debug.write("rtmphostlocal,rtmphost: ",canvas.rtmphostlocal,canvas.rtmphost);
var src = hib.protocollName+'://'+canvas.rtmphostlocal+':'+hib.protocollPort+'/'+canvas.webAppRootKey+'/'+hib.userScope;
@@ -953,43 +943,6 @@
canvas.sharedObject.flush();
</method>
- <method name="setColorStyle" args="value">
- var val = value;
- if (val == "mediumseagreen"){
- canvas.setAttribute('basebgcolorizer',"0x3CB371");
- canvas.setAttribute('baseMousecolorizer',"0x66CC8E");
- canvas.setAttribute('baseMouseOvercolorizer',"0x66CC8E");
- } else if (val == "steelblue"){
- canvas.setAttribute('basebgcolorizer',"0x4682B4");
- canvas.setAttribute('baseMousecolorizer',"0x80AECC");
- canvas.setAttribute('baseMouseOvercolorizer',"0x80AECC");
- } else if (val == "redorange"){
- canvas.setAttribute('basebgcolorizer',"0xFC8558");
- canvas.setAttribute('baseMousecolorizer',"0xFDC4A6");
- canvas.setAttribute('baseMouseOvercolorizer',"0xFDC4A6");
- } else if (val == "lightsteelblue"){
- canvas.setAttribute('basebgcolorizer',"0x3F5B9E");
- canvas.setAttribute('baseMousecolorizer',"0xC4D5E6");
- canvas.setAttribute('baseMouseOvercolorizer',"0xC4D5E6");
- } else if (val == "goldenrod"){
- canvas.setAttribute('basebgcolorizer',"0xDAA520");
- canvas.setAttribute('baseMousecolorizer',"0xE8C064");
- canvas.setAttribute('baseMouseOvercolorizer',"0xE8C064");
- } else if (val == "silvergray"){
- canvas.setAttribute('basebgcolorizer',"0xC4C8CC");
- canvas.setAttribute('baseMousecolorizer',"0xC2C8CD");
- canvas.setAttribute('baseMouseOvercolorizer',"0xC2C8CD");
- } else if (val == "userdefined"){
- canvas.setAttribute('basebgcolorizer', canvas.userbgcolorizer);
- canvas.setAttribute('baseMousecolorizer', canvas.userMousecolorizer);
- canvas.setAttribute('baseMouseOvercolorizer', canvas.userMouseOvercolorizer);
- } else {
- val = null;
- }
-
- return val;
- </method>
-
<attribute name="regExpCounter" value="0" type="number" />
<attribute name="regExpResultArray" value="null" />
@@ -1019,4 +972,20 @@
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;
+ </method>
+
+ <method name="setBaseColors">
+ defaultstyle.setAttribute("basecolor",canvas.getThemeColor('basebgcolorizer'));
+ itemStyle.setAttribute("basecolor",canvas.getThemeColor('basebgcolorizer'));
+ menuStyle.setAttribute("basecolor",canvas.getThemeColor('styleMenuBarBaseColor'));
+ _conferencemenu.setAttribute("bgcolor",canvas.getThemeColor('baseMousecolorizer'));
+ _mainbgcontentNavi.setAttribute("bgcolor",canvas.getThemeColor('mainBackgroundColor'));
+ main_content.setAttribute("bgcolor",canvas.getThemeColor('mainBackgroundColor'));
+ </method>
+
</library>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/navi/helpAndBugs.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/navi/helpAndBugs.lzx?rev=1309491&r1=1309490&r2=1309491&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/navi/helpAndBugs.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/navi/helpAndBugs.lzx Wed Apr 4 17:02:40 2012
@@ -33,7 +33,7 @@
quicklinkAct("userSettingsModule");
</handler>
<view name="_bg" visibility="hidden" width="$once{ parent.width }" y="4" opacity="0.4"
- bgcolor="$once{ canvas.baseMouseOvercolorizer }" height="$once{ parent.height-4 }" />
+ bgcolor="$once{ canvas.getThemeColor('baseMouseOvercolorizer') }" height="$once{ parent.height-4 }" />
<labelText labelid="1188" x="10" y="6" fontsize="12" fgcolor="$once{ canvas.fontColorHeader }"/>
</view>
<view bgcolor="0x3C86C3" y="10" height="10" width="1" />
@@ -49,7 +49,7 @@
quicklinkAct("userSettingsModule");
</handler>
<view name="_bg" visibility="hidden" width="$once{ parent.width }" y="4" opacity="0.4"
- bgcolor="$once{ canvas.baseMouseOvercolorizer }" height="$once{ parent.height-4 }" />
+ bgcolor="$once{ canvas.getThemeColor('baseMouseOvercolorizer') }" height="$once{ parent.height-4 }" />
<labelText labelid="5" x="10" y="6" fontsize="12" fgcolor="$once{ canvas.fontColorHeader }"/>
</view>
<view bgcolor="0x3C86C3" y="10" height="10" width="1" />
@@ -64,7 +64,7 @@
quicklinkAct('logout');
</handler>
<view name="_bg" visibility="hidden" width="$once{ parent.width }" y="4" opacity="0.4"
- bgcolor="$once{ canvas.baseMouseOvercolorizer }" height="$once{ parent.height }" />
+ bgcolor="$once{ canvas.getThemeColor('baseMouseOvercolorizer') }" height="$once{ parent.height }" />
<labelText labelid="310" x="10" y="6" fontsize="12" fgcolor="$once{ canvas.fontColorHeader }"/>
</view>
<view bgcolor="0x3C86C3" y="10" height="10" width="1" />
@@ -79,7 +79,7 @@
lz.Browser.loadURL(canvas.currentappnamebugurl,"_blank");
</handler>
<view name="_bg" visibility="hidden" width="$once{ parent.width-4 }" y="4" opacity="0.4"
- bgcolor="$once{ canvas.baseMouseOvercolorizer }" height="$once{ parent.height-4 }" />
+ bgcolor="$once{ canvas.getThemeColor('baseMouseOvercolorizer') }" height="$once{ parent.height-4 }" />
<labelText labelid="284" x="10" y="6" fontsize="12" fgcolor="$once{ canvas.fontColorHeader }"/>
</view>
</class>
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=1309491&r1=1309490&r2=1309491&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:02:40 2012
@@ -67,11 +67,11 @@
</class>
-<class name="horizontalDropDownSpacer" x="4" height="1" bgcolor="0xCCCCCC">
+<class name="horizontalDropDownSpacer" x="4" height="1" bgcolor="$once{ canvas.getThemeColor('mainBorderColor') }">
<attribute name="isSpacer" value="true" type="boolean" />
</class>
-<class name="baseDropDownMenuList" extends="view" bgcolor="0xCCCCCC">
+<class name="baseDropDownMenuList" extends="view" bgcolor="$once{ canvas.getThemeColor('mainBorderColor') }">
<attribute name="list" value="null" />
@@ -161,7 +161,7 @@
</handler>
<view name="_content" x="1" y="1"
- layout="axis:y;spacing:1" bgcolor="0xEFEFEF" />
+ layout="axis:y;spacing:1" bgcolor="$once{ canvas.getThemeColor('menuBackgroundColor') }" />
</class>
@@ -211,9 +211,9 @@
<view width="${ parent.width-1 }" bgcolor="0xFFFFFF" opacity="0.4" height="$once{ parent.height - 2}" y="1"
visibility="hidden" name="bgc"/>
- <view width="${ parent.width-1 }" bgcolor="0xEFEFEF" height="$once{ parent.height }"
+ <view width="${ parent.width-1 }" bgcolor="$once{ canvas.getThemeColor('menuBackgroundColor') }" height="$once{ parent.height }"
visibility="hidden" name="bga">
- <view width="${ parent.width }" bgcolor="0xCCCCCC" height="1" />
+ <view width="${ parent.width }" bgcolor="$once{ canvas.getThemeColor('mainBorderColor') }" height="1" />
</view>
<view name="_icon_down" x="${ parent.width-20 }" y="$once{ parent.down_y_inset }"
@@ -241,7 +241,7 @@
</class>
-<class name="mainNavi" extends="view" bgcolor="$once{ canvas.styleMenuBarBaseColor }"
+<class name="mainNavi" extends="view" bgcolor="$once{ canvas.getThemeColor('styleMenuBarBaseColor') }"
width="${ canvas.width }" y="50" >
<attribute name="naviObject" value="null" />
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/main.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/main.lzx?rev=1309491&r1=1309490&r2=1309491&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/main.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/main.lzx Wed Apr 4 17:02:40 2012
@@ -38,15 +38,13 @@
<include href="modules/" />
<include href="plugins/" />
-<silverstyle name="defaultstyle" isdefault="true" basecolor="${ canvas.basebgcolorizer }" canvascolor="white" />
+<silverstyle name="defaultstyle" isdefault="true" canvascolor="white" />
<silverstyle name="componentStyle" basecolor="0xFFFFFF" textcolor="0x000000" />
-<silverstyle name="itemStyle" basecolor="${ canvas.basebgcolorizer }"
- textcolor="0xFFFFFF" />
+<silverstyle name="itemStyle" textcolor="0xFFFFFF" />
-<whitestyle name="menuStyle" basecolor="${ canvas.styleMenuBarBaseColor }"
- textcolor="0x000000" />
+<whitestyle name="menuStyle" textcolor="0x000000" />
<!-- main colors: 264269 -->
@@ -62,8 +60,8 @@
<!-- View for Contents. All Windows will be loaded on this view. -->
<view name="main_content" y="${ canvas.naviHeightDelta }" width="${canvas.width}"
- height="${ canvas.height-canvas.naviHeightDelta }" bgcolor="0xEEF0EB"
- visibility="hidden" showhandcursor="false">
+ height="${ canvas.height-canvas.naviHeightDelta }"
+ visibility="hidden" showhandcursor="false">
<handler name="onmouseover">
setCurrentMouseWheelObject(this._scrollbar);
@@ -87,34 +85,12 @@
]]>
</method>
</view>
- <!-- Whats the reason for adding constraints here?
- You cannot set the inner to strict height values, cause otherwise the scrollbar
- won't be showing any difference, no matter if the content of *inner* is
- bigger then the container view *main_content*
-
- -swagner 19.03.2008
-
- <view name="_content" x="0" width="${parent.width}" height="${parent.height}" layout="axis:y;spacing:2">
- <view name="inner" width="${parent.width}" height="${parent.height}" />
- <method name="clearAll">
- <![CDATA[
- if($debug) Debug.write("main.lzx/clearAll() this.inner: ",this.inner,this.inner.subviews.length);
- if (this.inner.subviews.length!=0) var baseContent = this.inner.subviews[0].close();
- for (var eg in this.inner.subviews) {
- if($debug) Debug.write("clearAll this.inner.subviews: ",this.inner.subviews[eg]);
- if (eg!=0) this.inner.subviews[eg].close();
- }
- return baseContent;
- ]]>
- </method>
- </view>
- -->
- <om_vscrollbar name="_scrollbar" id="_mainScrollBar" />
+ <om_vscrollbar name="_scrollbar" id="_mainScrollBar" />
</view>
<!-- View for Navigation-bar and App-name -->
-<view name="_mainbgcontentNavi" x="0" y="0" bgcolor="${ canvas.bgColorMenu }" clip="true"
+<view name="_mainbgcontentNavi" x="0" y="0" clip="true"
width="100%" height="${ canvas.naviHeight }" visibility="hidden">
<text id="mainBaseText" x="10" y="10"
fgcolor="${ canvas.fontColorHeader }" fontsize="20" fontstyle="bold">
@@ -140,8 +116,7 @@
</view>
<!-- View for Conference menu bar at the top side. Visible on conference -->
-<view name="_conferencemenu" y="0" x="0" width="100%" height="20"
- bgcolor="$once{ canvas.baseMousecolorizer }" visibility="hidden" >
+<view name="_conferencemenu" y="0" x="0" width="100%" height="20" visibility="hidden" >
<method name="removeAll">
<![CDATA[
if($debug) Debug.write("main.lzx/_coferencemenu.removeAll(): ");
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/maindebug.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/maindebug.lzx?rev=1309491&r1=1309490&r2=1309491&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/maindebug.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/maindebug.lzx Wed Apr 4 17:02:40 2012
@@ -39,15 +39,13 @@
<include href="modules/" />
<include href="plugins/" />
-<silverstyle name="defaultstyle" isdefault="true" basecolor="${ canvas.basebgcolorizer }" canvascolor="white" />
+<silverstyle name="defaultstyle" isdefault="true" canvascolor="white" />
<silverstyle name="componentStyle" basecolor="0xFFFFFF" textcolor="0x000000" />
-<silverstyle name="itemStyle" basecolor="${ canvas.basebgcolorizer }"
- textcolor="0xFFFFFF" />
+<silverstyle name="itemStyle" textcolor="0xFFFFFF" />
-<whitestyle name="menuStyle" basecolor="${ canvas.styleMenuBarBaseColor }"
- textcolor="0x000000" />
+<whitestyle name="menuStyle" textcolor="0x000000" />
<!-- main colors: 264269 -->
<handler name="oninit">
@@ -62,8 +60,8 @@
<!-- View for Contents. All Windows will be loaded on this view. -->
<view name="main_content" y="${ canvas.naviHeightDelta }" width="${canvas.width}"
- height="${ canvas.height-canvas.naviHeightDelta }" bgcolor="0xEEF0EB"
- visibility="hidden" showhandcursor="false">
+ height="${ canvas.height-canvas.naviHeightDelta }"
+ visibility="hidden" showhandcursor="false">
<handler name="onmouseover">
setCurrentMouseWheelObject(this._scrollbar);
@@ -87,34 +85,11 @@
]]>
</method>
</view>
- <!-- Whats the reason for adding constraints here?
- You cannot set the inner to strict height values, cause otherwise the scrollbar
- won't be showing any difference, no matter if the content of *inner* is
- bigger then the container view *main_content*
-
- -swagner 19.03.2008
-
- <view name="_content" x="0" width="${parent.width}" height="${parent.height}" layout="axis:y;spacing:2">
- <view name="inner" width="${parent.width}" height="${parent.height}" />
- <method name="clearAll">
- <![CDATA[
- if($debug) Debug.write("main.lzx/clearAll() this.inner: ",this.inner,this.inner.subviews.length);
- if (this.inner.subviews.length!=0) var baseContent = this.inner.subviews[0].close();
- for (var eg in this.inner.subviews) {
- if($debug) Debug.write("clearAll this.inner.subviews: ",this.inner.subviews[eg]);
- if (eg!=0) this.inner.subviews[eg].close();
- }
- return baseContent;
- ]]>
- </method>
- </view>
- -->
<om_vscrollbar name="_scrollbar" id="_mainScrollBar" />
-
</view>
<!-- View for Navigation-bar and App-name -->
-<view name="_mainbgcontentNavi" x="0" y="0" bgcolor="${ canvas.bgColorMenu }" clip="true"
+<view name="_mainbgcontentNavi" x="0" y="0" clip="true"
width="100%" height="${ canvas.naviHeight }" visibility="hidden">
<text id="mainBaseText" x="10" y="10"
fgcolor="${ canvas.fontColorHeader }" fontsize="20" fontstyle="bold">
@@ -140,8 +115,7 @@
</view>
<!-- View for Conference menu bar at the top side. Visible on conference -->
-<view name="_conferencemenu" y="0" x="0" width="100%" height="20"
- bgcolor="$once{ canvas.baseMousecolorizer }" visibility="hidden" >
+<view name="_conferencemenu" y="0" x="0" width="100%" height="20" visibility="hidden" >
<method name="removeAll">
<![CDATA[
if($debug) Debug.write("main.lzx/_coferencemenu.removeAll(): ");
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/languageseditor/languagesEditor.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/languageseditor/languagesEditor.lzx?rev=1309491&r1=1309490&r2=1309491&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/languageseditor/languagesEditor.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/languageseditor/languagesEditor.lzx Wed Apr 4 17:02:40 2012
@@ -53,7 +53,7 @@
</method>
<view name="_savecontentbar" layout="axis:x;spacing:2;inset:2" x="2" height="28" width="$once{ parent.width }"
- bgcolor="$once{ canvas.baseMousecolorizer }">
+ bgcolor="$once{ canvas.getThemeColor('baseMousecolorizer') }">
<!-- 362:Add new language -->
<baseChooseIcon resourceN="edit_add_rsc" labelid="362" y="2"
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/emotIconsSelector.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/emotIconsSelector.lzx?rev=1309491&r1=1309490&r2=1309491&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/emotIconsSelector.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/emotIconsSelector.lzx Wed Apr 4 17:02:40 2012
@@ -21,7 +21,7 @@
<library>
<!--- view to select emoticons. size is 160x140 -->
-<class name="emotIconsSelector" extends="closableView" bgcolor="$once{ canvas.basebgcolorizer }"
+<class name="emotIconsSelector" extends="closableView" bgcolor="$once{ canvas.getThemeColor('basebgcolorizer') }"
clickable="true" width="160" height="140" >
<attribute name="btnRef" value="null" />
@@ -74,7 +74,7 @@
</handler>
</netRemoteCallHib>
- <view bgcolor="$once{ canvas.baseMousecolorizer }" width="$once{ parent.width-2 }"
+ <view bgcolor="$once{ canvas.getThemeColor('baseMousecolorizer') }" width="$once{ parent.width-2 }"
height="$once{ parent.height-2 }" x="1" y="1" />
<labelText x="1" y="1" labelid="446" /><!-- 446:Emoticons -->
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/inviteuser/chatParticipantsInviteConference.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/inviteuser/chatParticipantsInviteConference.lzx?rev=1309491&r1=1309490&r2=1309491&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/inviteuser/chatParticipantsInviteConference.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/inviteuser/chatParticipantsInviteConference.lzx Wed Apr 4 17:02:40 2012
@@ -72,7 +72,7 @@
</netRemoteCallHib>
<!-- inn.inn.inn view would be setted object by above ondata hander. -->
- <view name="inn" width="480" height="${ parent.height }" bgcolor="$once{ canvas.basebgcolorizer }" >
+ <view name="inn" width="480" height="${ parent.height }" bgcolor="$once{ canvas.getThemeColor('basebgcolorizer') }" >
<view name="inn" x="1" y="1" width="478" height="${ parent.height-2 }"
bgcolor="0xFFFFFF" clip="true" >
<view name="inn" layout="axis:y;spacing:1"/>
@@ -113,7 +113,7 @@
</netRemoteCallHib>
<!-- inn.inn.inn view would be setted object by above ondata hander. -->
- <view name="inn" width="480" height="${ parent.height }" bgcolor="$once{ canvas.basebgcolorizer }" >
+ <view name="inn" width="480" height="${ parent.height }" bgcolor="$once{ canvas.getThemeColor('basebgcolorizer') }" >
<view name="inn" x="1" y="1" width="478" height="${ parent.height-2 }" bgcolor="0xFFFFFF" clip="true" >
<view name="inn" layout="axis:y;spacing:1"/>
<om_vscrollbar />
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/overAllChat.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/overAllChat.lzx?rev=1309491&r1=1309490&r2=1309491&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/overAllChat.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/overAllChat.lzx Wed Apr 4 17:02:40 2012
@@ -33,7 +33,7 @@
<!-- message and buttons area-->
<view y="0" x="196" height="${ parent.height }" >
<view name="_chatoutputborder" height="${ parent.height-48 }"
- width="${ parent.parent.width - 196 }" bgcolor="0xE0E0E0">
+ width="${ parent.parent.width - 196 }" bgcolor="$once{ canvas.getThemeColor('secondBorderColor') }">
<!-- 604 -->
<overAllChatOutput name="_chatoutput" x="1" y="1" >
<handler name="oninit">
@@ -47,7 +47,7 @@
</view>
<!-- chat participants area -->
- <view x="0" y="0" name="_chatparticipants" bgcolor="0xE0E0E0"
+ <view x="0" y="0" name="_chatparticipants" bgcolor="$once{ canvas.getThemeColor('secondBorderColor') }"
height="${ parent.height-2 }" width="190" >
<handler name="oninit">
this.getChatOverallUsers.doCall();
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=1309491&r1=1309490&r2=1309491&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:02:40 2012
@@ -25,7 +25,7 @@
<class name="interviewConferenceMenubar" extends="conferenceMenubar" viewType="interview"/>
<class name="conferenceMenubar" extends="view" height="28" width="${ canvas.width }"
- bgcolor="$once{ canvas.styleMenuBarBaseColor }" >
+ bgcolor="$once{ canvas.getThemeColor('styleMenuBarBaseColor') }" >
<attribute name="viewType" value="conference" type="string" />
@@ -209,7 +209,7 @@
height="${ this._content.height+2 }" width="${ this._content.width+2 }">
<view name="_content" x="1" y="1"
- layout="axis:y;spacing:1" bgcolor="0xEFEFEF" >
+ layout="axis:y;spacing:1" bgcolor="$once{ canvas.getThemeColor('menuBackgroundColor') }" >
<conferencDropDownMenuItem labelid="15" command="cmd_importFile"
enabled="${ canvas.ismoderator }" />
@@ -226,7 +226,7 @@
</handler>
<view name="_content" x="1" y="1"
- layout="axis:y;spacing:1" bgcolor="0xEFEFEF" >
+ layout="axis:y;spacing:1" bgcolor="$once{ canvas.getThemeColor('menuBackgroundColor') }" >
<conferencDropDownMenuItem labelid="213" command="cmd_invitation"
enabled="${ canvas.ismoderator }" />
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/roomListDetails.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/roomListDetails.lzx?rev=1309491&r1=1309490&r2=1309491&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/roomListDetails.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/roomListDetails.lzx Wed Apr 4 17:02:40 2012
@@ -176,7 +176,7 @@
<labelText name="user_label" labelid="407" y="${10 + parent._roomcomment.y + parent._roomcomment.height}" width="200" />
<view name="_users" width="300" y="${30 + parent._roomcomment.y + parent._roomcomment.height}"
- height="${ parent.height - parent._users.y }" bgcolor="0xE0E0E0">
+ height="${ parent.height - parent._users.y }" bgcolor="$once{ canvas.getThemeColor('secondBorderColor') }">
<method name="clearList">
for (var eg in this._users._cbtext.subviews)
this._users._cbtext.subviews[eg].destroy();
@@ -188,23 +188,6 @@
</view>
</view>
- <!--
-
- <labelText name="chat_label" y="230" labelid="405" />
- <view name="_chat" y="250" height="270" >
- <view name="_chatoutputborder" height="${ parent.height-48 }"
- bgcolor="$once{ canvas.basebgcolorizer }" width="300">
- <chatOutputRoomsList name="_chatoutput" x="1" y="1" >
- <handler name="oninit">
- canvas._chatcontentRPC = this;
- </handler>
- </chatOutputRoomsList>
- </view>
- <chatTabBottomRoomList name="_chattabbottom" x="0" width="300"
- y="${ parent.height-46 }" />
- </view>
- -->
-
</class>
</library>
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=1309491&r1=1309490&r2=1309491&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 Wed Apr 4 17:02:40 2012
@@ -20,7 +20,7 @@
-->
<library>
-<class name="simplebaseItemActivityList" extends="view" height="40" bgcolor="$once{ canvas.baseMouseOvercolorizer }">
+<class name="simplebaseItemActivityList" extends="view" height="40" bgcolor="$once{ canvas.getThemeColor('baseMouseOvercolorizer') }">
<attribute name="message" value="" type="string" />
@@ -61,7 +61,7 @@
</class>
-<class name="baseItemActivityList" extends="view" height="40" bgcolor="$once{ canvas.baseMouseOvercolorizer }">
+<class name="baseItemActivityList" extends="view" height="40" bgcolor="$once{ canvas.getThemeColor('baseMouseOvercolorizer') }">
<attribute name="message" value="" type="string" />
@@ -567,7 +567,7 @@
]]>
</method>
- <view name="_list" y="21" height="179" bgcolor="0xEEF0EB"
+ <view name="_list" y="21" height="179" bgcolor="$once{ canvas.getThemeColor('mainBackgroundColor') }"
width="$once{ parent.width }" clip="true">
<view name="_list">
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=1309491&r1=1309490&r2=1309491&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 Wed Apr 4 17:02:40 2012
@@ -20,7 +20,7 @@
-->
<library>
-<class name="conferenceRoomSidebar" extends="view" width="280" bgcolor="0xEEF0EB"
+<class name="conferenceRoomSidebar" extends="view" width="280" bgcolor="$once{ canvas.getThemeColor('mainBackgroundColor') }"
height="${ canvas.height - ((canvas.currentRoomObj.hideTopBar) ? 0:28) }" y="0" clip="true">
<attribute name="selected" value="null" />
@@ -67,10 +67,10 @@
</method>
<view name="borderBarTop" y="0"
- width="${ parent.width }" bgcolor="0xCCCCCC" height="1" />
+ width="${ parent.width }" bgcolor="$once{ canvas.getThemeColor('mainBorderColor') }" 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" />
+ width="${ parent.width }" bgcolor="$once{ canvas.getThemeColor('mainBorderColor') }" height="1" />
<view name="_head" y="1" width="${ parent.width-10 }" height="32"
layout="axis:x;spacing:2;inset:2" >