From e21e2adb5c8074fdcedf986df679c4f8cc26c076 Mon Sep 17 00:00:00 2001
From: Stas Vilchik <vilchiks@gmail.com>
Date: Fri, 30 May 2014 15:41:23 +0600
Subject: [PATCH] SONAR-5209 Favorites: feedback applied

---
 sonar-core/src/main/resources/org/sonar/l10n/core.properties | 4 ++--
 sonar-server/src/main/hbs/component-viewer/header.hbs        | 5 +++--
 .../webapp/WEB-INF/app/controllers/favourites_controller.rb  | 4 ++--
 .../main/webapp/WEB-INF/app/helpers/application_helper.rb    | 4 ++--
 .../src/main/webapp/WEB-INF/app/helpers/issues_helper.rb     | 4 ++--
 .../src/main/webapp/WEB-INF/app/helpers/measures_helper.rb   | 4 ++--
 .../src/main/webapp/WEB-INF/app/views/issues/manage.html.erb | 4 ++--
 .../main/webapp/WEB-INF/app/views/measures/manage.html.erb   | 4 ++--
 8 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/sonar-core/src/main/resources/org/sonar/l10n/core.properties b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
index 07bcd0677bb..ea6cb00c425 100644
--- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties
+++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
@@ -193,8 +193,8 @@ assigned_to=Assigned to
 bulk_change=Bulk Change
 bulleted_point=Bulleted point
 coding_rules=Coding rules
-click_to_add_to_favourites=Click to add to favourites
-click_to_remove_from_favourites=Click to remove from favourites
+click_to_add_to_favorites=Click to add to favorites
+click_to_remove_from_favorites=Click to remove from favorites
 contact_admin=Please contact your administrator.
 created_by=Created by
 deactivate_all=Deactivate all
diff --git a/sonar-server/src/main/hbs/component-viewer/header.hbs b/sonar-server/src/main/hbs/component-viewer/header.hbs
index 3ce64919f12..44174771cf2 100644
--- a/sonar-server/src/main/hbs/component-viewer/header.hbs
+++ b/sonar-server/src/main/hbs/component-viewer/header.hbs
@@ -15,12 +15,13 @@
   </div>
 
   <div class="component-viewer-header-links">
+    <a><i class="icon-link"></i></a>
     {{#if component.canMarkAsFavourite}}
-      <a class="js-favorite">
+      <a class="js-favorite"
+         title="{{#if component.fav}}{{t 'click_to_remove_from_favorites'}}{{else}}{{t 'click_to_add_to_favorites'}}{{/if}}">
         <i class="{{#if component.fav}}icon-favorite{{else}}icon-not-favorite{{/if}}"></i>
       </a>
     {{/if}}
-    <a><i class="icon-link"></i></a>
   </div>
 
   <div class="component-viewer-header-measures">
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/favourites_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/favourites_controller.rb
index 0ec7b717ed1..8af423bb94b 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/favourites_controller.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/favourites_controller.rb
@@ -27,11 +27,11 @@ class FavouritesController < ApplicationController
     if current_user.favourite?(favourite_id)
       current_user.delete_favourite(favourite_id)
       css='icon-not-favorite'
-      title=message('click_to_add_to_favourites')
+      title=message('click_to_add_to_favorites')
     else
       current_user.add_favourite(favourite_id)
       css='icon-favorite'
-      title=message('click_to_remove_from_favourites')
+      title=message('click_to_remove_from_favorites')
     end
 
     render :json => {:css => css, :title => title}, :status => 200
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/helpers/application_helper.rb b/sonar-server/src/main/webapp/WEB-INF/app/helpers/application_helper.rb
index 21c85d89e9e..458574c46ab 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/helpers/application_helper.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/helpers/application_helper.rb
@@ -406,10 +406,10 @@ module ApplicationHelper
 
     if current_user.favourite?(resource_id)
       css='icon-favorite'
-      title=message('click_to_remove_from_favourites')
+      title=message('click_to_remove_from_favorites')
     else
       css='icon-not-favorite'
-      title=message('click_to_add_to_favourites')
+      title=message('click_to_add_to_favorites')
     end
     link_to_function '', "toggleFav(#{resource_id}, this)", :class => css, :title => title
   end
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/helpers/issues_helper.rb b/sonar-server/src/main/webapp/WEB-INF/app/helpers/issues_helper.rb
index fde8572c071..3b738585ac8 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/helpers/issues_helper.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/helpers/issues_helper.rb
@@ -35,10 +35,10 @@ module IssuesHelper
   def issue_filter_star(filter, is_favourite)
     if is_favourite
       style='icon-favorite'
-      title=message('click_to_remove_from_favourites')
+      title=message('click_to_remove_from_favorites')
     else
       style='icon-not-favorite'
-      title=message('click_to_add_to_favourites')
+      title=message('click_to_add_to_favorites')
     end
 
     "<a href='#' id='star-#{filter.name.parameterize}' class='issue-filter-star #{style}' filter-id='#{filter.id.to_s}' title='#{title}'></a>"
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/helpers/measures_helper.rb b/sonar-server/src/main/webapp/WEB-INF/app/helpers/measures_helper.rb
index fd7dbb02aa3..5e3a31dbe50 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/helpers/measures_helper.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/helpers/measures_helper.rb
@@ -77,10 +77,10 @@ module MeasuresHelper
   def measure_filter_star(filter, is_favourite)
     if is_favourite
       style='icon-favorite'
-      title=message('click_to_remove_from_favourites')
+      title=message('click_to_remove_from_favorites')
     else
       style='icon-not-favorite'
-      title=message('click_to_add_to_favourites')
+      title=message('click_to_add_to_favorites')
     end
 
     "<a href='#' id='star-#{filter.name.parameterize}' class='measure-filter-star #{style}' filter-id='#{filter.id}' title='#{title}'></a>"
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/manage.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/manage.html.erb
index 2c0f0c0de75..619b9f78068 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/manage.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/manage.html.erb
@@ -11,10 +11,10 @@
           success: function (data) {
             if (data == 'true') {
               star.removeClass('icon-not-favorite').addClass('icon-favorite');
-              star.attr('title', '<%= escape_javascript message('click_to_remove_from_favourites') -%>');
+              star.attr('title', '<%= escape_javascript message('click_to_remove_from_favorites') -%>');
             } else {
               star.removeClass('icon-favorite').addClass('icon-not-favorite');
-              star.attr('title', '<%= escape_javascript message('click_to_add_to_favourites') -%>');
+              star.attr('title', '<%= escape_javascript message('click_to_add_to_favorites') -%>');
             }
             $j('#sidebar-favourites').load(baseUrl + '/issues/favourites');
           }
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/measures/manage.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/measures/manage.html.erb
index bc7ec0d8bf8..ceaf3bd0e76 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/measures/manage.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/measures/manage.html.erb
@@ -11,10 +11,10 @@
           success: function (data) {
             if (data == 'true') {
               star.removeClass('icon-not-favorite').addClass('icon-favorite');
-              star.attr('title', '<%= escape_javascript message('click_to_remove_from_favourites') -%>');
+              star.attr('title', '<%= escape_javascript message('click_to_remove_from_favorites') -%>');
             } else {
               star.removeClass('icon-favorite').addClass('icon-not-favorite');
-              star.attr('title', '<%= escape_javascript message('click_to_add_to_favourites') -%>');
+              star.attr('title', '<%= escape_javascript message('click_to_add_to_favorites') -%>');
             }
             $j('#sidebar-favourites').load(baseUrl + '/measures/favourites');
           }
-- 
2.39.5