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 2d24b774e4d83d2a9001f1e44c327375f468337a..49fb323b421ab7a310be5e129b2393a44c4ba5f4 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 a2158aed3fe71fedd9c9dae5a8c59c947a2ec90e..211a0c4825b84ce2131c4f9f8a1f046aa8d30e62 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 ddd99086583b2192d9af302fa3881fb91e3e38d0..a8f4ccf30baa7939aa8f9f6ec26e994fcce4b7ad 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",