You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2016/04/22 13:09:18 UTC
svn commit: r1740479 - in /openmeetings/application:
branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/
branches/3.2.x/openmeetings-flash/src/main/swf/
branches/3.2.x/openmeetings-flash/src/main/swf/base/ branches/...
Author: solomax
Date: Fri Apr 22 11:09:18 2016
New Revision: 1740479
URL: http://svn.apache.org/viewvc?rev=1740479&view=rev
Log:
[OPENMEETINGS-1376] bridges are burned: old control are removed
Added:
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/remote/restCall.lzx
- copied unchanged from r1740476, openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/restCall.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/interviewVideoBox.lzx
- copied unchanged from r1740478, openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/interviewuserlist/interviewVideoBox.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/interviewWhiteboard.lzx
- copied unchanged from r1740465, openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/interviewuserlist/interviewWhiteboard.lzx
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomRightPanel.html
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomRightPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomRightPanel.html
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomRightPanel.java
Removed:
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/components/upload/
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/navi/
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/baseRoomInnerList.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/innerlistViewEventUserListTable.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/moderationMiniIconsEventUserList.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/roomSidebar/conferenceRoomSidebar.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/roomSidebar/interviewRoomSidebar.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/roomSidebar/restrictedRoomSidebar.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/interviewuserlist/
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/participants/
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/popups/converterPopup.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/restricted/
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/dashboard/
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/rest/
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/testVideoObject.lzx
Modified:
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/components/library.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/library.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/remote/library.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/main.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/interviewConferenceRoom.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/library.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/roomSidebar/baseRoomSidebar.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/roomSidebar/library.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/library.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/popups/library.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/library.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/library.lzx
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.html
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/room.css
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.html
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/room.css
Modified: openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java?rev=1740479&r1=1740478&r2=1740479&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java Fri Apr 22 11:09:18 2016
@@ -68,6 +68,7 @@ import org.apache.wicket.Application;
import org.apache.wicket.protocol.ws.WebSocketSettings;
import org.apache.wicket.protocol.ws.api.IWebSocketConnection;
import org.apache.wicket.protocol.ws.api.registry.IWebSocketConnectionRegistry;
+import org.apache.wicket.util.string.StringValue;
import org.apache.wicket.util.string.Strings;
import org.red5.logging.Red5LoggerFactory;
import org.red5.server.adapter.ApplicationAdapter;
@@ -177,7 +178,9 @@ public class ScopeApplicationAdapter ext
}
Client rcm = new Client();
rcm.setStreamid(conn.getClient().getId());
- rcm.setScope(conn.getScope().getName());
+ StringValue scn = StringValue.valueOf(conn.getScope().getName());
+ rcm.setScope(scn.toString());
+ rcm.setRoomId(scn.toOptionalLong());
rcm.setUserport(conn.getRemotePort());
rcm.setUserip(conn.getRemoteAddress());
rcm.setSwfurl(swfURL);
Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/components/library.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/components/library.lzx?rev=1740479&r1=1740478&r2=1740479&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/components/library.lzx (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/components/library.lzx Fri Apr 22 11:09:18 2016
@@ -41,7 +41,6 @@
<include href="turnoverlist/" />
<include href="turnoverlistpaged/" />
<include href="simplevaluelist/" />
- <include href="upload/" />
<include href="presenter/" />
<include href="lps/" />
<include href="conferencebox/" />
Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx?rev=1740479&r1=1740478&r2=1740479&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx Fri Apr 22 11:09:18 2016
@@ -1004,10 +1004,6 @@
<method name="clientUpdated" args="client">
<![CDATA[
- var u = canvas._videocontainer._participants.getUserListItemByPublicSID(client.publicSID);
- if (!!u && !!client) {
- u.update(client);
- }
if ($debug) Debug.write("drawAllowStatus changes ###### ");
if (client.publicSID == canvas.publicSID) {
if ($debug) Debug.write("Its about You ", client);
Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/library.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/library.lzx?rev=1740479&r1=1740478&r2=1740479&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/library.lzx (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/library.lzx Fri Apr 22 11:09:18 2016
@@ -23,7 +23,6 @@
<include href="components/" />
<include href="hibernate/" />
<include href="contentviews/" />
- <include href="navi/" />
<!-- for main.lzx -->
<include href="externalJavaScript.lzx" />
Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx?rev=1740479&r1=1740478&r2=1740479&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx Fri Apr 22 11:09:18 2016
@@ -337,21 +337,15 @@
if ($debug) Debug.write("updateModerationFlag", canvas.removeModeratorList);
for (var i = 0; i < canvas.removeModeratorList.length; ++i) {
var item = canvas.removeModeratorList[i];
- item.isMod = false;
- var u = canvas._videocontainer._participants.getUserListItemByPublicSID(item.publicSID);
- if (u != null) {
- u.update(item, false);
+ if (canvas.publicSID == item.publicSID) {
+ isCurrentModerator = false;
}
}
if ($debug) Debug.write("updateModerationFlag", canvas.currentModeratorList);
for (var i = 0; i < canvas.currentModeratorList.length; ++i) {
var item = canvas.currentModeratorList[i];
- var u = canvas._videocontainer._participants.getUserListItemByPublicSID(item.publicSID);
- if (u != null) {
- u.update(item);
- if (canvas.publicSID == item.publicSID) {
- isCurrentModerator = true;
- }
+ if (canvas.publicSID == item.publicSID) {
+ isCurrentModerator = true;
}
}
@@ -387,10 +381,6 @@
-->
<method name="setExclusiveAudioAllowStatus" args="roomClientObj">
<![CDATA[
- var u = canvas._videocontainer._participants.getUserListItemByPublicSID(roomClientObj.publicSID);
- if (!!u && !!roomClientObj) {
- u.update(roomClientObj);
- }
if ($debug) Debug.write("giveExclusiveAudioStatus changes ###### ");
if (roomClientObj.publicSID==canvas.publicSID) {
canvas.setAttribute("isAllowedToGiveExclusiveAudio",roomClientObj.canGiveAudio);
@@ -401,11 +391,6 @@
<method name="setMuteStatus" args="roomClientObj">
<![CDATA[
- if ($debug) Debug.write("setMuteStatus ###### ", roomClientObj);
- var u = canvas._videocontainer._participants.getUserListItemByPublicSID(roomClientObj.publicSID);
- if (!!u && !!roomClientObj) {
- u.update(roomClientObj);
- }
if ($debug) Debug.write("setMuteStatus changes ###### ",roomClientObj.micMuted);
//Check for self status
if (roomClientObj.publicSID == canvas.publicSID) {
Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/remote/library.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/remote/library.lzx?rev=1740479&r1=1740478&r2=1740479&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/remote/library.lzx (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/remote/library.lzx Fri Apr 22 11:09:18 2016
@@ -22,5 +22,6 @@
<include href="baseVideoView.lzx" />
<include href="baseVideoStream.lzx" />
<include href="baseVideoStreamDevice.lzx" />
+ <include href="restCall.lzx" />
<include href="rtmpConnection.lzx" />
</library>
Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/main.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/main.lzx?rev=1740479&r1=1740478&r2=1740479&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/main.lzx (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/main.lzx Fri Apr 22 11:09:18 2016
@@ -43,7 +43,6 @@
<include href="base/" /><!-- attributes,methods,datasets,are moved into /base -->
<include href="resources/" />
<include href="modules/" />
- <include href="testVideoObject.lzx" />
<include href="video/" />
<include href="screensharing/" />
<include href="audioVideoTest/" />
Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx?rev=1740479&r1=1740478&r2=1740479&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx Fri Apr 22 11:09:18 2016
@@ -21,7 +21,7 @@
<library>
<class name="flexibleConferenceRoom" extends="baseConferenceRoom">
- <conferenceRoomSidebar name="_sidePanel" />
+ <baseRoomSidebar name="_sidePanel" />
<view name="_videoviewcontent_hideWhiteboard" y="0" x="${ parent._sidePanel.width }"
width="${canvas.width-parent._sidePanel.width}" height="${ canvas.height - 5 + 28 }" clip="true">
Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/interviewConferenceRoom.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/interviewConferenceRoom.lzx?rev=1740479&r1=1740478&r2=1740479&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/interviewConferenceRoom.lzx (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/interviewConferenceRoom.lzx Fri Apr 22 11:09:18 2016
@@ -28,8 +28,7 @@
<!--
User Panel and Participants List
-->
- <interviewRoomSidebar name="_sidePanel"
- listType="eventUserListTableWithNames" />
+ <baseRoomSidebar name="_sidePanel"/>
<!--
Whiteboard in Interview Room Type those are the Video Pods
Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/library.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/library.lzx?rev=1740479&r1=1740478&r2=1740479&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/library.lzx (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/library.lzx Fri Apr 22 11:09:18 2016
@@ -19,7 +19,6 @@
-->
<library>
-
<resource name="userstatus_multiframe_rsc">
<frame src="resources/bullet_ball_glass_green.png"/> <!-- user -->
<frame src="resources/bullet_ball_glass_yellow.png"/> <!-- mod -->
@@ -64,15 +63,10 @@
<frame src="resources/sidebar_open.png" />
</resource>
- <include href="innerlistViewEventUserListTable.lzx" />
- <include href="moderationMiniIconsEventUserList.lzx" />
<include href="roomSidebar/" />
<include href="appointmentNotificationPopUp.lzx" />
- <include href="baseRoomInnerList.lzx" />
<include href="baseConferenceRoom.lzx" />
<include href="flexibleConferenceRoom.lzx" />
<include href="restrictedConferenceRoom.lzx" />
<include href="interviewConferenceRoom.lzx" />
-
-
</library>
Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx?rev=1740479&r1=1740478&r2=1740479&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx Fri Apr 22 11:09:18 2016
@@ -21,7 +21,7 @@
<library>
<class name="restrictedConferenceRoom" extends="baseConferenceRoom">
- <restrictedRoomSidebar name="_sidePanel" listType="eventUserListTableWithNames" />
+ <baseRoomSidebar name="_sidePanel"/>
<view name="_videoviewcontent_hideWhiteboard" y="0" x="${ parent._sidePanel.width }"
width="${canvas.width-parent._sidePanel.width}" height="${canvas.height- 5}" clip="true"
Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/roomSidebar/baseRoomSidebar.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/roomSidebar/baseRoomSidebar.lzx?rev=1740479&r1=1740478&r2=1740479&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/roomSidebar/baseRoomSidebar.lzx (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/roomSidebar/baseRoomSidebar.lzx Fri Apr 22 11:09:18 2016
@@ -8,7 +8,7 @@
"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
+ 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
@@ -20,77 +20,189 @@
-->
<library>
-<class name="baseRoomSidebar" extends="view" width="280" bgcolor="$once{ canvas.getThemeColor('mainBackgroundColor') }"
- height="${ canvas.height }" y="0" clip="true">
+<class name="baseRoomSidebar" extends="view" width="1" bgcolor="$once{ canvas.getThemeColor('mainBackgroundColor') }"
+ height="${ canvas.height }" y="0">
- <attribute name="selected" value="null" />
- <attribute name="isOpen" value="true" type="boolean"/>
- <attribute name="listType" value="eventUserListTable" type="string" />
-
- <method name="toggleStatus">
- this._minimizeSidebar.bringToFront();
- if (this.isOpen) {
- this._doClose.setAttribute('started', true);
- this.isOpen = false;
- this._minimizeSidebar._icon.setAttribute("frame", 2);
- this._minimizeSidebar._icon._labelTooltip.setAttribute("labelid", 857);
- } else {
- this._doOpen.setAttribute('started', true);
- this.isOpen = true;
- this._minimizeSidebar._icon.setAttribute("frame", 1);
- this._minimizeSidebar._icon._labelTooltip.setAttribute("labelid", 856);
- }
- </method>
-
- <view name="borderBarTop" y="0"
- width="${ parent.width }" bgcolor="$once{ canvas.getThemeColor('mainBorderColor') }" height="1" />
- <view name="_tabbarBg" width="${ parent.width }" height="32" y="1" bgcolor="0xFAFAFA" />
- <view name="borderBarBottom" y="34"
- width="${ parent.width }" bgcolor="$once{ canvas.getThemeColor('mainBorderColor') }" height="1" />
-
- <view name="_head" y="1" width="${ parent.width-10 }" height="32" layout="axis:x;spacing:2;inset:2" >
+ <handler name="oninit">
+ //set modus
+ canvas.thishib.modus = canvas.currentRoomObj.type;
+
+ //set reference, this reference will be cleared at *ontabcontenctleave* event
+ canvas._videocontainer = this;
+
+ this.getRoomModeratorsByRoomId.doCall();
+ </handler>
+
+ <view name="_filearea" x="0" y="0" height="${ parent.height }" width="1">
+ <attribute name="currentTrackGroupName" value="fileExplorer" type="string" />
+ <attribute name="currentDragItem" value="null" />
<handler name="oninit">
+ canvas.currentImagesListdraw = this;
+ </handler>
+ </view>
+
+ <netRemoteCallHib name="getRoomModeratorsByRoomId" funcname="conferenceservice.getRoomModeratorsByRoomId"
+ remotecontext="$once{ canvas.thishib }" >
+ <netparam><method name="getValue">return canvas.sessionId;</method></netparam>
+ <netparam><method name="getValue">return hib.currentroomid;</method></netparam>
+ <handler name="ondata" args="value">
<![CDATA[
- for (var eg in this.subviews) {
- this.subviews[eg].deselect();
- }
- if (!canvas.isInterview && !canvas.currentRoomObj.hideFilesExplorer && canvas.currentRoomObj.filesOpened) {
- this.filesTabButton.doSelection();
- } else {
- this.userTabButton.doSelection();
+ if ($debug) Debug.write("getRoomModeratorsByRoomId: ",value);
+ canvas.becomeSuperModerator = false;
+
+ parent.setRoomValues.applyDefaultModeration = canvas.becomemoderator;
+ canvas.becomeSuperModerator = canvas.becomemoderator;
+
+ if (!canvas.becomeSuperModerator) {
+ for (var i=0;i<value.length;i++) {
+
+ if (value[i].user.userId == canvas.userId) {
+ parent.setRoomValues.applyDefaultModeration = true;
+ canvas.becomeSuperModerator = value[i].isSuperModerator;
+ if ($debug) Debug.info("Make this User to an Moderator");
+ break;
+ }
+
+ }
}
+
+ if ($debug) Debug.write("canvas.becomemoderator: ",canvas.becomemoderator);
+ if ($debug) Debug.write("canvas.becomeSuperModerator: ",canvas.becomeSuperModerator);
+
+ canvas.currentusercolor = canvas.getColorForUser();
+
+ if ($debug) Debug.write(hib.userobject);
+ this.parent.setRoomValues.doCall();
]]>
</handler>
+ </netRemoteCallHib>
+
+ <netRemoteCallHib name="setRoomValues" funcname="setRoomValues" remotecontext="$once{ canvas.thishib }" >
+ <attribute name="applyDefaultModeration" value="false" type="boolean" />
+ <attribute name="groupId" value="0" type="number" />
+ <netparam><method name="getValue">return hib.currentroomid;</method></netparam>
+ <netparam><method name="getValue">return parent.applyDefaultModeration;</method></netparam>
+ <netparam><method name="getValue">return canvas.becomeSuperModerator;</method></netparam>
+ <netparam><method name="getValue">return canvas.currentusercolor;</method></netparam>
+ <handler name="ondata" args="roomStatus">
+ <![CDATA[
+ //The onResult-Handler will be called be the rtmpconnection
+ if ($debug) Debug.write("setRoomValues1: ",value);
+ //if ($debug) Debug.write("setRoomValues2: ",hib.currentroomid);
+
+ //if ($debug) Debug.write("+++++++++++++++++ getClientListScope : ",value);
+
+ if (roomStatus.browserStatus.browserInited) {
+ var tObj = new Object();
+ tObj[0] = "newBrowserURL";
+ tObj[1] = roomStatus.browserStatus.currentURL;
+ canvas.startBrowser(tObj);
+ }
+
+ var value = roomStatus.clientList;
+
+ for (var i = 0; i < value.length; ++i){
+ if ( value[i].streamid == canvas.streamid ) {
+ canvas.isAllowedToDraw = value[i].canDraw;
+ }
+ parent.addItemInitial(value[i]);
+ }
+ parent.batchCreateVideo(value);
+ ]]>
+ </handler>
+ </netRemoteCallHib>
+
+ <method name="batchCreateVideo" args="clients">
+ <![CDATA[
+ if ($debug) Debug.write("interval 0 :: ", clients.length);
+ canvas.commonVideoViewContent.batchCreateVideo(canvas.streamid, clients);
+
+ //this content must be inited _after_ setting the default values
+ canvas.thishib.getCurrentModeratorList.doCall();
+ //FIXME Issue-1076
+ canvas.thishib.checkLzRecording.doCall();
+ ]]>
+ </method>
- <tabButtonMain name="userTabButton" height="$once{ parent.height }" width="$once{ (parent.width-6)/2 }"
- currentIconRsc="users_tab_btn" labelid="613" />
+ <!-- invoked if another client logs into the room
+ after choosing devices -->
+ <method name="setAVSettingsToClient" args="rcl">
+ canvas.commonVideoViewContent.setAVSettingsToClient(rcl);
+ </method>
+
+ <method name="addItemInitial" args="object">
+ <![CDATA[
+ //if ($debug) Debug.write("initializeStreams addItem: ", object);
+ ]]>
+ </method>
+
+ <method name="receiveExclusiveAudioFlag" args="publicSID">
+ <![CDATA[
+ var vList = this._participants._table.renderList;
+ for (var i = 0;i < vList.length; ++i) {
+ var item = vList[i];
+ var rcl = new Object();
+
+ rcl.publicSID = item.publicSID;
+ rcl.micMuted = !(publicSID == item.publicSID);
+ canvas.setMuteStatus(rcl);
+ }
+ ]]>
+ </method>
+
+
+ <method name="addItem" args="connectedSince,isMod,streamid,username,userroom,formatedDate,position,color,object">
+ <![CDATA[
+ if ($debug) Debug.write("initializeStreams addItem: ",connectedSince,isMod,streamid,username,formatedDate);
- <tabButtonMain name="filesTabButton" currentIconRsc="files_tab_btn" height="$once{ parent.height }"
- labelid="614" width="$once{ (parent.width-6)/2 }"
- visible="${ !canvas.isInterview && !canvas.currentRoomObj.hideFilesExplorer }"/>
- </view>
-
- <fileExplorer name="_files" y="22" width="$once{ parent.width-12 }" height="${ parent.height-222 }" visible="false" />
+ //Do init only in case this stream is NOT the same as we are
+ if (streamid != canvas.streamid) {
+ canvas.commonVideoViewContent.createVideo(object.publicSID, object.firstname+' '+object.lastname, object.broadCastID, object.avsettings, -1, object);
+ }
+ ]]>
+ </method>
- <view name="_minimizeSidebar" x="${ parent.width - 10 }" width="10" y="1" bgcolor="0xE0E1EB" height="${ parent.height-1 }">
- <handler name="onclick">
- if (!canvas.isInterview) {
- parent.toggleStatus();
- }
- </handler>
+ <method name="addClientItem" args="connectedSince,isMod,streamid,username,roomId,formatedDate,position,color,object">
+ <![CDATA[
+ if ($debug) Debug.write("### initializeStreams addClientItem: ",connectedSince,isMod,streamid,username,roomId,formatedDate);
+
+ if (canvas.publicSID != object.publicSID){
+ canvas.commonVideoViewContent.createVideoObject(object.publicSID, false, -1, object);
+ }
+ ]]>
+ </method>
- <view width="${ parent.width }" height="$once{ parent.height }" bgcolor="0xE0E1EB" />
-
- <view name="_icon" resource="sidebar_tab_btn" y="0" visible="${ !canvas.isInterview }">
- <handler name="onclick">
- parent.parent.toggleStatus();
- </handler>
- <labelTooltip name="_labelTooltip" labelid="856" />
- </view>
- </view>
+ <!--
+ invoked whenever a User starts to Stream Video in this Room,
+ interviewPodId has only a meaning in the Room Type Interview
+ -->
+ <method name="startStream" args="publicSID,broadcastId,firstname,lastname,interviewPodId,VWidth,VHeight">
+ canvas.commonVideoViewContent.startStream(publicSID,broadcastId,firstname,lastname,interviewPodId,VWidth,VHeight);
+ </method>
+
+ <method name="closeStreamClient" args="publicSID">
+ canvas.commonVideoViewContent.closeStreamClient(publicSID);
+ </method>
+
+ <method name="resetAllValues">
+ canvas.commonVideoViewContent.resetAllValues();
+ </method>
+
+ <method name="removeVideoByUser" args="userObject">
+ canvas.commonVideoViewContent.removeVideoByUser(userObject.publicSID);
+ </method>
- <animator name="_doOpen" attribute="width" to="$once{ parent.width }" duration="750" started="false" />
- <animator name="_doClose" attribute="width" to="10" duration="750" started="false" />
+ <!---
+ stops the streaming but and destroys the view
+ @param int broadcastId broadcastId
+ -->
+ <method name="disconnectclient" args="publicSID">
+ canvas.commonVideoViewContent.disconnectclient(publicSID);
+ </method>
+
+ <method name="updateMuteStatusVideoView" args="roomClient">
+ canvas.commonVideoViewContent.updateMuteStatusVideoView(roomClient);
+ </method>
</class>
</library>
Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/roomSidebar/library.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/roomSidebar/library.lzx?rev=1740479&r1=1740478&r2=1740479&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/roomSidebar/library.lzx (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/roomSidebar/library.lzx Fri Apr 22 11:09:18 2016
@@ -20,7 +20,4 @@
-->
<library>
<include href="baseRoomSidebar.lzx" />
- <include href="conferenceRoomSidebar.lzx" />
- <include href="interviewRoomSidebar.lzx" />
- <include href="restrictedRoomSidebar.lzx" />
</library>
Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/library.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/library.lzx?rev=1740479&r1=1740478&r2=1740479&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/library.lzx (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/library.lzx Fri Apr 22 11:09:18 2016
@@ -41,14 +41,9 @@
<include href="whiteboard/" />
- <include href="tabcontent/" />
<include href="popups/" />
<include href="moderation/" />
- <include href="participants/" />
- <include href="interviewuserlist/" />
-
- <include href="restricted/" />
<include href="sip/" />
<include href="flexibleConferenceRoom/" />
Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/popups/library.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/popups/library.lzx?rev=1740479&r1=1740478&r2=1740479&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/popups/library.lzx (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/popups/library.lzx Fri Apr 22 11:09:18 2016
@@ -34,7 +34,6 @@
<include href="editWhiteboardDefault.lzx" />
<include href="confirmationSingle.lzx" />
<include href="autoLoader.lzx" />
- <include href="converterPopup.lzx" />
<include href="errorModeratorPopup.lzx" />
<include href="syncWin.lzx" />
<include href="incomingScreenSharing.lzx" />
Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/library.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/library.lzx?rev=1740479&r1=1740478&r2=1740479&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/library.lzx (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/library.lzx Fri Apr 22 11:09:18 2016
@@ -45,6 +45,8 @@
<include href="panels/" />
+ <include href="interviewVideoBox.lzx" />
+ <include href="interviewWhiteboard.lzx" />
<include href="basePropertyPanelWhiteboard.lzx" />
<include href="fixedFileExplorerWhiteBoard.lzx" />
<include href="fixedFileExplorerWhiteboardPanel.lzx" />
Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/library.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/library.lzx?rev=1740479&r1=1740478&r2=1740479&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/library.lzx (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/library.lzx Fri Apr 22 11:09:18 2016
@@ -22,7 +22,6 @@
<include href="conference/" />
<include href="invitation/" />
- <include href="dashboard/" />
<include href="sipintegration/" />
<include href="lzrecordcontent" />
</library>
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.html?rev=1740479&r1=1740478&r2=1740479&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.html (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.html Fri Apr 22 11:09:18 2016
@@ -25,14 +25,7 @@
<div wicket:id="name" class="user name"></div>
<span class="ui-icon align-right clickable audio-activity" wicket:message="title:372"></span>
<div wicket:id="actions" class="user actions">
- <span class="ui-icon align-left clickable moderator-right" wicket:message="title:676"></span>
- <span class="ui-icon align-left clickable wb-right" wicket:message="title:611"></span>
- <span class="ui-icon align-left clickable screen-share-right" wicket:message="title:1067"></span>
- <span class="ui-icon align-left clickable remote-control-right" wicket:message="title:1078"></span>
- <span class="ui-icon align-left clickable audio-right" wicket:message="title:1604"></span>
- <span class="ui-icon align-left clickable camera-right" wicket:message="title:683"></span>
- <span class="ui-icon align-left clickable global-mute" wicket:message="title:1384"></span>
- <span class="ui-icon align-left clickable exclsv-audio" wicket:message="title:1424"></span>
+ <span wicket:id="rights"></span>
<span class="ui-icon align-left clickable kick" wicket:message="title:1213"></span>
<span wicket:id="privateChat" class="ui-icon align-right clickable private-chat" wicket:message="title:1493" onclick="startPrivateChat($(this));"></span>
<div class="clear"></div>
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.java?rev=1740479&r1=1740478&r2=1740479&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.java Fri Apr 22 11:09:18 2016
@@ -52,11 +52,14 @@ public class RoomClientPanel extends Pan
status = "status-user";
statusTitle = "677";
}
+ //FIXME TODO add 'typingActivity'
+ //FIXME TODO add ability to change 'first/last name'
add(new WebMarkupContainer("status").add(AttributeAppender.append("class", status), AttributeAppender.replace("title", getString(statusTitle))));
User u = getBean(UserDao.class).get(c.getUserId());
add(new Label("name", u.getFirstname() + " " + u.getLastname()));
add(AttributeAppender.append("data-userid", c.getUserId()));
WebMarkupContainer actions = new WebMarkupContainer("actions");
+ actions.add(new RoomRightPanel("rights"));
actions.add(new WebMarkupContainer("privateChat").setVisible(!room.getRoom().isHidden(RoomElement.Chat) && !getUserId().equals(c.getUserId())));
if (room.getClient() != null) {
actions.setVisible(room.getClient().hasRight(Right.moderator));
Added: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomRightPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomRightPanel.html?rev=1740479&view=auto
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomRightPanel.html (added)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomRightPanel.html Fri Apr 22 11:09:18 2016
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<html xmlns:wicket="http://wicket.apache.org">
+<wicket:panel>
+ <span class="ui-icon align-left clickable moderator-right" wicket:message="title:676"></span>
+ <span class="ui-icon align-left clickable wb-right" wicket:message="title:611"></span>
+ <span class="ui-icon align-left clickable screen-share-right" wicket:message="title:1067"></span>
+ <span class="ui-icon align-left clickable remote-control-right" wicket:message="title:1078"></span>
+ <span class="ui-icon align-left clickable audio-right" wicket:message="title:1604"></span>
+ <span class="ui-icon align-left clickable camera-right" wicket:message="title:683"></span>
+ <span class="ui-icon align-left clickable global-mute" wicket:message="title:1384"></span>
+ <span class="ui-icon align-left clickable exclsv-audio" wicket:message="title:1424"></span>
+</wicket:panel>
+</html>
Added: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomRightPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomRightPanel.java?rev=1740479&view=auto
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomRightPanel.java (added)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomRightPanel.java Fri Apr 22 11:09:18 2016
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openmeetings.web.room.sidebar;
+
+import org.apache.wicket.markup.html.panel.Panel;
+
+public class RoomRightPanel extends Panel {
+ private static final long serialVersionUID = 1L;
+
+ public RoomRightPanel(String id) {
+ super(id);
+ setRenderBodyOnly(true);
+ setOutputMarkupId(true);
+ }
+}
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html?rev=1740479&r1=1740478&r2=1740479&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html Fri Apr 22 11:09:18 2016
@@ -23,6 +23,9 @@
<div class="tabs" wicket:id="tabs"></div>
<wicket:fragment wicket:id="user-panel">
+ <div class="user header">
+ <span wicket:id="rights"></span>
+ </div>
<div class="user list">
<div wicket:id="user" class="user ui-corner-all ui-widget-content">
<div wicket:id="user"></div>
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java?rev=1740479&r1=1740478&r2=1740479&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java Fri Apr 22 11:09:18 2016
@@ -47,6 +47,7 @@ public class RoomSidebar extends Panel {
private final ITab fileTab;
private final UploadDialog upload;
private final RoomFilePanel roomFiles;
+ private final RoomRightPanel selfRights;
private boolean showFiles;
private final ListView<Client> users = new ListView<Client>("user", new ArrayList<Client>()) {
private static final long serialVersionUID = 1L;
@@ -100,6 +101,7 @@ public class RoomSidebar extends Panel {
};
add(tabs = new TabbedPanel("tabs", Arrays.asList(userTab, fileTab)).setActiveTab(room.getRoom().isFilesOpened() ? 1 : 0));
roomFiles = new RoomFilePanel("tree", room);
+ selfRights = new RoomRightPanel("rights");
add(upload = new UploadDialog("upload", room, roomFiles));
}
@@ -115,6 +117,7 @@ public class RoomSidebar extends Panel {
public UserFragment(String id, String markupId) {
super(id, markupId, RoomSidebar.this);
+ add(selfRights);
add(updateUsers());
}
}
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/room.css
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/room.css?rev=1740479&r1=1740478&r2=1740479&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/room.css (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/room.css Fri Apr 22 11:09:18 2016
@@ -82,6 +82,14 @@
.room.sidebar.left .ui-tabs .ui-tabs-panel {
padding: 0;
}
+.room.sidebar.left .user.header {
+ height: 30px;
+ padding-left: 15px;
+}
+.room.sidebar.left .user.header .ui-icon {
+ margin-top: 5px;
+ margin-left: 5px;
+}
.room.sidebar.left .user.list {
height: 100%;
overflow-y: auto;
Modified: openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java?rev=1740479&r1=1740478&r2=1740479&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java (original)
+++ openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java Fri Apr 22 11:09:18 2016
@@ -68,6 +68,7 @@ import org.apache.wicket.Application;
import org.apache.wicket.protocol.ws.WebSocketSettings;
import org.apache.wicket.protocol.ws.api.IWebSocketConnection;
import org.apache.wicket.protocol.ws.api.registry.IWebSocketConnectionRegistry;
+import org.apache.wicket.util.string.StringValue;
import org.apache.wicket.util.string.Strings;
import org.red5.logging.Red5LoggerFactory;
import org.red5.server.adapter.ApplicationAdapter;
@@ -177,7 +178,9 @@ public class ScopeApplicationAdapter ext
}
Client rcm = new Client();
rcm.setStreamid(conn.getClient().getId());
- rcm.setScope(conn.getScope().getName());
+ StringValue scn = StringValue.valueOf(conn.getScope().getName());
+ rcm.setScope(scn.toString());
+ rcm.setRoomId(scn.toOptionalLong());
rcm.setUserport(conn.getRemotePort());
rcm.setUserip(conn.getRemoteAddress());
rcm.setSwfurl(swfURL);
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.html?rev=1740479&r1=1740478&r2=1740479&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.html (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.html Fri Apr 22 11:09:18 2016
@@ -25,14 +25,7 @@
<div wicket:id="name" class="user name"></div>
<span class="ui-icon align-right clickable audio-activity" wicket:message="title:372"></span>
<div wicket:id="actions" class="user actions">
- <span class="ui-icon align-left clickable moderator-right" wicket:message="title:676"></span>
- <span class="ui-icon align-left clickable wb-right" wicket:message="title:611"></span>
- <span class="ui-icon align-left clickable screen-share-right" wicket:message="title:1067"></span>
- <span class="ui-icon align-left clickable remote-control-right" wicket:message="title:1078"></span>
- <span class="ui-icon align-left clickable audio-right" wicket:message="title:1604"></span>
- <span class="ui-icon align-left clickable camera-right" wicket:message="title:683"></span>
- <span class="ui-icon align-left clickable global-mute" wicket:message="title:1384"></span>
- <span class="ui-icon align-left clickable exclsv-audio" wicket:message="title:1424"></span>
+ <span wicket:id="rights"></span>
<span class="ui-icon align-left clickable kick" wicket:message="title:1213"></span>
<span wicket:id="privateChat" class="ui-icon align-right clickable private-chat" wicket:message="title:1493" onclick="startPrivateChat($(this));"></span>
<div class="clear"></div>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.java?rev=1740479&r1=1740478&r2=1740479&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.java Fri Apr 22 11:09:18 2016
@@ -52,11 +52,14 @@ public class RoomClientPanel extends Pan
status = "status-user";
statusTitle = "677";
}
+ //FIXME TODO add 'typingActivity'
+ //FIXME TODO add ability to change 'first/last name'
add(new WebMarkupContainer("status").add(AttributeAppender.append("class", status), AttributeAppender.replace("title", getString(statusTitle))));
User u = getBean(UserDao.class).get(c.getUserId());
add(new Label("name", u.getFirstname() + " " + u.getLastname()));
add(AttributeAppender.append("data-userid", c.getUserId()));
WebMarkupContainer actions = new WebMarkupContainer("actions");
+ actions.add(new RoomRightPanel("rights"));
actions.add(new WebMarkupContainer("privateChat").setVisible(!room.getRoom().isHidden(RoomElement.Chat) && !getUserId().equals(c.getUserId())));
if (room.getClient() != null) {
actions.setVisible(room.getClient().hasRight(Right.moderator));
Added: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomRightPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomRightPanel.html?rev=1740479&view=auto
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomRightPanel.html (added)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomRightPanel.html Fri Apr 22 11:09:18 2016
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<html xmlns:wicket="http://wicket.apache.org">
+<wicket:panel>
+ <span class="ui-icon align-left clickable moderator-right" wicket:message="title:676"></span>
+ <span class="ui-icon align-left clickable wb-right" wicket:message="title:611"></span>
+ <span class="ui-icon align-left clickable screen-share-right" wicket:message="title:1067"></span>
+ <span class="ui-icon align-left clickable remote-control-right" wicket:message="title:1078"></span>
+ <span class="ui-icon align-left clickable audio-right" wicket:message="title:1604"></span>
+ <span class="ui-icon align-left clickable camera-right" wicket:message="title:683"></span>
+ <span class="ui-icon align-left clickable global-mute" wicket:message="title:1384"></span>
+ <span class="ui-icon align-left clickable exclsv-audio" wicket:message="title:1424"></span>
+</wicket:panel>
+</html>
Added: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomRightPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomRightPanel.java?rev=1740479&view=auto
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomRightPanel.java (added)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomRightPanel.java Fri Apr 22 11:09:18 2016
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openmeetings.web.room.sidebar;
+
+import org.apache.wicket.markup.html.panel.Panel;
+
+public class RoomRightPanel extends Panel {
+ private static final long serialVersionUID = 1L;
+
+ public RoomRightPanel(String id) {
+ super(id);
+ setRenderBodyOnly(true);
+ setOutputMarkupId(true);
+ }
+}
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html?rev=1740479&r1=1740478&r2=1740479&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html Fri Apr 22 11:09:18 2016
@@ -23,6 +23,9 @@
<div class="tabs" wicket:id="tabs"></div>
<wicket:fragment wicket:id="user-panel">
+ <div class="user header">
+ <span wicket:id="rights"></span>
+ </div>
<div class="user list">
<div wicket:id="user" class="user ui-corner-all ui-widget-content">
<div wicket:id="user"></div>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java?rev=1740479&r1=1740478&r2=1740479&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java Fri Apr 22 11:09:18 2016
@@ -47,6 +47,7 @@ public class RoomSidebar extends Panel {
private final ITab fileTab;
private final UploadDialog upload;
private final RoomFilePanel roomFiles;
+ private final RoomRightPanel selfRights;
private boolean showFiles;
private final ListView<Client> users = new ListView<Client>("user", new ArrayList<Client>()) {
private static final long serialVersionUID = 1L;
@@ -100,6 +101,7 @@ public class RoomSidebar extends Panel {
};
add(tabs = new TabbedPanel("tabs", Arrays.asList(userTab, fileTab)).setActiveTab(room.getRoom().isFilesOpened() ? 1 : 0));
roomFiles = new RoomFilePanel("tree", room);
+ selfRights = new RoomRightPanel("rights");
add(upload = new UploadDialog("upload", room, roomFiles));
}
@@ -115,6 +117,7 @@ public class RoomSidebar extends Panel {
public UserFragment(String id, String markupId) {
super(id, markupId, RoomSidebar.this);
+ add(selfRights);
add(updateUsers());
}
}
@@ -127,7 +130,7 @@ public class RoomSidebar extends Panel {
add(roomFiles);
}
}
-
+
private void updateShowFiles() {
showFiles = !room.getRoom().isHidden(RoomElement.Files) && room.getClient().hasRight(Right.whiteBoard);
}
Modified: openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/room.css
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/room.css?rev=1740479&r1=1740478&r2=1740479&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/room.css (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/room.css Fri Apr 22 11:09:18 2016
@@ -82,6 +82,14 @@
.room.sidebar.left .ui-tabs .ui-tabs-panel {
padding: 0;
}
+.room.sidebar.left .user.header {
+ height: 30px;
+ padding-left: 15px;
+}
+.room.sidebar.left .user.header .ui-icon {
+ margin-top: 5px;
+ margin-left: 5px;
+}
.room.sidebar.left .user.list {
height: 100%;
overflow-y: auto;