Author: sebawagner
Date: Tue Apr 3 18:02:36 2012
New Revision: 1309078
URL: http://svn.apache.org/viewvc?rev=1309078&view=rev
Log:
OPENMEETINGS-128 More cleaned up icon folders Part6
OPENMEETINGS-130 Basic mechanism, re-factored some of the icons to runtime
loading
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/default-theme.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/auth/
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/auth/icon_facebook.png
(with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/arrow_refresh.png
(with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/cancel_icon.fla
(with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/cancel_icon.png
(with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/disk.png
(with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/plus_icon.fla
(with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/plus_icon.png
(with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/reload_page.png
(with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/miniIcons.lzx
Removed:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/auth/icon_facebook.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/button/resources/menuseperator.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/resources/1leftarrow.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/resources/1rightarrow.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/resources/audio-volume-high.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/resources/button_cancel.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/resources/buttons/
incubator/openmeetings/trunk/singlewebapp/WebContent/src/resources/cancel_icon.fla
incubator/openmeetings/trunk/singlewebapp/WebContent/src/resources/cancel_icon.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/resources/dis_playn_over.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/resources/dis_recordn_over.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/resources/dis_stopn_over.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/resources/edit_add.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/resources/edit_remove.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/resources/editdelete.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/resources/emblem-unreadable.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/resources/filesave.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/resources/kaboodleloop.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/resources/ksirc.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/resources/kuser.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/resources/ledred.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/resources/list-add.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/resources/list-remove.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/resources/loudness.swf
incubator/openmeetings/trunk/singlewebapp/WebContent/src/resources/loudnessBig.swf
incubator/openmeetings/trunk/singlewebapp/WebContent/src/resources/loudnessRecorder.swf
incubator/openmeetings/trunk/singlewebapp/WebContent/src/resources/no_playn_over.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/resources/no_recordn_up.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/resources/noatunplay.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/resources/noatunstop.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/resources/player_play.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/resources/playn_down.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/resources/playn_over.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/resources/playn_up.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/resources/plus_icon.fla
incubator/openmeetings/trunk/singlewebapp/WebContent/src/resources/plus_icon.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/resources/recordn_down.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/resources/recordn_over.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/resources/recordn_up.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/resources/reload.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/resources/reload_page.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/resources/save_all.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/resources/stopn_down.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/resources/stopn_over.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/resources/stopn_up.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/resources/title.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/resources/ui_drafts/
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/auth/checkLoginData.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/auth/library.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/button/baseChooseIcon.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/library.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/simplevaluelist/recordValueList.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainDatasets.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/orgadmin/orgAdminValueForm.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/roomadmin/roomValueForm.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/useradmin/userAdminValueForm.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/chatParticipants.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/inviteuser/roomListInviteUserItem.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/overAllChatTabBottom.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/roomListItem.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participantList.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/polls/resultPollWin.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/chatTabBottom.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/chatTabItemEmoticons.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/panels/maintoolspanel/subMenuIconToolsToUpload.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/privatemessages/pendingUserStatus.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/privatemessages/privateMessageFolder.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/searchuserprofile/searchUserProfileListItem.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/usercontacts/contactsListItem.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/usercontacts/pendingContactsListItem.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/resources/library.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/miniIcons.lzx
Added:
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=1309078&view=auto
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/default-theme.xml
(added)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/default-theme.xml
Tue Apr 3 18:02:36 2012
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<theme>
+
+ <resource name="icon_facebook_rsc_png"
+ description="Icon for facebook button in login"
+ license="Unkown"
+
src="public/themes/basic-theme/auth/icon_facebook.png" />
+
+ <resource name="filesave_rsc"
+ description="Save Icon"
+ license="FamFam Icon Set"
+
src="public/themes/basic-theme/general/disk.png" />
+
+ <resource name="edit_add_rsc"
+ description="Save Icon"
+ license="APL Author sebawagner"
+
src="public/themes/basic-theme/general/plus_icon.png" />
+
+ <resource name="reload_rsc"
+ description="Save Icon"
+ license="FamFam Icon Set"
+
src="public/themes/basic-theme/general/arrow_refresh.png" />
+
+ <resource name="button_cancel_rsc"
+ description="Save Icon"
+ license="APL Author sebawagner"
+
src="public/themes/basic-theme/general/cancel_icon.png" />
+
+ <resource name="edit_add_rsc"
+ description="Edit Add Icon"
+ license="APL Author sebawagner"
+ src="public/themes/basic-theme/general/add.png"
/>
+
+
+</theme>
\ No newline at end of file
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/auth/icon_facebook.png
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/auth/icon_facebook.png?rev=1309078&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/auth/icon_facebook.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/arrow_refresh.png
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/arrow_refresh.png?rev=1309078&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/arrow_refresh.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/cancel_icon.fla
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/cancel_icon.fla?rev=1309078&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/cancel_icon.fla
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/cancel_icon.png
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/cancel_icon.png?rev=1309078&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/cancel_icon.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/disk.png
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/disk.png?rev=1309078&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/disk.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/plus_icon.fla
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/plus_icon.fla?rev=1309078&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/plus_icon.fla
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/plus_icon.png
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/plus_icon.png?rev=1309078&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/plus_icon.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/reload_page.png
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/reload_page.png?rev=1309078&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/reload_page.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=1309078&r1=1309077&r2=1309078&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/auth/checkLoginData.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/auth/checkLoginData.lzx
Tue Apr 3 18:02:36 2012
@@ -261,7 +261,7 @@
<simpleLabelButton labelid="1294" name="_facebook" width="120" y="$once{
parent.height-40 }"
visible="false" x="200" height="22">
- <view resource="icon_facebook_rsc_png" x="2" y="1"></view>
+ <image src="$once{ canvas.getThemeImage('icon_facebook_rsc_png') }"
x="2" y="1" />
<handler name="onclick">
lz.Browser.loadURL("http://apps.facebook.com/openmeetings/","_parent";);
</handler>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/auth/library.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/auth/library.lzx?rev=1309078&r1=1309077&r2=1309078&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/auth/library.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/auth/library.lzx
Tue Apr 3 18:02:36 2012
@@ -21,8 +21,6 @@
<!DOCTYPE library SYSTEM "/project.dtd">
<library >
- <resource name="icon_facebook_rsc_png" src="icon_facebook.png" />
-
<include href="resetForm.lzx" />
<include href="checkLoginData.lzx" />
<include href="registerNewUser.lzx" />
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=1309078&r1=1309077&r2=1309078&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
Tue Apr 3 18:02:36 2012
@@ -20,16 +20,12 @@
-->
<library>
-<resource name="menuseperator_rsc" src="resources/menuseperator.png" />
-
<resource name="background_drawchoose_rsc">
<frame src="resources/menudraw_up.png" />
<frame src="resources/menudraw_over.png" />
<frame src="resources/menudraw_down.png" />
</resource>
-<class name="baseMenuSeperator" resource="menuseperator_rsc" extends="view" />
-
<class name="baseChooseIcon" extends="view" width="24" height="24"
bgcolor="$once{ canvas.basebgcolorizer }" >
<attribute name="resourceN" value="" type="string" />
@@ -37,7 +33,7 @@
<view name="_bg" x="1" y="1" height="$once{ parent.height - 2 }"
width="$once{ parent.width - 2 }" bgcolor="$once{
canvas.baseMousecolorizer }" />
- <view name="_icon" resource="$once{ parent.resourceN }"
+ <image name="_icon" src="$once{ canvas.getThemeImage(parent.resourceN) }"
x="$once{ (parent.width-this.width) / 2 }"
y="$once{ (parent.height-this.height) / 2 }"
width="18" height="18" stretches="both"/>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/library.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/library.lzx?rev=1309078&r1=1309077&r2=1309078&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/library.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/library.lzx
Tue Apr 3 18:02:36 2012
@@ -21,7 +21,7 @@
<library>
-
+ <include href="miniIcons.lzx" />
<include href="iconView.lzx" />
<include href="miniIconsNew.lzx" />
<include href="resetCombobox.lzx" />
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/miniIcons.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/miniIcons.lzx?rev=1309078&view=auto
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/miniIcons.lzx
(added)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/miniIcons.lzx
Tue Apr 3 18:02:36 2012
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<library>
+
+<class name="miniIcons" extends="view" stretches="both">
+ <attribute name="showhandcursor" value="true" type="boolean" />
+ <handler name="onmouseover">
+ if (this.showhandcursor) {
+ this.setAttribute("x",this.x-1);
+ this.setAttribute("y",this.y-1);
+ this.setAttribute("height",this.height+2);
+ this.setAttribute("width",this.width+2);
+ }
+ parent.parent.onmouseover.sendEvent();
+ </handler>
+ <handler name="onmouseout">
+ if (this.showhandcursor) {
+ this.setAttribute("x",this.x+1);
+ this.setAttribute("y",this.y+1);
+ this.setAttribute("height",this.height-2);
+ this.setAttribute("width",this.width-2);
+ }
+ parent.parent.onmouseout.sendEvent();
+ </handler>
+</class>
+
+<class name="miniIconsImage" extends="image" stretches="both">
+ <attribute name="showhandcursor" value="true" type="boolean" />
+ <handler name="onmouseover">
+ if (this.showhandcursor) {
+ this.setAttribute("x",this.x-1);
+ this.setAttribute("y",this.y-1);
+ this.setAttribute("height",this.height+2);
+ this.setAttribute("width",this.width+2);
+ }
+ parent.parent.onmouseover.sendEvent();
+ </handler>
+ <handler name="onmouseout">
+ if (this.showhandcursor) {
+ this.setAttribute("x",this.x+1);
+ this.setAttribute("y",this.y+1);
+ this.setAttribute("height",this.height-2);
+ this.setAttribute("width",this.width-2);
+ }
+ parent.parent.onmouseout.sendEvent();
+ </handler>
+</class>
+
+</library>
\ No newline at end of file
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/simplevaluelist/recordValueList.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/simplevaluelist/recordValueList.lzx?rev=1309078&r1=1309077&r2=1309078&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/simplevaluelist/recordValueList.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/simplevaluelist/recordValueList.lzx
Tue Apr 3 18:02:36 2012
@@ -33,7 +33,8 @@
this.parent.parent.parent.parent.parent.itemToDelete=this;
this.parent.parent.parent.parent.parent.deleteItem.sendEvent(parent);
</method>
- <view resource="button_cancel_rsc" align="center"
valign="middle" />
+ <image src="$once{ canvas.getThemeImage('button_cancel_rsc') }"
+ align="center" valign="middle" />
<labelTooltip labelid="274" />
</view>
</class>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainDatasets.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainDatasets.lzx?rev=1309078&r1=1309077&r2=1309078&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainDatasets.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainDatasets.lzx
Tue Apr 3 18:02:36 2012
@@ -24,7 +24,7 @@
<library>
<!-- get values from config.xml -->
-<dataset type="http" name="myConfigSet" request="false"
ondata="canvas.myinit()">
+<dataset type="http" name="myConfigSet" request="false"
ondata="parent.mainTheme.loadTheme()">
<handler name="oninit">
var d = new Date();
this.setAttribute("src","config.xml?random="+d.getTime());
@@ -41,4 +41,22 @@
</handler>
</dataset>
+<!-- get values from config.xml -->
+<dataset type="http" name="mainTheme" request="false" ondata="canvas.myinit()">
+ <method name="loadTheme">
+ var d = new Date();
+ this.setAttribute("src","default-theme.xml?random="+d.getTime());
+ this.doRequest();
+ </method>
+ <handler name="ondata">
+ if ($debug) Debug.write("ondata");
+ </handler>
+ <handler name="onerror" args="e">
+ if ($debug) Debug.write("onerror",e);
+ </handler>
+ <handler name="ontimeout" args="e">
+ if ($debug) Debug.write("ontimeout",e);
+ </handler>
+</dataset>
+
</library>
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=1309078&r1=1309077&r2=1309078&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
Tue Apr 3 18:02:36 2012
@@ -1010,5 +1010,13 @@
<method name="checkRegExpResult" args="tId">
return this.regExpResultArray[tId];
</method>
-
+
+
+ <method name="getThemeImage" args="tName">
+ 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);
+ return tPath;
+ </method>
+
</library>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/orgadmin/orgAdminValueForm.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/orgadmin/orgAdminValueForm.lzx?rev=1309078&r1=1309077&r2=1309078&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/orgadmin/orgAdminValueForm.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/orgadmin/orgAdminValueForm.lzx
Tue Apr 3 18:02:36 2012
@@ -146,16 +146,6 @@
}
</method>
- <!--
- <baseChooseIcon resourceN="button_cancel_rsc" labelid="179" y="100"
x="430"
- onclick="new
lz.confirmDeleteWindow(canvas.main_content._content.inner,{refObj:this});" >
- <method name="confirmDelete">
- if (this.parent._userlist._selected!=null)
- for (var i in this.parent._userlist._selected)
this.parent._userlist.removeItem(this.parent._userlist._selected[i].value);
- </method>
- </baseChooseIcon>
- -->
-
</class>
</library>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/roomadmin/roomValueForm.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/roomadmin/roomValueForm.lzx?rev=1309078&r1=1309077&r2=1309078&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/roomadmin/roomValueForm.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/roomadmin/roomValueForm.lzx
Tue Apr 3 18:02:36 2012
@@ -458,17 +458,6 @@
</method>
</simpleTurnOverList>
- <!-- 176:remove organisation
- <baseChooseIcon resourceN="button_cancel_rsc" labelid="176" y="320"
x="370" width="20" height="20"
- onclick="new
lz.confirmDeleteWindow(canvas.main_content._content.inner,{refObj:this});" >
- <method name="confirmDelete">
- if (this.parent._organisationslist._selected!=null)
- for (var i in
this.parent._organisationslist._selected)
this.parent._organisationslist.removeItem(this.parent._organisationslist._selected[i].value);
- </method>
- </baseChooseIcon>
- -->
-
-
<!-- Limitations -->
<labelText labelid="830" width="200" y="500" fontstyle="bold"
resize="false" x="2"/>
@@ -772,7 +761,7 @@
<method name="sendConfirmation">
this.parent.destroy();
</method>
- <view resource="button_cancel_rsc" align="center" valign="middle" />
+ <image src="$once{ canvas.getThemeImage('button_cancel_rsc') }"
align="center" valign="middle" />
<labelTooltip labelid="274" />
</view>
@@ -806,7 +795,8 @@
<method name="sendConfirmation">
this.parent.destroy();
</method>
- <view resource="button_cancel_rsc" align="center" valign="middle" />
+ <image src="$once{ canvas.getThemeImage('button_cancel_rsc') }"
+ align="center" valign="middle" />
<labelTooltip labelid="274" />
</view>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/useradmin/userAdminValueForm.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/useradmin/userAdminValueForm.lzx?rev=1309078&r1=1309077&r2=1309078&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/useradmin/userAdminValueForm.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/useradmin/userAdminValueForm.lzx
Tue Apr 3 18:02:36 2012
@@ -313,26 +313,26 @@
<labelText labelid="143" width="200" y="40" resize="false"
fontstyle="bold" />
<labelText labelid="132" width="200" y="70" resize="false" x="2"/>
- <customEdittext name="username" y="70" x="120" width="270" text="" />
+ <customEdittext name="username" y="70" x="120" width="270" />
<labelText labelid="133" width="200" y="100" resize="false" x="2"/>
- <customEdittext name="userpass1" y="100" password="true" x="120"
width="270" text="" />
+ <customEdittext name="userpass1" y="100" password="true" x="120"
width="270" />
<labelText labelid="135" width="200" y="130" resize="false" x="2"/>
<resetCombobox name="salutation" width="100" y="130" x="120"
editable="false" fontsize="11">
<handler name="oninit" >
<![CDATA[
- for (var i=0;i<canvas.salutationsInitValues.length;i++){
-
this.addItem(canvas.salutationsInitValues[i].label.value,canvas.salutationsInitValues[i].salutations_id);
- }
-
this.selectItem(String(canvas.salutationsInitValues[0].salutations_id));
+ for (var
i=0;i<canvas.salutationsInitValues.length;i++){
+
this.addItem(canvas.salutationsInitValues[i].label.value,canvas.salutationsInitValues[i].salutations_id);
+ }
+
this.selectItem(String(canvas.salutationsInitValues[0].salutations_id));
]]>
</handler>
</resetCombobox>
- <customEdittext name="firstname" y="130" x="230" width="160" text="" />
+ <customEdittext name="firstname" y="130" x="230" width="160" />
<labelText labelid="136" width="200" y="160" resize="false" x="2"/>
- <customEdittext name="lastname" y="160" x="120" width="270" text="" />
+ <customEdittext name="lastname" y="160" x="120" width="270" />
<labelText labelid="1143" width="200" y="190" resize="false" x="2"/>
<resetCombobox name="_timeZone" editable="false" y="190" width="270"
x="120"
@@ -365,25 +365,22 @@
<labelText labelid="1148" width="200" y="280" resize="false" x="2"/>
<labelCheckbox name="forceTimeZoneCheck" width="270" y="280" x="130"
fontsize="11" />
-
<labelText labelid="137" width="200" y="310" resize="false" x="2"/>
- <customEdittext name="email" y="310" x="120" width="310"
regexpType="email"
- text="" />
+ <customEdittext name="email" y="310" x="120" width="270"
regexpType="email" />
<labelText labelid="607" width="200" y="340" resize="false" x="2"/>
- <customEdittext name="phone" y="340" x="120" width="270"
- text="" />
+ <customEdittext name="phone" y="340" x="120" width="270" />
<labelText labelid="138" width="200" y="370" resize="false" x="2"/>
- <dateField name="age" y="370" x="120" width="270" text="" />
+ <dateField name="age" y="370" x="120" width="270" />
<labelText labelid="139" width="200" y="400" resize="false" x="2"/>
- <customEdittext name="street" y="400" x="120" width="220" text="" />
- <customEdittext name="house" y="400" x="350" width="40" text="" />
+ <customEdittext name="street" y="400" x="120" width="220" />
+ <customEdittext name="house" y="400" x="350" width="40" />
<labelText labelid="140" width="200" y="430" resize="false" x="2"/>
- <customEdittext name="zip" y="430" x="120" width="70" text="" />
- <customEdittext name="town" y="430" x="200" width="190" text="" />
+ <customEdittext name="zip" y="430" x="120" width="70" />
+ <customEdittext name="town" y="430" x="200" width="190" />
<labelText labelid="141" width="200" y="460" resize="false" x="2"/>
<dynamicCombobox name="state" width="270" y="460" x="120"
@@ -416,7 +413,7 @@
<labelText labelid="142" width="200" y="550" resize="false" x="2"/>
<customScrollEdittext name="adress_comment" y="550" x="120"
width="270"
- height="70" text="" />
+ height="70" />
<labelText labelid="161" width="200" y="630" resize="false" x="2"/>
<simpleValueList name="_organisationslist" y="630" x="120" width="270"
height="100"
@@ -485,11 +482,11 @@
<labelText labelid="1162" width="200" y="1040" resize="false" x="2"/>
<customScrollEdittext name="userOffers" y="1040" x="120" width="270"
- height="100" text="" />
+ height="100" />
<labelText labelid="1163" width="200" y="1150" resize="false" x="2"/>
<customScrollEdittext name="userSearchs" y="1150" x="120" width="270"
- height="100" text="" />
+ height="100" />
<view y="1440" />
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/chatParticipants.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/chatParticipants.lzx?rev=1309078&r1=1309077&r2=1309078&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/chatParticipants.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/chatParticipants.lzx
Tue Apr 3 18:02:36 2012
@@ -95,7 +95,7 @@
<text text="$once{ parent.username }" x="40" resize="false"
width="$once{ parent.width - 40 }" />
- <miniIcons name="add" resource="edit_add_rsc" width="16" height="16"
+ <miniIconsImage name="add" src="$once{
canvas.getThemeImage('edit_add_rsc') }" width="16" height="16"
y="20" x="$once{ parent.width - 80 }" showhandcursor="true">
<handler name="onclick">
if ($debug) Debug.write("Start Conference");
@@ -106,7 +106,7 @@
parent.requestUserToContactList.doCall();
</handler>
<labelTooltip labelid="1186" />
- </miniIcons>
+ </miniIconsImage>
<miniIcons name="private_message_add" resource="private_message_add_rsc"
width="16" height="16"
y="20" x="$once{ parent.width - 60 }" showhandcursor="true">
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/inviteuser/roomListInviteUserItem.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/inviteuser/roomListInviteUserItem.lzx?rev=1309078&r1=1309077&r2=1309078&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/inviteuser/roomListInviteUserItem.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/inviteuser/roomListInviteUserItem.lzx
Tue Apr 3 18:02:36 2012
@@ -133,11 +133,11 @@
<labelText text="$once{ parent.roomname }" />
<labelText name="_users" y="26" />
- <view name="_r" resource="reload_rsc" x="130" y="26"
+ <image name="_r" src="$once{ canvas.getThemeImage('reload_rsc')
}" x="130" y="26"
onclick="parent.getRoomClientsListByRoomId.doCall()" >
<labelTooltip labelid="402" />
- </view>
-
+ </image>
+
<method name="checkConditionsWhenButtonClicked" args="_clicked">
checkForMaxUsers = true;
getRoomClientsListByRoomId.doCall();
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/overAllChatTabBottom.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/overAllChatTabBottom.lzx?rev=1309078&r1=1309077&r2=1309078&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/overAllChatTabBottom.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/overAllChatTabBottom.lzx
Tue Apr 3 18:02:36 2012
@@ -138,13 +138,13 @@
<labelTooltip labelid="1200" />
</miniIcons>
- <miniIcons y="2" x="122" resource="button_cancel_rsc" width="16"
height="16"
- showhandcursor="true">
+ <miniIconsImage y="2" x="122" src="$once{
canvas.getThemeImage('button_cancel_rsc') }"
+ width="16" height="16"
showhandcursor="true">
<handler name="onclick">
parent.clearOverallChat.doCall();
</handler>
<labelTooltip labelid="442" />
- </miniIcons>
+ </miniIconsImage>
<netRemoteCallHib name="clearOverallChat"
funcname="chatservice.clearOverallChat"
remotecontext="$once{ canvas.thishib }" >
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/roomListItem.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/roomListItem.lzx?rev=1309078&r1=1309077&r2=1309078&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/roomListItem.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/roomListItem.lzx
Tue Apr 3 18:02:36 2012
@@ -183,10 +183,10 @@
<labelText text="$once{ parent.roomname }" />
<labelText name="_users" y="26" />
- <view name="_r" resource="reload_rsc" x="130" y="26"
+ <image name="_r" src="$once{ canvas.getThemeImage('reload_rsc')
}" x="130" y="26"
onclick="parent.getRoomClientsListByRoomId.doCall()" >
<labelTooltip labelid="402" />
- </view>
+ </image>
<method name="checkConditionsWhenButtonClicked" args="_clicked">
<
