This is an automated email from the ASF dual-hosted git repository.
sebawagner pushed a commit to branch
feature/OPENMEETINGS-2344-file-explorer-files-to-use-whitespace
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to
refs/heads/feature/OPENMEETINGS-2344-file-explorer-files-to-use-whitespace by
this push:
new e5cec8f OPENMEETINGS-2344 Add non broken width for tree file item
e5cec8f is described below
commit e5cec8f8c1d82e169e88673e230f55902457b7c2
Author: Sebastian Wagner <sebawag...@apache.org>
AuthorDate: Tue May 5 19:59:46 2020 +1200
OPENMEETINGS-2344 Add non broken width for tree file item
---
.../openmeetings/web/common/tree/FolderPanel.java | 16 ------
openmeetings-web/src/main/webapp/css/raw-tree.css | 64 +++++++++++++++++-----
2 files changed, 50 insertions(+), 30 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 c3b2cba..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
@@ -24,7 +24,6 @@ import static
org.apache.openmeetings.util.OpenmeetingsVariables.ATTR_TITLE;
import java.util.Map.Entry;
import org.apache.openmeetings.db.dao.file.FileItemDao;
-import org.apache.openmeetings.db.dao.file.FileItemLogDao;
import org.apache.openmeetings.db.dao.record.RecordingDao;
import org.apache.openmeetings.db.entity.file.BaseFileItem;
import org.apache.openmeetings.db.entity.file.BaseFileItem.Type;
@@ -67,8 +66,6 @@ public class FolderPanel extends Panel implements
IDraggableListener, IDroppable
private RecordingDao recDao;
@SpringBean
private FileItemDao fileDao;
- @SpringBean
- private FileItemLogDao fileLogDao;
public FolderPanel(String id, final IModel<BaseFileItem> model, final
FileTreePanel treePanel) {
super(id, model);
@@ -228,19 +225,6 @@ public class FolderPanel extends Panel implements
IDraggableListener, IDroppable
}
String cls = f instanceof Recording ? "recorditem " : "fileitem
";
style.append(f.isReadOnly() ? "readonlyitem " : cls);
-
- long errorCount = fileLogDao.countErrors(f);
- boolean hasError = errorCount != 0;
- if (BaseFileItem.Type.RECORDING == f.getType()) {
- Recording r = (Recording)f;
- hasError |= (Status.RECORDING != r.getStatus() &&
Status.CONVERTING != r.getStatus() && !f.exists());
- } else {
- hasError |= !f.exists();
- }
- if (hasError) {
- style.append("error");
- }
-
return style;
}
diff --git a/openmeetings-web/src/main/webapp/css/raw-tree.css
b/openmeetings-web/src/main/webapp/css/raw-tree.css
index 0323285..8ce7d97 100644
--- a/openmeetings-web/src/main/webapp/css/raw-tree.css
+++ b/openmeetings-web/src/main/webapp/css/raw-tree.css
@@ -23,54 +23,90 @@
.file-tree .footer .sizes .size {
padding-left: 5px;
}
+/* Calc width with default for max level of 7 */
.file-tree .file.item .name
, .file-tree .file.item .name span
{
- max-width: calc(var(--room-sidebar-width) - 58px);
+ max-width: calc(var(--room-sidebar-width) - 26px);
min-width: 60px;
}
.file-tree .tree-subtree .file.item .name
, .file-tree .tree-subtree .file.item .name span
{
- max-width: calc(var(--room-sidebar-width) - 76px);
- min-width: 60px;
+ max-width: calc(var(--room-sidebar-width) - 44px);
}
.file-tree .tree-subtree .tree-subtree .file.item .name
, .file-tree .tree-subtree .tree-subtree .file.item .name span
{
- max-width: calc(var(--room-sidebar-width) - 94px);
- min-width: 60px;
+ max-width: calc(var(--room-sidebar-width) - 62px);
}
.file-tree .tree-subtree .tree-subtree .tree-subtree .file.item .name
, .file-tree .tree-subtree .tree-subtree .tree-subtree .file.item .name
span
{
- max-width: calc(var(--room-sidebar-width) - 112px);
- min-width: 60px;
+ max-width: calc(var(--room-sidebar-width) - 80px);
}
.file-tree .tree-subtree .tree-subtree .tree-subtree .tree-subtree .file.item
.name
, .file-tree .tree-subtree .tree-subtree .tree-subtree .tree-subtree
.file.item .name span
{
- max-width: calc(var(--room-sidebar-width) - 130px);
- min-width: 60px;
+ max-width: calc(var(--room-sidebar-width) - 98px);
}
.file-tree .tree-subtree .tree-subtree .tree-subtree .tree-subtree
.tree-subtree .file.item .name
, .file-tree .tree-subtree .tree-subtree .tree-subtree .tree-subtree
.tree-subtree .file.item .name span
{
- max-width: calc(var(--room-sidebar-width) - 148px);
- min-width: 60px;
+ max-width: calc(var(--room-sidebar-width) - 116px);
}
.file-tree .tree-subtree .tree-subtree .tree-subtree .tree-subtree
.tree-subtree .tree-subtree .file.item .name
, .file-tree .tree-subtree .tree-subtree .tree-subtree .tree-subtree
.tree-subtree .tree-subtree .file.item .name span
{
- max-width: calc(var(--room-sidebar-width) - 166px);
- min-width: 60px;
+ max-width: calc(var(--room-sidebar-width) - 134px);
}
.file-tree .tree-subtree .tree-subtree .tree-subtree .tree-subtree
.tree-subtree .tree-subtree .tree-subtree .file.item .name
, .file-tree .tree-subtree .tree-subtree .tree-subtree .tree-subtree
.tree-subtree .tree-subtree .tree-subtree .file.item .name span
{
- max-width: calc(var(--room-sidebar-width) - 184px);
+ max-width: calc(var(--room-sidebar-width) - 152px);
+}
+/* adding 32px extra space in case "broken" symbol is on same row*/
+.file-tree .broken .file.item .name
+ , .file-tree .broken .file.item .name span
+{
+ max-width: calc(var(--room-sidebar-width) - 58px);
min-width: 60px;
}
+.file-tree .tree-subtree .broken .file.item .name
+ , .file-tree .tree-subtree .broken .file.item .name span
+{
+ max-width: calc(var(--room-sidebar-width) - 76px);
+}
+.file-tree .tree-subtree .tree-subtree .broken .file.item .name
+ , .file-tree .tree-subtree .tree-subtree .broken .file.item .name span
+{
+ max-width: calc(var(--room-sidebar-width) - 94px);
+}
+.file-tree .tree-subtree .tree-subtree .tree-subtree .broken .file.item .name
+ , .file-tree .tree-subtree .tree-subtree .tree-subtree .broken
.file.item .name span
+{
+ max-width: calc(var(--room-sidebar-width) - 112px);
+}
+.file-tree .tree-subtree .tree-subtree .tree-subtree .tree-subtree .broken
.file.item .name
+ , .file-tree .tree-subtree .tree-subtree .tree-subtree .tree-subtree
.broken .file.item .name span
+{
+ max-width: calc(var(--room-sidebar-width) - 130px);
+}
+.file-tree .tree-subtree .tree-subtree .tree-subtree .tree-subtree
.tree-subtree .broken .file.item .name
+ , .file-tree .tree-subtree .tree-subtree .tree-subtree .tree-subtree
.tree-subtree .broken .file.item .name span
+{
+ max-width: calc(var(--room-sidebar-width) - 148px);
+}
+.file-tree .tree-subtree .tree-subtree .tree-subtree .tree-subtree
.tree-subtree .tree-subtree .broken .file.item .name
+ , .file-tree .tree-subtree .tree-subtree .tree-subtree .tree-subtree
.tree-subtree .tree-subtree .broken .file.item .name span
+{
+ max-width: calc(var(--room-sidebar-width) - 166px);
+}
+.file-tree .tree-subtree .tree-subtree .tree-subtree .tree-subtree
.tree-subtree .tree-subtree .tree-subtree .broken .file.item .name
+ , .file-tree .tree-subtree .tree-subtree .tree-subtree .tree-subtree
.tree-subtree .tree-subtree .tree-subtree .broken .file.item .name span
+{
+ max-width: calc(var(--room-sidebar-width) - 184px);
+}
.trash-toolbar {
font-weight: bold;
line-height: 20px;
