You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2022/06/07 05:10:29 UTC
[openmeetings] branch master updated (c070acc03 -> b962e042e)
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
from c070acc03 [OPENMEETINGS-2627] example for Keycloak is added
new dd3759069 [OPENMEETINGS-2715] minor improvements
new b962e042e [OPENMEETINGS-2732] wicket-jquery-ui, mockito
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../openmeetings/web/common/tree/FolderPanel.java | 51 +++++++++++-----------
openmeetings-web/src/main/webapp/css/raw-tree.css | 6 +--
pom.xml | 4 +-
3 files changed, 30 insertions(+), 31 deletions(-)
[openmeetings] 01/02: [OPENMEETINGS-2715] minor improvements
Posted by so...@apache.org.
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
commit dd3759069141f7ce1cfe8c2e2791b815094648ad
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Tue Jun 7 11:53:14 2022 +0700
[OPENMEETINGS-2715] minor improvements
---
.../openmeetings/web/common/tree/FolderPanel.java | 51 +++++++++++-----------
openmeetings-web/src/main/webapp/css/raw-tree.css | 6 +--
2 files changed, 28 insertions(+), 29 deletions(-)
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 b0057ab6d..ef0a0e8e0 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
@@ -247,32 +247,31 @@ public class FolderPanel extends Panel implements IDraggableListener, IDroppable
StringBuilder style = new StringBuilder("big om-icon ");
if (f.getId() == null) {
style.append(CSS_CLASS_FILE).append(f.getHash().indexOf("my") > -1 ? "my " : "public ");
- } else {
- if (BaseFileItem.Type.FOLDER != f.getType() && !f.exists()) {
- style.append("broken ");
- }
- switch(f.getType()) {
- case FOLDER:
- style.append(CSS_CLASS_FILE).append(open ? "folder-open " : "folder ");
- break;
- case IMAGE:
- style.append(CSS_CLASS_FILE).append("image ");
- break;
- case POLL_CHART:
- style.append(CSS_CLASS_FILE).append("chart ");
- break;
- case WML_FILE:
- style.append(CSS_CLASS_FILE).append("wml ");
- break;
- case VIDEO, RECORDING:
- setVideoStyle(f, style);
- break;
- case PRESENTATION:
- style.append(CSS_CLASS_FILE).append("doc ");
- break;
- default:
- break;
- }
+ }
+ if (BaseFileItem.Type.FOLDER != f.getType() && !f.exists()) {
+ style.append("broken ");
+ }
+ switch(f.getType()) {
+ case FOLDER:
+ style.append(CSS_CLASS_FILE).append(open ? "folder-open " : "folder ");
+ break;
+ case IMAGE:
+ style.append(CSS_CLASS_FILE).append("image ");
+ break;
+ case POLL_CHART:
+ style.append(CSS_CLASS_FILE).append("chart ");
+ break;
+ case WML_FILE:
+ style.append(CSS_CLASS_FILE).append("wml ");
+ break;
+ case VIDEO, RECORDING:
+ setVideoStyle(f, style);
+ break;
+ case PRESENTATION:
+ style.append(CSS_CLASS_FILE).append("doc ");
+ break;
+ default:
+ break;
}
if (treePanel.isSelected(f)) {
style.append("active ");
diff --git a/openmeetings-web/src/main/webapp/css/raw-tree.css b/openmeetings-web/src/main/webapp/css/raw-tree.css
index d30cdae45..b324d59d1 100644
--- a/openmeetings-web/src/main/webapp/css/raw-tree.css
+++ b/openmeetings-web/src/main/webapp/css/raw-tree.css
@@ -135,9 +135,6 @@
.file.om-icon, .recording.om-icon {
padding-left: 34px;
}
-.my.file.om-icon::before {
- content: '\f015';
-}
.public.file.om-icon::before {
content: '\f0ac';
}
@@ -165,6 +162,9 @@
.selected .file.item {
background-color: #0099FF;
}
+.my.file.om-icon::before {
+ content: '\f015';
+}
.tree-theme-windows span.tree-content {
display: flex !important;
}
[openmeetings] 02/02: [OPENMEETINGS-2732] wicket-jquery-ui, mockito
Posted by so...@apache.org.
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
commit b962e042e6a7d0f85a2caae70f42ae031de8d99b
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Tue Jun 7 12:10:21 2022 +0700
[OPENMEETINGS-2732] wicket-jquery-ui, mockito
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index f4f851dd2..aac59d700 100644
--- a/pom.xml
+++ b/pom.xml
@@ -81,7 +81,7 @@
<!-- dependency versions -->
<junit.version>5.8.2</junit.version>
<wicket.version>9.10.0</wicket.version>
- <wicket-jquery-ui.version>9.8.0</wicket-jquery-ui.version>
+ <wicket-jquery-ui.version>9.8.1</wicket-jquery-ui.version>
<wicketstuff.version>9.10.0</wicketstuff.version>
<wicket-bootstrap.version>6.0.0-M6</wicket-bootstrap.version>
<font-awesome.version>6.1.0</font-awesome.version>
@@ -121,7 +121,7 @@
<jetty.version>9.4.46.v20220331</jetty.version>
<license.excludedScopes>test</license.excludedScopes>
<bcprov-jdk15on.version>1.70</bcprov-jdk15on.version>
- <mockito.version>4.6.0</mockito.version>
+ <mockito.version>4.6.1</mockito.version>
<quartz.version>2.3.2</quartz.version>
<kurento.version>6.16.5</kurento.version>
<jain-sip.version>1.2.307</jain-sip.version><!-- other versions are broken! -->