From afbcba32133f1c85ef50a6515fabad2aa745b614 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 29 Sep 2014 10:01:35 -0400
Subject: [PATCH] Merge branch 'ticket/192' into develop
---
src/main/java/com/gitblit/wicket/panels/GravatarImage.java | 156 ++++++++++++++++++++++++---------------------------
1 files changed, 73 insertions(+), 83 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/panels/GravatarImage.java b/src/main/java/com/gitblit/wicket/panels/GravatarImage.java
index 741328c..e415757 100644
--- a/src/main/java/com/gitblit/wicket/panels/GravatarImage.java
+++ b/src/main/java/com/gitblit/wicket/panels/GravatarImage.java
@@ -1,84 +1,74 @@
-/*
- * Copyright 2011 gitblit.com.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.gitblit.wicket.panels;
-
-import java.text.MessageFormat;
-
-import org.apache.wicket.behavior.SimpleAttributeModifier;
-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.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;
-
-/**
- * Represents a Gravatar image and links to the Gravatar profile page.
- *
- * @author James Moger
- *
- */
-public class GravatarImage extends Panel {
-
- private static final long serialVersionUID = 1L;
-
- 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 = 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;
- if (identicon) {
- url = ActivityUtils.getGravatarIdenticonUrl(email, width);
- } else {
- url = ActivityUtils.getGravatarThumbnailUrl(email, width);
- }
- ExternalImage image = new ExternalImage("image", url);
- if (cssClass != null) {
- WicketUtils.setCssClass(image, cssClass);
- }
- link.add(image);
- if (linked) {
- WicketUtils.setHtmlTooltip(link,
- MessageFormat.format("View Gravatar profile for {0}", username));
- } else {
- WicketUtils.setHtmlTooltip(link, username);
- }
- add(link.setEnabled(linked));
- setVisible(GitBlit.getBoolean(Keys.web.allowGravatar, true));
- }
+/*
+ * Copyright 2011 gitblit.com.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.gitblit.wicket.panels;
+
+import org.eclipse.jgit.lib.PersonIdent;
+
+import com.gitblit.Keys;
+import com.gitblit.models.UserModel;
+import com.gitblit.utils.ActivityUtils;
+import com.gitblit.wicket.ExternalImage;
+import com.gitblit.wicket.WicketUtils;
+
+/**
+ * Represents a Gravatar image.
+ *
+ * @author James Moger
+ *
+ */
+public class GravatarImage extends BasePanel {
+
+ private static final long serialVersionUID = 1L;
+
+ public GravatarImage(String id, PersonIdent person) {
+ this(id, person, 0);
+ }
+
+ public GravatarImage(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) {
+ this(id, person.getName(), person.getEmailAddress(), cssClass, width, identicon);
+ }
+
+ public GravatarImage(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) {
+ 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);
+ }
+ ExternalImage image = new ExternalImage("image", url);
+ if (cssClass != null) {
+ WicketUtils.setCssClass(image, cssClass);
+ }
+ add(image);
+ WicketUtils.setHtmlTooltip(image, username);
+ setVisible(app().settings().getBoolean(Keys.web.allowGravatar, true));
+ }
+
+ public void setTooltip(String tooltip) {
+ WicketUtils.setHtmlTooltip(get("image"), tooltip);
+ }
}
\ No newline at end of file
--
Gitblit v1.9.1