From 3496564b412ba761b0f59fbcb0b9e43f07f85bcf Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 21 Feb 2012 17:21:16 -0500
Subject: [PATCH] Expand age coloring from 2 days to 30 days (issue 57)
---
src/com/gitblit/utils/TimeUtils.java | 12 ++++-
docs/04_releases.mkd | 1
src/com/gitblit/wicket/panels/RepositoriesPanel.html | 2
src/com/gitblit/wicket/panels/ActivityPanel.html | 6 +-
resources/gitblit.css | 40 ++++++++++++++++----
5 files changed, 46 insertions(+), 15 deletions(-)
diff --git a/docs/04_releases.mkd b/docs/04_releases.mkd
index 9531ff7..f675113 100644
--- a/docs/04_releases.mkd
+++ b/docs/04_releases.mkd
@@ -12,6 +12,7 @@
- block pushes to a repository with a working copy (i.e. non-bare repository) (issue-49)
- web.datetimestampLongFormat from *EEEE, MMMM d, yyyy h:mm a z* to *EEEE, MMMM d, yyyy HH:mm Z* (issue 50)
+- expanded commit age coloring from 2 days to 30 days (issue 57)
#### additions
diff --git a/resources/gitblit.css b/resources/gitblit.css
index e3f2bb5..6ad45fb 100644
--- a/resources/gitblit.css
+++ b/resources/gitblit.css
@@ -152,26 +152,51 @@
color: #888;
}
-.age0, .age1, .age2 {
+.age0, .age1, .age2, .age3, .age4 {
font-size: 12px;
}
-/* age0: age < 60*60*2 */
+/* age0: age < 2 hours */
.age0 {
- color: #008000;
font-style: italic;
+ color: #008000;
font-weight: bold;
}
-/* age1: 60*60*2 <= age < 60*60*24*2 */
+/* age1: 2 hours <= age < 2 days */
.age1 {
- color: #008000;
font-style: italic;
+ color: #0000ff;
+ font-weight: bold;
}
-/* age2: 60*60*24*2 <= age */
+/* age2: 2 days < age <= 7 days */
.age2 {
font-style: italic;
+ color: #2b60de;
+}
+
+/* age3: 7 days < age <= 30 days */
+.age3 {
+ color: #800080;
+}
+
+/* age4: > 30 days */
+.age4 {
+}
+
+/* Ensure that hovered ages are white */
+tr.light:hover .age0,
+tr.light:hover .age1,
+tr.light:hover .age2,
+tr.light:hover .age3,
+tr.light:hover .age4,
+tr.dark:hover .age0,
+tr.dark:hover .age1,
+tr.dark:hover .age2,
+tr.dark:hover .age3,
+tr.dark:hover .age4 {
+ color: #ffffff !important;
}
a.list {
@@ -218,7 +243,6 @@
border-radius: 3px;
padding: 1px 4px 2px 4px;
color: #ffffff;
- font-weight: bold;
vertical-align: center;
}
span.repositorySwatch a {
@@ -713,7 +737,7 @@
}
td.date {
- font-style: italic !important;
+ /*font-style: italic !important;*/
}
span.sha1, span.sha1 a, span.sha1 a span, pre.commit_message {
diff --git a/src/com/gitblit/utils/TimeUtils.java b/src/com/gitblit/utils/TimeUtils.java
index cd8e895..662025b 100644
--- a/src/com/gitblit/utils/TimeUtils.java
+++ b/src/com/gitblit/utils/TimeUtils.java
@@ -203,10 +203,16 @@
}
return mins + " min" + (mins > 1 ? "s" : "") + " ago";
} else {
- if (css) {
- return "age2";
- }
int days = daysAgo(date);
+ if (css) {
+ if (days <= 7) {
+ return "age2";
+ } if (days <= 30) {
+ return "age3";
+ } else {
+ return "age4";
+ }
+ }
if (days < 365) {
if (days <= 30) {
return days + " days ago";
diff --git a/src/com/gitblit/wicket/panels/ActivityPanel.html b/src/com/gitblit/wicket/panels/ActivityPanel.html
index f125f11..3827dc4 100644
--- a/src/com/gitblit/wicket/panels/ActivityPanel.html
+++ b/src/com/gitblit/wicket/panels/ActivityPanel.html
@@ -8,19 +8,19 @@
<wicket:panel>
<div wicket:id="activity">
- <div class="header"><span wicket:id="title">[title]</span></div>
+ <div class="header"><span style="font-weight:bold;" wicket:id="title">[title]</span></div>
<table class="activity" wicket:id="commits">
<tr wicket:id="commit"></tr>
</table>
</div>
<wicket:fragment wicket:id="commitFragment">
- <td class="date" style="width:40px; vertical-align: middle;" ><span wicket:id="time">[time of day]</span></td>
+ <td class="date" style="width:50px; vertical-align: middle;" ><span wicket:id="time">[time of day]</span></td>
<td style="width:10em;text-align:left;vertical-align: middle;">
<span wicket:id="repository" class="repositorySwatch">[repository link]</span>
</td>
<td style="width:30px;vertical-align: middle;"><span wicket:id="avatar" style="vertical-align: middle;"></span></td>
- <td class="author" style="vertical-align: middle;">
+ <td style="vertical-align: middle;">
<img wicket:id="commitIcon" style="vertical-align: middle;"></img>
<span wicket:id="message">[shortlog commit link]</span><br/>
<span wicket:id="author" style="padding-left:20px;">[author link]</span> committed <span wicket:id="commitid">[commit id]</span> to <span wicket:id="branch"></span>
diff --git a/src/com/gitblit/wicket/panels/RepositoriesPanel.html b/src/com/gitblit/wicket/panels/RepositoriesPanel.html
index 54a498e..08b529c 100644
--- a/src/com/gitblit/wicket/panels/RepositoriesPanel.html
+++ b/src/com/gitblit/wicket/panels/RepositoriesPanel.html
@@ -71,7 +71,7 @@
</wicket:fragment>
<wicket:fragment wicket:id="repositoryRow">
- <td class="left" style="padding-left:3px;" ><span class="repositorySwatch" wicket:id="repositorySwatch"></span> <span style="padding-left:3px;" wicket:id="repositoryName">[repository name]</span></td>
+ <td class="left" style="padding-left:3px;" ><b><span class="repositorySwatch" wicket:id="repositorySwatch"></span></b> <span style="padding-left:3px;" wicket:id="repositoryName">[repository name]</span></td>
<td><div class="list" wicket:id="repositoryDescription">[repository description]</div></td>
<td class="author"><span wicket:id="repositoryOwner">[repository owner]</span></td>
<td style="text-align: right;padding-right:10px;"><img class="inlineIcon" wicket:id="ticketsIcon" /><img class="inlineIcon" wicket:id="docsIcon" /><img class="inlineIcon" wicket:id="frozenIcon" /><img class="inlineIcon" wicket:id="federatedIcon" /><img class="inlineIcon" wicket:id="accessRestrictionIcon" /></td>
--
Gitblit v1.9.1