SQ 4.1 bugfixes

diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties b/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties
index 114ccb7a9a587d74eff46eebde50807bf8561984..a51ab5af2ae7691f7ae12811ff7c960329e7546f 100644 (file)
--- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties
+++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties
@@ -463,7 +463,7 @@ measure_filter.criteria.what=What? Projects, files...
 measure_filter.criteria.components=Components
 measure_filter.criteria.age=Age
 measure_filter.criteria.date=Date
-measure_filter.criteria.only_favourites=Favourites only
+measure_filter.criteria.only_favorites=Favorites only
 measure_filter.criteria.key=Key
 measure_filter.criteria.name=Name
 measure_filter.criteria.key_contains=Key contains
@@ -1408,6 +1408,7 @@ manual_measures.to_define_new_manual_metric_il_require=You can define new manual
 #------------------------------------------------------------------------------
 
 manual_rules.should_provide_real_description=Rule created on the fly. A description should be provided.
+manual_rules.add_manual_rule=Add Manual Rule
 
 
 #------------------------------------------------------------------------------

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 2a638f58b8afb5050bd525099ee8887e2abd7613..a5805422df57bde34801ba629b2cdeb891cb2f4e 100644 (file)
--- 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
@@ -108,7 +108,7 @@ module MeasuresHelper
     more_criteria_options << [message('measure_filter.criteria.metric'), 'metric']
     more_criteria_options << [message('measure_filter.criteria.age'), 'age'] unless filter.criteria('ageMinDays') || filter.criteria('ageMaxDays')
     more_criteria_options << [message('measure_filter.criteria.date'), 'date'] unless filter.criteria('fromDate') || filter.criteria('toDate')
-    more_criteria_options << [message('measure_filter.criteria.only_favourites'), 'fav'] unless filter.criteria('onFavourites')
+    more_criteria_options << [message('measure_filter.criteria.only_favorites'), 'fav'] unless filter.criteria('onFavourites')
     more_criteria_options << [message('measure_filter.criteria.key'), 'key'] unless filter.criteria('keySearch')
     more_criteria_options << [message('measure_filter.criteria.language'), 'lang'] unless filter.criteria('languages')
     more_criteria_options << [message('measure_filter.criteria.name'), 'name'] unless filter.criteria('nameSearch')

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/manual_measures/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/manual_measures/index.html.erb
index 2e3a5ce3d3bc1c130e2407cf31d587094f38e0d0..feffa27f53c55a1f6d76498dc59693bc21999191 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/manual_measures/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/manual_measures/index.html.erb
@@ -64,9 +64,8 @@
         <%= l(measure.updated_at) -%>
       </td>
       <td class="thin nowrap">
-        <a href="<%= url_for :controller => 'manual_measures', :action => 'edit_form', :metric => measure.metric.key, :id => @resource.id -%>" class="open-modal link-action"><%= message('edit')
-        -%></a>
-        &nbsp;
+        <a href="<%= url_for :controller => 'manual_measures', :action => 'edit_form', :metric => measure.metric.key, :id => @resource.id -%>" class="open-modal link-action"><%= message('edit') -%></a>&nbsp;
+
         <%= link_to_action message('delete'), "#{ApplicationController.root_context}/manual_measures/delete/#{ @resource.id}?metric=#{measure.metric.key}",
                            :class => 'link-action link-red',
                            :id => "delete_#{measure.metric.key}",

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/manual_rules/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/manual_rules/index.html.erb
index 7183c220507406ae04f67daf9908f308e0cca64d..9a593636f55d5b30a4b8b4303da091d364d00122 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/manual_rules/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/manual_rules/index.html.erb
@@ -2,7 +2,7 @@
     <% if profiles_administrator? %>
       <ul style="float: right" class="horizontal">
           <li class="marginleft10 add">
-              <a id="link-create-rule" href="<%=ApplicationController.root_context-%>/manual_rules/create_form" class="open-modal link-action">Create Manual Rule</a>
+              <a id="link-create-rule" href="<%=ApplicationController.root_context-%>/manual_rules/create_form" class="open-modal link-action"><%= message('manual_rules.add_manual_rule') %></a>
           </li>
       </ul>
     <% end %>
@@ -34,8 +34,7 @@
               <span class="note"><%= h rule.description -%></span>
             </td>
             <td class="right thin nowrap">
-              <a id="edit-<%= u(rule.key) -%>" class="open-modal link-action" href="<%=ApplicationController.root_context-%>/manual_rules/edit_form/<%= h rule.id -%>">Edit</a>
-                &nbsp;
+              <a id="edit-<%= u(rule.key) -%>" class="open-modal link-action" href="<%=ApplicationController.root_context-%>/manual_rules/edit_form/<%= h rule.id -%>">Edit</a>&nbsp;
               <%= link_to_action message('delete'), "#{ApplicationController.root_context}/manual_rules/delete/#{rule.id}",
                  :class => 'link-action link-red',
                  :id => "delete_#{rule.key.parameterize}",

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_sidebar.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_sidebar.html.erb
index ce64f69521d5e5cccf9e610559a3a62cb410228b..00ee26a1d9be9b51239cc635bbeb33267a8d4f72 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_sidebar.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_sidebar.html.erb
@@ -140,7 +140,7 @@
     </li>
 
     <li id="criteria-fav" <%= "style='display:none'" unless @filter.criteria('onFavourites') -%> class="marginbottom5">
-      <img src="<%= ApplicationController.root_context -%>/images/star.png"> <%= message 'measure_filter.criteria.only_favourites' %>:
+      <img src="<%= ApplicationController.root_context -%>/images/star.png"> <%= message 'measure_filter.criteria.only_favorites' %>:
       <%= check_box_tag 'onFavourites', 'true', @filter.criteria['onFavourites']=='true', :id => 'check-fav' -%>
     </li>
 

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/measures/search.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/measures/search.html.erb
index fcff2700de467ddd3c143c425b79bc2b7a256b00..0e0ff43d050d48d4a02e0b6f98c5a38b12045781 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/measures/search.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/measures/search.html.erb
@@ -73,7 +73,7 @@
       'alert':          '<%= escape_javascript message('measure_filter.criteria.alert') -%>',
       'componentsOf':   '<%= escape_javascript message('measure_filter.criteria.components_of') -%>',
       'date':           '<%= escape_javascript message('measure_filter.criteria.date') -%>',
-      'favoritesOnly':  '<%= escape_javascript message('measure_filter.criteria.only_favourites') -%>',
+      'favoritesOnly':  '<%= escape_javascript message('measure_filter.criteria.only_favorites') -%>',
       'keyContains':    '<%= escape_javascript message('measure_filter.criteria.key_contains') -%>',
       'language':       '<%= escape_javascript message('measure_filter.criteria.language') -%>',
       'metric':         '<%= escape_javascript message('measure_filter.criteria.metric') -%>',

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/metrics/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/metrics/index.html.erb
index f355d2f97931a048da9f176663961b7b560940ae..26b48502c5a1675936496ccac6bfb0ec56edb8f6 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/metrics/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/metrics/index.html.erb
@@ -42,8 +42,7 @@
             <td class="left" id="metric_type_name<%= metric.key -%>"><%= metric.value_type_name -%></td>
             <td class="right thin nowrap">
             <% if is_admin? %>
-             <a id="edit_<%= metric.key.parameterize -%>" href="<%=ApplicationController.root_context-%>/metrics/edit_form/<%= metric.id -%>" id="edit_<%= h(metric.short_name)-%>" class="open-modal link-action">Edit</a>
-              &nbsp;
+             <a id="edit_<%= metric.key.parameterize -%>" href="<%=ApplicationController.root_context-%>/metrics/edit_form/<%= metric.id -%>" id="edit_<%= h(metric.short_name)-%>" class="open-modal link-action">Edit</a>&nbsp;
               <%= link_to_action message('delete'), "#{ApplicationController.root_context}/metrics/delete_from_web/#{metric.id}",
                                  :class => 'link-action link-red',
                                  :id => "delete_#{h(metric.short_name)}",

diff --git a/sonar-server/src/main/webapp/javascripts/navigator/filters/ajax-select-filters.js b/sonar-server/src/main/webapp/javascripts/navigator/filters/ajax-select-filters.js
index dff04ba4b286e7fa964fcb3a3bb392bea2701a2e..c1673f4018c0ca749bdaf9c7da8305c4f38edb09 100644 (file)
--- a/sonar-server/src/main/webapp/javascripts/navigator/filters/ajax-select-filters.js
+++ b/sonar-server/src/main/webapp/javascripts/navigator/filters/ajax-select-filters.js
@@ -164,7 +164,7 @@ window.SS = typeof window.SS === 'object' ? window.SS : {};
 
 
     keydown: function(e) {
-      if (_([37, 38, 39, 40, 32, 13]).indexOf(e.keyCode) !== -1) {
+      if (_([37, 38, 39, 40, 13]).indexOf(e.keyCode) !== -1) {
         e.preventDefault();
       }
     },

diff --git a/sonar-server/src/main/webapp/javascripts/navigator/filters/select-filters.js b/sonar-server/src/main/webapp/javascripts/navigator/filters/select-filters.js
index f133b4bbd247628d43b14af748fdde46813162c5..0c5126ffe58c33863ea54920310dd58e9820530f 100644 (file)
--- a/sonar-server/src/main/webapp/javascripts/navigator/filters/select-filters.js
+++ b/sonar-server/src/main/webapp/javascripts/navigator/filters/select-filters.js
@@ -113,7 +113,6 @@ window.SS = typeof window.SS === 'object' ? window.SS : {};
           e.preventDefault();
           this.selectNextChoice();
           break;
-        case 32:
         case 13:
           e.preventDefault();
           this.selectCurrent();