From b57b9ec3edd2ca7e7e44190f85e3743cea822e3e Mon Sep 17 00:00:00 2001
From: Fabrice Bacchella <fbacchella@spamcop.net>
Date: Mon, 15 Jun 2015 11:55:05 -0400
Subject: [PATCH] First draft for a customized avatar image
---
src/main/java/com/gitblit/wicket/panels/AvatarImage.java | 21 +++++++--------------
1 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/panels/GravatarImage.java b/src/main/java/com/gitblit/wicket/panels/AvatarImage.java
similarity index 67%
rename from src/main/java/com/gitblit/wicket/panels/GravatarImage.java
rename to src/main/java/com/gitblit/wicket/panels/AvatarImage.java
index e415757..9901561 100644
--- a/src/main/java/com/gitblit/wicket/panels/GravatarImage.java
+++ b/src/main/java/com/gitblit/wicket/panels/AvatarImage.java
@@ -19,7 +19,6 @@
import com.gitblit.Keys;
import com.gitblit.models.UserModel;
-import com.gitblit.utils.ActivityUtils;
import com.gitblit.wicket.ExternalImage;
import com.gitblit.wicket.WicketUtils;
@@ -29,36 +28,30 @@
* @author James Moger
*
*/
-public class GravatarImage extends BasePanel {
+public class AvatarImage extends BasePanel {
private static final long serialVersionUID = 1L;
- public GravatarImage(String id, PersonIdent person) {
+ public AvatarImage(String id, PersonIdent person) {
this(id, person, 0);
}
- public GravatarImage(String id, PersonIdent person, int width) {
+ public AvatarImage(String id, PersonIdent person, int width) {
this(id, person.getName(), person.getEmailAddress(), "gravatar", width, true);
}
- public GravatarImage(String id, PersonIdent person, String cssClass, int width, boolean identicon) {
+ public AvatarImage(String id, PersonIdent person, String cssClass, int width, boolean identicon) {
this(id, person.getName(), person.getEmailAddress(), cssClass, width, identicon);
}
- public GravatarImage(String id, UserModel user, String cssClass, int width, boolean identicon) {
+ public AvatarImage(String id, UserModel user, String cssClass, int width, boolean identicon) {
this(id, user.getDisplayName(), user.emailAddress, cssClass, width, identicon);
}
- public GravatarImage(String id, String username, String emailaddress, String cssClass, int width, boolean identicon) {
+ public AvatarImage(String id, String username, String emailaddress, String cssClass, int width, boolean identicon) {
super(id);
- String email = emailaddress == null ? username.toLowerCase() : emailaddress.toLowerCase();
- String url;
- if (identicon) {
- url = ActivityUtils.getGravatarIdenticonUrl(email, width);
- } else {
- url = ActivityUtils.getGravatarThumbnailUrl(email, width);
- }
+ String url = app().buildAvatarUrl(username, emailaddress, cssClass, width, identicon);
ExternalImage image = new ExternalImage("image", url);
if (cssClass != null) {
WicketUtils.setCssClass(image, cssClass);
--
Gitblit v1.9.1