Revision: 4582
Author: seba.wagner
Date: Thu Nov 17 07:53:53 2011
Log: Fixes issue 1575
http://code.google.com/p/openmeetings/source/detail?r=4582
Added:
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/flexibleConferenceRoom/resources/ledlightgreen.png
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/tabcontent/chat/baseTabChatPanel.lzx
Modified:
/trunk/singlewebapp/WebContent/languages/arabic.xml
/trunk/singlewebapp/WebContent/languages/bulgarian.xml
/trunk/singlewebapp/WebContent/languages/catalan.xml
/trunk/singlewebapp/WebContent/languages/chinese simplified.xml
/trunk/singlewebapp/WebContent/languages/chinese traditional.xml
/trunk/singlewebapp/WebContent/languages/czech.xml
/trunk/singlewebapp/WebContent/languages/danish.xml
/trunk/singlewebapp/WebContent/languages/deutsch (studIP).xml
/trunk/singlewebapp/WebContent/languages/deutsch.xml
/trunk/singlewebapp/WebContent/languages/dutch.xml
/trunk/singlewebapp/WebContent/languages/english.xml
/trunk/singlewebapp/WebContent/languages/finnish.xml
/trunk/singlewebapp/WebContent/languages/french.xml
/trunk/singlewebapp/WebContent/languages/galician.xml
/trunk/singlewebapp/WebContent/languages/greek.xml
/trunk/singlewebapp/WebContent/languages/hebrew.xml
/trunk/singlewebapp/WebContent/languages/hungarian.xml
/trunk/singlewebapp/WebContent/languages/indonesian.xml
/trunk/singlewebapp/WebContent/languages/italian.xml
/trunk/singlewebapp/WebContent/languages/japanese.xml
/trunk/singlewebapp/WebContent/languages/korean.xml
/trunk/singlewebapp/WebContent/languages/persian.xml
/trunk/singlewebapp/WebContent/languages/polish.xml
/trunk/singlewebapp/WebContent/languages/portugues brazil.xml
/trunk/singlewebapp/WebContent/languages/portugues.xml
/trunk/singlewebapp/WebContent/languages/russian.xml
/trunk/singlewebapp/WebContent/languages/slovak.xml
/trunk/singlewebapp/WebContent/languages/spanish.xml
/trunk/singlewebapp/WebContent/languages/swedish.xml
/trunk/singlewebapp/WebContent/languages/thai.xml
/trunk/singlewebapp/WebContent/languages/turkish.xml
/trunk/singlewebapp/WebContent/languages/ukrainian.xml
/trunk/singlewebapp/WebContent/openmeetings/base/mainAttributes.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/flexibleConferenceRoom/flexibleEventRoom.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/flexibleConferenceRoom/interviewConferenceRoom.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/flexibleConferenceRoom/library.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/tabbar/conferenceContainerTab.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/tabcontent/chat/chatOutput.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/tabcontent/chat/chatTab.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/tabcontent/chat/library.lzx
=======================================
--- /dev/null
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/flexibleConferenceRoom/resources/ledlightgreen.png
Thu Nov 17 07:53:53 2011
Binary file, no diff available.
=======================================
--- /dev/null
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/tabcontent/chat/baseTabChatPanel.lzx
Thu Nov 17 07:53:53 2011
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<library>
+
+ <!--
+ #################################################
+ Provides functions to chat and extends the chat with the panel for
blinking
+ when new messages arrive when the tab is closed
+ #################################################
+ -->
+
+ <class name="baseTabChatPanel" extends="basePropertyPanel">
+
+ <attribute name="fadeDelegate" value="null" />
+ <attribute name="doBlink" value="false" type="boolean" />
+
+ <handler name="oninit">
+ this.fadeDelegate = new LzDelegate( this, "showText" );
+ </handler>
+
+ <handler name="onisopen" args="o">
+ if ($debug) Debug.write("onisopen",o);
+ if (o) {
+ canvas._chatcontent.doInitByOpen();
+ this.doBlink = false;
+
this._newMessage.setAttribute("visibility","hidden");
+ this._newMessage.setAttribute( "opacity", 0 );
+
this.content.setAttribute("visibility","visible");
+ } else {
+
this.content.setAttribute("visibility","hidden");
+ }
+ </handler>
+
+ <method name="startBlink">
+ if ($debug) Debug.write("startBlink",this.opacity);
+ if (this.isopen) return;
+ if (this.doBlink) {
+ if ($debug) Debug.write("doBlink already started
!!!");
+ } else {
+ if ($debug) Debug.write("doBlink");
+ this.doBlink = true;
+
this._newMessage.setAttribute("visibility","visible");
+ lz.Timer.addTimer( this.fadeDelegate , 1000 );
+ }
+ </method>
+
+ <method name="showText">
+ if (this.doBlink) {
+ if ($debug)
Debug.write("showText",this._newMessage.opacity);
+ lz.Timer.addTimer( this.fadeDelegate , 1000 );
+ if (this._newMessage.opacity == 0) {
+ this._newMessage.animate( "opacity",
1.0, 400 );
+ } else {
+ this._newMessage.animate( "opacity", 0,
400 );
+ }
+ } else {
+
this._newMessage.setAttribute("visibility","hidden");
+ }
+ </method>
+
+ <chatTab name="content" y="22" height="${ parent.height-22 }"
+ visibility="hidden" width="${ parent.width }" />
+
+ <labelText labelid="1199" x="${ parent.width - this.width }"
bgcolor="0xFFFFFF"
+ y="2" fontsize="10" fontstyle="bold" fgcolor="0xFF3300"
/>
+
+ <view name="_newMessage" y="0" x="${ parent.width-this.width }"
+ visibility="hidden">
+ <view x="1" y="2" resource="chat_message_incoming_rsc"
/>
+ <labelText x="22" y="2" fgcolor="0xFFFFFF"
fontstyle="bold"
+ labelid="1417" />
+ </view>
+
+ </class>
+
+</library>
=======================================
--- /trunk/singlewebapp/WebContent/languages/arabic.xml Wed Nov 16 06:36:51
2011
+++ /trunk/singlewebapp/WebContent/languages/arabic.xml Thu Nov 17 07:53:53
2011
@@ -4255,4 +4255,7 @@
<string id="1416" name="sign_up_validation">
<value>Please enter email</value>
</string>
+ <string id="1417" name="chat_notification">
+ <value>New message(s)</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/bulgarian.xml Wed Nov 16
06:36:51 2011
+++ /trunk/singlewebapp/WebContent/languages/bulgarian.xml Thu Nov 17
07:53:53 2011
@@ -4253,4 +4253,7 @@
<string id="1416" name="sign_up_validation">
<value>Please enter email</value>
</string>
+ <string id="1417" name="chat_notification">
+ <value>New message(s)</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/catalan.xml Wed Nov 16
06:36:51 2011
+++ /trunk/singlewebapp/WebContent/languages/catalan.xml Thu Nov 17
07:53:53 2011
@@ -4254,4 +4254,7 @@
<string id="1416" name="sign_up_validation">
<value>Please enter email</value>
</string>
+ <string id="1417" name="chat_notification">
+ <value>New message(s)</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/chinese simplified.xml Wed Nov
16 06:36:51 2011
+++ /trunk/singlewebapp/WebContent/languages/chinese simplified.xml Thu Nov
17 07:53:53 2011
@@ -4254,4 +4254,7 @@
<string id="1416" name="sign_up_validation">
<value>Please enter email</value>
</string>
+ <string id="1417" name="chat_notification">
+ <value>New message(s)</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/chinese traditional.xml Wed
Nov 16 06:36:51 2011
+++ /trunk/singlewebapp/WebContent/languages/chinese traditional.xml Thu
Nov 17 07:53:53 2011
@@ -4260,4 +4260,7 @@
<string id="1416" name="sign_up_validation">
<value>Please enter email</value>
</string>
+ <string id="1417" name="chat_notification">
+ <value>New message(s)</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/czech.xml Wed Nov 16 06:36:51
2011
+++ /trunk/singlewebapp/WebContent/languages/czech.xml Thu Nov 17 07:53:53
2011
@@ -4254,4 +4254,7 @@
<string id="1416" name="sign_up_validation">
<value>Please enter email</value>
</string>
+ <string id="1417" name="chat_notification">
+ <value>New message(s)</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/danish.xml Wed Nov 16 06:36:51
2011
+++ /trunk/singlewebapp/WebContent/languages/danish.xml Thu Nov 17 07:53:53
2011
@@ -4253,4 +4253,7 @@
<string id="1416" name="sign_up_validation">
<value>Please enter email</value>
</string>
+ <string id="1417" name="chat_notification">
+ <value>New message(s)</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/deutsch (studIP).xml Wed Nov
16 06:36:51 2011
+++ /trunk/singlewebapp/WebContent/languages/deutsch (studIP).xml Thu Nov
17 07:53:53 2011
@@ -4254,4 +4254,7 @@
<string id="1416" name="sign_up_validation">
<value>Please enter email</value>
</string>
+ <string id="1417" name="chat_notification">
+ <value>Neue Nachricht(en)</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/deutsch.xml Wed Nov 16
06:36:51 2011
+++ /trunk/singlewebapp/WebContent/languages/deutsch.xml Thu Nov 17
07:53:53 2011
@@ -4254,4 +4254,7 @@
<string id="1416" name="sign_up_validation">
<value>Bitte geben Sie eine EMail an</value>
</string>
+ <string id="1417" name="chat_notification">
+ <value>Neue Nachricht(en)</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/dutch.xml Wed Nov 16 06:36:51
2011
+++ /trunk/singlewebapp/WebContent/languages/dutch.xml Thu Nov 17 07:53:53
2011
@@ -4250,4 +4250,7 @@
<string id="1416" name="sign_up_validation">
<value>Please enter email</value>
</string>
+ <string id="1417" name="chat_notification">
+ <value>New message(s)</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/english.xml Wed Nov 16
06:36:51 2011
+++ /trunk/singlewebapp/WebContent/languages/english.xml Thu Nov 17
07:53:53 2011
@@ -4254,4 +4254,7 @@
<string id="1416" name="sign_up_validation">
<value>Please enter email</value>
</string>
+ <string id="1417" name="chat_notification">
+ <value>New message(s)</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/finnish.xml Wed Nov 16
06:36:51 2011
+++ /trunk/singlewebapp/WebContent/languages/finnish.xml Thu Nov 17
07:53:53 2011
@@ -4253,4 +4253,7 @@
<string id="1416" name="sign_up_validation">
<value>Please enter email</value>
</string>
+ <string id="1417" name="chat_notification">
+ <value>New message(s)</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/french.xml Wed Nov 16 06:36:51
2011
+++ /trunk/singlewebapp/WebContent/languages/french.xml Thu Nov 17 07:53:53
2011
@@ -4254,4 +4254,7 @@
<string id="1416" name="sign_up_validation">
<value>Please enter email</value>
</string>
+ <string id="1417" name="chat_notification">
+ <value>New message(s)</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/galician.xml Wed Nov 16
06:36:51 2011
+++ /trunk/singlewebapp/WebContent/languages/galician.xml Thu Nov 17
07:53:53 2011
@@ -4254,4 +4254,7 @@
<string id="1416" name="sign_up_validation">
<value>Please enter email</value>
</string>
+ <string id="1417" name="chat_notification">
+ <value>New message(s)</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/greek.xml Wed Nov 16 06:36:51
2011
+++ /trunk/singlewebapp/WebContent/languages/greek.xml Thu Nov 17 07:53:53
2011
@@ -4254,4 +4254,7 @@
<string id="1416" name="sign_up_validation">
<value>Please enter email</value>
</string>
+ <string id="1417" name="chat_notification">
+ <value>New message(s)</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/hebrew.xml Wed Nov 16 06:36:51
2011
+++ /trunk/singlewebapp/WebContent/languages/hebrew.xml Thu Nov 17 07:53:53
2011
@@ -4254,4 +4254,7 @@
<string id="1416" name="sign_up_validation">
<value>Please enter email</value>
</string>
+ <string id="1417" name="chat_notification">
+ <value>New message(s)</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/hungarian.xml Wed Nov 16
06:36:51 2011
+++ /trunk/singlewebapp/WebContent/languages/hungarian.xml Thu Nov 17
07:53:53 2011
@@ -4254,4 +4254,7 @@
<string id="1416" name="sign_up_validation">
<value>Please enter email</value>
</string>
+ <string id="1417" name="chat_notification">
+ <value>New message(s)</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/indonesian.xml Wed Nov 16
06:36:51 2011
+++ /trunk/singlewebapp/WebContent/languages/indonesian.xml Thu Nov 17
07:53:53 2011
@@ -4254,4 +4254,7 @@
<string id="1416" name="sign_up_validation">
<value>Please enter email</value>
</string>
+ <string id="1417" name="chat_notification">
+ <value>New message(s)</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/italian.xml Wed Nov 16
06:36:51 2011
+++ /trunk/singlewebapp/WebContent/languages/italian.xml Thu Nov 17
07:53:53 2011
@@ -4254,4 +4254,7 @@
<string id="1416" name="sign_up_validation">
<value>Please enter email</value>
</string>
+ <string id="1417" name="chat_notification">
+ <value>New message(s)</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/japanese.xml Wed Nov 16
06:36:51 2011
+++ /trunk/singlewebapp/WebContent/languages/japanese.xml Thu Nov 17
07:53:53 2011
@@ -4254,4 +4254,7 @@
<string id="1416" name="sign_up_validation">
<value>Please enter email</value>
</string>
+ <string id="1417" name="chat_notification">
+ <value>New message(s)</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/korean.xml Wed Nov 16 06:36:51
2011
+++ /trunk/singlewebapp/WebContent/languages/korean.xml Thu Nov 17 07:53:53
2011
@@ -4254,4 +4254,7 @@
<string id="1416" name="sign_up_validation">
<value>Please enter email</value>
</string>
+ <string id="1417" name="chat_notification">
+ <value>New message(s)</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/persian.xml Wed Nov 16
06:36:51 2011
+++ /trunk/singlewebapp/WebContent/languages/persian.xml Thu Nov 17
07:53:53 2011
@@ -4254,4 +4254,7 @@
<string id="1416" name="sign_up_validation">
<value>Please enter email</value>
</string>
+ <string id="1417" name="chat_notification">
+ <value>New message(s)</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/polish.xml Wed Nov 16 06:36:51
2011
+++ /trunk/singlewebapp/WebContent/languages/polish.xml Thu Nov 17 07:53:53
2011
@@ -4327,4 +4327,7 @@
<string id="1416" name="sign_up_validation">
<value>Please enter email</value>
</string>
+ <string id="1417" name="chat_notification">
+ <value>New message(s)</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/portugues brazil.xml Wed Nov
16 06:36:51 2011
+++ /trunk/singlewebapp/WebContent/languages/portugues brazil.xml Thu Nov
17 07:53:53 2011
@@ -4260,4 +4260,7 @@
<string id="1416" name="sign_up_validation">
<value>Please enter email</value>
</string>
+ <string id="1417" name="chat_notification">
+ <value>New message(s)</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/portugues.xml Wed Nov 16
06:36:51 2011
+++ /trunk/singlewebapp/WebContent/languages/portugues.xml Thu Nov 17
07:53:53 2011
@@ -4254,4 +4254,7 @@
<string id="1416" name="sign_up_validation">
<value>Please enter email</value>
</string>
+ <string id="1417" name="chat_notification">
+ <value>New message(s)</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/russian.xml Wed Nov 16
06:36:51 2011
+++ /trunk/singlewebapp/WebContent/languages/russian.xml Thu Nov 17
07:53:53 2011
@@ -4260,4 +4260,7 @@
<string id="1416" name="sign_up_validation">
<value>Please enter email</value>
</string>
+ <string id="1417" name="chat_notification">
+ <value>New message(s)</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/slovak.xml Wed Nov 16 06:36:51
2011
+++ /trunk/singlewebapp/WebContent/languages/slovak.xml Thu Nov 17 07:53:53
2011
@@ -4254,4 +4254,7 @@
<string id="1416" name="sign_up_validation">
<value>Please enter email</value>
</string>
+ <string id="1417" name="chat_notification">
+ <value>New message(s)</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/spanish.xml Wed Nov 16
06:36:51 2011
+++ /trunk/singlewebapp/WebContent/languages/spanish.xml Thu Nov 17
07:53:53 2011
@@ -4262,4 +4262,7 @@
<string id="1416" name="sign_up_validation">
<value>Please enter email</value>
</string>
+ <string id="1417" name="chat_notification">
+ <value>New message(s)</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/swedish.xml Wed Nov 16
06:36:51 2011
+++ /trunk/singlewebapp/WebContent/languages/swedish.xml Thu Nov 17
07:53:53 2011
@@ -4254,4 +4254,7 @@
<string id="1416" name="sign_up_validation">
<value>Please enter email</value>
</string>
+ <string id="1417" name="chat_notification">
+ <value>New message(s)</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/thai.xml Wed Nov 16 06:36:51
2011
+++ /trunk/singlewebapp/WebContent/languages/thai.xml Thu Nov 17 07:53:53
2011
@@ -4254,4 +4254,7 @@
<string id="1416" name="sign_up_validation">
<value>Please enter email</value>
</string>
+ <string id="1417" name="chat_notification">
+ <value>New message(s)</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/turkish.xml Wed Nov 16
06:36:51 2011
+++ /trunk/singlewebapp/WebContent/languages/turkish.xml Thu Nov 17
07:53:53 2011
@@ -4253,4 +4253,7 @@
<string id="1416" name="sign_up_validation">
<value>Please enter email</value>
</string>
+ <string id="1417" name="chat_notification">
+ <value>New message(s)</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/ukrainian.xml Wed Nov 16
06:36:51 2011
+++ /trunk/singlewebapp/WebContent/languages/ukrainian.xml Thu Nov 17
07:53:53 2011
@@ -4254,4 +4254,7 @@
<string id="1416" name="sign_up_validation">
<value>Please enter email</value>
</string>
+ <string id="1417" name="chat_notification">
+ <value>New message(s)</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/openmeetings/base/mainAttributes.lzx Mon
Nov 14 11:16:16 2011
+++ /trunk/singlewebapp/WebContent/openmeetings/base/mainAttributes.lzx Thu
Nov 17 07:53:53 2011
@@ -403,4 +403,6 @@
<attribute name="currentMicName" value="" type="string"/>
<attribute name="currentCamName" value="" type="string"/>
+<attribute name="currentBaseConferenceRoom" value="null" />
+
</library>
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx
Sun Sep 11 01:41:11 2011
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx
Thu Nov 17 07:53:53 2011
@@ -38,6 +38,8 @@
this.meetingTimer = new
lz.meetingTimer(canvas,{refObj:this,roomobj:this.roomobj});
}
}
+
+ canvas.currentBaseConferenceRoom = this;
this._chatPanelStrict.toggleopen();
@@ -46,6 +48,8 @@
<handler name="ontabcontentleave">
if ($debug) Debug.write("#################
ontabcontentleave:",this);
+ canvas.currentBaseConferenceRoom = null;
+
//reset the right to draw on WHiteboard as the RoomClient Object
will be destroyed also
//on server-Side the canDraw status will be false again when you
relogin the same room
canvas.isAllowedToDraw = true;
@@ -105,22 +109,10 @@
<conferenceRoomSidebar name="_sidePanel" />
- <basePropertyPanel name="_chatPanelStrict" labelid="616"
+ <baseTabChatPanel name="_chatPanelStrict" labelid="616"
height="200" x="${ parent._sidePanel.width }"
y="${ canvas.height - (this.height) - 28 }"
- width="${ canvas.width - parent._sidePanel.width }">
- <handler name="onisopen" args="o">
- if ($debug) Debug.write("onisopen",o);
- if (o) {
- canvas._chatcontent.doInitByOpen();
- this.content.setAttribute("visibility","visible");
- } else {
- this.content.setAttribute("visibility","hidden");
- }
- </handler>
- <chatTab name="content" y="22" height="${ parent.height-22 }"
visibility="hidden"
- width="${ parent.width }" />
- </basePropertyPanel>
+ width="${ canvas.width - parent._sidePanel.width }" />
<fixedFileExplorerWhiteboardPanel name="_whiteboard" labelid="615"
y="0" x="${ parent._sidePanel.width }" restricted="true"
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/flexibleConferenceRoom/flexibleEventRoom.lzx
Wed Sep 7 11:46:30 2011
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/flexibleConferenceRoom/flexibleEventRoom.lzx
Thu Nov 17 07:53:53 2011
@@ -36,6 +36,8 @@
this.meetingTimer = new
lz.meetingTimer(canvas,{refObj:this,roomobj:this.roomobj});
}
}
+
+ canvas.currentBaseConferenceRoom = this;
this._chatPanelStrict.toggleopen();
@@ -44,6 +46,8 @@
<handler name="ontabcontentleave">
if ($debug) Debug.write("#################
ontabcontentleave:",this);
+ canvas.currentBaseConferenceRoom = null;
+
//reset the right to draw on WHiteboard as the RoomClient Object
will be destroyed also
//on server-Side the canDraw status will be false again when you
relogin the same room
canvas.isAllowedToDraw = true;
@@ -103,22 +107,10 @@
<eventRoomSidebar name="_sidePanel" />
- <basePropertyPanel name="_chatPanelStrict" labelid="616"
+ <baseTabChatPanel name="_chatPanelStrict" labelid="616"
height="200" x="${ parent._sidePanel.width }"
y="${ canvas.height - (this.height) - 28 }"
- width="${ canvas.width - parent._sidePanel.width }">
- <handler name="onisopen" args="o">
- if ($debug) Debug.write("onisopen",o);
- if (o) {
- canvas._chatcontent.doInitByOpen();
- this.content.setAttribute("visibility","visible");
- } else {
- this.content.setAttribute("visibility","hidden");
- }
- </handler>
- <chatTab name="content" y="22" height="${ parent.height-22 }"
visibility="hidden"
- width="${ parent.width }" />
- </basePropertyPanel>
+ width="${ canvas.width - parent._sidePanel.width }" />
<fixedFileExplorerWhiteboardPanel name="_whiteboard" labelid="615"
y="0" x="${ parent._sidePanel.width }" restricted="true"
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/flexibleConferenceRoom/interviewConferenceRoom.lzx
Wed Sep 7 11:46:30 2011
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/flexibleConferenceRoom/interviewConferenceRoom.lzx
Thu Nov 17 07:53:53 2011
@@ -31,12 +31,16 @@
this.meetingTimer = new
lz.meetingTimer(canvas,{refObj:this,roomobj:this.roomobj});
}
}
+
+ canvas.currentBaseConferenceRoom = this;
</handler>
<handler name="ontabcontentleave">
if ($debug) Debug.write("#################
ontabcontentleave:",this);
+ canvas.currentBaseConferenceRoom = null;
+
//reset the right to draw on WHiteboard as the RoomClient Object
will be destroyed also
//on server-Side the canDraw status will be false again when you
relogin the same room
canvas.isAllowedToDraw = true;
@@ -116,22 +120,10 @@
</conferenceBox>
-->
- <basePropertyPanel name="_chatPanelStrict" labelid="616"
+ <baseTabChatPanel name="_chatPanelStrict" labelid="616"
height="200" x="${ parent._sidePanel.width }"
y="${ canvas.height - (this.height) - 28 }"
- width="${ canvas.width - parent._sidePanel.width }">
- <handler name="onisopen" args="o">
- if ($debug) Debug.write("onisopen",o);
- if (o) {
- canvas._chatcontent.doInitByOpen();
- this.content.setAttribute("visibility","visible");
- } else {
- this.content.setAttribute("visibility","hidden");
- }
- </handler>
- <chatTab name="content" y="22" height="${ parent.height-22 }"
visibility="hidden"
- width="${ parent.width }" />
- </basePropertyPanel>
+ width="${ canvas.width - parent._sidePanel.width }" />
</class>
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/flexibleConferenceRoom/library.lzx
Sat Jul 30 04:55:23 2011
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/flexibleConferenceRoom/library.lzx
Thu Nov 17 07:53:53 2011
@@ -3,7 +3,7 @@
<resource name="users_tab_btn" src="resources/kdmconfig.png" />
<resource name="files_tab_btn" src="resources/folder_yellow.png" />
-
+ <resource name="chat_message_incoming_rsc"
src="resources/ledlightgreen.png" />
<resource name="sidebar_tab_btn">
<frame src="resources/sidebar_close.png" />
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx
Wed Sep 7 11:46:30 2011
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx
Thu Nov 17 07:53:53 2011
@@ -32,6 +32,8 @@
this._chatPanelStrict.toggleopen();
+ canvas.currentBaseConferenceRoom = this;
+
canvas._videocontainer.setAttribute("allowUserQuestions",this.roomobj.allowUserQuestions);
</handler>
@@ -39,6 +41,8 @@
<handler name="ontabcontentleave">
if ($debug) Debug.write("#################
ontabcontentleave:",this);
+ canvas.currentBaseConferenceRoom = null;
+
//reset the right to draw on WHiteboard as the RoomClient Object
will be destroyed also
//on server-Side the canDraw status will be false again when you
relogin the same room
canvas.isAllowedToDraw = true;
@@ -99,26 +103,10 @@
<restrictedRoomSidebar name="_sidePanel" restricted="true"
listType="eventUserListTableWithNames" />
- <basePropertyPanel name="_chatPanelStrict" labelid="616"
+ <baseTabChatPanel name="_chatPanelStrict" labelid="616"
height="200" x="${ parent._sidePanel.width }"
y="${ canvas.height - (this.height) - 28 }"
- width="${ canvas.width - parent._sidePanel.width }">
- <handler name="onisopen" args="o">
- if ($debug) Debug.write("onisopen",o);
- if (o) {
- canvas._chatcontent.doInitByOpen();
- this.content.setAttribute("visibility","visible");
- } else {
- this.content.setAttribute("visibility","hidden");
- }
- </handler>
-
- <labelText labelid="1199" x="${ parent.width - this.width }"
bgcolor="0xFFFFFF"
- y="2" fontsize="10" fontstyle="bold" fgcolor="0xFF3300"
/>
-
- <chatTab name="content" y="22" height="${ parent.height-22 }"
visibility="hidden"
- width="${ parent.width }" />
- </basePropertyPanel>
+ width="${ canvas.width - parent._sidePanel.width }" />
<fixedFileExplorerWhiteboardPanel name="_whiteboard" labelid="615"
y="0" x="${ parent._sidePanel.width }" restricted="true"
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/tabbar/conferenceContainerTab.lzx
Wed Feb 3 11:42:06 2010
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/tabbar/conferenceContainerTab.lzx
Thu Nov 17 07:53:53 2011
@@ -37,7 +37,7 @@
<attribute name="uploadTapIsInited" value="false" type="boolean" />
<attribute name="membersTapIsInited" value="false" type="boolean" />
- <openmeetingsTabButton name="b1" iconresourcename="ksirc_rsc2"
labelid="244" x="1" y="0"
+ <openmeetingsTabButton iconresourcename="ksirc_rsc2" labelid="244"
x="1" y="0"
opacity="1">
<handler name="oninit">
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/tabcontent/chat/chatOutput.lzx
Thu Nov 4 07:25:30 2010
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/tabcontent/chat/chatOutput.lzx
Thu Nov 17 07:53:53 2011
@@ -74,7 +74,7 @@
<method name="addChatHistory" args="value,client">
<![CDATA[
//if($debug)
Debug.write("chatOutput/addChatHistory: ",value,client);
- parent.parent.parent.b1.startBlink();
+ canvas.currentBaseConferenceRoom._chatPanelStrict.startBlink();
//is Right To Left ? not checked for the moment
if (value[7]){
var username = client.firstname+" "+client.lastname;
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/tabcontent/chat/chatTab.lzx
Thu Oct 7 09:28:17 2010
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/tabcontent/chat/chatTab.lzx
Thu Nov 17 07:53:53 2011
@@ -24,7 +24,8 @@
<chatTabBottom name="_chattabbottom"
y="${ parent.height-46 }" x="0" width="${
parent.width-2 }" />
-
+
+
</class>
</library>
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/tabcontent/chat/library.lzx
Fri Oct 8 01:37:13 2010
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/tabcontent/chat/library.lzx
Thu Nov 17 07:53:53 2011
@@ -6,6 +6,7 @@
<resource name="smile_chat_log_rsc" src="resources/smile.swf" />
<include href="showChatLog.lzx" />
+ <include href="baseTabChatPanel.lzx" />
<include href="chatTabBottomRoomList.lzx" />
<include href="chatOutputRoomsList.lzx" />
<include href="chatTabItem.lzx" />
--
You received this message because you are subscribed to the Google Groups
"OpenMeetings developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/openmeetings-dev?hl=en.
