From 6c52e6c4824efb9522ac7a82c1818e551fa3d945 Mon Sep 17 00:00:00 2001
From: Florian Gnaegi - frentix GmbH <gnaegi@frentix.com>
Date: Fri, 16 May 2014 18:16:01 +0200
Subject: [PATCH] OO-1068 make table more compact
---
.../modules/bc/components/FolderComponentRenderer.java | 6 +++++-
.../impl/elements/table/AbstractFlexiTableRenderer.java | 2 +-
.../olat/repository/ui/author/AuthorListController.java | 9 ++++-----
3 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/olat/core/commons/modules/bc/components/FolderComponentRenderer.java b/src/main/java/org/olat/core/commons/modules/bc/components/FolderComponentRenderer.java
index 2d24b774e4d..49fb323b421 100644
--- a/src/main/java/org/olat/core/commons/modules/bc/components/FolderComponentRenderer.java
+++ b/src/main/java/org/olat/core/commons/modules/bc/components/FolderComponentRenderer.java
@@ -206,13 +206,15 @@ public class FolderComponentRenderer extends DefaultComponentRenderer {
// add current file bread crumb path
crumbRenderer.render(fc, target, ubu, true, iframePostEnabled);
+
// add file listing for current folder
+ target.append("<div class='o_table_wrapper'>");
listRenderer.render(fc, target, ubu, translator, iframePostEnabled);
if (fc.getCurrentContainerChildren().size() > 0) {
+ target.append("<div class='o_table_footer'>");
if (canWrite || canDelete || canMail) {
-
target.append("<div class=\"o_table_checkall input-sm\">");
target.append("<label class='checkbox-inline'><a href=\"#\" onclick=\"javascript:b_briefcase_toggleCheck('").append(formName).append("', true)\">");
target.append("<input type=\"checkbox\" checked=\"checked\" disabled=\"disabled\" />");
@@ -270,7 +272,9 @@ public class FolderComponentRenderer extends DefaultComponentRenderer {
}
target.append("</div>");
}
+ target.append("</div>");
}
+ target.append("</div>");
target.append("</form>");
}
diff --git a/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/table/AbstractFlexiTableRenderer.java b/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/table/AbstractFlexiTableRenderer.java
index a2158aed3fe..211a0c4825b 100644
--- a/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/table/AbstractFlexiTableRenderer.java
+++ b/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/table/AbstractFlexiTableRenderer.java
@@ -66,7 +66,7 @@ public abstract class AbstractFlexiTableRenderer extends DefaultComponentRendere
}
sb.append(" table-responsive\">");
String id = ftC.getFormDispatchId();
- sb.append("<table id=\"").append(id).append("\" class=\"table table-bordered table-hover table-responsive\">");
+ sb.append("<table id=\"").append(id).append("\" class=\"table table-condensed table-striped table-hover table-responsive\">");
//render headers
renderHeaders(sb, ftC, translator);
diff --git a/src/main/java/org/olat/repository/ui/author/AuthorListController.java b/src/main/java/org/olat/repository/ui/author/AuthorListController.java
index ddd99086583..a8f4ccf30ba 100644
--- a/src/main/java/org/olat/repository/ui/author/AuthorListController.java
+++ b/src/main/java/org/olat/repository/ui/author/AuthorListController.java
@@ -177,21 +177,20 @@ public class AuthorListController extends FormBasicController implements Activat
FlexiTableColumnModel columnsModel = FlexiTableDataModelFactory.createFlexiTableColumnModel();
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(false, Cols.key.i18nKey(), Cols.key.ordinal(), false, null));
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(Cols.mark.i18nKey(), Cols.mark.ordinal()));
- columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(Cols.ac.i18nKey(), Cols.ac.ordinal(), new ACRenderer()));
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(Cols.type.i18nKey(), Cols.type.ordinal(), new TypeRenderer()));
- columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(Cols.lifecycleLabel.i18nKey(), Cols.lifecycleLabel.ordinal()));
- columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(Cols.lifecycleSoftkey.i18nKey(), Cols.lifecycleSoftkey.ordinal()));
FlexiCellRenderer renderer = new StaticFlexiCellRenderer("select", new TextFlexiCellRenderer());
columnsModel.addFlexiColumnModel(new StaticFlexiColumnModel(Cols.displayName.i18nKey(), Cols.displayName.ordinal(), "select", renderer));
+ columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(false, Cols.authors.i18nKey(), Cols.authors.ordinal(), false, null));
+ columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(false, Cols.lifecycleLabel.i18nKey(), Cols.lifecycleLabel.ordinal(), true, null));
+ columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(false, Cols.lifecycleSoftkey.i18nKey(), Cols.lifecycleSoftkey.ordinal(), true, null));
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(Cols.lifecycleStart.i18nKey(), Cols.lifecycleStart.ordinal()));
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(Cols.lifecycleEnd.i18nKey(), Cols.lifecycleEnd.ordinal()));
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(Cols.author.i18nKey(), Cols.author.ordinal()));
- columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(false, Cols.authors.i18nKey(), Cols.authors.ordinal(), false, null));
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(true, Cols.access.i18nKey(), Cols.access.ordinal(),
false, null, FlexiColumnModel.ALIGNMENT_LEFT, new AccessRenderer()));
+ columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(Cols.ac.i18nKey(), Cols.ac.ordinal(), new ACRenderer()));
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(false, Cols.creationDate.i18nKey(), Cols.creationDate.ordinal(), false, null));
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(false, Cols.lastUsage.i18nKey(), Cols.lastUsage.ordinal(), false, null));
-
columnsModel.addFlexiColumnModel(new StaticFlexiColumnModel("details", -1, "details",
new StaticFlexiCellRenderer("" /* translate("details")*/, "details", "o_icon-lg o_icon_details")));
columnsModel.addFlexiColumnModel(new StaticFlexiColumnModel("edit", -1, "edit",
--
GitLab