[Openvas-commits] r6155 - in trunk/gsa: . src/html/src

[scm-commit@wald.intevation.org]

Author: mattm
Date: 2009-12-16 22:54:12 +0100 (Wed, 16 Dec 2009)
New Revision: 6155

Modified:
   trunk/gsa/ChangeLog
   trunk/gsa/src/html/src/omp.xsl
Log:
	* src/html/src/omp.xsl (html-report-details): Align table better.  Move
	per-host summary into filtered results.  Add a summary of total threat
	counts.  Rename the "Results per Host" window "Filtered Results".

Modified: trunk/gsa/ChangeLog
===================================================================
--- trunk/gsa/ChangeLog	2009-12-16 21:52:54 UTC (rev 6154)
+++ trunk/gsa/ChangeLog	2009-12-16 21:54:12 UTC (rev 6155)
@@ -1,5 +1,11 @@
 2009-12-16  Matthew Mundell <matthew.mundell at intevation.de>
 
+	* src/html/src/omp.xsl (html-report-details): Align table better.  Move
+	per-host summary into filtered results.  Add a summary of total threat
+	counts.  Rename the "Results per Host" window "Filtered Results".
+
+2009-12-16  Matthew Mundell <matthew.mundell at intevation.de>
+
 	* src/html/src/omp.xsl (html-report-details): Only display result range
 	and result headings when there are results.  Add first_result to download
 	URL.

Modified: trunk/gsa/src/html/src/omp.xsl
===================================================================
--- trunk/gsa/src/html/src/omp.xsl	2009-12-16 21:52:54 UTC (rev 6154)
+++ trunk/gsa/src/html/src/omp.xsl	2009-12-16 21:54:12 UTC (rev 6155)
@@ -108,32 +108,57 @@
       </div>
 
       <a name="summary"/>
-      <table>
-      <tr>
-        <td><b>Result of Task:</b></td>
-        <td><b><xsl:value-of select="report/task/name"/></b></td>
-      </tr>
-      <tr>
-        <td>Order of results:</td>
-        <td>by host</td>
-      </tr>
-      <tr>
-        <td><b>Scan started:</b></td>
-        <td><b><xsl:value-of select="report/scan_start"/></b></td>
-      </tr>
-      <tr>
-        <td>Scan ended:</td>
-        <td><xsl:value-of select="report/scan_end"/></td>
-      </tr>
-      <tr>
-        <td>Final scan run status:</td>
-        <td><xsl:value-of select="report/scan_run_status"/></td>
-      </tr>
+      <table border="0" cellspacing="0" cellpadding="3">
+        <tr>
+          <td><b>Result of Task:</b></td>
+          <td><b><xsl:value-of select="report/task/name"/></b></td>
+        </tr>
+        <tr>
+          <td>Order of results:</td>
+          <td>by host</td>
+        </tr>
+        <tr>
+          <td><b>Scan started:</b></td>
+          <td><b><xsl:value-of select="report/scan_start"/></b></td>
+        </tr>
+        <tr>
+          <td>Scan ended:</td>
+          <td><xsl:value-of select="report/scan_end"/></td>
+        </tr>
+        <tr>
+          <td>Final scan run status:</td>
+          <td><xsl:value-of select="report/scan_run_status"/></td>
+        </tr>
       </table>
-
-      <h1>Result Summary</h1>
-      <xsl:apply-templates select="../all/get_report_response/report"
-                           mode="overview"/>
+      <br/>
+      <table class="gbntable" cellspacing="2" cellpadding="4">
+        <tr class="gbntablehead2">
+          <td></td>
+          <td><img src="/img/high.png" alt="High" title="High"/></td>
+          <td><img src="/img/medium.png" alt="Medium" title="Medium"/></td>
+          <td><img src="/img/low.png" alt="Low" title="Low"/></td>
+          <td><img src="/img/log.png" alt="Log" title="Log"/></td>
+          <td>Total</td>
+        </tr>
+        <tr>
+          <td>Threat Counts:</td>
+          <td>
+            <xsl:value-of select="report/messages/hole"/>
+          </td>
+          <td>
+            <xsl:value-of select="report/messages/warning"/>
+          </td>
+          <td>
+            <xsl:value-of select="report/messages/info"/>
+          </td>
+          <td>
+            <xsl:value-of select="report/messages/log"/>
+          </td>
+          <td>
+            <xsl:value-of select="report/messages/hole + report/messages/warning + report/messages/info + report/messages/log"/>
+          </td>
+        </tr>
+      </table>
     </div>
   </div>
   <br/>
@@ -384,7 +409,7 @@
     <div class="gb_window_part_left"></div>
     <div class="gb_window_part_right"></div>
     <div class="gb_window_part_center">
-      Results per Host
+      Filtered Results
       <!--
       <a href="/help/view_report.html#viewreport"
          title="Help: View Report (Results per Host)">
@@ -395,6 +420,8 @@
     <div class="gb_window_part_content">
       <xsl:choose>
         <xsl:when test="count(report/results/result) &gt; 0">
+          <xsl:apply-templates select="report" mode="overview"/>
+
           <xsl:apply-templates select="report" mode="details"/>
         </xsl:when>
         <xsl:otherwise>