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/02 00:59:10 UTC
[09/13] isis git commit: ISIS-537: CollectionContentsAsSummary icon
now uses fa- icon.
ISIS-537: CollectionContentsAsSummary icon now uses fa- icon.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/c05621aa
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/c05621aa
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/c05621aa
Branch: refs/heads/master
Commit: c05621aa6e29deffa3608f8b2ac6983ee7aa1270
Parents: e2f15a5
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Dec 1 21:08:07 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Dec 1 21:08:07 2014 +0000
----------------------------------------------------------------------
.../summary/CollectionContentsAsSummaryFactory.java | 15 ++++++++++++++-
.../collectioncontents/summary/icon_summary_off.png | Bin 240 -> 0 bytes
.../collectioncontents/summary/icon_summary_on.png | Bin 299 -> 0 bytes
.../viewer/wicket/ui/pages/bootstrap-overrides.css | 6 ++++--
4 files changed, 18 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/c05621aa/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummaryFactory.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummaryFactory.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummaryFactory.java
index f8e657c..1c75d2a 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummaryFactory.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummaryFactory.java
@@ -23,6 +23,7 @@ import java.util.List;
import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
import org.apache.wicket.request.resource.CssResourceReference;
import org.apache.isis.applib.filter.Filter;
@@ -31,6 +32,7 @@ import org.apache.isis.core.metamodel.spec.feature.Contributed;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.core.metamodel.facets.value.bigdecimal.BigDecimalValueFacet;
import org.apache.isis.viewer.wicket.model.models.EntityCollectionModel;
+import org.apache.isis.viewer.wicket.ui.CollectionContentsAsFactory;
import org.apache.isis.viewer.wicket.ui.ComponentFactory;
import org.apache.isis.viewer.wicket.ui.ComponentFactoryAbstract;
import org.apache.isis.viewer.wicket.ui.ComponentType;
@@ -38,7 +40,7 @@ import org.apache.isis.viewer.wicket.ui.ComponentType;
/**
* {@link ComponentFactory} for {@link CollectionContentsAsSummary}.
*/
-public class CollectionContentsAsSummaryFactory extends ComponentFactoryAbstract {
+public class CollectionContentsAsSummaryFactory extends ComponentFactoryAbstract implements CollectionContentsAsFactory {
private static final long serialVersionUID = 1L;
@@ -78,4 +80,15 @@ public class CollectionContentsAsSummaryFactory extends ComponentFactoryAbstract
// do not bundle, because of relative CSS images...
return null;
}
+
+ @Override
+ public IModel<String> getTitleLabel() {
+ return Model.of("Summary");
+ }
+
+ @Override
+ public IModel<String> getCssClass() {
+ return Model.of("fa fa-fw fa-usd");
+ }
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/c05621aa/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/icon_summary_off.png
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/icon_summary_off.png b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/icon_summary_off.png
deleted file mode 100644
index da74793..0000000
Binary files a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/icon_summary_off.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/c05621aa/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/icon_summary_on.png
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/icon_summary_on.png b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/icon_summary_on.png
deleted file mode 100644
index d653bea..0000000
Binary files a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/icon_summary_on.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/c05621aa/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 c441d4f..b486641 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
@@ -328,17 +328,19 @@ body {
min-width: 720px;
}
+/*
a span.ViewLinkItem.summary {
- background-image:url("icon_summary_on.png");
+ background-image:url("./icon_summary_on.png");
background-position: center center;
background-repeat:no-repeat;
}
span.ViewLinkItem.summary {
- background-image:url("icon_summary_off.png");
+ background-image:url("./icon_summary_off.png");
background-position: center center;
background-repeat:no-repeat;
}
+*/
/* from EntityHeaderPanel.css */