summaryrefslogtreecommitdiffstats
path: root/src/main/java
diff options
context:
space:
mode:
authorJames Moger <james.moger@gitblit.com>2013-05-25 00:32:53 -0400
committerJames Moger <james.moger@gitblit.com>2013-05-25 00:32:53 -0400
commit325310ddb0970fc26833045efd624cde7b5c44ad (patch)
tree3b561aa5f689b640860dc8aa404aa701e0b324b7 /src/main/java
parent0eb562ebedc9a5f2b798d7692295f96e5057e5dd (diff)
downloadgitblit-325310ddb0970fc26833045efd624cde7b5c44ad.tar.gz
gitblit-325310ddb0970fc26833045efd624cde7b5c44ad.zip
Added Iconic font and replaced push log gravatars with Iconic symbols
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/com/gitblit/wicket/panels/PushesPanel.html2
-rw-r--r--src/main/java/com/gitblit/wicket/panels/PushesPanel.java8
2 files changed, 8 insertions, 2 deletions
diff --git a/src/main/java/com/gitblit/wicket/panels/PushesPanel.html b/src/main/java/com/gitblit/wicket/panels/PushesPanel.html
index e8f16e9e..cad59323 100644
--- a/src/main/java/com/gitblit/wicket/panels/PushesPanel.html
+++ b/src/main/java/com/gitblit/wicket/panels/PushesPanel.html
@@ -9,7 +9,7 @@
<div wicket:id="push" style="border-bottom: 1px solid #ddd;margin-bottom: 15px;">
<table style="padding: 3px 0px;">
<tr>
- <td class="hidden-phone" style="vertical-align: top;"><span wicket:id="whoAvatar"></span></td>
+ <td class="hidden-phone" style="vertical-align: top;padding-top:10px"><i style="font-size:3.25em;color:#bbb;" wicket:id="pushIcon"></i></td>
<td style="padding-left: 7px;">
<div>
<span wicket:id="whenPushed"></span> <span wicket:id="refRewind" class="alert alert-error" style="padding: 1px 5px;font-size: 10px;font-weight: bold;margin-left: 10px;">[rewind]</span>
diff --git a/src/main/java/com/gitblit/wicket/panels/PushesPanel.java b/src/main/java/com/gitblit/wicket/panels/PushesPanel.java
index 4b3cfb24..22addfdc 100644
--- a/src/main/java/com/gitblit/wicket/panels/PushesPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/PushesPanel.java
@@ -90,7 +90,13 @@ public class PushesPanel extends BasePanel {
}
pushItem.add(WicketUtils.createDateLabel("whenPushed", push.date, getTimeZone(), getTimeUtils()));
- pushItem.add(new GravatarImage("whoAvatar", push.getCommitterIdent(), 40));
+ Label pushIcon = new Label("pushIcon");
+ if (isTag) {
+ WicketUtils.setCssClass(pushIcon, "iconic-tag");
+ } else {
+ WicketUtils.setCssClass(pushIcon, "iconic-loop");
+ }
+ pushItem.add(pushIcon);
if (push.user.username.equals(push.user.emailAddress) && push.user.emailAddress.indexOf('@') > -1) {
// username is an email address - 1.2.1 push log bug
pushItem.add(new Label("whoPushed", push.user.getDisplayName()));