From d6b70ab47bc5be26a9671dfd3a0a3dd9fa044eb4 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 20 Oct 2014 16:17:39 -0400
Subject: [PATCH] Prepare 1.6.1 release
---
src/main/java/com/gitblit/wicket/pages/ProjectsPage.java | 131 +++++--------------------------------------
1 files changed, 16 insertions(+), 115 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/pages/ProjectsPage.java b/src/main/java/com/gitblit/wicket/pages/ProjectsPage.java
index 7f0b002..f04fa78 100644
--- a/src/main/java/com/gitblit/wicket/pages/ProjectsPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/ProjectsPage.java
@@ -15,33 +15,20 @@
*/
package com.gitblit.wicket.pages;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.text.MessageFormat;
-import java.util.ArrayList;
import java.util.List;
-import org.apache.wicket.Component;
import org.apache.wicket.PageParameters;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.repeater.Item;
import org.apache.wicket.markup.repeater.data.DataView;
import org.apache.wicket.markup.repeater.data.ListDataProvider;
-import org.apache.wicket.resource.ContextRelativeResource;
-import org.apache.wicket.util.resource.ResourceStreamNotFoundException;
-import org.eclipse.jgit.lib.Constants;
-import com.gitblit.GitBlit;
import com.gitblit.Keys;
+import com.gitblit.models.Menu.ParameterMenuItem;
+import com.gitblit.models.NavLink.DropDownPageMenuNavLink;
+import com.gitblit.models.NavLink;
import com.gitblit.models.ProjectModel;
-import com.gitblit.utils.MarkdownUtils;
-import com.gitblit.utils.StringUtils;
import com.gitblit.wicket.GitBlitWebSession;
-import com.gitblit.wicket.PageRegistration;
-import com.gitblit.wicket.PageRegistration.DropDownMenuItem;
-import com.gitblit.wicket.PageRegistration.DropDownMenuRegistration;
import com.gitblit.wicket.WicketUtils;
import com.gitblit.wicket.panels.LinkPanel;
@@ -61,31 +48,25 @@
protected boolean reusePageParameters() {
return true;
}
-
+
+ @Override
+ protected Class<? extends BasePage> getRootNavPageClass() {
+ return RepositoriesPage.class;
+ }
+
@Override
protected List<ProjectModel> getProjectModels() {
- return GitBlit.self().getProjectModels(getRepositoryModels(), false);
+ return app().projects().getProjectModels(getRepositoryModels(), false);
}
private void setup(PageParameters params) {
setupPage("", "");
// check to see if we should display a login message
- boolean authenticateView = GitBlit.getBoolean(Keys.web.authenticateViewPages, true);
+ boolean authenticateView = app().settings().getBoolean(Keys.web.authenticateViewPages, true);
if (authenticateView && !GitBlitWebSession.get().isLoggedIn()) {
- String messageSource = GitBlit.getString(Keys.web.loginMessage, "gitblit");
- String message = readMarkdown(messageSource, "login.mkd");
- Component repositoriesMessage = new Label("projectsMessage", message);
- add(repositoriesMessage.setEscapeModelStrings(false));
add(new Label("projectsPanel"));
return;
}
-
- // Load the markdown welcome message
- String messageSource = GitBlit.getString(Keys.web.repositoriesMessage, "gitblit");
- String message = readMarkdown(messageSource, "welcome.mkd");
- Component projectsMessage = new Label("projectsMessage", message).setEscapeModelStrings(
- false).setVisible(message.length() > 0);
- add(projectsMessage);
List<ProjectModel> projects = getProjects(params);
@@ -101,6 +82,7 @@
counter = 0;
}
+ @Override
public void populateItem(final Item<ProjectModel> item) {
final ProjectModel entry = item.getModelObject();
@@ -130,21 +112,13 @@
}
};
add(dataView);
-
- // push the panel down if we are hiding the admin controls and the
- // welcome message
- if (!showAdmin && !projectsMessage.isVisible()) {
- WicketUtils.setCssStyle(dataView, "padding-top:5px;");
- }
}
@Override
- protected void addDropDownMenus(List<PageRegistration> pages) {
+ protected void addDropDownMenus(List<NavLink> navLinks) {
PageParameters params = getPageParameters();
-
- pages.add(0, new PageRegistration("gb.projects", ProjectsPage.class, params));
- DropDownMenuRegistration menu = new DropDownMenuRegistration("gb.filters",
+ DropDownPageMenuNavLink menu = new DropDownPageMenuNavLink("gb.filters",
ProjectsPage.class);
// preserve time filter option on repository choices
menu.menuItems.addAll(getRepositoryFilterItems(params));
@@ -154,82 +128,9 @@
if (menu.menuItems.size() > 0) {
// Reset Filter
- menu.menuItems.add(new DropDownMenuItem(getString("gb.reset"), null, null));
+ menu.menuItems.add(new ParameterMenuItem(getString("gb.reset")));
}
- pages.add(menu);
- }
-
- private String readMarkdown(String messageSource, String resource) {
- String message = "";
- if (messageSource.equalsIgnoreCase("gitblit")) {
- // Read default message
- message = readDefaultMarkdown(resource);
- } else {
- // Read user-supplied message
- if (!StringUtils.isEmpty(messageSource)) {
- File file = new File(messageSource);
- if (file.exists()) {
- try {
- FileInputStream fis = new FileInputStream(file);
- InputStreamReader reader = new InputStreamReader(fis,
- Constants.CHARACTER_ENCODING);
- message = MarkdownUtils.transformMarkdown(reader);
- reader.close();
- } catch (Throwable t) {
- message = getString("gb.failedToRead") + " " + file;
- warn(message, t);
- }
- } else {
- message = messageSource + " " + getString("gb.isNotValidFile");
- }
- }
- }
- return message;
- }
-
- private String readDefaultMarkdown(String file) {
- String base = file.substring(0, file.lastIndexOf('.'));
- String ext = file.substring(file.lastIndexOf('.'));
- String lc = getLanguageCode();
- String cc = getCountryCode();
-
- // try to read file_en-us.ext, file_en.ext, file.ext
- List<String> files = new ArrayList<String>();
- if (!StringUtils.isEmpty(lc)) {
- if (!StringUtils.isEmpty(cc)) {
- files.add(base + "_" + lc + "-" + cc + ext);
- files.add(base + "_" + lc + "_" + cc + ext);
- }
- files.add(base + "_" + lc + ext);
- }
- files.add(file);
-
- for (String name : files) {
- String message;
- InputStreamReader reader = null;
- try {
- ContextRelativeResource res = WicketUtils.getResource(name);
- InputStream is = res.getResourceStream().getInputStream();
- reader = new InputStreamReader(is, Constants.CHARACTER_ENCODING);
- message = MarkdownUtils.transformMarkdown(reader);
- reader.close();
- return message;
- } catch (ResourceStreamNotFoundException t) {
- continue;
- } catch (Throwable t) {
- message = MessageFormat.format(getString("gb.failedToReadMessage"), file);
- error(message, t, false);
- return message;
- } finally {
- if (reader != null) {
- try {
- reader.close();
- } catch (Exception e) {
- }
- }
- }
- }
- return MessageFormat.format(getString("gb.failedToReadMessage"), file);
+ navLinks.add(menu);
}
}
--
Gitblit v1.9.1