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/10/23 14:38:28 UTC
[4/6] git commit: ISIS-537: prettying up the todoapp to use font
awesome icons
ISIS-537: prettying up the todoapp to use font awesome icons
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/2618e35b
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/2618e35b
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/2618e35b
Branch: refs/heads/master
Commit: 2618e35b8e01e25064616465caadb1c5fb6efd30
Parents: ff78618
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Oct 23 12:53:34 2014 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Oct 23 13:05:24 2014 +0100
----------------------------------------------------------------------
.../todoapp/dom/src/main/java/app/ToDoItemAnalysis.java | 3 +++
.../todoapp/dom/src/main/java/dom/todo/ToDoItem.layout.json | 4 ++--
.../todoapp/dom/src/main/java/dom/todo/ToDoItems.java | 6 ++++--
.../src/main/java/fixture/todo/ToDoItemsFixturesService.java | 1 +
.../src/main/java/webapp/prototyping/ExternalLinksService.java | 3 ++-
5 files changed, 12 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/2618e35b/example/application/todoapp/dom/src/main/java/app/ToDoItemAnalysis.java
----------------------------------------------------------------------
diff --git a/example/application/todoapp/dom/src/main/java/app/ToDoItemAnalysis.java b/example/application/todoapp/dom/src/main/java/app/ToDoItemAnalysis.java
index 3286ae6..cbeaa88 100644
--- a/example/application/todoapp/dom/src/main/java/app/ToDoItemAnalysis.java
+++ b/example/application/todoapp/dom/src/main/java/app/ToDoItemAnalysis.java
@@ -44,7 +44,9 @@ public class ToDoItemAnalysis {
}
//endregion
+
//region > byCategory (action)
+ @CssClassFa("fa-pie-chart")
@Named("By Category")
@Bookmarkable
@ActionSemantics(Of.SAFE)
@@ -75,6 +77,7 @@ public class ToDoItemAnalysis {
Unknown,
}
+ @CssClassFa("fa-calendar")
@Named("By Date Range")
@Bookmarkable
@ActionSemantics(Of.SAFE)
http://git-wip-us.apache.org/repos/asf/isis/blob/2618e35b/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 a4c9460..e03a4a5 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
@@ -50,11 +50,11 @@
"describedAs": {
"value": "Mark this todo item as having been completed"
},
- "cssClassFa": { "value": "fa fa-check-square" }
+ "cssClassFa": { "value": "fa fa-thumbs-up" }
},
"notYetCompleted": {
"named": { "value": "Not done" },
- "cssClassFa": { "value": "fa-reply fa-flip-vertical" }
+ "cssClassFa": { "value": "fa fa-thumbs-down" }
},
"scheduleExplicitly": {
},
http://git-wip-us.apache.org/repos/asf/isis/blob/2618e35b/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItems.java
----------------------------------------------------------------------
diff --git a/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItems.java b/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItems.java
index 70cf8a0..165774d 100644
--- a/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItems.java
+++ b/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItems.java
@@ -36,7 +36,7 @@ import org.apache.isis.applib.services.clock.ClockService;
public class ToDoItems {
//region > notYetComplete (action)
- @CssClassFa("fa-list")
+ @CssClassFa("fa fa-thumbs-down")
@Bookmarkable
@ActionSemantics(Of.SAFE)
@MemberOrder(sequence = "10")
@@ -58,7 +58,7 @@ public class ToDoItems {
//endregion
//region > complete (action)
- @CssClassFa("fa-check-square-o")
+ @CssClassFa("fa fa-thumbs-up")
@ActionSemantics(Of.SAFE)
@MemberOrder(sequence = "20")
public List<ToDoItem> complete() {
@@ -83,6 +83,7 @@ public class ToDoItems {
@Bookmarkable
@ActionSemantics(Of.SAFE)
@MemberOrder(sequence = "40")
+ @CssClassFa("fa-question")
public List<ToDoItem> categorized(
@Named("Category") final Category category,
@Named("Subcategory") final Subcategory subcategory,
@@ -148,6 +149,7 @@ public class ToDoItems {
//endregion
//region > allToDos (action)
+ @CssClassFa("fa fa-globe")
@Prototype
@ActionSemantics(Of.SAFE)
@MemberOrder(sequence = "50")
http://git-wip-us.apache.org/repos/asf/isis/blob/2618e35b/example/application/todoapp/fixture/src/main/java/fixture/todo/ToDoItemsFixturesService.java
----------------------------------------------------------------------
diff --git a/example/application/todoapp/fixture/src/main/java/fixture/todo/ToDoItemsFixturesService.java b/example/application/todoapp/fixture/src/main/java/fixture/todo/ToDoItemsFixturesService.java
index f4e219a..e8ab32c 100644
--- a/example/application/todoapp/fixture/src/main/java/fixture/todo/ToDoItemsFixturesService.java
+++ b/example/application/todoapp/fixture/src/main/java/fixture/todo/ToDoItemsFixturesService.java
@@ -61,6 +61,7 @@ public class ToDoItemsFixturesService extends FixtureScripts {
@Prototype
+ @CssClassFa("fa-list")
@MemberOrder(sequence="20")
public Object recreateToDoItemsReturnFirst() {
final List<FixtureResult> run = findFixtureScriptFor(RecreateToDoItemsAndCompleteSeveralForCurrent.class).run(null);
http://git-wip-us.apache.org/repos/asf/isis/blob/2618e35b/example/application/todoapp/webapp/src/main/java/webapp/prototyping/ExternalLinksService.java
----------------------------------------------------------------------
diff --git a/example/application/todoapp/webapp/src/main/java/webapp/prototyping/ExternalLinksService.java b/example/application/todoapp/webapp/src/main/java/webapp/prototyping/ExternalLinksService.java
index 0606b0e..3dbab69 100644
--- a/example/application/todoapp/webapp/src/main/java/webapp/prototyping/ExternalLinksService.java
+++ b/example/application/todoapp/webapp/src/main/java/webapp/prototyping/ExternalLinksService.java
@@ -45,7 +45,8 @@ public class ExternalLinksService {
return title;
}
}
-
+
+ @CssClassFa("fa-external-link")
@Prototype
@ActionSemantics(Of.SAFE)
@MemberOrder(name="Prototyping", sequence="91.1")