From: James Moger Date: Mon, 16 May 2011 20:45:51 +0000 (-0400) Subject: Move admin links. Drop extra GitBlit link. Line numbers on Blob page. X-Git-Tag: v0.5.0~48 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=7812236b90f39fd92699017f376f1b50c4ea24cb;p=gitblit.git Move admin links. Drop extra GitBlit link. Line numbers on Blob page. --- diff --git a/src/com/gitblit/utils/JGitUtils.java b/src/com/gitblit/utils/JGitUtils.java index f86596d5..c9c13c56 100644 --- a/src/com/gitblit/utils/JGitUtils.java +++ b/src/com/gitblit/utils/JGitUtils.java @@ -80,6 +80,9 @@ public class JGitUtils { public static List getNestedRepositories(File repositoriesFolder, File folder, boolean exportAll, boolean readNested) { String basefile = repositoriesFolder.getAbsolutePath(); List list = new ArrayList(); + if (folder == null || !folder.exists()) { + return list; + } for (File file : folder.listFiles()) { if (file.isDirectory() && !file.getName().equalsIgnoreCase(Constants.DOT_GIT)) { // if this is a git repository add it to the list diff --git a/src/com/gitblit/wicket/BasePage.html b/src/com/gitblit/wicket/BasePage.html index 0ec9e181..0e8705c6 100644 --- a/src/com/gitblit/wicket/BasePage.html +++ b/src/com/gitblit/wicket/BasePage.html @@ -32,7 +32,7 @@ diff --git a/src/com/gitblit/wicket/pages/BlobPage.java b/src/com/gitblit/wicket/pages/BlobPage.java index 938eaabe..d28ff324 100644 --- a/src/com/gitblit/wicket/pages/BlobPage.java +++ b/src/com/gitblit/wicket/pages/BlobPage.java @@ -75,7 +75,7 @@ public class BlobPage extends RepositoryPage { case 1: // PrettyPrint blob text c = new Label("blobText", JGitUtils.getRawContentAsString(r, commit, blobPath)); - WicketUtils.setCssClass(c, "prettyprint"); + WicketUtils.setCssClass(c, "prettyprint linenums"); break; case 2: // TODO image blobs diff --git a/src/com/gitblit/wicket/pages/RepositoriesPage.html b/src/com/gitblit/wicket/pages/RepositoriesPage.html index c33e530d..9c27f793 100644 --- a/src/com/gitblit/wicket/pages/RepositoriesPage.html +++ b/src/com/gitblit/wicket/pages/RepositoriesPage.html @@ -10,12 +10,12 @@ - -
[admin links]
+ +
[Feedback Panel]
-
[Feedback Panel]
+
[repositories message]
-
[repositories message]
+
[admin links]
@@ -40,7 +40,7 @@ -