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:25 UTC
[1/6] git commit: ISIS-928: fixing errors in TCK dom entities
(duplicate @ObjectTypes/@Discriminators)
Repository: isis
Updated Branches:
refs/heads/master 89d1c871b -> 20e99fbaa
ISIS-928: fixing errors in TCK dom entities (duplicate @ObjectTypes/@Discriminators)
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/9a9abd77
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/9a9abd77
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/9a9abd77
Branch: refs/heads/master
Commit: 9a9abd77f97b04ff88fb38c0258afc46b7c06e25
Parents: 89d1c87
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Oct 23 12:51:14 2014 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Oct 23 12:57:04 2014 +0100
----------------------------------------------------------------------
.../java/org/apache/isis/core/tck/dom/refs/AggregatedEntity.java | 2 +-
.../tck/dom/refs/PolyInterfaceIdentityStrategySubtype3Entity.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/9a9abd77/core/tck/tck-dom/src/main/java/org/apache/isis/core/tck/dom/refs/AggregatedEntity.java
----------------------------------------------------------------------
diff --git a/core/tck/tck-dom/src/main/java/org/apache/isis/core/tck/dom/refs/AggregatedEntity.java b/core/tck/tck-dom/src/main/java/org/apache/isis/core/tck/dom/refs/AggregatedEntity.java
index 92fbd72..dab2309 100644
--- a/core/tck/tck-dom/src/main/java/org/apache/isis/core/tck/dom/refs/AggregatedEntity.java
+++ b/core/tck/tck-dom/src/main/java/org/apache/isis/core/tck/dom/refs/AggregatedEntity.java
@@ -25,7 +25,7 @@ import org.apache.isis.applib.annotation.ObjectType;
@javax.jdo.annotations.PersistenceCapable
@javax.jdo.annotations.EmbeddedOnly
-@javax.jdo.annotations.Discriminator("RFCG")
+@javax.jdo.annotations.Discriminator("AGGR")
@Aggregated
@ObjectType("AGGR")
public class AggregatedEntity extends BaseEntity {
http://git-wip-us.apache.org/repos/asf/isis/blob/9a9abd77/core/tck/tck-dom/src/main/java/org/apache/isis/core/tck/dom/refs/PolyInterfaceIdentityStrategySubtype3Entity.java
----------------------------------------------------------------------
diff --git a/core/tck/tck-dom/src/main/java/org/apache/isis/core/tck/dom/refs/PolyInterfaceIdentityStrategySubtype3Entity.java b/core/tck/tck-dom/src/main/java/org/apache/isis/core/tck/dom/refs/PolyInterfaceIdentityStrategySubtype3Entity.java
index fcad3cd..c15dc71 100644
--- a/core/tck/tck-dom/src/main/java/org/apache/isis/core/tck/dom/refs/PolyInterfaceIdentityStrategySubtype3Entity.java
+++ b/core/tck/tck-dom/src/main/java/org/apache/isis/core/tck/dom/refs/PolyInterfaceIdentityStrategySubtype3Entity.java
@@ -29,7 +29,7 @@ import org.apache.isis.applib.annotation.Optional;
import org.apache.isis.applib.annotation.Title;
@javax.jdo.annotations.PersistenceCapable(identityType=IdentityType.DATASTORE)
-@javax.jdo.annotations.Discriminator("PIS3")
+@javax.jdo.annotations.Discriminator("PIIS3")
@javax.jdo.annotations.DatastoreIdentity(strategy=javax.jdo.annotations.IdGeneratorStrategy.IDENTITY)
@Inheritance(strategy=InheritanceStrategy.NEW_TABLE)
@ObjectType("PIIS3")
[6/6] git commit: ISIS-928: demonstrating use of hidden() and
disabled() in the todoapp.
Posted by da...@apache.org.
ISIS-928: demonstrating use of hidden() and disabled() in the todoapp.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/20e99fba
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/20e99fba
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/20e99fba
Branch: refs/heads/master
Commit: 20e99fbaa4f898accb193c4d5acb992fb88bf25a
Parents: a5b4258
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Oct 23 13:37:55 2014 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Oct 23 13:37:55 2014 +0100
----------------------------------------------------------------------
.../application/todoapp/dom/src/main/java/dom/todo/ToDoItem.java | 4 +++-
.../src/test/java/integration/tests/ToDoItemIntegTest.java | 4 ++++
2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/20e99fba/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItem.java
----------------------------------------------------------------------
diff --git a/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItem.java b/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItem.java
index e70da55..09955e1 100644
--- a/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItem.java
+++ b/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItem.java
@@ -701,7 +701,9 @@ public class ToDoItem implements Categorized, Comparable<ToDoItem> {
* Prevent user from modifying any other user's data.
*/
public String disabled(Identifier.Type type){
- if(Objects.equal(getOwnedBy(), container.getUser().getName())) { return null; }
+ final UserMemento currentUser = container.getUser();
+ final String currentUserName = currentUser.getName();
+ if(Objects.equal(getOwnedBy(), currentUserName)) { return null; }
return "This object is owned by '" + getOwnedBy() + "' and cannot be modified by you";
}
http://git-wip-us.apache.org/repos/asf/isis/blob/20e99fba/example/application/todoapp/integtests/src/test/java/integration/tests/ToDoItemIntegTest.java
----------------------------------------------------------------------
diff --git a/example/application/todoapp/integtests/src/test/java/integration/tests/ToDoItemIntegTest.java b/example/application/todoapp/integtests/src/test/java/integration/tests/ToDoItemIntegTest.java
index 358f820..ff63e8f 100644
--- a/example/application/todoapp/integtests/src/test/java/integration/tests/ToDoItemIntegTest.java
+++ b/example/application/todoapp/integtests/src/test/java/integration/tests/ToDoItemIntegTest.java
@@ -292,8 +292,12 @@ public class ToDoItemIntegTest extends AbstractToDoIntegTest {
scenarioExecution().replaceService(originalEventBusService, mockEventBusService);
scenarioExecution().closeSession();
scenarioExecution().openSession();
+
+ final List<ToDoItem> all = toDoItems.notYetComplete();
+ toDoItem = wrap(all.get(0));
}
+
@After
public void reinstateOriginalEventBusService() throws Exception {
scenarioExecution().replaceService(mockEventBusService, originalEventBusService);
[4/6] git commit: ISIS-537: prettying up the todoapp to use font
awesome icons
Posted by da...@apache.org.
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")
[5/6] git commit: ISIS-928: enhance Todo app to demonstrate how to
disable/hide all members in a class.
Posted by da...@apache.org.
ISIS-928: enhance Todo app to demonstrate how to disable/hide all members in a class.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/a5b42588
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/a5b42588
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/a5b42588
Branch: refs/heads/master
Commit: a5b42588bed30c615b50c8b5864597dd7f01c435
Parents: 2618e35
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Oct 23 11:20:25 2014 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Oct 23 13:12:11 2014 +0100
----------------------------------------------------------------------
.../dom/src/main/java/dom/todo/ToDoItem.java | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/a5b42588/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItem.java
----------------------------------------------------------------------
diff --git a/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItem.java b/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItem.java
index 501a989..e70da55 100644
--- a/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItem.java
+++ b/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItem.java
@@ -689,6 +689,23 @@ public class ToDoItem implements Categorized, Comparable<ToDoItem> {
//region > object-level validation
/**
+ * Prevent user from viewing another user's data.
+ */
+ public boolean hidden() {
+ // uncomment to enable. As things stand, the disabled() method below instead will make object "read-only".
+ //return !Objects.equal(getOwnedBy(), container.getUser().getName());
+ return false;
+ }
+
+ /**
+ * Prevent user from modifying any other user's data.
+ */
+ public String disabled(Identifier.Type type){
+ if(Objects.equal(getOwnedBy(), container.getUser().getName())) { return null; }
+ return "This object is owned by '" + getOwnedBy() + "' and cannot be modified by you";
+ }
+
+ /**
* In a real app, if this were actually a rule, then we'd expect that
* invoking the {@link #completed() done} action would clear the {@link #getDueBy() dueBy}
* property (rather than require the user to have to clear manually).
@@ -699,8 +716,11 @@ public class ToDoItem implements Categorized, Comparable<ToDoItem> {
}
return null;
}
+
+
//endregion
+
//region > programmatic helpers
@Programmatic // excluded from the framework's metamodel
public boolean isDue() {
[2/6] git commit: ISIS-537: font-awesome icons on bulk actions.
Posted by da...@apache.org.
ISIS-537: font-awesome icons on bulk actions.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/7db17c0a
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/7db17c0a
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/7db17c0a
Branch: refs/heads/master
Commit: 7db17c0adc26b1c382a58bd56aba7f3d3087ea3a
Parents: 9a9abd7
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Oct 23 12:52:25 2014 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Oct 23 13:05:06 2014 +0100
----------------------------------------------------------------------
.../components/widgets/cssmenu/CssMenuItem.java | 26 +++++++++++++++-----
.../widgets/cssmenu/CssMenuItemPanel.html | 24 +++++++++---------
.../widgets/cssmenu/CssMenuPanel.html | 25 +++++++++----------
.../widgets/cssmenu/CssMenuPanel.java | 3 +--
4 files changed, 45 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/7db17c0a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuItem.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuItem.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuItem.java
index 8f0498e..4be4b6b 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuItem.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuItem.java
@@ -120,11 +120,25 @@ public class CssMenuItem implements Serializable {
return this;
}
+ public Builder withFacet(CssClassFacet facet) {
+ if(facet != null) {
+ withCssClass(facet.value());
+ }
+ return this;
+ }
+
public Builder withCssClass(String cssClass) {
cssMenuItem.setCssClass(cssClass);
return this;
}
+ public Builder withFacet(CssClassFaFacet facet) {
+ if(facet != null) {
+ withCssClassFa(facet.value());
+ }
+ return this;
+ }
+
public Builder withCssClassFa(String cssClassFa) {
cssMenuItem.setCssClassFa(cssClassFa);
return this;
@@ -358,12 +372,12 @@ public class CssMenuItem implements Serializable {
final AbstractLink link = linkAndLabel.getLink();
final String actionLabel = linkAndLabel.getLabel();
- Builder builder = this.newSubMenuItem(actionLabel).link(link).prototyping(linkAndLabel.isPrototype()).returnsBlobOrClob(linkAndLabel.isBlobOrClob());
-
- CssClassFacet cssClassFacet = objectAction.getFacet(CssClassFacet.class);
- if (cssClassFacet != null) {
- builder.withCssClass(cssClassFacet.value());
- }
+ Builder builder = this.newSubMenuItem(actionLabel)
+ .link(link)
+ .prototyping(linkAndLabel.isPrototype())
+ .returnsBlobOrClob(linkAndLabel.isBlobOrClob())
+ .withFacet(objectAction.getFacet(CssClassFacet.class))
+ .withFacet(objectAction.getFacet(CssClassFaFacet.class));
return builder;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/7db17c0a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuItemPanel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuItemPanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuItemPanel.html
index ad16716..2f09644 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuItemPanel.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuItemPanel.html
@@ -18,15 +18,17 @@
under the License.
-->
<html xmlns:wicket="http://wicket.apache.org">
- <body>
- <wicket:panel>
- <li class="cssMenuItemPanel">
- <a wicket:id="menuLink" class="btn btn-sm btn-default">
- <span wicket:id="menuLabel">[menu label]</span>
- </a>
- <p wicket:id="menuLabel">[menu label]</p>
- <span wicket:id="subMenuItems">[subMenuItems]</span>
- </li>
- </wicket:panel>
- </body>
+ <body>
+ <wicket:panel>
+ <li class="cssMenuItemPanel">
+ <a wicket:id="menuLink" class="btn btn-sm btn-default">
+ <span class="fontAwesomeIcon" wicket:id="menuLinkFontAwesome"/>
+ <span wicket:id="menuLabel">[menu label]</span>
+ </a>
+
+ <p wicket:id="menuLabel">[menu label]</p>
+ <span wicket:id="subMenuItems">[subMenuItems]</span>
+ </li>
+ </wicket:panel>
+ </body>
</html>
http://git-wip-us.apache.org/repos/asf/isis/blob/7db17c0a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuPanel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuPanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuPanel.html
index 5cb8e48..2080c50 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuPanel.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuPanel.html
@@ -18,18 +18,15 @@
under the License.
-->
<html>
- <body>
- <wicket:panel>
- <span class="cssMenuPanel">
- <span class="menuh">
- <ul wicket:id="menuItems" class="cssMenuItems">
- <span wicket:id="menuItem">[menuItem here]</span>
- </ul>
- </span>
- </span>
- </wicket:panel>
- </body>
+ <body>
+ <wicket:panel>
+ <span class="cssMenuPanel">
+ <span class="menuh">
+ <ul wicket:id="menuItems" class="cssMenuItems">
+ <span wicket:id="menuItem">[menuItem here]</span>
+ </ul>
+ </span>
+ </span>
+ </wicket:panel>
+ </body>
</html>
-
-
-
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/7db17c0a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuPanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuPanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuPanel.java
index a8f3c8b..9181e76 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuPanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuPanel.java
@@ -21,12 +21,10 @@ package org.apache.isis.viewer.wicket.ui.components.widgets.cssmenu;
import java.util.Arrays;
import java.util.List;
-
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.repeater.RepeatingView;
import org.apache.wicket.model.util.ListModel;
-
import org.apache.isis.core.commons.lang.StringExtensions;
import org.apache.isis.viewer.wicket.ui.ComponentFactory;
import org.apache.isis.viewer.wicket.ui.ComponentType;
@@ -83,6 +81,7 @@ public class CssMenuPanel extends PanelAbstract<CssMenuPanel.MyModel> {
private final StyleAppender styleAppender;
static final String ID_MENU_ITEMS = "menuItems";
+ static final String ID_MENU_ITEM_FONT_AWESOME = "menuItemFontAwesome";
static final String ID_MENU_ITEM = "menuItem";
public CssMenuPanel(final String id, final Style style, final List<CssMenuItem> topLevelMenuItems) {
[3/6] git commit: ISIS-537: fix for table sorting indicator,
seemingly required in Firefox
Posted by da...@apache.org.
ISIS-537: fix for table sorting indicator, seemingly required in Firefox
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/ff786186
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/ff786186
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/ff786186
Branch: refs/heads/master
Commit: ff7861860607eb539f7deca4a8d8bd37504dc5e9
Parents: 7db17c0
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Oct 23 12:52:54 2014 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Oct 23 13:05:16 2014 +0100
----------------------------------------------------------------------
.../apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/ff786186/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 b41ca25..e72fdd8 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
@@ -86,3 +86,8 @@ label {
padding-right: 10px;
}
+/* fix for Firefox */
+th > a > div > strong {
+ float: left;
+}
+