From 1be31659e7e92c0fdc32e629d059d2aed5fe3a63 Mon Sep 17 00:00:00 2001 From: Rafael Cavazin <rafaelcavazin@gmail.com> Date: Sun, 21 Jul 2013 11:12:11 -0400 Subject: [PATCH] Translation of lastest Strings up-do-date. Tradução das últimas Strings até a data atual. --- src/main/java/com/gitblit/wicket/pages/SummaryPage.java | 67 +++++++++++---------------------- 1 files changed, 22 insertions(+), 45 deletions(-) diff --git a/src/main/java/com/gitblit/wicket/pages/SummaryPage.java b/src/main/java/com/gitblit/wicket/pages/SummaryPage.java index bd40a1b..17c41eb 100644 --- a/src/main/java/com/gitblit/wicket/pages/SummaryPage.java +++ b/src/main/java/com/gitblit/wicket/pages/SummaryPage.java @@ -32,7 +32,6 @@ import org.apache.wicket.markup.repeater.data.ListDataProvider; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.revwalk.RevCommit; -import org.wicketstuff.googlecharts.Chart; import org.wicketstuff.googlecharts.ChartAxis; import org.wicketstuff.googlecharts.ChartAxisType; import org.wicketstuff.googlecharts.ChartProvider; @@ -42,24 +41,27 @@ import org.wicketstuff.googlecharts.MarkerType; import org.wicketstuff.googlecharts.ShapeMarker; -import com.gitblit.Constants.AccessRestrictionType; import com.gitblit.GitBlit; import com.gitblit.Keys; import com.gitblit.models.Metric; import com.gitblit.models.PathModel; import com.gitblit.models.RepositoryModel; import com.gitblit.models.UserModel; -import com.gitblit.utils.ArrayUtils; import com.gitblit.utils.JGitUtils; import com.gitblit.utils.MarkdownUtils; import com.gitblit.utils.StringUtils; +import com.gitblit.wicket.CacheControl; +import com.gitblit.wicket.GitBlitWebSession; import com.gitblit.wicket.WicketUtils; +import com.gitblit.wicket.CacheControl.LastModified; +import com.gitblit.wicket.charting.SecureChart; import com.gitblit.wicket.panels.BranchesPanel; import com.gitblit.wicket.panels.LinkPanel; import com.gitblit.wicket.panels.LogPanel; import com.gitblit.wicket.panels.RepositoryUrlPanel; import com.gitblit.wicket.panels.TagsPanel; +@CacheControl(LastModified.REPOSITORY) public class SummaryPage extends RepositoryPage { public SummaryPage(PageParameters params) { @@ -72,7 +74,11 @@ int numberRefs = GitBlit.getInteger(Keys.web.summaryRefsCount, 5); Repository r = getRepository(); - RepositoryModel model = getRepositoryModel(); + final RepositoryModel model = getRepositoryModel(); + UserModel user = GitBlitWebSession.get().getUser(); + if (user == null) { + user = UserModel.ANONYMOUS; + } List<Metric> metrics = null; Metric metricsTotal = null; @@ -93,12 +99,16 @@ private static final long serialVersionUID = 1L; int counter = 0; public void populateItem(final Item<String> item) { - UserModel ownerModel = GitBlit.self().getUserModel(item.getModelObject()); + String ownername = item.getModelObject(); + UserModel ownerModel = GitBlit.self().getUserModel(ownername); if (ownerModel != null) { item.add(new LinkPanel("owner", null, ownerModel.getDisplayName(), UserPage.class, WicketUtils.newUsernameParameter(ownerModel.username)).setRenderBodyOnly(true)); } else { - item.add(new Label("owner").setVisible(false)); + Label owner = new Label("owner", ownername); + WicketUtils.setCssStyle(owner, "text-decoration: line-through;"); + WicketUtils.setHtmlTooltip(owner, MessageFormat.format(getString("gb.failedToFindAccount"), ownername)); + item.add(owner); } counter++; item.add(new Label("comma", ",").setVisible(counter < owners.size())); @@ -109,7 +119,8 @@ add(ownersView); add(WicketUtils.createTimestampLabel("repositoryLastChange", - JGitUtils.getLastChange(r), getTimeZone(), getTimeUtils())); + JGitUtils.getLastChange(r).when, getTimeZone(), getTimeUtils())); + add(new Label("repositorySize", getRepositoryModel().size)); if (metricsTotal == null) { add(new Label("branchStats", "")); } else { @@ -120,42 +131,8 @@ add(new BookmarkablePageLink<Void>("metrics", MetricsPage.class, WicketUtils.newRepositoryParameter(repositoryName))); - List<String> repositoryUrls = new ArrayList<String>(); - - if (GitBlit.getBoolean(Keys.git.enableGitServlet, true)) { - AccessRestrictionType accessRestriction = getRepositoryModel().accessRestriction; - switch (accessRestriction) { - case NONE: - add(WicketUtils.newClearPixel("accessRestrictionIcon").setVisible(false)); - break; - case PUSH: - add(WicketUtils.newImage("accessRestrictionIcon", "lock_go_16x16.png", - getAccessRestrictions().get(accessRestriction))); - break; - case CLONE: - add(WicketUtils.newImage("accessRestrictionIcon", "lock_pull_16x16.png", - getAccessRestrictions().get(accessRestriction))); - break; - case VIEW: - add(WicketUtils.newImage("accessRestrictionIcon", "shield_16x16.png", - getAccessRestrictions().get(accessRestriction))); - break; - default: - add(WicketUtils.newClearPixel("accessRestrictionIcon").setVisible(false)); - } - // add the Gitblit repository url - repositoryUrls.add(getRepositoryUrl(getRepositoryModel())); - } else { - add(WicketUtils.newClearPixel("accessRestrictionIcon").setVisible(false)); - } - repositoryUrls.addAll(GitBlit.self().getOtherCloneUrls(repositoryName)); - - String primaryUrl = ArrayUtils.isEmpty(repositoryUrls) ? "" : repositoryUrls.remove(0); - add(new RepositoryUrlPanel("repositoryCloneUrl", primaryUrl)); - - add(new Label("otherUrls", StringUtils.flattenStrings(repositoryUrls, "<br/>")) - .setEscapeModelStrings(false)); - + add(new RepositoryUrlPanel("repositoryUrlPanel", false, user, model)); + add(new LogPanel("commitsPanel", repositoryName, getRepositoryModel().HEAD, r, numberCommits, 0, getRepositoryModel().showRemoteBranches)); add(new TagsPanel("tagsPanel", repositoryName, r, numberRefs).hideIfEmpty()); add(new BranchesPanel("branchesPanel", getRepositoryModel(), r, numberRefs, false).hideIfEmpty()); @@ -228,9 +205,9 @@ String.valueOf((int) WicketUtils.maxValue(metrics)) }); provider.addAxis(commitAxis); provider.setLineStyles(new LineStyle[] { new LineStyle(2, 4, 0), new LineStyle(0, 4, 1) }); - provider.addShapeMarker(new ShapeMarker(MarkerType.CIRCLE, Color.BLUE, 1, -1, 5)); + provider.addShapeMarker(new ShapeMarker(MarkerType.CIRCLE, Color.decode("#002060"), 1, -1, 5)); - add(new Chart("commitsChart", provider)); + add(new SecureChart("commitsChart", provider)); } else { add(WicketUtils.newBlankImage("commitsChart")); } -- Gitblit v1.9.1