SONAR-3755 fix CSS of global issues

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 dcf15fe0aef0d32e0d49317c8eb850f8a1c20a43..c3db4d5774d7334e57daa36eb1d9b709d125982a 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
@@ -543,7 +543,7 @@ issue.set_severity=Set Severity
 issue.set_severity.submit=Set Severity
 issue.do_plan=Plan
 issue.plan.submit=Plan
-issue.plan_must_be_created_first=An action plan should be first created to plan the remediation effort of this violation.
+issue.plan_must_be_created_first=An action plan should be first created to plan the remediation effort of this issue.
 issue.status.REOPENED=Reopened
 issue.status.RESOLVED=Resolved
 issue.status.OPEN=Open

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/issue_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/issue_controller.rb
index 8e5089a5d84a91669683a43aacf3f36168b79b99..84c8a6a9bdd3597ca852ec86e894fd756f15b7e0 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/issue_controller.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/issue_controller.rb
@@ -22,30 +22,6 @@ class IssueController < ApplicationController
 
   SECTION=Navigation::SECTION_RESOURCE
 
-  helper SourceHelper, UsersHelper
-
-  #
-  #
-  # ACTIONS FROM ISSUE DETAIL PAGE
-  #
-  #
-
-
-  # Used for the permalink, e.g. http://localhost:9000/issue/view/1
-  def view
-    require_parameters :id
-    init_issue(params[:id])
-    init_resource
-    @transitions = Internal.issues.listTransitions(@issue.key) if current_user
-    render 'issue/_view'
-  end
-
-  def show
-    require_parameters :key
-    init_issue(params[:key])
-    render_issue_detail
-  end
-
   def action_form
     verify_ajax_request
     require_parameters :id, :issue
@@ -101,103 +77,6 @@ class IssueController < ApplicationController
   end
 
 
-  #
-  #
-  # ACTIONS FROM ISSUES TAB OF CODE VIEWER
-  #
-  #
-
-  def display_issue
-    init_issue(params[:issue])
-    render :partial => 'resource/issue', :locals => {:issue => @issue}
-  end
-
-  def issue_transition_form
-    require_parameters :issue, :transition
-
-    init_issue(params[:issue])
-    @transition = params[:transition]
-    bad_request('Missing transition') if @transition.blank?
-
-    render :partial => 'issue/code_viewer/transition_form'
-  end
-
-  def issue_transition
-    verify_post_request
-    require_parameters :issue, :transition
-
-    @issue = Internal.issues.doTransition(params[:issue], params[:transition])
-    init_issue(params[:issue])
-    render_issue_code_viewer
-  end
-
-  def issue_assign_form
-    require_parameters :issue
-    init_issue(params[:issue])
-
-    render :partial => 'issue/code_viewer/assign_form'
-  end
-
-  def issue_assign
-    verify_post_request
-    require_parameters :issue
-
-    assignee = nil
-    if params[:me]=='true'
-      assignee = current_user.login
-
-    elsif params[:issue_assignee_login].present?
-      assignee = params[:issue_assignee_login]
-    end
-
-    @issue = Internal.issues.assign(params[:issue], assignee)
-    init_issue(params[:issue])
-    render_issue_code_viewer
-  end
-
-  def issue_change_severity_form
-    require_parameters :issue
-    init_issue(params[:issue])
-
-    render :partial => 'issue/code_viewer/change_severity_form'
-  end
-
-  def issue_change_severity
-    verify_post_request
-    require_parameters :issue, :severity
-
-    @issue = Internal.issues.setSeverity(params[:issue], params[:severity])
-    init_issue(params[:issue])
-    render_issue_code_viewer
-  end
-
-  def issue_plan_form
-    require_parameters :issue
-    init_issue(params[:issue])
-    init_resource
-    @action_plans = Internal.issues.findOpenActionPlans(@resource.key)
-
-    render :partial => 'issue/code_viewer/plan_form'
-  end
-
-  def issue_plan
-    verify_post_request
-    require_parameters :issue, :plan
-
-    @issue = Internal.issues.plan(params[:issue], params[:plan])
-    init_issue(params[:issue])
-    render_issue_code_viewer
-  end
-
-  def issue_unplan
-    verify_post_request
-    require_parameters :issue
-
-    @issue = Internal.issues.plan(params[:issue], nil)
-    init_issue(params[:issue])
-    render_issue_code_viewer
-  end
-
 
   #
   #
@@ -212,50 +91,4 @@ class IssueController < ApplicationController
   end
 
 
-  protected
-
-  def init_issue(issue_key)
-    @issue_results = find_issue(issue_key)
-    @issue = @issue_results.issues[0]
-  end
-
-  def init_resource
-    @component = Project.by_key(@issue.component_key)
-    @resource = @component.root_project
-  end
-
-  def render_issue_detail
-    if @issue
-      init_resource
-      @transitions = Internal.issues.listTransitions(@issue.key) if current_user
-      render :partial => 'issue/view'
-    else
-      # TODO
-      render :status => 400
-    end
-  end
-
-  def render_issue_code_viewer
-    if @issue
-      @transitions = Internal.issues.listTransitions(@issue.key) if current_user
-      render :partial => 'resource/issue', :locals => {:issue => @issue}
-    else
-      # TODO
-      render :status => 400
-    end
-  end
-
-  def find_issues(map)
-    Api.issues.find(map)
-  end
-
-  def find_issue(issue_key)
-    issue_result = find_issues({'issueKeys' => issue_key})
-    if issue_result.issues.length == 1
-      issue_result
-    else
-      render :text => "<b>Cannot access this issue</b> : not found."
-    end
-  end
-
 end
\ No newline at end of file

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_view.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_view.html.erb
deleted file mode 100644 (file)
index 5b9cefe..0000000
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_view.html.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<div id="issue">
-  <%
-    # hack in case 'error_message' is nil (this should disappear when refactoring the '_view' and '_issue' partials)
-    error_message = error_message 
-  %>
-  <%= render :partial => 'issue/issue',
-             :locals => {:error_message => error_message} -%>
-</div>

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_index_issues.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_index_issues.html.erb
index 53e88b0b344df9dceccba79fe629e915a5603059..8d20132bf95e380d77c3b24ffb9fc5279c1fb629 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_index_issues.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_index_issues.html.erb
@@ -7,13 +7,11 @@
     <%= render :partial => "resource/header_#{@extension.getId()}" -%>
 
     <% if @display_issues && @global_issues && @global_issues.size>0 -%>
-      <table class="global_violations" cellpadding="0" cellspacing="0" border="0">
+      <div class="code-global-issues">
         <% @global_issues.each do |issue| %>
-          <tr>
-            <td><%= render :partial => 'issue', :locals => {:issue => issue} -%></td>
-          </tr>
+          <%= render :partial => 'issue', :locals => {:issue => issue} -%></td>
         <% end %>
-      </table>
+      </div>
     <% end %>
 
     <% if @lines && @lines.size>0 %>

diff --git a/sonar-server/src/main/webapp/stylesheets/style.css b/sonar-server/src/main/webapp/stylesheets/style.css
index b9f8c512331db0440f32d075517e3e4816562b76..dc90bfbb5e769dff45d755e1957a0a44a3ad336d 100644 (file)
--- a/sonar-server/src/main/webapp/stylesheets/style.css
+++ b/sonar-server/src/main/webapp/stylesheets/style.css
@@ -892,6 +892,9 @@ span.rulename a:hover {
   vertical-align: text-bottom;
 }
 
+.code-global-issues {
+  padding: 10px;
+}
 .code-issues {
   background-color: #FFF;
   padding: 10px;
@@ -2388,6 +2391,10 @@ td.spacer-top {
   padding: 4px 5px;
 }
 
+.table > tfoot > tr > td a {
+  color: #777;
+}
+
 .table-bordered > tbody {
   border-left: 1px solid #DDD;
   border-right: 1px solid #DDD;