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/12/05 16:23:30 UTC
[07/11] isis git commit: ISIS-964: okay, just about there I think
ISIS-964: okay, just about there I think
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/1e17f118
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/1e17f118
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/1e17f118
Branch: refs/heads/master
Commit: 1e17f118ffa973f252a047a3f65d519fd70a5872
Parents: 452d927
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Dec 5 11:41:12 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Dec 5 11:41:12 2014 +0000
----------------------------------------------------------------------
.../AdditionalLinksAsDropDownPanel.html | 2 +-
.../collections/EntityCollectionsPanel.java | 5 ++
.../wicket/ui/pages/bootstrap-overrides.css | 2 +-
.../actions/layout/ActionLayoutFactory.java | 55 +++++++++++++++++-
.../layout/CollectionLayoutFactory.java | 54 +++++++++++++++++-
...ltiLineFacetForPropertyLayoutAnnotation.java | 2 +-
...LineFacetOnPropertyFromLayoutProperties.java | 2 +-
.../layout/PropertyLayoutFactory.java | 48 ++++++++++++++++
.../webapp/src/main/webapp/css/application.css | 52 -----------------
.../src/main/java/dom/todo/ToDoItem.layout.json | 9 +--
.../src/main/webapp/WEB-INF/isis.properties | 2 +-
.../webapp/src/main/webapp/css/application.css | 60 +-------------------
12 files changed, 169 insertions(+), 124 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/1e17f118/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksAsDropDownPanel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksAsDropDownPanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksAsDropDownPanel.html
index 3667116..18a716c 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksAsDropDownPanel.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksAsDropDownPanel.html
@@ -29,7 +29,7 @@
<button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
<span class="fa fa-ellipsis-v"></span>
</button>
- <ul class="dropdown-menu" role="menu">
+ <ul class="dropdown-menu dropdown-menu-right" role="menu">
<li wicket:id="additionalLinkItem" class="additionalLinkItem">
<a href="#" wicket:id="additionalLink">
<span wicket:id="additionalLinkFontAwesome"></span>
http://git-wip-us.apache.org/repos/asf/isis/blob/1e17f118/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collections/EntityCollectionsPanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collections/EntityCollectionsPanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collections/EntityCollectionsPanel.java
index 04a669e..90a46ce 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collections/EntityCollectionsPanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collections/EntityCollectionsPanel.java
@@ -20,6 +20,7 @@
package org.apache.isis.viewer.wicket.ui.components.entity.collections;
import java.util.List;
+import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.repeater.RepeatingView;
@@ -118,6 +119,10 @@ public class EntityCollectionsPanel extends PanelAbstract<EntityModel> {
fieldset.addOrReplace(collectionPanel);
Label labelComponent = collectionPanel.createLabel(ID_COLLECTION_NAME, association.getName());
+ final String description = association.getDescription();
+ if(description != null) {
+ labelComponent.add(new AttributeAppender("title", Model.of(description)));
+ }
fieldset.add(labelComponent);
http://git-wip-us.apache.org/repos/asf/isis/blob/1e17f118/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
index 09e1cea..cd7bc8a 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
@@ -549,7 +549,7 @@ div.label-left.actions-right .scalarValueWrapper {
div.label-top .scalarValueWrapper,
div.label-none .scalarValueWrapper {
- width: 99%;
+ width: 99.5%;
display: block;
padding-left: 8px;
padding-right: 20px;
http://git-wip-us.apache.org/repos/asf/isis/blob/1e17f118/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionLayoutFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionLayoutFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionLayoutFactory.java
index da33d7f..725d3c4 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionLayoutFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionLayoutFactory.java
@@ -25,6 +25,7 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facets.Annotations;
+import org.apache.isis.core.metamodel.facets.ContributeeMemberFacetFactory;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.actions.position.ActionPositionFacet;
import org.apache.isis.core.metamodel.facets.actions.position.ActionPositionFacetFallback;
@@ -36,7 +37,7 @@ import org.apache.isis.core.metamodel.facets.members.cssclass.CssClassFacet;
import org.apache.isis.core.metamodel.facets.members.cssclassfa.CssClassFaFacet;
-public class ActionLayoutFactory extends FacetFactoryAbstract {
+public class ActionLayoutFactory extends FacetFactoryAbstract implements ContributeeMemberFacetFactory {
public ActionLayoutFactory() {
super(FeatureType.ACTIONS_ONLY);
@@ -101,7 +102,7 @@ public class ActionLayoutFactory extends FacetFactoryAbstract {
actionPositionFacet = ActionPositionFacetForActionLayoutAnnotation.create(actionLayout, holder);
}
if(actionPositionFacet == null) {
- actionPositionFacet = new ActionPositionFacetFallback(processMethodContext.getFacetHolder());
+ actionPositionFacet = new ActionPositionFacetFallback(holder);
}
FacetUtil.addFacet(actionPositionFacet);
@@ -114,4 +115,54 @@ public class ActionLayoutFactory extends FacetFactoryAbstract {
FacetUtil.addFacet(prototypeFacet);
}
+ @Override
+ public void process(ProcessContributeeMemberContext processMemberContext) {
+ final FacetHolder holder = processMemberContext.getFacetHolder();
+
+ Properties properties = processMemberContext.metadataProperties("actionLayout");
+ if (properties == null) {
+ // alternate key
+ properties = processMemberContext.metadataProperties("layout");
+ }
+
+
+ // cssClass
+ CssClassFacet cssClassFacet = CssClassFacetOnActionFromLayoutProperties.create(properties, holder);
+ FacetUtil.addFacet(cssClassFacet);
+
+
+ // cssClassFa
+ CssClassFaFacet cssClassFaFacet = CssClassFaFacetOnActionFromLayoutProperties.create(properties, holder);
+ FacetUtil.addFacet(cssClassFaFacet);
+
+
+ // describedAs
+ DescribedAsFacet describedAsFacet = DescribedAsFacetOnActionFromLayoutProperties.create(properties, holder);
+ FacetUtil.addFacet(describedAsFacet);
+
+
+ // hidden
+ HiddenFacet hiddenFacet = HiddenFacetOnActionFromLayoutProperties.create(properties, holder);
+ FacetUtil.addFacet(hiddenFacet);
+
+
+ // named
+ NamedFacet namedFacet = NamedFacetOnActionFromLayoutProperties.create(properties, holder);
+ FacetUtil.addFacet(namedFacet);
+
+
+ // position
+ ActionPositionFacet actionPositionFacet = ActionPositionFacetOnActionFromLayoutProperties.create(properties, holder);
+ if(actionPositionFacet == null) {
+ actionPositionFacet = new ActionPositionFacetFallback(holder);
+ }
+ FacetUtil.addFacet(actionPositionFacet);
+
+
+ // prototype
+ PrototypeFacet prototypeFacet = PrototypeFacetOnActionFromLayoutProperties.create(properties, holder);
+ FacetUtil.addFacet(prototypeFacet);
+
+ }
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/1e17f118/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/CollectionLayoutFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/CollectionLayoutFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/CollectionLayoutFactory.java
index 9f783cc..236649e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/CollectionLayoutFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/CollectionLayoutFactory.java
@@ -25,6 +25,7 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facets.Annotations;
+import org.apache.isis.core.metamodel.facets.ContributeeMemberFacetFactory;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.all.describedas.DescribedAsFacet;
import org.apache.isis.core.metamodel.facets.all.hide.HiddenFacet;
@@ -33,11 +34,9 @@ import org.apache.isis.core.metamodel.facets.collections.sortedby.SortedByFacet;
import org.apache.isis.core.metamodel.facets.members.cssclass.CssClassFacet;
import org.apache.isis.core.metamodel.facets.members.render.RenderFacet;
import org.apache.isis.core.metamodel.facets.object.paged.PagedFacet;
-import org.apache.isis.core.metamodel.facets.properties.layout.TypicalLengthFacetForPropertyLayoutAnnotation;
-import org.apache.isis.core.metamodel.facets.properties.layout.TypicalLengthFacetOnPropertyFromLayoutProperties;
-public class CollectionLayoutFactory extends FacetFactoryAbstract {
+public class CollectionLayoutFactory extends FacetFactoryAbstract implements ContributeeMemberFacetFactory {
public CollectionLayoutFactory() {
super(FeatureType.COLLECTIONS_ONLY);
@@ -113,5 +112,54 @@ public class CollectionLayoutFactory extends FacetFactoryAbstract {
}
+ @Override
+ public void process(ProcessContributeeMemberContext processMemberContext) {
+
+ final FacetHolder holder = processMemberContext.getFacetHolder();
+
+ Properties properties = processMemberContext.metadataProperties("collectionLayout");
+ if(properties == null) {
+ // alternate key
+ properties = processMemberContext.metadataProperties("layout");
+ }
+
+
+ // cssClass
+ CssClassFacet cssClassFacet = CssClassFacetOnCollectionFromLayoutProperties.create(properties, holder);
+ FacetUtil.addFacet(cssClassFacet);
+
+
+ // describedAs
+ DescribedAsFacet describedAsFacet = DescribedAsFacetOnCollectionFromLayoutProperties.create(properties, holder);
+ FacetUtil.addFacet(describedAsFacet);
+
+
+ // hidden
+ HiddenFacet hiddenFacet = HiddenFacetOnCollectionFromLayoutProperties.create(properties, holder);
+ FacetUtil.addFacet(hiddenFacet);
+
+
+ // named
+ NamedFacet namedFacet = NamedFacetOnCollectionFromLayoutProperties.create(properties, holder);
+ FacetUtil.addFacet(namedFacet);
+
+
+ // paged
+ PagedFacet pagedFacet = PagedFacetOnCollectionFromLayoutProperties.create(properties, holder);
+ FacetUtil.addFacet(pagedFacet);
+
+
+ // renderType
+ RenderFacet renderFacet = RenderFacetOnCollectionFromLayoutProperties.create(properties, holder);
+ FacetUtil.addFacet(renderFacet);
+
+
+ // sortedBy
+ SortedByFacet sortedByFacet = SortedByFacetOnCollectionFromLayoutProperties.create(properties, holder);
+ FacetUtil.addFacet(sortedByFacet);
+
+
+ }
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/1e17f118/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/layout/MultiLineFacetForPropertyLayoutAnnotation.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/layout/MultiLineFacetForPropertyLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/layout/MultiLineFacetForPropertyLayoutAnnotation.java
index 99b401f..e043092 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/layout/MultiLineFacetForPropertyLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/layout/MultiLineFacetForPropertyLayoutAnnotation.java
@@ -31,7 +31,7 @@ public class MultiLineFacetForPropertyLayoutAnnotation extends MultiLineFacetAbs
return null;
}
final int multiLine = propertyLayout.multiLine();
- return multiLine != -1 ? new MultiLineFacetForPropertyLayoutAnnotation(multiLine, false, holder) : null;
+ return multiLine > 1 ? new MultiLineFacetForPropertyLayoutAnnotation(multiLine, false, holder) : null;
}
private MultiLineFacetForPropertyLayoutAnnotation(int numberOfLines, boolean preventWrapping, FacetHolder holder) {
http://git-wip-us.apache.org/repos/asf/isis/blob/1e17f118/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/layout/MultiLineFacetOnPropertyFromLayoutProperties.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/layout/MultiLineFacetOnPropertyFromLayoutProperties.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/layout/MultiLineFacetOnPropertyFromLayoutProperties.java
index e1516df..17682f0 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/layout/MultiLineFacetOnPropertyFromLayoutProperties.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/layout/MultiLineFacetOnPropertyFromLayoutProperties.java
@@ -29,7 +29,7 @@ public class MultiLineFacetOnPropertyFromLayoutProperties extends MultiLineFacet
public static MultiLineFacet create(Properties properties, FacetHolder holder) {
final int multiLine = multiLine(properties);
- return multiLine != -1? new MultiLineFacetOnPropertyFromLayoutProperties(multiLine, holder): null;
+ return multiLine > 1? new MultiLineFacetOnPropertyFromLayoutProperties(multiLine, holder): null;
}
private MultiLineFacetOnPropertyFromLayoutProperties(int multiLine, FacetHolder holder) {
http://git-wip-us.apache.org/repos/asf/isis/blob/1e17f118/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/layout/PropertyLayoutFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/layout/PropertyLayoutFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/layout/PropertyLayoutFactory.java
index 09a0f3e..d51458f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/layout/PropertyLayoutFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/layout/PropertyLayoutFactory.java
@@ -122,6 +122,54 @@ public class PropertyLayoutFactory extends FacetFactoryAbstract implements Contr
@Override
public void process(ProcessContributeeMemberContext processMemberContext) {
+ final FacetHolder holder = processMemberContext.getFacetHolder();
+
+ Properties properties = processMemberContext.metadataProperties("propertyLayout");
+ if(properties == null) {
+ // alternate key
+ properties = processMemberContext.metadataProperties("layout");
+ }
+
+
+ // cssClass
+ CssClassFacet cssClassFacet = CssClassFacetOnPropertyFromLayoutProperties.create(properties, holder);
+ FacetUtil.addFacet(cssClassFacet);
+
+
+ // describedAs
+ DescribedAsFacet describedAsFacet = DescribedAsFacetOnPropertyFromLayoutProperties.create(properties, holder);
+ FacetUtil.addFacet(describedAsFacet);
+
+
+ // hidden
+ HiddenFacet hiddenFacet = HiddenFacetOnPropertyFromLayoutProperties.create(properties, holder);
+ FacetUtil.addFacet(hiddenFacet);
+
+
+ // labelAt
+ LabelAtFacet labelAtFacet = LabelAtFacetOnPropertyFromLayoutProperties.create(properties, holder);
+ FacetUtil.addFacet(labelAtFacet);
+
+
+ // multiLine
+ MultiLineFacet multiLineFacet = MultiLineFacetOnPropertyFromLayoutProperties.create(properties, holder);
+ FacetUtil.addFacet(multiLineFacet);
+
+
+ // named
+ NamedFacet namedFacet = NamedFacetOnPropertyFromLayoutProperties.create(properties, holder);
+ FacetUtil.addFacet(namedFacet);
+
+
+ // renderedAsDayBefore
+ RenderedAdjustedFacet renderedAdjustedFacet = RenderedAdjustedFacetOnPropertyFromLayoutProperties.create(properties, holder);
+ FacetUtil.addFacet(renderedAdjustedFacet);
+
+
+ // typicalLength
+ TypicalLengthFacet typicalLengthFacet = TypicalLengthFacetOnPropertyFromLayoutProperties.create(properties, holder);
+ FacetUtil.addFacet(typicalLengthFacet);
+
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/1e17f118/example/application/simpleapp/webapp/src/main/webapp/css/application.css
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/webapp/src/main/webapp/css/application.css b/example/application/simpleapp/webapp/src/main/webapp/css/application.css
index 8aac50a..9f1612a 100644
--- a/example/application/simpleapp/webapp/src/main/webapp/css/application.css
+++ b/example/application/simpleapp/webapp/src/main/webapp/css/application.css
@@ -17,55 +17,3 @@
* under the License.
*/
-/*
-uncomment to add a logo (in an ../images directory relative to this file)
-
-#header {
- height: 48px;
- background-image: url("../images/logo.png");
- background-repeat: no-repeat;
-}
-
-#header h1 {
- display: none;
-}
-*/
-
-/*
-example: uncomment to hide the icon
-
-.entityIconAndTitlePanel a img {
- display: none;
-}
-*/
-
-/*
-example: uncomment to hide the sliding bookmark panel
-
-#bookmarkedPagesSlidingDiv {
- display: none;
-}
-.showPanelTab {
- display: none;
-}
-*/
-
-
-.entityActions .cssMenuPanel .menuh li.x-caution a,
-li.x-caution a {
- background-color: #C94316;
-}
-.entityActions .cssMenuPanel .menuh li.x-caution a:hover {
- background-color:#20B5C2;
-}
-
-/*.entityActions .cssMenuPanel .menuh a:hover*/
-
-.entityActions .cssMenuPanel .menuh li.x-highlight a,
-li.x-highlight a {
- background-color: #51A95C;
-}
-
-div.x-key span.scalarName {
- color: red;
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/1e17f118/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItem.layout.json
----------------------------------------------------------------------
diff --git a/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItem.layout.json b/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItem.layout.json
index 9d9f7a8..5cf21cd 100644
--- a/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItem.layout.json
+++ b/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItem.layout.json
@@ -23,8 +23,8 @@
"members": {
"description": {
"propertyLayout": {
- "labelPosition": "TOP",
- "typicalLength": 50
+ "cssClass": "x-key",
+ "labelPosition": "TOP"
}
},
"category": {
@@ -118,7 +118,7 @@
},
"dueBy": {
"propertyLayout": {
- "cssClass": "x-key"
+ "renderedAsDayBefore": "false"
}
}
}
@@ -164,6 +164,7 @@
"collections": {
"dependencies": {
"collectionLayout": {
+ "describedAs": "ToDo items that must be completed before this one",
"paged": 5,
"render": "EAGERLY"
},
@@ -205,7 +206,7 @@
"actionLayout": {
"named": "Clone",
"describedAs": "Create a new todo item from this one",
- "cssClass": "btn-default",
+ "cssClass": "btn-warn",
"cssClassFa": "fa fa-copy fa-lg"
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/1e17f118/example/application/todoapp/webapp/src/main/webapp/WEB-INF/isis.properties
----------------------------------------------------------------------
diff --git a/example/application/todoapp/webapp/src/main/webapp/WEB-INF/isis.properties b/example/application/todoapp/webapp/src/main/webapp/WEB-INF/isis.properties
index e2f1027..f5e951f 100644
--- a/example/application/todoapp/webapp/src/main/webapp/WEB-INF/isis.properties
+++ b/example/application/todoapp/webapp/src/main/webapp/WEB-INF/isis.properties
@@ -125,7 +125,7 @@ isis.reflector.facet.cssClassFa.patterns=\
isis.reflector.facet.cssClass.patterns=\
delete.*:btn-warning,\
- .*:btn-primary
+ .*:btn-default
#################################################################################
http://git-wip-us.apache.org/repos/asf/isis/blob/1e17f118/example/application/todoapp/webapp/src/main/webapp/css/application.css
----------------------------------------------------------------------
diff --git a/example/application/todoapp/webapp/src/main/webapp/css/application.css b/example/application/todoapp/webapp/src/main/webapp/css/application.css
index ac67314..400c158 100644
--- a/example/application/todoapp/webapp/src/main/webapp/css/application.css
+++ b/example/application/todoapp/webapp/src/main/webapp/css/application.css
@@ -17,64 +17,8 @@
* under the License.
*/
-/*
-uncomment to add a logo (in an ../images directory relative to this file)
-
-#header {
- height: 48px;
- background-image: url("../images/logo.png");
- background-repeat: no-repeat;
-}
-
-#header h1 {
- display: none;
-}
-*/
-
-/*
-example: uncomment to hide the icon
-
-.entityIconAndTitlePanel a img {
- display: none;
-}
-*/
-
-/*
-example: uncomment to hide the sliding bookmark panel
-
-#bookmarkedPagesSlidingDiv {
- display: none;
-}
-.showPanelTab {
- display: none;
-}
-*/
-
-/*
-example: uncomment to hide the text for the 'notes' field
-div.ToDoItem-notes span.scalarValue {
- display: none;
-}
-*/
-
-
-.entityActions .cssMenuPanel .menuh li.x-caution a,
-li.x-caution a {
- background-color: #C94316;
-}
-.entityCombined .entityActions .cssMenuPanel .menuh li.x-caution a:hover {
- background-color:#20B5C2;
-}
-
-.entityActions .cssMenuPanel .menuh li.x-highlight a,
-li.x-highlight a {
- background-color: #51A95C;
-}
-.entityCombined .entityActions .cssMenuPanel .menuh li.x-highlight a:hover {
- background-color:#20B5C2;
-}
-div.x-key span.scalarName {
- color: red;
+.x-key label.scalarName {
+ color: red;
}