From 9effe1630d97039b3e01cd9b58ed07e75be1d63c Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 25 Feb 2013 08:40:30 -0500
Subject: [PATCH] Merge pull request #75 from thefake/master
---
src/com/gitblit/wicket/pages/GravatarProfilePage.java | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/GravatarProfilePage.java b/src/com/gitblit/wicket/pages/GravatarProfilePage.java
index 0fa9009..ee567d7 100644
--- a/src/com/gitblit/wicket/pages/GravatarProfilePage.java
+++ b/src/com/gitblit/wicket/pages/GravatarProfilePage.java
@@ -18,15 +18,13 @@
import java.io.IOException;
import java.text.MessageFormat;
-import org.apache.wicket.AttributeModifier;
import org.apache.wicket.PageParameters;
import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.image.Image;
import org.apache.wicket.markup.html.link.ExternalLink;
-import org.apache.wicket.model.Model;
import com.gitblit.models.GravatarProfile;
import com.gitblit.utils.ActivityUtils;
+import com.gitblit.wicket.ExternalImage;
import com.gitblit.wicket.WicketUtils;
/**
@@ -49,18 +47,17 @@
profile = ActivityUtils.getGravatarProfile(object);
}
} catch (IOException e) {
- error(MessageFormat.format("Failed to find Gravatar profile for {0}", object), e, true);
+ error(MessageFormat.format(getString("gb.failedToFindGravatarProfile"), object), e, true);
}
if (profile == null) {
- error(MessageFormat.format("Failed to find Gravatar profile for {0}", object), true);
+ error(MessageFormat.format(getString("gb.failedToFindGravatarProfile"), object), true);
}
add(new Label("displayName", profile.displayName));
add(new Label("username", profile.preferredUsername));
add(new Label("location", profile.currentLocation));
add(new Label("aboutMe", profile.aboutMe));
- Image image = new Image("profileImage");
- image.add(new AttributeModifier("src", true, new Model<String>(profile.thumbnailUrl + "?s=256&d=identicon")));
+ ExternalImage image = new ExternalImage("profileImage", profile.thumbnailUrl + "?s=256&d=identicon");
add(image);
add(new ExternalLink("profileLink", profile.profileUrl));
}
--
Gitblit v1.9.1