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/02 01:36:02 UTC
[05/15] isis git commit: ISIS-993: bootstrap3 layout working,
more or less. Still need to do the normalization phase.
http://git-wip-us.apache.org/repos/asf/isis/blob/c57d8cd8/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 d03b88b..4d6bd0f 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
@@ -33,6 +33,7 @@
<span wicket:id="associatedActionLinksBelow"></span>
</span>
<span wicket:id="associatedActionLinksRight"></span>
+ <div class="clearfix"/>
</div>
<wicket:container wicket:id="scalarIfCompact"></wicket:container>
</div>
@@ -44,7 +45,6 @@
<wicket:fragment wicket:id="compactAsSpan">
<span wicket:id="scalarIfCompact"></span>
</wicket:fragment>
-
</wicket:panel>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/isis/blob/c57d8cd8/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 235b356..43c615d 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
@@ -484,6 +484,8 @@ div.additionalLinkList {
+.col .additionalLinks,
+.col .additionalLinksAndSelectorDropDown,
.entityPropertiesPanel .additionalLinks,
.entityCollectionsPanel .additionalLinksAndSelectorDropDown {
margin-top: -4px;
@@ -750,6 +752,6 @@ tr.headers th form input {
padding-bottom: 10px;
}
-.entityPage .middleColumn .tabbable {
+.tabbable {
padding-bottom: 10px;
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/c57d8cd8/example/application/simpleapp/dom/src/main/java/domainapp/dom/simple/SimpleObject.layout-BS3.xml
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/dom/src/main/java/domainapp/dom/simple/SimpleObject.layout-BS3.xml b/example/application/simpleapp/dom/src/main/java/domainapp/dom/simple/SimpleObject.layout-BS3.xml
deleted file mode 100644
index 1697575..0000000
--- a/example/application/simpleapp/dom/src/main/java/domainapp/dom/simple/SimpleObject.layout-BS3.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<bs3:page xsi:schemaLocation="http://isis.apache.org/schema/applib/layout/common http://isis.apache.org/schema/applib/layout/common/common.xsd http://isis.apache.org/schema/applib/layout/bootstrap3 http://isis.apache.org/schema/applib/layout/bootstrap3/bootstrap3.xsd" xmlns:c="http://isis.apache.org/schema/applib/layout/common" xmlns:bs3="http://isis.apache.org/schema/applib/layout/bootstrap3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <bs3:row>
- <bs3:col span="12">
- <c:domainObject/>
- <c:action id="delete"/>
- </bs3:col>
- </bs3:row>
-
- <bs3:row>
- <bs3:col span="12">
- <bs3:tabGroup>
- <bs3:tab name="Metadata">
- <bs3:row>
- <bs3:col span="7">
- <c:fieldSet name="General">
- <c:action id="downloadJdoMetadata" position="PANEL"/>
- <c:action id="downloadLayoutXml" position="PANEL_DROPDOWN"/>
- <c:property id="name" labelPosition="TOP">
- <c:action id="updateName">
- <c:describedAs>This allows the name to be updated</c:describedAs>
- </c:action>
- </c:property>
- </c:fieldSet>
- </bs3:col>
- </bs3:row>
- </bs3:tab>
- </bs3:tabGroup>
- <bs3:tabGroup>
- <bs3:tab name="SimilarTo">
- <bs3:row>
- <bs3:col span="12">
- <c:collection id="similarTo" defaultView="table"/>
- <c:collection id="others" defaultView="hide"/>
- </bs3:col>
- </bs3:row>
- </bs3:tab>
- </bs3:tabGroup>
- </bs3:col>
- </bs3:row>
-</bs3:page>
http://git-wip-us.apache.org/repos/asf/isis/blob/c57d8cd8/example/application/simpleapp/dom/src/main/java/domainapp/dom/simple/SimpleObject.layout-FC.xml
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/dom/src/main/java/domainapp/dom/simple/SimpleObject.layout-FC.xml b/example/application/simpleapp/dom/src/main/java/domainapp/dom/simple/SimpleObject.layout-FC.xml
new file mode 100644
index 0000000..da9fc4c
--- /dev/null
+++ b/example/application/simpleapp/dom/src/main/java/domainapp/dom/simple/SimpleObject.layout-FC.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<page xsi:schemaLocation="http://isis.apache.org/schema/applib/layout/common http://isis.apache.org/schema/applib/layout/common/common.xsd http://isis.apache.org/schema/applib/layout/fixedcols http://isis.apache.org/schema/applib/layout/fixedcols/fixedcols.xsd" xmlns="http://isis.apache.org/schema/applib/layout/fixedcols" xmlns:c="http://isis.apache.org/schema/applib/layout/common" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+
+ <left span="0">
+ </left>
+ <tabGroup>
+ <tab name="Properties">
+ <left span="8">
+ <c:fieldSet name="General">
+ <c:action id="delete"/>
+ <c:property id="name" labelPosition="TOP">
+ <c:action id="updateName">
+ <c:describedAs>This allows the name to be updated</c:describedAs>
+ </c:action>
+ </c:property>
+ </c:fieldSet>
+ </left>
+ <middle span="4">
+ <c:fieldSet name="Foo">
+ <c:action id="downloadJdoMetadata" position="PANEL"/>
+ <c:action id="downloadLayoutXml" position="PANEL"/>
+ <c:property id="versionSequence"/>
+ </c:fieldSet>
+ </middle>
+ </tab>
+ </tabGroup>
+ <tabGroup>
+ <tab name="Collections">
+ <left span="6">
+ <c:collection id="similarTo" defaultView="table"/>
+ </left>
+ <right span="6">
+ <c:collection id="others" defaultView="table"/>
+ </right>
+ </tab>
+ </tabGroup>
+</page>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/c57d8cd8/example/application/simpleapp/dom/src/main/java/domainapp/dom/simple/SimpleObject.layout.xml
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/dom/src/main/java/domainapp/dom/simple/SimpleObject.layout.xml b/example/application/simpleapp/dom/src/main/java/domainapp/dom/simple/SimpleObject.layout.xml
index da9fc4c..482f6fa 100644
--- a/example/application/simpleapp/dom/src/main/java/domainapp/dom/simple/SimpleObject.layout.xml
+++ b/example/application/simpleapp/dom/src/main/java/domainapp/dom/simple/SimpleObject.layout.xml
@@ -1,38 +1,64 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<page xsi:schemaLocation="http://isis.apache.org/schema/applib/layout/common http://isis.apache.org/schema/applib/layout/common/common.xsd http://isis.apache.org/schema/applib/layout/fixedcols http://isis.apache.org/schema/applib/layout/fixedcols/fixedcols.xsd" xmlns="http://isis.apache.org/schema/applib/layout/fixedcols" xmlns:c="http://isis.apache.org/schema/applib/layout/common" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<bs3:page xsi:schemaLocation="http://isis.apache.org/schema/applib/layout/common http://isis.apache.org/schema/applib/layout/common/common.xsd http://isis.apache.org/schema/applib/layout/bootstrap3 http://isis.apache.org/schema/applib/layout/bootstrap3/bootstrap3.xsd" xmlns:c="http://isis.apache.org/schema/applib/layout/common" xmlns:bs3="http://isis.apache.org/schema/applib/layout/bootstrap3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <bs3:row cssClass="bishbosh">
+ <bs3:col span="8">
+ <c:domainObject/>
+ </bs3:col>
+ <bs3:col span="4" cssClass="foobar">
+ </bs3:col>
+ </bs3:row>
- <left span="0">
- </left>
- <tabGroup>
- <tab name="Properties">
- <left span="8">
- <c:fieldSet name="General">
- <c:action id="delete"/>
- <c:property id="name" labelPosition="TOP">
- <c:action id="updateName">
- <c:describedAs>This allows the name to be updated</c:describedAs>
- </c:action>
- </c:property>
- </c:fieldSet>
- </left>
- <middle span="4">
- <c:fieldSet name="Foo">
- <c:action id="downloadJdoMetadata" position="PANEL"/>
- <c:action id="downloadLayoutXml" position="PANEL"/>
- <c:property id="versionSequence"/>
- </c:fieldSet>
- </middle>
- </tab>
- </tabGroup>
- <tabGroup>
- <tab name="Collections">
- <left span="6">
- <c:collection id="similarTo" defaultView="table"/>
- </left>
- <right span="6">
- <c:collection id="others" defaultView="table"/>
- </right>
- </tab>
- </tabGroup>
-</page>
\ No newline at end of file
+ <bs3:row>
+ <bs3:col span="12">
+ <bs3:tabGroup>
+ <bs3:tab name="Metadata">
+ <bs3:row>
+ <bs3:col span="12">
+ <c:fieldSet name="Metadata">
+ <c:action id="downloadJdoMetadata" position="PANEL"/>
+ <c:action id="downloadLayoutXml" position="PANEL_DROPDOWN"/>
+ <c:property id="versionSequence">
+ </c:property>
+ </c:fieldSet>
+ </bs3:col>
+ <bs3:col span="6">
+ <c:fieldSet name="Xxx">
+ <c:property id="name" labelPosition="TOP">
+ <c:action id="updateName">
+ <c:describedAs>This allows the name to be updated</c:describedAs>
+ </c:action>
+ </c:property>
+ </c:fieldSet>
+ </bs3:col>
+ <bs3:col span="6">
+ <c:fieldSet name="Xxx">
+ <c:property id="name" labelPosition="TOP">
+ <c:action id="updateName">
+ <c:describedAs>This allows the name to be updated</c:describedAs>
+ </c:action>
+ </c:property>
+ </c:fieldSet>
+ </bs3:col>
+ </bs3:row>
+ </bs3:tab>
+ </bs3:tabGroup>
+ <bs3:tabGroup>
+ <bs3:tab name="SimilarTo">
+ <bs3:row>
+ <bs3:col span="12">
+ <c:collection id="similarTo" defaultView="table"/>
+ </bs3:col>
+ </bs3:row>
+ </bs3:tab>
+ <bs3:tab name="Others">
+ <bs3:row>
+ <bs3:col span="12">
+ <c:collection id="others" defaultView="hide"/>
+ </bs3:col>
+ </bs3:row>
+ </bs3:tab>
+ </bs3:tabGroup>
+ </bs3:col>
+ </bs3:row>
+</bs3:page>