This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch csp
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/csp by this push:
new 6ecb6c8 [OPENMEETINGS-2165] tree confirmations seems to work
6ecb6c8 is described below
commit 6ecb6c8389a912bf1c291d9bcf612af9a46c4509
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Thu Feb 13 21:29:06 2020 +0700
[OPENMEETINGS-2165] tree confirmations seems to work
---
openmeetings-core/pom.xml | 1 +
openmeetings-db/pom.xml | 1 +
openmeetings-install/pom.xml | 1 +
openmeetings-screenshare/pom.xml | 1 +
openmeetings-server/pom.xml | 1 +
openmeetings-service/pom.xml | 1 +
openmeetings-util/pom.xml | 1 +
openmeetings-web/pom.xml | 1 +
.../apache/openmeetings/web/app/Application.java | 3 +-
.../web/common/tree/FileTreePanel.html | 17 ++++++++++
.../web/common/tree/FileTreePanel.java | 19 +++--------
.../openmeetings/web/common/tree/FolderPanel.java | 2 +-
.../openmeetings/web/common/tree/filetree.js | 16 ++++++---
.../src/main/webapp/css/raw-general.css | 4 +--
openmeetings-web/src/main/webapp/css/raw-tree.css | 9 +++--
openmeetings-webservice/pom.xml | 1 +
pom.xml | 38 +---------------------
17 files changed, 52 insertions(+), 65 deletions(-)
diff --git a/openmeetings-core/pom.xml b/openmeetings-core/pom.xml
index fd8f2b9..9c6e68f 100644
--- a/openmeetings-core/pom.xml
+++ b/openmeetings-core/pom.xml
@@ -31,6 +31,7 @@
<description>Module for OpenMeetings core classes and
services</description>
<properties>
<site.basedir>${project.parent.basedir}</site.basedir>
+ <autoModuleName>apache.openmeetings.core</autoModuleName>
</properties>
<build>
<plugins>
diff --git a/openmeetings-db/pom.xml b/openmeetings-db/pom.xml
index 42eb12b..318a957 100644
--- a/openmeetings-db/pom.xml
+++ b/openmeetings-db/pom.xml
@@ -31,6 +31,7 @@
<description>OpenMeetings module for all Database/DTO related
classes</description>
<properties>
<site.basedir>${project.parent.basedir}</site.basedir>
+ <autoModuleName>apache.openmeetings.db</autoModuleName>
</properties>
<dependencies>
<dependency>
diff --git a/openmeetings-install/pom.xml b/openmeetings-install/pom.xml
index 57f5fd3..64fb961 100644
--- a/openmeetings-install/pom.xml
+++ b/openmeetings-install/pom.xml
@@ -31,6 +31,7 @@
<description>Module for OpenMeetings command line admin and classes
necessary for installer.</description>
<properties>
<site.basedir>${project.parent.basedir}</site.basedir>
+ <autoModuleName>apache.openmeetings.install</autoModuleName>
</properties>
<dependencies>
<dependency>
diff --git a/openmeetings-screenshare/pom.xml b/openmeetings-screenshare/pom.xml
index d6d4adc..b5fd7d3 100644
--- a/openmeetings-screenshare/pom.xml
+++ b/openmeetings-screenshare/pom.xml
@@ -37,6 +37,7 @@
<key.alias>screen</key.alias>
<site.basedir>${project.parent.basedir}</site.basedir>
<jnlp.out.dir>${project.build.directory}/jnlp</jnlp.out.dir>
+ <autoModuleName>apache.openmeetings.screenshare</autoModuleName>
</properties>
<dependencies>
<dependency>
diff --git a/openmeetings-server/pom.xml b/openmeetings-server/pom.xml
index d4a3b64..0c38b20 100644
--- a/openmeetings-server/pom.xml
+++ b/openmeetings-server/pom.xml
@@ -40,6 +40,7 @@
<om.webapp>webapps/openmeetings</om.webapp>
<root.webapp>webapps/ROOT</root.webapp>
<server-file.dir>web-server</server-file.dir>
+ <autoModuleName>apache.openmeetings.server</autoModuleName>
</properties>
<url>https://openmeetings.apache.org</url>
<scm>
diff --git a/openmeetings-service/pom.xml b/openmeetings-service/pom.xml
index b59b866..d9727e9 100644
--- a/openmeetings-service/pom.xml
+++ b/openmeetings-service/pom.xml
@@ -31,6 +31,7 @@
<description>Module for OpenMeetings schedulers, mail templates and
managers.</description>
<properties>
<site.basedir>${project.parent.basedir}</site.basedir>
+ <autoModuleName>apache.openmeetings.service</autoModuleName>
</properties>
<dependencies>
<dependency>
diff --git a/openmeetings-util/pom.xml b/openmeetings-util/pom.xml
index 8a90141..a3e1065 100644
--- a/openmeetings-util/pom.xml
+++ b/openmeetings-util/pom.xml
@@ -31,6 +31,7 @@
<description>Module for utility classes being used by all OpenMeetings
modules</description>
<properties>
<site.basedir>${project.parent.basedir}</site.basedir>
+ <autoModuleName>apache.openmeetings.util</autoModuleName>
</properties>
<build>
<plugins>
diff --git a/openmeetings-web/pom.xml b/openmeetings-web/pom.xml
index e50f39f..709e72a 100644
--- a/openmeetings-web/pom.xml
+++ b/openmeetings-web/pom.xml
@@ -32,6 +32,7 @@
<properties>
<old-backups.dir>${project.build.directory}/test-data</old-backups.dir>
<site.basedir>${project.parent.basedir}</site.basedir>
+ <autoModuleName>apache.openmeetings.web</autoModuleName>
</properties>
<profiles>
<profile>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
index a39e104..5fb4cb7 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
@@ -336,7 +336,6 @@ public class Application extends
AuthenticatedWebApplication implements IApplica
Version.logOMStarted();
recordingDao.resetProcessingStatus(); //we are starting
so all processing recordings are now errors
- getCsp().blocking().disabled(); //FIXME TODO due to
`reporting-only enabled`
oauthDao.getActive().forEach(oauth -> {
if (!Strings.isEmpty(oauth.getIconUrl())) {
cspConfig.add(CSPDirective.IMG_SRC,
oauth.getIconUrl());
@@ -376,7 +375,7 @@ public class Application extends
AuthenticatedWebApplication implements IApplica
}
public CSPHeaderConfiguration getCspConfig() {
- return getCsp().reporting();
+ return getCsp().blocking();
}
public static OmAuthenticationStrategy getAuthenticationStrategy() {
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.html
index ee726c3..e71fdda 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.html
@@ -29,6 +29,23 @@
<span wicket:id="refresh" class="refresh om-icon big
align-left clickable" wicket:message="title:lbl.refresh"></span>
<span wicket:id="trash"></span>
<div class="clear"></div>
+ <div id="om-js-trash-confirm" class="modal
om-confirm-dialog" tabindex="-1" data-backdrop="static" role="dialog"
aria-labelledby="om-js-trash-confirm-header" aria-modal="true">
+ <div class="modal-dialog">
+ <div class="modal-content">
+ <div class="modal-header">
+ <h4 class="modal-title"
id="om-js-trash-confirm-header"><wicket:message key="80"/></h4>
+ <button type="button"
class="close" data-dismiss="modal" aria-hidden="true">×</button>
+ </div>
+ <div
class="modal-body"><wicket:message key="713"/></div>
+ <div class="modal-footer">
+ <button type="button"
class="btn btn-outline-danger ok-btn">
+ <i class="fas
fa-exclamation-triangle"></i> <wicket:message key="54"/>
+ </button>
+ <button type="button"
data-dismiss="modal" class="btn btn-outline-secondary"><wicket:message
key="lbl.cancel"/></button>
+ </div>
+ </div>
+ </div>
+ </div>
</div>
<div wicket:id="tree-container" class="trees">
<div id="tree-anchor"></div>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java
index 8e0b725..25ca161 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java
@@ -20,7 +20,6 @@ package org.apache.openmeetings.web.common.tree;
import static java.time.Duration.ZERO;
import static java.util.UUID.randomUUID;
-import static org.apache.commons.text.StringEscapeUtils.escapeEcmaScript;
import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_JPG;
import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_PDF;
import static org.apache.openmeetings.util.OpenmeetingsVariables.ATTR_CLASS;
@@ -206,7 +205,7 @@ public abstract class FileTreePanel extends Panel {
@Override
public void onConfigure(JQueryBehavior behavior) {
super.onConfigure(behavior);
- behavior.setOption("hoverClass",
Options.asString("bg-light trash-toolbar-hover"));
+ behavior.setOption("hoverClass",
Options.asString("trash-toolbar-hover"));
behavior.setOption("accept",
Options.asString(".recorditem, .fileitem"));
}
@@ -222,19 +221,9 @@ public abstract class FileTreePanel extends Panel {
@Override
public CharSequence
getCallbackFunctionBody(CallbackParameter... parameters) {
- String dialogId
= randomUUID().toString();
-
- String
statement = "var $drop = $(this);";
- statement +=
"$('body').append('<div id=" + dialogId + ">" + getString("713") + "</div>');";
- statement +=
"$( '#" + dialogId
-
+ "' ).dialog({ title: '" + escapeEcmaScript(getString("80")) + "', classes:
{'ui-dialog-titlebar': 'ui-corner-all no-close'}, buttons: [";
- statement += "
{ text: '" + escapeEcmaScript(getString("54")) + "', click: function() {
$drop.append(ui.draggable); $(this).dialog('close'); " +
super.getCallbackFunctionBody(parameters) + " } },";
- statement += "
{ text: '" + escapeEcmaScript(getString("lbl.cancel")) + "', click: function()
{ $(this).dialog('close'); } } ";
- statement +=
"],";
- statement +=
"close: function(event, ui) { $(this).dialog('destroy').remove(); }";
- statement +=
"});";
-
- return
statement;
+ return
"OmFileTree.confirmTrash($(this), ui, function() {"
+
+ super.getCallbackFunctionBody(parameters)
+
+ "});";
}
};
}
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 7b8b0c8..8391cc5 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
@@ -221,7 +221,7 @@ public class FolderPanel extends Panel implements
IDraggableListener, IDroppable
}
}
if (treePanel.isSelected(f)) {
- style.append("bg-info ");
+ style.append("active ");
}
String cls = f instanceof Recording ? "recorditem " : "fileitem
";
style.append(f.isReadOnly() ? "readonlyitem " : cls);
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/filetree.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/filetree.js
index d268e5c..88d1479 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/filetree.js
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/filetree.js
@@ -3,19 +3,25 @@ var OmFileTree = (function() {
return {
dragHelper: function() {
let s = $(this);
- if (s.hasClass('ui-state-active')) {
- s =
$('.file.ui-state-active.ui-draggable.ui-draggable-handle,
.recording.ui-state-active.ui-draggable.ui-draggable-handle');
+ if (s.hasClass('active')) {
+ s =
$('.file.active.ui-draggable.ui-draggable-handle,
.recording.active.ui-draggable.ui-draggable-handle');
}
const c = $('<div/>').attr('id',
'draggingContainer').addClass('drag-container').width(80).height(36)
- , h = $('<div class="ui-corner-all
ui-widget-header"/>').append(s.clone()).width(s.width());
+ , h = $('<div class="border
ui-widget-header"/>').append(s.clone()).width(s.width());
return c.append(h);
}
, treeRevert: function(dropped) {
$('.file-tree .trees')[0].scrollTop =
$(this).parent()[0].offsetTop - 32;
return !dropped || (!!dropped.context &&
$(dropped.context).hasClass('wb', 'room'));
}
- , confirmTrash: function() {
-
+ , confirmTrash: function(drop, ui, callback) {
+ const dlg = $('#om-js-trash-confirm');
+ dlg.find('.ok-btn').off().click(function() {
+ drop.append(ui.draggable);
+ dlg.modal('hide');
+ callback();
+ });
+ dlg.modal('show');
}
}
})();
diff --git a/openmeetings-web/src/main/webapp/css/raw-general.css
b/openmeetings-web/src/main/webapp/css/raw-general.css
index fbfa3da..df4f6ad 100644
--- a/openmeetings-web/src/main/webapp/css/raw-general.css
+++ b/openmeetings-web/src/main/webapp/css/raw-general.css
@@ -246,8 +246,8 @@ html, body {
.tick.om-icon {
background-image: url(images/tick.png);
}
-.add.om-icon {
- background-image: url(images/add.png);
+.add.om-icon::before {
+ content: '\f055';
}
.new-email.om-icon {
background-image: url(images/email_add.png);
diff --git a/openmeetings-web/src/main/webapp/css/raw-tree.css
b/openmeetings-web/src/main/webapp/css/raw-tree.css
index c8d5f5e..bb1afa9 100644
--- a/openmeetings-web/src/main/webapp/css/raw-tree.css
+++ b/openmeetings-web/src/main/webapp/css/raw-tree.css
@@ -42,6 +42,7 @@
}
.trash-toolbar-hover {
color: inherit;
+ background-color: var(--light);
}
.file-tree .info .details {
width: 100%;
@@ -82,15 +83,17 @@
.trees .tree-node {
white-space: nowrap;
}
-
+.file-tree .trees .om-icon.active {
+ background-color: var(--info);
+}
.refresh.om-icon::before {
content: '\f2f1';
}
.trash.om-icon::before {
content: '\f2ed';
}
-.ui-state-hover.trash-toolbar-hover .trash.om-icon::before {
- font-weight: 900;
+.trash-toolbar-hover .trash.om-icon::before {
+ font-weight: 400;
}
.folder-create.om-icon::before {
content: '\f65e';
diff --git a/openmeetings-webservice/pom.xml b/openmeetings-webservice/pom.xml
index 2caa135..09c0d44 100644
--- a/openmeetings-webservice/pom.xml
+++ b/openmeetings-webservice/pom.xml
@@ -31,6 +31,7 @@
<description>Module for OpenMeetings CXF based web
services.</description>
<properties>
<site.basedir>${project.parent.basedir}</site.basedir>
+ <autoModuleName>apache.openmeetings.webservice</autoModuleName>
</properties>
<build>
<plugins>
diff --git a/pom.xml b/pom.xml
index 6d9a92b..d89d2ef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,6 +37,7 @@
<om.quick.build>false</om.quick.build>
<om.notquick.build>true</om.notquick.build>
<db>h2</db>
+ <autoModuleName>apache.openmeetings.parent</autoModuleName>
<jdk.version>11</jdk.version>
<!-- plugin versions -->
<maven-javadoc-plugin.version>3.1.1</maven-javadoc-plugin.version>
@@ -818,25 +819,6 @@
</executions>
</plugin>
<plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>groovy-maven-plugin</artifactId>
- <executions>
- <execution>
- <phase>generate-sources</phase>
- <goals>
- <goal>execute</goal>
- </goals>
- <configuration>
- <source>
- def
autoModuleName = "apache.${project.artifactId}".replace('-', '.')
-
project.properties['autoModuleName'] = autoModuleName;
-
println("Automatic-Module-Name will be '" + autoModuleName + "'")
- </source>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
</plugin>
@@ -1051,11 +1033,6 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.codehaus.gmaven</groupId>
-
<artifactId>groovy-maven-plugin</artifactId>
- <version>2.1.1</version>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>${maven-enforcer-plugin.version}</version>
@@ -1542,19 +1519,6 @@
<ignore></ignore>
</action>
</pluginExecution>
-
<pluginExecution>
-
<pluginExecutionFilter>
-
<groupId>org.codehaus.gmaven</groupId>
-
<artifactId>groovy-maven-plugin</artifactId>
-
<versionRange>[1.0.0,)</versionRange>
-
<goals>
-
<goal>execute</goal>
-
</goals>
-
</pluginExecutionFilter>
-
<action>
-
<ignore></ignore>
-
</action>
-
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
