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/27 09:49:45 UTC
git commit: ISIS-537 Use a rather than or
Repository: isis
Updated Branches:
refs/heads/master 982e16303 -> 3e254d999
ISIS-537 Use a <span> rather than <input> or <label> for compact mode of most scalar panels
https://trello.com/c/AOUUduY1/90-change-compact-view-of-scalar-panels-to-use-labels-rather-than-input
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/3e254d99
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/3e254d99
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/3e254d99
Branch: refs/heads/master
Commit: 3e254d999dc10915a5c31a55ad2f6be23fa7aacb
Parents: 982e163
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Oct 27 10:22:51 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Oct 27 10:22:51 2014 +0200
----------------------------------------------------------------------
.../CollectionContentsAsAjaxTablePanel.css | 20 ++++++--------
.../components/scalars/ScalarPanelAbstract.html | 8 ------
.../components/scalars/ScalarPanelAbstract.java | 8 ------
.../ScalarPanelTextFieldDatePickerAbstract.java | 20 ++++++--------
.../scalars/ScalarPanelTextFieldNumeric.java | 29 +++++---------------
.../wicket/ui/pages/bootstrap-overrides.css | 9 ------
6 files changed, 23 insertions(+), 71 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/3e254d99/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 3813dd1..2171b17 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,18 +58,14 @@
border: none;
}
-.collectionContentsAsAjaxTablePanel table.contents input.date:disabled {
- text-align: left;
-}
-
-.collectionContentsAsAjaxTablePanel table.contents .javaMathBigDecimalPanel input:disabled,
-.collectionContentsAsAjaxTablePanel table.contents .javaMathBigIntegerPanel input:disabled,
-.collectionContentsAsAjaxTablePanel table.contents .bytePanel input:disabled,
-.collectionContentsAsAjaxTablePanel table.contents .shortPanel input:disabled,
-.collectionContentsAsAjaxTablePanel table.contents .integerPanel input:disabled,
-.collectionContentsAsAjaxTablePanel table.contents .longPanel input:disabled,
-.collectionContentsAsAjaxTablePanel table.contents .floatPanel input:disabled,
-.collectionContentsAsAjaxTablePanel table.contents .doublePanel input:disabled {
+.collectionContentsAsAjaxTablePanel table.contents .javaMathBigDecimalPanel,
+.collectionContentsAsAjaxTablePanel table.contents .javaMathBigIntegerPanel,
+.collectionContentsAsAjaxTablePanel table.contents .bytePanel,
+.collectionContentsAsAjaxTablePanel table.contents .shortPanel,
+.collectionContentsAsAjaxTablePanel table.contents .integerPanel,
+.collectionContentsAsAjaxTablePanel table.contents .longPanel,
+.collectionContentsAsAjaxTablePanel table.contents .floatPanel,
+.collectionContentsAsAjaxTablePanel table.contents .doublePanel {
text-align: right;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/3e254d99/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.html
index 20acf9a..3a2d352 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.html
@@ -36,18 +36,10 @@
<wicket:container wicket:id="scalarIfCompact"></wicket:container>
</div>
- <wicket:fragment wicket:id="compactAsInputText">
- <input type="text" class="form-control" wicket:id="scalarIfCompact"/>
- </wicket:fragment>
-
<wicket:fragment wicket:id="compactAsInputCheckbox">
<input type="checkbox" class="form-control" wicket:id="scalarIfCompact"/>
</wicket:fragment>
- <wicket:fragment wicket:id="compactAsLabel">
- <label wicket:id="scalarIfCompact"/>
- </wicket:fragment>
-
<wicket:fragment wicket:id="compactAsSpan">
<span wicket:id="scalarIfCompact"></span>
</wicket:fragment>
http://git-wip-us.apache.org/repos/asf/isis/blob/3e254d99/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
index 2fad9fb..853c4c2 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
@@ -75,9 +75,7 @@ public abstract class ScalarPanelAbstract extends PanelAbstract<ScalarModel> imp
private static final String ID_FEEDBACK = "feedback";
public enum CompactType {
- INPUT_TEXT,
INPUT_CHECKBOX,
- LABEL,
SPAN
}
@@ -145,15 +143,9 @@ public abstract class ScalarPanelAbstract extends PanelAbstract<ScalarModel> imp
protected Fragment getCompactFragment(CompactType type) {
Fragment compactFragment;
switch (type) {
- case INPUT_TEXT:
- compactFragment = new Fragment("scalarIfCompact", "compactAsInputText", ScalarPanelAbstract.this);
- break;
case INPUT_CHECKBOX:
compactFragment = new Fragment("scalarIfCompact", "compactAsInputCheckbox", ScalarPanelAbstract.this);
break;
- case LABEL:
- compactFragment = new Fragment("scalarIfCompact", "compactAsLabel", ScalarPanelAbstract.this);
- break;
case SPAN:
default:
compactFragment = new Fragment("scalarIfCompact", "compactAsSpan", ScalarPanelAbstract.this);
http://git-wip-us.apache.org/repos/asf/isis/blob/3e254d99/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 123382f..79c37b5 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
@@ -25,6 +25,7 @@ import com.google.inject.Inject;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.Component;
+import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.AbstractTextComponent;
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.markup.html.panel.Fragment;
@@ -70,7 +71,7 @@ public abstract class ScalarPanelTextFieldDatePickerAbstract<T extends Serializa
}
protected TextField<T> createTextField(final String id) {
- return new TextFieldWithDatePicker<>(id, new TextFieldValueModel<T>(this), cls, converter);
+ return new TextFieldWithDatePicker<>(id, newTextFieldValueModel(), cls, converter);
}
@Override
@@ -87,26 +88,21 @@ 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);
-
- textField.setEnabled(false);
+ Fragment compactFragment = getCompactFragment(CompactType.SPAN);
+ final Label label = new Label(ID_SCALAR_IF_COMPACT, newTextFieldValueModel());
+ label.setEnabled(false);
// adding an amount because seemed to truncate in tables in certain circumstances
final int lengthAdjust =
getLengthAdjustHint() != null ? getLengthAdjustHint() : 1;
final String dateTimePattern = converter.getDateTimePattern(getLocale());
final int length = dateTimePattern.length() + lengthAdjust;
- textField.add(new AttributeModifier("size", Model.of("" + length)));
+ label.add(new AttributeModifier("size", Model.of("" + length)));
- compactFragment.add(textField);
+ compactFragment.add(label);
scalarTypeContainer.addOrReplace(compactFragment);
- return textField;
+ return label;
}
/**
http://git-wip-us.apache.org/repos/asf/isis/blob/3e254d99/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldNumeric.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldNumeric.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldNumeric.java
index 92b120d..1bf5e4c 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldNumeric.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldNumeric.java
@@ -22,9 +22,8 @@ package org.apache.isis.viewer.wicket.ui.components.scalars;
import java.io.Serializable;
import org.apache.wicket.Component;
-import org.apache.wicket.markup.html.form.AbstractTextComponent;
+import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.panel.Fragment;
-import org.apache.wicket.model.IModel;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
@@ -39,29 +38,15 @@ public abstract class ScalarPanelTextFieldNumeric<T extends Serializable> extend
super(id, scalarModel, cls);
}
- @Override
- protected void addSemantics() {
- super.addSemantics();
- }
-
- @Override
- protected AbstractTextComponent<T> createTextFieldForRegular() {
- return createTextField(ID_SCALAR_VALUE);
- }
-
protected Component addComponentForCompact() {
- Fragment compactFragment = getCompactFragment(CompactType.INPUT_TEXT);
- final AbstractTextComponent<T> textField = createTextField(ID_SCALAR_IF_COMPACT);
- final IModel<T> model = textField.getModel();
- final T object = model.getObject();
- model.setObject(object);
-
- textField.setEnabled(false);
- setTextFieldSizeAndMaxLengthIfSpecified(textField);
+ Fragment compactFragment = getCompactFragment(CompactType.SPAN);
+ final Label label = new Label(ID_SCALAR_IF_COMPACT, newTextFieldValueModel());
+
+ label.setEnabled(false);
- compactFragment.add(textField);
+ compactFragment.add(label);
scalarTypeContainer.addOrReplace(compactFragment);
- return textField;
+ return label;
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/3e254d99/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
index b809842..bc9b790 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
@@ -16,11 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-/*
-.table.contents img {
- width: 16px;
- height: 16px;
-}*/
.table .form-control:disabled {
background-color: transparent;
@@ -77,10 +72,6 @@ body {
padding-top: 80px;
}
-label {
- font-weight: normal;
-}
-
.nav > li > a {
padding-left: 10px;
padding-right: 10px;