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/11/07 04:50:58 UTC
[12/18] isis git commit: ISIS-537 Disable the resizing of textareas
in modal windows
ISIS-537 Disable the resizing of textareas in modal windows
reduce the right padding for .label-top and .label-none form components in modal windows
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/e858ac5a
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/e858ac5a
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/e858ac5a
Branch: refs/heads/master
Commit: e858ac5a385aaa20c2be6af844e71dd5a56ada75
Parents: 9fbfcaa
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Nov 5 23:39:35 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Nov 5 23:39:35 2014 +0200
----------------------------------------------------------------------
.../isis/viewer/wicket/ui/pages/bootstrap-overrides.css | 9 +++++++++
.../todoapp/dom/src/main/java/dom/todo/ToDoItem.java | 4 +++-
2 files changed, 12 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/e858ac5a/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 e66d3d7..9c287ff 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
@@ -116,6 +116,11 @@ div.label-none .scalarValueWrapper {
padding-right: 20px;
}
+.modal-body div.label-top .scalarValueWrapper,
+.modal-body div.label-none .scalarValueWrapper {
+ padding-right: 14px;
+}
+
div.label-left .scalarValueWrapper .form-control {
width: 100%;
}
@@ -149,3 +154,7 @@ div.label-left .choicesPlaceholder {
margin-left: -5px;
margin-right: -25px;
}
+
+.modal-body textarea {
+ resize: none;
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/e858ac5a/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItem.java
----------------------------------------------------------------------
diff --git a/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItem.java b/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItem.java
index a5b4a02..dcbd897 100644
--- a/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItem.java
+++ b/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItem.java
@@ -134,7 +134,8 @@ public class ToDoItem implements Categorized, Comparable<ToDoItem> {
@javax.jdo.annotations.Column(allowsNull="false", length=100)
@PropertyInteraction()
- @RegEx(validation = "\\w[@&:\\-\\,\\.\\+ \\w]*")
+ @RegEx(validation = "\\w[@&:\\-\\,\\.\\+ \\w]*")
+ @LabelAt(LabelAt.Position.TOP)
public String getDescription() {
return description;
}
@@ -254,6 +255,7 @@ public class ToDoItem implements Categorized, Comparable<ToDoItem> {
@javax.jdo.annotations.Column(allowsNull="true")
@Disabled(reason="Use action to update both category and subcategory")
+ @LabelAt(LabelAt.Position.NONE)
public Subcategory getSubcategory() {
return subcategory;
}