Author: sebawagner
Date: Sat Apr 7 13:40:24 2012
New Revision: 1310768
URL: http://svn.apache.org/viewvc?rev=1310768&view=rev
Log:
OPENMEETINGS-129 add warning icon from popup dialog
OPENMEETINGS-80 fixes: Application is freezed when user clicks on cancel or on
the top icon to close the popup window to exit the room
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/error.png
(with props)
Removed:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/modules/conference/popups/commonPopupAdapter.lzx
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/default-theme.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/popups/confirmationSingle.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainAttributes.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/modules/conference/popups/confirmationSingleSWF10.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/modules/conference/popups/library.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=1310768&r1=1310767&r2=1310768&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/default-theme.xml
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/default-theme.xml
Sat Apr 7 13:40:24 2012
@@ -39,6 +39,11 @@
description="Icon for facebook button in login"
license="Unkown"
src="public/themes/basic-theme/auth/icon_facebook.png" />
+
+ <resource name="warning_popup_icon_rsc"
+ description="Toolbar Icon"
+ license="FamFam Icon Set"
+
src="public/themes/basic-theme/general/error.png" />
<!-- Save Toolbar (for example Admin section) -->
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/error.png
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/error.png?rev=1310768&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/themes/basic-theme/general/error.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
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=1310768&r1=1310767&r2=1310768&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
Sat Apr 7 13:40:24 2012
@@ -216,7 +216,17 @@
canvas.videoComp_lc.regExpResult = function(tId,tResult) {
t.regExpResult(tId,tResult);
}
-
+ canvas.videoComp_lc.exitRoom = function(confirm) {
+ if ($debug) Debug.write("confirm exitRoom:", confirm);
+ if (confirm) {
+
canvas.currentBaseConferenceRoom._screenSharingAdapter.closeAllScreenSharings();
+ if (canvas.appointmentNotificationPopUp != null) {
+ canvas.appointmentNotificationPopUp.destroy();
+ }
+ canvas.doActionmenu('quit');
+ }
+ }
+
mainBaseText.setAttribute('text',canvas.currentappname);
mainBaseText.setShadow();
mainBaseTextLabel.setAttribute('text',canvas.currentappnameurl);
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=1310768&r1=1310767&r2=1310768&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 Apr 7 13:40:24 2012
@@ -110,16 +110,6 @@
</handler>
<handler name="onclick">
canvas._videocontainer._videoviewcontent.exitRoom();
- canvas.videoComp_lc.exitRoom = function(confirm) {
- if ($debug) Debug.write("confirm exitRoom:", confirm);
- if (confirm) {
-
canvas.currentBaseConferenceRoom._screenSharingAdapter.closeAllScreenSharings();
- if (canvas.appointmentNotificationPopUp != null) {
- canvas.appointmentNotificationPopUp.destroy();
- }
- canvas.doActionmenu('quit');
- }
- }
</handler>
<view width="${ parent.width-1 }" bgcolor="0xFFFFFF" opacity="0.4"
height="$once{ parent.height - 2}" y="1"
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/popups/confirmationSingle.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/popups/confirmationSingle.lzx?rev=1310768&r1=1310767&r2=1310768&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/popups/confirmationSingle.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/popups/confirmationSingle.lzx
Sat Apr 7 13:40:24 2012
@@ -33,7 +33,9 @@
<attribute name="doCalcPosition" value="true" type="number" />
- <view x="4" resource="warning_icon_rsc" y="24" />
+ <attribute name="iconResource" value="warning_popup_icon_rsc"
type="string" />
+
+ <image x="4" src="$once{ canvas.getThemeImage(parent.iconResource) }"
y="24" />
<labelText labelid="$once{ parent.labeliderror }" y="24"
width="$once{ parent.width - 40 }"
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainAttributes.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainAttributes.lzx?rev=1310768&r1=1310767&r2=1310768&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainAttributes.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainAttributes.lzx
Sat Apr 7 13:40:24 2012
@@ -83,10 +83,4 @@
<attribute name="interviewPod2_x" value="644" type="number" />
<attribute name="interviewPod2_y" value="28" type="number" />
- <!--
- Popup dialogs attributes
- -->
- <attribute name="exitDialog" value="null" />
- <attribute name="closeWhiteboardDialog" value="null" />
-
</library>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx?rev=1310768&r1=1310767&r2=1310768&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx
Sat Apr 7 13:40:24 2012
@@ -34,8 +34,7 @@
<attribute name="offsetLength" type="number" value="40"/>
<attribute name="videoWidth" type="number" value="132"/>
<attribute name="videoHeight" type="number" value="132"/>
- <attribute name="popupAdapter"/>
-
+
<handler name="oninit">
<![CDATA[
@@ -72,7 +71,6 @@
lc.client = client;
canvas.setAttribute("lc", lc);
- popupAdapter = new lz.commonPopupAdapter();
]]>
</handler>
@@ -454,7 +452,17 @@
-->
<method name="exitRoom">
if ($debug) Debug.write("exitRoom");
- popupAdapter.exitRoom();
+ new lz.confirmationSingleSWF10(canvas,{
+ refObj:this,
+ labelid:791,
+ labeliderror:790,
+ refReturnMethod:'exitConfirmMethod',
+ showCheckBox:false
+ });
+ </method>
+
+ <method name="exitConfirmMethod" args="bool,sharedObjectData">
+ canvas.videoComp_lc.send(canvas.videoComp_lc_name, 'exitRoom', bool);
</method>
<!---
@@ -462,7 +470,20 @@
-->
<method name="closeWhiteboard">
if ($debug) Debug.write("closeWhiteboard");
- popupAdapter.closeWhiteboard();
+ if (canvas.ismoderator || canvas.isAllowedToDraw) {
+ canvas.closeWhiteboardDialog = new
lz.confirmationSingleSWF10(canvas,{
+ refObj:this,
+ labeliderror:1313,
+ refReturnMethod:'closeWhiteboardConfirmMethod',
+ showCheckBox:false
+ });
+ } else {
+ new lz.labelerrorPopupSWF10(canvas,{labelid:1366,
errorlabelid:1365});
+ }
+ </method>
+
+ <method name="closeWhiteboardConfirmMethod" args="bool,sharedObjectData">
+ canvas.videoComp_lc.send(canvas.videoComp_lc_name, 'closeWhiteboard',
bool);
</method>
<!--
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/modules/conference/popups/confirmationSingleSWF10.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/modules/conference/popups/confirmationSingleSWF10.lzx?rev=1310768&r1=1310767&r2=1310768&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/modules/conference/popups/confirmationSingleSWF10.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/modules/conference/popups/confirmationSingleSWF10.lzx
Sat Apr 7 13:40:24 2012
@@ -32,8 +32,10 @@
<attribute name="labeliderror" value="0" type="number" />
<attribute name="result" type="bool"/>
+
+ <attribute name="iconResource" value="warning_popup_icon_rsc"
type="string" />
- <view x="4" resource="warning_icon_rsc" y="24" />
+ <image x="4" src="$once{ canvas.getThemeImage(parent.iconResource) }"
y="24" />
<labelText labelid="$once{ parent.labeliderror }" y="24"
width="$once{ parent.width - 40 }"
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=1310768&r1=1310767&r2=1310768&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 Apr 7 13:40:24 2012
@@ -26,7 +26,6 @@
-->
<resource name="warning_icon_rsc" src="resources/warning.png" />
- <include href="commonPopupAdapter.lzx" />
<include href="confirmationSingleSWF10.lzx" />
<include href="errorPopupSWF10.lzx" />
