From 883d79b2f7a8d57c5a3f8bcbc4bd018dea7f82c7 Mon Sep 17 00:00:00 2001
From: Stas Vilchik <vilchiks@gmail.com>
Date: Thu, 18 Jun 2015 14:45:20 +0200
Subject: [PATCH] SONAR-6507 apply feedback

---
 .../src/main/webapp/WEB-INF/app/models/user.rb       |  2 +-
 .../webapp/WEB-INF/app/views/account/index.html.erb  | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/models/user.rb b/server/sonar-web/src/main/webapp/WEB-INF/app/models/user.rb
index a727b0b529e..fed2167f346 100644
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/models/user.rb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/app/models/user.rb
@@ -86,7 +86,7 @@ class User < ActiveRecord::Base
 
   # SCM accounts should also contain login and email
   def full_scm_accounts
-    new_scm_accounts = self.scm_accounts.split(',').reject { |c| c.empty? } if self.scm_accounts
+    new_scm_accounts = self.scm_accounts.split(/\r?\n/).reject { |c| c.empty? } if self.scm_accounts
     new_scm_accounts = [] unless new_scm_accounts
     new_scm_accounts << self.login
     new_scm_accounts << self.email
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/account/index.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/account/index.html.erb
index 412bd704e06..34b20b53303 100644
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/account/index.html.erb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/account/index.html.erb
@@ -6,10 +6,10 @@
         <% if configuration('sonar.lf.enableGravatar', 'true') == 'true' %>
           <div class="js-avatar big-spacer-bottom"></div>
         <% end %>
-        <h2 id="name"><%= current_user.name %></h2>
-        <p id="login" class="note"><%= current_user.login %></p>
+        <h2 id="name" class="text-ellipsis" title="<%= current_user.name -%>"><%= current_user.name -%></h2>
+        <p id="login" class="note text-ellipsis" title="<%= current_user.login -%>"><%= current_user.login -%></p>
         <div class="text-center spacer-top">
-          <p id="email"><%= current_user.email %></p>
+          <p id="email" class="text-ellipsis" title="<%= current_user.email -%>"><%= current_user.email -%></p>
         </div>
       </div>
 
@@ -17,7 +17,7 @@
         <h3 class="text-center"><%= message('my_profile.groups') -%></h3>
         <ul id="groups">
           <% current_user.groups.sort.each do |group| -%>
-            <li><%= group.name -%></li>
+            <li class="text-ellipsis" title="<%= group.name -%>"><%= group.name -%></li>
           <% end -%>
         </ul>
       </div>
@@ -26,14 +26,14 @@
         <h3 class="text-center"><%= message('my_profile.scm_accounts') -%></h3>
         <ul id="scm-accounts">
           <% current_user.full_scm_accounts.each do |scm_account| -%>
-            <li><%= scm_account -%></li>
+            <li class="text-ellipsis" title="<%= scm_account -%>"><%= scm_account -%></li>
           <% end -%>
         </ul>
       </div>
 
       <% if User.editable_password? %>
         <div class="big-spacer-top text-center">
-          <button id="account-change-password-trigger" class="open-modal block-button"
+          <button id="account-change-password-trigger" class="open-modal"
                   href="<%= url_for :action => 'change_password_form' %>">
             <i class="icon-lock"></i> <%= message('my_profile.password.title') -%>
           </button>
-- 
2.39.5