Skip to content

Commit 9e5beee

Browse files
gitblitgitblit
committed
Refactored topbar navigation links to indicate current page.
1 parent 10177fb commit 9e5beee

File tree

9 files changed

+187
-139
lines changed

9 files changed

+187
-139
lines changed

‎resources/arrow_page.png

191 Bytes
Loading

‎resources/bootstrap.gb.css

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,12 @@ hr {
4646
border-bottom: 2px solid #ff9900 !important;
4747
}
4848

49+
.topbar ul li:focus, .topbar .active {
50+
background-repeat:no-repeat;
51+
background-image: url(arrow_page.png);
52+
background-position: center bottom;
53+
}
54+
4955
.breadcrumb {
5056
margin-top: 5px !important;
5157
margin-bottom: 5px !important;

‎src/com/gitblit/wicket/PageRegistration.java

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
/*
2+
* Copyright 2011 gitblit.com.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
package com.gitblit.wicket;
17+
18+
import java.io.Serializable;
19+
20+
import org.apache.wicket.PageParameters;
21+
22+
import com.gitblit.wicket.pages.BasePage;
23+
24+
/**
25+
* Represents a page link registration for the topbar.
26+
*
27+
* @author James Moger
28+
*
29+
*/
30+
public class PageRegistration implements Serializable {
31+
private static final long serialVersionUID = 1L;
32+
33+
public final String translationKey;
34+
public final Class<? extends BasePage> pageClass;
35+
public final PageParameters params;
36+
37+
public PageRegistration(String translationKey, Class<? extends BasePage> pageClass) {
38+
this(translationKey, pageClass, null);
39+
}
40+
41+
public PageRegistration(String translationKey, Class<? extends BasePage> pageClass,
42+
PageParameters params) {
43+
this.translationKey = translationKey;
44+
this.pageClass = pageClass;
45+
this.params = params;
46+
}
47+
}

‎src/com/gitblit/wicket/pages/RepositoryPage.html

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,13 @@
1515
<a class="brand" wicket:id="rootLink">
1616
<img src="gitblt_25_white.png" width="79" height="25" alt="gitblit" class="logo"/>
1717
</a>
18-
<ul class="nav">
19-
<li><a wicket:id="repositories"><wicket:message key="gb.repositories"></wicket:message></a></li>
20-
<li><a wicket:id="summary"><wicket:message key="gb.summary"></wicket:message></a></li>
21-
<li><a wicket:id="log"><wicket:message key="gb.log"></wicket:message></a></li>
22-
<li><a wicket:id="branches"><wicket:message key="gb.branches"></wicket:message></a></li>
23-
<li><a wicket:id="tags"><wicket:message key="gb.tags"></wicket:message></a></li>
24-
<li><a wicket:id="tree"><wicket:message key="gb.tree"></wicket:message></a></li>
25-
<li wicket:id="extra"><span wicket:id="extraLink"></span></li>
26-
<li><a style="text-decoration: none;" wicket:id="syndication">
27-
<img style="border:0px;vertical-align:middle;" src="feed_16x16.png"></img></a>
28-
</li>
29-
</ul>
18+
19+
<span wicket:id="navPanel"></span>
20+
21+
<a class="brand" style="text-decoration: none;" wicket:id="syndication">
22+
<img style="border:0px;vertical-align:middle;" src="feed_16x16.png"></img>
23+
</a>
24+
3025
<form class="pull-right" wicket:id="searchForm">
3126
<div class="search">
3227
<select class="small" wicket:id="searchType"/>

‎src/com/gitblit/wicket/pages/RepositoryPage.java

Lines changed: 48 additions & 117 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import java.text.MessageFormat;
2020
import java.util.ArrayList;
2121
import java.util.Arrays;
22-
import java.util.HashMap;
22+
import java.util.LinkedHashMap;
2323
import java.util.List;
2424
import java.util.Map;
2525

@@ -29,12 +29,8 @@
2929
import org.apache.wicket.markup.html.form.DropDownChoice;
3030
import org.apache.wicket.markup.html.form.StatelessForm;
3131
import org.apache.wicket.markup.html.form.TextField;
32-
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
3332
import org.apache.wicket.markup.html.link.ExternalLink;
3433
import org.apache.wicket.markup.html.panel.Fragment;
35-
import org.apache.wicket.markup.repeater.Item;
36-
import org.apache.wicket.markup.repeater.data.DataView;
37-
import org.apache.wicket.markup.repeater.data.ListDataProvider;
3834
import org.apache.wicket.model.IModel;
3935
import org.apache.wicket.model.Model;
4036
import org.eclipse.jgit.diff.DiffEntry.ChangeType;
@@ -51,8 +47,10 @@
5147
import com.gitblit.utils.StringUtils;
5248
import com.gitblit.utils.TicgitUtils;
5349
import com.gitblit.wicket.GitBlitWebSession;
50+
import com.gitblit.wicket.PageRegistration;
5451
import com.gitblit.wicket.WicketUtils;
5552
import com.gitblit.wicket.panels.LinkPanel;
53+
import com.gitblit.wicket.panels.NavigationPanel;
5654
import com.gitblit.wicket.panels.RefsPanel;
5755

5856
public abstract class RepositoryPage extends BasePage {
@@ -64,22 +62,7 @@ public abstract class RepositoryPage extends BasePage {
6462

6563
private RepositoryModel m;
6664

67-
private final Map<String, PageRegistration> registeredPages = new HashMap<String, PageRegistration>() {
68-
69-
private static final long serialVersionUID = 1L;
70-
71-
{
72-
put("repositories", new PageRegistration("gb.repositories", RepositoriesPage.class, false));
73-
put("summary", new PageRegistration("gb.summary", SummaryPage.class));
74-
put("log", new PageRegistration("gb.log", LogPage.class));
75-
put("branches", new PageRegistration("gb.branches", BranchesPage.class));
76-
put("tags", new PageRegistration("gb.tags", TagsPage.class));
77-
put("tree", new PageRegistration("gb.tree", TreePage.class));
78-
put("tickets", new PageRegistration("gb.tickets", TicketsPage.class));
79-
put("edit", new PageRegistration("gb.edit", EditRepositoryPage.class));
80-
put("docs", new PageRegistration("gb.docs", DocsPage.class));
81-
}
82-
};
65+
private final Map<String, PageRegistration> registeredPages;
8366

8467
public RepositoryPage(PageParameters params) {
8568
super(params);
@@ -90,72 +73,69 @@ public RepositoryPage(PageParameters params) {
9073
error(MessageFormat.format("Repository not specified for {0}!", getPageName()), true);
9174
}
9275

93-
Repository r = getRepository();
94-
RepositoryModel model = getRepositoryModel();
76+
// register the available page links for this page and user
77+
registeredPages = registerPages();
9578

9679
// standard page links
97-
addRegisteredPageLink("repositories");
98-
addRegisteredPageLink("summary");
99-
addRegisteredPageLink("log");
100-
addRegisteredPageLink("branches");
101-
addRegisteredPageLink("tags");
102-
addRegisteredPageLink("tree");
80+
List<PageRegistration> pages = new ArrayList<PageRegistration>(registeredPages.values());
81+
NavigationPanel navigationPanel = new NavigationPanel("navPanel", getClass(), pages);
82+
add(navigationPanel);
83+
84+
add(new ExternalLink("syndication", SyndicationServlet.asLink(getRequest()
85+
.getRelativePathPrefixToContextRoot(), repositoryName, null, 0)));
86+
87+
// add floating search form
88+
SearchForm searchForm = new SearchForm("searchForm", repositoryName);
89+
add(searchForm);
90+
searchForm.setTranslatedAttributes();
91+
92+
// set stateless page preference
93+
setStatelessHint(true);
94+
}
95+
96+
private Map<String, PageRegistration> registerPages() {
97+
PageParameters params = null;
98+
if (!StringUtils.isEmpty(repositoryName)) {
99+
params = WicketUtils.newRepositoryParameter(repositoryName);
100+
}
101+
Map<String, PageRegistration> pages = new LinkedHashMap<String, PageRegistration>();
102+
103+
// standard links
104+
pages.put("repositories", new PageRegistration("gb.repositories", RepositoriesPage.class));
105+
pages.put("summary", new PageRegistration("gb.summary", SummaryPage.class, params));
106+
pages.put("log", new PageRegistration("gb.log", LogPage.class, params));
107+
pages.put("branches", new PageRegistration("gb.branches", BranchesPage.class, params));
108+
pages.put("tags", new PageRegistration("gb.tags", TagsPage.class, params));
109+
pages.put("tree", new PageRegistration("gb.tree", TreePage.class, params));
110+
111+
// conditional links
112+
Repository r = getRepository();
113+
RepositoryModel model = getRepositoryModel();
103114

104115
// per-repository extra page links
105-
List<String> extraPageLinks = new ArrayList<String>();
106116
if (model.useTickets && TicgitUtils.getTicketsBranch(r) != null) {
107-
extraPageLinks.add("tickets");
117+
pages.put("tickets", new PageRegistration("gb.tickets", TicketsPage.class, params));
108118
}
109119
if (model.useDocs) {
110-
extraPageLinks.add("docs");
120+
pages.put("docs", new PageRegistration("gb.docs", DocsPage.class, params));
111121
}
112-
122+
// Conditionally add edit link
113123
final boolean showAdmin;
114124
if (GitBlit.getBoolean(Keys.web.authenticateAdminPages, true)) {
115125
boolean allowAdmin = GitBlit.getBoolean(Keys.web.allowAdministration, false);
116126
showAdmin = allowAdmin && GitBlitWebSession.get().canAdmin();
117127
} else {
118128
showAdmin = GitBlit.getBoolean(Keys.web.allowAdministration, false);
119129
}
120-
121-
// Conditionally add edit link
122130
if (showAdmin
123131
|| GitBlitWebSession.get().isLoggedIn()
124132
&& (model.owner != null && model.owner.equalsIgnoreCase(GitBlitWebSession.get()
125133
.getUser().username))) {
126-
extraPageLinks.add("edit");
134+
pages.put("edit", new PageRegistration("gb.edit", EditRepositoryPage.class, params));
127135
}
128-
129-
final String pageName = getPageName();
130-
final String pageWicketId = getLinkWicketId(pageName);
131-
ListDataProvider<String> extrasDp = new ListDataProvider<String>(extraPageLinks);
132-
DataView<String> extrasView = new DataView<String>("extra", extrasDp) {
133-
private static final long serialVersionUID = 1L;
134-
135-
public void populateItem(final Item<String> item) {
136-
String extra = item.getModelObject();
137-
PageRegistration pageReg = registeredPages.get(extra);
138-
item.add(new LinkPanel("extraLink", null, getString(pageReg.translationKey),
139-
pageReg.pageClass, WicketUtils.newRepositoryParameter(repositoryName)));
140-
}
141-
};
142-
add(extrasView);
143-
144-
add(new ExternalLink("syndication", SyndicationServlet.asLink(getRequest()
145-
.getRelativePathPrefixToContextRoot(), repositoryName, null, 0)));
146-
147-
// disable current page
148-
disableRegisteredPageLink(pageName);
149-
150-
// add floating search form
151-
SearchForm searchForm = new SearchForm("searchForm", repositoryName);
152-
add(searchForm);
153-
searchForm.setTranslatedAttributes();
154-
155-
// set stateless page preference
156-
setStatelessHint(true);
136+
return pages;
157137
}
158-
138+
159139
@Override
160140
protected void setupPage(String repositoryName, String pageName) {
161141
add(new LinkPanel("repositoryName", null, repositoryName, SummaryPage.class,
@@ -165,38 +145,6 @@ protected void setupPage(String repositoryName, String pageName) {
165145
super.setupPage(repositoryName, pageName);
166146
}
167147

168-
public String getLinkWicketId(String pageName) {
169-
for (String wicketId : registeredPages.keySet()) {
170-
String key = registeredPages.get(wicketId).translationKey;
171-
String linkName = getString(key);
172-
if (linkName.equals(pageName)) {
173-
return wicketId;
174-
}
175-
}
176-
return null;
177-
}
178-
179-
public void disableRegisteredPageLink(String pageName) {
180-
String wicketId = getLinkWicketId(pageName);
181-
if (!StringUtils.isEmpty(wicketId)) {
182-
Component c = get(wicketId);
183-
if (c != null) {
184-
// c.setEnabled(false);
185-
// WicketUtils.setCssClass(c, "selected");
186-
}
187-
}
188-
}
189-
190-
private void addRegisteredPageLink(String key) {
191-
PageRegistration pageReg = registeredPages.get(key);
192-
if (pageReg.repositoryLink) {
193-
add(new BookmarkablePageLink<Void>(key, pageReg.pageClass,
194-
WicketUtils.newRepositoryParameter(repositoryName)));
195-
} else {
196-
add(new BookmarkablePageLink<Void>(key, pageReg.pageClass));
197-
}
198-
}
199-
200148
protected void addSyndicationDiscoveryLink() {
201149
add(WicketUtils.syndicationDiscoveryLink(SyndicationServlet.getTitle(repositoryName,
202150
objectId), SyndicationServlet.asLink(getRequest()
@@ -344,24 +292,6 @@ protected PageParameters newCommitParameter(String commitId) {
344292
return WicketUtils.newObjectParameter(repositoryName, commitId);
345293
}
346294

347-
private static class PageRegistration implements Serializable {
348-
private static final long serialVersionUID = 1L;
349-
350-
final String translationKey;
351-
final Class<? extends BasePage> pageClass;
352-
final boolean repositoryLink;
353-
354-
PageRegistration(String translationKey, Class<? extends BasePage> pageClass) {
355-
this(translationKey, pageClass, true);
356-
}
357-
358-
PageRegistration(String translationKey, Class<? extends BasePage> pageClass, boolean repositoryLink) {
359-
this.translationKey = translationKey;
360-
this.pageClass = pageClass;
361-
this.repositoryLink = repositoryLink;
362-
}
363-
}
364-
365295
private static class SearchForm extends StatelessForm<Void> implements Serializable {
366296
private static final long serialVersionUID = 1L;
367297

@@ -384,7 +314,8 @@ public SearchForm(String id, String repositoryName) {
384314

385315
void setTranslatedAttributes() {
386316
WicketUtils.setHtmlTooltip(get("searchType"), getString("gb.searchTypeTooltip"));
387-
WicketUtils.setHtmlTooltip(get("searchBox"), MessageFormat.format(getString("gb.searchTooltip"), repositoryName));
317+
WicketUtils.setHtmlTooltip(get("searchBox"),
318+
MessageFormat.format(getString("gb.searchTooltip"), repositoryName));
388319
WicketUtils.setInputPlaceholder(get("searchBox"), getString("gb.search"));
389320
}
390321

‎src/com/gitblit/wicket/pages/RootPage.html

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,7 @@
1212
<img src="gitblt_25_white.png" width="79" height="25" alt="gitblit" class="logo"/>
1313
</a>
1414

15-
<ul class="nav">
16-
<li><a wicket:id="repositories"><wicket:message key="gb.repositories"></wicket:message></a></li>
17-
<li><a wicket:id="users"><wicket:message key="gb.users"></wicket:message></a></li>
18-
<li><a wicket:id="federation"><wicket:message key="gb.federation"></wicket:message></a></li>
19-
</ul>
15+
<span wicket:id="navPanel"></span>
2016

2117
<form class="pull-right" wicket:id="loginForm">
2218
<div class="login">

‎src/com/gitblit/wicket/pages/RootPage.java

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,13 @@
1616
package com.gitblit.wicket.pages;
1717

1818
import java.text.MessageFormat;
19+
import java.util.ArrayList;
20+
import java.util.List;
1921

2022
import org.apache.wicket.PageParameters;
2123
import org.apache.wicket.markup.html.form.PasswordTextField;
2224
import org.apache.wicket.markup.html.form.StatelessForm;
2325
import org.apache.wicket.markup.html.form.TextField;
24-
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
2526
import org.apache.wicket.model.IModel;
2627
import org.apache.wicket.model.Model;
2728
import org.apache.wicket.protocol.http.WebResponse;
@@ -32,7 +33,9 @@
3233
import com.gitblit.models.UserModel;
3334
import com.gitblit.utils.StringUtils;
3435
import com.gitblit.wicket.GitBlitWebSession;
36+
import com.gitblit.wicket.PageRegistration;
3537
import com.gitblit.wicket.WicketUtils;
38+
import com.gitblit.wicket.panels.NavigationPanel;
3639

3740
/**
3841
* Root page is a topbar, navigable page like Repositories, Users, or
@@ -77,10 +80,16 @@ protected void setupPage(String repositoryName, String pageName) {
7780
&& GitBlit.getBoolean(Keys.web.showFederationRegistrations, false);
7881

7982
// navigation links
80-
add(new BookmarkablePageLink<Void>("repositories", RepositoriesPage.class));
81-
add(new BookmarkablePageLink<Void>("users", UsersPage.class).setVisible(showAdmin));
82-
add(new BookmarkablePageLink<Void>("federation", FederationPage.class).setVisible(showAdmin
83-
|| showRegistrations));
83+
List<PageRegistration> pages = new ArrayList<PageRegistration>();
84+
pages.add(new PageRegistration("gb.repositories", RepositoriesPage.class));
85+
if (showAdmin) {
86+
pages.add(new PageRegistration("gb.users", UsersPage.class));
87+
}
88+
if (showAdmin || showRegistrations) {
89+
pages.add(new PageRegistration("gb.federation", FederationPage.class));
90+
}
91+
NavigationPanel navPanel = new NavigationPanel("navPanel", getClass(), pages);
92+
add(navPanel);
8493

8594
// login form
8695
StatelessForm<Void> loginForm = new StatelessForm<Void>("loginForm") {

0 commit comments

Comments
 (0)