Some feedback on the issues page

(cherry picked from commit ef55348)

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 6f88a525be2507f3be8e8966123a709716a8cef5..bb226ca248558197b9ecae0fae39a0e489db2f5c 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
@@ -144,6 +144,7 @@ technical_debt=Technical Debt
 template=Template
 title=Title
 to=To
+to.downcase=to
 treemap=Treemap
 true=True
 type=Type

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_issue.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_issue.html.erb
index 07c7546c33d9672e0a3980dfe443cd7d90bdb3a5..d283763dd6975de726d21fca9fd2bade5e04fff2 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_issue.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_issue.html.erb
@@ -52,10 +52,12 @@
           <li><%= message('assigned_to') -%> <strong><%= h @issue_results.user(issue.assignee).name -%></strong></li>
         <% end %>
       <% elsif current_user %>
-        <li><a href='#' onclick="return issueForm('assign', this)" class="link-action"><%= message('issue.assign.formlink') -%></a></li>
-        <% if issue.assignee != current_user.login %>
-          <li>[<a href="#" onclick="return assignIssueToMe(this)" class="link-action"><%= message('issue.assign.to_me') -%></a>]</li>
-        <% end %>
+        <li>
+          <a href='#' onclick="return issueForm('assign', this)" class="link-action"><%= message('issue.assign.formlink') -%></a>
+          <% if issue.assignee != current_user.login %>
+            [<a href="#" onclick="return assignIssueToMe(this)" class="link-action"><%= message('issue.assign.to_me') -%></a>]
+          <% end %>
+        </li>
       <% end %>
       <% if issue.actionPlanKey %>
         <% if current_user %>

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/search.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/search.html.erb
index 8c2f6c0ec4ca50f18d1ef28515541d4a2b81e31b..9b868e49a89e84dd574e93ad539d949bc9916d69 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/search.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/search.html.erb
@@ -56,7 +56,7 @@
       'all':           '<%= escape_javascript message('all') -%>',
       'edit':          '<%= escape_javascript message('edit') -%>',
       'delete':        '<%= escape_javascript message('delete') -%>',
-      'to':            '<%= escape_javascript message('to') -%>',
+      'to':            '<%= escape_javascript message('to.downcase') -%>',
       'project':       '<%= escape_javascript message('issue_filter.criteria.project') -%>',
       'severity':      '<%= escape_javascript message('issue_filter.criteria.severity') -%>',
       'severities': {

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 b66d449d89a32ce2128a95b91ddf6ee7a1e7c344..48b96e38997b3c60d160220dff2ce91703263dba 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
@@ -66,7 +66,7 @@
       'anytime':        '<%= escape_javascript message('anytime') -%>',
       'all':            '<%= escape_javascript message('all') -%>',
       'manage':         '<%= escape_javascript message('manage') -%>',
-      'to':             '<%= escape_javascript message('to') -%>',
+      'to':             '<%= escape_javascript message('to.downcase') -%>',
       'value':          '<%= escape_javascript message('value') -%>',
       'components':     '<%= escape_javascript message('measure_filter.criteria.components') -%>',
       'age':            '<%= escape_javascript message('measure_filter.criteria.age') -%>',

diff --git a/sonar-server/src/main/webapp/javascripts/issues-extra.js b/sonar-server/src/main/webapp/javascripts/issues-extra.js
index 62a59c7cf4fb76d24bd0c75778df96fd8bc0b88f..5f775689bfc7c1ad77784bd23aaefe6a17e9f94a 100644 (file)
--- a/sonar-server/src/main/webapp/javascripts/issues-extra.js
+++ b/sonar-server/src/main/webapp/javascripts/issues-extra.js
@@ -579,8 +579,16 @@ define(
 
 
         onRender: function () {
+          var format = function(state) {
+            if (!state.id) return state.text; // optgroup
+            return '<i class="icon-severity-' + state.id.toLowerCase() + '"></i>' + state.text;
+          }
+
           this.ui.select.select2({
-            minimumResultsForSearch: 100
+            minimumResultsForSearch: 100,
+            formatResult: format,
+            formatSelection: format,
+            escapeMarkup: function(m) { return m; }
           });
         },
 

diff --git a/sonar-server/src/main/webapp/stylesheets/navigator.css b/sonar-server/src/main/webapp/stylesheets/navigator.css
index 8fce025175a50aa4c4a67c4c069ad247f2027465..6cd6a7b994eec9e55405b416029ac5e69bbf5dd3 100644 (file)
--- a/sonar-server/src/main/webapp/stylesheets/navigator.css
+++ b/sonar-server/src/main/webapp/stylesheets/navigator.css
@@ -108,12 +108,14 @@
   position: relative;
 }
 .navigator-fetching#tab-issue-rule:before {
+  z-index: 3;
   background-color: #EFEFEF;
 }
 .navigator-fetching.code-issue-actions {
   position: relative;
 }
 .navigator-fetching.code-issue-actions:before {
+  z-index: 3;
   background-color: #E4ECF3;
 }
 .navigator-header {
@@ -269,7 +271,7 @@
 .navigator-details .source {
   padding-right: 10px;
 }
-.navigator-details .source table {
+.navigator-details .source > table {
   border: 1px solid #DDD;
 }
 .navigator-details .scm .author {

diff --git a/sonar-server/src/main/webapp/stylesheets/navigator/base.css b/sonar-server/src/main/webapp/stylesheets/navigator/base.css
index 3e37f544611ffd8ef3e774b3a2716db2f8d3fd5d..c86ddfc501dee8a42f062812dcb8df38fbf270b2 100644 (file)
--- a/sonar-server/src/main/webapp/stylesheets/navigator/base.css
+++ b/sonar-server/src/main/webapp/stylesheets/navigator/base.css
@@ -108,12 +108,14 @@
   position: relative;
 }
 .navigator-fetching#tab-issue-rule:before {
+  z-index: 3;
   background-color: #EFEFEF;
 }
 .navigator-fetching.code-issue-actions {
   position: relative;
 }
 .navigator-fetching.code-issue-actions:before {
+  z-index: 3;
   background-color: #E4ECF3;
 }
 .navigator-header {
@@ -269,7 +271,7 @@
 .navigator-details .source {
   padding-right: 10px;
 }
-.navigator-details .source table {
+.navigator-details .source > table {
   border: 1px solid #DDD;
 }
 .navigator-details .scm .author {

diff --git a/sonar-server/src/main/webapp/stylesheets/navigator/base.less b/sonar-server/src/main/webapp/stylesheets/navigator/base.less
index ea7de94df0dea38b5c15e55c29725700808b36ff..73623b8bdc995f7428eaa6d883a83bc98d1e3978 100644 (file)
--- a/sonar-server/src/main/webapp/stylesheets/navigator/base.less
+++ b/sonar-server/src/main/webapp/stylesheets/navigator/base.less
@@ -108,6 +108,7 @@
     position: relative;
 
     &:before {
+      z-index: 3;
       background-color: #EFEFEF;
     }
   }
@@ -116,6 +117,7 @@
     position: relative;
 
     &:before {
+      z-index: 3;
       background-color: #E4ECF3;
     }
   }
@@ -321,7 +323,7 @@
   .source {
     padding-right: 10px;
 
-    table {
+    & > table {
       border: 1px solid #DDD;
     }
   }