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/03/25 07:59:53 UTC
[06/15] isis git commit: ISIS-1340: removing the
HideMixinsForHomePage (as per ISIS-1343, this implementation will end up
being invalid, so don't want it in the archetype polluting people's apps);
instead use the layout.xml to hide the actions.
ISIS-1340: removing the HideMixinsForHomePage (as per ISIS-1343, this implementation will end up being invalid, so don't want it in the archetype polluting people's apps); instead use the layout.xml to hide the actions.
Also:
- improve CSS for top-level actions when they are visible
- removing action from SimpleObject.layout.xml (removed in code a while back).
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/d7ed3521
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/d7ed3521
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/d7ed3521
Branch: refs/heads/master
Commit: d7ed3521cae6289a03fba4db28154549a8277cec
Parents: 654bfd5
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue Mar 22 23:53:25 2016 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Mar 25 06:35:58 2016 +0000
----------------------------------------------------------------------
.../wicket/ui/pages/bootstrap-overrides.css | 5 ++
.../homepage/HomePageViewModel.layout.xml | 5 ++
.../prototyping/HideMixinsForHomePage.java | 53 --------------------
.../dom/simple/SimpleObject.layout.xml | 4 +-
4 files changed, 11 insertions(+), 56 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/d7ed3521/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 e46598d..e6cfa3e 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
@@ -821,4 +821,9 @@ tr.headers th form input {
width: 100%;
margin: 5px;
padding: 5px;
+}
+
+.entityHeaderPanel .entityActions ul.additionalLinkList li.additionalLinkItem {
+ padding-top: 3px;
+ padding-bottom: 7px;
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/d7ed3521/example/application/simpleapp/app/src/main/java/domainapp/app/services/homepage/HomePageViewModel.layout.xml
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/app/src/main/java/domainapp/app/services/homepage/HomePageViewModel.layout.xml b/example/application/simpleapp/app/src/main/java/domainapp/app/services/homepage/HomePageViewModel.layout.xml
index e2a907d..f743828 100644
--- a/example/application/simpleapp/app/src/main/java/domainapp/app/services/homepage/HomePageViewModel.layout.xml
+++ b/example/application/simpleapp/app/src/main/java/domainapp/app/services/homepage/HomePageViewModel.layout.xml
@@ -25,6 +25,8 @@
<bs3:col span="12" unreferencedActions="true">
<domainObject/>
<action id="clearHints" hidden="EVERYWHERE"/>
+ <action id="downloadLayoutXml" hidden="EVERYWHERE"/>
+ <action id="rebuildMetamodel" hidden="EVERYWHERE"/>
</bs3:col>
</bs3:row>
</bs3:col>
@@ -37,6 +39,9 @@
</bs3:col>
</bs3:row>
<bs3:row>
+
+ </bs3:row>
+ <bs3:row>
<bs3:col span="0">
<fieldSet name="General" id="general" unreferencedProperties="true"/>
</bs3:col>
http://git-wip-us.apache.org/repos/asf/isis/blob/d7ed3521/example/application/simpleapp/app/src/main/java/domainapp/app/services/prototyping/HideMixinsForHomePage.java
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/app/src/main/java/domainapp/app/services/prototyping/HideMixinsForHomePage.java b/example/application/simpleapp/app/src/main/java/domainapp/app/services/prototyping/HideMixinsForHomePage.java
deleted file mode 100644
index 6e4acc1..0000000
--- a/example/application/simpleapp/app/src/main/java/domainapp/app/services/prototyping/HideMixinsForHomePage.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * 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.
- */
-package domainapp.app.services.prototyping;
-
-import java.util.List;
-
-import com.google.common.eventbus.Subscribe;
-
-import org.apache.isis.applib.AbstractSubscriber;
-import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.NatureOfService;
-import org.apache.isis.applib.services.layout.Object_downloadLayoutXml;
-import org.apache.isis.applib.services.layout.Object_rebuildMetamodel;
-
-import domainapp.app.services.homepage.HomePageViewModel;
-
-@DomainService(
- nature = NatureOfService.DOMAIN
-)
-public class HideMixinsForHomePage extends AbstractSubscriber{
-
- @Subscribe
- public void on(Object_rebuildMetamodel.ActionDomainEvent ev) {
- final List<Object> arguments = ev.getArguments();
- if(arguments.get(0) instanceof HomePageViewModel) {
- ev.hide();
- }
- }
-
- @Subscribe
- public void on(Object_downloadLayoutXml.ActionDomainEvent ev) {
- final List<Object> arguments = ev.getArguments();
- if(arguments.get(0) instanceof HomePageViewModel) {
- ev.hide();
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/d7ed3521/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 49fe8af..c0c6d14 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
@@ -32,9 +32,7 @@
<bs3:col span="12">
<c:fieldSet name="Name">
<c:action id="delete"/>
- <c:property id="name" namedEscaped="true">
- <c:action id="updateName" position="BELOW"/>
- </c:property>
+ <c:property id="name" namedEscaped="true"/>
</c:fieldSet>
</bs3:col>
</bs3:row>