You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2012/07/03 12:57:42 UTC
svn commit: r1356670 [1/2] - in /incubator/openmeetings/trunk/singlewebapp:
WebContent/languages/ WebContent/src/base/hibernate/
WebContent/src/modules/chat/
WebContent/src/modules/conference/flexibleConferenceRoom/
WebContent/src/modules/conference/fl...
Author: solomax
Date: Tue Jul 3 10:57:35 2012
New Revision: 1356670
URL: http://svn.apache.org/viewvc?rev=1356670&view=rev
Log:
OPENMEETINGS-342 is partially implemented (minor issues remains)
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/chatBarMenu.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/chatMiniButton.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/resources/page_edit.png (with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/privateChatTabBottom.lzx
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese simplified.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese traditional.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch (studIP).xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues brazil.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/globalAttributes.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/library.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/interviewConferenceRoom.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/library.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/moderationMiniIconsEventUserList.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participantListItem.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/moderationMiniIconRestricted.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/baseTabChatPanel.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/chatOutput.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/chatTab.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/library.lzx
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/ChatService.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/sip/xmlrpc/OpenXGHttpClient.java
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml?rev=1356670&r1=1356669&r2=1356670&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml Tue Jul 3 10:57:35 2012
@@ -4503,4 +4503,19 @@ see http://incubator.apache.org/openmeet
<string id="1492" name="conference menu">
<value>Ask moderator to share your whiteboard</value>
</string>
+ <string id="1493" name="private chat">
+ <value>Start Private Chat</value>
+ </string>
+ <string id="1494" name="all_private_chat">
+ <value>All</value>
+ </string>
+ <string id="1495" name="private chat">
+ <value>You cannot start a private chat with yourself.</value>
+ </string>
+ <string id="1496" name="private chat">
+ <value>You've already started a private chat with this participant.</value>
+ </string>
+ <string id="1497" name="private chat">
+ <value>Do you really want to delete this private chat?</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml?rev=1356670&r1=1356669&r2=1356670&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml Tue Jul 3 10:57:35 2012
@@ -4501,4 +4501,19 @@ see http://incubator.apache.org/openmeet
<string id="1492" name="conference menu">
<value>Ask moderator to share your whiteboard</value>
</string>
+ <string id="1493" name="private chat">
+ <value>Start Private Chat</value>
+ </string>
+ <string id="1494" name="all_private_chat">
+ <value>All</value>
+ </string>
+ <string id="1495" name="private chat">
+ <value>You cannot start a private chat with yourself.</value>
+ </string>
+ <string id="1496" name="private chat">
+ <value>You've already started a private chat with this participant.</value>
+ </string>
+ <string id="1497" name="private chat">
+ <value>Do you really want to delete this private chat?</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml?rev=1356670&r1=1356669&r2=1356670&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml Tue Jul 3 10:57:35 2012
@@ -4502,4 +4502,19 @@ see http://incubator.apache.org/openmeet
<string id="1492" name="conference menu">
<value>Ask moderator to share your whiteboard</value>
</string>
+ <string id="1493" name="private chat">
+ <value>Start Private Chat</value>
+ </string>
+ <string id="1494" name="all_private_chat">
+ <value>All</value>
+ </string>
+ <string id="1495" name="private chat">
+ <value>You cannot start a private chat with yourself.</value>
+ </string>
+ <string id="1496" name="private chat">
+ <value>You've already started a private chat with this participant.</value>
+ </string>
+ <string id="1497" name="private chat">
+ <value>Do you really want to delete this private chat?</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese simplified.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese%20simplified.xml?rev=1356670&r1=1356669&r2=1356670&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese simplified.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese simplified.xml Tue Jul 3 10:57:35 2012
@@ -4502,4 +4502,19 @@ see http://incubator.apache.org/openmeet
<string id="1492" name="conference menu">
<value>Ask moderator to share your whiteboard</value>
</string>
+ <string id="1493" name="private chat">
+ <value>Start Private Chat</value>
+ </string>
+ <string id="1494" name="all_private_chat">
+ <value>All</value>
+ </string>
+ <string id="1495" name="private chat">
+ <value>You cannot start a private chat with yourself.</value>
+ </string>
+ <string id="1496" name="private chat">
+ <value>You've already started a private chat with this participant.</value>
+ </string>
+ <string id="1497" name="private chat">
+ <value>Do you really want to delete this private chat?</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese traditional.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese%20traditional.xml?rev=1356670&r1=1356669&r2=1356670&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese traditional.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese traditional.xml Tue Jul 3 10:57:35 2012
@@ -4514,4 +4514,19 @@ see http://incubator.apache.org/openmeet
<string id="1492" name="conference menu">
<value>Ask moderator to share your whiteboard</value>
</string>
+ <string id="1493" name="private chat">
+ <value>Start Private Chat</value>
+ </string>
+ <string id="1494" name="all_private_chat">
+ <value>All</value>
+ </string>
+ <string id="1495" name="private chat">
+ <value>You cannot start a private chat with yourself.</value>
+ </string>
+ <string id="1496" name="private chat">
+ <value>You've already started a private chat with this participant.</value>
+ </string>
+ <string id="1497" name="private chat">
+ <value>Do you really want to delete this private chat?</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml?rev=1356670&r1=1356669&r2=1356670&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml Tue Jul 3 10:57:35 2012
@@ -4502,4 +4502,19 @@ see http://incubator.apache.org/openmeet
<string id="1492" name="conference menu">
<value>Ask moderator to share your whiteboard</value>
</string>
+ <string id="1493" name="private chat">
+ <value>Start Private Chat</value>
+ </string>
+ <string id="1494" name="all_private_chat">
+ <value>All</value>
+ </string>
+ <string id="1495" name="private chat">
+ <value>You cannot start a private chat with yourself.</value>
+ </string>
+ <string id="1496" name="private chat">
+ <value>You've already started a private chat with this participant.</value>
+ </string>
+ <string id="1497" name="private chat">
+ <value>Do you really want to delete this private chat?</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml?rev=1356670&r1=1356669&r2=1356670&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml Tue Jul 3 10:57:35 2012
@@ -4501,4 +4501,19 @@ see http://incubator.apache.org/openmeet
<string id="1492" name="conference menu">
<value>Ask moderator to share your whiteboard</value>
</string>
+ <string id="1493" name="private chat">
+ <value>Start Private Chat</value>
+ </string>
+ <string id="1494" name="all_private_chat">
+ <value>All</value>
+ </string>
+ <string id="1495" name="private chat">
+ <value>You cannot start a private chat with yourself.</value>
+ </string>
+ <string id="1496" name="private chat">
+ <value>You've already started a private chat with this participant.</value>
+ </string>
+ <string id="1497" name="private chat">
+ <value>Do you really want to delete this private chat?</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch (studIP).xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch%20%28studIP%29.xml?rev=1356670&r1=1356669&r2=1356670&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch (studIP).xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch (studIP).xml Tue Jul 3 10:57:35 2012
@@ -4502,4 +4502,19 @@ see http://incubator.apache.org/openmeet
<string id="1492" name="conference menu">
<value>Ask moderator to share your whiteboard</value>
</string>
+ <string id="1493" name="private chat">
+ <value>Start Private Chat</value>
+ </string>
+ <string id="1494" name="all_private_chat">
+ <value>All</value>
+ </string>
+ <string id="1495" name="private chat">
+ <value>You cannot start a private chat with yourself.</value>
+ </string>
+ <string id="1496" name="private chat">
+ <value>You've already started a private chat with this participant.</value>
+ </string>
+ <string id="1497" name="private chat">
+ <value>Do you really want to delete this private chat?</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml?rev=1356670&r1=1356669&r2=1356670&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml Tue Jul 3 10:57:35 2012
@@ -5969,4 +5969,19 @@ see http://incubator.apache.org/openmeet
<string id="1492" name="conference menu">
<value>Ask moderator to share your whiteboard</value>
</string>
+ <string id="1493" name="private chat">
+ <value>Start Private Chat</value>
+ </string>
+ <string id="1494" name="all_private_chat">
+ <value>All</value>
+ </string>
+ <string id="1495" name="private chat">
+ <value>You cannot start a private chat with yourself.</value>
+ </string>
+ <string id="1496" name="private chat">
+ <value>You've already started a private chat with this participant.</value>
+ </string>
+ <string id="1497" name="private chat">
+ <value>Do you really want to delete this private chat?</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml?rev=1356670&r1=1356669&r2=1356670&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml Tue Jul 3 10:57:35 2012
@@ -4498,4 +4498,19 @@ see http://incubator.apache.org/openmeet
<string id="1492" name="conference menu">
<value>Ask moderator to share your whiteboard</value>
</string>
+ <string id="1493" name="private chat">
+ <value>Start Private Chat</value>
+ </string>
+ <string id="1494" name="all_private_chat">
+ <value>All</value>
+ </string>
+ <string id="1495" name="private chat">
+ <value>You cannot start a private chat with yourself.</value>
+ </string>
+ <string id="1496" name="private chat">
+ <value>You've already started a private chat with this participant.</value>
+ </string>
+ <string id="1497" name="private chat">
+ <value>Do you really want to delete this private chat?</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml?rev=1356670&r1=1356669&r2=1356670&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml Tue Jul 3 10:57:35 2012
@@ -5945,4 +5945,19 @@ see http://incubator.apache.org/openmeet
<string id="1492" name="conference menu">
<value>Ask moderator to share your whiteboard</value>
</string>
+ <string id="1493" name="private chat">
+ <value>Start Private Chat</value>
+ </string>
+ <string id="1494" name="all_private_chat">
+ <value>All</value>
+ </string>
+ <string id="1495" name="private chat">
+ <value>You cannot start a private chat with yourself.</value>
+ </string>
+ <string id="1496" name="private chat">
+ <value>You've already started a private chat with this participant.</value>
+ </string>
+ <string id="1497" name="private chat">
+ <value>Do you really want to delete this private chat?</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml?rev=1356670&r1=1356669&r2=1356670&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml Tue Jul 3 10:57:35 2012
@@ -4501,4 +4501,19 @@ see http://incubator.apache.org/openmeet
<string id="1492" name="conference menu">
<value>Ask moderator to share your whiteboard</value>
</string>
+ <string id="1493" name="private chat">
+ <value>Start Private Chat</value>
+ </string>
+ <string id="1494" name="all_private_chat">
+ <value>All</value>
+ </string>
+ <string id="1495" name="private chat">
+ <value>You cannot start a private chat with yourself.</value>
+ </string>
+ <string id="1496" name="private chat">
+ <value>You've already started a private chat with this participant.</value>
+ </string>
+ <string id="1497" name="private chat">
+ <value>Do you really want to delete this private chat?</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml?rev=1356670&r1=1356669&r2=1356670&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml Tue Jul 3 10:57:35 2012
@@ -4502,4 +4502,19 @@ see http://incubator.apache.org/openmeet
<string id="1492" name="conference menu">
<value>Demander au modé rateur le droit de partager votre tableau blanc</value>
</string>
+ <string id="1493" name="private chat">
+ <value>Start Private Chat</value>
+ </string>
+ <string id="1494" name="all_private_chat">
+ <value>All</value>
+ </string>
+ <string id="1495" name="private chat">
+ <value>You cannot start a private chat with yourself.</value>
+ </string>
+ <string id="1496" name="private chat">
+ <value>You've already started a private chat with this participant.</value>
+ </string>
+ <string id="1497" name="private chat">
+ <value>Do you really want to delete this private chat?</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml?rev=1356670&r1=1356669&r2=1356670&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml Tue Jul 3 10:57:35 2012
@@ -4502,4 +4502,19 @@ see http://incubator.apache.org/openmeet
<string id="1492" name="conference menu">
<value>Ask moderator to share your whiteboard</value>
</string>
+ <string id="1493" name="private chat">
+ <value>Start Private Chat</value>
+ </string>
+ <string id="1494" name="all_private_chat">
+ <value>All</value>
+ </string>
+ <string id="1495" name="private chat">
+ <value>You cannot start a private chat with yourself.</value>
+ </string>
+ <string id="1496" name="private chat">
+ <value>You've already started a private chat with this participant.</value>
+ </string>
+ <string id="1497" name="private chat">
+ <value>Do you really want to delete this private chat?</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml?rev=1356670&r1=1356669&r2=1356670&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml Tue Jul 3 10:57:35 2012
@@ -4502,4 +4502,19 @@ see http://incubator.apache.org/openmeet
<string id="1492" name="conference menu">
<value>Ask moderator to share your whiteboard</value>
</string>
+ <string id="1493" name="private chat">
+ <value>Start Private Chat</value>
+ </string>
+ <string id="1494" name="all_private_chat">
+ <value>All</value>
+ </string>
+ <string id="1495" name="private chat">
+ <value>You cannot start a private chat with yourself.</value>
+ </string>
+ <string id="1496" name="private chat">
+ <value>You've already started a private chat with this participant.</value>
+ </string>
+ <string id="1497" name="private chat">
+ <value>Do you really want to delete this private chat?</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml?rev=1356670&r1=1356669&r2=1356670&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml Tue Jul 3 10:57:35 2012
@@ -4502,4 +4502,19 @@ see http://incubator.apache.org/openmeet
<string id="1492" name="conference menu">
<value>Ask moderator to share your whiteboard</value>
</string>
+ <string id="1493" name="private chat">
+ <value>Start Private Chat</value>
+ </string>
+ <string id="1494" name="all_private_chat">
+ <value>All</value>
+ </string>
+ <string id="1495" name="private chat">
+ <value>You cannot start a private chat with yourself.</value>
+ </string>
+ <string id="1496" name="private chat">
+ <value>You've already started a private chat with this participant.</value>
+ </string>
+ <string id="1497" name="private chat">
+ <value>Do you really want to delete this private chat?</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml?rev=1356670&r1=1356669&r2=1356670&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml Tue Jul 3 10:57:35 2012
@@ -4502,4 +4502,19 @@ see http://incubator.apache.org/openmeet
<string id="1492" name="conference menu">
<value>Ask moderator to share your whiteboard</value>
</string>
+ <string id="1493" name="private chat">
+ <value>Start Private Chat</value>
+ </string>
+ <string id="1494" name="all_private_chat">
+ <value>All</value>
+ </string>
+ <string id="1495" name="private chat">
+ <value>You cannot start a private chat with yourself.</value>
+ </string>
+ <string id="1496" name="private chat">
+ <value>You've already started a private chat with this participant.</value>
+ </string>
+ <string id="1497" name="private chat">
+ <value>Do you really want to delete this private chat?</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml?rev=1356670&r1=1356669&r2=1356670&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml Tue Jul 3 10:57:35 2012
@@ -4502,4 +4502,19 @@ see http://incubator.apache.org/openmeet
<string id="1492" name="conference menu">
<value>Ask moderator to share your whiteboard</value>
</string>
+ <string id="1493" name="private chat">
+ <value>Start Private Chat</value>
+ </string>
+ <string id="1494" name="all_private_chat">
+ <value>All</value>
+ </string>
+ <string id="1495" name="private chat">
+ <value>You cannot start a private chat with yourself.</value>
+ </string>
+ <string id="1496" name="private chat">
+ <value>You've already started a private chat with this participant.</value>
+ </string>
+ <string id="1497" name="private chat">
+ <value>Do you really want to delete this private chat?</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml?rev=1356670&r1=1356669&r2=1356670&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml Tue Jul 3 10:57:35 2012
@@ -4502,4 +4502,19 @@ see http://incubator.apache.org/openmeet
<string id="1492" name="conference menu">
<value>Ask moderator to share your whiteboard</value>
</string>
+ <string id="1493" name="private chat">
+ <value>Start Private Chat</value>
+ </string>
+ <string id="1494" name="all_private_chat">
+ <value>All</value>
+ </string>
+ <string id="1495" name="private chat">
+ <value>You cannot start a private chat with yourself.</value>
+ </string>
+ <string id="1496" name="private chat">
+ <value>You've already started a private chat with this participant.</value>
+ </string>
+ <string id="1497" name="private chat">
+ <value>Do you really want to delete this private chat?</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml?rev=1356670&r1=1356669&r2=1356670&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml Tue Jul 3 10:57:35 2012
@@ -4483,4 +4483,19 @@ see http://incubator.apache.org/openmeet
<string id="1492" name="conference menu">
<value>Ask moderator to share your whiteboard</value>
</string>
+ <string id="1493" name="private chat">
+ <value>Start Private Chat</value>
+ </string>
+ <string id="1494" name="all_private_chat">
+ <value>All</value>
+ </string>
+ <string id="1495" name="private chat">
+ <value>You cannot start a private chat with yourself.</value>
+ </string>
+ <string id="1496" name="private chat">
+ <value>You've already started a private chat with this participant.</value>
+ </string>
+ <string id="1497" name="private chat">
+ <value>Do you really want to delete this private chat?</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml?rev=1356670&r1=1356669&r2=1356670&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml Tue Jul 3 10:57:35 2012
@@ -4502,4 +4502,19 @@ see http://incubator.apache.org/openmeet
<string id="1492" name="conference menu">
<value>Ask moderator to share your whiteboard</value>
</string>
+ <string id="1493" name="private chat">
+ <value>Start Private Chat</value>
+ </string>
+ <string id="1494" name="all_private_chat">
+ <value>All</value>
+ </string>
+ <string id="1495" name="private chat">
+ <value>You cannot start a private chat with yourself.</value>
+ </string>
+ <string id="1496" name="private chat">
+ <value>You've already started a private chat with this participant.</value>
+ </string>
+ <string id="1497" name="private chat">
+ <value>Do you really want to delete this private chat?</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml?rev=1356670&r1=1356669&r2=1356670&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml Tue Jul 3 10:57:35 2012
@@ -4502,4 +4502,19 @@ see http://incubator.apache.org/openmeet
<string id="1492" name="conference menu">
<value>Ask moderator to share your whiteboard</value>
</string>
+ <string id="1493" name="private chat">
+ <value>Start Private Chat</value>
+ </string>
+ <string id="1494" name="all_private_chat">
+ <value>All</value>
+ </string>
+ <string id="1495" name="private chat">
+ <value>You cannot start a private chat with yourself.</value>
+ </string>
+ <string id="1496" name="private chat">
+ <value>You've already started a private chat with this participant.</value>
+ </string>
+ <string id="1497" name="private chat">
+ <value>Do you really want to delete this private chat?</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml?rev=1356670&r1=1356669&r2=1356670&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml Tue Jul 3 10:57:35 2012
@@ -4575,4 +4575,19 @@ transmitowania gÅosu i obrazu wideo.<
<string id="1492" name="conference menu">
<value>Ask moderator to share your whiteboard</value>
</string>
+ <string id="1493" name="private chat">
+ <value>Start Private Chat</value>
+ </string>
+ <string id="1494" name="all_private_chat">
+ <value>All</value>
+ </string>
+ <string id="1495" name="private chat">
+ <value>You cannot start a private chat with yourself.</value>
+ </string>
+ <string id="1496" name="private chat">
+ <value>You've already started a private chat with this participant.</value>
+ </string>
+ <string id="1497" name="private chat">
+ <value>Do you really want to delete this private chat?</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues brazil.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues%20brazil.xml?rev=1356670&r1=1356669&r2=1356670&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues brazil.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues brazil.xml Tue Jul 3 10:57:35 2012
@@ -4503,4 +4503,19 @@ Details
<string id="1492" name="conference menu">
<value>Pergunte ao moderador para compartilhar sua lousa</value>
</string>
+ <string id="1493" name="private chat">
+ <value>Start Private Chat</value>
+ </string>
+ <string id="1494" name="all_private_chat">
+ <value>All</value>
+ </string>
+ <string id="1495" name="private chat">
+ <value>You cannot start a private chat with yourself.</value>
+ </string>
+ <string id="1496" name="private chat">
+ <value>You've already started a private chat with this participant.</value>
+ </string>
+ <string id="1497" name="private chat">
+ <value>Do you really want to delete this private chat?</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml?rev=1356670&r1=1356669&r2=1356670&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml Tue Jul 3 10:57:35 2012
@@ -4502,4 +4502,19 @@ see http://incubator.apache.org/openmeet
<string id="1492" name="conference menu">
<value>Ask moderator to share your whiteboard</value>
</string>
+ <string id="1493" name="private chat">
+ <value>Start Private Chat</value>
+ </string>
+ <string id="1494" name="all_private_chat">
+ <value>All</value>
+ </string>
+ <string id="1495" name="private chat">
+ <value>You cannot start a private chat with yourself.</value>
+ </string>
+ <string id="1496" name="private chat">
+ <value>You've already started a private chat with this participant.</value>
+ </string>
+ <string id="1497" name="private chat">
+ <value>Do you really want to delete this private chat?</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml?rev=1356670&r1=1356669&r2=1356670&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml Tue Jul 3 10:57:35 2012
@@ -4502,4 +4502,19 @@ see http://incubator.apache.org/openmeet
<string id="1492" name="conference menu">
<value>ÐапÑоÑиÑÑ ÑазÑеÑение модеÑаÑоÑа на доÑÑÑп к доÑке</value>
</string>
+ <string id="1493" name="private chat">
+ <value>Start Private Chat</value>
+ </string>
+ <string id="1494" name="all_private_chat">
+ <value>All</value>
+ </string>
+ <string id="1495" name="private chat">
+ <value>You cannot start a private chat with yourself.</value>
+ </string>
+ <string id="1496" name="private chat">
+ <value>You've already started a private chat with this participant.</value>
+ </string>
+ <string id="1497" name="private chat">
+ <value>Do you really want to delete this private chat?</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml?rev=1356670&r1=1356669&r2=1356670&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml Tue Jul 3 10:57:35 2012
@@ -4502,4 +4502,19 @@ see http://incubator.apache.org/openmeet
<string id="1492" name="conference menu">
<value>Ask moderator to share your whiteboard</value>
</string>
+ <string id="1493" name="private chat">
+ <value>Start Private Chat</value>
+ </string>
+ <string id="1494" name="all_private_chat">
+ <value>All</value>
+ </string>
+ <string id="1495" name="private chat">
+ <value>You cannot start a private chat with yourself.</value>
+ </string>
+ <string id="1496" name="private chat">
+ <value>You've already started a private chat with this participant.</value>
+ </string>
+ <string id="1497" name="private chat">
+ <value>Do you really want to delete this private chat?</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml?rev=1356670&r1=1356669&r2=1356670&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml Tue Jul 3 10:57:35 2012
@@ -4510,4 +4510,19 @@ see http://incubator.apache.org/openmeet
<string id="1492" name="conference menu">
<value>Ask moderator to share your whiteboard</value>
</string>
+ <string id="1493" name="private chat">
+ <value>Start Private Chat</value>
+ </string>
+ <string id="1494" name="all_private_chat">
+ <value>All</value>
+ </string>
+ <string id="1495" name="private chat">
+ <value>You cannot start a private chat with yourself.</value>
+ </string>
+ <string id="1496" name="private chat">
+ <value>You've already started a private chat with this participant.</value>
+ </string>
+ <string id="1497" name="private chat">
+ <value>Do you really want to delete this private chat?</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml?rev=1356670&r1=1356669&r2=1356670&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml Tue Jul 3 10:57:35 2012
@@ -4502,4 +4502,19 @@ see http://incubator.apache.org/openmeet
<string id="1492" name="conference menu">
<value>Ask moderator to share your whiteboard</value>
</string>
+ <string id="1493" name="private chat">
+ <value>Start Private Chat</value>
+ </string>
+ <string id="1494" name="all_private_chat">
+ <value>All</value>
+ </string>
+ <string id="1495" name="private chat">
+ <value>You cannot start a private chat with yourself.</value>
+ </string>
+ <string id="1496" name="private chat">
+ <value>You've already started a private chat with this participant.</value>
+ </string>
+ <string id="1497" name="private chat">
+ <value>Do you really want to delete this private chat?</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml?rev=1356670&r1=1356669&r2=1356670&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml Tue Jul 3 10:57:35 2012
@@ -4502,4 +4502,19 @@ see http://incubator.apache.org/openmeet
<string id="1492" name="conference menu">
<value>Ask moderator to share your whiteboard</value>
</string>
+ <string id="1493" name="private chat">
+ <value>Start Private Chat</value>
+ </string>
+ <string id="1494" name="all_private_chat">
+ <value>All</value>
+ </string>
+ <string id="1495" name="private chat">
+ <value>You cannot start a private chat with yourself.</value>
+ </string>
+ <string id="1496" name="private chat">
+ <value>You've already started a private chat with this participant.</value>
+ </string>
+ <string id="1497" name="private chat">
+ <value>Do you really want to delete this private chat?</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml?rev=1356670&r1=1356669&r2=1356670&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml Tue Jul 3 10:57:35 2012
@@ -4501,4 +4501,19 @@ see http://incubator.apache.org/openmeet
<string id="1492" name="conference menu">
<value>Ask moderator to share your whiteboard</value>
</string>
+ <string id="1493" name="private chat">
+ <value>Start Private Chat</value>
+ </string>
+ <string id="1494" name="all_private_chat">
+ <value>All</value>
+ </string>
+ <string id="1495" name="private chat">
+ <value>You cannot start a private chat with yourself.</value>
+ </string>
+ <string id="1496" name="private chat">
+ <value>You've already started a private chat with this participant.</value>
+ </string>
+ <string id="1497" name="private chat">
+ <value>Do you really want to delete this private chat?</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml?rev=1356670&r1=1356669&r2=1356670&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml Tue Jul 3 10:57:35 2012
@@ -4502,4 +4502,19 @@ see http://incubator.apache.org/openmeet
<string id="1492" name="conference menu">
<value>Ask moderator to share your whiteboard</value>
</string>
+ <string id="1493" name="private chat">
+ <value>Start Private Chat</value>
+ </string>
+ <string id="1494" name="all_private_chat">
+ <value>All</value>
+ </string>
+ <string id="1495" name="private chat">
+ <value>You cannot start a private chat with yourself.</value>
+ </string>
+ <string id="1496" name="private chat">
+ <value>You've already started a private chat with this participant.</value>
+ </string>
+ <string id="1497" name="private chat">
+ <value>Do you really want to delete this private chat?</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx?rev=1356670&r1=1356669&r2=1356670&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx Tue Jul 3 10:57:35 2012
@@ -1070,11 +1070,16 @@
<netRemoteCallHib name="roomDisconnect" funcname="roomDisconnect">
<handler name="ondata" args="value">
+ <![CDATA[
//The onResult-Handler will be called be the rtmpconnection
if ($debug) Debug.write("roomDisconnect: ",value);
if (value.isScreenClient) {
return;
}
+ if ($debug) Debug.write("canvas.currentBaseConferenceRoom._chatPanelStrict: ", canvas.currentBaseConferenceRoom._chatPanelStrict);
+ if (canvas.currentBaseConferenceRoom != null && canvas.currentBaseConferenceRoom._chatPanelStrict != null) {
+ canvas.currentBaseConferenceRoom._chatPanelStrict.closeprivatechat(["close", value.publicSID]);
+ }
if (canvas.currentActivityList != null) {
canvas.currentActivityList.addMessageRequest(value, canvas.getLabelName(1367), new Date().getTime());
}
@@ -1091,6 +1096,7 @@
canvas._mymod.setMessage();
}
}
+ ]]>
</handler>
</netRemoteCallHib>
@@ -1134,7 +1140,7 @@
<method name="setUserStatus" args="ctx,user,o">
<![CDATA[
- if (!o || !user) return;
+ if (!o || !user) return;
//The onResult-Handler will be called be the rtmpconnection
if ($debug) {
Debug.write("setUserStatus: ", user);
@@ -1604,6 +1610,9 @@
}
} else if (value.message[0]=='applyModAnswer'){
canvas.currentModApply.setUserAnswer(value);
+ } else if (value.message[0]=='privatechat'){
+ if ($debug) Debug.write("privatechat",value.message,value.client);
+ canvas._currentChatPanel.privatechat(value.message,value.client);
} else if (value.message[0]=='chat'){
if (canvas._chatcontent) canvas._chatcontent.addChatHistory(value.message,value.client);
if (canvas._chatcontentRPC) canvas._chatcontentRPC.addChatHistory(value.message,value.client);
@@ -1698,7 +1707,13 @@
//The onResult-Handler will be called be the rtmpconnection
//if ($debug) Debug.write("newMessageByRoomAndDomain: ",value);
<![CDATA[
- if (value.message=='desktop'){
+ if (value[0]=='closeprivatechat'){
+ if ($debug) Debug.write("closeprivatechat",value);
+ canvas._currentChatPanel.closeprivatechat(value);
+ } else if (value[0]=='newprivatechat'){
+ if ($debug) Debug.write("newprivatechat",value);
+ canvas._currentChatPanel.newprivatechat(value);
+ } else if (value.message=='desktop'){
canvas._drawarea.incomingScreenSharing(value);
} else if (value.message=='library'){
Added: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/chatBarMenu.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/chatBarMenu.lzx?rev=1356670&view=auto
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/chatBarMenu.lzx (added)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/chatBarMenu.lzx Tue Jul 3 10:57:35 2012
@@ -0,0 +1,109 @@
+<?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="chatBarMenu" extends="view" width="${ parent.width }" x="0"
+ height="20" layout="axis:x;spacing:1;inset:2" bgcolor="$once{ canvas.getThemeColor('baseMousecolorizer') }">
+
+ <attribute name="staticwidth" type="number" value="120" />
+ <attribute name="currentBtn" value="null" />
+
+ <event name="onRemoveWindow" />
+
+ <method name="getCurrentSize">
+ <![CDATA[
+ if ( ((this.subviews.length+1)*(this.staticwidth+1)) <= this.width) {
+ return this.staticwidth;
+ } else {
+ var newwidth = Math.round((this.width-this.subviews.length)/(this.subviews.length+1));
+ for (var i=0;i<this.subviews.length;i++) {
+ this.subviews[i].setAttribute('width',newwidth);
+ }
+ return newwidth;
+ }
+ ]]>
+ </method>
+
+ <handler name="onwidth">
+ <![CDATA[
+ if ( ((this.subviews.length)*(this.staticwidth+1)) <= this.width) {
+ for (var i=0;i<this.subviews.length;i++) {
+ this.subviews[i].setAttribute('width',this.staticwidth);
+ }
+ } else {
+ var newwidth = Math.round((this.width-this.subviews.length)/(this.subviews.length));
+ for (var i=0;i<this.subviews.length;i++) {
+ this.subviews[i].setAttribute('width',newwidth);
+ }
+ }
+ ]]>
+ </handler>
+
+ <method name="removeObject" args="btn">
+ this.removeObjectSynced(btn);
+ if ($debug) Debug.write("removeObject :: ",btn);
+ this.onRemoveWindow.sendEvent(btn.objRef.refObj.publicSID);
+ </method>
+
+ <method name="removeObjectSynced" args="btn">
+ var removeCurrent = false;
+ if (this.currentBtn == btn){
+ removeCurrent = true;
+ }
+ btn.objRef.destroy();
+ btn.destroy();
+ if (this.subviews.length != 0) {
+ if (removeCurrent) {
+ this.sendActiveWindowSynced(this.subviews[this.subviews.length-1]);
+ }
+ }
+
+ </method>
+
+
+ <method name="sendActiveWindow" args="btn,win">
+ if ($debug) Debug.write("sendActiveWindow: ", btn, win);
+ this.sendActiveWindowSynced(btn);
+ </method>
+
+ <method name="sendActiveWindowSynced" args="btn">
+ <![CDATA[
+ if (this.currentBtn != null){
+ this.currentBtn.isactive=false;
+ this.currentBtn.objRef.setAttribute("visibility", "hidden");
+ if ($debug) Debug.write("sendActiveWindow1: ",this.currentBtn);
+ this.currentBtn._minimizebtn_mo.setAttribute('visibility','hidden');
+ this.currentBtn._minimizebtn_dn.setAttribute('visibility','hidden');
+ }
+ this.currentBtn = btn;
+ this.currentBtn.objRef.setAttribute("visibility","visible");
+ this.currentBtn.objRef.bringToFront();
+ if ($debug) //Debug.write("sendActiveWindow2: ",this.currentBtn);
+ this.currentBtn._minimizebtn_mo.setAttribute('visibility','hidden');
+ this.currentBtn._minimizebtn_dn.setAttribute('visibility','visible');
+ this.currentBtn.isactive=true;
+ this.currentBtn.objRef.sendActiveWindow();
+ ]]>
+ </method>
+
+</class>
+
+</library>
Added: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/chatMiniButton.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/chatMiniButton.lzx?rev=1356670&view=auto
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/chatMiniButton.lzx (added)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/chatMiniButton.lzx Tue Jul 3 10:57:35 2012
@@ -0,0 +1,171 @@
+<?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="chatMiniButton" extends="view" width="250" height="18" y="2"
+ bgcolor="$once{ canvas.getThemeColor('basebgcolorizer') }">
+
+ <attribute name="btnName" value="" type="string" />
+ <attribute name="objRef" value="null" />
+
+ <attribute name="zielx" value="200" type="number" />
+ <attribute name="zielwidth" value="100" type="number" />
+
+ <attribute name="isactive" value="true" type="boolean" />
+
+ <attribute name="isHidden" value="false" type="boolean" />
+
+ <attribute name="isClosable" value="true" type="boolean" />
+
+ <handler name="oninit">
+ this.calcTextWidth();
+ parent.onwidth.sendEvent();
+ </handler>
+
+ <handler name="onwidth">
+ if (this.isinited){
+ this.calcTextWidth();
+ }
+ </handler>
+
+ <method name="disableItem">
+ //if ($debug) Debug.write("disableItem :: set visibility to hidden");
+ this.isHidden = true;
+ this.setAttribute("visibility","hidden");
+ //this.destroy();
+ </method>
+
+ <method name="enableItem">
+ this.setAttribute("visibility","visible");
+ this.isHidden = false;
+ </method>
+
+ <method name="calcTextWidth">
+ <![CDATA[
+ if (this.isHidden) {
+ return;
+ }
+ ////////if ($debug) //Debug.write(this,this._text,this._text.getTextWidth());
+ if (this._text.getTextWidth()>(this.width-24)) {
+ this._long.setAttribute('visibility','visible');
+ this._text.setAttribute('width',this.width-26);
+ } else {
+ this._long.setAttribute('visibility','hidden');
+ this._text.setAttribute('width',this.width-18);
+ }
+ ]]>
+ </method>
+
+ <handler name="onclick">
+ if (this.isHidden) {
+ return;
+ }
+ this._minimizebtn_mo.setAttribute('visibility','visible');
+ this._minimizebtn_dn.setAttribute('visibility','hidden');
+ if ($debug) Debug.write(" :: onclick :: ");
+ this.sendActiveWindow(this.objRef);
+ </handler>
+
+ <handler name="onmouseover">
+ if (this.isHidden) {
+ return;
+ }
+ this._minimizebtn_mo.setAttribute('visibility','visible');
+ this._minimizebtn_dn.setAttribute('visibility','hidden');
+ </handler>
+ <handler name="onmouseout">
+ if (this.isHidden) {
+ return;
+ }
+ if (this.isactive) {
+ this._minimizebtn_mo.setAttribute('visibility','hidden');
+ this._minimizebtn_dn.setAttribute('visibility','visible');
+ } else {
+ this._minimizebtn_mo.setAttribute('visibility','hidden');
+ this._minimizebtn_dn.setAttribute('visibility','hidden');
+ }
+ </handler>
+ <handler name="onmousedown">
+ if (this.isHidden) {
+ return;
+ }
+ this._minimizebtn_mo.setAttribute('visibility','hidden');
+ this._minimizebtn_dn.setAttribute('visibility','visible');
+ </handler>
+ <handler name="onmouseup">
+ if (this.isHidden) {
+ return;
+ }
+ this._minimizebtn_mo.setAttribute('visibility','visible');
+ this._minimizebtn_dn.setAttribute('visibility','hidden');
+ </handler>
+
+ <method name="sendActiveWindow" args="win">
+ this.parent.sendActiveWindow(this,win);
+ </method>
+
+ <method name="activateSynced">
+ this.parent.sendActiveWindowSynced(this,win);
+ </method>
+
+ <view name="_minimizebtn_mo" width="${ parent.width-2 }" height="16"
+ bgcolor="0xFFFFFF" opacity="0.3" visibility="hidden" x="1" y="1" />
+
+ <view name="_minimizebtn_dn" width="${ parent.width-2 }" height="16"
+ bgcolor="0x000000" opacity="0.3" visibility="hidden" x="1" y="1" />
+
+
+ <text text="${ parent.btnName }" fgcolor="0xFFFFFF" resize="false"
+ x="1" fontsize="10" name="_text" />
+
+ <view y="1" x="${ parent.width-18 }" name="_close"
+ resource="btn_presenter_close"
+ visible="$once{ parent.isClosable }"
+ onmouseover="this.setAttribute('frame',2)"
+ onmouseout="this.setAttribute('frame',1)"
+ onmousedown="this.setAttribute('frame',3)"
+ onmouseup="this.setAttribute('frame',1)" >
+ <handler name="onclick">
+ this.setAttribute('frame',2);
+ new lz.confirmationSingle(canvas,{
+ refObj:this,
+ labeliderror:1497,
+ showCheckBox:false
+ });
+ </handler>
+ <method name="sendConfirmation" args="bool,askAgain">
+ if (bool) {
+ this.parent.parent.removeObject(this.parent);
+ }
+ </method>
+ <method name="sendNoConfirmation">
+
+ </method>
+ <labelTooltip text="close" />
+ </view>
+
+ <text y="1" name="_long" text="..."
+ x="${ parent.width-28 }" fontsize="10" />
+
+ <labelTooltip text="${ parent.btnName }" />
+</class>
+
+</library>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/globalAttributes.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/globalAttributes.lzx?rev=1356670&r1=1356669&r2=1356670&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/globalAttributes.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/globalAttributes.lzx Tue Jul 3 10:57:35 2012
@@ -29,6 +29,9 @@
<!--- chat modules: chat content -->
<attribute name="_chatcontent" value="null" />
+<!--- chat modules: chat content -->
+<attribute name="_currentChatPanel" value="null" />
+
<!--- chat modules: chat content RPC -->
<attribute name="_chatcontentRPC" value="null" />
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/library.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/library.lzx?rev=1356670&r1=1356669&r2=1356670&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/library.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/library.lzx Tue Jul 3 10:57:35 2012
@@ -24,6 +24,8 @@
<include href="globalAttributes.lzx" />
<include href="globalMethods.lzx" />
+ <include href="chatMiniButton.lzx" />
+ <include href="chatBarMenu.lzx" />
<include href="inviteuser/" />
<include href="chatParticipants.lzx" />
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx?rev=1356670&r1=1356669&r2=1356670&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx Tue Jul 3 10:57:35 2012
@@ -179,6 +179,11 @@
<screenSharingAdapter name="_screenSharingAdapter" />
+ <baseTabChatPanel name="_chatPanelStrict" labelid="616"
+ height="200" x="${ parent._sidePanel.width }"
+ y="${ canvas.height - (this.height) - ((canvas.currentRoomObj.hideTopBar) ? 0 : 28) }"
+ width="${ canvas.width - parent._sidePanel.width }" />
+
</class>
</library>
\ No newline at end of file
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx?rev=1356670&r1=1356669&r2=1356670&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx Tue Jul 3 10:57:35 2012
@@ -144,11 +144,6 @@
<om_vscrollbar name="_attenddeescrollbar" visibility="visible"></om_vscrollbar>
</view>
- <baseTabChatPanel name="_chatPanelStrict" labelid="616"
- height="200" x="${ parent._sidePanel.width }"
- y="${ canvas.height - (this.height) - ((canvas.currentRoomObj.hideTopBar) ? 0:28)}"
- width="${ canvas.width - parent._sidePanel.width }" />
-
<fixedFileExplorerWhiteboardPanel name="_whiteboard" labelid="615"
y="0" x="${ parent._sidePanel.width }"
width="${ canvas.width - parent._sidePanel.width }"
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/interviewConferenceRoom.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/interviewConferenceRoom.lzx?rev=1356670&r1=1356669&r2=1356670&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/interviewConferenceRoom.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/interviewConferenceRoom.lzx Tue Jul 3 10:57:35 2012
@@ -135,21 +135,6 @@
<interviewWhiteboard name="_whiteboardInterview" x="${ parent._sidePanel.width }"
width="${ canvas.width - parent._sidePanel.width }" />
- <!--
- Chat Box
- <conferenceBox name="_chatPanelStrict" labelid="616" textInset="30" closeable="true"
- height="350" x="${ parent._sidePanel.width }" bgcolor="0xFFFFFF"
- y="${ canvas.height - (this.height+22) }"
- width="${ canvas.width - parent._sidePanel.width }">
- <chatTab name="content" y="40" height="${ parent.height-40 }" width="${ parent.width }" />
- </conferenceBox>
- -->
-
- <baseTabChatPanel name="_chatPanelStrict" labelid="616"
- height="200" x="${ parent._sidePanel.width }"
- y="${ canvas.height - (this.height) - ((canvas.currentRoomObj.hideTopBar) ? 0:28) }"
- width="${ canvas.width - parent._sidePanel.width }" />
-
</class>
</library>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/library.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/library.lzx?rev=1356670&r1=1356669&r2=1356670&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/library.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/library.lzx Tue Jul 3 10:57:35 2012
@@ -41,6 +41,8 @@
<resource name="av_allow_rsc" src="resources/audio_and_video.png" />
<!-- FamFam Icon Set -->
<resource name="av_deny_rsc" src="resources/audio_and_video_no.png" />
+ <!-- FamFam Icon Set -->
+ <resource name="start_private_chat_rsc" src="resources/page_edit.png" />
<!-- APL author sebawagner -->
<resource name="kick_user_rsc" src="resources/cancel_icon.png" />
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/moderationMiniIconsEventUserList.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/moderationMiniIconsEventUserList.lzx?rev=1356670&r1=1356669&r2=1356670&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/moderationMiniIconsEventUserList.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/moderationMiniIconsEventUserList.lzx Tue Jul 3 10:57:35 2012
@@ -291,7 +291,6 @@
</handler>
<labelTooltip labelid="1432" />
</miniIconsNew>
-
</class>
</library>
Added: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/resources/page_edit.png
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/resources/page_edit.png?rev=1356670&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/resources/page_edit.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx?rev=1356670&r1=1356669&r2=1356670&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx Tue Jul 3 10:57:35 2012
@@ -138,11 +138,6 @@
<om_vscrollbar name="_attenddeescrollbar" visibility="visible"></om_vscrollbar>
</view>
- <baseTabChatPanel name="_chatPanelStrict" labelid="616"
- height="200" x="${ parent._sidePanel.width }"
- y="${ canvas.height - (this.height) - 28 }"
- width="${ canvas.width - parent._sidePanel.width }" />
-
<fixedFileExplorerWhiteboardPanel name="_whiteboard" labelid="615"
y="0" x="${ parent._sidePanel.width }"
width="${ canvas.width - parent._sidePanel.width }"
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participantListItem.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participantListItem.lzx?rev=1356670&r1=1356669&r2=1356670&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participantListItem.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participantListItem.lzx Tue Jul 3 10:57:35 2012
@@ -403,6 +403,23 @@
<labelText name="_firstName" fontsize="10" x="40" text="$once{ parent.firstname }" />
<labelText name="_lastName" fontsize="10" x="40" y="20" text="$once{ parent.lastname }" />
+ <miniIcons name="_start_private_chat_rsc" x="114" y = "2" width="16" height="16"
+ resource="start_private_chat_rsc" showhandcursor="true">
+ <handler name="onclick">
+ var refObj = parent.refObj;
+ if ($debug) Debug.write("Start Private Chat with 1: ", refObj.publicSID);
+ if ($debug) Debug.write("Start Private Chat with 2: ", refObj);
+ if (refObj.publicSID == canvas.publicSID) {
+ new lz.labelerrorPopup(canvas.main_content._content.inner,{
+ errorlabelid:1495
+ });
+ return;
+ }
+ canvas._currentChatPanel.addChat(refObj);
+ </handler>
+ <labelTooltip labelid="1493" />
+ </miniIcons>
+
<view name="_x" x="132" y="2">
<miniIcons name="_mute" x="82" width="16" height="16" resource="mute_micro_btn_rsc" showhandcursor="true" >
@@ -634,7 +651,6 @@
<labelTooltip inittwice="true" labelid="372" />
</view>
</view>
-
</view>
<view name="divisionLine" width="$once{ parent.width }"
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/moderationMiniIconRestricted.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/moderationMiniIconRestricted.lzx?rev=1356670&r1=1356669&r2=1356670&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/moderationMiniIconRestricted.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/moderationMiniIconRestricted.lzx Tue Jul 3 10:57:35 2012
@@ -379,6 +379,22 @@
<labelTooltip labelid="1213" />
</miniIcons>
+ <miniIcons name="_start_private_chat_rsc" x="172" y = "2" width="16" height="16"
+ resource="start_private_chat_rsc" showhandcursor="true">
+ <handler name="onclick">
+ var refObj = parent.parent.parent.refObj;
+ if ($debug) Debug.write("Start Private Chat with 1: ", refObj.publicSID);
+ if ($debug) Debug.write("Start Private Chat with 2: ", refObj);
+ if (refObj.publicSID == canvas.publicSID) {
+ new lz.labelerrorPopup(canvas.main_content._content.inner,{
+ errorlabelid:1495
+ });
+ return;
+ }
+ canvas._currentChatPanel.addChat(refObj);
+ </handler>
+ <labelTooltip labelid="1493" />
+ </miniIcons>
</class>
</library>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/baseTabChatPanel.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/baseTabChatPanel.lzx?rev=1356670&r1=1356669&r2=1356670&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/baseTabChatPanel.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/baseTabChatPanel.lzx Tue Jul 3 10:57:35 2012
@@ -33,10 +33,97 @@
<attribute name="doBlink" value="false" type="boolean" />
<handler name="oninit">
+ canvas._currentChatPanel = this;
this.fadeDelegate = new LzDelegate( this, "showText" );
</handler>
- <handler name="onisopen" args="o">
+ <method name="newprivatechat" args="refObj">
+ this.addChatSync(refObj[1],true);
+ </method>
+
+ <method name="closeprivatechat" args="value">
+ if ($debug) Debug.write("closeprivatechat _1a_ ",value);
+ var publicSID = value[1];
+ if ($debug) Debug.write("closeprivatechat _1b_ ",publicSID);
+
+ for (var eg in this.content.chatbar.subviews) {
+
+ if ($debug) Debug.write("closeprivatechat _2A_ ",this.content.chatbar.subviews[eg].objRef);
+ if ($debug) Debug.write("closeprivatechat _2B_ ",this.content.chatbar.subviews[eg].objRef.refObj);
+ if ($debug) Debug.write("closeprivatechat _2C_ ",this.content.chatbar.subviews[eg].objRef.refObj.publicSID);
+
+ if (this.content.chatbar.subviews[eg].objRef.refObj.publicSID == publicSID ) {
+ this.content.chatbar.removeObjectSynced(this.content.chatbar.subviews[eg]);
+ return;
+ }
+ }
+ </method>
+
+ <method name="privatechat" args="value,client">
+ if ($debug) Debug.write("privatechat A ",client.publicSID);
+ if ($debug) Debug.write("privatechat B ",value[6]);
+
+ for (var eg in this.content.subviews) {
+ if (this.content.subviews[eg].refObj != null) {
+
+ if ($debug) Debug.write("privatechat _1_ ",this.content.subviews[eg].refObj);
+ if ($debug) Debug.write("privatechat _2_ ",this.content.subviews[eg].refObj.publicSID);
+
+ if (this.content.subviews[eg].refObj.publicSID == client.publicSID
+ || this.content.subviews[eg].refObj.publicSID == value[6] ) {
+ this.content.subviews[eg]._chatoutputborder._chatoutput.addChatHistory(value,client);
+ }
+ }
+ }
+ </method>
+
+ <method name="addChat" args="refObj">
+ this.addChatSync(refObj,false);
+ </method>
+
+ <method name="addChatSync" args="refObj,remoteOpen">
+ if (this.content.visibility == "hidden") {
+ this.toggleopen();
+ }
+
+ for (var eg in this.content.subviews) {
+ if (this.content.subviews[eg].refObj != null) {
+ if (this.content.subviews[eg].refObj.publicSID == refObj.publicSID) {
+ new lz.labelerrorPopup(canvas.main_content._content.inner,{
+ errorlabelid:1496
+ });
+ return;
+ }
+ }
+ }
+
+ if ($debug) Debug.write("addChat :: ",refObj);
+ for (var eg in this.content.chatbar.subviews) {
+ this.content.chatbar.subviews[eg].isactive = false;
+ this.content.chatbar.subviews[eg].onmouseout.sendEvent(null);
+ this.content.chatbar.subviews[eg].objRef.setAttribute("visibility","hidden");
+ }
+
+ var chatTabPrivateRef = new lz.chatTabPrivateChat(this.content,{
+ refObj:refObj,
+ remoteOpen:remoteOpen
+
+ });
+ var tempWidth = this.content.chatbar.getCurrentSize();
+
+ var tWhiteboardBtn = new lz.chatMiniButton(this.content.chatbar,{
+ objRef:chatTabPrivateRef,
+ width:tempWidth,
+ isactive:true,
+ btnName:refObj.firstname+" "+refObj.lastname
+ });
+
+ this.content.chatbar.currentBtn = tWhiteboardBtn;
+
+ tWhiteboardBtn.onmouseout.sendEvent(null);
+ </method>
+
+ <handler name="onisopen" args="o">
if ($debug) Debug.write("onisopen",o);
if (o) {
canvas._chatcontent.doInitByOpen();
@@ -76,8 +163,57 @@
}
</method>
- <chatTab name="content" y="22" height="${ parent.height-22 }"
- visibility="hidden" width="${ parent.width }" />
+ <view name="content" visibility="hidden" y="22"
+ height="${ parent.height-22 }" width="${ parent.width }">
+ <chatBarMenu name="chatbar">
+ <attribute name="refObj" value="null" />
+ <attribute name="objMessage" value="null" />
+ <attribute name="publicSID" value="" type="string" />
+
+ <handler name="oninit">
+ this.currentBtn = this._button1;
+ </handler>
+
+ <handler name="onRemoveWindow" args="publicSID">
+ <![CDATA[
+
+ if ($debug) Debug.write("onRemoveWindow :: ",publicSID);
+
+ this.publicSID = publicSID;
+
+ this.objMessage = new Array();
+ this.objMessage[0] = 'closeprivatechat';
+ this.objMessage[1] = canvas.publicSID;
+
+ this.sendMessageWithClientByPublicSID.doCall();
+ ]]>
+ </handler>
+
+ <netRemoteCallHib name="sendMessageWithClientByPublicSID" funcname="sendMessageWithClientByPublicSID"
+ remotecontext="$once{ canvas.thishib }" >
+ <netparam><method name="getValue"> return parent.parent.objMessage; </method></netparam>
+ <netparam><method name="getValue"> return parent.parent.publicSID; </method></netparam>
+ <handler name="ondata" args="value">
+ <![CDATA[
+ //The onResult-Handler will be called be the rtmpconnection
+ if ($debug) Debug.write("chatservice.sendMessageWithClientByPublicSID getValue : ",value);
+ ]]>
+ </handler>
+ </netRemoteCallHib>
+
+ <chatMiniButton name="_button1" isactive="true" isClosable="false" >
+ <handler name="oninit">
+ this.setAttribute("btnName", canvas.getLabelName(1494) + " 1");
+ this.objRef = parent.parent._content1;
+ this.onmouseout.sendEvent(this);
+ </handler>
+ </chatMiniButton>
+
+ </chatBarMenu>
+
+ <chatTab name="_content1" />
+
+ </view>
<labelText labelid="1199" x="${ parent.width - this.width }" bgcolor="0xFFFFFF"
y="2" fontsize="10" fontstyle="bold" fgcolor="0xFF3300" />
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/chatOutput.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/chatOutput.lzx?rev=1356670&r1=1356669&r2=1356670&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/chatOutput.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/chatOutput.lzx Tue Jul 3 10:57:35 2012
@@ -117,7 +117,7 @@
|| canvas.directUserLogin || canvas.secureRemoteUserLogin) {
isDirectLink = true;
}
- if ( usercolor==null || usercolor==0 || usercolor.length==0 )usercolor=0xCCCCCC;
+ if ( usercolor==null || usercolor==0 || (usercolor !=null && usercolor.length==0) )usercolor=0xCCCCCC;
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/chatTab.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/chatTab.lzx?rev=1356670&r1=1356669&r2=1356670&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/chatTab.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/chatTab.lzx Tue Jul 3 10:57:35 2012
@@ -47,4 +47,50 @@ This is used in the conference.
</class>
+<class name="chatTabPrivateChat" extends="simpleBaseTabpane" y="22" height="${ parent.height-22 }"
+ width="${ parent.width }">
+
+ <attribute name="refObj" value="null"/>
+ <attribute name="objMessage" value="null"/>
+ <attribute name="remoteOpen" value="false" type="boolean"/>
+
+ <handler name="oninit">
+ <![CDATA[
+ if (this.remoteOpen) {
+ return;
+ }
+ this.objMessage = new Array();
+ this.objMessage[0] = 'newprivatechat';
+ this.objMessage[1] = canvas.thishib.userobject;
+ this.objMessage[1].publicSID = canvas.publicSID;
+
+ this.sendMessageWithClientByPublicSID.doCall();
+ ]]>
+ </handler>
+
+ <netRemoteCallHib name="sendMessageWithClientByPublicSID" funcname="sendMessageWithClientByPublicSID"
+ remotecontext="$once{ canvas.thishib }" >
+ <netparam><method name="getValue"> return parent.parent.objMessage; </method></netparam>
+ <netparam><method name="getValue"> return parent.parent.refObj.publicSID; </method></netparam>
+ <handler name="ondata" args="value">
+ <![CDATA[
+ //The onResult-Handler will be called be the rtmpconnection
+ if ($debug) Debug.write("chatservice.sendMessageWithClientByPublicSID getValue : ",value);
+ ]]>
+ </handler>
+ </netRemoteCallHib>
+
+ <view name="_chatoutputborder" height="${ parent.height-48 }"
+ bgcolor="$once{ canvas.getThemeColor('basebgcolorizer') }" width="${ parent.width-2 }">
+
+ <chatOutput name="_chatoutput" x="1" y="1" >
+
+ </chatOutput>
+
+ </view>
+
+ <privateChatTabBottom name="_chattabbottom"
+ y="${ parent.height-46 }" x="0" width="${ parent.width-2 }" />
+
+</class>
</library>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/library.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/library.lzx?rev=1356670&r1=1356669&r2=1356670&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/library.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/library.lzx Tue Jul 3 10:57:35 2012
@@ -33,6 +33,7 @@
<include href="chatTabItemEmoticons.lzx" />
<include href="chatOutput.lzx" />
<include href="chatTabBottom.lzx" />
+ <include href="privateChatTabBottom.lzx" />
<include href="chatTab.lzx" />
</library>