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/04/27 12:33:12 UTC
[26/35] isis git commit: ISIS-1603: fixes the rendering of the icon
for reference panel which are editable.
ISIS-1603: fixes the rendering of the icon for reference panel which are editable.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/4fdfc251
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/4fdfc251
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/4fdfc251
Branch: refs/heads/ISIS-1603
Commit: 4fdfc2519a49dbdf293475524f4694abeab653b2
Parents: ea613a9
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Apr 27 13:03:43 2017 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Apr 27 13:26:40 2017 +0100
----------------------------------------------------------------------
.../scalars/reference/ReferencePanel.html | 16 +++++++++-------
.../scalars/reference/ReferencePanel.java | 7 ++++++-
.../valuechoices/ValueChoicesSelect2Panel.java | 1 -
.../viewer/wicket/ui/pages/bootstrap-overrides.css | 10 ++++++++--
4 files changed, 23 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/4fdfc251/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.html
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.html b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.html
index 675ffab..a3e96eb 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.html
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.html
@@ -44,13 +44,6 @@
<span class="scalarValueInput">
<span class="editing">
- <a href="#"
- name="scalarValueInlinePromptLink"
- class="form-control input-sm scalarValueInlinePromptLink"
- wicket:id="scalarValueInlinePromptLink">
- <span wicket:id="scalarValueInlinePromptLabel"></span>
- </a>
-
<span class="autoCompletePlaceholder">
<span wicket:id="entityLink">link or drop down</span>
<span wicket:id="entityIconAndTitle">[icon and title]</span>
@@ -60,6 +53,15 @@
<a href="#"
class="edit fa fa-pencil-square-o"
wicket:id="editProperty"></a>
+
+ <a href="#"
+ name="scalarValueInlinePromptLink"
+ class="form-control input-sm scalarValueInlinePromptLink"
+ wicket:id="scalarValueInlinePromptLink">
+ <span wicket:id="scalarValueInlinePromptLabel"></span>
+ </a>
+
+
</span>
</span>
</span>
http://git-wip-us.apache.org/repos/asf/isis/blob/4fdfc251/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
index abe0f34..a600b68 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
@@ -26,7 +26,6 @@ import com.google.common.collect.Lists;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
-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.model.IModel;
@@ -37,6 +36,7 @@ import org.apache.wicket.validation.ValidationError;
import org.wicketstuff.select2.ChoiceProvider;
import org.wicketstuff.select2.Settings;
+import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager.ConcurrencyChecking;
@@ -57,6 +57,7 @@ import org.apache.isis.viewer.wicket.ui.components.widgets.select2.providers.Obj
import org.apache.isis.viewer.wicket.ui.components.widgets.select2.providers.ObjectAdapterMementoProviderForReferenceObjectAutoComplete;
import org.apache.isis.viewer.wicket.ui.components.widgets.select2.providers.ObjectAdapterMementoProviderForReferenceParamOrPropertyAutoComplete;
import org.apache.isis.viewer.wicket.ui.util.Components;
+import org.apache.isis.viewer.wicket.ui.util.CssClassAppender;
/**
* Panel for rendering scalars which of are of reference type (as opposed to
@@ -280,6 +281,10 @@ public class ReferencePanel extends ScalarPanelSelect2Abstract implements PanelW
final ComponentFactory componentFactory =
getComponentFactoryRegistry().findComponentFactory(ComponentType.ENTITY_ICON_AND_TITLE, entityModelForLink);
final Component component = componentFactory.createComponent(ComponentType.ENTITY_ICON_AND_TITLE.getWicketId(), entityModelForLink);
+ if(scalarModel.getPromptStyle() == PromptStyle.INLINE) {
+ // bit of a hack... allows us to suppress the title using CSS
+ component.add(new CssClassAppender("inlinePrompt"));
+ }
componentForRegular.addOrReplace(component);
http://git-wip-us.apache.org/repos/asf/isis/blob/4fdfc251/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2Panel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2Panel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2Panel.java
index ea5ce37..6c46b4d 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2Panel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2Panel.java
@@ -189,7 +189,6 @@ public class ValueChoicesSelect2Panel extends ScalarPanelSelect2Abstract impleme
return scalarModel;
}
-
@com.google.inject.Inject
WicketViewerSettings wicketViewerSettings;
http://git-wip-us.apache.org/repos/asf/isis/blob/4fdfc251/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
index c307f05..7001b98 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
@@ -884,9 +884,15 @@ tr.headers th form input {
.referencePanel .form-control.scalarValueInlinePromptLink {
display: inline-block;
- width: 50%;
+ width: 90%;
}
.referencePanel div.label-left .scalarValueWrapper .form-control.scalarValueInlinePromptLink {
- width: 50%;
+ width: 90%;
+}
+.referencePanel .inlinePrompt .entityIconAndTitlePanel .entityImage {
+ margin-right: 10px;
+}
+.referencePanel .inlinePrompt .entityIconAndTitlePanel .entityTitle {
+ display: none;
}