ux: #4037 use gravatar for commit email and add tooltips for name + email

rhodecode/lib/helpers.py

@@ -818,6 +818,20 b' def person(author, show_attr="username_a'
         return _author or _email
 
 
+def author_string(email):
+    if email:
+        user = User.get_by_email(email, case_insensitive=True, cache=True)
+        if user:
+            if user.firstname or user.lastname:
+                return '%s %s <%s>' % (user.firstname, user.lastname, email)
+            else:
+                return email
+        else:
+            return email
+    else:
+        return None
+
+
 def person_by_id(id_, show_attr="username_and_name"):
     # attr to return from fetched user
     person_getter = lambda usr: getattr(usr, show_attr)

rhodecode/public/css/main.less

@@ -670,6 +670,13 b' label {'
     }
 }
 
+.user-inline-data {
+    display: inline-block;
+    float: left;
+    padding-left: .5em;
+    line-height: 1.3em;
+}
+
 .rc-user { // gravatar + user wrapper
     float: left;
     position: relative;
@@ -1864,15 +1871,6 b' h3.files_location{'
 	}
 }
 
-.file_author{
-	margin-bottom: @padding;
-
-	div{
-		display: inline-block;
-		margin-right: 0.5em;
-	}
-}
-
 .browser-cur-rev{
 	margin-bottom: @textmargin;
 }

rhodecode/public/css/summary.less

@@ -138,6 +138,10 b''
 
 .summary .sidebar-right-content {
     margin-bottom: @space;
+
+    .rc-user {
+        min-width: 0;
+    }
 }
 
 .fieldset {

rhodecode/templates/admin/admin_log.html

@@ -1,4 +1,6 b''
 ## -*- coding: utf-8 -*-
+<%namespace name="base" file="/base/base.html"/>
+
 %if c.users_log:
 <table class="rctable admin_log">
     <tr>
@@ -12,11 +14,11 b''
     %for cnt,l in enumerate(c.users_log):
     <tr class="parity${cnt%2}">
         <td class="td-user">
-        %if l.user is not None:
-          ${h.link_to(l.user.username,h.url('edit_user', user_id=l.user.user_id))}
-        %else:
-          ${l.username}
-        %endif
+            %if l.user is not None:
+              ${base.gravatar_with_user(l.user.email)}
+            %else:
+              ${l.username}
+            %endif
         </td>
         <td class="td-journalaction">${h.action_parser(l)[0]()}
             <div class="journal_action_params">

rhodecode/templates/base/base.html

@@ -135,8 +135,9 b''
 
 
 <%def name="gravatar_with_user(contact, size=16, show_disabled=False)">
-  <div class="rc-user tooltip" title="${contact}">
-    ${self.gravatar(h.email_or_none(contact), size)}
+  <% email = h.email_or_none(contact) %>
+  <div class="rc-user tooltip" title="${h.author_string(email)}">
+    ${self.gravatar(email, size)}
     <span class="${'user user-disabled' if show_disabled else 'user'}"> ${h.link_to_user(contact)}</span>
   </div>
 </%def>

rhodecode/templates/changelog/changelog.html

@@ -131,8 +131,7 b''
                     %endif
                     </td>
                     <td class="td-user">
-                      ${self.gravatar(h.email_or_none(commit.author))}
-                      <span title="${commit.author}" class="user">${h.link_to_user(commit.author, length=22)}</span>
+                          ${self.gravatar_with_user(commit.author)}
                     </td>
                     <td class="td-time">
                         ${h.age_component(commit.date)}

rhodecode/templates/changelog/changelog_summary_data.html

@@ -43,8 +43,7 b''
         </td>
 
         <td class="td-user author">
-              ${base.gravatar(h.email_or_none(cs.author), 16)}
-              <span title="${cs.author}" class="user">${h.link_to_user(cs.author, length=22)}</span>
+            ${base.gravatar_with_user(cs.author)}
         </td>
         <td class="td-tags truncate-wrap">
           <div class="truncate tags-truncate"><div class="autoexpand">

rhodecode/templates/changeset/changeset.html

@@ -164,12 +164,10 b''
           ${_('Author')}
         </h4>
       </div>
-      <div class="sidebar-right-content">
-        <img alt="gravatar" class="gravatar" title="${h.email_or_none(c.commit.author)}" src="${h.gravatar_url(h.email_or_none(c.commit.author), 40)}" height="16" width="16">
-        <span class="author">
-            ${h.link_to_user(c.commit.author)} - ${h.age_component(c.commit.date)}
-        </span>
-      </div>
+        <div class="sidebar-right-content">
+            ${self.gravatar_with_user(c.commit.author)}
+            <div class="user-inline-data">- ${h.age_component(c.commit.date)}</div>
+        </div>
     </div><!-- end sidebar -->
   </div> <!-- end summary -->
   <div class="cs_files_title">

rhodecode/templates/data_table/_dt_elements.html

@@ -103,7 +103,9 b''
 </%def>
 
 <%def name="user_gravatar(email, size=16)">
+  <div class="rc-user tooltip" title="${h.author_string(email)}">
     ${base.gravatar(email, 16)}
+  </div>
 </%def>
 
 <%def name="repo_actions(repo_name, super_user=True)">

rhodecode/templates/files/file_authors_box.html

@@ -12,24 +12,18 b''
 </div>
 
 % if c.authors:
-<ul class="pull-left">
+<ul class="sidebar-right-content">
     % for email, user in sorted(c.authors, key=lambda e: c.file_last_commit.author_email!=e[0]):
     <li class="file_author">
-      <div class="contributor tooltip"  title="${h.tooltip(user)}">
-        ${base.gravatar(email, 16)}
-        <span class="author user">
-            ## case initial page load we only have last commit author
-            % if c.file_author:
-                ${h.link_to_user(user)} - ${h.age_component(c.file_last_commit.date)}
-            % else:
-                % if c.file_last_commit.author_email==email:
-                    <strong>${h.link_to_user(user)}</strong> (${_('last author')})
-                % else:
-                    ${h.link_to_user(user)}
-                % endif
-            % endif
-        </span>
-      </div>
+        <div class="rc-user tooltip" title="${h.author_string(email)}">
+          ${base.gravatar(email, 16)}
+          <span class="user">${h.link_to_user(user)}</span>
+        </div>
+        % if c.file_author: 
+            <div class="user-inline-data">- ${h.age_component(c.file_last_commit.date)}</div>
+        % elif c.file_last_commit.author_email==email:
+            <div class="user-inline-data"> (${_('last author')})</div>
+        % endif
     </li>
     % endfor
 </ul>

rhodecode/templates/files/file_tree_author_box.html

@@ -6,9 +6,7 b''
   </h4>
 </div>
 <div class="sidebar-right-content">
-  ${base.gravatar(h.email_or_none(c.commit.author), 16)}
-  <span class="author user">
-      ${h.link_to_user(c.commit.author)} - ${h.age_component(c.commit.date)}
-  </span>
+    ${base.gravatar_with_user(c.commit.author)}
+    <div class="user-inline-data">- ${h.age_component(c.commit.date)}</div>
 </div>