You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by se...@apache.org on 2012/03/08 18:54:14 UTC
svn commit: r1298487 - in /incubator/openmeetings/trunk/singlewebapp:
WebContent/src/base/ WebContent/src/base/hibernate/
WebContent/src/modules/chat/
WebContent/src/modules/conference/flexibleConferenceRoom/
WebContent/src/modules/conference/flexibleC...
Author: sebawagner
Date: Thu Mar 8 17:54:13 2012
New Revision: 1298487
URL: http://svn.apache.org/viewvc?rev=1298487&view=rev
Log:
OPENMEETINGS-85 Fix and improve Chat Layout
+ add contact section to incubator website with committer list
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/chatParticipants.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/overAllChat.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/overAllChatOutput.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/overAllChatTabBottom.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/activitylist/activityList.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/baseRoomInnerList.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/interviewuserlist/interviewUserList.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participants.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/restrictedUserList.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/chatTabBottom.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/chatTabItemEmoticons.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/mainDashboard.lzx
incubator/openmeetings/trunk/singlewebapp/docs/team-list.html
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/ChatService.java
incubator/openmeetings/trunk/singlewebapp/xdocs/team-list.xml
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=1298487&r1=1298486&r2=1298487&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx Thu Mar 8 17:54:13 2012
@@ -1516,6 +1516,8 @@
canvas.startBrowser(value);
} else if(value[0]=='closeBrowserURL'){
canvas.closeBrowser(value);
+ } else if(value[0]=='clearOverallChatHistory'){
+ canvas._overallchatcontent.clear();
}
]]>
@@ -1894,73 +1896,6 @@
</handler>
</netRemoteCallHib>
- <!-- ###########################
- New Screen Sharing Methods
- @deprecated
- <netRemoteCallHib name="newScreenSharing" funcname="newScreenSharing">
- <handler name="ondata" args="value">
- <![CDATA[
- //The onResult-Handler will be called be the rtmpconnection
- if ($debug) Debug.write("newScreenSharing: ",value,value.deleted);
- if (!value.deleted) {
- new lz.sharingSession(canvas._screens,{name:'_screen',sharingSessionObject:value});
- } else {
- var screenObj = canvas._screens.searchForSession(value.s);
- if (screenObj != null) {
- screenObj.close();
- }
- }
- ]]>
- </handler>
- </netRemoteCallHib>
-
- newScreenCursorPosition
- @deprecated
- <netRemoteCallHib name="newScreenCursorPosition" funcname="newScreenCursorPosition">
- <handler name="ondata" args="value">
- <![CDATA[
- //The onResult-Handler will be called be the rtmpconnection
- //if ($debug) Debug.write("newScreenCursorPosition: ",value);
- var screenObj = canvas._screens.searchForSession(value.s);
- if (screenObj != null) {
- screenObj.updateCursor(value.x,value.y);
- }
- ]]>
- </handler>
- </netRemoteCallHib>
-
- @deprecated
- <netRemoteCallHib name="newScreenFrame" funcname="newScreenFrame">
- <handler name="ondata" args="value">
- <![CDATA[
- //The onResult-Handler will be called be the rtmpconnection
- //if ($debug) Debug.write("newScreenFrame: ",value);
- //canvas._screens._screen.sendNewFrame(value);
- var screenObj = canvas._screens.searchForSession(value.s);
- if (screenObj != null) {
- screenObj.sendNewFrame(value);
- }
- ]]>
- </handler>
- </netRemoteCallHib>
-
- @deprecated
- <netRemoteCallHib name="checkSharingSession" funcname="checkSharingSession">
- <handler name="ondata" args="value">
- <![CDATA[
- //The onResult-Handler will be called be the rtmpconnection
- if ($debug) Debug.write("checkSharingSession: ",value);
- //canvas._screens._screen.sendNewFrame(value);
- for (var i=0;i<value.length;i++) {
- if (!value[i].deleted) {
- new lz.sharingSession(canvas._screens,{name:'_screen',sharingSessionObject:value[i]});
- }
- }
- ]]>
- </handler>
- </netRemoteCallHib>
- -->
-
<!-- Recording of Meetings -->
<netRemoteCallHib name="checkForRecording" funcname="flvrecorderservice.checkForRecording">
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx?rev=1298487&r1=1298486&r2=1298487&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx Thu Mar 8 17:54:13 2012
@@ -78,6 +78,15 @@
<confmenucommand id="cmd_exportFileTIF" onselect="canvas.doWhiteboardActionmenu('exportFileTIF')" />
+ <attribute name="colorArray" value="null" />
+
+ <method name="getColorForUser">
+ <![CDATA[
+ var colorArray = [0x92E8A4,0xC2F1FF,0xFFFCAE,0xE8C792,0xFF8073,
+ 0xE8DB87,0xAFFFB8,0xBED4FF,0xE0BBE8,0xFFBBA5];
+ return colorArray[Math.round(Math.random()*10)];
+ ]]>
+ </method>
<dataset type="http" name="languageData" request="false"
src="${ canvas.currentlanguage+'.xml' }" proxied="false">
@@ -156,25 +165,20 @@
this.setAttribute('dashboardModuleStartScreen',canvas.myConfigSet.getPointer().xpathQuery('config/dashboardModuleStartScreen/text()'));
this.setAttribute('dashboardModuleCalendar',canvas.myConfigSet.getPointer().xpathQuery('config/dashboardModuleCalendar/text()'));
-
this.setAttribute('conferenceModuleRoomList',canvas.myConfigSet.getPointer().xpathQuery('config/conferenceModuleRoomList/text()'));
this.setAttribute('conferenceRoomModule',canvas.myConfigSet.getPointer().xpathQuery('config/conferenceRoomModule/text()'));
-
this.setAttribute('restrictedRoomModule',canvas.myConfigSet.getPointer().xpathQuery('config/restrictedRoomModule/text()'));
-
this.setAttribute('interviewRoomModule',canvas.myConfigSet.getPointer().xpathQuery('config/interviewRoomModule/text()'));
-
-
this.setAttribute('userSettingsModule',canvas.myConfigSet.getPointer().xpathQuery('config/userSettingsModule/text()'));
-
- this.setAttribute('recordModule',canvas.myConfigSet.getPointer().xpathQuery('config/recordModule/text()'));
-
+ this.setAttribute('recordModule',canvas.myConfigSet.getPointer().xpathQuery('config/recordModule/text()'));
+
this.setAttribute('httpRootKey',canvas.myConfigSet.getPointer().xpathQuery('config/httpRootKey/text()'));
-
this.setAttribute('protocol',canvas.myConfigSet.getPointer().xpathQuery('config/protocol/text()'));
-
this.setAttribute('proxyType',canvas.myConfigSet.getPointer().xpathQuery('config/proxyType/text()'));
+ //set user color
+ canvas.currentusercolor = canvas.getColorForUser();
+
var lc_SID = lz.Browser.getInitArg('lc_SID');
if($debug) Debug.write("lc_SID: ", lc_SID);
@@ -183,6 +187,8 @@
new lz.errorPopup(canvas,{'error':'You are loading the wrong SWF, there is no lz_SID given'});
return;
}
+
+
this.setAttribute('lc_SID', lc_SID);
this.setAttribute('vid_lc_name', this.lc_SID + "__videoLC");
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/chatParticipants.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/chatParticipants.lzx?rev=1298487&r1=1298486&r2=1298487&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/chatParticipants.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/chatParticipants.lzx Thu Mar 8 17:54:13 2012
@@ -75,8 +75,11 @@
]]>
</handler>
</netRemoteCallHib>
+
+ <view width="$once{ parent.width }" height="$once{ parent.height-1 }"
+ bgcolor="0xFFFFFF" opacity="0.2" />
- <image name="_userpic" stretches="both">
+ <image name="_userpic" stretches="both" x="1" y="1">
<handler name="onload">
<![CDATA[
if (this.height > 38) {
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/overAllChat.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/overAllChat.lzx?rev=1298487&r1=1298486&r2=1298487&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/overAllChat.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/overAllChat.lzx Thu Mar 8 17:54:13 2012
@@ -30,14 +30,10 @@
canvas._overallchatcontent=null;
</handler>
- <!-- background area. all of the chat contents are putted on this view. -->
- <view y="0" bgcolor="0xFFFFFF" x="0" width="${ parent.width }"
- height="$once{ parent.height }" />
-
<!-- message and buttons area-->
- <view y="2" bgcolor="0xFFFFFF" x="4" height="${ parent.height-2 }" >
+ <view y="0" x="196" height="${ parent.height }" >
<view name="_chatoutputborder" height="${ parent.height-48 }"
- bgcolor="$once{ canvas.basebgcolorizer }" width="${ parent.parent.width - 206 }">
+ width="${ parent.parent.width - 196 }">
<!-- 604 -->
<overAllChatOutput name="_chatoutput" x="1" y="1" >
<handler name="oninit">
@@ -47,19 +43,12 @@
</overAllChatOutput>
</view>
<overAllChatTabBottom name="_chattabbottom"
- y="${ parent.height-46 }" x="0" width="${ parent.parent.width - 206 }" />
+ y="${ parent.height-46 }" x="0" width="${ parent.parent.width - 196 }" />
</view>
- <!-- background of chat participant area -->
- <view x="${ parent.width-193 }" y="2" name="_chatparticipantsBorderLeft" bgcolor="$once{ canvas.basebgcolorizer }"
- height="$once{ parent.height-2 }" width="1" />
-
- <view x="${ parent.width-192 }" y="2" name="_chatparticipantsBorderTop" bgcolor="$once{ canvas.basebgcolorizer }"
- height="1" width="191" />
-
<!-- chat participants area -->
- <view x="${ parent.width-191 }" y="3" name="_chatparticipants" bgcolor="0xFFFFFF"
- height="${ parent.height-5 }" width="190" clip="true" >
+ <view x="0" y="0" name="_chatparticipants" bgcolor="0xFFFFFF"
+ height="${ parent.height-2 }" width="190" clip="true" >
<handler name="oninit">
this.getChatOverallUsers.doCall();
</handler>
@@ -94,7 +83,7 @@
]]>
</method>
- <view name="_list" width="176" layout="axis:y;spacing:1" />
+ <view name="_list" width="176" layout="axis:y;spacing:0" />
<vscrollbar name="_scroll" />
</view>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/overAllChatOutput.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/overAllChatOutput.lzx?rev=1298487&r1=1298486&r2=1298487&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/overAllChatOutput.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/overAllChatOutput.lzx Thu Mar 8 17:54:13 2012
@@ -34,6 +34,10 @@
this.getOverallChatHistory.doCall();
</method>
+ <method name="clear">
+ this._cbtext.clearChatOutput();
+ </method>
+
<netRemoteCallHib name="getOverallChatHistory" funcname="chatservice.getOverallChatHistory"
remotecontext="$once{ canvas.thishib }" >
<handler name="ondata" args="value">
@@ -107,7 +111,7 @@
]]>
</method>
- <view name="_cbtext" width="$once{ parent.width }" layout="axis:y;spacing:2" >
+ <view name="_cbtext" width="$once{ parent.width }" layout="axis:y;spacing:0" >
<method name="clearChatOutput">
<![CDATA[
if($debug) Debug.write("overAllChatOutput/clearChatOutput ",this.subviews.length);
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/overAllChatTabBottom.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/overAllChatTabBottom.lzx?rev=1298487&r1=1298486&r2=1298487&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/overAllChatTabBottom.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/overAllChatTabBottom.lzx Thu Mar 8 17:54:13 2012
@@ -20,28 +20,70 @@
-->
<library>
-<!--- View of the buttom area of chat. It contains buttons of message,emoticons,clear. -->
+<!---
+ View of the buttom area of chat. It contains buttons of message,emoticons,clear.
+ -->
<class name="overAllChatTabBottom" extends="view" >
<view x="0" y="0" height="20" width="${ parent.width }" name="message"
- bgcolor="$once{ canvas.basebgcolorizer }">
+ bgcolor="0xBBBBBB">
+
+ <attribute name="objMessage" value="null" />
+
<method name="getText">
return this._ctext.getText();
</method>
<method name="setText" args="txt">
this._ctext.setAttribute('text',txt);
</method>
- <customInputtext name="_ctext" width="${ parent.width-2 }" height="$once{ parent.height-2 }"
+ <customInputtext name="_ctext" width="${ parent.width-81 }" height="$once{ parent.height-2 }"
x="1" y="1" bgcolor="white" >
<handler name="onkeyup" args="key">
<![CDATA[
// 13 is return
if ((key==27) || (key==13)) {
- this.parent.parent._button._button.onclick.sendEvent();
+ this.parent._button.onclick.sendEvent();
}
]]>
</handler>
- </customInputtext>
+ </customInputtext>
+
+ <simpleLabelButton labelid="220" name="_button"
+ x="$once{ parent.width-80 }" width="80" height="20">
+ <handler name="onclick">
+ parent.objMessage = new Array ();
+ parent.objMessage[0] = 'chat';
+ //The server side will put time here
+ parent.objMessage[1] = "";
+ //Debug.write("Setting Message");
+ parent.objMessage[2] = 'newtextmessage';
+ parent.objMessage[3] = hib.userobject.login;
+ var message = this.parent.getText();
+ if (parent.parent._inverseWording.getValue()) message = canvas.reverseWordingsBySplit(message)
+ parent.objMessage[4] = message;
+ parent.objMessage[5] = canvas.currentusercolor;
+ parent.objMessage[6] = canvas.publicSID;
+ parent.objMessage[7] = canvas.isrtl;
+ parent.objMessage[8] = hib.userobject.user_id;
+ if (this.parent.parent.message.getText().length!=0){
+ //Debug.write("send: ",this.parent.objMessage);
+ parent.sendMessageToOverallChat.doCall();
+ this.parent.setText('');
+ }
+ </handler>
+ </simpleLabelButton>
+
+ <netRemoteCallHib name="sendMessageToOverallChat" funcname="chatservice.sendMessageToOverallChat"
+ remotecontext="$once{ canvas.thishib }" >
+ <netparam><method name="getValue"> return parent.parent.objMessage; </method></netparam>
+ <handler name="ondata" args="value">
+ <![CDATA[
+ //The onResult-Handler will be called be the rtmpconnection
+ if ($debug) Debug.write("chatservice.sendMessageToOverallChat getValue: ",value);
+ ]]>
+ </handler>
+ </netRemoteCallHib>
+
</view>
<labelCheckbox name="_inverseWording" x="2" y="24" labelid="580">
@@ -70,31 +112,6 @@
<view name="_button" width="140" y="22" align="right">
- <attribute name="objMessage" value="null" />
- <simpleLabelButton labelid="220" name="_button" width="80" height="21">
- <handler name="onclick">
- parent.objMessage = new Array ();
- parent.objMessage[0] = 'chat';
- //The server side will put time here
- parent.objMessage[1] = "";
- //Debug.write("Setting Message");
- parent.objMessage[2] = 'newtextmessage';
- parent.objMessage[3] = hib.userobject.login;
- var message = this.parent.parent.message.getText();
- if (parent.parent._inverseWording.getValue()) message = canvas.reverseWordingsBySplit(message)
- parent.objMessage[4] = message;
- parent.objMessage[5] = canvas.currentusercolor;
- parent.objMessage[6] = canvas.publicSID;
- parent.objMessage[7] = canvas.isrtl;
- parent.objMessage[8] = hib.userobject.user_id;
- if (this.parent.parent.message.getText().length!=0){
- //Debug.write("send: ",this.parent.objMessage);
- parent.sendMessageToOverallChat.doCall();
- this.parent.parent.message.setText('');
- }
- </handler>
- </simpleLabelButton>
-
<miniIcons y="2" x="82" resource="smile_chat_log_rsc" width="16" height="16"
showhandcursor="true">
<handler name="onclick">
@@ -107,30 +124,12 @@
</handler>
<labelTooltip labelid="445" />
</miniIcons>
- <!--
- <blueButton name="_show_emots" y="0" resourceItem="smile_chat_log_rsc"
- x_insetResource="2" y_insetResource="2" width="20" height="20"
- width_insetResource="16" height_insetResource="16">
- <handler name="onclick">
- //parent.clearOverallChat.doCall();
- var pick = new lz.emotIconsSelector(canvas,{
- btnRef:this.parent.parent,
- x:(this.getAttributeRelative('x',canvas)-140),
- y:(this.getAttributeRelative('y',canvas)-140)
- });
- lz.ModeManager.makeModal( pick );
- </handler>
- <labelTooltip labelid="445" />
- </blueButton>
- -->
<miniIcons y="2" x="102" resource="copy_chat_log_rsc" width="16" height="16"
showhandcursor="true">
<handler name="onclick">
<![CDATA[
-
var tString = canvas._overallchatcontent.getLog();
-
new lz.showChatLog(canvas,{
error:tString
});
@@ -138,23 +137,6 @@
</handler>
<labelTooltip labelid="1200" />
</miniIcons>
- <!--
- <blueButton width="20" height="20" resourceItem="copy_chat_log_rsc"
- x_insetResource="2" y_insetResource="2"
- width_insetResource="16" height_insetResource="16">
- <handler name="onclick">
- <![CDATA[
-
- var tString = canvas._overallchatcontent.getLog();
-
- new lz.showChatLog(canvas,{
- error:tString
- });
- ]]>
- </handler>
- <labelTooltip labelid="1200" />
- </blueButton>
- -->
<miniIcons y="2" x="122" resource="button_cancel_rsc" width="16" height="16"
showhandcursor="true">
@@ -163,48 +145,6 @@
</handler>
<labelTooltip labelid="442" />
</miniIcons>
- <!--
- <blueButton width="20" height="20" resourceItem="button_cancel_rsc"
- x_insetResource="2" y_insetResource="2"
- width_insetResource="16" height_insetResource="16">
-
- <handler name="onclick">
- parent.clearOverallChat.doCall();
- </handler>
- <labelTooltip labelid="442" />
- </blueButton>
- -->
-
- <!--
- <simpleLabelButton name="_show_emots" y="0">
- <handler name="onclick">
- //parent.clearOverallChat.doCall();
- var pick = new lz.emotIconsSelector(canvas,{
- btnRef:this.parent.parent,
- x:(this.getAttributeRelative('x',canvas)-140),
- y:(this.getAttributeRelative('y',canvas)-140)
- });
- lz.ModeManager.makeModal( pick );
- </handler>
- <view x="2" y="1">
- <handler name="oninit">
- var swfurl = canvas.protocol+'://'+canvas.rtmphostlocal+':'
- +canvas.red5httpport+canvas.httpRootKey+'public/emoticons/smile_btn.swf';
- this.setSource(swfurl);
- //if ($debug) Debug.write("CHAT SWFURL",swfurl);
- </handler>
- </view>
- <labelTooltip labelid="445" />
- </simpleLabelButton>
-
- <simpleLabelButton x="20" y="0" name="_delete_chat_log">
- <handler name="onclick">
- parent.clearOverallChat.doCall();
- </handler>
- <view x="3" y="1" resource="delete_chat_log_rsc" />
- <labelTooltip labelid="442" />
- </simpleLabelButton>
- -->
<netRemoteCallHib name="clearOverallChat" funcname="chatservice.clearOverallChat"
remotecontext="$once{ canvas.thishib }" >
@@ -217,118 +157,8 @@
</handler>
</netRemoteCallHib>
- <netRemoteCallHib name="sendMessageToOverallChat" funcname="chatservice.sendMessageToOverallChat"
- remotecontext="$once{ canvas.thishib }" >
- <netparam><method name="getValue"> return parent.parent.objMessage; </method></netparam>
- <handler name="ondata" args="value">
- <![CDATA[
- //The onResult-Handler will be called be the rtmpconnection
- if ($debug) Debug.write("chatservice.sendMessageToOverallChat getValue: ",value);
- ]]>
- </handler>
- </netRemoteCallHib>
-
</view>
-
</class>
-<!--
-layout="axis:x;spacing:2" >
-
- <view height="20" width="485" name="message"
- bgcolor="$once{ canvas.basebgcolorizer }">
- <attribute name="curserpos" value="0" type="number" />
- <method name="getText">
- return this._ctext.getText();
- </method>
- <method name="setText" args="txt">
- this._ctext.setAttribute('text',txt);
- </method>
- <inputtext name="_ctext" width="$once{ parent.width-2 }" height="$once{ parent.height-2 }"
- x="1" y="1" bgcolor="white" >
- <handler name="onkeyup" args="key">
- <![CDATA[
- // 13 is return
- if ((key==27) || (key==13)) {
- this.parent.parent._button.onclick.sendEvent();
- }
- ]]>
- </handler>
- </inputtext>
- </view>
-
- <attribute name="objMessage" value="null" />
- <simpleLabelButton labelid="220" name="_button" width="70" >
- <handler name="onclick">
- parent.objMessage = new Array ();
- parent.objMessage[0] = 'chat';
- //The server side will put time here
- parent.objMessage[1] = "";
- //Debug.write("Setting Message");
- parent.objMessage[2] = 'newtextmessage';
- parent.objMessage[3] = hib.userobject.login;
- var message = this.parent.message.getText();
- if (canvas.isrtl) message = canvas.reverseWords(message)
- parent.objMessage[4] = message;
- parent.objMessage[5] = canvas.currentusercolor;
- parent.objMessage[6] = canvas.currentuserpos;
- parent.objMessage[7] = canvas.isrtl;
- parent.objMessage[8] = hib.userobject.user_id;
- if (this.parent.message.getText().length!=0){
- //Debug.write("send: ",this.parent.objMessage);
- parent.sendMessageToOverallChat.doCall();
- this.parent.message.setAttribute('text','');
- }
- </handler>
- <labelTooltip labelid="444" />
- </simpleLabelButton>
-
- <simpleLabelButton name="_show_emots">
- <handler name="onclick">
- //parent.clearOverallChat.doCall();
- var pick = new lz.emotIconsSelector(canvas,{btnRef:this.parent,x:(this.getAttributeRelative('x',canvas)-140),y:(this.getAttributeRelative('y',canvas)-140)});
- lz.ModeManager.makeModal( pick );
- </handler>
- <view x="2" y="1">
- <handler name="oninit">
- var swfurl = canvas.protocol+'://'+canvas.rtmphostlocal+':'+canvas.red5httpport+canvas.httpRootKey+'public/emoticons/smile_btn.swf';
- this.setSource(swfurl);
- </handler>
- </view>
- <labelTooltip labelid="445" />
- </simpleLabelButton>
-
- <simpleLabelButton name="_delete_chat_log">
- <handler name="onclick">
- parent.clearOverallChat.doCall();
- </handler>
- <view x="3" y="2" resource="delete_chat_log_rsc" />
- <labelTooltip labelid="442" />
- </simpleLabelButton>
-
- <netRemoteCallHib name="clearOverallChat" funcname="chatservice.clearOverallChat"
- remotecontext="$once{ canvas.thishib }" >
- <handler name="ondata" args="value">
- <![CDATA[
- //The onResult-Handler will be called be the rtmpconnection
- Debug.write("clearChat : ",value);
- canvas._overallchatcontent._cbtext.clearChatOutput();
- canvas._overallchatcontent.getOverallChatHistory.doCall();
- ]]>
- </handler>
- </netRemoteCallHib>
-
- <netRemoteCallHib name="sendMessageToOverallChat" funcname="chatservice.sendMessageToOverallChat"
- remotecontext="$once{ canvas.thishib }" >
- <netparam><method name="getValue"> return parent.parent.objMessage;</method></netparam>
- <handler name="ondata" args="value">
- <![CDATA[
- //The onResult-Handler will be called be the rtmpconnection
- Debug.write("chatservice.sendMessageToOverallChat getValue : ",value);
- ]]>
- </handler>
- </netRemoteCallHib>
- -->
-
</library>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/activitylist/activityList.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/activitylist/activityList.lzx?rev=1298487&r1=1298486&r2=1298487&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/activitylist/activityList.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/activitylist/activityList.lzx Thu Mar 8 17:54:13 2012
@@ -567,7 +567,7 @@
]]>
</method>
- <view name="_list" y="20" height="180" bgcolor="0xFFFFFF"
+ <view name="_list" y="20" height="180" bgcolor="0xEEF0EB"
width="$once{ parent.width+8 }" clip="true">
<view name="_list">
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/baseRoomInnerList.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/baseRoomInnerList.lzx?rev=1298487&r1=1298486&r2=1298487&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/baseRoomInnerList.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/baseRoomInnerList.lzx Thu Mar 8 17:54:13 2012
@@ -29,26 +29,12 @@
<class name="baseRoomInnerList" extends="view" >
- <attribute name="colorArray" value="null" />
-
<handler name="oninit">
<![CDATA[
- //color array
- this.colorArray = [0x4174B1,0x00CC00,0xFFCC33,0xFF6633,0x4174B1,
- 0x00FF00,0xFFCC33,0xFF6633,0xFFA500,0xC71585];
-
this.initList();
]]>
</handler>
- <method name="getColorForUser" args="listNumber">
- <![CDATA[
-
- return this.colorArray[Math.round(Math.random()*10)];
-
- ]]>
- </method>
-
</class>
</library>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/interviewuserlist/interviewUserList.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/interviewuserlist/interviewUserList.lzx?rev=1298487&r1=1298486&r2=1298487&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/interviewuserlist/interviewUserList.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/interviewuserlist/interviewUserList.lzx Thu Mar 8 17:54:13 2012
@@ -104,7 +104,7 @@
if ($debug) Debug.write("canvas.becomemoderator: ",canvas.becomemoderator);
if ($debug) Debug.write("canvas.becomeSuperModerator: ",canvas.becomeSuperModerator);
- canvas.currentusercolor = parent._participants.getColorForUser();
+ canvas.currentusercolor = canvas.getColorForUser();
var organisation_id = 1;
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participants.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participants.lzx?rev=1298487&r1=1298486&r2=1298487&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participants.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participants.lzx Thu Mar 8 17:54:13 2012
@@ -113,7 +113,7 @@
if ($debug) Debug.write("canvas.becomemoderator: ",canvas.becomemoderator);
if ($debug) Debug.write("canvas.becomeSuperModerator: ",canvas.becomeSuperModerator);
- canvas.currentusercolor = parent.getColorForUser();
+ canvas.currentusercolor = canvas.getColorForUser();
var organisation_id = 1;
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/restrictedUserList.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/restrictedUserList.lzx?rev=1298487&r1=1298486&r2=1298487&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/restrictedUserList.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/restrictedUserList.lzx Thu Mar 8 17:54:13 2012
@@ -119,7 +119,7 @@
if ($debug) Debug.write("canvas.becomemoderator: ",canvas.becomemoderator);
if ($debug) Debug.write("canvas.becomeSuperModerator: ",canvas.becomeSuperModerator);
- canvas.currentusercolor = parent._participents.getColorForUser();
+ canvas.currentusercolor = canvas.getColorForUser();
var organisation_id = 1;
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=1298487&r1=1298486&r2=1298487&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 Thu Mar 8 17:54:13 2012
@@ -27,7 +27,7 @@
#################################################
-->
- <class name="baseTabChatPanel" extends="basePropertyPanel">
+ <class name="baseTabChatPanel" extends="basePropertyPanel" >
<attribute name="fadeDelegate" value="null" />
<attribute name="doBlink" value="false" type="boolean" />
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=1298487&r1=1298486&r2=1298487&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 Thu Mar 8 17:54:13 2012
@@ -23,7 +23,7 @@
<!--- chat output specialized for video-conference -->
<class name="chatOutput" extends="view" height="${ parent.height-2 }"
- clip="true" bgcolor="0xFFFFFF" width="${ parent.width-2 }" >
+ clip="true" width="${ parent.width-2 }" bgcolor="0xFFFFFF">
<attribute name="isAlreadyLoaded" value="false" type="boolean"/>
<!---
@@ -137,7 +137,7 @@
]]>
</method>
- <view name="_cbtext" width="${ parent.width - 14 }" layout="axis:y;spacing:2" >
+ <view name="_cbtext" width="${ parent.width }" layout="axis:y;spacing:0" >
<method name="clearChatOutput">
<![CDATA[
while (this.subviews.length>0){
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=1298487&r1=1298486&r2=1298487&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 Thu Mar 8 17:54:13 2012
@@ -24,16 +24,15 @@
Chat tabpane class. It contains chatOutput-class and catTabBottom-class.
This is used in the conference.
-->
-<class name="chatTab" extends="simpleBaseTabpane" >
+<class name="chatTab" extends="simpleBaseTabpane" bgcolor="0xEEF0EB" x="0">
<!--
bgcolor="$once{ canvas.basebgcolorizer }"
-->
- <view name="_chatoutputborder" height="${ parent.height-48 }"
- bgcolor="$once{ canvas.basebgcolorizer }" width="${ parent.width-4 }">
+ <view name="_chatoutputborder" height="${ parent.height-46 }" width="${ parent.width }">
- <chatOutput name="_chatoutput" x="1" y="1" >
+ <chatOutput name="_chatoutput" x="2" y="1" >
<handler name="oninit">
canvas._chatcontent = this;
</handler>
@@ -42,7 +41,7 @@ This is used in the conference.
</view>
<chatTabBottom name="_chattabbottom"
- y="${ parent.height-46 }" x="0" width="${ parent.width-2 }" />
+ y="${ parent.height-42 }" x="4" width="${ parent.width-6 }" />
</class>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/chatTabBottom.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/chatTabBottom.lzx?rev=1298487&r1=1298486&r2=1298487&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/chatTabBottom.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/chatTabBottom.lzx Thu Mar 8 17:54:13 2012
@@ -21,10 +21,10 @@
<library>
<!--- View of the buttom area of chat. It contains buttons of message,emoticons,clear. -->
-<class name="chatTabBottom" extends="view" >
+<class name="chatTabBottom" extends="view" height="42">
<view x="0" y="0" height="20" width="${ parent.width-2 }" name="message"
- bgcolor="$once{ canvas.basebgcolorizer }">
+ bgcolor="0xBBBBBB">
<method name="getText">
return this._ctext.getText();
</method>
@@ -35,19 +35,55 @@
x="1" y="1" bgcolor="white" >
<handler name="onkeyup" args="key">
<![CDATA[
- if ($debug) Debug.write("onkeyup");
-
var reverse = canvas.reverseAll(parent.getText());
- if ($debug) Debug.write("reverse : ", reverse);
- // parent.setText(reverse);
+ // parent.setText(reverse);
// 13 is return
if ((key==27) || (key==13)) {
- this.parent.parent._button._button.onclick.sendEvent();
+ this.parent._button.onclick.sendEvent();
}
]]>
</handler>
- </customInputtext>
+ </customInputtext>
+
+ <attribute name="objMessage" value="null" />
+
+ <simpleLabelButton name="_button" labelid="220" height="21" width="80"
+ x="$once{ parent.width-80 }" >
+ <handler name="onclick">
+ parent.objMessage = new Array ();
+ parent.objMessage[0] = 'chat';
+ //The server side will put time here
+ parent.objMessage[1] = "";
+ //Debug.write("Setting Message");
+ parent.objMessage[2] = 'newtextmessage';
+ parent.objMessage[3] = hib.userobject.login;
+ var message = this.parent.getText();
+ //if (parent.parent._inverseWording.getValue()) message = canvas.reverseAll(message)
+ parent.objMessage[4] = message;
+ parent.objMessage[5] = canvas.currentusercolor;
+ parent.objMessage[6] = canvas.publicSID;
+ parent.objMessage[7] = canvas.isrtl;
+ parent.objMessage[8] = hib.userobject.user_id;
+ if (this.parent.getText().length!=0){
+ //Debug.write("send: ",this.parent.objMessage);
+ parent.sendMessageWithClient.doCall();
+ this.parent.setText('');
+ }
+ </handler>
+ </simpleLabelButton>
+
+ <netRemoteCallHib name="sendMessageWithClient" funcname="chatservice.sendMessageWithClient"
+ remotecontext="$once{ canvas.thishib }" >
+ <netparam><method name="getValue"> return parent.parent.objMessage; </method></netparam>
+ <handler name="ondata" args="value">
+ <![CDATA[
+ //The onResult-Handler will be called be the rtmpconnection
+ if ($debug) Debug.write("chatservice.sendMessageWithClient getValue : ",value);
+ ]]>
+ </handler>
+ </netRemoteCallHib>
+
</view>
<labelCheckbox name="_inverseWording" x="2" y="24" labelid="580">
@@ -76,46 +112,6 @@
<view name="_button" width="140" y="22" align="right">
- <attribute name="objMessage" value="null" />
-
- <simpleLabelButton name="_button" labelid="220" height="21" width="80" >
- <handler name="onclick">
- parent.objMessage = new Array ();
- parent.objMessage[0] = 'chat';
- //The server side will put time here
- parent.objMessage[1] = "";
- //Debug.write("Setting Message");
- parent.objMessage[2] = 'newtextmessage';
- parent.objMessage[3] = hib.userobject.login;
- var message = this.parent.parent.message.getText();
- //if (parent.parent._inverseWording.getValue()) message = canvas.reverseAll(message)
- parent.objMessage[4] = message;
- parent.objMessage[5] = canvas.currentusercolor;
- parent.objMessage[6] = canvas.publicSID;
- parent.objMessage[7] = canvas.isrtl;
- parent.objMessage[8] = hib.userobject.user_id;
- if (this.parent.parent.message.getText().length!=0){
- //Debug.write("send: ",this.parent.objMessage);
- parent.sendMessageWithClient.doCall();
- this.parent.parent.message.setText('');
- }
- </handler>
- </simpleLabelButton>
-
- <!--
- <miniIcons resource="copy_chat_log_rsc" y="0" x="$once{ parent.width - 72 }" width="16" height="16"
- showhandcursor="true">
- <handler name="onclick">
- if ($debug) Debug.write("Start Conference");
- new lz.chatParticipantsInviteConference(canvas,{
- publicSID:parent.publicSID,
- user_id:parent.user_id
- });
- </handler>
- <labelTooltip labelid="1131" />
- </miniIcons>
- -->
-
<miniIcons y="2" x="82" resource="smile_chat_log_rsc" width="16" height="16"
showhandcursor="true">
<handler name="onclick">
@@ -128,31 +124,12 @@
</handler>
<labelTooltip labelid="445" />
</miniIcons>
- <!--
- <blueButton name="_show_emots" y="0" resourceItem="smile_chat_log_rsc"
- x_insetResource="2" y_insetResource="2" width="20" height="20"
- width_insetResource="16" height_insetResource="16">
- <handler name="onclick">
- //parent.clearOverallChat.doCall();
- var pick = new lz.emotIconsSelector(canvas,{
- btnRef:this.parent.parent,
- x:(this.getAttributeRelative('x',canvas)-140),
- y:(this.getAttributeRelative('y',canvas)-140)
- });
- lz.ModeManager.makeModal( pick );
- </handler>
- <labelTooltip labelid="445" />
-
- </blueButton>
- -->
<miniIcons y="2" x="102" resource="copy_chat_log_rsc" width="16" height="16"
showhandcursor="true">
<handler name="onclick">
<![CDATA[
-
var tString = canvas._chatcontent.getLog();
-
new lz.showChatLog(canvas,{
error:tString
});
@@ -160,23 +137,6 @@
</handler>
<labelTooltip labelid="1200" />
</miniIcons>
- <!--
- <blueButton width="20" height="20" resourceItem="copy_chat_log_rsc"
- x_insetResource="2" y_insetResource="2"
- width_insetResource="16" height_insetResource="16">
- <handler name="onclick">
- <![CDATA[
-
- var tString = canvas._chatcontent.getLog();
-
- new lz.showChatLog(canvas,{
- error:tString
- });
- ]]>
- </handler>
- <labelTooltip labelid="1200" />
- </blueButton>
- -->
<miniIcons y="2" x="122" resource="button_cancel_rsc" width="16" height="16"
showhandcursor="true">
@@ -190,22 +150,6 @@
</handler>
<labelTooltip labelid="442" />
</miniIcons>
- <!--
- <blueButton width="20" height="20" resourceItem="button_cancel_rsc"
- x_insetResource="2" y_insetResource="2"
- width_insetResource="16" height_insetResource="16">
-
- <handler name="onclick">
- if (!canvas.ismoderator) {
- //Do not allow
- new lz.labelerrorPopup(canvas,{errorlabelid:783});
- return;
- }
- parent.clearChat.doCall();
- </handler>
- <labelTooltip labelid="442" />
- </blueButton>
- -->
<view width="1" />
@@ -215,25 +159,12 @@
<![CDATA[
//The onResult-Handler will be called be the rtmpconnection
if ($debug) Debug.write("clearChat : ",value);
-
]]>
</handler>
</netRemoteCallHib>
- <netRemoteCallHib name="sendMessageWithClient" funcname="chatservice.sendMessageWithClient"
- remotecontext="$once{ canvas.thishib }" >
- <netparam><method name="getValue"> return parent.parent.objMessage; </method></netparam>
- <handler name="ondata" args="value">
- <![CDATA[
- //The onResult-Handler will be called be the rtmpconnection
- if ($debug) Debug.write("chatservice.sendMessageWithClient getValue : ",value);
- ]]>
- </handler>
- </netRemoteCallHib>
-
</view>
-
</class>
</library>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/chatTabItemEmoticons.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/chatTabItemEmoticons.lzx?rev=1298487&r1=1298486&r2=1298487&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/chatTabItemEmoticons.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/chatTabItemEmoticons.lzx Thu Mar 8 17:54:13 2012
@@ -21,7 +21,7 @@
<library>
-<class name="chatTabItemEmoticons" extends="view" width="$once{ parent.width - 14 }" >
+<class name="chatTabItemEmoticons" extends="view" width="$once{ parent.width - 14 }" bgcolor="$once{ this.usercolor }">
<attribute name="user_id" value="0" type="number" />
<attribute name="username" value="" type="string" />
@@ -68,7 +68,11 @@
]]>
</handler>
- <image name="_userpic" stretches="both">
+ <view name="bg" width="179" height="$once{ parent.height-1 }" bgcolor="0xFFFFFF"
+ opacity="0.1">
+ </view>
+
+ <image name="_userpic" stretches="both" x="1" y="1">
<handler name="onload">
<![CDATA[
if (this.height > 38) {
@@ -77,17 +81,22 @@
this.setAttribute('height',38);
this.setAttribute('width',width);
}
+ if (this.width > 38) {
+ var height = this.height/(this.width/38);
+ this.setAttribute('height',height);
+ this.setAttribute('width',38);
+ }
]]>
</handler>
</image>
+ <text text="$once{ parent.username }" x="40" resize="false" fontsize="11" multiline="true"
+ width="140" height="$once{ parent.height }"
+ name="header_user">
+ </text>
- <text text="$once{ parent.username }" x="40" resize="false" fontsize="10"
- width="$once{ parent.width - 40 }" bgcolor="$once{ parent.usercolor }"
- name="header_user" />
-
<miniIcons name="add" resource="edit_add_rsc" width="16" height="16"
- y="0" x="$once{ parent.width - 114 }" showhandcursor="true">
+ y="2" x="$once{ parent.width - 114 }" showhandcursor="true">
<handler name="onclick">
if ($debug) Debug.write("Start Conference");
if (hib.userobject.user_id == parent.user_id) {
@@ -120,55 +129,15 @@
</handler>
</netRemoteCallHib>
- <miniIcons name="private_message_add" resource="private_message_add_rsc" width="16" height="16"
- y="0" x="$once{ parent.width - 94 }" showhandcursor="true">
- <handler name="onclick">
- if ($debug) Debug.write("Start Conference");
- new lz.newPrivateMessage(canvas,{
- x:200,y:120,
- refObj:null,
- minimizable:true,
- maximizable:true,
- userObject:null,
- isdragable:true,
- user_id:parent.user_id,
- width:canvas.width-300,
- height:canvas.height-130
- });
- </handler>
- <labelTooltip labelid="1253" />
- </miniIcons>
-
- <miniIcons resource="user_profile_rsc" width="16" height="16"
- y="0" x="$once{ parent.width - 74 }" showhandcursor="true">
- <handler name="onclick">
- if ($debug) Debug.write("Start Conference");
- new lz.viewUserProfileWindow(canvas,{
- userId:parent.user_id
- });
- </handler>
- <labelTooltip labelid="1236" />
- </miniIcons>
-
- <miniIcons visible="$once{ !parent.isDirectLink }" y="0" x="$once{ parent.width - 54 }"
- resource="start_conference2_rsc" width="16" height="16"
- showhandcursor="true">
- <handler name="onclick">
- if ($debug) Debug.write("Start Conference");
- new lz.chatParticipantsInviteConference(canvas,{
- publicSID:parent.publicSID,
- user_id:parent.user_id
- });
- </handler>
- <labelTooltip labelid="1131" />
- </miniIcons>
- <text text="$once{ parent.usertime }" align="right"
- fontsize="10" name="header_time" />
<!-- space between each line of text -->
<attribute name="leading" value="5" type="number" />
- <text multiline="true" x="40" y="20" width="$once{ parent.width - 40 }" fontsize="11" selectable="true" name="multi" >
+ <view name="bg_main" x="180" width="$once{ parent.width - 180 }" height="$once{ parent.height-1 }"
+ opacity="0.3" bgcolor="0xFFFFFF">
+ </view>
+
+ <text multiline="true" x="180" width="$once{ parent.width - 290 }" fontsize="11" selectable="true" name="multi" >
<handler name="oninit">
<![CDATA[
@@ -230,7 +199,6 @@
this.setAttribute('height',this.sprite.__LZtextclip.textHeight+12);
}
else{
-
var t = "";
var items = parent.messageObj;
@@ -241,10 +209,12 @@
}
this.setAttribute('text',this.getText()+ t);
-
-
}
+ parent.setAttribute('height',this.height);
+ parent.header_user.setAttribute('height',this.height);
+ parent.bg.setAttribute('height',this.height-1);
+ parent.bg_main.setAttribute('height',this.height-1);
]]>
</handler>
@@ -258,6 +228,51 @@
</method>
</text>
+
+ <miniIcons name="private_message_add" resource="private_message_add_rsc" width="16" height="16"
+ y="0" x="$once{ parent.width - 94 }" showhandcursor="true">
+ <handler name="onclick">
+ if ($debug) Debug.write("Start Conference");
+ new lz.newPrivateMessage(canvas,{
+ x:200,y:120,
+ refObj:null,
+ minimizable:true,
+ maximizable:true,
+ userObject:null,
+ isdragable:true,
+ user_id:parent.user_id,
+ width:canvas.width-300,
+ height:canvas.height-130
+ });
+ </handler>
+ <labelTooltip labelid="1253" />
+ </miniIcons>
+
+ <miniIcons resource="user_profile_rsc" width="16" height="16"
+ y="0" x="$once{ parent.width - 74 }" showhandcursor="true">
+ <handler name="onclick">
+ if ($debug) Debug.write("Start Conference");
+ new lz.viewUserProfileWindow(canvas,{
+ userId:parent.user_id
+ });
+ </handler>
+ <labelTooltip labelid="1236" />
+ </miniIcons>
+
+ <miniIcons visible="$once{ !parent.isDirectLink }" y="0" x="$once{ parent.width - 54 }"
+ resource="start_conference2_rsc" width="16" height="16"
+ showhandcursor="true">
+ <handler name="onclick">
+ if ($debug) Debug.write("Start Conference");
+ new lz.chatParticipantsInviteConference(canvas,{
+ publicSID:parent.publicSID,
+ user_id:parent.user_id
+ });
+ </handler>
+ <labelTooltip labelid="1131" />
+ </miniIcons>
+ <text text="$once{ parent.usertime }" align="right" fgcolor="0xAAAAAA"
+ fontsize="10" name="header_time" />
</class>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/mainDashboard.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/mainDashboard.lzx?rev=1298487&r1=1298486&r2=1298487&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/mainDashboard.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/mainDashboard.lzx Thu Mar 8 17:54:13 2012
@@ -227,7 +227,7 @@
</view>
- <view name="_boxes" height="${ parent.height-44 }" width="${ parent.width }" y="43">
+ <view name="_boxes" height="${ parent.height-42 }" width="${ parent.width }" y="41">
<view name="myMeetings" height="${ parent.height }" width="${ parent.width }" visibility="hidden" >
Modified: incubator/openmeetings/trunk/singlewebapp/docs/team-list.html
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/docs/team-list.html?rev=1298487&r1=1298486&r2=1298487&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/docs/team-list.html (original)
+++ incubator/openmeetings/trunk/singlewebapp/docs/team-list.html Thu Mar 8 17:54:13 2012
@@ -29,15 +29,13 @@ limitations under the License.
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
<meta name="author" value="
- Sebastian Wagner">
+ Sebastian Wagner
+ ">
<meta name="email" value="sebawagner@apache.org">
-
-
-
-
-
+
+
<title>Apache OpenMeetings - Project Team</title>
<link rel="stylesheet" type="text/css" href="css/openmeetings.css">
<link rel="stylesheet" type="text/css" href="css/jquery-ui.css">
@@ -861,22 +859,25 @@ limitations under the License.
</td></tr>
<tr><td>
<blockquote>
- <p>
-The people listed below have made significant contributions to Podling by
-working long and hard to make quality software for the rest of the world to
-use.
-</p>
- <p>
-If you would like to contribute to Podling, please see the
-LINK TO CONFLUENCE
- to find areas where you can contribute.
-If there is nothing in there that suits your interest, but you still have
-ideas, please feel free to suggest them on the mailing list.
-</p>
- <p>
-If you would like to become a committer, please see
-<a href="get-involved.html">Get Involved</a>.
-</p>
+ <p>
+ The people listed below have made significant contributions to Podling
+ by
+ working long and hard to make quality software for the rest of the world to
+ use.
+ </p>
+ <p>
+ If you would like to contribute to Podling, please see the
+ LINK TO CONFLUENCE
+ to find areas where you can contribute.
+ If there is nothing in there that suits your interest, but you still
+ have
+ ideas, please feel free to suggest them on the mailing list.
+ </p>
+ <p>
+ If you would like to become a committer, please see
+ <a href="get-involved.html">Get Involved</a>
+ .
+ </p>
<table>
<tr>
<th bgcolor="#039acc" colspan="" rowspan="" valign="top" align="left">
@@ -889,6 +890,11 @@ If you would like to become a committer,
Organization
</font>
</th>
+ <th bgcolor="#039acc" colspan="" rowspan="" valign="top" align="left">
+ <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+ Contact/Website
+ </font>
+</th>
</tr>
<tr>
<td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
@@ -901,6 +907,14 @@ If you would like to become a committer,
Independent
</font>
</td>
+ <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
+ <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+
+ <a href="https://twitter.com/#!/dead_lock" target="_BLANK" rel="nofollow">https://twitter.com/#!/dead_lock
+ </a>
+
+ </font>
+</td>
</tr>
<tr>
<td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
@@ -913,6 +927,11 @@ If you would like to become a committer,
Independent
</font>
</td>
+ <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
+ <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+
+ </font>
+</td>
</tr>
<tr>
<td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
@@ -925,6 +944,11 @@ If you would like to become a committer,
Independent
</font>
</td>
+ <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
+ <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+
+ </font>
+</td>
</tr>
<tr>
<td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
@@ -937,6 +961,11 @@ If you would like to become a committer,
Independent
</font>
</td>
+ <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
+ <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+
+ </font>
+</td>
</tr>
<tr>
<td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
@@ -949,6 +978,11 @@ If you would like to become a committer,
Independent
</font>
</td>
+ <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
+ <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+
+ </font>
+</td>
</tr>
<tr>
<td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
@@ -961,6 +995,11 @@ If you would like to become a committer,
Independent
</font>
</td>
+ <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
+ <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+
+ </font>
+</td>
</tr>
<tr>
<td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
@@ -973,6 +1012,11 @@ If you would like to become a committer,
Independent
</font>
</td>
+ <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
+ <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+
+ </font>
+</td>
</tr>
<tr>
<td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
@@ -985,6 +1029,11 @@ If you would like to become a committer,
Independent
</font>
</td>
+ <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
+ <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+
+ </font>
+</td>
</tr>
</table>
</blockquote>
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/ChatService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/ChatService.java?rev=1298487&r1=1298486&r2=1298487&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/ChatService.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/ChatService.java Thu Mar 8 17:54:13 2012
@@ -26,12 +26,14 @@ import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.List;
+import java.util.Map;
import java.util.Set;
import org.openmeetings.app.OpenmeetingsVariables;
import org.openmeetings.app.conference.session.RoomClient;
import org.openmeetings.app.remote.red5.ClientListManager;
import org.openmeetings.app.remote.red5.EmoticonsManager;
+import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
import org.openmeetings.utils.stringhandlers.ChatString;
import org.red5.logging.Red5LoggerFactory;
import org.red5.server.api.IConnection;
@@ -40,6 +42,7 @@ import org.red5.server.api.service.IPend
import org.red5.server.api.service.IPendingServiceCallback;
import org.red5.server.api.service.IServiceCapableConnection;
import org.slf4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
/**
*
@@ -47,6 +50,9 @@ import org.slf4j.Logger;
*
*/
public class ChatService implements IPendingServiceCallback {
+
+ @Autowired
+ private ScopeApplicationAdapter scopeApplicationAdapter;
//the overall chatroom is jsut another room
private static final Long overallChatRoomName = new Long(-1);
@@ -409,6 +415,11 @@ public class ChatService implements IPen
myChats.put(overallChatRoomName,myChatList);
+ //Send event to clear to all participants
+ Map<Integer,String> newMessage = new HashMap<Integer,String>();
+ newMessage.put(0, "clearOverallChatHistory");
+ scopeApplicationAdapter.sendMessageToMembers(newMessage);
+
return myChatList;
} catch (Exception err) {
Modified: incubator/openmeetings/trunk/singlewebapp/xdocs/team-list.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/xdocs/team-list.xml?rev=1298487&r1=1298486&r2=1298487&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/xdocs/team-list.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/xdocs/team-list.xml Thu Mar 8 17:54:13 2012
@@ -1,63 +1,97 @@
<?xml version="1.0"?>
-<!--
-
- Copyright 2006 The Apache Software Foundation
-
- Licensed 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.
--->
+<!-- Copyright 2006 The Apache Software Foundation Licensed 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. -->
<document>
-<properties>
-<title>Project Team</title>
-<author email="sebawagner@apache.org">
- Sebastian Wagner</author>
-</properties>
-
-<body>
-
-<section name="OpenMeetings Committers">
-
-<p>
-The people listed below have made significant contributions to Podling by
-working long and hard to make quality software for the rest of the world to
-use.
-</p>
-
-<p>
-If you would like to contribute to Podling, please see the
-LINK TO CONFLUENCE
- to find areas where you can contribute.
-If there is nothing in there that suits your interest, but you still have
-ideas, please feel free to suggest them on the mailing list.
-</p>
-<p>
-If you would like to become a committer, please see
-<a href="get-involved.html">Get Involved</a>.
-</p>
-
-<table>
-<tr><th>Name</th><th>Organization</th></tr>
-<tr><td>Sebastian Wagner</td><td>Independent</td></tr>
-<tr><td>Alexei Fedotov</td><td>Independent</td></tr>
-<tr><td>Evgeny Rovinsky</td><td>Independent</td></tr>
-<tr><td>Maxim Solodovnik</td><td>Independent</td></tr>
-<tr><td>Oliver Becherer</td><td>Independent</td></tr>
-<tr><td>Eugen Schwert</td><td>Independent</td></tr>
-<tr><td>Sascha Xander</td><td>Independent</td></tr>
-<tr><td>Johnny Strom</td><td>Independent</td></tr>
-</table>
-</section>
+ <properties>
+ <title>Project Team</title>
+ <author email="sebawagner@apache.org">
+ Sebastian Wagner
+ </author>
+ </properties>
+
+ <body>
+
+ <section name="OpenMeetings Committers">
+
+ <p>
+ The people listed below have made significant contributions to Podling
+ by
+ working long and hard to make quality software for the rest of the world to
+ use.
+ </p>
+
+ <p>
+ If you would like to contribute to Podling, please see the
+ LINK TO CONFLUENCE
+ to find areas where you can contribute.
+ If there is nothing in there that suits your interest, but you still
+ have
+ ideas, please feel free to suggest them on the mailing list.
+ </p>
+ <p>
+ If you would like to become a committer, please see
+ <a href="get-involved.html">Get Involved</a>
+ .
+ </p>
+
+ <table>
+ <tr>
+ <th>Name</th>
+ <th>Organization</th>
+ <th>Contact/Website</th>
+ </tr>
+ <tr>
+ <td>Sebastian Wagner</td>
+ <td>Independent</td>
+ <td>
+ <a href="https://twitter.com/#!/dead_lock" target="_BLANK" rel="nofollow">https://twitter.com/#!/dead_lock
+ </a>
+ </td>
+ </tr>
+ <tr>
+ <td>Alexei Fedotov</td>
+ <td>Independent</td>
+ <td></td>
+ </tr>
+ <tr>
+ <td>Evgeny Rovinsky</td>
+ <td>Independent</td>
+ <td></td>
+ </tr>
+ <tr>
+ <td>Maxim Solodovnik</td>
+ <td>Independent</td>
+ <td></td>
+ </tr>
+ <tr>
+ <td>Oliver Becherer</td>
+ <td>Independent</td>
+ <td></td>
+ </tr>
+ <tr>
+ <td>Eugen Schwert</td>
+ <td>Independent</td>
+ <td></td>
+ </tr>
+ <tr>
+ <td>Sascha Xander</td>
+ <td>Independent</td>
+ <td></td>
+ </tr>
+ <tr>
+ <td>Johnny Strom</td>
+ <td>Independent</td>
+ <td></td>
+ </tr>
+ </table>
+ </section>
-</body>
+ </body>
</document>