SONAR-1922 Improve UI for profile changelog

* Replace 'enabled' by 'on' and 'disabled' by 'off', fix typos.

* Use internationalized format for date.

* Add prefix 'last' to last version.

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/profiles_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/profiles_controller.rb
index 3d9cbeaf1aca3a1a4d659d796ff8c96bded1c1bf..7cab30c34d5f07c369997ad2f8d19674afac7370 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/profiles_controller.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/profiles_controller.rb
@@ -225,7 +225,7 @@ class ProfilesController < ApplicationController
       end
       @changes = ActiveRuleChange.find(:all, :conditions => ['profile_id=? and ?<profile_version and profile_version<=?', @profile.id, @since_version, @to_version], :order => 'id desc')
 
-      @select_versions = versions.map {|u| ["version " + u.profile_version.to_s + " (" + u.change_date.strftime("%Y/%m/%d %H:%M:%S") + ")", u.profile_version]} | [["no version", 0]];
+      @select_versions = versions.map {|u| [ (u.profile_version == last_version ? "last " : "" ) + "version " + u.profile_version.to_s + " (" + l(u.change_date) + ")", u.profile_version]} | [["no version", 0]];
     end
   end
 

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/active_rule_change.rb b/sonar-server/src/main/webapp/WEB-INF/app/models/active_rule_change.rb
index b58f811538ec2cb6ea17ec72fd2e920d50583cae..218183b78399316c0dc945110a98a373219a37a6 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/models/active_rule_change.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/models/active_rule_change.rb
@@ -24,8 +24,8 @@ class ActiveRuleChange < ActiveRecord::Base
 
   def action_text
     case enabled
-      when true then "enabled"
-      when false then "disabled"
+      when true then "on"
+      when false then "off"
       when nil then "modified"
     end
   end

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/changelog.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/changelog.html.erb
index d1cfc1635c43c1826450c69962b9773c79e13617..049de5a9a8d4b6383864dc1b806f6e210266e818 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/changelog.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/changelog.html.erb
@@ -8,9 +8,9 @@
 
   <% form_tag({:action => 'changelog'}, {:method => 'post'}) do %>
     <%= hidden_field_tag "id", @profile.id %>
-    Cahngelog between
+    Changelog from
     <%= select_tag "since", options_for_select(@select_versions, @since_version) %>
-    and
+    to
     <%= select_tag "to", options_for_select(@select_versions, @to_version) %>
     <%= submit_tag "Load", :id => 'submit'%>
   <% end %>
@@ -31,10 +31,10 @@
     %>
     <tr class="<%= cycle('even', 'odd') -%>">
       <td valign="top"><%= change.profile_version - 1 %> -> <%= change.profile_version %></td>
-      <td valign="top"><%=change.change_date.strftime("%Y-%m-%d %H:%M:%S")%></td>
-      <td valign="top"><%=change.user_name%></td>
-      <td valign="top"><%=change.action_text%></td>
-      <td valign="top"><%=change.rule.name%></td>
+      <td valign="top"><%= l(change.change_date) -%></td>
+      <td valign="top"><%= change.user_name %></td>
+      <td valign="top"><%= change.action_text %></td>
+      <td valign="top"><%= change.rule.name %></td>
       <td valign="top">
         <% if change.old_severity
              if change.new_severity %>