This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 026d117 ISIS-2093: minor improvements to Tooltip Demo (button naming
and text)
026d117 is described below
commit 026d1174d9e8166a830c72da90aa53027cb9e52e
Author: Andi Huber <ahu...@apache.org>
AuthorDate: Tue Mar 24 11:29:16 2020 +0100
ISIS-2093: minor improvements to Tooltip Demo (button naming and text)
---
.../demo/src/main/java/demoapp/dom/tooltip/TooltipDemo.java | 13 +++++++++----
.../main/java/demoapp/dom/tooltip/TooltipDemo.layout.xml | 2 +-
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/examples/demo/src/main/java/demoapp/dom/tooltip/TooltipDemo.java
b/examples/demo/src/main/java/demoapp/dom/tooltip/TooltipDemo.java
index a99218c..6112d9b 100644
--- a/examples/demo/src/main/java/demoapp/dom/tooltip/TooltipDemo.java
+++ b/examples/demo/src/main/java/demoapp/dom/tooltip/TooltipDemo.java
@@ -65,13 +65,16 @@ public class TooltipDemo extends DemoStub {
// -- NO ARG
@Action
- @ActionLayout(describedAs="This is a no-arg action with a tooltip.")
+ @ActionLayout(
+ named = "No Arguments",
+ describedAs="This is a no-arg action with a tooltip.")
public TooltipDemo noArgAction(){
return this;
}
@Action(semantics=SemanticsOf.IDEMPOTENT_ARE_YOU_SURE)
@ActionLayout(
+ named = "No Arguments With Confirm",
cssClass="btn-danger",
describedAs="This is a no-arg action with a tooltip and 'are you
sure' semantics.")
public TooltipDemo noArgActionWithConfirm(){
@@ -82,6 +85,7 @@ public class TooltipDemo extends DemoStub {
@Action
@ActionLayout(
+ named = "With Arguments",
describedAs="This is an action with arguments and a tooltip.",
promptStyle=PromptStyle.DIALOG_MODAL)
public TooltipDemo biArgAction(
@@ -105,6 +109,7 @@ public class TooltipDemo extends DemoStub {
@Action(semantics=SemanticsOf.IDEMPOTENT_ARE_YOU_SURE)
@ActionLayout(
+ named = "With Arguments And Confirm",
describedAs="This is an action with arguments, a tooltip and 'are
you sure' semantics.",
promptStyle=PromptStyle.DIALOG_MODAL)
public TooltipDemo biArgActionWithConfirm(
@@ -131,7 +136,7 @@ public class TooltipDemo extends DemoStub {
@Action
@ActionLayout(
- named="Disabled Action", // metamodel validation is picky when
method prefix 'disabled' is used
+ named="Disabled",
describedAs="This is a disabled action with a tooltip.")
public TooltipDemo disabledAction(){
return this;
@@ -144,7 +149,7 @@ public class TooltipDemo extends DemoStub {
@Action
@ActionLayout(
- named="Disabled Action with Confirmation", // metamodel validation
is picky when method prefix 'disabled' is used
+ named="Disabled With Confirm",
cssClass="btn-danger",
describedAs="This is a disabled action with a tooltip and 'are you
sure' "
+ "semantics.")
@@ -191,7 +196,7 @@ public class TooltipDemo extends DemoStub {
@PropertyLayout(labelPosition=LabelPosition.NONE)
public Markup getText2() {
- return new Markup("Click the above button, and mouse-over then
action's "
+ return new Markup("Click the above buttons, and mouse-over the
action's "
+ "parameter lables. Tooltips should pop up.");
}
diff --git
a/examples/demo/src/main/java/demoapp/dom/tooltip/TooltipDemo.layout.xml
b/examples/demo/src/main/java/demoapp/dom/tooltip/TooltipDemo.layout.xml
index 8ccc1f4..a36e0ff 100644
--- a/examples/demo/src/main/java/demoapp/dom/tooltip/TooltipDemo.layout.xml
+++ b/examples/demo/src/main/java/demoapp/dom/tooltip/TooltipDemo.layout.xml
@@ -29,7 +29,7 @@
<cpt:property id="text2"/>
</cpt:fieldSet>
- <cpt:fieldSet name="Actions disabled" id="a3">
+ <cpt:fieldSet name="Disabled Actions" id="a3">
<cpt:action id="disabledAction" />
<cpt:action id="disabledActionWithConfirmation"
/>
<cpt:property id="text3"/>
