From a5c69b6b7070c7cac977f2e837e81a17a208b3d5 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 15 Nov 2013 16:43:38 -0500
Subject: [PATCH] Improve pages servlet
---
src/main/java/com/gitblit/wicket/panels/GravatarImage.java | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/panels/GravatarImage.java b/src/main/java/com/gitblit/wicket/panels/GravatarImage.java
index 7f1874f..741328c 100644
--- a/src/main/java/com/gitblit/wicket/panels/GravatarImage.java
+++ b/src/main/java/com/gitblit/wicket/panels/GravatarImage.java
@@ -33,9 +33,9 @@
/**
* Represents a Gravatar image and links to the Gravatar profile page.
- *
+ *
* @author James Moger
- *
+ *
*/
public class GravatarImage extends Panel {
@@ -44,28 +44,39 @@
public GravatarImage(String id, PersonIdent person) {
this(id, person, 0);
}
-
+
public GravatarImage(String id, PersonIdent person, int width) {
this(id, person, width, true);
}
public GravatarImage(String id, PersonIdent person, int width, boolean linked) {
+ this(id, person.getName(), person.getEmailAddress(), "gravatar", width, linked, true);
+ }
+
+ public GravatarImage(String id, String username, String emailaddress, String cssClass, int width, boolean linked, boolean identicon) {
super(id);
- String email = person.getEmailAddress() == null ? person.getName().toLowerCase() : person.getEmailAddress().toLowerCase();
+ String email = emailaddress == null ? username.toLowerCase() : emailaddress.toLowerCase();
String hash = StringUtils.getMD5(email);
Link<Void> link = new BookmarkablePageLink<Void>("link", GravatarProfilePage.class,
WicketUtils.newObjectParameter(hash));
link.add(new SimpleAttributeModifier("target", "_blank"));
- String url = ActivityUtils.getGravatarThumbnailUrl(email, width);
+ String url;
+ if (identicon) {
+ url = ActivityUtils.getGravatarIdenticonUrl(email, width);
+ } else {
+ url = ActivityUtils.getGravatarThumbnailUrl(email, width);
+ }
ExternalImage image = new ExternalImage("image", url);
- WicketUtils.setCssClass(image, "gravatar");
+ if (cssClass != null) {
+ WicketUtils.setCssClass(image, cssClass);
+ }
link.add(image);
if (linked) {
WicketUtils.setHtmlTooltip(link,
- MessageFormat.format("View Gravatar profile for {0}", person.getName()));
+ MessageFormat.format("View Gravatar profile for {0}", username));
} else {
- WicketUtils.setHtmlTooltip(link, person.getName());
+ WicketUtils.setHtmlTooltip(link, username);
}
add(link.setEnabled(linked));
setVisible(GitBlit.getBoolean(Keys.web.allowGravatar, true));
--
Gitblit v1.9.1