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 2014/10/25 13:20:27 UTC
[06/10] git commit: ISIS-537 Left align the dates when shown as
compact in a table
ISIS-537 Left align the dates when shown as compact in a table
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/1834d63e
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/1834d63e
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/1834d63e
Branch: refs/heads/master
Commit: 1834d63ee752663f8e3f5782d64e014a3a5b854e
Parents: 7d4ae1e
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Sat Oct 25 10:43:44 2014 +0300
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Sat Oct 25 11:07:15 2014 +0100
----------------------------------------------------------------------
.../ajaxtable/CollectionContentsAsAjaxTablePanel.css | 4 ++++
.../scalars/ScalarPanelTextFieldDatePickerAbstract.java | 2 ++
2 files changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/1834d63e/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.css
index 00512b5..3a37b9c 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.css
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.css
@@ -58,6 +58,10 @@
border: none;
}
+.collectionContentsAsAjaxTablePanel table.contents input.date:disabled {
+ text-align: left;
+}
+
.collectionContentsAsAjaxTablePanel table.contents tbody td,
.collectionContentsAsAjaxTablePanel table.contents thead th {
padding:5px;
http://git-wip-us.apache.org/repos/asf/isis/blob/1834d63e/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldDatePickerAbstract.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldDatePickerAbstract.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldDatePickerAbstract.java
index 63d1cf9..123382f 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldDatePickerAbstract.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldDatePickerAbstract.java
@@ -39,6 +39,7 @@ import org.apache.isis.core.metamodel.facets.propparam.renderedadjusted.Rendered
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.components.scalars.datepicker.TextFieldWithDatePicker;
+import org.apache.isis.viewer.wicket.ui.util.CssClassAppender;
/**
* Panel for rendering scalars representing dates, along with a date picker.
@@ -88,6 +89,7 @@ public abstract class ScalarPanelTextFieldDatePickerAbstract<T extends Serializa
protected Component addComponentForCompact() {
Fragment compactFragment = getCompactFragment(CompactType.INPUT_TEXT);
final AbstractTextComponent<T> textField = createTextField(ID_SCALAR_IF_COMPACT);
+ textField.add(new CssClassAppender("date"));
final IModel<T> model = textField.getModel();
final T object = model.getObject();
model.setObject(object);