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/12 13:59:09 UTC
svn commit: r1325212 - in
/incubator/openmeetings/trunk/singlewebapp/WebContent: openmeetings/
openmeetings/public/themes/basic-theme/conference/
openmeetings/public/themes/basic-theme/whiteboard/
src/modules/conference/conference/ src/modules/conferen...
Author: sebawagner
Date: Thu Apr 12 11:59:08 2012
New Revision: 1325212
URL: http://svn.apache.org/viewvc?rev=1325212&view=rev
Log:
OPENMEETINGS-129 Fix Exit icon, replace clear whiteboard icon
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/conference/exit_button.fla (with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/conference/exit_button.png (with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/whiteboard/delete_all.fla (with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/whiteboard/delete_all.png (with props)
Removed:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/resources/
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/default-theme.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/library.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/roomListItem.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=1325212&r1=1325211&r2=1325212&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/default-theme.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/default-theme.xml Thu Apr 12 11:59:08 2012
@@ -113,8 +113,8 @@
<resource name="plain"
description="Toolbar Icon"
- license="FamFam Icon Set"
- src="public/themes/basic-theme/whiteboard/cancel.png" />
+ license="APL author sebawagner"
+ src="public/themes/basic-theme/whiteboard/delete_all.png" />
<resource name="plainSlides"
description="Toolbar Icon"
@@ -282,6 +282,11 @@
<resource name="files_tab_btn"
description="Conference Room Tab Files"
license="FamFam Icon Set"
- src="public/themes/basic-theme/conference/folder_explore.png" />
+ src="public/themes/basic-theme/conference/folder_explore.png" />
+
+ <resource name="exit_btn_rsc"
+ description="Conference Room Tab Icon"
+ license="APL author sebawagner"
+ src="public/themes/basic-theme/conference/exit_button.png" />
</theme>
\ No newline at end of file
Added: incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/conference/exit_button.fla
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/conference/exit_button.fla?rev=1325212&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/conference/exit_button.fla
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/conference/exit_button.png
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/conference/exit_button.png?rev=1325212&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/conference/exit_button.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/whiteboard/delete_all.fla
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/whiteboard/delete_all.fla?rev=1325212&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/whiteboard/delete_all.fla
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/whiteboard/delete_all.png
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/whiteboard/delete_all.png?rev=1325212&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/whiteboard/delete_all.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
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=1325212&r1=1325211&r2=1325212&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 Thu Apr 12 11:59:08 2012
@@ -115,7 +115,7 @@
<view width="${ parent.width-1 }" bgcolor="0xFFFFFF" opacity="0.4" height="$once{ parent.height - 2}" y="1"
visibility="hidden" name="bgc"/>
- <view resource="exit_btn_rsc" y="4" x="4" />
+ <image src="$once{ canvas.getThemeImage( 'exit_btn_rsc' ) }" y="4" x="4" />
<view width="1" height="${ parent.height }" y="0" bgcolor="0xEEEEEE" x="${ parent.width-1 }" />
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/library.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/library.lzx?rev=1325212&r1=1325211&r2=1325212&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/library.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/library.lzx Thu Apr 12 11:59:08 2012
@@ -20,9 +20,6 @@
-->
<library>
- <resource name="messagebox_info_big_rsc" src="resources/messagebox_info.png" />
- <resource name="exit_btn_rsc" src="resources/exit.png" />
-
<include href="roomListItem.lzx" />
<include href="roomListDetails.lzx" />
<include href="conferenceMenubar.lzx" />
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=1325212&r1=1325211&r2=1325212&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 Thu Apr 12 11:59:08 2012
@@ -20,8 +20,6 @@
-->
<library>
- <resource name="waitcursor" src="resources/lzwaitcursor_rsc.swf"/>
-
<class name="roomListItem" extends="view" bgcolor="$once{ canvas.bgColorMenuItems }"
height="50" onmouseover="" onmouseout="" width="478" >
@@ -192,8 +190,6 @@
<![CDATA[
if (parent.parent.parent.parent.parent.parent.parent.parent.finishedTabsQuantity < 3) {
parent.parent.parent.parent.parent.parent.parent.parent.clickedButton = _clicked;
-
- lz.Cursor.setCursorGlobal("waitcursor");
} else {
checkForMaxUsers = true;
getRoomClientsListByRoomId.doCall();