This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new 1a2ce07 [OPENMEETINGS-2165] file drop to WB seems to work
1a2ce07 is described below
commit 1a2ce07eb7e7bd03732caa318609feda6d470a8c
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Tue Mar 17 12:48:17 2020 +0700
[OPENMEETINGS-2165] file drop to WB seems to work
---
.../org/apache/openmeetings/web/common/tree/FolderPanel.html | 1 +
.../org/apache/openmeetings/web/common/tree/FolderPanel.java | 10 +++++-----
.../java/org/apache/openmeetings/web/room/wb/raw-wb-board.js | 8 ++++----
openmeetings-web/src/main/webapp/css/raw-general-rtl.css | 3 ---
openmeetings-web/src/main/webapp/css/raw-general.css | 4 +---
openmeetings-web/src/main/webapp/css/raw-room.css | 3 ---
openmeetings-web/src/main/webapp/css/raw-tree.css | 11 +++++++++--
7 files changed, 20 insertions(+), 20 deletions(-)
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.html
index ec48a8d..145463a 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.html
@@ -21,6 +21,7 @@
<!DOCTYPE html>
<html xmlns:wicket="http://wicket.apache.org";>
<wicket:panel>
+ <i class="fas fa-sync-alt fa-spin"></i>
<div class="file item"><wicket:child /><span wicket:id="name"
class="name"></span></div>
</wicket:panel>
</html>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java
index 9ba67ab..fcc0afe 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java
@@ -138,13 +138,13 @@ public class FolderPanel extends Panel implements
IDraggableListener, IDroppable
});
}
- private void moveAll(final FileTreePanel treePanel, AjaxRequestTarget
target, BaseFileItem p) {
+ private void moveAll(AjaxRequestTarget target, BaseFileItem p) {
for (Entry<String, BaseFileItem> e :
treePanel.getSelected().entrySet()) {
- move(treePanel, target, p, e.getValue());
+ move(target, p, e.getValue());
}
}
- private void move(final FileTreePanel treePanel, AjaxRequestTarget
target, BaseFileItem p, BaseFileItem f) {
+ private void move(AjaxRequestTarget target, BaseFileItem p,
BaseFileItem f) {
Long pid = p.getId();
if (pid != null && pid.equals(f.getId())) {
return;
@@ -270,9 +270,9 @@ public class FolderPanel extends Panel implements
IDraggableListener, IDroppable
BaseFileItem p = (BaseFileItem)getDefaultModelObject();
BaseFileItem f = (BaseFileItem)o;
if (treePanel.isSelected(f)) {
- moveAll(treePanel, target, p);
+ moveAll(target, p);
} else {
- move(treePanel, target, p, f);
+ move(target, p, f);
}
treePanel.updateNode(target, p);
}
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-board.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-board.js
index 1852f2f..4161b48 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-board.js
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-board.js
@@ -437,11 +437,11 @@ var Wb = function() {
}
function _createHandler(_o) {
switch (_o.fileType) {
- case 'Video':
- case 'Recording':
+ case 'VIDEO':
+ case 'RECORDING':
//no-op
break;
- case 'Presentation':
+ case 'PRESENTATION':
{
const ccount = canvases.length;
for (let i = 0; i < _o.count; ++i) {
@@ -820,7 +820,7 @@ var Wb = function() {
const arr = [], del = [], _arr = Array.isArray(obj) ? obj :
[obj];
for (let i = 0; i < _arr.length; ++i) {
const o = _arr[i];
- if (!!o.deleted && 'Presentation' !== o.fileType) {
+ if (!!o.deleted && 'PRESENTATION' !== o.fileType) {
del.push(o);
continue;
}
diff --git a/openmeetings-web/src/main/webapp/css/raw-general-rtl.css
b/openmeetings-web/src/main/webapp/css/raw-general-rtl.css
index d762489..b953b19 100644
--- a/openmeetings-web/src/main/webapp/css/raw-general-rtl.css
+++ b/openmeetings-web/src/main/webapp/css/raw-general-rtl.css
@@ -97,9 +97,6 @@ html[dir="rtl"] @media screen and (max-width: 1280px) {
padding-left: 0 !important;
}
}
-html[dir="rtl"] .om-icon.big {
- background-position: right 1px top 1px !important;
-}
html[dir="rtl"] .room-block .sidebar .user-list .user {
background-position: right 2px top 2px !important;
}
diff --git a/openmeetings-web/src/main/webapp/css/raw-general.css
b/openmeetings-web/src/main/webapp/css/raw-general.css
index 221eaed..fc60dde 100644
--- a/openmeetings-web/src/main/webapp/css/raw-general.css
+++ b/openmeetings-web/src/main/webapp/css/raw-general.css
@@ -201,15 +201,13 @@ html, body {
clear: both;
}
.om-icon {
- background-repeat: no-repeat !important;
- background-position: 0 0 !important;
- background-size: 16px;
width: 18px;
height: 18px;
border: none;
margin-left: 2px;
margin-top: 2px;
display: inline-block !important;
+ position: relative;
}
.om-icon.big {
width: 34px;
diff --git a/openmeetings-web/src/main/webapp/css/raw-room.css
b/openmeetings-web/src/main/webapp/css/raw-room.css
index 46c94b3..d83aa36 100644
--- a/openmeetings-web/src/main/webapp/css/raw-room.css
+++ b/openmeetings-web/src/main/webapp/css/raw-room.css
@@ -184,9 +184,6 @@ html[dir="rtl"] .room-block .sidebar {
.audio-activity.om-icon.speaking {
opacity: 1;
}
-.right.om-icon {
- position: relative;
-}
#room-sidebar-tab-users .header .om-icon i {
font-size: 1.2em;
}
diff --git a/openmeetings-web/src/main/webapp/css/raw-tree.css
b/openmeetings-web/src/main/webapp/css/raw-tree.css
index cc88adc..6cb4f70 100644
--- a/openmeetings-web/src/main/webapp/css/raw-tree.css
+++ b/openmeetings-web/src/main/webapp/css/raw-tree.css
@@ -83,6 +83,13 @@
.file-tree .trees .om-icon.active {
background-color: var(--info);
}
+.file-tree .trees .om-icon i {
+ display: none;
+ position: absolute;
+ bottom: 1px;
+ left: 5px;
+ font-size: .8em;
+}
.refresh.om-icon::before {
content: '\f2f1';
}
@@ -101,8 +108,8 @@
.broken.om-icon::before {
color: var(--danger);
}
-.processing.om-icon {
- color: var(--info);
+.file-tree .trees .processing.om-icon i {
+ display: block;
}
.file.om-icon, .recording.om-icon {
padding-left: 34px;
