Repository: isis Updated Branches: refs/heads/master d68ab6282 -> 23fd0eea8
ISIS-928: fixing colours for action dropdown (if positioned on RIGHT). Project: http://git-wip-us.apache.org/repos/asf/isis/repo Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/23fd0eea Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/23fd0eea Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/23fd0eea Branch: refs/heads/master Commit: 23fd0eea875d830d94d845477451e05347fe1db1 Parents: d68ab62 Author: Dan Haywood <[email protected]> Authored: Fri Feb 20 10:20:32 2015 +0000 Committer: Dan Haywood <[email protected]> Committed: Fri Feb 20 10:20:32 2015 +0000 ---------------------------------------------------------------------- .../domainapp/dom/modules/simple/SimpleObject.layout.json | 9 ++++++--- .../webapp/src/main/webapp/WEB-INF/isis.properties | 3 +-- .../domainapp/dom/modules/simple/SimpleObject.layout.json | 9 ++++++--- .../webapp/src/main/webapp/WEB-INF/isis.properties | 3 +-- 4 files changed, 14 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/isis/blob/23fd0eea/example/application/simpleapp/dom/src/main/java/domainapp/dom/modules/simple/SimpleObject.layout.json ---------------------------------------------------------------------- diff --git a/example/application/simpleapp/dom/src/main/java/domainapp/dom/modules/simple/SimpleObject.layout.json b/example/application/simpleapp/dom/src/main/java/domainapp/dom/modules/simple/SimpleObject.layout.json index d84e88c..bd72754 100644 --- a/example/application/simpleapp/dom/src/main/java/domainapp/dom/modules/simple/SimpleObject.layout.json +++ b/example/application/simpleapp/dom/src/main/java/domainapp/dom/modules/simple/SimpleObject.layout.json @@ -23,7 +23,11 @@ "members": { "name": { "actions": { - "updateName": {} + "updateName": { + "actionLayout": { + "position": "BOTTOM" + } + } } } } @@ -44,5 +48,4 @@ } ], "actions": {} -} - \ No newline at end of file +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/isis/blob/23fd0eea/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/isis.properties ---------------------------------------------------------------------- diff --git a/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/isis.properties b/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/isis.properties index 02c3eca..cfb5e4f 100644 --- a/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/isis.properties +++ b/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/isis.properties @@ -141,8 +141,7 @@ isis.reflector.facet.cssClassFa.patterns=\ # patterns for applying CssClass facet (CSS styles), matching on member names # isis.reflector.facet.cssClass.patterns=\ - delete.*:btn-warning,\ - .*:btn-default + delete.*:btn-warning ################################################################################# http://git-wip-us.apache.org/repos/asf/isis/blob/23fd0eea/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/domainapp/dom/modules/simple/SimpleObject.layout.json ---------------------------------------------------------------------- diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/domainapp/dom/modules/simple/SimpleObject.layout.json b/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/domainapp/dom/modules/simple/SimpleObject.layout.json index d84e88c..bd72754 100644 --- a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/domainapp/dom/modules/simple/SimpleObject.layout.json +++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/domainapp/dom/modules/simple/SimpleObject.layout.json @@ -23,7 +23,11 @@ "members": { "name": { "actions": { - "updateName": {} + "updateName": { + "actionLayout": { + "position": "BOTTOM" + } + } } } } @@ -44,5 +48,4 @@ } ], "actions": {} -} - \ No newline at end of file +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/isis/blob/23fd0eea/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/isis.properties ---------------------------------------------------------------------- diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/isis.properties b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/isis.properties index 945e4b8..ee83afe 100644 --- a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/isis.properties +++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/isis.properties @@ -144,8 +144,7 @@ ${symbol_pound} ${symbol_pound} patterns for applying CssClass facet (CSS styles), matching on member names ${symbol_pound} isis.reflector.facet.cssClass.patterns=${symbol_escape} - delete.*:btn-warning,${symbol_escape} - .*:btn-default + delete.*:btn-warning ${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbo l_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}
