From 889d4875e846ac326fead6c6da4ccfc1ab9c25b8 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Fri, 31 May 2013 23:26:47 -0400 Subject: [PATCH] Fixes for responsive layouts on phones and tablets --- src/main/java/com/gitblit/wicket/pages/SummaryPage.java | 44 +++----------------------------------------- 1 files changed, 3 insertions(+), 41 deletions(-) diff --git a/src/main/java/com/gitblit/wicket/pages/SummaryPage.java b/src/main/java/com/gitblit/wicket/pages/SummaryPage.java index 7588a93..d4ce0f0 100644 --- a/src/main/java/com/gitblit/wicket/pages/SummaryPage.java +++ b/src/main/java/com/gitblit/wicket/pages/SummaryPage.java @@ -42,7 +42,6 @@ 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; @@ -55,7 +54,6 @@ import com.gitblit.wicket.GitBlitWebSession; import com.gitblit.wicket.WicketUtils; import com.gitblit.wicket.panels.BranchesPanel; -import com.gitblit.wicket.panels.DetailedRepositoryUrlPanel; import com.gitblit.wicket.panels.LinkPanel; import com.gitblit.wicket.panels.LogPanel; import com.gitblit.wicket.panels.RepositoryUrlPanel; @@ -115,6 +113,7 @@ add(WicketUtils.createTimestampLabel("repositoryLastChange", JGitUtils.getLastChange(r), getTimeZone(), getTimeUtils())); + add(new Label("repositorySize", getRepositoryModel().size)); if (metricsTotal == null) { add(new Label("branchStats", "")); } else { @@ -125,45 +124,8 @@ add(new BookmarkablePageLink<Void>("metrics", MetricsPage.class, WicketUtils.newRepositoryParameter(repositoryName))); - 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)); - } - } else { - add(WicketUtils.newClearPixel("accessRestrictionIcon").setVisible(false)); - } - - add(new RepositoryUrlPanel("repositoryUrlPanel", false, user, model, getLocalizer(), this)); + add(new RepositoryUrlPanel("repositoryUrlPanel", false, user, model)); - List<String> otherUrls = GitBlit.self().getOtherCloneUrls(repositoryName, UserModel.ANONYMOUS.equals(user) ? "" : user.username); - ListDataProvider<String> urls = new ListDataProvider<String>(otherUrls); - DataView<String> otherUrlsView = new DataView<String>("otherUrls", urls) { - private static final long serialVersionUID = 1L; - - public void populateItem(final Item<String> item) { - final String url = item.getModelObject(); - item.add(new DetailedRepositoryUrlPanel("otherUrl", getLocalizer(), this, model.name, url)); - } - }; - add(otherUrlsView); - 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()); @@ -236,7 +198,7 @@ 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)); } else { -- Gitblit v1.9.1