From cbf1c9276d452e7d09169d19c2aca4ff33e16619 Mon Sep 17 00:00:00 2001 From: Mrbytes <eguervos@msn.com> Date: Sun, 07 Oct 2012 05:31:03 -0400 Subject: [PATCH] GitBlitWebApp_es.properties: Up to date and other small corrections --- src/com/gitblit/wicket/panels/GravatarImage.java | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/com/gitblit/wicket/panels/GravatarImage.java b/src/com/gitblit/wicket/panels/GravatarImage.java index 0dc0502..f26a902 100644 --- a/src/com/gitblit/wicket/panels/GravatarImage.java +++ b/src/com/gitblit/wicket/panels/GravatarImage.java @@ -17,19 +17,17 @@ import java.text.MessageFormat; -import org.apache.wicket.AttributeModifier; import org.apache.wicket.behavior.SimpleAttributeModifier; -import org.apache.wicket.markup.html.image.Image; import org.apache.wicket.markup.html.link.BookmarkablePageLink; import org.apache.wicket.markup.html.link.Link; import org.apache.wicket.markup.html.panel.Panel; -import org.apache.wicket.model.Model; import org.eclipse.jgit.lib.PersonIdent; import com.gitblit.GitBlit; import com.gitblit.Keys; import com.gitblit.utils.ActivityUtils; import com.gitblit.utils.StringUtils; +import com.gitblit.wicket.ExternalImage; import com.gitblit.wicket.WicketUtils; import com.gitblit.wicket.pages.GravatarProfilePage; @@ -50,14 +48,13 @@ public GravatarImage(String id, PersonIdent person, int width) { super(id); - String email = person.getEmailAddress().toLowerCase(); + String email = person.getEmailAddress() == null ? person.getName().toLowerCase() : person.getEmailAddress().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); - Image image = new Image("image"); - image.add(new AttributeModifier("src", true, new Model<String>(url))); + ExternalImage image = new ExternalImage("image", url); WicketUtils.setCssClass(image, "gravatar"); link.add(image); WicketUtils.setHtmlTooltip(link, -- Gitblit v1.9.1