Author: solomax
Date: Tue May 21 09:51:32 2013
New Revision: 1484723
URL: http://svn.apache.org/r1484723
Log:
[OPENMEETINGS-634] upload to whiteboard is disabled if there is no whiteboard.
Modified:
openmeetings/branches/2.1/WebContent/src/base/components/upload/uploadWindowExplorer.lzx
openmeetings/branches/2.1/WebContent/src/base/mainAttributes.lzx
openmeetings/branches/2.1/WebContent/src/modules/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx
openmeetings/trunk/singlewebapp/WebContent/src/base/components/upload/uploadWindowExplorer.lzx
openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx
openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx
Modified:
openmeetings/branches/2.1/WebContent/src/base/components/upload/uploadWindowExplorer.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/2.1/WebContent/src/base/components/upload/uploadWindowExplorer.lzx?rev=1484723&r1=1484722&r2=1484723&view=diff
==============================================================================
---
openmeetings/branches/2.1/WebContent/src/base/components/upload/uploadWindowExplorer.lzx
(original)
+++
openmeetings/branches/2.1/WebContent/src/base/components/upload/uploadWindowExplorer.lzx
Tue May 21 09:51:32 2013
@@ -226,12 +226,6 @@
</handler>
</simpleLabelButton>
- <!--
- <labelText labelid="592" name="progress2" visibility="hidden" x="10"
y="140"
- width="250" multiline="true">
-
- </labelText>
- -->
<view name="progress2" x="10" y="158" width="250" visibility="hidden"
height="10" bgcolor="#C6CEDF">
<attribute name="isStarted" value="false" type="boolean" />
<method name="startShowing">
@@ -280,7 +274,7 @@
</view>
<labelCheckbox name="_loadToWhiteboard" x="4" y="184" fontsize="11"
- labelid="1312" value="true" />
+ labelid="1312" value="true" labelid="1312" value="${
canvas.whiteboardCount > 0 }" enabled="${ canvas.whiteboardCount > 0 }" />
<simpleLabelButton name="_close" x="100" y="204" labelid="595"
width="160" height="20">
<handler name="onclick">
Modified: openmeetings/branches/2.1/WebContent/src/base/mainAttributes.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/2.1/WebContent/src/base/mainAttributes.lzx?rev=1484723&r1=1484722&r2=1484723&view=diff
==============================================================================
--- openmeetings/branches/2.1/WebContent/src/base/mainAttributes.lzx (original)
+++ openmeetings/branches/2.1/WebContent/src/base/mainAttributes.lzx Tue May 21
09:51:32 2013
@@ -253,6 +253,7 @@ the LAST RoomClient Object that has been
<attribute name="currentlanguage" value="english" type="string" />
<attribute name="objWhiteboard" value="null" />
+<attribute name="whiteboardCount" value="0" type="number" />
<attribute name="objMessage" value="null" />
<attribute name="VarsModeratorGeneral" value="null" />
Modified:
openmeetings/branches/2.1/WebContent/src/modules/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/2.1/WebContent/src/modules/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx?rev=1484723&r1=1484722&r2=1484723&view=diff
==============================================================================
---
openmeetings/branches/2.1/WebContent/src/modules/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx
(original)
+++
openmeetings/branches/2.1/WebContent/src/modules/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx
Tue May 21 09:51:32 2013
@@ -140,6 +140,7 @@
tWhiteboardBtn.onmouseout.sendEvent(null);
this.addNewItemButton.updatePosition();
+ canvas.whiteboardCount++;
return whiteboard;
</method>
@@ -175,6 +176,7 @@
this.objMessage[0] = "removeWindow";
this.objMessage[1] = whiteboardId;
this.sendMessageToMembers.doCall();
+ canvas.whiteboardCount--;
}
</method>
Modified:
openmeetings/trunk/singlewebapp/WebContent/src/base/components/upload/uploadWindowExplorer.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/base/components/upload/uploadWindowExplorer.lzx?rev=1484723&r1=1484722&r2=1484723&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/WebContent/src/base/components/upload/uploadWindowExplorer.lzx
(original)
+++
openmeetings/trunk/singlewebapp/WebContent/src/base/components/upload/uploadWindowExplorer.lzx
Tue May 21 09:51:32 2013
@@ -226,12 +226,6 @@
</handler>
</simpleLabelButton>
- <!--
- <labelText labelid="592" name="progress2" visibility="hidden" x="10"
y="140"
- width="250" multiline="true">
-
- </labelText>
- -->
<view name="progress2" x="10" y="158" width="250" visibility="hidden"
height="10" bgcolor="#C6CEDF">
<attribute name="isStarted" value="false" type="boolean" />
<method name="startShowing">
@@ -280,7 +274,7 @@
</view>
<labelCheckbox name="_loadToWhiteboard" x="4" y="184" fontsize="11"
- labelid="1312" value="true" />
+ labelid="1312" value="${ canvas.whiteboardCount > 0 }"
enabled="${ canvas.whiteboardCount > 0 }" />
<simpleLabelButton name="_close" x="100" y="204" labelid="595"
width="160" height="20">
<handler name="onclick">
Modified: openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx?rev=1484723&r1=1484722&r2=1484723&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx
(original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx Tue
May 21 09:51:32 2013
@@ -253,6 +253,7 @@ the LAST RoomClient Object that has been
<attribute name="currentlanguage" value="english" type="string" />
<attribute name="objWhiteboard" value="null" />
+<attribute name="whiteboardCount" value="0" type="number" />
<attribute name="objMessage" value="null" />
<attribute name="VarsModeratorGeneral" value="null" />
Modified:
openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx?rev=1484723&r1=1484722&r2=1484723&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx
(original)
+++
openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx
Tue May 21 09:51:32 2013
@@ -140,6 +140,7 @@
tWhiteboardBtn.onmouseout.sendEvent(null);
this.addNewItemButton.updatePosition();
+ canvas.whiteboardCount++;
return whiteboard;
</method>
@@ -175,6 +176,7 @@
this.objMessage[0] = "removeWindow";
this.objMessage[1] = whiteboardId;
this.sendMessageToMembers.doCall();
+ canvas.whiteboardCount--;
}
</method>
