Eliminate Gravatar profile linking and improve api

James Moger

2014-03-03 94e12c168f5eec300fd23d0de25c7dc93a96c429

Eliminate Gravatar profile linking and improve api

 releases.moxie

@@ -53,6 +53,7 @@
    - Revised committer verification to require a matching displayname or account name AND the email address
    - Serve repositories on both /r and /git, displaying /r because it is shorter
    - Eliminate HEAD from the blob, blame, and tree pages. That assumed a resource was available in HEAD and it may not be.
    - Eliminate Gravatar profile linking.
    additions:
    - Added color modes for the blame page (issue-2)
    - Added an optional MirrorService which will periodically fetch ref updates from source repositories for mirrors (issue-5).  Repositories must be manually cloned using native git and "--mirror".

 src/main/java/com/gitblit/wicket/GitBlitWebApp.java

@@ -53,7 +53,6 @@
import com.gitblit.wicket.pages.ForkPage;
import com.gitblit.wicket.pages.ForksPage;
import com.gitblit.wicket.pages.GitSearchPage;
import com.gitblit.wicket.pages.GravatarProfilePage;
import com.gitblit.wicket.pages.HistoryPage;
import com.gitblit.wicket.pages.LogPage;
import com.gitblit.wicket.pages.LogoutPage;
@@ -178,7 +177,6 @@
        mount("/registration", FederationRegistrationPage.class, "u", "n");

        mount("/activity", ActivityPage.class, "r", "h");
        mount("/gravatar", GravatarProfilePage.class, "h");
        mount("/lucene", LuceneSearchPage.class);
        mount("/project", ProjectPage.class, "p");
        mount("/projects", ProjectsPage.class);

 src/main/java/com/gitblit/wicket/pages/GravatarProfilePage.html

File was deleted

 src/main/java/com/gitblit/wicket/pages/GravatarProfilePage.java

File was deleted

 src/main/java/com/gitblit/wicket/pages/RootPage.java

@@ -576,8 +576,7 @@
            boolean standardLogin = session.authenticationType.isStandard();



            if (app().settings().getBoolean(Keys.web.allowGravatar, true)) {

                add(new GravatarImage("username", user.getDisplayName(),

                        user.emailAddress, "navbarGravatar", 20, false, false));

                add(new GravatarImage("username", user, "navbarGravatar", 20, false));

            } else {

                add(new Label("username", user.getDisplayName()));

            }


 src/main/java/com/gitblit/wicket/panels/DigestsPanel.java

@@ -203,8 +203,7 @@
                        final RepositoryCommit commit = commitItem.getModelObject();



                        // author gravatar

                        commitItem.add(new GravatarImage("commitAuthor", commit.getAuthorIdent().getName(),

                                commit.getAuthorIdent().getEmailAddress(), null, 16, false, false));

                        commitItem.add(new GravatarImage("commitAuthor", commit.getAuthorIdent(), null, 16, false));



                        // merge icon

                        if (commit.getParentCount() > 1) {


 src/main/java/com/gitblit/wicket/panels/GravatarImage.html

@@ -4,6 +4,6 @@
      xml:lang="en"  

      lang="en">

<wicket:panel>

<a href="#" wicket:id="link"><img wicket:id="image"></img></a>

<img wicket:id="image"></img>

</wicket:panel>

</html>

 src/main/java/com/gitblit/wicket/panels/GravatarImage.java

@@ -15,22 +15,16 @@
 */

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.eclipse.jgit.lib.PersonIdent;



import com.gitblit.Keys;

import com.gitblit.models.UserModel;

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.

 * Represents a Gravatar image.

 *

 * @author James Moger

 *

@@ -44,21 +38,21 @@
    }



    public GravatarImage(String id, PersonIdent person, int width) {

        this(id, person, width, true);

        this(id, person.getName(), person.getEmailAddress(), "gravatar", 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, PersonIdent person, String cssClass, int width, boolean identicon) {

        this(id, person.getName(), person.getEmailAddress(), cssClass, width, identicon);

    }



    public GravatarImage(String id, String username, String emailaddress, String cssClass, int width, boolean linked, boolean 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 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);

@@ -69,14 +63,8 @@
        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));

        add(image);

        WicketUtils.setHtmlTooltip(image, username);

        setVisible(app().settings().getBoolean(Keys.web.allowGravatar, true));

    }

}

 src/main/java/com/gitblit/wicket/panels/ReflogPanel.java

@@ -259,8 +259,7 @@
                        final RepositoryCommit commit = commitItem.getModelObject();



                        // author gravatar

                        commitItem.add(new GravatarImage("commitAuthor", commit.getAuthorIdent().getName(),

                                commit.getAuthorIdent().getEmailAddress(), null, 16, false, false));

                        commitItem.add(new GravatarImage("commitAuthor", commit.getAuthorIdent(), null, 16, false));



                        // merge icon

                        if (commit.getParentCount() > 1) {


 src/main/java/com/gitblit/wicket/panels/RegistrantPermissionsPanel.java

@@ -145,7 +145,7 @@
                    }

                    Fragment userFragment = new Fragment("registrant", "userRegistrant", RegistrantPermissionsPanel.this);
                    userFragment.add(new GravatarImage("userAvatar", ident, 20, false));
                    userFragment.add(new GravatarImage("userAvatar", ident, 20));
                    userFragment.add(new Label("userName", entry.registrant));
                    item.add(userFragment);
                } else {