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 2012/11/21 01:38:43 UTC
svn commit: r1411965 - in
/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui:
components/bookmarkedpages/BookmarkedPagesPanel.css pages/PageAbstract.css
selector/links/LinksSelectorPanelAbstract.java
Author: danhaywood
Date: Wed Nov 21 00:38:42 2012
New Revision: 1411965
URL: http://svn.apache.org/viewvc?rev=1411965&view=rev
Log:
ISIS-232: fixes while verifying restyling
* remove leading '/' from image references
* fix code so that invoking action for entity collection works.
Modified:
isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.css
isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.css
isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/LinksSelectorPanelAbstract.java
Modified: isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.css
URL: http://svn.apache.org/viewvc/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.css?rev=1411965&r1=1411964&r2=1411965&view=diff
==============================================================================
--- isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.css (original)
+++ isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.css Wed Nov 21 00:38:42 2012
@@ -63,7 +63,7 @@
}
.bookmarkedPagesPanel .clearBookmarks {
- background: url('/images/icon_clear.png') no-repeat center center transparent !important;
+ background: url('images/icon_clear.png') no-repeat center center transparent !important;
border-radius: 4px 4px 4px 4px;
color: #46413B;
display: block;
Modified: isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.css
URL: http://svn.apache.org/viewvc/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.css?rev=1411965&r1=1411964&r2=1411965&view=diff
==============================================================================
--- isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.css (original)
+++ isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.css Wed Nov 21 00:38:42 2012
@@ -27,7 +27,7 @@
.headerContainer {
- background: url("/images/bg_header_brown.png") left top repeat;
+ background: url("images/bg_header_brown.png") left top repeat;
}
.headerContainer .links>span:first-child {
Modified: isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/LinksSelectorPanelAbstract.java
URL: http://svn.apache.org/viewvc/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/LinksSelectorPanelAbstract.java?rev=1411965&r1=1411964&r2=1411965&view=diff
==============================================================================
--- isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/LinksSelectorPanelAbstract.java (original)
+++ isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/LinksSelectorPanelAbstract.java Wed Nov 21 00:38:42 2012
@@ -109,11 +109,11 @@ public abstract class LinksSelectorPanel
Label viewTitleLabel = new Label(ID_ADDITIONAL_LINK_TITLE, linkAndLabel.getLabel());
viewTitleLabel.add(new CssClassAppender(StringUtils.toLowerDashed(linkAndLabel.getLabel())));
- link.add(viewTitleLabel);
- item.add(link);
+ link.addOrReplace(viewTitleLabel);
+ item.addOrReplace(link);
}
};
- container.add(listView);
+ container.addOrReplace(listView);
addOrReplace(views);