Author: sebawagner
Date: Thu Apr 19 18:14:49 2012
New Revision: 1328064
URL: http://svn.apache.org/viewvc?rev=1328064&view=rev
Log:
OPENMEETINGS-135 Video window can't be maximized
OPENMEETINGS-181 Video Window, Conference room 1 and 3
+ clean empty package in Java sources
Removed:
incubator/openmeetings/trunk/singlewebapp/src/org/red5/
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
traditional.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch
(studIP).xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/fileExplorer.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/baseFileExplorerItem.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/infosPanel.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/baseVideoObject.lzx
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
traditional.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese%20traditional.xml?rev=1328064&r1=1328063&r2=1328064&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
traditional.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
traditional.xml Thu Apr 19 18:14:49 2012
@@ -2351,7 +2351,7 @@ see http://incubator.apache.org/openmeet
<value>Start Conference</value>
</string>
<string id="774" name="start view">
- <value>How to Conference:</value>
+ <value>How to conference</value>
</string>
<string id="775" name="test setup">
<value>Start Recording</value>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml?rev=1328064&r1=1328063&r2=1328064&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml
Thu Apr 19 18:14:49 2012
@@ -2345,7 +2345,7 @@ see http://incubator.apache.org/openmeet
<value>Start Conference</value>
</string>
<string id="774" name="start view">
- <value>How to Conference:</value>
+ <value>How to conference</value>
</string>
<string id="775" name="test setup">
<value>Start Recording</value>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch
(studIP).xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch%20%28studIP%29.xml?rev=1328064&r1=1328063&r2=1328064&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch
(studIP).xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch
(studIP).xml Thu Apr 19 18:14:49 2012
@@ -2345,7 +2345,7 @@ see http://incubator.apache.org/openmeet
<value>Konferenz starten</value>
</string>
<string id="774" name="start view">
- <value>Wie starte ich eine Konferenz:</value>
+ <value>Wie starte ich eine Konferenz</value>
</string>
<string id="775" name="test setup">
<value>Testaufnahme</value>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml?rev=1328064&r1=1328063&r2=1328064&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml
Thu Apr 19 18:14:49 2012
@@ -3119,7 +3119,7 @@ see http://incubator.apache.org/openmeet
</string>
<string id="774" name="start view">
- <value>Wie starte ich eine Konferenz:</value>
+ <value>Wie starte ich eine Konferenz</value>
</string>
<string id="775" name="test setup">
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml?rev=1328064&r1=1328063&r2=1328064&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml
Thu Apr 19 18:14:49 2012
@@ -3121,7 +3121,7 @@ see http://incubator.apache.org/openmeet
</string>
<string id="774" name="start view">
- <value>How to conference:</value>
+ <value>How to conference</value>
</string>
<string id="775" name="test setup">
@@ -5851,4 +5851,7 @@ see http://incubator.apache.org/openmeet
<string id="1461" name="tooltip menu">
<value>Export/Import System Backups</value>
</string>
+ <string id="1462" name="file explorer">
+ <value>You need moderation or the right to draw on whiteboard to upload,
add, delete or load files and folders.</value>
+ </string>
</language>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml?rev=1328064&r1=1328063&r2=1328064&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml
Thu Apr 19 18:14:49 2012
@@ -2344,7 +2344,7 @@ see http://incubator.apache.org/openmeet
<value>Start Conference</value>
</string>
<string id="774" name="start view">
- <value>How to Conference:</value>
+ <value>How to conference</value>
</string>
<string id="775" name="test setup">
<value>Start Recording</value>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml?rev=1328064&r1=1328063&r2=1328064&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml
Thu Apr 19 18:14:49 2012
@@ -2345,7 +2345,7 @@ see http://incubator.apache.org/openmeet
<value>Start Conference</value>
</string>
<string id="774" name="start view">
- <value>How to Conference:</value>
+ <value>How to conference</value>
</string>
<string id="775" name="test setup">
<value>Start Recording</value>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml?rev=1328064&r1=1328063&r2=1328064&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml
Thu Apr 19 18:14:49 2012
@@ -2345,7 +2345,7 @@ see http://incubator.apache.org/openmeet
<value>Start Conference</value>
</string>
<string id="774" name="start view">
- <value>How to Conference:</value>
+ <value>How to conference</value>
</string>
<string id="775" name="test setup">
<value>Start Recording</value>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml?rev=1328064&r1=1328063&r2=1328064&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml
Thu Apr 19 18:14:49 2012
@@ -2345,7 +2345,7 @@ see http://incubator.apache.org/openmeet
<value>Start Conference</value>
</string>
<string id="774" name="start view">
- <value>How to Conference:</value>
+ <value>How to conference</value>
</string>
<string id="775" name="test setup">
<value>Start Recording</value>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml?rev=1328064&r1=1328063&r2=1328064&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml
Thu Apr 19 18:14:49 2012
@@ -2345,7 +2345,7 @@ see http://incubator.apache.org/openmeet
<value>Start Conference</value>
</string>
<string id="774" name="start view">
- <value>How to Conference:</value>
+ <value>How to conference</value>
</string>
<string id="775" name="test setup">
<value>Start Recording</value>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml?rev=1328064&r1=1328063&r2=1328064&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml
Thu Apr 19 18:14:49 2012
@@ -2345,7 +2345,7 @@ see http://incubator.apache.org/openmeet
<value>Start Conference</value>
</string>
<string id="774" name="start view">
- <value>How to Conference:</value>
+ <value>How to conference</value>
</string>
<string id="775" name="test setup">
<value>Start Recording</value>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml?rev=1328064&r1=1328063&r2=1328064&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml
Thu Apr 19 18:14:49 2012
@@ -2418,7 +2418,7 @@ transmitowania gÅosu i obrazu wideo.<
<value>Start Conference</value>
</string>
<string id="774" name="start view">
- <value>How to Conference:</value>
+ <value>How to conference</value>
</string>
<string id="775" name="test setup">
<value>Start Recording</value>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml?rev=1328064&r1=1328063&r2=1328064&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml
Thu Apr 19 18:14:49 2012
@@ -2345,7 +2345,7 @@ see http://incubator.apache.org/openmeet
<value>Start Conference</value>
</string>
<string id="774" name="start view">
- <value>How to Conference:</value>
+ <value>How to conference</value>
</string>
<string id="775" name="test setup">
<value>Start Recording</value>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml?rev=1328064&r1=1328063&r2=1328064&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml
Thu Apr 19 18:14:49 2012
@@ -2345,7 +2345,7 @@ see http://incubator.apache.org/openmeet
<value>Start Conference</value>
</string>
<string id="774" name="start view">
- <value>How to Conference:</value>
+ <value>How to conference</value>
</string>
<string id="775" name="test setup">
<value>Start Recording</value>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml?rev=1328064&r1=1328063&r2=1328064&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml Thu
Apr 19 18:14:49 2012
@@ -2345,7 +2345,7 @@ see http://incubator.apache.org/openmeet
<value>Start Conference</value>
</string>
<string id="774" name="start view">
- <value>How to Conference:</value>
+ <value>How to conference</value>
</string>
<string id="775" name="test setup">
<value>Start Recording</value>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml?rev=1328064&r1=1328063&r2=1328064&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml
Thu Apr 19 18:14:49 2012
@@ -2344,7 +2344,7 @@ see http://incubator.apache.org/openmeet
<value>Start Conference</value>
</string>
<string id="774" name="start view">
- <value>How to Conference:</value>
+ <value>How to conference</value>
</string>
<string id="775" name="test setup">
<value>Start Recording</value>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml?rev=1328064&r1=1328063&r2=1328064&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml
Thu Apr 19 18:14:49 2012
@@ -2345,7 +2345,7 @@ see http://incubator.apache.org/openmeet
<value>Start Conference</value>
</string>
<string id="774" name="start view">
- <value>How to Conference:</value>
+ <value>How to conference</value>
</string>
<string id="775" name="test setup">
<value>Start Recording</value>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/fileExplorer.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/fileExplorer.lzx?rev=1328064&r1=1328063&r2=1328064&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/fileExplorer.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/fileExplorer.lzx
Thu Apr 19 18:14:49 2012
@@ -73,48 +73,61 @@
</method>
<method name="addFile">
-
- if ($debug) Debug.write("addFile ::
",this._selected,this.parentFolderId);
-
- var isOwner = 0;
- if (this.parentFolderId == -2) {
- isOwner = 1;
- } else {
- //Check if its a subfolder of a Owners Dir
- if (this._selected != null) {
- var checkForOwer = this._selected.checkForIsOwner();
- if ($debug) Debug.write("checkForOwer ::",checkForOwer);
- if (checkForOwer) {
- isOwner = 1;
- }
- }
- }
-
- if ($debug) Debug.write("addFile :: ",isOwner);
-
- new lz.uploadWindowExplorer(canvas.main_content._content.inner,{
- x:60,uploadmodule:canvas.uploadmoduleimg,
- parentFolderId:this.parentFolderId,
- isOwner:isOwner,
- fileExplorerRef:this,
- isOnlyImage:true,
- servletName:'file.upload'
- });
+ <![CDATA[
+ if ($debug) Debug.write("addFile ::
",this._selected,this.parentFolderId);
+
+ if (!canvas.isAllowedToDraw && !canvas.ismoderator) {
+ new lz.labelerrorPopup(canvas,{errorlabelid:1462});
+ return;
+ }
+
+ var isOwner = 0;
+ if (this.parentFolderId == -2) {
+ isOwner = 1;
+ } else {
+ //Check if its a subfolder of a Owners Dir
+ if (this._selected != null) {
+ var checkForOwer =
this._selected.checkForIsOwner();
+ if ($debug) Debug.write("checkForOwer
::",checkForOwer);
+ if (checkForOwer) {
+ isOwner = 1;
+ }
+ }
+ }
+
+ if ($debug) Debug.write("addFile :: ",isOwner);
+
+ new lz.uploadWindowExplorer(canvas.main_content._content.inner,{
+ x:60,uploadmodule:canvas.uploadmoduleimg,
+ parentFolderId:this.parentFolderId,
+ isOwner:isOwner,
+ fileExplorerRef:this,
+ isOnlyImage:true,
+ servletName:'file.upload'
+ });
+ ]]>
</method>
<method name="addFolder">
- if (this._selected == null) {
- if ($debug) Debug.write("addFolder ::1 ",this._selected);
- this._filearea._contentarea.subviews[0].addFolder();
- } else {
- if (this._selected.isFolder) {
- if ($debug) Debug.write("-1 this._selected.isFolder
",this._selected);
- this._selected.addFolder();
- } else {
- if ($debug) Debug.write("-2 !this._selected.isFolder
",this._selected);
- this._selected.parent.parent.addFolder();
- }
- }
+ <![CDATA[
+ if (!canvas.isAllowedToDraw && !canvas.ismoderator) {
+ new lz.labelerrorPopup(canvas,{errorlabelid:1462});
+ return;
+ }
+
+ if (this._selected == null) {
+ if ($debug) Debug.write("addFolder ::1
",this._selected);
+ this._filearea._contentarea.subviews[0].addFolder();
+ } else {
+ if (this._selected.isFolder) {
+ if ($debug) Debug.write("-1 this._selected.isFolder
",this._selected);
+ this._selected.addFolder();
+ } else {
+ if ($debug) Debug.write("-2 !this._selected.isFolder
",this._selected);
+ this._selected.parent.parent.addFolder();
+ }
+ }
+ ]]>
</method>
<method name="loadWmlFile" args="itemObj">
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/baseFileExplorerItem.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/baseFileExplorerItem.lzx?rev=1328064&r1=1328063&r2=1328064&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/baseFileExplorerItem.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/baseFileExplorerItem.lzx
Thu Apr 19 18:14:49 2012
@@ -84,14 +84,20 @@
</method>
<method name="doMouseDownClick" args="itemObj">
- this.mouseDownClickUsed = true;
- if ($debug) Debug.write("mouseDown CLICK Start Drag And Drop");
- new lz.dragItemFileExplorer(canvas,{
- dragItemResource:this.fileIcon,
- refObj:this,
- x:canvas.getMouse('x'),
- y:canvas.getMouse('y')
- })
+ <![CDATA[
+ if (!canvas.isAllowedToDraw && !canvas.ismoderator) {
+ new lz.labelerrorPopup(canvas,{errorlabelid:1462});
+ return;
+ }
+ this.mouseDownClickUsed = true;
+ if ($debug) Debug.write("mouseDown CLICK Start Drag And Drop");
+ new lz.dragItemFileExplorer(canvas,{
+ dragItemResource:this.fileIcon,
+ refObj:this,
+ x:canvas.getMouse('x'),
+ y:canvas.getMouse('y')
+ });
+ ]]>
</method>
<!--
@@ -122,13 +128,18 @@
</method>
<method name="deleteFile" args="labelid">
- new lz.confirmationSingle(canvas,{
- refObj:this,
- labelid:labelid,
- labeliderror:713,
- showCheckBox:false
- });
- //this.deleteFileOrFolder();
+ <![CDATA[
+ if (!canvas.isAllowedToDraw && !canvas.ismoderator) {
+ new lz.labelerrorPopup(canvas,{errorlabelid:1462});
+ return;
+ }
+ new lz.confirmationSingle(canvas,{
+ refObj:this,
+ labelid:labelid,
+ labeliderror:713,
+ showCheckBox:false
+ });
+ ]]>
</method>
<method name="sendConfirmation" args="bool,askAgain">
@@ -139,6 +150,11 @@
<method name="deleteFileOrFolder">
<![CDATA[
+ if (!canvas.isAllowedToDraw && !canvas.ismoderator) {
+ new lz.labelerrorPopup(canvas,{errorlabelid:1462});
+ return;
+ }
+
if ($debug) Debug.write("deleteFileOrFolder HTTP 1: ");
//this.getFileExplorerByRoom.doCall();
var downloadurl = canvas.protocol +
'://'+canvas.rtmphostlocal+':'+canvas.red5httpport
@@ -197,23 +213,30 @@
</method>
<method name="addFolder">
- if (this.isFolder) {
- if ($debug) Debug.write("NEW this.fileExplorerItemId
INTO ",this);
- if ($debug) Debug.write("NEW this.fileExplorerItemId
",this.fileExplorerItemId);
- if (this["icon_folder_pre"]) {
- this.icon_folder_pre.setAttribute("frame",2);
- this.content.setAttribute("visibility","visible");
- this._folderIcon.setAttribute("frame",2);
- var t = new lz.folderFileExplorerItem(this.content,{
- isOwner:this.isOwner,
- isFolder:true,
- fileIcon:'icon_folder_rsc',
- refObjListRoot:this.refObjListRoot,
- fileName:canvas.getLabelName(712)
- });
- t.addOrUpdateFolderName(this.fileExplorerItemId,true);
+ <![CDATA[
+ if (!canvas.isAllowedToDraw && !canvas.ismoderator) {
+ new lz.labelerrorPopup(canvas,{errorlabelid:1462});
+ return;
+ }
+
+ if (this.isFolder) {
+ if ($debug) Debug.write("NEW
this.fileExplorerItemId INTO ",this);
+ if ($debug) Debug.write("NEW
this.fileExplorerItemId ",this.fileExplorerItemId);
+ if (this["icon_folder_pre"]) {
+ this.icon_folder_pre.setAttribute("frame",2);
+ this.content.setAttribute("visibility","visible");
+ this._folderIcon.setAttribute("frame",2);
+ var t = new
lz.folderFileExplorerItem(this.content,{
+ isOwner:this.isOwner,
+ isFolder:true,
+ fileIcon:'icon_folder_rsc',
+ refObjListRoot:this.refObjListRoot,
+ fileName:canvas.getLabelName(712)
+ });
+ t.addOrUpdateFolderName(this.fileExplorerItemId,true);
+ }
}
- }
+ ]]>
</method>
<method name="refresh">
@@ -225,7 +248,13 @@
</method>
<method name="editFolderName">
- this.addOrUpdateFolderName(this.fileExplorerItemId,false);
+ <![CDATA[
+ if (!canvas.isAllowedToDraw && !canvas.ismoderator) {
+ new lz.labelerrorPopup(canvas,{errorlabelid:1462});
+ return;
+ }
+
this.addOrUpdateFolderName(this.fileExplorerItemId,false);
+ ]]>
</method>
<method name="loadDocument">
@@ -242,6 +271,11 @@
<method name="addOrUpdateFolderName" args="fileExplorerItemId,isNew">
<![CDATA[
+ if (!canvas.isAllowedToDraw && !canvas.ismoderator) {
+ new lz.labelerrorPopup(canvas,{errorlabelid:1462});
+ return;
+ }
+
if ($debug) Debug.write("addOrUpdateFolderName
",fileExplorerItemId);
var tWidth = this._fileName.width;
if (tWidth < 160) {
@@ -266,61 +300,68 @@
</method>
<method name="toggleOpen" args="setSelection">
- if (this.mouseDownClickUsed) {
- if ($debug) Debug.write("mouseDownClickUsed RESET TO
DEFAULT BUT DO NO ACTION Cause its a Drag and Drop Event");
- this.mouseDownClickUsed = false;
- return;
- }
-
- if (this.singleClickStarted) {
- if ($debug) Debug.write("Is this selected => Double Click !!!");
- this.singleClickStarted = false;
- lz.Timer.removeTimer( this.singleClickDelegate );
-
- if (this.isVideo) {
- this.playVideo();
- } else if (this.isWmlFile){
- this.loadWmlFile();
- } else if (this.isFolder) {
- this.doSingleClick(null);
- } else if (this.isPresentation) {
- this.loadDocument();
- }
- } else {
-
- if (this.isFolder){
- if (!this.open) {
- this.doOpen();
- } else {
- if (setSelection) {
- if (this.selected) {
- if ($debug) Debug.write("Is this
selected => Do Edit !!!");
- this.singleClickStarted = true;
- lz.Timer.addTimer(
this.singleClickDelegate, 300 );
- } else {
-
- this.singleClickStarted = true;
- lz.Timer.addTimer(
this.resetClickDelegate, 300 );
- }
- } else {
- this.doClose();
- }
- }
- } else {
- if (setSelection) {
- if (this.selected) {
- if ($debug) Debug.write("Is this selected => Do Edit
!!!");
- this.singleClickStarted = true;
- lz.Timer.addTimer( this.singleClickDelegate, 300 );
- } else {
- this.singleClickStarted = true;
- lz.Timer.addTimer( this.resetClickDelegate, 300 );
- }
- }
- }
- }
-
- if (setSelection) this.refObjListRoot.selectItem(this);
+ <![CDATA[
+ if (this.mouseDownClickUsed) {
+ if ($debug) Debug.write("mouseDownClickUsed
RESET TO DEFAULT BUT DO NO ACTION Cause its a Drag and Drop Event");
+ this.mouseDownClickUsed = false;
+ return;
+ }
+
+ if (this.singleClickStarted) {
+ if ($debug) Debug.write("Is this selected => Double Click
!!!");
+ this.singleClickStarted = false;
+ lz.Timer.removeTimer( this.singleClickDelegate );
+
+ if (!canvas.isAllowedToDraw && !canvas.ismoderator) {
+ new
lz.labelerrorPopup(canvas,{errorlabelid:1462});
+ return;
+ }
+
+ if (this.isVideo) {
+ this.playVideo();
+ } else if (this.isWmlFile){
+ this.loadWmlFile();
+ } else if (this.isFolder) {
+ this.doSingleClick(null);
+ } else if (this.isPresentation) {
+ this.loadDocument();
+ }
+ } else {
+
+ if (this.isFolder){
+ if (!this.open) {
+ this.doOpen();
+ } else {
+ if (setSelection) {
+ if (this.selected) {
+ if ($debug) Debug.write("Is
this selected => Do Edit !!!");
+ this.singleClickStarted = true;
+ lz.Timer.addTimer(
this.singleClickDelegate, 300 );
+ } else {
+
+ this.singleClickStarted = true;
+ lz.Timer.addTimer(
this.resetClickDelegate, 300 );
+ }
+ } else {
+ this.doClose();
+ }
+ }
+ } else {
+ if (setSelection) {
+ if (this.selected) {
+ if ($debug) Debug.write("Is this selected => Do
Edit !!!");
+ this.singleClickStarted = true;
+ lz.Timer.addTimer( this.singleClickDelegate,
300 );
+ } else {
+ this.singleClickStarted = true;
+ lz.Timer.addTimer( this.resetClickDelegate, 300
);
+ }
+ }
+ }
+ }
+
+ if (setSelection) this.refObjListRoot.selectItem(this);
+ ]]>
</method>
<method name="selectItem">
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/infosPanel.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/infosPanel.lzx?rev=1328064&r1=1328063&r2=1328064&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/infosPanel.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/infosPanel.lzx
Thu Apr 19 18:14:49 2012
@@ -25,17 +25,12 @@
<attribute name="resourceViewName" value="" type="string" />
<attribute name="labelid" value="0" type="number" />
-
- <handler name="oninit">
- <![CDATA[
- this._txt.setAttribute("x",31-this._txt.width/2);
- ]]>
- </handler>
- <image src="$once{ canvas.getThemeImage( parent.resourceViewName ) }" />
+ <image src="$once{ canvas.getThemeImage( parent.resourceViewName ) }"
+ stretches="both" width="24" height="24" />
- <labelText name="_txt" labelid="$once{ parent.labelid }" x="0"
- y="64" fontstyle="bold" fgcolor="0x14537C" />
+ <labelText name="_txt" labelid="$once{ parent.labelid }" x="30"
+ y="2" fontstyle="bold" fgcolor="0x14537C" />
</class>
@@ -47,38 +42,38 @@
<labelText name="_txt" fontstyle="bold" labelid="774" y="0" x="2" />
- <iconStepButtonWizzard resourceViewName="icon_btn_dashboard_1" y="30"
x="30" labelid="768">
+ <iconStepButtonWizzard resourceViewName="icon_btn_dashboard_1" x="110"
y="30" labelid="768">
<handler name="onclick">
quicklink('conferenceModuleRoomList');
</handler>
</iconStepButtonWizzard>
- <iconStepButtonWizzard resourceViewName="icon_btn_dashboard_2" y="30"
x="144" labelid="771">
+ <iconStepButtonWizzard resourceViewName="icon_btn_dashboard_2" x="140"
y="60" labelid="771">
<handler name="onclick">
quicklink('conferenceModuleRoomList');
</handler>
</iconStepButtonWizzard>
- <iconStepButtonWizzard resourceViewName="icon_btn_dashboard_3" y="30"
x="258" labelid="772" >
+ <iconStepButtonWizzard resourceViewName="icon_btn_dashboard_3" x="170"
y="90" labelid="772" >
<handler name="onclick">
quicklink('conferenceModuleRoomList');
</handler>
</iconStepButtonWizzard>
- <iconStepButtonWizzard resourceViewName="icon_btn_dashboard_4" y="30"
x="382" labelid="773">
+ <iconStepButtonWizzard resourceViewName="icon_btn_dashboard_4" x="200"
y="120" labelid="773">
<handler name="onclick">
quicklink('conferenceModuleRoomList');
</handler>
</iconStepButtonWizzard>
- <labelText labelid="804" x="10" y="$once{ parent.height-80 }"
multiline="true"
+ <labelText labelid="804" x="10" y="$once{ parent.height-70 }"
multiline="true"
width="$once{ parent.width-210 }" />
<simpleLabelButton labelid="788" width="196" x="$once{
parent.width-200 }"
- y="$once{ parent.height-80 }" height="24"
+ y="$once{ parent.height-70 }" height="24"
onclick="this.parent.storeSettings();">
<handler name="onclick">
quicklink('conferenceModuleRoomList');
@@ -87,7 +82,7 @@
</simpleLabelButton>
<simpleLabelButton labelid="291" width="196" x="$once{
parent.width-200 }"
- y="$once{ parent.height-54 }" height="24"
+ y="$once{ parent.height-44 }" height="24"
onclick="this.parent.storeSettings();">
<handler name="onclick">
quicklink('dashboardModuleCalendar');
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/baseVideoObject.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/baseVideoObject.lzx?rev=1328064&r1=1328063&r2=1328064&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/baseVideoObject.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/baseVideoObject.lzx
Thu Apr 19 18:14:49 2012
@@ -331,6 +331,8 @@
]]>
</method>
+ <attribute name="initialHeight" value="$once{ this.height }" type="number"
/>
+
<method name="minimize">
<![CDATA[
@@ -344,8 +346,7 @@
for (var eg in this.subviews) {
if (this.subviews[eg].name != "_toolbar"
&& this.subviews[eg].name != "_innertop"
- && this.subviews[eg].name != "_loudness"
- && this.subviews[eg].name != "_micView") {
+ && this.subviews[eg].name != "_loudness") {
this.subviews[eg].setAttribute("visibility","hidden");
}
}
@@ -368,9 +369,9 @@
this._toolbar._maximize2.setAttribute("visibility","hidden");
this._loudness.setAttribute("x",1);
- this._micView.setAttribute("x",21);
//this.setAttribute("height",this.initialHeight);
+ if ($debug) Debug.write("this.initialHeight ",this.initialHeight);
this._minimizeZoom.setAttribute("to",this.initialHeight);
this._minimizeZoom.doStart();
]]>
@@ -384,7 +385,6 @@
if (this.subviews[eg].name != "_toolbar"
&& this.subviews[eg].name != "_innertop"
&& this.subviews[eg].name != "_loudness"
- && this.subviews[eg].name != "_micView"
&& this.subviews[eg].name != "_innerbottom") {
this.subviews[eg].setAttribute("visibility","visible");
}
