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/19 13:40:51 UTC
[74/78] [abbrv] git commit: ISIS-537 Use fixed top navigation bar.
ISIS-537 Use fixed top navigation bar.
https://trello.com/c/KuelbIOY/63-header-should-be-fixed
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/3d58eca2
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/3d58eca2
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/3d58eca2
Branch: refs/heads/master
Commit: 3d58eca2bd5c1de708540ed976b25ffdc35c7bbd
Parents: aa5b265
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Sat Oct 18 17:19:28 2014 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Sat Oct 18 17:19:28 2014 +0300
----------------------------------------------------------------------
.../viewer/wicket/ui/pages/PageAbstract.html | 10 ++--
.../viewer/wicket/ui/pages/PageAbstract.java | 52 +++++++++-----------
.../wicket/ui/pages/bootstrap-overrides.css | 2 +
3 files changed, 33 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/3d58eca2/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.html
index 0f5bc83..3967a29 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.html
@@ -33,9 +33,7 @@
<div id="container" class="page container-fluid">
<div wicket:id="theme">
- <header wicket:id="navbar" style="margin-bottom: 0"></header>
-
- <header class="navbar navbar-default" role="navigation">
+ <header class="navbar navbar-default navbar-fixed-top" role="navigation" style="margin-bottom: 30px">
<div class="container-fluid">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse.app-actions">
@@ -44,9 +42,15 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
+ <a class="navbar-brand" wicket:id="applicationName"></a>
</div>
<div class="navbar-collapse app-actions collapse">
<ul class="nav navbar-nav" wicket:id="applicationActions"></ul>
+ <ul class="nav navbar-nav navbar-right">
+ <p class="navbar-text" wicket:id="userName"></p>
+ <li><a wicket:id="logoutLink">Logout</a></li>
+ <li><a wicket:id="aboutLink">About</a></li>
+ </ul>
<form class="navbar-form navbar-right">
<div wicket:id="breadcrumbs" style="width: 200px"></div>
</form>
http://git-wip-us.apache.org/repos/asf/isis/blob/3d58eca2/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
index 3d878ff..9fc0789 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
@@ -20,11 +20,6 @@
package org.apache.isis.viewer.wicket.ui.pages;
import de.agilecoders.wicket.core.markup.html.bootstrap.behavior.BootstrapBaseBehavior;
-import de.agilecoders.wicket.core.markup.html.bootstrap.navbar.ImmutableNavbarComponent;
-import de.agilecoders.wicket.core.markup.html.bootstrap.navbar.Navbar;
-import de.agilecoders.wicket.core.markup.html.bootstrap.navbar.NavbarAjaxLink;
-import de.agilecoders.wicket.core.markup.html.bootstrap.navbar.NavbarButton;
-import de.agilecoders.wicket.core.markup.html.bootstrap.navbar.NavbarText;
import de.agilecoders.wicket.core.markup.html.references.BootlintJavaScriptReference;
import de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesomeCssReference;
@@ -36,7 +31,6 @@ import com.google.inject.name.Named;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.Page;
import org.apache.wicket.RestartResponseAtInterceptPageException;
-import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.event.Broadcast;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.CssReferenceHeaderItem;
@@ -48,6 +42,8 @@ import org.apache.wicket.markup.head.filter.HeaderResponseContainer;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
+import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.model.ResourceModel;
@@ -182,20 +178,13 @@ public abstract class PageAbstract extends WebPage implements ActionPromptProvid
addApplicationActions(themeDiv);
- Navbar navbar = new Navbar("navbar");
- themeDiv.add(navbar);
-
- navbar.fluid();
-
- navbar.setBrandName(Model.of(applicationName));
-
-
this.childComponentIds = Collections.unmodifiableList(Arrays.asList(childComponentIds));
this.pageParameters = pageParameters;
- addUserName(navbar);
- addLogoutLink(navbar);
- addAboutLink(navbar);
+ addApplicationName(themeDiv);
+ addUserName(themeDiv);
+ addLogoutLink(themeDiv);
+ addAboutLink(themeDiv);
addBreadcrumbs();
addThemePicker();
@@ -223,6 +212,12 @@ public abstract class PageAbstract extends WebPage implements ActionPromptProvid
}
}
+ private void addApplicationName(MarkupContainer themeDiv) {
+ BookmarkablePageLink<Void> applicationNameLink = homePageLink("applicationName");
+ applicationNameLink.setBody(Model.of(applicationName));
+ themeDiv.add(applicationNameLink);
+ }
+
private void addThemePicker() {
ThemePicker themePicker = new ThemePicker(ID_THEME_PICKER);
themeDiv.addOrReplace(themePicker);
@@ -291,27 +286,28 @@ public abstract class PageAbstract extends WebPage implements ActionPromptProvid
}
}
- private void addUserName(Navbar navbar) {
- NavbarText userName = new NavbarText(navbar.newExtraItemId(), getAuthenticationSession().getUserName());
- userName.position(Navbar.ComponentPosition.RIGHT);
- navbar.addComponents(userName);
+ private void addUserName(MarkupContainer themeDiv) {
+ Label userName = new Label("userName", getAuthenticationSession().getUserName());
+ themeDiv.add(userName);
}
- private void addLogoutLink(Navbar navbar) {
- NavbarAjaxLink logoutLink = new NavbarAjaxLink(new ResourceModel("logoutLabel")) {
+ private void addLogoutLink(MarkupContainer themeDiv) {
+ Link logoutLink = new Link("logoutLink") {
@Override
- public void onClick(AjaxRequestTarget target) {
+ public void onClick() {
getSession().invalidate();
setResponsePage(getSignInPage());
}
};
- navbar.addComponents(new ImmutableNavbarComponent(logoutLink, Navbar.ComponentPosition.RIGHT));
+ logoutLink.setBody(new ResourceModel("logoutLabel"));
+ themeDiv.add(logoutLink);
}
- private void addAboutLink(Navbar navbar) {
- NavbarButton aboutLink = new NavbarButton(AboutPage.class, new ResourceModel("aboutLabel"));
- navbar.addComponents(new ImmutableNavbarComponent(aboutLink, Navbar.ComponentPosition.RIGHT));
+ private void addAboutLink(MarkupContainer themeDiv) {
+ BookmarkablePageLink<Void> aboutLink = new BookmarkablePageLink<>("aboutLink", AboutPage.class);
+ aboutLink.setBody(new ResourceModel("aboutLabel"));
+ themeDiv.add(aboutLink);
}
private void addBreadcrumbs() {
http://git-wip-us.apache.org/repos/asf/isis/blob/3d58eca2/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 e8ebbe4..886e498 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
@@ -66,3 +66,5 @@
.pagination {
margin: 0;
}
+
+body { padding-top: 70px; }