From bdfb4cbb8175c09beaf77c7270d36403b127a0de Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 19 Jun 2013 16:24:55 -0400
Subject: [PATCH] Fixed tablet/phone scaling on dashboards. Improved digests title.
---
src/main/java/com/gitblit/wicket/pages/DashboardPage.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/pages/DashboardPage.java b/src/main/java/com/gitblit/wicket/pages/DashboardPage.java
index 1c45b64..3c2828b 100644
--- a/src/main/java/com/gitblit/wicket/pages/DashboardPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/DashboardPage.java
@@ -52,7 +52,6 @@
import com.gitblit.wicket.PageRegistration;
import com.gitblit.wicket.PageRegistration.DropDownMenuItem;
import com.gitblit.wicket.PageRegistration.DropDownMenuRegistration;
-import com.gitblit.wicket.WicketUtils;
import com.gitblit.wicket.charting.GoogleChart;
import com.gitblit.wicket.charting.GoogleCharts;
import com.gitblit.wicket.charting.GooglePieChart;
@@ -75,7 +74,7 @@
return true;
}
- protected void addActivity(UserModel user, Collection<RepositoryModel> repositories, int daysBack) {
+ protected void addActivity(UserModel user, Collection<RepositoryModel> repositories, boolean isStarred, int daysBack) {
Calendar c = Calendar.getInstance();
c.add(Calendar.DATE, -1*daysBack);
Date minimumDate = c.getTime();
@@ -92,6 +91,7 @@
Fragment activityFragment = new Fragment("activity", "activityFragment", this);
add(activityFragment);
+ activityFragment.add(new Label("feedTitle", getString( isStarred ? "gb.starredAndOwned" : "gb.recentActivity")));
if (digests.size() == 0) {
// quiet or no starred repositories
if (repositories.size() == 0) {
@@ -107,7 +107,6 @@
// show daily commit digest feed
Collections.sort(digests);
DigestsPanel digestsPanel = new DigestsPanel("digests", digests);
- WicketUtils.setCssStyle(digestsPanel, "margin-top:-20px");
activityFragment.add(digestsPanel);
}
--
Gitblit v1.9.1