Author: sebawagner
Date: Sat Mar 31 14:26:13 2012
New Revision: 1307813
URL: http://svn.apache.org/viewvc?rev=1307813&view=rev
Log:
OPENMEETINGS-80 Some notification windows need to be moved to SWF10 => Fix icons
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/popups/resources/warning.png
(with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/modules/conference/popups/resources/
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/modules/conference/popups/resources/warning.png
(with props)
Removed:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/popups/resources/messagebox_warning.png
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/popups/library.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/modules/conference/popups/library.lzx
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=1307813&r1=1307812&r2=1307813&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
Sat Mar 31 14:26:13 2012
@@ -211,7 +211,7 @@
<view name="_content" x="1" y="1"
layout="axis:y;spacing:1" bgcolor="0xEFEFEF" >
- <conferencDropDownMenuItem labelid="213"
command="cmd_importFile"
+ <conferencDropDownMenuItem labelid="15"
command="cmd_importFile"
enabled="${ canvas.ismoderator
}" />
</view>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/popups/library.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/popups/library.lzx?rev=1307813&r1=1307812&r2=1307813&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/popups/library.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/popups/library.lzx
Sat Mar 31 14:26:13 2012
@@ -20,7 +20,11 @@
-->
<library>
- <resource name="warning_icon_rsc"
src="resources/messagebox_warning.png" />
+ <!--
+ Source:
http://www.iconfinder.com/icondetails/36026/32/error_hazard_warning_icon
+ Creative Commons 3.0
+ -->
+ <resource name="warning_icon_rsc" src="resources/warning.png" />
<include href="rpcerrorDialog.lzx" />
<include href="errorPopup.lzx" />
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/popups/resources/warning.png
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/popups/resources/warning.png?rev=1307813&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/popups/resources/warning.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/modules/conference/popups/library.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/modules/conference/popups/library.lzx?rev=1307813&r1=1307812&r2=1307813&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/modules/conference/popups/library.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/modules/conference/popups/library.lzx
Sat Mar 31 14:26:13 2012
@@ -19,6 +19,12 @@
-->
<library>
+
+ <!--
+ Source:
http://www.iconfinder.com/icondetails/36026/32/error_hazard_warning_icon
+ Creative Commons 3.0
+ -->
+ <resource name="warning_icon_rsc" src="resources/warning.png" />
<include href="commonPopupAdapter.lzx" />
<include href="confirmationSingleSWF10.lzx" />
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/modules/conference/popups/resources/warning.png
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/modules/conference/popups/resources/warning.png?rev=1307813&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/modules/conference/popups/resources/warning.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
