From daced6cc12ea041b1de76a2dd7cac286a2fece68 Mon Sep 17 00:00:00 2001
From: Stas Vilchik <vilchiks@gmail.com>
Date: Thu, 28 May 2015 10:39:24 +0200
Subject: [PATCH] SONAR-6579 apply gravatars feedback

---
 .../coffee/components/issue/templates/issue-changelog.hbs  | 5 ++++-
 .../src/main/coffee/components/issue/templates/issue.hbs   | 3 ++-
 .../src/main/js/components/common/handlebars-extensions.js | 2 +-
 .../components/source-viewer/templates/source-viewer.hbs   | 6 +-----
 server/sonar-web/src/main/less/components/source.less      | 7 +++++++
 server/sonar-web/src/main/less/init/misc.less              | 4 ++++
 6 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/server/sonar-web/src/main/coffee/components/issue/templates/issue-changelog.hbs b/server/sonar-web/src/main/coffee/components/issue/templates/issue-changelog.hbs
index e1cb758c574..fd6f33d2d25 100644
--- a/server/sonar-web/src/main/coffee/components/issue/templates/issue-changelog.hbs
+++ b/server/sonar-web/src/main/coffee/components/issue/templates/issue-changelog.hbs
@@ -21,7 +21,10 @@
     {{#each items}}
       <tr>
         <td class="thin text-left text-top" nowrap>{{dt creationDate}}</td>
-        <td class="thin text-left text-top" nowrap>{{userName}}</td>
+        <td class="thin text-left text-top" nowrap>
+          {{#ifShowAvatars}}{{avatarHelper email 16}}{{/ifShowAvatars}}
+          {{userName}}
+        </td>
         <td class="text-left text-top">
           {{#each diffs}}
             {{changelog this}}<br>
diff --git a/server/sonar-web/src/main/coffee/components/issue/templates/issue.hbs b/server/sonar-web/src/main/coffee/components/issue/templates/issue.hbs
index b27f6b53c81..f5a2d5e2fda 100644
--- a/server/sonar-web/src/main/coffee/components/issue/templates/issue.hbs
+++ b/server/sonar-web/src/main/coffee/components/issue/templates/issue.hbs
@@ -137,7 +137,8 @@
     <div class="issue-comments">
       {{#each comments}}
         <div class="issue-comment" data-comment-key="{{key}}">
-          <div class="issue-comment-author" title="{{userName}}"><i class="icon-comment icon-half-transparent"></i>&nbsp;{{userName}}
+          <div class="issue-comment-author" title="{{userName}}">
+            {{#ifShowAvatars}}{{avatarHelper email 16}}{{else}}<i class="icon-comment icon-half-transparent"></i>{{/ifShowAvatars}}&nbsp;{{userName}}
           </div>
           <div class="issue-comment-text markdown">{{{show html htmlText}}}</div>
           <div class="issue-comment-age">({{fromNow createdAt}})</div>
diff --git a/server/sonar-web/src/main/js/components/common/handlebars-extensions.js b/server/sonar-web/src/main/js/components/common/handlebars-extensions.js
index cec8c0c725b..44dc16d5680 100644
--- a/server/sonar-web/src/main/js/components/common/handlebars-extensions.js
+++ b/server/sonar-web/src/main/js/components/common/handlebars-extensions.js
@@ -573,7 +573,7 @@
             .replace('{EMAIL_MD5}', emailHash)
             .replace('{SIZE}', size);
     return new Handlebars.SafeString(
-        '<img src="' + url + '" width="' + size + '" height="' + size + '" alt="' + email + '">'
+        '<img class="rounded" src="' + url + '" width="' + size + '" height="' + size + '" alt="' + email + '">'
     );
   });
 
diff --git a/server/sonar-web/src/main/js/components/source-viewer/templates/source-viewer.hbs b/server/sonar-web/src/main/js/components/source-viewer/templates/source-viewer.hbs
index 1f4c3ffeb19..123d21e86a2 100644
--- a/server/sonar-web/src/main/js/components/source-viewer/templates/source-viewer.hbs
+++ b/server/sonar-web/src/main/js/components/source-viewer/templates/source-viewer.hbs
@@ -13,11 +13,7 @@
 
         <td class="source-meta source-line-scm" {{#if line}}data-line-number="{{line}}"{{/if}}>
           {{#ifSCMChanged2 ../source line}}
-            <div class="source-line-scm-inner" data-author="{{scmAuthor}}">
-              {{#gt line 0}}
-                {{avatarHelper scmAuthor 16}}
-              {{/gt}}
-            </div>
+            <div class="source-line-scm-inner" data-author="{{scmAuthor}}"></div>
           {{/ifSCMChanged2}}
         </td>
 
diff --git a/server/sonar-web/src/main/less/components/source.less b/server/sonar-web/src/main/less/components/source.less
index c2f8237c638..6e02fe6e7ad 100644
--- a/server/sonar-web/src/main/less/components/source.less
+++ b/server/sonar-web/src/main/less/components/source.less
@@ -193,6 +193,13 @@
 
 .source-line-scm-inner {
   max-width: 40px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+
+  &:before {
+    content: attr(data-author);
+  }
 }
 
 .source-line-bar {
diff --git a/server/sonar-web/src/main/less/init/misc.less b/server/sonar-web/src/main/less/init/misc.less
index e369019dc77..7c51d9d1a62 100644
--- a/server/sonar-web/src/main/less/init/misc.less
+++ b/server/sonar-web/src/main/less/init/misc.less
@@ -103,6 +103,10 @@ td.spacer-top    { padding-top: 8px; }
   display: inline-block;
 }
 
+.rounded {
+  border-radius: 2px;
+}
+
 
 // Background Color
 
-- 
2.39.5