minor reformatting of the headless results page

2 files changed, 21 insertions, 3 deletions

diff --git a/src/batchtools/headless/src/main/java/com/galois/fiveui/Reporter.java b/src/batchtools/headless/src/main/java/com/galois/fiveui/Reporter.java
index 80e024a..b1c60af 100644
--- a/src/batchtools/headless/src/main/java/com/galois/fiveui/Reporter.java
+++ b/src/batchtools/headless/src/main/java/com/galois/fiveui/Reporter.java
@@ -175,11 +175,24 @@ public class Reporter {
                     ul();
                     int i = 0;
                     for (Result r : scopedMap.get(url)) {
-                        li().classAttr(i % 2 == 0 ? "regRow" : "hlRow");
+                        String cAttr = i % 2 == 0 ? "regRow" : "hlRow";
+
                         // format an individual Result for this url:
-                        ul().li().em().text(r.getRuleName()+ ": ").end();
+                        li().classAttr(cAttr).b().text(r.getRuleName()).end();
+                        
+                        ul();
+                        li().classAttr(cAttr).b().text("Description:").end();
                         text(r.getRuleDesc()).end();
-                        li().text(r.getProblem()).end();
+                        
+                        li().classAttr(cAttr).b().text("Message:").end();
+                        text(r.getMsg()).end();
+
+                        li().classAttr(cAttr).b().text("xpath:").end();
+                        text(r.getXpath()).end();
+                        
+                        li().classAttr(cAttr).b().text("Severity:").end();
+                        text(r.getType().toString()).end();
+                        end();
                         end();
                         i++;
                     }
diff --git a/src/batchtools/rsTester/src/main/java/com/galois/fiveui/Result.java b/src/batchtools/rsTester/src/main/java/com/galois/fiveui/Result.java
index a367d1d..6c83c7b 100644
--- a/src/batchtools/rsTester/src/main/java/com/galois/fiveui/Result.java
+++ b/src/batchtools/rsTester/src/main/java/com/galois/fiveui/Result.java
@@ -205,4 +205,9 @@ public class Result {
              + " |\\_ " + _ruleDesc + "\n"
              + "  \\_ " + _prob;
     }
+
+    public String getXpath() {
+        // TODO Auto-generated method stub
+        return null;
+    }
 }