Eliminate Gravatar profile linking and improve api

James Moger

2014-03-03 94e12c168f5eec300fd23d0de25c7dc93a96c429

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

@@ -19,7 +19,6 @@
import java.text.MessageFormat;

import java.text.SimpleDateFormat;

import java.util.ArrayList;

import java.util.Calendar;

import java.util.Date;

import java.util.List;

import java.util.TimeZone;

@@ -55,14 +54,6 @@
      super(wicketId);

      hasChanges = digests.size() > 0;



      final int hashLen = app().settings().getInteger(Keys.web.shortCommitIdLength, 6);



      String dateFormat = app().settings().getString(Keys.web.datestampLongFormat, "EEEE, MMMM d, yyyy");

      final TimeZone timezone = getTimeZone();

      final DateFormat df = new SimpleDateFormat(dateFormat);

      df.setTimeZone(timezone);

      final Calendar cal = Calendar.getInstance(timezone);



      ListDataProvider<DailyLogEntry> dp = new ListDataProvider<DailyLogEntry>(digests);

      DataView<DailyLogEntry> pushView = new DataView<DailyLogEntry>("change", dp) {

         private static final long serialVersionUID = 1L;

@@ -70,6 +61,12 @@
         @Override

         public void populateItem(final Item<DailyLogEntry> logItem) {

            final DailyLogEntry change = logItem.getModelObject();



            String dateFormat = app().settings().getString(Keys.web.datestampLongFormat, "EEEE, MMMM d, yyyy");

            TimeZone timezone = getTimeZone();

            DateFormat df = new SimpleDateFormat(dateFormat);

            df.setTimeZone(timezone);



            String fullRefName = change.getChangedRefs().get(0);

            String shortRefName = fullRefName;

            boolean isTag = false;

@@ -88,13 +85,6 @@
            } else if (TimeUtils.isYesterday(pushDate, timezone)) {

               fuzzydate = tu.yesterday();

            } else {

               // calculate a fuzzy time ago date

                   cal.setTime(pushDate);

                   cal.set(Calendar.HOUR_OF_DAY, 0);

                   cal.set(Calendar.MINUTE, 0);

                   cal.set(Calendar.SECOND, 0);

                   cal.set(Calendar.MILLISECOND, 0);

                   pushDate = cal.getTime();

               fuzzydate = getTimeUtils().timeAgo(pushDate);

            }

            logItem.add(new Label("whenChanged", fuzzydate + ", " + df.format(pushDate)));

@@ -213,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) {

@@ -240,6 +229,7 @@
                  commitItem.add(shortlog);



                  // commit hash link

                  int hashLen = app().settings().getInteger(Keys.web.shortCommitIdLength, 6);

                  LinkPanel commitHash = new LinkPanel("hashLink", null, commit.getName().substring(0, hashLen),

                        CommitPage.class, WicketUtils.newObjectParameter(

                              change.repository, commit.getName()));