Merge branch 'new-ui'

2 files changed, 22 insertions, 6 deletions

diff --git a/src/js/fiveui/css/ui.css b/src/js/fiveui/css/ui.css
index 0b723c9..2a08a69 100644
--- a/src/js/fiveui/css/ui.css
+++ b/src/js/fiveui/css/ui.css
@@ -108,9 +108,17 @@ div.fiveui-problem-body {
 }
 
 div.fiveui-severity-0 {
-  background-color: #F2FC7E;
+  background-color: #F5B3B3;
 }
 
 div.fiveui-severity-1 {
-  background-color: #F5B3B3;
+  background-color: #F2FC7E;
+}
+
+div.fiveui-severity-2 {
+  background-color: rgba(0, 255, 0, 0.5);
+}
+
+div.fiveui-severity-3 {
+  background-color: rgba(0, 0, 255, 0.5);
 }
diff --git a/src/js/fiveui/injected/compute.js b/src/js/fiveui/injected/compute.js
index 9fc16a8..d8ae9e8 100644
--- a/src/js/fiveui/injected/compute.js
+++ b/src/js/fiveui/injected/compute.js
@@ -101,7 +101,7 @@
        msg:      message,
        descr:    rule.description,
        url:      window.location.href,
-       severity: 1,
+       severity: 0,  // default is error
        xpath:    core.getElementXPath(node),
        phash:    null,
        hash:     null,
@@ -238,15 +238,23 @@
        };
      fiveui.stats.numElts = 0; // reset stats element counter
 
-     var report = {
-       error:function(message, node) {
+     var genericReporter = function (severity) {
+       return function (message, node) {
          var prob = core.hash(theRule, message, node);
          var query = $(node);
 
          // let the backend sort out if this problem has been reported already
          query.addClass(prob.hash);
+         prob.severity = severity;
          core.reportProblem(prob);
-       }
+       };
+     };
+
+     var report = {
+       error: genericReporter(0),
+       warning: genericReporter(1),
+       advisory: genericReporter(2),
+       info: genericReporter(3)
      };
 
      core.beforeRules();