Author: danhaywood
Date: Fri Nov 23 18:24:14 2012
New Revision: 1413014
URL: http://svn.apache.org/viewvc?rev=1413014&view=rev
Log:
ISIS-232: making logo into hyperlink back to home page
Modified:
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/pages/PageAbstract.html
isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
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=1413014&r1=1413013&r2=1413014&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
Fri Nov 23 18:24:14 2012
@@ -22,10 +22,10 @@
width: 73%;
float: left;
height: 60px;
- background: transparent url("/images/logo.png") left center no-repeat;
+ background: transparent url("images/logo.png") left center no-repeat;
}
-#header h1 {
+#header .applicationName {
display:none;
}
.headerContainer {
Modified:
isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.html
URL:
http://svn.apache.org/viewvc/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.html?rev=1413014&r1=1413013&r2=1413014&view=diff
==============================================================================
---
isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.html
(original)
+++
isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.html
Fri Nov 23 18:24:14 2012
@@ -33,9 +33,14 @@
<div id="container" class="page">
<div class="headerContainer">
- <div id="header">
- <h1><span
wicket:id="applicationName">[application name]</span></h1>
+ <div>
+ <h1>
+ <a wicket:id="homePageLink"
id="header" href="#">
+ <span
wicket:id="applicationName" class="applicationName">[application name]</span>
+ </a>
+ </h1>
</div>
+
<div id="secondaryMenu">
<div class="links">
<span
wicket:id="userName">[username]</span>
Modified:
isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
URL:
http://svn.apache.org/viewvc/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java?rev=1413014&r1=1413013&r2=1413014&view=diff
==============================================================================
---
isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
(original)
+++
isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
Fri Nov 23 18:24:14 2012
@@ -44,6 +44,7 @@ import org.apache.wicket.markup.head.IHe
import org.apache.wicket.markup.head.JavaScriptReferenceHeaderItem;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.link.ExternalLink;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.model.IModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
@@ -57,10 +58,11 @@ import com.google.inject.name.Named;
*/
public abstract class PageAbstract extends WebPage {
- private static final String ID_BOOKMARKED_PAGES = "breadcrumbs";
private static final long serialVersionUID = 1L;
+ private static final String ID_BOOKMARKED_PAGES = "breadcrumbs";
+ private static final String ID_HOME_PAGE_LINK = "homePageLink";
private static final String ID_APPLICATION_NAME = "applicationName";
private static final String ID_USER_NAME = "userName";
@@ -99,7 +101,7 @@ public abstract class PageAbstract exten
addApplicationActionsComponent();
this.childComponentIds =
Collections.unmodifiableList(Arrays.asList(childComponentIds));
this.pageParameters = pageParameters;
- addApplicationName();
+ addHomePageLinkAndApplicationName();
addUserName();
addLogoutLink();
addAboutLink();
@@ -122,8 +124,11 @@ public abstract class PageAbstract exten
}
}
- private void addApplicationName() {
- add(new Label(ID_APPLICATION_NAME, applicationName));
+ private void addHomePageLinkAndApplicationName() {
+ ExternalLink homePageLink = new ExternalLink(ID_HOME_PAGE_LINK, "/");
+ homePageLink.setContextRelative(true);
+ add(homePageLink);
+ homePageLink.add(new Label(ID_APPLICATION_NAME, applicationName));
}
private void addUserName() {
