Revision: 2513
Author: seba.wagner
Date: Mon Oct 26 03:55:01 2009
Log: Fixes: Restricted Room, other type of User-List
http://code.google.com/p/openmeetings/source/detail?r=2513
Added:
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/eventuserlist/eventUserListItemWithNames.lzx
Modified:
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/conference/conferenceMenubar.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/eventuserlist/eventUserList.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/eventuserlist/eventUserListInner.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/eventuserlist/library.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/flexibleConferenceRoom/roomSidebar/eventRoomSidebar.lzx
=======================================
--- /dev/null
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/eventuserlist/eventUserListItemWithNames.lzx
Mon Oct 26 03:55:01 2009
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<library>
+
+<class name="eventUserListItemWithNames" extends="view"
showhandcursor="false"
+ bgcolor="0xCCCCCC" width="252" height="42">
+
+ <attribute name="connectedSince" value="" type="string" />
+ <attribute name="isMod" value="" type="string" />
+ <attribute name="streamid" value="" type="string" />
+ <attribute name="username" value="" type="string" />
+ <attribute name="userroom" value="" type="string" />
+ <attribute name="formatedDate" value="" type="string" />
+ <attribute name="firstname" value="" type="string" />
+ <attribute name="lastname" value="" type="string" />
+ <attribute name="user_id" value="0" type="number" />
+ <attribute name="refObj" value="null" />
+
+ <attribute name="isSelected" value="false" type="boolean" />
+
+ <handler name="oninit">
+ <![CDATA[
+
+ //this._userpic.setAttribute('src',downloadurl);
+ //This is a workaround cause in LPS-4.2.x immediatelly loading
does not work
+ lz.Timer.addTimer( new LzDelegate( this, "fadeText" ), 1000 );
+
+ if (this.isMod) {
+ this.userStatus.setAttribute("frame",3);
+ }
+
+ if (canvas.publicSID == this.refObj.publicSID) {
+ //this._userName.setAttribute("fontstyle","bold");
+ this.setAttribute("bgcolor",0x00FF00);
+ }
+
+ this.updateIcons();
+ ]]>
+ </handler>
+
+ <method name="updateIconByMod">
+ this.isMod = canvas.getIsModeratorByPublicSID(this.refObj.publicSID);
+ if (this.isMod) {
+ this.userStatus.setAttribute("frame",3);
+ } else if (this.refObj.canDraw) {
+ this.userStatus.setAttribute("frame",2);
+ } else {
+ this.userStatus.setAttribute("frame",1);
+ }
+
+ if (this.isSelected) {
+ this._miniIcons.oninit.sendEvent();
+ }
+ </method>
+
+ <method name="fadeText" args="ignore=null">
+ <![CDATA[
+
+ //Do Load the Custom Moodle Profilee Picture
+ if (this.refObj.externalUserId >= 1 &&
this.refObj.externalUserType == "moodle") {
+
+ if (this.refObj.externalUserId == 1) {
+ //Means it is a guest
+ var downloadurl = canvas.moodleWwwRoot+"/pix/u/f2.jpg";
+ } else {
+ var downloadurl =
canvas.moodleWwwRoot+"/user/pix.php/"+ this.refObj.externalUserId
+"/f2.jpg";
+ }
+
+ } else {
+
+ var downloadurl
= 'http://'+canvas.rtmphostlocal+':'+canvas.red5httpport
+
+canvas.httpRootKey+'DownloadHandler?fileName=CHAT'
+
+'&moduleName=chat&parentPath=&room_id='
+ +'&remoteUserid='+this.user_id
+ +'&sid='+canvas.sessionId;
+
+ }
+
+ this._userpic.setAttribute('src',downloadurl);
+ ]]>
+ </method>
+
+ <handler name="onmouseover">
+ //this.setAttribute('bgcolor',canvas.baseMousecolorizer);
+ </handler>
+
+ <handler name="onmouseout">
+ //this.setAttribute('bgcolor',0xFFFFFF);
+ </handler>
+
+ <handler name="onclick">
+ parent.parent.parent.selectItem(this);
+ </handler>
+
+ <method name="select">
+ if (!this.isSelected) {
+ new
lz.moderationMiniIcons(this,{name:'_miniIcons',align:'right'});
+ this.isSelected = true;
+ this._userName.text = "";
+ this.showItem.doStart();
+ }
+ </method>
+
+ <method name="deselect">
+ if (this.isSelected) {
+ this._miniIcons.destroy();
+ this.isSelected = false;
+ this._userName.text = this.firstname+' '+this.lastname;
+ this.closeItem.doStart();
+ }
+ </method>
+
+ <image name="_userpic" stretches="both" x="1" y="1">
+ <handler name="onload">
+ <![CDATA[
+ if (this.height > 38) {
+ //If bigger then containter then scale it
+ var width = this.width/(this.height/38);
+ this.setAttribute('height',38);
+ this.setAttribute('width',width);
+ }
+ ]]>
+ </handler>
+ </image>
+
+ <view name="userStatus" align="right" frame="1"
+ resource="userstatus_multiframe_rsc" />
+
+ <labelText name="_userName" x="41" y="2"
+ text="$once{ parent.firstname+' '+parent.lastname }" />
+
+ <!--
+ <labelTooltip name="_userName" text="$once{
parent.firstname+' '+parent.lastname }" />
+ -->
+
+ <animatorgroup name="showItem" start="false" process="simultaneous">
+ <animator attribute="height" to="62" duration="750" />
+ <animator attribute="width" to="252" duration="750" />
+ </animatorgroup>
+
+ <animatorgroup name="closeItem" start="false" process="simultaneous">
+ <animator attribute="height" to="42" duration="750" />
+ <animator attribute="width" to="252" duration="750" />
+ </animatorgroup>
+
+</class>
+
+</library>
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/conference/conferenceMenubar.lzx
Sun Oct 25 08:47:11 2009
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/conference/conferenceMenubar.lzx
Mon Oct 26 03:55:01 2009
@@ -127,13 +127,13 @@
}
]]>
</handler>
- <_labelMenuItem labelid="15" command="cmd_importFile" />
+ <_labelMenuItem labelid="15" command="cmd_importFile"
enabled="${ !canvas.ismoderator }" />
<menuseparator/>
- <_labelMenuItem labelid="561" command="cmd_exportFilePNG" />
- <_labelMenuItem labelid="562" command="cmd_exportFileJPG" />
- <_labelMenuItem labelid="563" command="cmd_exportFilePDF" />
- <_labelMenuItem labelid="560" command="cmd_exportFileSVG" />
- <_labelMenuItem labelid="564" command="cmd_exportFileTIF" />
+ <_labelMenuItem labelid="561" command="cmd_exportFilePNG"
enabled="${ !canvas.ismoderator }" />
+ <_labelMenuItem labelid="562" command="cmd_exportFileJPG"
enabled="${ !canvas.ismoderator }" />
+ <_labelMenuItem labelid="563" command="cmd_exportFilePDF"
enabled="${ !canvas.ismoderator }" />
+ <_labelMenuItem labelid="560" command="cmd_exportFileSVG"
enabled="${ !canvas.ismoderator }" />
+ <_labelMenuItem labelid="564" command="cmd_exportFileTIF"
enabled="${ !canvas.ismoderator }" />
<menuseparator/>
<_labelMenuItem name="_exitItem" labelid="309"
command="cmd_quit" value="quit" />
</_labelMenu>
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/eventuserlist/eventUserList.lzx
Mon Oct 12 03:58:23 2009
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/eventuserlist/eventUserList.lzx
Mon Oct 26 03:55:01 2009
@@ -13,6 +13,8 @@
-->
<attribute name="userNewVideoContainer" value="false" type="boolean"/>
+ <attribute name="listType" value="eventUserListTable" type="string" />
+
<!--- colors for each user -->
<attribute name="colorArray" value="null" />
@@ -362,7 +364,7 @@
}
</method>
- <eventUserListInner name="_participents" />
+ <eventUserListInner name="_participents" listType="$once{
parent.listType }" />
<view name="_videoviewcontent">
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/eventuserlist/eventUserListInner.lzx
Mon Oct 12 03:58:23 2009
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/eventuserlist/eventUserListInner.lzx
Mon Oct 26 03:55:01 2009
@@ -4,13 +4,26 @@
<class name="innerlistViewEventUserListTable" extends="view" width="258" >
<wrappinglayout axis="x" spacing="4"/>
</class>
-
-<class name="eventUserListTable" extends="view"
- bgcolor="white" x="2" y="2" clip="true" width="$once{ parent.width-4
}" >
+
+<class name="innerlistViewEventUserListTableWithNames" extends="view"
width="258" >
+ <simplelayout axis="y" spacing="1" />
+</class>
+
+<class name="eventUserListTable" extends="view" y="60"
+ height="${ parent.height-64-parent.moderationPanel.height }"
+ bgcolor="0xFFFFFF" x="2" clip="true" width="$once{ parent.width-4 }" >
<innerlistViewEventUserListTable name="innerList" />
<vscrollbar />
</class>
+<class name="eventUserListTableWithNames" extends="view" y="60"
+ height="${ parent.height-64-parent.moderationPanel.height }"
+ bgcolor="0xFFFFFF" x="2" clip="true" width="$once{ parent.width-4 }" >
+ <innerlistViewEventUserListTableWithNames name="innerList" />
+ <vscrollbar />
+</class>
+
+
<class name="eventUserListInner" extends="view" width="$once{
parent.width }" height="${ parent.height }"
bgcolor="$once{ canvas.basebgcolorizer }" >
@@ -18,6 +31,8 @@
<attribute name="colorArray" value="null" />
+ <attribute name="listType" value="eventUserListTable" type="string" />
+
<handler name="oninit">
<![CDATA[
//color array
@@ -35,6 +50,8 @@
0x4174B1,0x00CC00,0xFFCC33,0xFF6633,0x4174B1,0x00CC00,0xFFCC33,0xFF6633,
0x4174B1,0x00CC00,0xFFCC33,0xFF6633,0x4174B1,0x00CC00,0xFFCC33,0xFF6633,
0x4174B1,0x00CC00,0xFFCC33,0xFF6633,0x4174B1,0x00CC00,0xFFCC33,0xFF6633];
+
+ this.initList();
]]>
</handler>
@@ -57,26 +74,44 @@
//FIXME: Round Number and make mod(10) to get a number between
1 and 10 for a color
canvas.currentusercolor =
this.colorArray[this._table.innerList.subviews.length];
- new lz.eventUserListItem(this._table.innerList,{
- user_id:object.user_id,
- firstname:object.firstname,
- lastname:object.lastname,
- refObj:object,
- connectedSince:object.connectedSince,
- isMod:object.isMod,
- streamid:object.streamid,
- username:object.username,
- formatedDate:object.formatedDate
- });
-
+ if (this.listType == "eventUserListTable") {
+ new lz.eventUserListItem(this._table.innerList,{
+ user_id:object.user_id,
+ firstname:object.firstname,
+ lastname:object.lastname,
+ refObj:object,
+ connectedSince:object.connectedSince,
+ isMod:object.isMod,
+ streamid:object.streamid,
+ username:object.username,
+ formatedDate:object.formatedDate
+ });
+ } else if (this.listType == "eventUserListTableWithNames") {
+ new lz.eventUserListItemWithNames(this._table.innerList,{
+ user_id:object.user_id,
+ firstname:object.firstname,
+ lastname:object.lastname,
+ refObj:object,
+ connectedSince:object.connectedSince,
+ isMod:object.isMod,
+ streamid:object.streamid,
+ username:object.username,
+ formatedDate:object.formatedDate
+ });
+ }
//Broadcast the message about the new user to all participants
canvas.thishib.setAudienceModus.doCall();
]]>
</method>
+ <method name="initList">
+ new lz[this.listType](this,{name:'_table'});
+ this.moderationPanel.bringToFront();
+ </method>
+
<method name="clearList">
this._table.destroy();
- new lz.eventUserListTable(this,{name:'_table'});
+ this.initList();
</method>
<!--- get a Objects List Item
@@ -142,9 +177,9 @@
<moderationMiniIconsEventUserList name="_applyAndStatusIcons"
x="$once{
parent.width-this.width-4 }" y="2" />
- <eventUserListTable name="_table" y="60"
- height="${
parent.height-64-parent.moderationPanel.height }"/>
-
+ <!--
+ <eventUserListTable name="_table" />
+ -->
<view name="moderationPanel" height="0" clip="true" y="${
parent.height - this.height - 2 }">
<handler name="onismoderator" reference="canvas" args="m">
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/eventuserlist/library.lzx
Mon Oct 12 03:58:23 2009
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/eventuserlist/library.lzx
Mon Oct 26 03:55:01 2009
@@ -12,5 +12,6 @@
<include href="eventUserListInner.lzx" />
<include href="eventUserListItem.lzx" />
<include href="eventUserList.lzx" />
+ <include href="eventUserListItemWithNames.lzx" />
</library>
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx
Sun Oct 25 08:47:11 2009
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx
Mon Oct 26 03:55:01 2009
@@ -89,7 +89,7 @@
</handler>
</netRemoteCallHib>
- <eventRoomSidebar name="_sidePanel" restricted="true" />
+ <eventRoomSidebar name="_sidePanel" restricted="true"
listType="eventUserListTableWithNames" />
<conferenceBox name="_chatPanelStrict" labelid="616" textInset="30"
closeable="true"
height="200" x="${ parent._sidePanel.width }"
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/flexibleConferenceRoom/roomSidebar/eventRoomSidebar.lzx
Sun Oct 25 08:47:11 2009
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/flexibleConferenceRoom/roomSidebar/eventRoomSidebar.lzx
Mon Oct 26 03:55:01 2009
@@ -9,6 +9,8 @@
<attribute name="isOpen" value="true" type="boolean"/>
<attribute name="restricted" value="false" type="boolean" />
+
+ <attribute name="listType" value="eventUserListTable" type="string" />
<method name="doSelection" args="itemRef">
<![CDATA[
@@ -92,8 +94,9 @@
<uploadTab name="_files" y="36" width="$once{ parent.width-12 }"
height="${ parent.height-36 }" visibility="hidden" />
- <eventUserList name="_videocontainer" y="36"
userNewVideoContainer="true"
- width="$once{ parent.width-10 }" height="${
parent.height-36 }" />
+ <eventUserList name="_videocontainer" y="36" listType="$once{
parent.listType }"
+ userNewVideoContainer="true" width="$once{
parent.width-10 }"
+ height="${ parent.height-36 }" />
<view name="_minimizeSidebar" x="${ parent.width - 10 }" width="10"
bgcolor="$once{ canvas.baseMousecolorizer }" height="${
parent.height }">
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"OpenMeetings developers" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/openmeetings-dev?hl=en
-~----------~----~----~----~------~----~------~--~---
