Changeset 5576

Timestamp:

08/20/14 09:39:14 (10 years ago)

Author:

Twan Goosen

Message:

Title link to actual app home page
Refs #594

Location:

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/pages

Files:

• BasePage.html (modified) (1 diff)
• BasePage.java (modified) (5 diffs)

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/pages/BasePage.html

@@ -26 +26 @@
                             <span class="icon-bar"></span>
                         </button>
-                        <a class="navbar-brand" href="/"><header>Virtual Collection Registry</header></a>
+                        <a class="navbar-brand" wicket:id="homelink"><header>Virtual Collection Registry</header></a>
                     </div>
 

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/pages/BasePage.java

@@ -8 +8 @@
 import org.apache.wicket.WicketRuntimeException;
 import org.apache.wicket.markup.html.WebPage;
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
 import org.apache.wicket.markup.html.panel.FeedbackPanel;
 import org.apache.wicket.model.IModel;
@@ -17 +18 @@
     @SpringBean
     private AdminUsersService adminUsersService;
-
+    
     protected BasePage(IModel<?> model) {
         super(model);
@@ -40 +41 @@
         
         add(new FeedbackPanel("feedback"));
+        
+        add(new BookmarkablePageLink("homelink", getApplication().getHomePage())
+                .setAutoEnable(false));
     }
-
+    
     protected BasePage() {
         this(null);
     }
-
+    
     @Override
     protected void onBeforeRender() {
         // skip lazy auto-auth for login page
         if (!this.getClass().isInstance(LoginPage.class)) {
-            final HttpServletRequest request =
-                getWebRequestCycle().getWebRequest().getHttpServletRequest();
-            final ApplicationSession session =
-                (ApplicationSession) getSession();
+            final HttpServletRequest request
+                    = getWebRequestCycle().getWebRequest().getHttpServletRequest();
+            final ApplicationSession session
+                    = (ApplicationSession) getSession();
             if (!session.isSignedIn()) {
                 if (request.getAuthType() != null) {
@@ -78 +82 @@
         super.onBeforeRender();
     }
-
+    
     protected Principal getUser() {
         ApplicationSession session = (ApplicationSession) getSession();
@@ -98 +102 @@
     }
     
-    
-
 } // class BasePage