Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<div class="logo-menu">
<span class="logo" onclick="toggleMobileNav()"></span>
<div class="logo-dropdown">
<a href=".">Home</a>
<a href="/">Home</a>
<a wicket:id="users" href="./userlist">Users</a>
<a wicket:id="connectors" href="./spaces">Spaces</a>
<a wicket:id="query" href="./queries">Query</a>
Expand Down
24 changes: 15 additions & 9 deletions src/main/java/com/knowledgepixels/nanodash/component/TitleBar.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@

import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.markup.repeater.Item;
import org.apache.wicket.markup.repeater.data.DataView;
Expand All @@ -14,6 +16,10 @@
import com.knowledgepixels.nanodash.NanodashPreferences;
import com.knowledgepixels.nanodash.Utils;
import com.knowledgepixels.nanodash.page.NanodashPage;
import com.knowledgepixels.nanodash.page.PublishPage;
import com.knowledgepixels.nanodash.page.QueryListPage;
import com.knowledgepixels.nanodash.page.SpaceListPage;
import com.knowledgepixels.nanodash.page.UserListPage;

/**
* TitleBar is the top bar of the Nanodash application, which contains
Expand All @@ -38,10 +44,10 @@ public TitleBar(String id, NanodashPage page, String highlight, NanodashPageRef.
this.highlight = highlight;
add(new ProfileItem("profile", page));

createContainer("users");
createContainer("connectors");
createContainer("publish").setVisible(!NanodashPreferences.get().isReadOnlyMode());
createContainer("query");
createNavLink("users", UserListPage.class);
createNavLink("connectors", SpaceListPage.class);
createNavLink("publish", PublishPage.class).setVisible(!NanodashPreferences.get().isReadOnlyMode());
createNavLink("query", QueryListPage.class);

WebMarkupContainer breadcrumbPath = new WebMarkupContainer("breadcrumbpath");
breadcrumbPath.setVisible(pathRefs.length > 0);
Expand Down Expand Up @@ -125,13 +131,13 @@ private static String stripParentPrefix(String parent, String child) {
return remainder;
}

private WebMarkupContainer createContainer(String id) {
WebMarkupContainer c = new WebMarkupContainer(id);
private BookmarkablePageLink<Void> createNavLink(String id, Class<? extends WebPage> pageClass) {
BookmarkablePageLink<Void> link = new BookmarkablePageLink<>(id, pageClass);
if (id.equals(highlight)) {
c.add(new AttributeAppender("class", "selected"));
link.add(new AttributeAppender("class", "selected"));
}
add(c);
return c;
add(link);
return link;
}

}