From f3ce6e80794ff3a234dbd8850c8501abda95cedb Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 11 Jul 2012 17:14:30 -0400
Subject: [PATCH] Fixes and adjustments to test suite
---
src/com/gitblit/wicket/panels/RepositoriesPanel.java | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/src/com/gitblit/wicket/panels/RepositoriesPanel.java b/src/com/gitblit/wicket/panels/RepositoriesPanel.java
index 3b3db49..9664e05 100644
--- a/src/com/gitblit/wicket/panels/RepositoriesPanel.java
+++ b/src/com/gitblit/wicket/panels/RepositoriesPanel.java
@@ -49,7 +49,6 @@
import com.gitblit.models.RepositoryModel;
import com.gitblit.models.UserModel;
import com.gitblit.utils.StringUtils;
-import com.gitblit.utils.TimeUtils;
import com.gitblit.wicket.GitBlitWebSession;
import com.gitblit.wicket.WicketUtils;
import com.gitblit.wicket.pages.BasePage;
@@ -148,10 +147,16 @@
if (!StringUtils.isEmpty(currGroupName) && (repoName.indexOf('/') > -1)) {
repoName = repoName.substring(currGroupName.length() + 1);
}
-
+
// repository swatch
- Component swatch = new Label("repositorySwatch", " ").setEscapeModelStrings(false);
- WicketUtils.setCssBackground(swatch, entry.name);
+ Component swatch;
+ if (entry.isBare){
+ swatch = new Label("repositorySwatch", " ").setEscapeModelStrings(false);
+ } else {
+ swatch = new Label("repositorySwatch", "!");
+ WicketUtils.setHtmlTooltip(swatch, getString("gb.workingCopyWarning"));
+ }
+ WicketUtils.setCssBackground(swatch, entry.toString());
row.add(swatch);
swatch.setVisible(showSwatch);
@@ -179,7 +184,7 @@
row.add(new Label("repositorySize", entry.size).setVisible(showSize));
} else {
// New repository
- row.add(new Label("repositorySize", "<span class='empty'>(empty)</span>")
+ row.add(new Label("repositorySize", "<span class='empty'>(" + getString("gb.empty") + ")</span>")
.setEscapeModelStrings(false));
}
@@ -236,11 +241,11 @@
if (entry.lastChange.getTime() == 0) {
lastChange = "--";
} else {
- lastChange = TimeUtils.timeAgo(entry.lastChange);
+ lastChange = getTimeUtils().timeAgo(entry.lastChange);
}
Label lastChangeLabel = new Label("repositoryLastChange", lastChange);
row.add(lastChangeLabel);
- WicketUtils.setCssClass(lastChangeLabel, TimeUtils.timeAgoCss(entry.lastChange));
+ WicketUtils.setCssClass(lastChangeLabel, getTimeUtils().timeAgoCss(entry.lastChange));
boolean showOwner = user != null && user.username.equalsIgnoreCase(entry.owner);
if (showAdmin) {
@@ -256,20 +261,19 @@
@Override
public void onClick() {
if (GitBlit.self().deleteRepositoryModel(entry)) {
- info(MessageFormat.format("Repository ''{0}'' deleted.", entry));
+ info(MessageFormat.format(getString("gb.repositoryDeleted"), entry));
if (dp instanceof SortableRepositoriesProvider) {
((SortableRepositoriesProvider) dp).remove(entry);
} else {
((RepositoriesProvider) dp).remove(entry);
}
} else {
- error(MessageFormat.format("Failed to delete repository ''{0}''!",
- entry));
+ error(MessageFormat.format(getString("gb.repositoryDeleteFailed"), entry));
}
}
};
deleteLink.add(new JavascriptEventConfirmation("onclick", MessageFormat.format(
- "Delete repository \"{0}\"?", entry)));
+ getString("gb.deleteRepository"), entry)));
repositoryLinks.add(deleteLink);
row.add(repositoryLinks);
} else if (showOwner) {
--
Gitblit v1.9.1