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/04/18 17:49:57 UTC
svn commit: r1327550 - in /incubator/openmeetings/trunk/singlewebapp:
WebContent/languages/ WebContent/src/base/hibernate/
WebContent/src/modules/conference/flexibleConferenceRoom/
WebContent/src/modules/conference/flexibleConferenceRoom/activitylist/ ...
Author: sebawagner
Date: Wed Apr 18 15:49:56 2012
New Revision: 1327550
URL: http://svn.apache.org/viewvc?rev=1327550&view=rev
Log:
Fixes: OPENMEETINGS-136 Duplicate message in Activity section
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/activitylist/activityList.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/moderationMiniIconsEventUserList.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participants.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/popups/autoLoader.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/popups/confirmationSingle.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/moderationMiniIconRestricted.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/dragItemFileExplorer.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/presentations/items/baseListPresentationItemExplorer.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/tabbar/baseChooseIconView.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/baseFileExplorerItem.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/chartFileExplorerItem.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/folderFileExplorerItem.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/rootFileExplorerItem.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/wmlFileExplorerItem.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/basePropertyPanelWhiteboard.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/dragItemFLVExplorer.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/remote/rtmpConnection.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/Sessionmanagement.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/MainService.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml?rev=1327550&r1=1327549&r2=1327550&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml Wed Apr 18 15:49:56 2012
@@ -2795,15 +2795,15 @@ see http://incubator.apache.org/openmeet
</string>
<string id="693" name="apply for mod message">
- <value>würde gerne die Moderation übernehmen. Benutzen Sie die Status-Symbole neben dem Benutzernamen in der Benutzerliste um eine Moderaton hinzuzufügen oder zu entfernen.</value>
+ <value>würde gerne die Moderation übernehmen.</value>
</string>
<string id="694" name="apply for whiteboard">
- <value>würde gerne auf dem Zeichenbrett zeichnen. Benutzen Sie die Status-Symbole neben der Benutzerliste um das Recht etwas auf dem Zeichenbrett zu zeichnen zu vergeben oder zu verwehren.</value>
+ <value>würde gerne auf dem Zeichenbrett zeichnen.</value>
</string>
<string id="695" name="695">
- <value>würde gerne sein Audio/Video mit anderen teilen. Benutzen Sie die Status-Symbole neben der Benutzerliste, um das Recht mit anderen Video/Audio zu teilen zu vergeben oder zu verwehren.</value>
+ <value>würde gerne sein Audio/Video mit anderen teilen.</value>
</string>
<string id="696" name="moderation message">
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml?rev=1327550&r1=1327549&r2=1327550&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml Wed Apr 18 15:49:56 2012
@@ -2548,7 +2548,7 @@ see http://incubator.apache.org/openmeet
</string>
<string id="631" name="lbl_name">
- <value>Lsst name</value>
+ <value>Surname</value>
</string>
<string id="632" name="lbl_email">
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=1327550&r1=1327549&r2=1327550&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx Wed Apr 18 15:49:56 2012
@@ -1945,6 +1945,26 @@
</handler>
</netRemoteCallHib>
+ <netRemoteCallHib name="setCanGiveAudio" funcname="whiteboardservice.setCanGiveAudio"
+ remotecontext="$once{ canvas.thishib }">
+ <attribute name="publicSID" value="" type="string" />
+ <attribute name="canGiveAudio" value="true" type="boolean" />
+ <method name="sendValue" args="publicSID,giveAudio">
+ this.publicSID = publicSID;
+ this.canGiveAudio = giveAudio;
+ this.doCall();
+ </method>
+ <netparam><method name="getValue">return canvas.sessionId;</method></netparam>
+ <netparam><method name="getValue">return parent.publicSID;</method></netparam>
+ <netparam><method name="getValue">return parent.canGiveAudio;</method></netparam>
+ <handler name="ondata" args="value">
+ <![CDATA[
+ //The onResult-Handler will be called be the rtmpconnection
+ if ($debug) Debug.write("setCanGiveAudio : ",value);
+ ]]>
+ </handler>
+ </netRemoteCallHib>
+
</class>
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=1327550&r1=1327549&r2=1327550&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 Wed Apr 18 15:49:56 2012
@@ -151,16 +151,14 @@
labelidToolTipOkButton="1428">
<method name="applyObject">
- canvas.thishib.setCanGiveAudio.publicSID = this.rcl.publicSID;
- canvas.thishib.setCanGiveAudio.canGiveAudio = true;
- canvas.thishib.setCanGiveAudio.doCall();
+ canvas.thishib.setCanGiveAudio.sendValue(this.rcl.publicSID,true);
this.sendClearMessage(true);
</method>
<view resource="participants_exclusive_audio_rsc" x="2" y="2" />
- <labelText text="$once{ parent.message }" multiline="true" x="40"
- width="$once{ parent.width - 60 }" font="Helvetica"/>
+ <labelText text="$once{ parent.message }" multiline="true" x="20"
+ width="$once{ parent.width - 40 }" font="Helvetica"/>
</class>
@@ -175,8 +173,8 @@
<view resource="unmute_btn_rsc" x="2" y="2" />
- <labelText text="$once{ parent.message }" multiline="true" x="40"
- width="$once{ parent.width - 60 }" font="Helvetica"/>
+ <labelText text="$once{ parent.message }" multiline="true" x="20"
+ width="$once{ parent.width - 40 }" font="Helvetica"/>
</class>
@@ -382,7 +380,7 @@
canvas.getLabelName(1082) + " [" + getStringTimeByTimeStamp(tStamp) + "]";
}
- new lz.activityListRestrictedRoomApplyForMuteOn(this._list._list,{
+ new lz.activityListRestrictedRoomRemote(this._list._list,{
message:txt,
width:this._list.width-14,
rcl:rcl,
@@ -580,7 +578,7 @@
]]>
</method>
- <simplelayout name="_layout" axis="y" spacing="2" />
+ <simplelayout name="_layout" axis="y" spacing="1" />
</view>
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=1327550&r1=1327549&r2=1327550&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 Wed Apr 18 15:49:56 2012
@@ -42,11 +42,7 @@
this._canDraw.isActive = false;
//this._canDraw._text.setAttribute("text",canvas.getLabelName(681));
this._canDrawModerator.setAttribute("visibility","hidden");
- this._muteDevice._tip.setAttribute("labelid",1403);
- this._unMuteDevice._tip.setAttribute("labelid",1404);
} else {
- this._muteDevice._tip.setAttribute("labelid",1394);
- this._unMuteDevice._tip.setAttribute("labelid",1395);
if (canvas.isAllowedToDraw) {
this._canDraw.setAttribute("visibility","visible");
this._canDraw.isActive = true;
@@ -260,13 +256,7 @@
<handler name="onclick">
canvas._videocontainer._videoviewcontent.muteSound(canvas.publicSID, true);
</handler>
- <method name="confirmGloballyOff" args="bool,t" >
- if ($debug) Debug.write("confirmGloballyOff :: ",bool);
- if (bool) {
- canvas.thishib.switchMicMuted.setMute(canvas.publicSID,true);
- }
- </method>
- <labelTooltip name="_tip" labelid="1394" />
+ <labelTooltip name="_tip" labelid="1403" />
</miniIconsNew>
<miniIconsNew name="_unMuteDevice" x="120" width="16" height="16" innerResource="unmute_btn_rsc"
@@ -274,7 +264,7 @@
<handler name="onclick">
canvas._videocontainer._videoviewcontent.muteSound(canvas.publicSID, false);
</handler>
- <labelTooltip name="_tip" labelid="1395" />
+ <labelTooltip name="_tip" labelid="1404" />
</miniIconsNew>
<miniIconsNew name="_allowExclusiveAudio" x="60" width="16" height="16"
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=1327550&r1=1327549&r2=1327550&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 Wed Apr 18 15:49:56 2012
@@ -263,7 +263,7 @@
]]>
</method>
- <moderationMiniIconsEventUserList name="_applyAndStatusIcons" showAvIcons="false" x="2" y="2" >
+ <moderationMiniIconsEventUserList name="_applyAndStatusIcons" x="2" y="2" >
<handler name="onismoderator" reference="canvas" args="m">
this.updateIcons();
</handler>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/popups/autoLoader.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/popups/autoLoader.lzx?rev=1327550&r1=1327549&r2=1327550&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/popups/autoLoader.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/popups/autoLoader.lzx Wed Apr 18 15:49:56 2012
@@ -49,8 +49,8 @@
this.loadingbar._loading.setAttribute('width',w);
</method>
- <text fontsize="11" name="error" />
- <text fontsize="11" name="_src" />
+ <text fontsize="11" name="error" y="20"/>
+ <text fontsize="11" name="_src" y="40" />
<view name="loadingbar" bgcolor="$once{ canvas.getThemeColor('styleMenuBarBaseColor') }" height="10" pixellock="true"
x="-5" y="60" width="$once{ parent.maxwidth }" visibility="hidden">
@@ -58,6 +58,7 @@
<view name="_loading" x="1" y="1" width="0" height="8" pixellock="true"
bgcolor="$once{ canvas.getThemeColor('styleMenuBarBaseColor') }"/>
</view>
+
</class>
</library>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/popups/confirmationSingle.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/popups/confirmationSingle.lzx?rev=1327550&r1=1327549&r2=1327550&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/popups/confirmationSingle.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/popups/confirmationSingle.lzx Wed Apr 18 15:49:56 2012
@@ -94,6 +94,7 @@
var t = parent.holddatainSO.getValue();
this.parent.close();
if (parent.refReturnMethod == null) {
+ if ($debug) Debug.write("refObj ",this.parent.refObj);
this.parent.refObj.sendNoConfirmation();
} else {
this.parent.refObj[parent.refReturnMethod](false,t);
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=1327550&r1=1327549&r2=1327550&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 Wed Apr 18 15:49:56 2012
@@ -315,9 +315,7 @@
<![CDATA[
if ($debug) Debug.write("Deny Give Exclusive Audio: ",parent.parent.parent.refObj.publicSID);
if (canvas.ismoderator && this.isActive) {
- canvas.thishib.setCanGiveAudio.publicSID = parent.parent.parent.refObj.publicSID;
- canvas.thishib.setCanGiveAudio.canGiveAudio = false;
- canvas.thishib.setCanGiveAudio.doCall();
+ canvas.thishib.setCanGiveAudio.sendValue(parent.parent.parent.refObj.publicSID,false);
}
]]>
</handler>
@@ -329,15 +327,13 @@
<handler name="onclick">
if ($debug) Debug.write("Allow Give Exclusive Audio: ",parent.parent.parent.refObj.publicSID);
if (canvas.ismoderator) {
- canvas.thishib.setCanGiveAudio.publicSID = parent.parent.parent.refObj.publicSID;
- canvas.thishib.setCanGiveAudio.canGiveAudio = true;
- canvas.thishib.setCanGiveAudio.doCall();
+ canvas.thishib.setCanGiveAudio.sendValue(parent.parent.parent.refObj.publicSID,true);
}
</handler>
<labelTooltip labelid="1424" />
</miniIcons>
- <miniIcons name="_kickUser" x="152" width="16" height="16"
+ <miniIcons name="_kickUser" x="154" width="16" height="16"
resource="kick_user_rsc" showhandcursor="true">
<handler name="onclick">
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/dragItemFileExplorer.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/dragItemFileExplorer.lzx?rev=1327550&r1=1327549&r2=1327550&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/dragItemFileExplorer.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/dragItemFileExplorer.lzx Wed Apr 18 15:49:56 2012
@@ -94,7 +94,8 @@
refObj:this,
labelid:710,
labeliderror:713,
- showCheckBox:false
+ showCheckBox:false,
+ refReturnMethod:"sendConfirmation"
});
} else if (this.overItem["isFolder"] && this.overItem.isFolder){
if ($debug) Debug.write("MOVE ITEM",this.refObj.fileExplorerItemId);
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/presentations/items/baseListPresentationItemExplorer.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/presentations/items/baseListPresentationItemExplorer.lzx?rev=1327550&r1=1327549&r2=1327550&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/presentations/items/baseListPresentationItemExplorer.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/presentations/items/baseListPresentationItemExplorer.lzx Wed Apr 18 15:49:56 2012
@@ -21,7 +21,7 @@
<library>
<class name="baseListPresentationItemExplorer" extends="view" height="110" width="$once{ parent.width }"
- bgcolor="0xFFFFFF" focusable="true">
+ bgcolor="$once{ canvas.getThemeColor('mainBackgroundColor') }" focusable="true">
<attribute name="uploadmodul" value="" type="string"/>
<attribute name="selectable" value="true" type="boolean" />
@@ -52,7 +52,7 @@
<handler name="onmouseout">
disableCurrentMouseWheelObject();
if (!this.isselected){
- this.setAttribute('bgcolor',0xFFFFFF);
+ this.setAttribute('bgcolor',canvas.getThemeColor('mainBackgroundColor'));
}
</handler>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/tabbar/baseChooseIconView.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/tabbar/baseChooseIconView.lzx?rev=1327550&r1=1327549&r2=1327550&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/tabbar/baseChooseIconView.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/tabbar/baseChooseIconView.lzx Wed Apr 18 15:49:56 2012
@@ -38,11 +38,11 @@
</handler>
<handler name="onmouseout">
- this._bg.setAttribute("bgcolor",0xFFFFFF);
+ this._bg.setAttribute("bgcolor",canvas.getThemeColor('mainBackgroundColor'));
</handler>
<view name="_bg" x="1" y="1" width="$once{ parent.width-1 }"
- height="$once{ parent.height-2 }" bgcolor="0xFFFFFF" />
+ height="$once{ parent.height-2 }" bgcolor="$once{ canvas.getThemeColor('mainBackgroundColor') }" />
<view x="2" y="2" resource="$once{ parent.resourceN }" />
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/baseFileExplorerItem.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/baseFileExplorerItem.lzx?rev=1327550&r1=1327549&r2=1327550&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/baseFileExplorerItem.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/baseFileExplorerItem.lzx Wed Apr 18 15:49:56 2012
@@ -331,7 +331,7 @@
<method name="deselectItem">
this.selected = false;
if (this["_fileName"]) {
- this._fileName.setAttribute("bgcolor",0xFFFFFF);
+ this._fileName.setAttribute("bgcolor",canvas.getThemeColor('mainBackgroundColor'));
} else {
if ($debug) Debug.warn("deselectItem:: _fileName is NULL ",this);
}
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/chartFileExplorerItem.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/chartFileExplorerItem.lzx?rev=1327550&r1=1327549&r2=1327550&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/chartFileExplorerItem.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/chartFileExplorerItem.lzx Wed Apr 18 15:49:56 2012
@@ -59,12 +59,12 @@
<handler name="onmousetrackout">
Debug.write("onmousetrackout");
canvas.currentImagesListdraw.currentDragItem.sendOutItem(parent);
- this.setAttribute("bgcolor",0xFFFFFF);
+ this.setAttribute("bgcolor",canvas.getThemeColor('mainBackgroundColor'));
</handler>
<handler name="onmousetrackup">
if ($debug) Debug.write("onmousetrackup");
- this.setAttribute("bgcolor",0xFFFFFF);
+ this.setAttribute("bgcolor",canvas.getThemeColor('mainBackgroundColor'));
</handler>
<handler name="onmousedown">
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/folderFileExplorerItem.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/folderFileExplorerItem.lzx?rev=1327550&r1=1327549&r2=1327550&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/folderFileExplorerItem.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/folderFileExplorerItem.lzx Wed Apr 18 15:49:56 2012
@@ -56,12 +56,12 @@
<handler name="onmousetrackout">
//if ($debug) Debug.write("onmousetrackout");
canvas.currentImagesListdraw.currentDragItem.sendOutItem(parent);
- this.setAttribute("bgcolor",0xFFFFFF);
+ this.setAttribute("bgcolor",canvas.getThemeColor('mainBackgroundColor'));
</handler>
<handler name="onmousetrackup">
if ($debug) Debug.write("onmousetrackup");
- this.setAttribute("bgcolor",0xFFFFFF);
+ this.setAttribute("bgcolor",canvas.getThemeColor('mainBackgroundColor'));
</handler>
<handler name="onmousedown">
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/rootFileExplorerItem.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/rootFileExplorerItem.lzx?rev=1327550&r1=1327549&r2=1327550&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/rootFileExplorerItem.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/rootFileExplorerItem.lzx Wed Apr 18 15:49:56 2012
@@ -43,12 +43,12 @@
<handler name="onmousetrackout">
//if ($debug) Debug.write("onmousetrackout");
canvas.currentImagesListdraw.currentDragItem.sendOutItem(parent);
- this.setAttribute("bgcolor",0xFFFFFF);
+ this.setAttribute("bgcolor",canvas.getThemeColor('mainBackgroundColor'));
</handler>
<handler name="onmousetrackup">
if ($debug) Debug.write("onmousetrackup");
- this.setAttribute("bgcolor",0xFFFFFF);
+ this.setAttribute("bgcolor",canvas.getThemeColor('mainBackgroundColor'));
</handler>
<handler name="onclick">
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/wmlFileExplorerItem.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/wmlFileExplorerItem.lzx?rev=1327550&r1=1327549&r2=1327550&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/wmlFileExplorerItem.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/wmlFileExplorerItem.lzx Wed Apr 18 15:49:56 2012
@@ -57,12 +57,12 @@
<handler name="onmousetrackout">
//if ($debug) Debug.write("onmousetrackout");
canvas.currentImagesListdraw.currentDragItem.sendOutItem(parent);
- this.setAttribute("bgcolor",0xFFFFFF);
+ this.setAttribute("bgcolor",canvas.getThemeColor('mainBackgroundColor'));
</handler>
<handler name="onmousetrackup">
if ($debug) Debug.write("onmousetrackup");
- this.setAttribute("bgcolor",0xFFFFFF);
+ this.setAttribute("bgcolor",canvas.getThemeColor('mainBackgroundColor'));
</handler>
<handler name="onmousedown">
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/basePropertyPanelWhiteboard.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/basePropertyPanelWhiteboard.lzx?rev=1327550&r1=1327549&r2=1327550&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/basePropertyPanelWhiteboard.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/basePropertyPanelWhiteboard.lzx Wed Apr 18 15:49:56 2012
@@ -63,7 +63,7 @@
<view x="0" y="19" width="${ this.parent.width }" height="1" bgcolor="$once{ canvas.getThemeColor('mainBorderColor') }" />
<handler name="onclick">
- this.parent.toggleopen();
+ this.toggleopen();
</handler>
<text fontsize="11" height="17" x="2" y="1" text="${ this.parent.title }"
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx?rev=1327550&r1=1327549&r2=1327550&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx Wed Apr 18 15:49:56 2012
@@ -217,18 +217,18 @@
<handler name="onmousetrackover">
if ($debug) Debug.write("onmousetrackover");
canvas.currentImagesListdraw.currentDragItem.sendOverItem(this);
- parent.setAttribute("bgcolor",0x93FE92);
+ this.setAttribute("bgcolor",0x93FE92);
</handler>
<handler name="onmousetrackout">
if ($debug) Debug.write("onmousetrackout");
canvas.currentImagesListdraw.currentDragItem.sendOutItem(this);
- parent.setAttribute("bgcolor",0xFFFFFF);
+ this.setAttribute("bgcolor",0xFFFFFF);
</handler>
<handler name="onmousetrackup">
if ($debug) Debug.write("onmousetrackup");
- parent.setAttribute("bgcolor",0xFFFFFF);
+ this.setAttribute("bgcolor",0xFFFFFF);
</handler>
<remoteWhiteboard y="0" name="_drawarea" isRemoteOID="true" height="${parent.height}" width="${parent.height}"
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/dragItemFLVExplorer.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/dragItemFLVExplorer.lzx?rev=1327550&r1=1327549&r2=1327550&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/dragItemFLVExplorer.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/dragItemFLVExplorer.lzx Wed Apr 18 15:49:56 2012
@@ -88,7 +88,8 @@
refObj:this,
labelid:710,
labeliderror:713,
- showCheckBox:false
+ showCheckBox:false,
+ refReturnMethod:"sendConfirmation"
});
} else if (this.overItem.isFolder){
if ($debug) Debug.write("MOVE ITEM",this.refObj.fileExplorerItemId);
@@ -137,10 +138,6 @@
}
</method>
- <method name="sendNoConfirmation">
- this.destroy();
- </method>
-
<netRemoteCallHib name="deleteFLVOrFolder" funcname="flvrecorderservice.deleteFLVOrFolder"
remotecontext="$once{ canvas.thishib }" >
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/remote/rtmpConnection.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/remote/rtmpConnection.lzx?rev=1327550&r1=1327549&r2=1327550&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/remote/rtmpConnection.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/remote/rtmpConnection.lzx Wed Apr 18 15:49:56 2012
@@ -56,8 +56,17 @@
this._nc.addEventListener(NetStatusEvent.NET_STATUS, _onStatus);
if($debug) Debug.write("devRtmpConnection/registerMethods()");
+ var clientObj = {};
+ clientObj.setId = this.setId;
+
+ this._nc.client = clientObj;
+
//Register Methods
- this.registerMethods();
+ //this.registerMethods();
+ </method>
+
+ <method name="setId" args="tId">
+ if ($debug) Debug.write("setId ", tId);
</method>
<method name="_onStatus" args="stats"><![CDATA[
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx?rev=1327550&r1=1327549&r2=1327550&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx Wed Apr 18 15:49:56 2012
@@ -125,11 +125,14 @@
if ($debug) Debug.warn("start play");
vidContainer._chatvideoinner._videostream.playStream(broadcastId,-1);
vidContainer.setAttribute("visibility","visible");
- } else {
+ } else if (avsettings=="v" || avsettings=="av") {
//this means avsettings is either: "v" or "av"
vidContainer.setDefaultVideoSize(object.VWidth,object.VHeight);
vidContainer._chatvideoinner._videostream.playStream(broadcastId,-1);
vidContainer.setAttribute("visibility","visible");
+ } else {
+ //this means user did not select anything yet and streaming has not started
+ vidContainer.setAttribute("visibility","hidden");
}
vidContainer.setAttribute("interviewPodId", interviewPodId);
vidContainer.updateAVSettingsSymbol(object);
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/Sessionmanagement.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/Sessionmanagement.java?rev=1327550&r1=1327549&r2=1327550&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/Sessionmanagement.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/Sessionmanagement.java Wed Apr 18 15:49:56 2012
@@ -68,7 +68,6 @@ public class Sessionmanagement {
* @return
*/
public Sessiondata startsession() {
- // log.error("startsession User: || ");
try {
log.debug("startsession :: startsession");
@@ -107,8 +106,6 @@ public class Sessionmanagement {
if (fullList.size() == 0) {
log.error("Could not find session to update: " + SID);
return null;
- } else {
- // log.error("Found session to update: "+SID);
}
Sessiondata sd = fullList.get(0);
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/MainService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/MainService.java?rev=1327550&r1=1327549&r2=1327550&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/MainService.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/MainService.java Wed Apr 18 15:49:56 2012
@@ -202,18 +202,12 @@ public class MainService implements IPen
* @return a unique session identifier
*/
public Sessiondata getsessiondata() {
-
- log.debug(":: getsessiondata");
- System.out.println(":: getsessiondata");
-
return sessionManagement.startsession();
}
public Long setCurrentUserOrganization(String SID, Long organization_id) {
try {
-
sessionManagement.updateUserOrg(SID, organization_id);
-
return 1L;
} catch (Exception err) {
log.error("[setCurrentUserOrganization]", err);
@@ -249,40 +243,9 @@ public class MainService implements IPen
currentClient.setFirstname(o.getFirstname());
currentClient.setLastname(o.getLastname());
+
+ scopeApplicationAdapter.syncMessageToCurrentScope("roomConnect", currentClient, false);
- Collection<Set<IConnection>> conCollection = current.getScope()
- .getConnections();
- for (Set<IConnection> conset : conCollection) {
- for (IConnection cons : conset) {
- if (cons != null) {
- RoomClient rcl = this.clientListManager
- .getClientByStreamId(cons.getClient()
- .getId());
- if (rcl == null) {
- // continue;
- } else if (rcl.getIsScreenClient() != null
- && rcl.getIsScreenClient()) {
- // continue;
- } else {
- if (cons instanceof IServiceCapableConnection) {
- if (!cons.equals(current)) {
- // log.error("sending roomDisconnect to "
- // + cons);
- // RoomClient rcl =
- // this.clientListManager.getClientByStreamId(cons.getClient().getId());
- // Send to all connected users
- ((IServiceCapableConnection) cons)
- .invoke("roomConnect",
- new Object[] { currentClient },
- this);
- // log.error("sending roomDisconnect to "
- // + cons);
- }
- }
- }
- }
- }
- }
}
return o;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java?rev=1327550&r1=1327549&r2=1327550&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java Wed Apr 18 15:49:56 2012
@@ -597,10 +597,6 @@ public class ScopeApplicationAdapter ext
currentClient);
}
- log.debug("##### roomLeave :. " + currentClient.getStreamid()); // just
- // a
- // unique
- // number
log.debug("removing USername " + currentClient.getUsername() + " "
+ currentClient.getConnectedSince() + " streamid: "
+ currentClient.getStreamid());
@@ -620,15 +616,9 @@ public class ScopeApplicationAdapter ext
}
// Notify all clients of the same currentScope (room) with domain
- // and room
- // except the current disconnected cause it could throw an exception
-
+ // and room except the current disconnected cause it could throw an exception
log.debug("currentScope " + currentScope);
- // Remove User AFTER cause otherwise the currentClient Object is
- // NULL ?!
- // OR before ?!?!
-
if (currentScope != null && currentScope.getConnections() != null) {
// Notify Users of the current Scope
Collection<Set<IConnection>> conCollection = currentScope
@@ -659,22 +649,8 @@ public class ScopeApplicationAdapter ext
*/
if (!currentClient.getStreamid().equals(
rcl.getStreamid())) {
-
- if (rcl.getIsScreenClient() != null
- && rcl.getIsScreenClient()) {
- // continue;
- } else {
- // Send to all connected users
- ((IServiceCapableConnection) cons)
- .invoke("roomDisconnect",
- new Object[] { currentClient },
- this);
- log.debug("sending roomDisconnect to "
- + cons);
- }
-
- // add Notification if another user is
- // recording
+
+ // add Notification if another user isrecording
log.debug("###########[roomLeave]");
if (rcl.getIsRecording()) {
log.debug("*** roomLeave Any Client is Recording - stop that");
@@ -682,7 +658,28 @@ public class ScopeApplicationAdapter ext
.stopRecordingShowForClient(
cons, currentClient);
}
-
+
+ //If the user was a avclient, we do not broadcast a message about that to everybody
+ if (currentClient.getIsAVClient() == null
+ || currentClient.getIsAVClient()) {
+ continue;
+ }
+
+ if (rcl.getIsScreenClient() != null && rcl
+ .getIsScreenClient()) {
+ // screen sharing clients do not receive events
+ continue;
+ } else if (rcl.getIsAVClient() == null || rcl
+ .getIsAVClient()) {
+ // AVClients or potential AVClients do not receive events
+ continue;
+ }
+
+ // Send to all connected users
+ ((IServiceCapableConnection) cons)
+ .invoke("roomDisconnect",
+ new Object[] { currentClient },this);
+ log.debug("sending roomDisconnect to " + cons);
}
} else {
log.debug("For this StreamId: "
@@ -2361,7 +2358,7 @@ public class ScopeApplicationAdapter ext
*/
public synchronized int sendMessageWithClient(Object newMessage) {
try {
- sendMessageWithClientWithSyncObject(newMessage, false);
+ sendMessageWithClientWithSyncObject(newMessage, true);
} catch (Exception err) {
log.error("[sendMessageWithClient] ", err);