James Moger
2012-01-06 4ce036395e12e6d29ab97cd4d4604733013c1969
Use .git-stripped repository name for calculating color
3 files modified
9 ■■■■■ changed files
src/com/gitblit/wicket/pages/ActivityPage.java 3 ●●●● patch | view | raw | blame | history
src/com/gitblit/wicket/panels/ActivityPanel.java 2 ●●● patch | view | raw | blame | history
src/com/gitblit/wicket/panels/RepositoriesPanel.java 4 ●●●● patch | view | raw | blame | history
src/com/gitblit/wicket/pages/ActivityPage.java
@@ -35,6 +35,7 @@
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 @@
            // 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));
                }
src/com/gitblit/wicket/panels/ActivityPanel.java
@@ -98,7 +98,7 @@
                        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
src/com/gitblit/wicket/panels/RepositoriesPanel.java
@@ -148,10 +148,10 @@
                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);