Merge pull request #11288 from epwinchell/openscap_results

Update openSCAP results styling (cherry picked from commit e61dbc4) https://bugzilla.redhat.com/show_bug.cgi?id=1377417
ManageIQ · Oct 7, 2016 · 983597f · 983597f
1 parent b4186e1
commit 983597f
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 2 deletions.
diff --git a/app/assets/stylesheets/patternfly_overrides.scss b/app/assets/stylesheets/patternfly_overrides.scss
@@ -236,7 +236,14 @@ table.table-hover tbody tr:nth-child(even).no-hover:hover td {
 
 /* summary screen formatting */
 
-table .label {display: table-cell;width: 20% !important; min-width: 200px; font: normal 12px OpenSansSemibold,Arial,Helvetica,sans-serif;cursor: default;color: #333; text-align: left;}
+table .label {
+  display: table-cell;
+  width: 20% !important;
+  min-width: 200px;
+  font: normal 12px OpenSansSemibold,Arial,Helvetica,sans-serif;
+  cursor: default;
+  text-align: left;
+}
 
 table.table.table-selectable tbody tr.selected td {
   background-color: $link-color;

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -925,6 +925,10 @@ def view_to_hash(view)
           celltext = Dictionary.gettext(row[col], :type => :model, :notfound => :titleize)
         when 'approval_state'
           celltext = _(PROV_STATES[row[col]])
+        when "result"
+          new_row[:cells] << {:span => result_span_class(row[col]), :text => row[col].titleize}
+        when "severity"
+          new_row[:cells] << {:span => severity_span_class(row[col]), :text => row[col].titleize}
         when 'state'
           celltext = row[col].titleize
         when 'hardware.bitness'
@@ -937,7 +941,7 @@ def view_to_hash(view)
           celltext = format_col_for_display(view, row, col, celltz || tz)
         end
 
-        new_row[:cells] << {:text => celltext}
+        new_row[:cells] << {:text => celltext} if celltext
       end
 
       if @row_button # Show a button in the last col
@@ -951,6 +955,28 @@ def view_to_hash(view)
     root
   end
 
+  def result_span_class(value)
+    case value.downcase
+    when "pass"
+      "label label-success"
+    when "fail"
+      "label label-danger"
+    else
+      "label label-primary"
+    end
+  end
+
+  def severity_span_class(value)
+    case value.downcase
+    when "high"
+      "label label-danger"
+    when "medium"
+      "label label-warning"
+    else
+      "label label-primary"
+    end
+  end
+
   def calculate_pct_img(val)
     val == 100 ? 20 : ((val + 2) / 5.25).round # val is the percentage value of free space
   end

diff --git a/app/views/layouts/_list_grid.html.haml b/app/views/layouts/_list_grid.html.haml
@@ -72,6 +72,9 @@
                                       :title   => cell[:title],
                                       :alt     => cell[:title]}
                 = cell[:text]
+            - elsif cell[:span]
+              %span{:class => "#{cell[:span]}"}
+                = cell[:text]
             - else
               - if cell[:icon]
                 %i{:class => cell[:icon], :title => cell[:title]}