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/05/11 14:22:22 UTC

[04/11] git commit: ISIS-778: moved html from EntityLinkSelect2Panel...

ISIS-778: moved html from EntityLinkSelect2Panel...

... into ReferencePanel.


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/b5aedd85
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/b5aedd85
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/b5aedd85

Branch: refs/heads/master
Commit: b5aedd8581df39f495d7697faee314592e4af135
Parents: 6ef0b7c
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Sun May 11 13:06:48 2014 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Sun May 11 13:06:48 2014 +0100

----------------------------------------------------------------------
 .../scalars/reference/EntityLinkSelect2Panel.html   | 11 ++---------
 .../scalars/reference/ReferencePanel.html           | 16 +++++++++++++---
 2 files changed, 15 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/b5aedd85/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/EntityLinkSelect2Panel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/EntityLinkSelect2Panel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/EntityLinkSelect2Panel.html
index 4893d6d..7610cf1 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/EntityLinkSelect2Panel.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/EntityLinkSelect2Panel.html
@@ -24,15 +24,8 @@
       lang="en">
 	<body>
 		<wicket:panel>
-			<div class="entityLinkSelect2Panel entityLinkComponentType">
-				<div class="wrapper">
-                    <span class="autoCompletePlaceholder">
-    					<input wicket:id="autoComplete" type="hidden" class="autoComplete" />
-    					<span wicket:id="entityIconAndTitle">[icon and title]</span>
-                    </span>
-				    <div class="clear"/>
-	  			</div>
-			</div>
+            <input wicket:id="autoComplete" type="hidden" class="autoComplete" />
+            <span wicket:id="entityIconAndTitle">[icon and title]</span>
 		</wicket:panel>
 	</body>
 </html>

http://git-wip-us.apache.org/repos/asf/isis/blob/b5aedd85/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.html
index 57dad38..6d39871 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.html
@@ -29,10 +29,20 @@
 				<label for="entityLink" wicket:id="scalarIfRegular" class="scalarIfRegular">
 	      			<span wicket:id="scalarName" class="scalarName">[Label text]</span>
 	      			<span class="scalarValue">
-		      			<span class="entityLink" wicket:id="entityLink">[property or parameter value]</span>
-              			<span wicket:id="feedback"></span>
+                        <span class="entityLink">
+                            <div class="entityLinkSelect2Panel entityLinkComponentType">
+                                <div class="wrapper">
+                                    <span class="autoCompletePlaceholder">
+                                        <span wicket:id="entityLink">
+                                        </span>
+                                    </span>
+                                    <div class="clear"/>
+                                </div>
+                            </div>
+                        </span>
+              			<span wicket:id="feedback"/>
                         <span wicket:id="additionalLinks"/>
-	      			</span>
+                    </span>
 				</label>
 				<label wicket:id="scalarIfCompact" class="scalarIfCompact">
 	      			<span class="scalarValue">