Author: sebawagner
Date: Tue Mar 6 19:31:28 2012
New Revision: 1297663
URL: http://svn.apache.org/viewvc?rev=1297663&view=rev
Log:
OPENMEETINGS-81 client side upload with only one component
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/upload/uploadWindowExplorer.lzx
Removed:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/upload/backupImportWindow.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/upload/importWindow.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/upload/uploadWindow.lzx
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/upload/fileUpload.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/upload/library.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/backup/backupContent.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/languageseditor/languagesEditor.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/library.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/library.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/mainDashboard.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/profilesPanel.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/editUserProfile.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/plugins/fileexplorer/library.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/plugins/fileexplorer/upload/library.lzx
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/upload/fileUpload.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/upload/fileUpload.lzx?rev=1297663&r1=1297662&r2=1297663&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/upload/fileUpload.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/upload/fileUpload.lzx
Tue Mar 6 19:31:28 2012
@@ -73,11 +73,18 @@
var allTypes = new Array();
var imageTypes = new Object();
- imageTypes.description = "Powerpoint (*.zip)";
+ imageTypes.description = "ZIP (*.zip)";
imageTypes.extension = "*.zip";
allTypes.push(imageTypes);
fr.browse(allTypes);
+ } else if(this.isOnlyProfile){
+ var allTypes = new Array();
+ var imageTypes = new Object();
+ imageTypes.description = "Allowed Files (*.psd,
*.tiff, *.bmp, *.svg, *.dpx, *.exr, *.jpg, *.jpeg, *.gif, *.png)";
+ imageTypes.extension = "*.psd; *.tiff; *.bmp;
*.svg; *.dpx; *.exr; *.jpg; *.jpeg; *.gif; *.png";
+ allTypes.push(imageTypes);
+ fr.browse(allTypes);
} else if (this.isOnlyImage){
var allTypes = new Array();
@@ -112,17 +119,10 @@
} else if(this.isOnlyXml){
var allTypes = new Array();
var imageTypes = new Object();
- imageTypes.description = "Powerpoint (*.xml)";
+ imageTypes.description = "XML (*.xml)";
imageTypes.extension = "*.xml;";
allTypes.push(imageTypes);
fr.browse(allTypes);
- } else if(this.isOnlyProfile){
- var allTypes = new Array();
- var imageTypes = new Object();
- imageTypes.description = "Allowed Files (*.psd,
*.tiff, *.bmp, *.svg, *.dpx, *.exr, *.jpg, *.jpeg, *.gif, *.png)";
- imageTypes.extension = "*.psd; *.tiff; *.bmp;
*.svg; *.dpx; *.exr; *.jpg; *.jpeg; *.gif; *.png";
- allTypes.push(imageTypes);
- fr.browse(allTypes);
} else {
fr.browse();
}
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/upload/library.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/upload/library.lzx?rev=1297663&r1=1297662&r2=1297663&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/upload/library.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/upload/library.lzx
Tue Mar 6 19:31:28 2012
@@ -20,9 +20,14 @@
-->
<library>
+
<include href="fileUpload.lzx" />
+ <include href="uploadWindowExplorer.lzx" />
+
+ <!--
<include href="backupImportWindow.lzx" />
<include href="importWindow.lzx" />
<include href="uploadWindow.lzx" />
+ -->
</library>
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/upload/uploadWindowExplorer.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/upload/uploadWindowExplorer.lzx?rev=1297663&view=auto
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/upload/uploadWindowExplorer.lzx
(added)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/upload/uploadWindowExplorer.lzx
Tue Mar 6 19:31:28 2012
@@ -0,0 +1,289 @@
+<?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.
+
+-->
+<library>
+
+ <class name="uploadWindowExplorer" extends="labelExplorerBox" labelid="304"
+ docking="true" closable="true" width="264" x="200" height="230">
+
+ <handler name="oninit">
+ lz.ModeManager.makeModal(this);
+ canvas.currentUploadWindow = this;
+ if (this.servletName != "file.upload") {
+ this._loadToWhiteboard.destroy();
+ }
+ </handler>
+
+ <handler name="onclose">
+ lz.ModeManager.release(this);
+ </handler>
+
+ <attribute name="winobj" value="null" />
+ <attribute name="sessionid" value="" type="string" />
+ <attribute name="isOwner" value="0" type="string" />
+ <attribute name="usersid" value="" type="string" />
+ <attribute name="singleslidesmodule_id" type="string" value="" />
+ <attribute name="fileExplorerRef" value="null" />
+ <attribute name="secondid" value="0" type="string" />
+
+ <attribute name="servletName" value="upload.upload" type="string" />
+ <attribute name="parentFolderId" value="0" type="number" />
+
+ <attribute name="uploadmodule" value="videoconf1" type="string" />
+
+ <attribute name="isOnlyImage" value="false" type="boolean" />
+ <attribute name="isOnlyPpt" value="false" type="boolean" />
+ <attribute name="isOnlyProfile" value="false" type="boolean" />
+ <attribute name="isOnlyXml" value="false" type="boolean" />
+ <attribute name="isOnlyZip" value="false" type="boolean" />
+
+ <attribute name="isdefaultreturn" value="true" type="boolean" />
+ <attribute name="returnObj" value="true" type="boolean" />
+
+ <fileUpload name="myFileUpload" isOnlyImage="${ this.parent.isOnlyImage
}"
+ isOnlyPpt="${ this.parent.isOnlyPpt }" isOnlyProfile="${
this.parent.isOnlyProfile }"
+ isOnlyXml="${ this.parent.isOnlyXml }" isOnlyZip="${
this.parent.isOnlyZip }">
+ <method name="onComplete" args="fr">
+ if ($debug) Debug.write("oncomplete ",fr);
+ </method>
+ <method name="formatURL" args="fileHash">
+ <![CDATA[
+ var uploadmoduleimgfolderVar = '/' + fileHash;
+ var downloadurl = canvas.protocol + '://' +
canvas.rtmphostlocal + ':' + canvas.red5httpport +
canvas.httpRootKey+'DownloadHandler?' +
+ 'fileName=' + encodeURIComponent(fileHash + ".swf") +
+ '&moduleName=' + 'videoconf1' +
+ '&parentPath=' +
encodeURIComponent(uploadmoduleimgfolderVar + '/' )+
+ '&room_id=files'+
+ '&sid='+canvas.sessionId;
+ ////Debug.write("downloadurl: ",downloadurl);
+ return downloadurl;
+ ]]>
+ </method>
+
+ <method name="generateFileLink" args="fileHash">
+ <![CDATA[
+ return canvas.protocol +
'://'+canvas.rtmphostlocal+':'+canvas.red5httpport+canvas.httpRootKey+'DownloadHandler?'
+
+ 'fileName='+ fileHash +
+ '&moduleName='+ "videoconf1" +
+ '&parentPath='+ '/' +
+ '&room_id=files' +
+ '&sid='+canvas.sessionId;
+ ]]>
+ </method>
+
+ <method name="onCompleteByRemote" args="tArrayValueObj">
+
+ if ($debug) Debug.write("onCompleteByRemote ",tArrayValueObj);
+ this.parent.progressBar.setValue(100);
+ this.parent.upload.setAttribute('enabled', false);
+ this.parent.upload.setAttribute("visible",false);
+ this.parent.browse.setAttribute("visible",false);
+ this.parent.txtFile.setAttribute("visible",false);
+
+ if (this.isOnlyZip) {
+ this.parent.close();
+ return;
+ }
+
+ if (this.isOnlyXml) {
+ parent.returnObj.sendRefresh();
+ this.parent.close();
+ return;
+ }
+
+ if (this.isOnlyProfile) {
+ parent.returnObj.sendRefresh();
+ this.parent.close();
+ return;
+ }
+
+ if (parent._loadToWhiteboard.getValue()) {
+
+ var fileExplorerItem = tArrayValueObj.fileExplorerItem;
+
+ if ($debug) Debug.write(tArrayValueObj);
+ if (fileExplorerItem.isPresentation) {
+ var url = this.formatURL(fileExplorerItem.fileHash);
+
+ var uploadmoduleimgfolderVar = '/' +
fileExplorerItem.fileHash;
+
+ if ($debug) Debug.write(url);
+
+
canvas._drawarea.loadSWFPresentationSynced(url,fileExplorerItem.fileHash +
".swf",
+
"videoconf1",uploadmoduleimgfolderVar,"files",hib.conferencedomain,1,
+ fileExplorerItem.fileName);
+ } else if (fileExplorerItem.isImage) {
+
canvas._drawarea.parent.parent.clearAreaAndAddImage(this.generateFileLink(fileExplorerItem.fileHash),0,0,
+ canvas.protocol +
'://'+canvas.rtmphostlocal+':'+canvas.red5httpport+canvas.httpRootKey+'DownloadHandler',
+
fileExplorerItem.fileHash,"videoconf1","/","files",hib.conferencedomain);
+ }
+ }
+
+ if (parent.isdefaultreturn) {
+
+ var tempSendArray = new Array ();
+ tempSendArray[0] = 'fileslist';
+ var nowTime = new Date();
+ var datumsString = nowTime.getHours()+':'+nowTime.getMinutes();
+ tempSendArray[1] = datumsString;
+ //Debug.write("Setting Message");
+ tempSendArray[2] = 'newfile';
+ tempSendArray[3] = canvas.currentusename;
+ //Debug.write("send: ",tempSendArray);
+ canvas.objMessage = tempSendArray;
+ canvas.thishib.sendMessage.doCall();
+
+ } else {
+ parent.returnObj.sendRefresh();
+ }
+ this.parent.close();
+ if (parent.fileExplorerRef != null) {
+ parent.fileExplorerRef.onClose.sendEvent();
+ }
+ </method>
+
+ <method name="onProgress" args="fr, bytesLoaded, bytesTotal">
+ <![CDATA[
+ this.parent.progressBar.setValue(bytesLoaded * 100 /
bytesTotal);
+ if (Math.round(bytesLoaded * 100 / bytesTotal)==100){
+
this.parent.progressBar.setAttribute('visibility','hidden');
+ this.parent.progress2.startShowing();
+ }
+ ]]>
+ </method>
+
+ <method name="onHTTPError" args="fr, httpError">
+ <![CDATA[
+ Debug.write('onHTTPError invoked: ' + httpError);
+ new lz.errorPopup(canvas,{error:'HTTP-ERROR: '+httpError});
+ this.parent.close();
+ var tempSendArray = new Array ();
+ tempSendArray[0] = 'fileslist';
+ var nowTime = new Date();
+ var datumsString =
nowTime.getHours()+':'+nowTime.getMinutes();
+ tempSendArray[1] = datumsString;
+ //Debug.write("Setting Message");
+ tempSendArray[2] = 'newfile';
+ tempSendArray[3] = canvas.currentusename;
+ //Debug.write("send: ",tempSendArray);
+ canvas.objMessage = tempSendArray;
+ hib.sendMessage.doCall();
+ ]]>
+ </method>
+
+ <method name="onSelect" args="fr">
+ //Debug.write("onSelect: ",getName());
+ this.parent.txtFile.setAttribute('text',getName());
+ this.parent.upload.setAttribute('enabled', true);
+ </method>
+ </fileUpload>
+
+ <labelText x="10" width="250" y="24" multiline="true" name="txtFileDescr"
labelid="594" />
+
+ <labelText x="10" fontsize="11" y="60" width="250" name="txtFile"
multiline="true"
+ resize="false" fgcolor="0x666666" />
+
+ <simpleLabelButton fontsize="11" name="browse" x="10" y="100"
labelid="596" width="250" height="20">
+ <handler name="onclick">
+ parent.myFileUpload.browse();
+ </handler>
+ </simpleLabelButton>
+
+ <!-- moduleName=videoconf1'; -->
+ <simpleLabelButton name="upload" x="10" y="120" labelid="593"
width="250" enabled="false" height="20">
+ <handler name="onclick">
+ <![CDATA[
+ var uploadurl = canvas.protocol +
'://'+canvas.rtmphostlocal+':'+canvas.red5httpport+canvas.httpRootKey+
parent.servletName +'?' +
+ 'moduleName='+this.parent.uploadmodule +
+ '&publicSID='+canvas.publicSID +
+ '&filename='+encodeURIComponent(parent.txtFile.text) +
+ '&parentFolderId='+parent.parentFolderId +
+ '&room_id='+hib.currentroomid +
+ '&secondid='+parent.secondid +
+ '&isOwner='+parent.isOwner +
+ '&sid='+canvas.sessionId;
+ if ($debug) Debug.write("uploadurl: ",uploadurl);
+ parent.myFileUpload.upload(uploadurl);
+ ]]>
+ </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">
+ if (!this.isStarted) {
+ this.isStarted = true;
+ this.status._hide.doStart();
+ this.setAttribute("visibility","visible");
+ } else {
+ return;
+ }
+ </method>
+ <view x="1" y="1" width="248" height="8" bgcolor="#FFFFFF"/>
+ <view name="status" x="1" y="1" height="8" width="248"
bgcolor="#D6DEEF">
+
+ <animator name="_hide" attribute="opacity" to="0" from="1"
duration="1000" start="false">
+ <handler name="onstop">
+ parent._show.doStart();
+ </handler>
+ </animator>
+ <animator name="_show" attribute="opacity" to="1" from="0"
duration="1000" start="false">
+ <handler name="onstop">
+ parent._show.doStart();
+ </handler>
+ </animator>
+ </view>
+ <labelText name="percent" align="center" resize="true" y="-18"
fontstyle="bold"
+ fontsize="10" fgcolor="#555555" labelid="592"/>
+ </view>
+
+ <view name="progressBar" x="10" y="158" width="250" visibility="hidden"
height="10" bgcolor="#C6CEDF">
+ <view x="1" y="1" width="248" height="8" bgcolor="#FFFFFF"/>
+ <view name="status" x="1" y="1" height="8" bgcolor="#D6DEEF"/>
+ <method name="setValue" args="value">
+ <![CDATA[
+ this.setAttribute("visible",true);
+ status.setAttribute('width', value * 248 / 100);
+ percent.setAttribute('text',Math.round(value) + '%');
+ ]]>
+ </method>
+ <text name="percent" align="center" resize="true" y="-18"
fontstyle="bold"
+ fontsize="10" fgcolor="#555555" />
+ </view>
+
+ <labelCheckbox name="_loadToWhiteboard" x="4" y="184" fontsize="11"
+ labelid="1312" value="true" />
+
+ <simpleLabelButton name="_close" x="100" y="204" labelid="595"
width="160" height="20">
+ <handler name="onclick">
+ if ($debug) Debug.write("this.parent: ",this.parent);
+ this.parent.close();
+ </handler>
+ </simpleLabelButton>
+</class>
+
+</library>
+
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx?rev=1297663&r1=1297662&r2=1297663&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
Tue Mar 6 19:31:28 2012
@@ -1304,7 +1304,7 @@
<netRemoteCallHib name="switchMicMuted" funcname="switchMicMuted">
<attribute name="publicSID" value="" type="string" />
<attribute name="mute" value="false" type="boolean" />
- <event name="onMute" args="event"/>
+ <event name="onMute" />
<method name="setMute" args="tPublicSID,tMute">
this.publicSID = tPublicSID;
this.mute = tMute;
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx?rev=1297663&r1=1297662&r2=1297663&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
Tue Mar 6 19:31:28 2012
@@ -376,8 +376,6 @@
} else if (stringSub=='checkPollVoted') {
this.checkHasVoted.doCall();
} else if (stringSub=='importFile') {
- //new
lz.uploadWindow(canvas.main_content._content.inner,{x:60,uploadmodule:canvas.uploadmoduleimg,isOnlyImage:true});
-
new
lz.uploadWindowExplorer(canvas.main_content._content.inner,{
x:60,uploadmodule:canvas.uploadmoduleimg,
parentFolderId:0,
@@ -386,7 +384,6 @@
isOnlyImage:true,
servletName:'file.upload'
});
-
} else if (stringSub=='applyForMod') {
if ($debug) Debug.info("Apply For Mod through
doActionmenu");
//new
lz.applyForModeration(canvas.main_content._content.inner);
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/backup/backupContent.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/backup/backupContent.lzx?rev=1297663&r1=1297662&r2=1297663&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/backup/backupContent.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/backup/backupContent.lzx
Tue Mar 6 19:31:28 2012
@@ -39,9 +39,18 @@
<!-- System Import -->
<simpleLabelButton text="System Import" x="30" y="140" width="200">
- <handler name="onclick">
+ <handler name="onclick">
+ <![CDATA[
+ new
lz.uploadWindowExplorer(canvas.main_content._content.inner,{
+ x:300,
+ isOnlyZip:true,
+ servletName:'backup.upload'
+ });
+ ]]>
+ </handler>
+ <!--
new
lz.backupImportWindow(canvas.main_content._content.inner,{x:60,y:60,uploadmodule:'users'});
- </handler>
+ -->
</simpleLabelButton>
<!-- System Backup -->
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/languageseditor/languagesEditor.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/languageseditor/languagesEditor.lzx?rev=1297663&r1=1297662&r2=1297663&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/languageseditor/languagesEditor.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/languageseditor/languagesEditor.lzx
Tue Mar 6 19:31:28 2012
@@ -108,7 +108,14 @@
<!-- 387:import -->
<simpleLabelButton labelid="387" x="387" y="32" width="75">
<handler name="onclick">
- new
lz.importWindow(canvas.main_content._content.inner,{x:60,secondid:parent.languages.getValue(),uploadmodule:'language'});
+ //new
lz.importWindow(canvas.main_content._content.inner,{x:60,secondid:parent.languages.getValue(),uploadmodule:'language'});
+ new lz.uploadWindowExplorer(canvas.main_content._content.inner,{
+ x:300,
+ uploadmodule:'language',
+ secondid:parent.languages.getValue(),
+ isOnlyXml:true,
+ servletName:'import.upload'
+ });
</handler>
<labelTooltip multiline="true" labelid="389" />
</simpleLabelButton>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/library.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/library.lzx?rev=1297663&r1=1297662&r2=1297663&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/library.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/library.lzx
Tue Mar 6 19:31:28 2012
@@ -48,7 +48,9 @@
<include href="screenSharingAdapter.lzx" />
<include href="whiteboard/" />
+ <!-- -->
<include href="tabbar/" />
+
<include href="tabcontent/" />
<include href="popups/" />
<include href="moderation/" />
@@ -62,9 +64,6 @@
<include href="participants/" />
<include href="interviewuserlist/" />
- <!--
- <include href="eventuserlist/" />
- -->
<include href="restricted/" />
<include href="browser/" />
<include href="testsetup/" />
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/library.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/library.lzx?rev=1297663&r1=1297662&r2=1297663&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/library.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/library.lzx
Tue Mar 6 19:31:28 2012
@@ -22,7 +22,9 @@
<include href="participantsPanel.lzx" />
+ <!-- -->
<include href="files/" />
+
<include href="chat/" />
</library>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/mainDashboard.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/mainDashboard.lzx?rev=1297663&r1=1297662&r2=1297663&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/mainDashboard.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/mainDashboard.lzx
Tue Mar 6 19:31:28 2012
@@ -138,7 +138,7 @@
<netparam><method name="getValue"> return canvas.sessionId;
</method></netparam>
<handler name="ondata" args="value">
<![CDATA[
- Debug.write("getRssFeeds: ",value);
+ if ($debug) Debug.write("getRssFeeds: ",value);
parent._bottomArea._boxes.feed1.outputRSS(value.feed2);
//parent.feed2.feed.outputRSS(value.feed2);
]]>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/profilesPanel.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/profilesPanel.lzx?rev=1297663&r1=1297662&r2=1297663&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/profilesPanel.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/profilesPanel.lzx
Tue Mar 6 19:31:28 2012
@@ -41,9 +41,8 @@
this.getUserSelf.doCall();
]]>
</handler>
- <method name="sendRefresh">
- this.getUserSelf.doCall();
- </method>
+
+
<netRemoteCallHib name="getUserSelf" funcname="userservice.getUserSelf"
remotecontext="$once{ canvas.thishib }" >
<netparam><method name="getValue"> return canvas.sessionId;
</method></netparam>
@@ -72,8 +71,23 @@
-->
<image y="20" x="10" name="_userpic" />
- <simpleLabelButton y="40" labelid="379" x="150" width="140"
+ <simpleLabelButton y="40" labelid="379" x="150" width="140">
+ <!--
onclick="new
lz.uploadWindow(canvas.main_content._content.inner,{x:300,uploadmodule:'userprofile',isOnlyProfile:true,isdefaultreturn:false,returnObj:this.parent});">
+ -->
+ <handler name="onclick">
+ <![CDATA[
+ new
lz.uploadWindowExplorer(canvas.main_content._content.inner,{
+ x:300,uploadmodule:'userprofile',
+ isOnlyProfile:true,
+ returnObj:this,
+ servletName:'upload.upload'
+ });
+ ]]>
+ </handler>
+ <method name="sendRefresh">
+ parent.getUserSelf.doCall();
+ </method>
<labelTooltip labelid="379" />
</simpleLabelButton>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/editUserProfile.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/editUserProfile.lzx?rev=1297663&r1=1297662&r2=1297663&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/editUserProfile.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/editUserProfile.lzx
Tue Mar 6 19:31:28 2012
@@ -292,8 +292,24 @@
<image y="40" x="410" name="_userpic" />
<!-- 379:Upload new Image -->
- <simpleLabelButton y="50" labelid="379" x="550"
- onclick="new
lz.uploadWindow(canvas.main_content._content.inner,{x:300,uploadmodule:'userprofile',isOnlyProfile:true,isdefaultreturn:false,returnObj:this.parent});"
/>
+ <simpleLabelButton y="50" labelid="379" x="550">
+ <!--
+ onclick="new
lz.uploadWindow(canvas.main_content._content.inner,{x:300,uploadmodule:'userprofile',isOnlyProfile:true,isdefaultreturn:false,returnObj:this.parent});">
+ -->
+ <handler name="onclick">
+ <![CDATA[
+ new
lz.uploadWindowExplorer(canvas.main_content._content.inner,{
+ x:300,uploadmodule:'userprofile',
+ isOnlyProfile:true,
+ returnObj:this,
+ servletName:'upload.upload'
+ });
+ ]]>
+ </handler>
+ <method name="sendRefresh">
+ parent.getUserSelf.doCall();
+ </method>
+ </simpleLabelButton>
<!-- Remember Me -->
<labelCheckbox name="doShowTestWizzard" labelid="776" x="430" y="156" >
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/plugins/fileexplorer/library.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/plugins/fileexplorer/library.lzx?rev=1297663&r1=1297662&r2=1297663&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/plugins/fileexplorer/library.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/plugins/fileexplorer/library.lzx
Tue Mar 6 19:31:28 2012
@@ -22,7 +22,10 @@
<include href="presentations/" />
<include href="tabbar/" />
+
+ <!--
<include href="upload/" />
+ -->
<include href="treeitems/" />
<include href="dynamicFileName.lzx" />
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/plugins/fileexplorer/upload/library.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/plugins/fileexplorer/upload/library.lzx?rev=1297663&r1=1297662&r2=1297663&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/plugins/fileexplorer/upload/library.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/plugins/fileexplorer/upload/library.lzx
Tue Mar 6 19:31:28 2012
@@ -21,7 +21,7 @@
<library>
- <include href="uploadWindowExplorer.lzx" />
+
</library>
