openmeetings git commit: [OPENMEETINGS-1749] white-space 'pre' is used for RSS content

2017-11-09 Thread solomax 
Repository: openmeetings
Updated Branches:
  refs/heads/master 9cdac67ab -> f60c88e4a


[OPENMEETINGS-1749] white-space 'pre' is used for RSS content


Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/f60c88e4
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/f60c88e4
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/f60c88e4

Branch: refs/heads/master
Commit: f60c88e4ae3846f7667d1be70201020783b759aa
Parents: 9cdac67
Author: Maxim Solodovnik 
Authored: Fri Nov 10 13:52:24 2017 +0700
Committer: Maxim Solodovnik 
Committed: Fri Nov 10 13:54:01 2017 +0700

--
 openmeetings-web/src/main/webapp/css/general.css | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/openmeetings/blob/f60c88e4/openmeetings-web/src/main/webapp/css/general.css
--
diff --git a/openmeetings-web/src/main/webapp/css/general.css 
b/openmeetings-web/src/main/webapp/css/general.css
index ccbbf75..56c9663 100644
--- a/openmeetings-web/src/main/webapp/css/general.css
+++ b/openmeetings-web/src/main/webapp/css/general.css
@@ -247,6 +247,9 @@ html, body {
 #feeds.ui-accordion .ui-accordion-header {
margin-bottom: 2px;
 }
+#feeds.ui-accordion .ui-accordion-content {
+   white-space: pre;
+}
 .align-left {
float: left;
 }

[jira] [Commented] (OPENMEETINGS-1749) RSS need to be loaded asynchronously

2017-11-09 Thread ASF subversion and git services (JIRA) 

[ 
https://issues.apache.org/jira/browse/OPENMEETINGS-1749?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16247092#comment-16247092
 ] 

ASF subversion and git services commented on OPENMEETINGS-1749:
---

Commit bc277a0275094c5c87c35cefee5bceff6f6122a4 in openmeetings's branch 
refs/heads/4.0.x from [~solomax]
[ https://git-wip-us.apache.org/repos/asf?p=openmeetings.git;h=bc277a0 ]

[OPENMEETINGS-1749] white-space 'pre' is used for RSS content


> RSS need to be loaded asynchronously
> 
>
> Key: OPENMEETINGS-1749
> URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1749
> Project: Openmeetings
>  Issue Type: Bug
>  Components: HTML5/Dashboard
>Affects Versions: 4.0.0
>Reporter: Maxim Solodovnik
>Assignee: Maxim Solodovnik
> Fix For: 4.0.1
>
>
> RSS need to be loaded asynchronously in configurable interval
> RSS dashboard panel need to be refreshed



--
This message was sent by Atlassian JIRA
(v6.4.14#64029)

openmeetings git commit: [OPENMEETINGS-1749] white-space 'pre' is used for RSS content

2017-11-09 Thread solomax 
Repository: openmeetings
Updated Branches:
  refs/heads/4.0.x 1d29ee943 -> bc277a027


[OPENMEETINGS-1749] white-space 'pre' is used for RSS content


Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/bc277a02
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/bc277a02
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/bc277a02

Branch: refs/heads/4.0.x
Commit: bc277a0275094c5c87c35cefee5bceff6f6122a4
Parents: 1d29ee9
Author: Maxim Solodovnik 
Authored: Fri Nov 10 13:52:24 2017 +0700
Committer: Maxim Solodovnik 
Committed: Fri Nov 10 13:52:24 2017 +0700

--
 openmeetings-web/src/main/webapp/css/general.css | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/openmeetings/blob/bc277a02/openmeetings-web/src/main/webapp/css/general.css
--
diff --git a/openmeetings-web/src/main/webapp/css/general.css 
b/openmeetings-web/src/main/webapp/css/general.css
index ccbbf75..56c9663 100644
--- a/openmeetings-web/src/main/webapp/css/general.css
+++ b/openmeetings-web/src/main/webapp/css/general.css
@@ -247,6 +247,9 @@ html, body {
 #feeds.ui-accordion .ui-accordion-header {
margin-bottom: 2px;
 }
+#feeds.ui-accordion .ui-accordion-content {
+   white-space: pre;
+}
 .align-left {
float: left;
 }

openmeetings git commit: no jira: no-cache is added to land export

2017-11-09 Thread solomax 
Repository: openmeetings
Updated Branches:
  refs/heads/master 59202efa0 -> 9cdac67ab


no jira: no-cache is added to land export


Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/9cdac67a
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/9cdac67a
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/9cdac67a

Branch: refs/heads/master
Commit: 9cdac67abe5fb5d4c547f2ffcd18d706aca45d82
Parents: 59202ef
Author: Maxim Solodovnik 
Authored: Fri Nov 10 12:00:14 2017 +0700
Committer: Maxim Solodovnik 
Committed: Fri Nov 10 12:00:32 2017 +0700

--
 .../org/apache/openmeetings/web/admin/labels/LangPanel.java| 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/openmeetings/blob/9cdac67a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java
--
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java
index 6c45812..91e2dbc 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java
@@ -20,6 +20,8 @@ package org.apache.openmeetings.web.admin.labels;
 
 import static org.apache.openmeetings.util.OpenmeetingsVariables.ATTR_CLASS;
 import static 
org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
+import static org.apache.wicket.request.resource.ContentDisposition.ATTACHMENT;
+import static org.apache.wicket.util.time.Duration.NONE;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -52,7 +54,6 @@ import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.form.upload.FileUpload;
 import org.apache.wicket.markup.html.form.upload.FileUploadField;
 import org.apache.wicket.markup.repeater.Item;
-import org.apache.wicket.request.resource.ContentDisposition;
 import org.apache.wicket.request.resource.ResourceStreamResource;
 import org.apache.wicket.util.resource.AbstractResourceStream;
 import org.apache.wicket.util.resource.IResourceStream;
@@ -175,7 +176,8 @@ public class LangPanel extends AdminBasePanel {
private static final long serialVersionUID = 1L;
 
{
-   
setContentDisposition(ContentDisposition.ATTACHMENT);
+   setContentDisposition(ATTACHMENT);
+   setCacheDuration(NONE);
}
 
@Override

openmeetings git commit: no jira: no-cache is added to land export

2017-11-09 Thread solomax 
Repository: openmeetings
Updated Branches:
  refs/heads/4.0.x d1bd96f0b -> 1d29ee943


no jira: no-cache is added to land export


Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/1d29ee94
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/1d29ee94
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/1d29ee94

Branch: refs/heads/4.0.x
Commit: 1d29ee9435732070ab11a366bab790087959725a
Parents: d1bd96f
Author: Maxim Solodovnik 
Authored: Fri Nov 10 12:00:14 2017 +0700
Committer: Maxim Solodovnik 
Committed: Fri Nov 10 12:00:14 2017 +0700

--
 .../org/apache/openmeetings/web/admin/labels/LangPanel.java| 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1d29ee94/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java
--
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java
index 6c45812..91e2dbc 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java
@@ -20,6 +20,8 @@ package org.apache.openmeetings.web.admin.labels;
 
 import static org.apache.openmeetings.util.OpenmeetingsVariables.ATTR_CLASS;
 import static 
org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
+import static org.apache.wicket.request.resource.ContentDisposition.ATTACHMENT;
+import static org.apache.wicket.util.time.Duration.NONE;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -52,7 +54,6 @@ import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.form.upload.FileUpload;
 import org.apache.wicket.markup.html.form.upload.FileUploadField;
 import org.apache.wicket.markup.repeater.Item;
-import org.apache.wicket.request.resource.ContentDisposition;
 import org.apache.wicket.request.resource.ResourceStreamResource;
 import org.apache.wicket.util.resource.AbstractResourceStream;
 import org.apache.wicket.util.resource.IResourceStream;
@@ -175,7 +176,8 @@ public class LangPanel extends AdminBasePanel {
private static final long serialVersionUID = 1L;
 
{
-   
setContentDisposition(ContentDisposition.ATTACHMENT);
+   setContentDisposition(ATTACHMENT);
+   setCacheDuration(NONE);
}
 
@Override

openmeetings git commit: [OPENMEETINGS-1752] opacity can be set on various objects

2017-11-09 Thread solomax 
Repository: openmeetings
Updated Branches:
  refs/heads/master 987ca57cf -> 59202efa0


[OPENMEETINGS-1752] opacity can be set on various objects


Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/59202efa
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/59202efa
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/59202efa

Branch: refs/heads/master
Commit: 59202efa089bf749b5a1abf758353386e12ca3df
Parents: 987ca57
Author: Maxim Solodovnik 
Authored: Fri Nov 10 11:55:03 2017 +0700
Committer: Maxim Solodovnik 
Committed: Fri Nov 10 11:55:23 2017 +0700

--
 .../org/apache/openmeetings/web/room/wb/tool-arrow.js|  1 +
 .../org/apache/openmeetings/web/room/wb/tool-clipart.js  |  2 ++
 .../org/apache/openmeetings/web/room/wb/tool-ellipse.js  |  1 +
 .../org/apache/openmeetings/web/room/wb/tool-rect.js |  1 +
 .../org/apache/openmeetings/web/room/wb/tool-util.js | 11 +++
 5 files changed, 12 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/openmeetings/blob/59202efa/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-arrow.js
--
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-arrow.js
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-arrow.js
index b7315f8..46af4d1 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-arrow.js
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-arrow.js
@@ -17,6 +17,7 @@ var Arrow = function(wb, s) {
, strokeWidth: 2
, fill: arrow.fill.enabled ? arrow.fill.color : 
'rgba(0,0,0,0)'
, stroke: arrow.stroke.enabled ? 
arrow.stroke.color : 'rgba(0,0,0,0)'
+   , opacity: arrow.opacity
});
 
return arrow.obj;

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/59202efa/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-clipart.js
--
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-clipart.js
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-clipart.js
index 70257d2..de4a0f2 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-clipart.js
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-clipart.js
@@ -14,6 +14,7 @@ var Clipart = function(wb, btn, s) {
, height: 0
, omType: 'Clipart'
, _src: imgSrc
+   , opacity: art.opacity
});
canvas.add(art.obj);
});
@@ -32,6 +33,7 @@ var Clipart = function(wb, btn, s) {
};
art.internalActivate = function() {
ToolUtil.disableAllProps(s);
+   ToolUtil.enableOpacity(s, art);
};
return art;
 };

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/59202efa/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-ellipse.js
--
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-ellipse.js
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-ellipse.js
index 642c3fa..ad8d426 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-ellipse.js
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-ellipse.js
@@ -6,6 +6,7 @@ var Ellipse = function(wb, s) {
strokeWidth: ellipse.stroke.width
, fill: ellipse.fill.enabled ? ellipse.fill.color : 
'rgba(0,0,0,0)'
, stroke: ellipse.stroke.enabled ? ellipse.stroke.color 
: 'rgba(0,0,0,0)'
+   , opacity: ellipse.opacity
, left: ellipse.orig.x
, top: ellipse.orig.y
, rx: 0

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/59202efa/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-rect.js
--
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-rect.js
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-rect.js
index f26a450..191772e 100644
---

[jira] [Commented] (OPENMEETINGS-1752) Opacity can not be set on several WB objects

2017-11-09 Thread ASF subversion and git services (JIRA) 

[ 
https://issues.apache.org/jira/browse/OPENMEETINGS-1752?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16247007#comment-16247007
 ] 

ASF subversion and git services commented on OPENMEETINGS-1752:
---

Commit 59202efa089bf749b5a1abf758353386e12ca3df in openmeetings's branch 
refs/heads/master from [~solomax]
[ https://git-wip-us.apache.org/repos/asf?p=openmeetings.git;h=59202ef ]

[OPENMEETINGS-1752] opacity can be set on various objects


> Opacity can not be set on several WB objects
> 
>
> Key: OPENMEETINGS-1752
> URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1752
> Project: Openmeetings
>  Issue Type: Bug
>  Components: HTML5/WhiteBoard
>Affects Versions: 4.0.0
>Reporter: Maxim Solodovnik
>Assignee: Maxim Solodovnik
> Fix For: 4.0.1
>
>
> Opacity can not be set on several WB objects
> * Rectangle
> * Ellipse
> * Clipart
> * Arrow



--
This message was sent by Atlassian JIRA
(v6.4.14#64029)

[jira] [Resolved] (OPENMEETINGS-1752) Opacity can not be set on several WB objects

2017-11-09 Thread Maxim Solodovnik (JIRA) 

 [ 
https://issues.apache.org/jira/browse/OPENMEETINGS-1752?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Maxim Solodovnik resolved OPENMEETINGS-1752.

Resolution: Fixed

> Opacity can not be set on several WB objects
> 
>
> Key: OPENMEETINGS-1752
> URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1752
> Project: Openmeetings
>  Issue Type: Bug
>  Components: HTML5/WhiteBoard
>Affects Versions: 4.0.0
>Reporter: Maxim Solodovnik
>Assignee: Maxim Solodovnik
> Fix For: 4.0.1
>
>
> Opacity can not be set on several WB objects
> * Rectangle
> * Ellipse
> * Clipart
> * Arrow



--
This message was sent by Atlassian JIRA
(v6.4.14#64029)

[jira] [Commented] (OPENMEETINGS-1752) Opacity can not be set on several WB objects

2017-11-09 Thread ASF subversion and git services (JIRA) 

[ 
https://issues.apache.org/jira/browse/OPENMEETINGS-1752?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16247006#comment-16247006
 ] 

ASF subversion and git services commented on OPENMEETINGS-1752:
---

Commit d1bd96f0be1b3df52c093a2f1ac9345d1c946012 in openmeetings's branch 
refs/heads/4.0.x from [~solomax]
[ https://git-wip-us.apache.org/repos/asf?p=openmeetings.git;h=d1bd96f ]

[OPENMEETINGS-1752] opacity can be set on various objects


> Opacity can not be set on several WB objects
> 
>
> Key: OPENMEETINGS-1752
> URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1752
> Project: Openmeetings
>  Issue Type: Bug
>  Components: HTML5/WhiteBoard
>Affects Versions: 4.0.0
>Reporter: Maxim Solodovnik
>Assignee: Maxim Solodovnik
> Fix For: 4.0.1
>
>
> Opacity can not be set on several WB objects
> * Rectangle
> * Ellipse
> * Clipart
> * Arrow



--
This message was sent by Atlassian JIRA
(v6.4.14#64029)

[jira] [Created] (OPENMEETINGS-1752) Opacity can not be set on several WB objects

2017-11-09 Thread Maxim Solodovnik (JIRA) 
Maxim Solodovnik created OPENMEETINGS-1752:
--

 Summary: Opacity can not be set on several WB objects
 Key: OPENMEETINGS-1752
 URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1752
 Project: Openmeetings
  Issue Type: Bug
  Components: HTML5/WhiteBoard
Affects Versions: 4.0.0
Reporter: Maxim Solodovnik
Assignee: Maxim Solodovnik
 Fix For: 4.0.1


Opacity can not be set on several WB objects

* Rectangle
* Ellipse
* Clipart
* Arrow



--
This message was sent by Atlassian JIRA
(v6.4.14#64029)

openmeetings git commit: [OPENMEETINGS-1752] opacity can be set on various objects

2017-11-09 Thread solomax 
Repository: openmeetings
Updated Branches:
  refs/heads/4.0.x de39d0114 -> d1bd96f0b


[OPENMEETINGS-1752] opacity can be set on various objects


Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/d1bd96f0
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/d1bd96f0
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/d1bd96f0

Branch: refs/heads/4.0.x
Commit: d1bd96f0be1b3df52c093a2f1ac9345d1c946012
Parents: de39d01
Author: Maxim Solodovnik 
Authored: Fri Nov 10 11:55:03 2017 +0700
Committer: Maxim Solodovnik 
Committed: Fri Nov 10 11:55:03 2017 +0700

--
 .../org/apache/openmeetings/web/room/wb/tool-arrow.js|  1 +
 .../org/apache/openmeetings/web/room/wb/tool-clipart.js  |  2 ++
 .../org/apache/openmeetings/web/room/wb/tool-ellipse.js  |  1 +
 .../org/apache/openmeetings/web/room/wb/tool-rect.js |  1 +
 .../org/apache/openmeetings/web/room/wb/tool-util.js | 11 +++
 5 files changed, 12 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d1bd96f0/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-arrow.js
--
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-arrow.js
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-arrow.js
index b7315f8..46af4d1 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-arrow.js
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-arrow.js
@@ -17,6 +17,7 @@ var Arrow = function(wb, s) {
, strokeWidth: 2
, fill: arrow.fill.enabled ? arrow.fill.color : 
'rgba(0,0,0,0)'
, stroke: arrow.stroke.enabled ? 
arrow.stroke.color : 'rgba(0,0,0,0)'
+   , opacity: arrow.opacity
});
 
return arrow.obj;

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d1bd96f0/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-clipart.js
--
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-clipart.js
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-clipart.js
index 70257d2..de4a0f2 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-clipart.js
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-clipart.js
@@ -14,6 +14,7 @@ var Clipart = function(wb, btn, s) {
, height: 0
, omType: 'Clipart'
, _src: imgSrc
+   , opacity: art.opacity
});
canvas.add(art.obj);
});
@@ -32,6 +33,7 @@ var Clipart = function(wb, btn, s) {
};
art.internalActivate = function() {
ToolUtil.disableAllProps(s);
+   ToolUtil.enableOpacity(s, art);
};
return art;
 };

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d1bd96f0/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-ellipse.js
--
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-ellipse.js
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-ellipse.js
index 642c3fa..ad8d426 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-ellipse.js
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-ellipse.js
@@ -6,6 +6,7 @@ var Ellipse = function(wb, s) {
strokeWidth: ellipse.stroke.width
, fill: ellipse.fill.enabled ? ellipse.fill.color : 
'rgba(0,0,0,0)'
, stroke: ellipse.stroke.enabled ? ellipse.stroke.color 
: 'rgba(0,0,0,0)'
+   , opacity: ellipse.opacity
, left: ellipse.orig.x
, top: ellipse.orig.y
, rx: 0

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d1bd96f0/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-rect.js
--
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-rect.js
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-rect.js
index f26a450..191772e 100644
---

[jira] [Resolved] (OPENMEETINGS-1751) Direct WB upload some times is unsuccessful

2017-11-09 Thread Maxim Solodovnik (JIRA) 

 [ 
https://issues.apache.org/jira/browse/OPENMEETINGS-1751?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Maxim Solodovnik resolved OPENMEETINGS-1751.

Resolution: Fixed

> Direct WB upload some times is unsuccessful
> ---
>
> Key: OPENMEETINGS-1751
> URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1751
> Project: Openmeetings
>  Issue Type: Bug
>  Components: HTML5/WhiteBoard
>Affects Versions: 4.0.0
>Reporter: Maxim Solodovnik
>Assignee: Maxim Solodovnik
>Priority: Critical
> Fix For: 4.0.1
>
>
> 1) enter room
> 2) add WB
> 3) switch to 2nd WB
> 4) upload PDF "Load directly to the Whiteboard" CHECKED
> 5) clean WB
> 6) perform 4) until document is NOT loaded
> Result: document NOT loaded directly to WB
> Expected Result: document should be loadded to WB with no issues



--
This message was sent by Atlassian JIRA
(v6.4.14#64029)

[jira] [Commented] (OPENMEETINGS-1751) Direct WB upload some times is unsuccessful

2017-11-09 Thread ASF subversion and git services (JIRA) 

[ 
https://issues.apache.org/jira/browse/OPENMEETINGS-1751?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16247000#comment-16247000
 ] 

ASF subversion and git services commented on OPENMEETINGS-1751:
---

Commit 987ca57cf48544990975ffcaa64e8afd2e812bc4 in openmeetings's branch 
refs/heads/master from [~solomax]
[ https://git-wip-us.apache.org/repos/asf?p=openmeetings.git;h=987ca57 ]

[OPENMEETINGS-1751] direct document load should be fixed


> Direct WB upload some times is unsuccessful
> ---
>
> Key: OPENMEETINGS-1751
> URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1751
> Project: Openmeetings
>  Issue Type: Bug
>  Components: HTML5/WhiteBoard
>Affects Versions: 4.0.0
>Reporter: Maxim Solodovnik
>Assignee: Maxim Solodovnik
>Priority: Critical
> Fix For: 4.0.1
>
>
> 1) enter room
> 2) add WB
> 3) switch to 2nd WB
> 4) upload PDF "Load directly to the Whiteboard" CHECKED
> 5) clean WB
> 6) perform 4) until document is NOT loaded
> Result: document NOT loaded directly to WB
> Expected Result: document should be loadded to WB with no issues



--
This message was sent by Atlassian JIRA
(v6.4.14#64029)

openmeetings git commit: [OPENMEETINGS-1751] direct document load should be fixed

2017-11-09 Thread solomax 
Repository: openmeetings
Updated Branches:
  refs/heads/master 66ca69884 -> 987ca57cf


[OPENMEETINGS-1751] direct document load should be fixed


Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/987ca57c
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/987ca57c
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/987ca57c

Branch: refs/heads/master
Commit: 987ca57cf48544990975ffcaa64e8afd2e812bc4
Parents: 66ca698
Author: Maxim Solodovnik 
Authored: Fri Nov 10 11:32:54 2017 +0700
Committer: Maxim Solodovnik 
Committed: Fri Nov 10 11:33:18 2017 +0700

--
 .../main/java/org/apache/openmeetings/db/dto/room/Whiteboard.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/openmeetings/blob/987ca57c/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Whiteboard.java
--
diff --git 
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Whiteboard.java
 
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Whiteboard.java
index 6b80349..82bfe31 100644
--- 
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Whiteboard.java
+++ 
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Whiteboard.java
@@ -118,7 +118,8 @@ public class Whiteboard implements Serializable {
}
 
public JSONObject get(String uid) {
-   return new JSONObject(roomItems.get(uid));
+   String obj = roomItems.get(uid);
+   return obj == null ? null : new JSONObject(obj);
}
 
public boolean contains(String uid) {

[jira] [Commented] (OPENMEETINGS-1751) Direct WB upload some times is unsuccessful

2017-11-09 Thread ASF subversion and git services (JIRA) 

[ 
https://issues.apache.org/jira/browse/OPENMEETINGS-1751?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16246999#comment-16246999
 ] 

ASF subversion and git services commented on OPENMEETINGS-1751:
---

Commit de39d01140a7c1ce38905f95a258b7a71deab883 in openmeetings's branch 
refs/heads/4.0.x from [~solomax]
[ https://git-wip-us.apache.org/repos/asf?p=openmeetings.git;h=de39d01 ]

[OPENMEETINGS-1751] direct document load should be fixed


> Direct WB upload some times is unsuccessful
> ---
>
> Key: OPENMEETINGS-1751
> URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1751
> Project: Openmeetings
>  Issue Type: Bug
>  Components: HTML5/WhiteBoard
>Affects Versions: 4.0.0
>Reporter: Maxim Solodovnik
>Assignee: Maxim Solodovnik
>Priority: Critical
> Fix For: 4.0.1
>
>
> 1) enter room
> 2) add WB
> 3) switch to 2nd WB
> 4) upload PDF "Load directly to the Whiteboard" CHECKED
> 5) clean WB
> 6) perform 4) until document is NOT loaded
> Result: document NOT loaded directly to WB
> Expected Result: document should be loadded to WB with no issues



--
This message was sent by Atlassian JIRA
(v6.4.14#64029)

openmeetings git commit: [OPENMEETINGS-1751] direct document load should be fixed

2017-11-09 Thread solomax 
Repository: openmeetings
Updated Branches:
  refs/heads/4.0.x a92011991 -> de39d0114


[OPENMEETINGS-1751] direct document load should be fixed


Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/de39d011
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/de39d011
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/de39d011

Branch: refs/heads/4.0.x
Commit: de39d01140a7c1ce38905f95a258b7a71deab883
Parents: a920119
Author: Maxim Solodovnik 
Authored: Fri Nov 10 11:32:54 2017 +0700
Committer: Maxim Solodovnik 
Committed: Fri Nov 10 11:32:54 2017 +0700

--
 .../main/java/org/apache/openmeetings/db/dto/room/Whiteboard.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/openmeetings/blob/de39d011/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Whiteboard.java
--
diff --git 
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Whiteboard.java
 
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Whiteboard.java
index 6b80349..82bfe31 100644
--- 
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Whiteboard.java
+++ 
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Whiteboard.java
@@ -118,7 +118,8 @@ public class Whiteboard implements Serializable {
}
 
public JSONObject get(String uid) {
-   return new JSONObject(roomItems.get(uid));
+   String obj = roomItems.get(uid);
+   return obj == null ? null : new JSONObject(obj);
}
 
public boolean contains(String uid) {

[jira] [Created] (OPENMEETINGS-1751) Direct WB upload some times is unsuccessful

2017-11-09 Thread Maxim Solodovnik (JIRA) 
Maxim Solodovnik created OPENMEETINGS-1751:
--

 Summary: Direct WB upload some times is unsuccessful
 Key: OPENMEETINGS-1751
 URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1751
 Project: Openmeetings
  Issue Type: Bug
  Components: HTML5/WhiteBoard
Affects Versions: 4.0.0
Reporter: Maxim Solodovnik
Assignee: Maxim Solodovnik
Priority: Critical
 Fix For: 4.0.1


1) enter room
2) add WB
3) switch to 2nd WB
4) upload PDF "Load directly to the Whiteboard" CHECKED
5) clean WB
6) perform 4) until document is NOT loaded
Result: document NOT loaded directly to WB
Expected Result: document should be loadded to WB with no issues



--
This message was sent by Atlassian JIRA
(v6.4.14#64029)

[jira] [Resolved] (OPENMEETINGS-1750) WB toolbar icon size should be reduced

2017-11-09 Thread Maxim Solodovnik (JIRA) 

 [ 
https://issues.apache.org/jira/browse/OPENMEETINGS-1750?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Maxim Solodovnik resolved OPENMEETINGS-1750.

Resolution: Fixed

> WB toolbar icon size should be reduced
> --
>
> Key: OPENMEETINGS-1750
> URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1750
> Project: Openmeetings
>  Issue Type: Improvement
>  Components: HTML5/WhiteBoard
>Affects Versions: 4.0.0
>Reporter: Maxim Solodovnik
>Assignee: Maxim Solodovnik
>Priority: Minor
> Fix For: 4.0.1
>
>
> WB toolbar icon size should be reduced to 20x20px to better fit WB



--
This message was sent by Atlassian JIRA
(v6.4.14#64029)

[jira] [Commented] (OPENMEETINGS-1750) WB toolbar icon size should be reduced

2017-11-09 Thread ASF subversion and git services (JIRA) 

[ 
https://issues.apache.org/jira/browse/OPENMEETINGS-1750?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16245877#comment-16245877
 ] 

ASF subversion and git services commented on OPENMEETINGS-1750:
---

Commit 66ca69884ef71825d1608e5da8e491cc2986054d in openmeetings's branch 
refs/heads/master from [~solomax]
[ https://git-wip-us.apache.org/repos/asf?p=openmeetings.git;h=66ca698 ]

[OPENMEETINGS-1750] wb tool icon size is redused


> WB toolbar icon size should be reduced
> --
>
> Key: OPENMEETINGS-1750
> URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1750
> Project: Openmeetings
>  Issue Type: Improvement
>  Components: HTML5/WhiteBoard
>Affects Versions: 4.0.0
>Reporter: Maxim Solodovnik
>Assignee: Maxim Solodovnik
>Priority: Minor
> Fix For: 4.0.1
>
>
> WB toolbar icon size should be reduced to 20x20px to better fit WB



--
This message was sent by Atlassian JIRA
(v6.4.14#64029)

[jira] [Commented] (OPENMEETINGS-1750) WB toolbar icon size should be reduced

2017-11-09 Thread ASF subversion and git services (JIRA) 

[ 
https://issues.apache.org/jira/browse/OPENMEETINGS-1750?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16245876#comment-16245876
 ] 

ASF subversion and git services commented on OPENMEETINGS-1750:
---

Commit a92011991a34dae53d54d8ffe22c245cd558fa86 in openmeetings's branch 
refs/heads/4.0.x from [~solomax]
[ https://git-wip-us.apache.org/repos/asf?p=openmeetings.git;h=a920119 ]

[OPENMEETINGS-1750] wb tool icon size is redused


> WB toolbar icon size should be reduced
> --
>
> Key: OPENMEETINGS-1750
> URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1750
> Project: Openmeetings
>  Issue Type: Improvement
>  Components: HTML5/WhiteBoard
>Affects Versions: 4.0.0
>Reporter: Maxim Solodovnik
>Assignee: Maxim Solodovnik
>Priority: Minor
> Fix For: 4.0.1
>
>
> WB toolbar icon size should be reduced to 20x20px to better fit WB



--
This message was sent by Atlassian JIRA
(v6.4.14#64029)

openmeetings git commit: [OPENMEETINGS-1750] wb tool icon size is redused

2017-11-09 Thread solomax 
Repository: openmeetings
Updated Branches:
  refs/heads/master c2cb1fb26 -> 66ca69884


[OPENMEETINGS-1750] wb tool icon size is redused


Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/66ca6988
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/66ca6988
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/66ca6988

Branch: refs/heads/master
Commit: 66ca69884ef71825d1608e5da8e491cc2986054d
Parents: c2cb1fb
Author: Maxim Solodovnik 
Authored: Thu Nov 9 22:52:26 2017 +0700
Committer: Maxim Solodovnik 
Committed: Thu Nov 9 22:52:50 2017 +0700

--
 openmeetings-web/src/main/webapp/css/wb.css | 27 +---
 1 file changed, 15 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/openmeetings/blob/66ca6988/openmeetings-web/src/main/webapp/css/wb.css
--
diff --git a/openmeetings-web/src/main/webapp/css/wb.css 
b/openmeetings-web/src/main/webapp/css/wb.css
index e9af380..1662744 100644
--- a/openmeetings-web/src/main/webapp/css/wb.css
+++ b/openmeetings-web/src/main/webapp/css/wb.css
@@ -54,32 +54,35 @@
background: repeating-linear-gradient(-45deg, transparent, transparent 
3px, gray 3px, gray 5px);
 }
 .room.wb.area .tools.vertical .bumper {
-   width: 38px;
-   height: 20px;
+   width: 24px;
+   height: 11px;
 }
 .room.wb.area .tools.horisontal .bumper {
-   width: 20px;
-   height: 38px;
+   width: 11px;
+   height: 24px;
 }
 .room.wb.area .tools.vertical {
-   width: 38px;
-   height: 563px;
+   width: 26px;
+   height: 373px;
 }
 .room.wb.area .tools.readonly.vertical {
-   width: 38px;
-   height: 60px;
+   width: 26px;
+   height: 37px;
 }
 .room.wb.area .tools.horisontal {
-   width: 563px;
-   height: 38px;
+   width: 373px;
+   height: 26px;
 }
 .room.wb.area .tools.readonly.horisontal {
-   width: 60px;
-   height: 38px;
+   width: 37px;
+   height: 26px;
 }
 .room.wb.area .tools .om-icon.big {
float: left;
vertical-align: top;
+   width: 22px;
+   height: 22px;
+   background-size: 20px;
 }
 .room.wb.area .tools .om-icon.big.active {
background-color: whitesmoke;

openmeetings git commit: [OPENMEETINGS-1750] wb tool icon size is redused

2017-11-09 Thread solomax 
Repository: openmeetings
Updated Branches:
  refs/heads/4.0.x a4d9c7d0f -> a92011991


[OPENMEETINGS-1750] wb tool icon size is redused


Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/a9201199
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/a9201199
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/a9201199

Branch: refs/heads/4.0.x
Commit: a92011991a34dae53d54d8ffe22c245cd558fa86
Parents: a4d9c7d
Author: Maxim Solodovnik 
Authored: Thu Nov 9 22:52:26 2017 +0700
Committer: Maxim Solodovnik 
Committed: Thu Nov 9 22:52:26 2017 +0700

--
 openmeetings-web/src/main/webapp/css/wb.css | 27 +---
 1 file changed, 15 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/openmeetings/blob/a9201199/openmeetings-web/src/main/webapp/css/wb.css
--
diff --git a/openmeetings-web/src/main/webapp/css/wb.css 
b/openmeetings-web/src/main/webapp/css/wb.css
index e9af380..1662744 100644
--- a/openmeetings-web/src/main/webapp/css/wb.css
+++ b/openmeetings-web/src/main/webapp/css/wb.css
@@ -54,32 +54,35 @@
background: repeating-linear-gradient(-45deg, transparent, transparent 
3px, gray 3px, gray 5px);
 }
 .room.wb.area .tools.vertical .bumper {
-   width: 38px;
-   height: 20px;
+   width: 24px;
+   height: 11px;
 }
 .room.wb.area .tools.horisontal .bumper {
-   width: 20px;
-   height: 38px;
+   width: 11px;
+   height: 24px;
 }
 .room.wb.area .tools.vertical {
-   width: 38px;
-   height: 563px;
+   width: 26px;
+   height: 373px;
 }
 .room.wb.area .tools.readonly.vertical {
-   width: 38px;
-   height: 60px;
+   width: 26px;
+   height: 37px;
 }
 .room.wb.area .tools.horisontal {
-   width: 563px;
-   height: 38px;
+   width: 373px;
+   height: 26px;
 }
 .room.wb.area .tools.readonly.horisontal {
-   width: 60px;
-   height: 38px;
+   width: 37px;
+   height: 26px;
 }
 .room.wb.area .tools .om-icon.big {
float: left;
vertical-align: top;
+   width: 22px;
+   height: 22px;
+   background-size: 20px;
 }
 .room.wb.area .tools .om-icon.big.active {
background-color: whitesmoke;

[jira] [Created] (OPENMEETINGS-1750) WB toolbar icon size should be reduced

2017-11-09 Thread Maxim Solodovnik (JIRA) 
Maxim Solodovnik created OPENMEETINGS-1750:
--

 Summary: WB toolbar icon size should be reduced
 Key: OPENMEETINGS-1750
 URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1750
 Project: Openmeetings
  Issue Type: Improvement
  Components: HTML5/WhiteBoard
Affects Versions: 4.0.0
Reporter: Maxim Solodovnik
Assignee: Maxim Solodovnik
Priority: Minor
 Fix For: 4.0.1


WB toolbar icon size should be reduced to 20x20px to better fit WB



--
This message was sent by Atlassian JIRA
(v6.4.14#64029)

[jira] [Commented] (OPENMEETINGS-1748) Chat should refactored so it can be opened and not overlap WB

2017-11-09 Thread ASF subversion and git services (JIRA) 

[ 
https://issues.apache.org/jira/browse/OPENMEETINGS-1748?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16245337#comment-16245337
 ] 

ASF subversion and git services commented on OPENMEETINGS-1748:
---

Commit c2cb1fb263b521bc7e179d6f4bc680fc7f20e03d in openmeetings's branch 
refs/heads/master from [~solomax]
[ https://git-wip-us.apache.org/repos/asf?p=openmeetings.git;h=c2cb1fb ]

[OPENMEETINGS-1748] global chat is fixed


> Chat should refactored so it can be opened and not overlap WB
> -
>
> Key: OPENMEETINGS-1748
> URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1748
> Project: Openmeetings
>  Issue Type: Improvement
>  Components: HTML5/Chat, HTML5/Room
>Affects Versions: 4.0.0
>Reporter: Maxim Solodovnik
>Assignee: Maxim Solodovnik
> Fix For: 4.0.1
>
>
> Chat should refactored so it can be opened and not overlap WB
> Global Chat need to be double-checked



--
This message was sent by Atlassian JIRA
(v6.4.14#64029)

[jira] [Commented] (OPENMEETINGS-1748) Chat should refactored so it can be opened and not overlap WB

2017-11-09 Thread ASF subversion and git services (JIRA) 

[ 
https://issues.apache.org/jira/browse/OPENMEETINGS-1748?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16245336#comment-16245336
 ] 

ASF subversion and git services commented on OPENMEETINGS-1748:
---

Commit a4d9c7d0fab1cb38a5e13d960b7a7ee345003dfd in openmeetings's branch 
refs/heads/4.0.x from [~solomax]
[ https://git-wip-us.apache.org/repos/asf?p=openmeetings.git;h=a4d9c7d ]

[OPENMEETINGS-1748] global chat is fixed


> Chat should refactored so it can be opened and not overlap WB
> -
>
> Key: OPENMEETINGS-1748
> URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1748
> Project: Openmeetings
>  Issue Type: Improvement
>  Components: HTML5/Chat, HTML5/Room
>Affects Versions: 4.0.0
>Reporter: Maxim Solodovnik
>Assignee: Maxim Solodovnik
> Fix For: 4.0.1
>
>
> Chat should refactored so it can be opened and not overlap WB
> Global Chat need to be double-checked



--
This message was sent by Atlassian JIRA
(v6.4.14#64029)