From 16653e916fbf6b64baaaed2247d34d8f2372b89e Mon Sep 17 00:00:00 2001 From: pbe <pbe@remmert.de> Date: Mon, 05 May 2014 08:41:19 -0400 Subject: [PATCH] Added TortoiseGit to the clientapps --- src/main/java/com/gitblit/wicket/pages/RepositoriesPage.java | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/gitblit/wicket/pages/RepositoriesPage.java b/src/main/java/com/gitblit/wicket/pages/RepositoriesPage.java index b446279..f4ddf40 100644 --- a/src/main/java/com/gitblit/wicket/pages/RepositoriesPage.java +++ b/src/main/java/com/gitblit/wicket/pages/RepositoriesPage.java @@ -28,7 +28,6 @@ import org.apache.wicket.markup.html.basic.Label; import org.eclipse.jgit.lib.Constants; -import com.gitblit.GitBlit; import com.gitblit.Keys; import com.gitblit.models.RepositoryModel; import com.gitblit.utils.MarkdownUtils; @@ -63,9 +62,9 @@ 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 messageSource = app().settings().getString(Keys.web.loginMessage, "gitblit"); String message = readMarkdown(messageSource, "login.mkd"); Component repositoriesMessage = new Label("repositoriesMessage", message); add(repositoriesMessage.setEscapeModelStrings(false)); @@ -74,7 +73,7 @@ } // Load the markdown welcome message - String messageSource = GitBlit.getString(Keys.web.repositoriesMessage, "gitblit"); + String messageSource = app().settings().getString(Keys.web.repositoriesMessage, "gitblit"); String message = readMarkdown(messageSource, "welcome.mkd"); Component repositoriesMessage = new Label("repositoriesMessage", message) .setEscapeModelStrings(false).setVisible(message.length() > 0); @@ -120,7 +119,7 @@ } else { // Read user-supplied message if (!StringUtils.isEmpty(messageSource)) { - File file = GitBlit.getFileOrFolder(messageSource); + File file = app().runtime().getFileOrFolder(messageSource); if (file.exists()) { try { FileInputStream fis = new FileInputStream(file); @@ -151,7 +150,7 @@ if (!StringUtils.isEmpty(lc)) { if (!StringUtils.isEmpty(cc)) { files.add(base + "_" + lc + "-" + cc + ext); - files.add(base + "_" + lc + "_" + cc + ext); + files.add(base + "_" + lc + "_" + cc.toUpperCase() + ext); } files.add(base + "_" + lc + ext); } -- Gitblit v1.9.1