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 2016/02/24 00:40:12 UTC
[09/13] isis git commit: ISIS-993: more sorting out of positioning of
actions in right drop-down.
ISIS-993: more sorting out of positioning of actions in right drop-down.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/0f09648f
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/0f09648f
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/0f09648f
Branch: refs/heads/ISIS-993
Commit: 0f09648fa41b2af52af61d016842aa0102ab251c
Parents: 1841a12
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue Feb 23 20:35:39 2016 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue Feb 23 20:35:39 2016 +0000
----------------------------------------------------------------------
.../AdditionalLinksAsListInlinePanel.html | 1 -
.../components/scalars/ScalarPanelAbstract.html | 2 +-
.../isisapplib/IsisBlobOrClobPanelAbstract.html | 2 +-
.../scalars/primitive/BooleanPanel.html | 2 +-
.../scalars/reference/ReferencePanel.html | 2 +-
.../valuechoices/ValueChoicesSelect2Panel.html | 2 +-
.../wicket/ui/pages/bootstrap-overrides.css | 25 +++++++++++++++++---
7 files changed, 27 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/0f09648f/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksAsListInlinePanel.html
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksAsListInlinePanel.html b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksAsListInlinePanel.html
index f7d8db6..7cc41f1 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksAsListInlinePanel.html
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksAsListInlinePanel.html
@@ -31,7 +31,6 @@
</a>
</li>
</ul>
- <div class="clearfix"/>
</wicket:panel>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/isis/blob/0f09648f/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.html
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.html b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.html
index dcbd683..effea6d 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.html
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.html
@@ -35,11 +35,11 @@
<a wicket:id="editProperty" href="#" class="edit fa fa-pencil-square-o"/>
</span>
</span>
+ <span wicket:id="associatedActionLinksRight" class="associatedActionLinksRight">[drop down]</span>
</div>
<span wicket:id="feedback" class="help-block"></span>
<span wicket:id="associatedActionLinksBelow"></span>
</span>
- <span wicket:id="associatedActionLinksRight" class="associatedActionLinksRight">[drop down]</span>
<div class="clearfix"/>
</div>
<wicket:container wicket:id="scalarIfCompact"></wicket:container>
http://git-wip-us.apache.org/repos/asf/isis/blob/0f09648f/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.html
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.html b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.html
index 92b11a7..cc19d87 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.html
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.html
@@ -41,11 +41,11 @@
<a wicket:id="editProperty" href="#" class="edit fa fa-pencil-square-o"/>
</span>
</span>
+ <span wicket:id="associatedActionLinksRight" class="associatedActionLinksRight">[drop down]</span>
</div>
<span wicket:id="feedback" class="help-block"></span>
<span wicket:id="associatedActionLinksBelow"></span>
</span>
- <span wicket:id="associatedActionLinksRight" class="associatedActionLinksRight">[drop down]</span>
<div class="clearfix"/>
</div>
<span wicket:id="scalarIfCompact">
http://git-wip-us.apache.org/repos/asf/isis/blob/0f09648f/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.html
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.html b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.html
index 8fa08d9..2b4af5f 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.html
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.html
@@ -35,11 +35,11 @@
<a wicket:id="editProperty" href="#" class="edit fa fa-pencil-square-o"/>
</span>
</span>
+ <span wicket:id="associatedActionLinksRight" class="associatedActionLinksRight"></span>
</div>
<span wicket:id="feedback" class="help-block"></span>
<span wicket:id="associatedActionLinksBelow"></span>
</span>
- <span wicket:id="associatedActionLinksRight" class="associatedActionLinksRight"></span>
<div class="clearfix"/>
</div>
<input type="checkbox" wicket:id="scalarIfCompact" />
http://git-wip-us.apache.org/repos/asf/isis/blob/0f09648f/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 cfc0ace..f85dbcb 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
@@ -41,11 +41,11 @@
</span>
</span>
</span>
+ <span wicket:id="associatedActionLinksRight" class="associatedActionLinksRight"></span>
</div>
<span wicket:id="feedback" class="help-block"></span>
<span wicket:id="associatedActionLinksBelow"></span>
</span>
- <span wicket:id="associatedActionLinksRight" class="associatedActionLinksRight"></span>
<div class="clearfix"/>
</div>
<div wicket:id="scalarIfCompact" class="scalarIfCompact">
http://git-wip-us.apache.org/repos/asf/isis/blob/0f09648f/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.html
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.html b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.html
index 7971e56..0874436 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.html
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.html
@@ -35,11 +35,11 @@
<a wicket:id="editProperty" href="#" class="edit fa fa-pencil-square-o"/>
</span>
</span>
+ <span wicket:id="associatedActionLinksRight" class="associatedActionLinksRight"></span>
</div>
<span wicket:id="feedback" class="help-block"></span>
<span wicket:id="associatedActionLinksBelow"></span>
</span>
- <span wicket:id="associatedActionLinksRight" class="associatedActionLinksRight"></span>
<div class="clearfix"/>
</div>
<span wicket:id="scalarIfCompact"></span>
http://git-wip-us.apache.org/repos/asf/isis/blob/0f09648f/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 4d7458f..729917e 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
@@ -554,7 +554,7 @@ div.label-left .scalarValueWrapper {
}
div.label-left.actions-right .scalarValueWrapper {
- width: 62%;
+ /*width: 62%;*/
}
.actions-right .additionalLinkListDropDown {
@@ -787,11 +787,30 @@ tr.headers th form input {
}
.associatedActionLinksRight .additionalLinkListDropDown {
- padding-right: 10px;
+ padding-right: 11px;
}
.editing .edit {
padding-top: 2px;
float: right;
margin-bottom: 10px;
-}
\ No newline at end of file
+}
+
+.actions-right .scalarPlaceholder .scalarValueInput {
+ width: 90%;
+ float: left;
+}
+
+.actions-right .additionalLinkListInline {
+ margin-top: -22px;
+}
+
+.booleanPanel .actions-right .additionalLinkListInline {
+ margin-top: 0px;
+}
+
+.referencePanel .actions-right .additionalLinkListInline,
+.isisBlobPanel .actions-right .additionalLinkListInline {
+ margin-top: 5px;
+}
+