Use .git-stripped repository name for calculating color

3 files changed, 5 insertions, 4 deletions

diff --git a/src/com/gitblit/wicket/pages/ActivityPage.java b/src/com/gitblit/wicket/pages/ActivityPage.java
index d548cfb6..aa2f2665 100644
--- a/src/com/gitblit/wicket/pages/ActivityPage.java
+++ b/src/com/gitblit/wicket/pages/ActivityPage.java
@@ -35,6 +35,7 @@ import com.gitblit.models.Activity;
 import com.gitblit.models.Metric;

 import com.gitblit.models.RepositoryModel;

 import com.gitblit.utils.ActivityUtils;

+import com.gitblit.utils.StringUtils;

 import com.gitblit.wicket.PageRegistration;

 import com.gitblit.wicket.PageRegistration.DropDownMenuItem;

 import com.gitblit.wicket.PageRegistration.DropDownMenuRegistration;

@@ -152,7 +153,7 @@ public class ActivityPage extends RootPage {
 

 			// aggregate repository metrics

 			for (Map.Entry<String, Metric> entry : activity.getRepositoryMetrics().entrySet()) {

-				String repository = entry.getKey();

+				String repository = StringUtils.stripDotGit(entry.getKey());

 				if (!repositoryMetrics.containsKey(repository)) {

 					repositoryMetrics.put(repository, new Metric(repository));

 				}

diff --git a/src/com/gitblit/wicket/panels/ActivityPanel.java b/src/com/gitblit/wicket/panels/ActivityPanel.java
index 7cafb828..2ee437de 100644
--- a/src/com/gitblit/wicket/panels/ActivityPanel.java
+++ b/src/com/gitblit/wicket/panels/ActivityPanel.java
@@ -98,7 +98,7 @@ public class ActivityPanel extends BasePanel {
 						LinkPanel repositoryLink = new LinkPanel("repository", null,

 								repoName, SummaryPage.class,

 								WicketUtils.newRepositoryParameter(commit.repository), true);

-						WicketUtils.setCssBackground(repositoryLink, commit.repository);

+						WicketUtils.setCssBackground(repositoryLink, repoName);

 						fragment.add(repositoryLink);

 

 						// repository branch

diff --git a/src/com/gitblit/wicket/panels/RepositoriesPanel.java b/src/com/gitblit/wicket/panels/RepositoriesPanel.java
index 3b3db492..4007a979 100644
--- a/src/com/gitblit/wicket/panels/RepositoriesPanel.java
+++ b/src/com/gitblit/wicket/panels/RepositoriesPanel.java
@@ -148,10 +148,10 @@ public class RepositoriesPanel extends BasePanel {
 				if (!StringUtils.isEmpty(currGroupName) && (repoName.indexOf('/') > -1)) {

 					repoName = repoName.substring(currGroupName.length() + 1);

 				}

-

+				

 				// repository swatch

 				Component swatch = new Label("repositorySwatch", "&nbsp;").setEscapeModelStrings(false);

-				WicketUtils.setCssBackground(swatch, entry.name);

+				WicketUtils.setCssBackground(swatch, entry.toString());

 				row.add(swatch);

 				swatch.setVisible(showSwatch);