diff options
| author | Luc Donnet | 2014-02-11 15:42:49 +0100 |
|---|---|---|
| committer | Luc Donnet | 2014-02-11 15:42:49 +0100 |
| commit | b5bdcf3396ec57ad4f66ce0e6998a2ebfe2fb6a8 (patch) | |
| tree | 2c59dc5695b812422c92d83d4669a865ab0d6b01 /app | |
| parent | 90831700d30cadf18f068f11fc4e5b674c645a20 (diff) | |
| download | chouette-core-b5bdcf3396ec57ad4f66ce0e6998a2ebfe2fb6a8.tar.bz2 | |
Set icon color in compliance check result from graph colors
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/compliance_check_tasks.css.scss | 8 | ||||
| -rw-r--r-- | app/helpers/compliance_check_results_helper.rb | 13 | ||||
| -rw-r--r-- | app/views/compliance_check_results/index.html.erb | 2 |
3 files changed, 22 insertions, 1 deletions
diff --git a/app/assets/stylesheets/compliance_check_tasks.css.scss b/app/assets/stylesheets/compliance_check_tasks.css.scss index 0c3d6cc61..e5df5e844 100644 --- a/app/assets/stylesheets/compliance_check_tasks.css.scss +++ b/app/assets/stylesheets/compliance_check_tasks.css.scss @@ -93,6 +93,14 @@ border-bottom: 1px solid #e4e4e4; } + .status_ok_error { color: #8fc861; } + .status_nok_error { color: #e22b1b; } + .status_na_error { color: #898e7f; } + + .status_ok_warning { color: #8fc861; } + .status_nok_warning { color: #ffbd2b; } + .status_na_warning { color: #898e7f; } + .resume { &:after{ content: " "; diff --git a/app/helpers/compliance_check_results_helper.rb b/app/helpers/compliance_check_results_helper.rb new file mode 100644 index 000000000..092315ffd --- /dev/null +++ b/app/helpers/compliance_check_results_helper.rb @@ -0,0 +1,13 @@ +module ComplianceCheckResultsHelper + + def status_icon( compliance_check_result_status, compliance_check_result_severity ) + if compliance_check_result_status == "na" + ("<i class='fa fa-ban status_" + compliance_check_result_status + "_" + compliance_check_result_severity + "'></i>").html_safe + elsif compliance_check_result_status == "ok" + ("<i class='fa fa-check status_" + compliance_check_result_status + "_" + compliance_check_result_severity + "'></i>").html_safe + else + ("<i class='fa fa-minus-circle status_" + compliance_check_result_status + "_" + compliance_check_result_severity + "'></i>").html_safe + end + end + +end diff --git a/app/views/compliance_check_results/index.html.erb b/app/views/compliance_check_results/index.html.erb index 594023dce..532e32be0 100644 --- a/app/views/compliance_check_results/index.html.erb +++ b/app/views/compliance_check_results/index.html.erb @@ -14,7 +14,7 @@ <% @compliance_check_results.each_with_index do |compliance_check_result, index| %> <tr> <td><%= index + 1 %></td> - <td><%= image_tag "icons/status_#{compliance_check_result.status}.png" %></td> + <td><%= status_icon( compliance_check_result.status, compliance_check_result.severity ) %> </td> <td><%= t compliance_check_result.severity, :scope => "compliance_check_result.severities" %></td> <td> <%= image_tag "icons/notice.png", :"data-content" => ComplianceCheckResult.human_attribute_name(compliance_check_result.rule_code), :"data-title" => t("activerecord.attributes.compliance_check_result.detail"), :class =>"notice" %> |