Skip to content
Snippets Groups Projects
Commit 6c52e6c4 authored by Florian Gnaegi - frentix GmbH's avatar Florian Gnaegi - frentix GmbH
Browse files

OO-1068 make table more compact

parent a7762ece
No related branches found
No related tags found
No related merge requests found
...@@ -206,13 +206,15 @@ public class FolderComponentRenderer extends DefaultComponentRenderer { ...@@ -206,13 +206,15 @@ public class FolderComponentRenderer extends DefaultComponentRenderer {
// add current file bread crumb path // add current file bread crumb path
crumbRenderer.render(fc, target, ubu, true, iframePostEnabled); crumbRenderer.render(fc, target, ubu, true, iframePostEnabled);
// add file listing for current folder // add file listing for current folder
target.append("<div class='o_table_wrapper'>");
listRenderer.render(fc, target, ubu, translator, iframePostEnabled); listRenderer.render(fc, target, ubu, translator, iframePostEnabled);
if (fc.getCurrentContainerChildren().size() > 0) { if (fc.getCurrentContainerChildren().size() > 0) {
target.append("<div class='o_table_footer'>");
if (canWrite || canDelete || canMail) { if (canWrite || canDelete || canMail) {
target.append("<div class=\"o_table_checkall input-sm\">"); 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("<label class='checkbox-inline'><a href=\"#\" onclick=\"javascript:b_briefcase_toggleCheck('").append(formName).append("', true)\">");
target.append("<input type=\"checkbox\" checked=\"checked\" disabled=\"disabled\" />"); target.append("<input type=\"checkbox\" checked=\"checked\" disabled=\"disabled\" />");
...@@ -270,7 +272,9 @@ public class FolderComponentRenderer extends DefaultComponentRenderer { ...@@ -270,7 +272,9 @@ public class FolderComponentRenderer extends DefaultComponentRenderer {
} }
target.append("</div>"); target.append("</div>");
} }
target.append("</div>");
} }
target.append("</div>");
target.append("</form>"); target.append("</form>");
} }
......
...@@ -66,7 +66,7 @@ public abstract class AbstractFlexiTableRenderer extends DefaultComponentRendere ...@@ -66,7 +66,7 @@ public abstract class AbstractFlexiTableRenderer extends DefaultComponentRendere
} }
sb.append(" table-responsive\">"); sb.append(" table-responsive\">");
String id = ftC.getFormDispatchId(); 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 //render headers
renderHeaders(sb, ftC, translator); renderHeaders(sb, ftC, translator);
......
...@@ -177,21 +177,20 @@ public class AuthorListController extends FormBasicController implements Activat ...@@ -177,21 +177,20 @@ public class AuthorListController extends FormBasicController implements Activat
FlexiTableColumnModel columnsModel = FlexiTableDataModelFactory.createFlexiTableColumnModel(); FlexiTableColumnModel columnsModel = FlexiTableDataModelFactory.createFlexiTableColumnModel();
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(false, Cols.key.i18nKey(), Cols.key.ordinal(), false, null)); 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.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.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()); FlexiCellRenderer renderer = new StaticFlexiCellRenderer("select", new TextFlexiCellRenderer());
columnsModel.addFlexiColumnModel(new StaticFlexiColumnModel(Cols.displayName.i18nKey(), Cols.displayName.ordinal(), "select", renderer)); 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.lifecycleStart.i18nKey(), Cols.lifecycleStart.ordinal()));
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(Cols.lifecycleEnd.i18nKey(), Cols.lifecycleEnd.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(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(), columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(true, Cols.access.i18nKey(), Cols.access.ordinal(),
false, null, FlexiColumnModel.ALIGNMENT_LEFT, new AccessRenderer())); 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.creationDate.i18nKey(), Cols.creationDate.ordinal(), false, null));
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(false, Cols.lastUsage.i18nKey(), Cols.lastUsage.ordinal(), false, null)); columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(false, Cols.lastUsage.i18nKey(), Cols.lastUsage.ordinal(), false, null));
columnsModel.addFlexiColumnModel(new StaticFlexiColumnModel("details", -1, "details", columnsModel.addFlexiColumnModel(new StaticFlexiColumnModel("details", -1, "details",
new StaticFlexiCellRenderer("" /* translate("details")*/, "details", "o_icon-lg o_icon_details"))); new StaticFlexiCellRenderer("" /* translate("details")*/, "details", "o_icon-lg o_icon_details")));
columnsModel.addFlexiColumnModel(new StaticFlexiColumnModel("edit", -1, "edit", columnsModel.addFlexiColumnModel(new StaticFlexiColumnModel("edit", -1, "edit",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment