Author: solomax
Date: Tue Aug 21 21:55:28 2012
New Revision: 1375816
URL: http://svn.apache.org/viewvc?rev=1375816&view=rev
Log:
OPENMEETINGS-397 fixed
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participantListItem.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/moderationMiniIconRestricted.lzx
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participantListItem.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participantListItem.lzx?rev=1375816&r1=1375815&r2=1375816&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participantListItem.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participantListItem.lzx
Tue Aug 21 21:55:28 2012
@@ -394,22 +394,22 @@
<labelText name="_firstName" fontsize="10" x="40" text="$once{
parent.firstname }" />
<labelText name="_lastName" fontsize="10" x="40" y="20" text="$once{
parent.lastname }" />
- <miniIcons name="_start_private_chat_rsc" x="114" y = "2" width="16"
height="16"
- resource="start_private_chat_rsc" showhandcursor="true">
- <handler name="onclick">
- var refObj = parent.refObj;
- if ($debug) Debug.write("Start Private Chat with 1: ",
refObj.publicSID);
- if ($debug) Debug.write("Start Private Chat with 2: ", refObj);
- if (refObj.publicSID == canvas.publicSID) {
- new lz.labelerrorPopup(canvas.main_content._content.inner,{
- errorlabelid:1495
- });
- return;
- }
+ <miniIcons name="_start_private_chat_rsc" x="114" y = "2" width="16"
height="16"
+ resource="start_private_chat_rsc" showhandcursor="true"
+ visible="${ (canvas.currentRoomObj.hideChat == null ||
!canvas.currentRoomObj.hideChat) && parent.refObj.publicSID !=
canvas.publicSID }">
+
+ <handler name="onclick">
+ var refObj = parent.refObj;
+ if ($debug) Debug.write("Start Private Chat: ", refObj);
+ if (refObj.publicSID == canvas.publicSID) {
+ new
lz.labelerrorPopup(canvas.main_content._content.inner
+ , {errorlabelid:1495});
+ return;
+ }
canvas._currentChatPanel.addChat(refObj);
- </handler>
- <labelTooltip labelid="1493" />
- </miniIcons>
+ </handler>
+ <labelTooltip labelid="1493" />
+ </miniIcons>
<view name="_x" x="132" y="2">
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=1375816&r1=1375815&r2=1375816&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
Tue Aug 21 21:55:28 2012
@@ -26,6 +26,7 @@
<attribute name="isSuperModerator" value="false" type="boolean"/>
<handler name="oninit">
+ <![CDATA[
this.isMod = parent.parent.isMod;
this.isSuperModerator = parent.parent.isSuperModerator;
@@ -133,6 +134,10 @@
this._unMuteDevice.setAttribute("visibility","hidden");
}
+ this._start_private_chat_rsc.setAttribute('visible'
+ , (canvas.currentRoomObj.hideChat == null ||
!canvas.currentRoomObj.hideChat)
+ && parent.parent.refObj.publicSID !=
canvas.publicSID);
+ ]]>
</handler>
<miniIcons name="_isMod" x="0" width="16" showhandcursor="true"
@@ -379,22 +384,21 @@
<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">
- <handler name="onclick">
- var refObj = parent.parent.parent.refObj;
- if ($debug) Debug.write("Start Private Chat with 1: ",
refObj.publicSID);
- if ($debug) Debug.write("Start Private Chat with 2: ", refObj);
- if (refObj.publicSID == canvas.publicSID) {
- new lz.labelerrorPopup(canvas.main_content._content.inner,{
- errorlabelid:1495
- });
- return;
- }
+ <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;
+ if ($debug) Debug.write("Start Private Chat: ", refObj);
+ if (refObj.publicSID == canvas.publicSID) {
+ new
lz.labelerrorPopup(canvas.main_content._content.inner
+ ,{errorlabelid:1495});
+ return;
+ }
canvas._currentChatPanel.addChat(refObj);
- </handler>
- <labelTooltip labelid="1493" />
- </miniIcons>
+ </handler>
+ <labelTooltip labelid="1493" />
+ </miniIcons>
</class>
</library>
