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:47 UTC
[01/18] isis git commit: ISIS-537 Add Bootstrap overrides CSS file
for Sandstone theme to fix the rendering of the input-group-addon for the
dates
Repository: isis
Updated Branches:
refs/heads/master d4816a472 -> 11c6dcd37
ISIS-537 Add Bootstrap overrides CSS file for Sandstone theme to fix the rendering of the input-group-addon for the dates
https://trello.com/c/6oCefJvi/99-sandstone-theme-date-hint-is-too-large
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/8efdfa05
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/8efdfa05
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/8efdfa05
Branch: refs/heads/master
Commit: 8efdfa0532e966689c753c1e1665381089a34c79
Parents: d4816a4
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Nov 4 22:21:03 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue Nov 4 22:21:56 2014 +0200
----------------------------------------------------------------------
.../ui/pages/bootstrap-overrides-sandstone.css | 22 ++++++++++++++++++++
1 file changed, 22 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/8efdfa05/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-sandstone.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-sandstone.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-sandstone.css
new file mode 100644
index 0000000..df9795b
--- /dev/null
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-sandstone.css
@@ -0,0 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+.input-group-sm > .input-group-addon {
+ padding: 0 11px;
+}
[18/18] isis git commit: ISIS-537 Improve the Bootstrap styling of
ValuePage.html
Posted by da...@apache.org.
ISIS-537 Improve the Bootstrap styling of ValuePage.html
https://trello.com/c/Ygt1zDSp/112-i-just-tested-todo-app-s-total-cost-functionality-and-found-out-that-the-valuepage-doesn-t-looks-very-pretty-at-the-moment
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/11c6dcd3
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/11c6dcd3
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/11c6dcd3
Branch: refs/heads/master
Commit: 11c6dcd378e3d94e502269d2eeb36e471613c166
Parents: 1c17e40
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu Nov 6 12:07:10 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu Nov 6 12:07:10 2014 +0200
----------------------------------------------------------------------
.../apache/isis/viewer/wicket/ui/pages/value/ValuePage.html | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/11c6dcd3/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/value/ValuePage.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/value/ValuePage.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/value/ValuePage.html
index 7fee76e..d1b793b 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/value/ValuePage.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/value/ValuePage.html
@@ -28,9 +28,11 @@
<div wicket:id="bookmarks"></div>
<div class="myBlockContainer">
<div class="iconAndTitle panel panel-default actionPanelHeaderNew">
- <h3 wicket:id="actionName" class="actionName">[action name]</h3>
+ <div class="panel-heading">
+ <div wicket:id="actionName" class="panel-title actionName">[action name]</div>
+ </div>
+ <div wicket:id="value" class="panel-body"></div>
</div>
- <div wicket:id="value"></div>
</div>
</div>
</wicket:extend>
[16/18] isis git commit: ISIS-537 Remove a div.clearfix to save some
vertical space and for better alignment of the table view selector and the
entity action links
Posted by da...@apache.org.
ISIS-537 Remove a div.clearfix to save some vertical space and for better alignment of the table view selector and the entity action links
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/33b3125f
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/33b3125f
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/33b3125f
Branch: refs/heads/master
Commit: 33b3125f1b2187faedf11c145cfc55709686af9a
Parents: 21d008a
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu Nov 6 11:42:49 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu Nov 6 11:42:49 2014 +0200
----------------------------------------------------------------------
.../viewer/wicket/ui/selector/links/LinksSelectorPanelAbstract.html | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/33b3125f/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/LinksSelectorPanelAbstract.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/LinksSelectorPanelAbstract.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/LinksSelectorPanelAbstract.html
index d573d33..14418d1 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/LinksSelectorPanelAbstract.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/LinksSelectorPanelAbstract.html
@@ -40,7 +40,6 @@
</div>
<span wicket:id="additionalLinks"></span>
- <div class="clearfix"></div>
<div class="views">
<wicket:child/>
[05/18] isis git commit: ISIS-537 Improve the logic for
showing/hiding the CopyLink modal window with alt+] keyboard combination
Posted by da...@apache.org.
ISIS-537 Improve the logic for showing/hiding the CopyLink modal window with alt+] keyboard combination
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/da9e3605
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/da9e3605
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/da9e3605
Branch: refs/heads/master
Commit: da9e36058564324d5d5cfda3ec1d5a97c28e2e25
Parents: 2fc840f
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Nov 5 00:30:35 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Nov 5 00:30:35 2014 +0200
----------------------------------------------------------------------
.../wicket/ui/pages/jquery.isis.wicket.viewer.js | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/da9e3605/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js
index bff6a9c..f502195 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js
@@ -93,15 +93,16 @@ $(function() {
* Show/hide the CopyLink modal window with alt+]
*/
$('body').keydown(function(e) {
- var $copyModal = $('.copyModal');
-
- if(!Isis.copyModalShown && e.which === 221 && e.altKey) {
- Isis.copyModalShown = true;
- $('.copyLink').click();
- } else {
- $copyModal.modal('hide');
- $('.modal-backdrop').remove();
- Isis.copyModalShown = false;
+ if (e.which === 221 && e.altKey) {
+ if (Isis.copyModalShown) {
+ $('.copyModal').modal('hide');
+ $('.modal-backdrop').remove();
+ Isis.copyModalShown = false;
+ }
+ else {
+ Isis.copyModalShown = true;
+ $('.copyLink').click();
+ }
}
});
[11/18] isis git commit: ISIS-537 Use same space on the left and the
right of the form components in the forms (EntityPropertiesPanel and
ActionParametersFormPanel)
Posted by da...@apache.org.
ISIS-537 Use same space on the left and the right of the form components in the forms (EntityPropertiesPanel and ActionParametersFormPanel)
https://trello.com/c/qCb7H75g/108-left-and-right-margins-in-action-prompt-different
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/9fbfcaaf
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/9fbfcaaf
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/9fbfcaaf
Branch: refs/heads/master
Commit: 9fbfcaaf02590f865d42ff7543bf4288cea6aa38
Parents: 692adff
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Nov 5 23:21:56 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Nov 5 23:21:56 2014 +0200
----------------------------------------------------------------------
.../ui/components/actions/ActionParametersFormPanel.html | 2 +-
.../isis/viewer/wicket/ui/pages/bootstrap-overrides.css | 10 ++++++++++
2 files changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/9fbfcaaf/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.html
index 2beb8bc..05eaaec 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.html
@@ -21,7 +21,7 @@
<body>
<wicket:panel>
<div class="actionParametersForm inputForm">
- <form wicket:id="inputForm" method="post" class="form-horizontal">
+ <form wicket:id="inputForm" method="post" class="form-horizontal actionParametersForm">
<fieldset class="inputFormTable parameters">
<div wicket:id="parameters" class="parameter">
<div wicket:id="scalarNameAndValue">[scalar]</div>
http://git-wip-us.apache.org/repos/asf/isis/blob/9fbfcaaf/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 081e522..e66d3d7 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
@@ -139,3 +139,13 @@ div.label-left .choicesPlaceholder {
vertical-align: middle;
}
/* Labels on the left/top/none END */
+
+
+.form-horizontal.actionParametersForm .form-group {
+ margin-left: -5px;
+}
+
+.form-horizontal.inputForm .form-group {
+ margin-left: -5px;
+ margin-right: -25px;
+}
[14/18] isis git commit: ISIS-537 Revert a change to ToDoItem related
to testing of @LabelAt positions committed by mistake
Posted by da...@apache.org.
ISIS-537 Revert a change to ToDoItem related to testing of @LabelAt positions committed by mistake
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/e59364a7
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/e59364a7
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/e59364a7
Branch: refs/heads/master
Commit: e59364a78216ddca791ba59344e4b518707c55c5
Parents: 8cbe98e
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu Nov 6 10:55:09 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu Nov 6 10:55:09 2014 +0200
----------------------------------------------------------------------
.../application/todoapp/dom/src/main/java/dom/todo/ToDoItem.java | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/e59364a7/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 dcbd897..8768a74 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
@@ -135,7 +135,6 @@ public class ToDoItem implements Categorized, Comparable<ToDoItem> {
@javax.jdo.annotations.Column(allowsNull="false", length=100)
@PropertyInteraction()
@RegEx(validation = "\\w[@&:\\-\\,\\.\\+ \\w]*")
- @LabelAt(LabelAt.Position.TOP)
public String getDescription() {
return description;
}
@@ -255,7 +254,6 @@ 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;
}
[07/18] isis git commit: Revert "ISIS-537,
ISIS-911 - Remove the extra "Clear" button for Blob/Clob scalars in
edit mode"
Posted by da...@apache.org.
Revert "ISIS-537, ISIS-911 - Remove the extra "Clear" button for Blob/Clob scalars in edit mode"
This reverts commit f605fba1ec596fa79ad9bf63a209114775bf858f.
https://trello.com/c/3ar0leq2/103-my-mistake-we-now-don-t-have-any-way-to-clear-an-attachment-or-blob-if-optional-eg-in-the-todoapp
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/c195fa7c
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/c195fa7c
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/c195fa7c
Branch: refs/heads/master
Commit: c195fa7ccc3d407c14b85aba8eb91d13a0bae479
Parents: 21bc20b
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Nov 5 22:29:38 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Nov 5 22:29:38 2014 +0200
----------------------------------------------------------------------
.../additionallinks/AdditionalLinksPanel.java | 11 +++----
.../additionallinks/EntityActionUtil.java | 3 +-
.../isisapplib/IsisBlobOrClobPanelAbstract.html | 1 +
.../isisapplib/IsisBlobOrClobPanelAbstract.java | 31 +++++++++++++++++++-
4 files changed, 39 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/c195fa7c/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/additionallinks/AdditionalLinksPanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/additionallinks/AdditionalLinksPanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/additionallinks/AdditionalLinksPanel.java
index b94beb1..50b9a1b 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/additionallinks/AdditionalLinksPanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/additionallinks/AdditionalLinksPanel.java
@@ -40,8 +40,7 @@ import org.apache.isis.viewer.wicket.ui.util.Components;
import org.apache.isis.viewer.wicket.ui.util.CssClassAppender;
/**
- * Panel for rendering additional links like <em>update</em> and <em>clear</em>
- * next to a scalar.
+ * Panel for rendering scalars of type {@link String}.
*/
public class AdditionalLinksPanel extends PanelAbstract<ListOfLinksModel> {
@@ -51,11 +50,13 @@ public class AdditionalLinksPanel extends PanelAbstract<ListOfLinksModel> {
private static final String ID_ADDITIONAL_LINK_ITEM = "additionalLinkItem";
private static final String ID_ADDITIONAL_LINK_FONT_AWESOME = "additionalLinkFontAwesome";
private static final String ID_ADDITIONAL_LINK_TITLE = "additionalLinkTitle";
-
+
+ private List<LinkAndLabel> linkAndLabels;
+
public AdditionalLinksPanel(final String id, final List<LinkAndLabel> links) {
super(id, new ListOfLinksModel(links));
- List<LinkAndLabel> linkAndLabels = getModel().getObject();
+ this.linkAndLabels = getModel().getObject();
final WebMarkupContainer container = new WebMarkupContainer(ID_ADDITIONAL_LINK_LIST);
addOrReplace(container);
@@ -64,7 +65,7 @@ public class AdditionalLinksPanel extends PanelAbstract<ListOfLinksModel> {
setOutputMarkupId(true);
- final ListView<LinkAndLabel> listView = new ListView<LinkAndLabel>(ID_ADDITIONAL_LINK_ITEM, linkAndLabels) {
+ final ListView<LinkAndLabel> listView = new ListView<LinkAndLabel>(ID_ADDITIONAL_LINK_ITEM, this.linkAndLabels) {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/isis/blob/c195fa7c/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/additionallinks/EntityActionUtil.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/additionallinks/EntityActionUtil.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/additionallinks/EntityActionUtil.java
index 4e0bd4c..5c2d62c 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/additionallinks/EntityActionUtil.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/additionallinks/EntityActionUtil.java
@@ -92,6 +92,7 @@ public final class EntityActionUtil {
final EntityModel entityModel,
final ObjectAssociation association,
final List<ObjectAction> associatedActions) {
+ final ObjectSpecification adapterSpec = entityModel.getTypeOfSpecification();
final ObjectAdapter adapter = entityModel.load(ConcurrencyChecking.NO_CHECK);
final AuthenticationSessionProvider asa = (AuthenticationSessionProvider) Session.get();
@@ -105,7 +106,7 @@ public final class EntityActionUtil {
ObjectAction.Filters.notBulkOnly(),
ObjectAction.Filters.excludeWizardActions(objectSpecification));
- final List<ObjectAction> userActions = objectSpecification.getObjectActions(type, Contributed.INCLUDED, filter);
+ final List<ObjectAction> userActions = adapterSpec.getObjectActions(type, Contributed.INCLUDED, filter);
associatedActions.addAll(userActions);
return userActions;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/c195fa7c/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.html
index 2857d9a..0320af1 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.html
@@ -30,6 +30,7 @@
<span class="uploadFile help-block">
<input type="file" name="scalarValue" wicket:id="scalarValue" />
</span>
+ <a wicket:id="scalarIfRegularClear" class="btn btn-primary btn-sm"><span class="clearTitle">Clear</span></a>
<a class="download btn btn-sm btn-primary" wicket:id="scalarIfRegularDownload"><span class="downloadTitle">Download</span></a>
<span class="fileName" wicket:id="fileName"></span>
http://git-wip-us.apache.org/repos/asf/isis/blob/c195fa7c/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.java
index 6cacd86..c122780 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.java
@@ -28,6 +28,8 @@ import javax.activation.MimeType;
import javax.imageio.ImageIO;
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.extensions.markup.html.image.resource.ThumbnailImageResource;
import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -63,6 +65,7 @@ public abstract class IsisBlobOrClobPanelAbstract<T extends NamedWithMimeType> e
private static final String ID_SCALAR_IF_REGULAR = "scalarIfRegular";
private static final String ID_SCALAR_IF_REGULAR_DOWNLOAD = "scalarIfRegularDownload";
private static final String ID_FILE_NAME = "fileName";
+ private static final String ID_SCALAR_IF_REGULAR_CLEAR = "scalarIfRegularClear";
private static final String ID_SCALAR_NAME = "scalarName";
private static final String ID_SCALAR_VALUE = "scalarValue";
private static final String ID_IMAGE = "scalarImage";
@@ -72,6 +75,7 @@ public abstract class IsisBlobOrClobPanelAbstract<T extends NamedWithMimeType> e
private Image wicketImage;
private FileUploadField fileUploadField;
+ private Label fileNameLabel;
protected enum InputFieldVisibility {
VISIBLE, NOT_VISIBLE
@@ -225,7 +229,9 @@ public abstract class IsisBlobOrClobPanelAbstract<T extends NamedWithMimeType> e
MarkupContainer formComponent = (MarkupContainer) getComponentForRegular();
formComponent.get(ID_SCALAR_VALUE).setVisible(visibility == InputFieldVisibility.VISIBLE);
- updateFileNameLabel(ID_FILE_NAME, formComponent);
+ fileNameLabel = updateFileNameLabel(ID_FILE_NAME, formComponent);
+
+ updateClearLink(visibility);
// the visibility of download link is intentionally 'backwards';
// if in edit mode then do NOT show
@@ -255,6 +261,29 @@ public abstract class IsisBlobOrClobPanelAbstract<T extends NamedWithMimeType> e
return fileNameLabel;
}
+ private void updateClearLink(InputFieldVisibility visibility) {
+ final MarkupContainer formComponent = (MarkupContainer) getComponentForRegular();
+ formComponent.setOutputMarkupId(true); // enable ajax link
+
+ final AjaxLink<Void> ajaxLink = new AjaxLink<Void>(ID_SCALAR_IF_REGULAR_CLEAR){
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ setEnabled(false);
+ ScalarModel model = IsisBlobOrClobPanelAbstract.this.getModel();
+ model.setObject(null);
+ target.add(formComponent);
+ target.add(fileNameLabel);
+ }
+ };
+ ajaxLink.setOutputMarkupId(true);
+ formComponent.addOrReplace(ajaxLink);
+
+ final T blobOrClob = getBlobOrClobFromModel();
+ formComponent.get(ID_SCALAR_IF_REGULAR_CLEAR).setVisible(blobOrClob != null && visibility == InputFieldVisibility.VISIBLE);
+ }
+
private MarkupContainer updateDownloadLink(String downloadId, MarkupContainer container) {
final ResourceLink<?> resourceLink = createResourceLink(downloadId);
if(resourceLink != null) {
[13/18] isis git commit: ISIS-537 Replace tabs with spaces. Remove
unused methods.
Posted by da...@apache.org.
ISIS-537 Replace tabs with spaces. Remove unused methods.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/8cbe98e0
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/8cbe98e0
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/8cbe98e0
Branch: refs/heads/master
Commit: 8cbe98e03d58a047a141795e24f44391c2b27a0a
Parents: e858ac5
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu Nov 6 10:53:55 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu Nov 6 10:53:55 2014 +0200
----------------------------------------------------------------------
.../collections/EntityCollectionsPanel.java | 37 ++++++--------------
1 file changed, 10 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/8cbe98e0/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collections/EntityCollectionsPanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collections/EntityCollectionsPanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collections/EntityCollectionsPanel.java
index 6a162f9..f18ba4a 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collections/EntityCollectionsPanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collections/EntityCollectionsPanel.java
@@ -21,8 +21,6 @@ package org.apache.isis.viewer.wicket.ui.components.entity.collections;
import java.util.List;
-import org.apache.wicket.Component;
-import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.repeater.RepeatingView;
@@ -98,8 +96,8 @@ public class EntityCollectionsPanel extends PanelAbstract<EntityModel> {
}
private void addCollectionToForm(final EntityModel entityModel,
- final ObjectAssociation association,
- final WebMarkupContainer collectionRvContainer) {
+ final ObjectAssociation association,
+ final WebMarkupContainer collectionRvContainer) {
final CssClassFacet facet = association.getFacet(CssClassFacet.class);
if(facet != null) {
@@ -108,39 +106,24 @@ public class EntityCollectionsPanel extends PanelAbstract<EntityModel> {
final WebMarkupContainer fieldset = new WebMarkupContainer(ID_COLLECTION_GROUP);
collectionRvContainer.add(fieldset);
- final OneToManyAssociation otma = (OneToManyAssociation) association;
+ final OneToManyAssociation otma = (OneToManyAssociation) association;
+
+ final CollectionPanel collectionPanel = new CollectionPanel(ID_COLLECTION, entityModel, otma);
+
+ labelComponent = collectionPanel.createLabel(ID_COLLECTION_NAME, association.getName());
- final CollectionPanel collectionPanel = new CollectionPanel(ID_COLLECTION, entityModel, otma);
-
- labelComponent = collectionPanel.createLabel(ID_COLLECTION_NAME, association.getName());
-
fieldset.add(labelComponent);
- fieldset.addOrReplace(collectionPanel);
- }
+ fieldset.addOrReplace(collectionPanel);
+ }
private List<ObjectAssociation> visibleCollections(final ObjectAdapter adapter, final ObjectSpecification noSpec) {
return noSpec.getAssociations(Contributed.INCLUDED, visibleCollectionsFilter(adapter));
}
@SuppressWarnings("unchecked")
- private Filter<ObjectAssociation> visibleCollectionsFilter(final ObjectAdapter adapter) {
+ private Filter<ObjectAssociation> visibleCollectionsFilter(final ObjectAdapter adapter) {
return Filters.and(ObjectAssociation.Filters.COLLECTIONS, ObjectAssociation.Filters.dynamicallyVisible(getAuthenticationSession(), adapter, Where.PARENTED_TABLES));
}
- private void requestRepaintPanel(final AjaxRequestTarget target) {
- if (target != null) {
- target.add(this);
- }
- }
-
- private EntityModel getEntityModel() {
- return getModel();
- }
-
- void toViewMode(final AjaxRequestTarget target) {
- getEntityModel().toViewMode();
- requestRepaintPanel(target);
- }
-
}
[10/18] isis git commit: ISIS-537 Add 4px padding at the bottom of
the label when .label-top
Posted by da...@apache.org.
ISIS-537 Add 4px padding at the bottom of the label when .label-top
https://trello.com/c/g3Qj4xcE/106-if-labelat-top-add-a-bit-more-vertical-space-between-label-and-field
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/692adff3
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/692adff3
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/692adff3
Branch: refs/heads/master
Commit: 692adff3d79f0fbc78cf374cd817ce99a6b8cd3d
Parents: c5697ee
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Nov 5 22:55:51 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Nov 5 22:55:51 2014 +0200
----------------------------------------------------------------------
.../org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/692adff3/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 2cde692..081e522 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
@@ -96,6 +96,7 @@ div.label-left label.control-label {
div.label-top label.control-label {
padding-left: 10px;
+ padding-bottom: 4px;
}
div.label-none label.control-label {
[04/18] isis git commit: ISIS-537 Show/Hide the copy link only when
hovering the entity's icon and title
Posted by da...@apache.org.
ISIS-537 Show/Hide the copy link only when hovering the entity's icon and title
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/2fc840fd
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/2fc840fd
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/2fc840fd
Branch: refs/heads/master
Commit: 2fc840fd1822e5d82a73b41473140e3d6bcfdd66
Parents: cf910f3
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Nov 4 23:18:52 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue Nov 4 23:18:52 2014 +0200
----------------------------------------------------------------------
.../ui/components/entity/header/EntityHeaderPanel.html | 2 +-
.../ui/components/widgets/zclip/ZeroClipboardPanel.css | 6 +++++-
.../ui/components/widgets/zclip/ZeroClipboardPanel.html | 2 +-
.../ui/components/widgets/zclip/ZeroClipboardPanel.java | 11 +++++++++--
.../viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js | 12 ++++++++++++
5 files changed, 28 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/2fc840fd/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.html
index 4a20cd7..76d70e6 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.html
@@ -22,7 +22,7 @@
<wicket:panel>
<div class="entityHeaderPanel">
<h4 class="iconAndTitle">
- <div wicket:id="entityIconTitleAndCopylink" class="iconAndTitleLabel">[icon and title]</div>
+ <div wicket:id="entityIconTitleAndCopylink" class="iconAndTitleLabel entityIconTitleAndCopylink">[icon and title]</div>
<div class="entityActions" wicket:id="entityActions"></div>
<div class="clearfix"></div>
</h4>
http://git-wip-us.apache.org/repos/asf/isis/blob/2fc840fd/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.css
index b62e3ba..a4793b9 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.css
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.css
@@ -23,4 +23,8 @@
.zeroClipboardPanel a:hover {
text-decoration: none;
-}
\ No newline at end of file
+}
+
+.copyLink {
+ opacity: 0;
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/2fc840fd/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.html
index 52d1dfd..7f93a49 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.html
@@ -21,7 +21,7 @@
<body>
<wicket:panel>
<a wicket:id="copyLink" href="#" class="copyLink">
- <i class="fa fa-fw fa-link fa-lg"></i>
+ <i class="fa fa-fw fa-link" style="font-size: 1.5em"></i>
</a>
<wicket:remove>
TODO mgrigorov reenable the subscribing link after figuring out what it is.
http://git-wip-us.apache.org/repos/asf/isis/blob/2fc840fd/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.java
index 9dbb70c..1f116df 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.java
@@ -22,6 +22,7 @@ import org.apache.wicket.Page;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.event.IEvent;
+import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.markup.html.link.AbstractLink;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
@@ -37,6 +38,7 @@ import org.apache.isis.viewer.wicket.model.models.PageType;
import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistry;
import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistryAccessor;
import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
+import org.apache.isis.viewer.wicket.ui.panels.PanelUtil;
import org.apache.isis.viewer.wicket.ui.util.Links;
public class ZeroClipboardPanel extends PanelAbstract<EntityModel> {
@@ -72,6 +74,13 @@ public class ZeroClipboardPanel extends PanelAbstract<EntityModel> {
setVisible(renderingHint == EntityModel.RenderingHint.REGULAR && mode == EntityModel.Mode.VIEW);
}
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+
+ PanelUtil.renderHead(response, ZeroClipboardPanel.class);
+ }
+
private AjaxLink<ObjectAdapter> createLink(String linkId) {
return newSimpleClipboardLink(linkId);
}
@@ -175,6 +184,4 @@ public class ZeroClipboardPanel extends PanelAbstract<EntityModel> {
final PageClassRegistryAccessor pcra = (PageClassRegistryAccessor) getApplication();
return pcra.getPageClassRegistry();
}
-
-
}
http://git-wip-us.apache.org/repos/asf/isis/blob/2fc840fd/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js
index b7cf9dd..bff6a9c 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js
@@ -104,6 +104,18 @@ $(function() {
Isis.copyModalShown = false;
}
});
+
+ /**
+ * Show/Hide the copy link only when hovering the entity icon and title
+ */
+ $('.entityIconTitleAndCopylink').hover(
+ function() {
+ $('.copyLink').css({opacity: 1});
+ },
+ function() {
+ $('.copyLink').css({opacity: 0});
+ }
+ );
});
/**
[03/18] isis git commit: ISIS-537 Fix JavaScript for
org.apache.isis.viewer.wicket.ui.components.widgets.cssmenu.AjaxDeferredBehaviour.OpenUrlStrategy#NEW_WINDOW.
It should be wrapped in a function.
Posted by da...@apache.org.
ISIS-537 Fix JavaScript for org.apache.isis.viewer.wicket.ui.components.widgets.cssmenu.AjaxDeferredBehaviour.OpenUrlStrategy#NEW_WINDOW. It should be wrapped in a function.
https://trello.com/c/UYl51kIt/101-todoitem-opensourcecodeongithub-a-no-arg-action-returning-a-java-net-url-does-nothing
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/cf910f3c
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/cf910f3c
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/cf910f3c
Branch: refs/heads/master
Commit: cf910f3c9b7f4d613668cf4e104eb0fd9df3e742
Parents: b97fac4
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Nov 4 22:54:10 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue Nov 4 22:54:10 2014 +0200
----------------------------------------------------------------------
.../ui/components/widgets/cssmenu/AjaxDeferredBehaviour.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/cf910f3c/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/AjaxDeferredBehaviour.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/AjaxDeferredBehaviour.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/AjaxDeferredBehaviour.java
index bc9bb2f..cdf06ca 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/AjaxDeferredBehaviour.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/AjaxDeferredBehaviour.java
@@ -39,7 +39,7 @@ public abstract class AjaxDeferredBehaviour extends AbstractAjaxBehavior {
final RequestCycle requestCycle = deferredBehaviour.getComponent().getRequestCycle();
final UrlRenderer urlRenderer = requestCycle.getUrlRenderer();
String fullUrl = urlRenderer.renderFullUrl(parsedUrl);
- return "Wicket.Event.publish(Isis.Topic.OPEN_IN_NEW_TAB, '" + fullUrl + "');";
+ return "function(){Wicket.Event.publish(Isis.Topic.OPEN_IN_NEW_TAB, '" + fullUrl + "');}";
}
},
SAME_WINDOW {
[09/18] isis git commit: ISIS-537 Reduce event more the vertical
space between the entity properties by copmletely hiding the label when
.label-none.
Posted by da...@apache.org.
ISIS-537 Reduce event more the vertical space between the entity properties by copmletely hiding the label when .label-none.
Remove the top padding (5px) and make the bottom padding 2px bigger (to 7px).
https://trello.com/c/ZaacXqga/105-if-labelat-none-then-remove-the-large-amount-of-vertical-white-space-where-the-label-would-ve-been
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/c5697ee0
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/c5697ee0
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/c5697ee0
Branch: refs/heads/master
Commit: c5697ee02327df4b6f4b4719772535e0a4c36422
Parents: bcd1794
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Nov 5 22:51:31 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Nov 5 22:51:31 2014 +0200
----------------------------------------------------------------------
.../ui/components/entity/properties/EntityPropertiesPanel.css | 3 +--
.../apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/c5697ee0/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesPanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesPanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesPanel.css
index bd6f65a..b46a621 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesPanel.css
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesPanel.css
@@ -17,6 +17,5 @@
* under the License.
*/
.entityPropertiesPanel .property {
- padding-top: 5px;
- padding-bottom: 5px;
+ padding-bottom: 7px;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/c5697ee0/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 64934e8..2cde692 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
@@ -99,8 +99,7 @@ div.label-top label.control-label {
}
div.label-none label.control-label {
- padding-left: 10px;
- visibility: hidden;
+ display: none;
}
div.label-left .scalarValueWrapper {
[12/18] isis git commit: ISIS-537 Disable the resizing of textareas
in modal windows
Posted by da...@apache.org.
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;
}
[06/18] isis git commit: ISIS-537 Use CSS 'visibility' for
showing/hiding the copy link for better IE support
Posted by da...@apache.org.
ISIS-537 Use CSS 'visibility' for showing/hiding the copy link for better IE support
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/21bc20bd
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/21bc20bd
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/21bc20bd
Branch: refs/heads/master
Commit: 21bc20bd016b268b354089696a1895db4568e281
Parents: da9e360
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Nov 5 00:32:49 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Nov 5 00:32:49 2014 +0200
----------------------------------------------------------------------
.../wicket/ui/components/widgets/zclip/ZeroClipboardPanel.css | 2 +-
.../isis/viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/21bc20bd/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.css
index a4793b9..5a90393 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.css
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.css
@@ -26,5 +26,5 @@
}
.copyLink {
- opacity: 0;
+ visibility: hidden;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/21bc20bd/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js
index f502195..c5a734b 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js
@@ -111,10 +111,10 @@ $(function() {
*/
$('.entityIconTitleAndCopylink').hover(
function() {
- $('.copyLink').css({opacity: 1});
+ $('.copyLink').css({visibility: 'visible'});
},
function() {
- $('.copyLink').css({opacity: 0});
+ $('.copyLink').css({visibility: 'hidden'});
}
);
});
[02/18] isis git commit: ISIS-537 Show/hide the CopyLink modal window
with alt+] keyboard combination
Posted by da...@apache.org.
ISIS-537 Show/hide the CopyLink modal window with alt+] keyboard combination
https://trello.com/c/ZothDcdD/102-bug-if-do-alt-twice-in-succession-then-cancel-does-not-remove-the-veil
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/b97fac42
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/b97fac42
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/b97fac42
Branch: refs/heads/master
Commit: b97fac426840fa2d3a9415c45d02ce6a9ca4947c
Parents: 8efdfa0
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Nov 4 22:47:17 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue Nov 4 22:47:17 2014 +0200
----------------------------------------------------------------------
.../widgets/zclip/ZeroClipboardPanel.html | 4 ++--
.../wicket/ui/pages/jquery.isis.wicket.viewer.js | 17 +++++++++++++----
2 files changed, 15 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/b97fac42/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.html
index f4c8857..52d1dfd 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.html
@@ -24,11 +24,11 @@
<i class="fa fa-fw fa-link fa-lg"></i>
</a>
<wicket:remove>
- TODO reenable the subscribing link after figuring out what it is.
+ TODO mgrigorov reenable the subscribing link after figuring out what it is.
Can we have a separate <li></li> for it ?
</wicket:remove>
<!--<a wicket:id="subscribingLink" id="subscribingLink" class="subscribingLink" href="#"> </a>-->
- <div wicket:id="simpleClipboardModalWindow"></div>
+ <div wicket:id="simpleClipboardModalWindow" class="copyModal"></div>
</wicket:panel>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/isis/blob/b97fac42/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js
index 1178319..b7cf9dd 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js
@@ -27,7 +27,8 @@ $(function() {
window.Isis = {
Topic: {
OPEN_IN_NEW_TAB: 'openInNewTab'
- }
+ },
+ copyModalShown: false
};
var isisVeilTimeoutId;
@@ -88,11 +89,19 @@ $(function() {
});
});
-
+ /**
+ * Show/hide the CopyLink modal window with alt+]
+ */
$('body').keydown(function(e) {
- // alt+]
- if(e.which === 221 && e.altKey) {
+ var $copyModal = $('.copyModal');
+
+ if(!Isis.copyModalShown && e.which === 221 && e.altKey) {
+ Isis.copyModalShown = true;
$('.copyLink').click();
+ } else {
+ $copyModal.modal('hide');
+ $('.modal-backdrop').remove();
+ Isis.copyModalShown = false;
}
});
});
[17/18] isis git commit: ISIS-537 Add "registered trademark" to
Powered by in the footer
Posted by da...@apache.org.
ISIS-537 Add "registered trademark" to Powered by in the footer
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/1c17e40d
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/1c17e40d
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/1c17e40d
Branch: refs/heads/master
Commit: 1c17e40df52ae728a26b6556c813dba64c94f6d6
Parents: 33b3125
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu Nov 6 11:48:06 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu Nov 6 11:48:06 2014 +0200
----------------------------------------------------------------------
.../java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/1c17e40d/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.html
index cdc6cf6..b6a0c3b 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.html
@@ -94,7 +94,7 @@
</ul>
<ul class="nav navbar-nav navbar-right">
<p class="navbar-text powered-by">Powered by:</p>
- <li><a href="http://isis.apache.org" target="_blank">Apache Isis</a></li>
+ <li><a href="http://isis.apache.org" target="_blank">Apache Isis ®</a></li>
<li><a wicket:id="aboutLink" class="navbar-right">About</a></li>
<li wicket:id="themePicker"></li>
</ul>
[15/18] isis git commit: ISIS-537 Add an 'edit' icon for
EntityPropertiesPanel
Posted by da...@apache.org.
ISIS-537 Add an 'edit' icon for EntityPropertiesPanel
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/21d008a8
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/21d008a8
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/21d008a8
Branch: refs/heads/master
Commit: 21d008a89061d892fb427d668b64fbfbe3e90b07
Parents: e59364a
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu Nov 6 11:42:04 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu Nov 6 11:42:04 2014 +0200
----------------------------------------------------------------------
.../ui/components/entity/properties/EntityPropertiesForm.java | 1 +
.../ui/components/entity/properties/EntityPropertiesPanel.html | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/21d008a8/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesForm.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesForm.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesForm.java
index 6c8d1b4..cbfe092 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesForm.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesForm.java
@@ -447,6 +447,7 @@ public class EntityPropertiesForm extends FormAbstract<ObjectAdapter> {
});
}
};
+ editButton.add(new Label("editLabel", editButton.getModel()));
markupContainer.add(editButton);
http://git-wip-us.apache.org/repos/asf/isis/blob/21d008a8/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesPanel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesPanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesPanel.html
index f9e8d40..18dfd1d 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesPanel.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesPanel.html
@@ -40,7 +40,7 @@
<span wicket:id="feedback"></span>
</div>
<div class="buttons">
- <input type="submit" class="edit btn btn-primary btn-md" wicket:id="edit"/>
+ <button type="submit" class="edit btn btn-primary btn-md" wicket:id="edit"><span class="fa fa-edit"></span> <wicket:container wicket:id="editLabel"></wicket:container></button>
<input type="submit" class="ok btn btn-primary btn-md" wicket:id="ok"/>
<input type="submit" class="cancel btn btn-default btn-md" wicket:id="cancel"/>
</div>
[08/18] isis git commit: ISIS-537 Remove margin-bottom: 15px;
for .form-group
Posted by da...@apache.org.
ISIS-537 Remove margin-bottom: 15px; for .form-group
https://trello.com/c/ATmCqVEy/104-too-much-vertical-space-between-fields-all-themes
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/bcd1794d
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/bcd1794d
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/bcd1794d
Branch: refs/heads/master
Commit: bcd1794d4f82f68491f710b3ac0285181c0c2884
Parents: c195fa7
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Nov 5 22:36:42 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Nov 5 22:36:42 2014 +0200
----------------------------------------------------------------------
.../entity/properties/EntityPropertiesPanel.css | 10 +++-------
.../entity/properties/EntityPropertiesPanel.java | 9 +++++++++
.../viewer/wicket/ui/pages/bootstrap-overrides.css | 15 +++++++--------
3 files changed, 19 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/bcd1794d/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesPanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesPanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesPanel.css
index 20dfa96..bd6f65a 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesPanel.css
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesPanel.css
@@ -16,11 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-.entityPropertiesPanel fieldset {
- margin: 0px 0px 10px 0px;
- padding:10px 10px 0px 10px;
- border-radius: 4px;
+.entityPropertiesPanel .property {
+ padding-top: 5px;
+ padding-bottom: 5px;
}
-
-.entityPropertiesPanel fieldset legend {
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/bcd1794d/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesPanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesPanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesPanel.java
index fe9366a..ac89613 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesPanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesPanel.java
@@ -19,9 +19,11 @@
package org.apache.isis.viewer.wicket.ui.components.entity.properties;
+import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.viewer.wicket.model.models.EntityModel;
import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
+import org.apache.isis.viewer.wicket.ui.panels.PanelUtil;
/**
* {@link PanelAbstract Panel} representing the properties of an entity, as per
@@ -41,6 +43,13 @@ public class EntityPropertiesPanel extends PanelAbstract<EntityModel> {
form.toViewMode(null);
}
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+
+ PanelUtil.renderHead(response, getClass());
+ }
+
private void buildGui() {
buildEntityPropertiesAndOrCollectionsGui();
setOutputMarkupId(true); // so can repaint via ajax
http://git-wip-us.apache.org/repos/asf/isis/blob/bcd1794d/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 5d9ef09..64934e8 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
@@ -58,12 +58,6 @@
border: none;
}
-/** added here because looks lke EntityPropertiesPanel.css is currently excluded ...? */
-.entityPropertiesPanel .property {
- padding-top: 5px;
- padding-bottom: 5px;
-}
-
.pagination {
margin: 0;
}
@@ -82,7 +76,12 @@ th > a > div > strong {
float: left;
}
-/* Labels on the left START */
+/* Labels on the left/top/none START */
+
+.form-group {
+ margin-bottom: 0;
+}
+
div.label-left.form-group {
width: 100%;
}
@@ -139,4 +138,4 @@ div.label-left .choicesPlaceholder {
vertical-align: -webkit-baseline-middle;
vertical-align: middle;
}
-/* Labels on the right END */
+/* Labels on the left/top/none END */