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 <[email protected]> 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; }
