You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2017/06/01 10:14:15 UTC
[4/4] isis git commit: ISIS-1613: uses small checkboxes for table
view (large for regular form view)
ISIS-1613: uses small checkboxes for table view (large for regular form view)
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/72bab938
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/72bab938
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/72bab938
Branch: refs/heads/master
Commit: 72bab93897364d54758211efa3ef819c9007c671
Parents: 6f39447
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Jun 1 11:14:00 2017 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Jun 1 11:14:00 2017 +0100
----------------------------------------------------------------------
.../ui/components/scalars/primitive/BooleanPanel.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/72bab938/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java
index d52abeb..d7eefd1 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java
@@ -58,7 +58,7 @@ public class BooleanPanel extends ScalarPanelAbstract2 {
protected MarkupContainer createComponentForRegular() {
final String name = getModel().getName();
- checkBox = createCheckBox(ID_SCALAR_VALUE);
+ checkBox = createCheckBox(ID_SCALAR_VALUE, CheckBoxXConfig.Sizes.lg);
checkBox.setLabel(Model.of(name));
@@ -92,7 +92,7 @@ public class BooleanPanel extends ScalarPanelAbstract2 {
*/
@Override
protected Component createComponentForCompact() {
- return createCheckBox(ID_SCALAR_IF_COMPACT);
+ return createCheckBox(ID_SCALAR_IF_COMPACT, CheckBoxXConfig.Sizes.sm);
}
@@ -121,9 +121,9 @@ public class BooleanPanel extends ScalarPanelAbstract2 {
};
}
- private CheckBoxX createCheckBox(final String id) {
+ private CheckBoxX createCheckBox(final String id, final CheckBoxXConfig.Sizes size) {
- final CheckBoxXConfig config = configFor(getModel().isRequired());
+ final CheckBoxXConfig config = configFor(getModel().isRequired(), size);
final CheckBoxX checkBox = new CheckBoxX(id, new Model<Boolean>() {
private static final long serialVersionUID = 1L;
@@ -180,7 +180,7 @@ public class BooleanPanel extends ScalarPanelAbstract2 {
return checkBox;
}
- private static CheckBoxXConfig configFor(final boolean required) {
+ private static CheckBoxXConfig configFor(final boolean required, final CheckBoxXConfig.Sizes size) {
final CheckBoxXConfig config = new CheckBoxXConfig() {
{
// so can tab to the checkbox
@@ -189,7 +189,7 @@ public class BooleanPanel extends ScalarPanelAbstract2 {
}
};
return config
- .withSize(CheckBoxXConfig.Sizes.lg)
+ .withSize(size)
.withEnclosedLabel(false)
.withIconChecked("<i class='fa fa-fw fa-check'></i>")
.withIconNull("<i class='fa fa-fw fa-square'></i>")