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 2014/10/20 15:50:49 UTC
svn commit: r1633155 - in /openmeetings/branches/3.0.x/WebContent:
src/modules/conference/restricted/moderationMiniIconRestricted.lzx
src/modules/conference/restricted/restrictedUserListItem.lzx
swf10/video/editRecordStreamSWF10.lzx
Author: solomax
Date: Mon Oct 20 13:50:49 2014
New Revision: 1633155
URL: http://svn.apache.org/r1633155
Log:
[OPENMEETINGS-1075] re-sync icon is added to restricted room, remember video settings works as expected
Modified:
openmeetings/branches/3.0.x/WebContent/src/modules/conference/restricted/moderationMiniIconRestricted.lzx
openmeetings/branches/3.0.x/WebContent/src/modules/conference/restricted/restrictedUserListItem.lzx
openmeetings/branches/3.0.x/WebContent/swf10/video/editRecordStreamSWF10.lzx
Modified: openmeetings/branches/3.0.x/WebContent/src/modules/conference/restricted/moderationMiniIconRestricted.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/WebContent/src/modules/conference/restricted/moderationMiniIconRestricted.lzx?rev=1633155&r1=1633154&r2=1633155&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/WebContent/src/modules/conference/restricted/moderationMiniIconRestricted.lzx (original)
+++ openmeetings/branches/3.0.x/WebContent/src/modules/conference/restricted/moderationMiniIconRestricted.lzx Mon Oct 20 13:50:49 2014
@@ -385,8 +385,7 @@
<labelTooltip labelid="1213" />
</miniIcons>
- <miniIcons name="_start_private_chat_rsc" x="172" y = "2" width="16" height="16"
- resource="start_private_chat_rsc" showhandcursor="true">
+ <miniIcons name="_start_private_chat_rsc" x="172" y="2" width="16" height="16" resource="start_private_chat_rsc" showhandcursor="true">
<handler name="onclick">
var refObj = parent.parent.parent.refObj;
Modified: openmeetings/branches/3.0.x/WebContent/src/modules/conference/restricted/restrictedUserListItem.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/WebContent/src/modules/conference/restricted/restrictedUserListItem.lzx?rev=1633155&r1=1633154&r2=1633155&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/WebContent/src/modules/conference/restricted/restrictedUserListItem.lzx (original)
+++ openmeetings/branches/3.0.x/WebContent/src/modules/conference/restricted/restrictedUserListItem.lzx Mon Oct 20 13:50:49 2014
@@ -20,8 +20,7 @@
-->
<library>
-<class name="restrictedUserListItem" extends="basePagingListItem"
- showhandcursor="false" width="254" height="42">
+<class name="restrictedUserListItem" extends="basePagingListItem" showhandcursor="false" width="254" height="42">
<attribute name="connectedSince" value="" type="string" />
@@ -113,26 +112,22 @@
</method>
<view name="_content" width="254">
-
- <view name="_contentIsCurrent" visible="${ parent.parent.selfItem }"
- width="254" height="40" bgcolor="0x7CFC00"/>
+ <view name="_contentIsCurrent" visible="${ parent.parent.selfItem }" width="254" height="40" bgcolor="0x7CFC00"/>
- <!--
- + ' ' + parent.parent.itemId
- -->
-
- <labelText name="_userName" x="2" y="2"
- text="${ parent.parent.firstname+' '+parent.parent.lastname }" />
+ <labelText name="_userName" x="2" y="2" text="${ parent.parent.firstname+' '+parent.parent.lastname }" />
- <view name="userStatus" visible="${ parent.parent.clickable }"
- x="238" frame="1" resource="userstatus_multiframe_rsc" />
-
+ <miniIcons name="_restartDevice" x="220" y="0" width="16" height="16" resource="resyncuser_rsc" showhandcursor="true"
+ visible="${ parent.parent.clickable && parent.parent.selfItem && canvas.isBroadCasting }">
+ <handler name="onclick">
+ if ($debug) Debug.write("parent.parent.refObj.publicSID: ",parent.parent.refObj.publicSID);
+ canvas._videocontainer._videoviewcontent.showDevicePopUp(true);
+ </handler>
+ <labelTooltip labelid="610" />
+ </miniIcons>
+ <view name="userStatus" visible="${ parent.parent.clickable }" x="238" frame="1" resource="userstatus_multiframe_rsc" />
<moderationMiniIconRestricted name="_iconsModerator" visibility="hidden"/>
</view>
-
-
-
</class>
</library>
Modified: openmeetings/branches/3.0.x/WebContent/swf10/video/editRecordStreamSWF10.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/WebContent/swf10/video/editRecordStreamSWF10.lzx?rev=1633155&r1=1633154&r2=1633155&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/WebContent/swf10/video/editRecordStreamSWF10.lzx (original)
+++ openmeetings/branches/3.0.x/WebContent/swf10/video/editRecordStreamSWF10.lzx Mon Oct 20 13:50:49 2014
@@ -160,10 +160,6 @@
//In case the user presses the Sync Button this box should
//not close automatically and do the user-prefered values
- if (canvas.currentRoomObject.roomtype.roomtypes_id == 3) {
- //restricted room
- return null;
- }
if(save && !this.isSyncUpdate && this.checkLocalDataComplete()) {
return g;
}