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

[scm-commit@wald.intevation.org]

Author: mattm
Date: 2010-02-18 17:41:00 +0100 (Thu, 18 Feb 2010)
New Revision: 6780

Modified:
   trunk/gsa/ChangeLog
   trunk/gsa/src/gsad_omp.c
   trunk/gsa/src/html/src/omp.xsl
Log:
	* src/gsad_omp.c (get_status_omp): Request notes with task.

	* src/html/src/omp.xsl (html-report-table): Add notes window.

Modified: trunk/gsa/ChangeLog
===================================================================
--- trunk/gsa/ChangeLog	2010-02-18 16:37:01 UTC (rev 6779)
+++ trunk/gsa/ChangeLog	2010-02-18 16:41:00 UTC (rev 6780)
@@ -1,5 +1,11 @@
 2010-02-18  Matthew Mundell <matthew.mundell at intevation.de>
 
+	* src/gsad_omp.c (get_status_omp): Request notes with task.
+
+	* src/html/src/omp.xsl (html-report-table): Add notes window.
+
+2010-02-18  Matthew Mundell <matthew.mundell at intevation.de>
+
 	* src/gsad.c (init_validator): Extend the "port" rule to allow ports like
 	"port-name (111/tcp)".
 

Modified: trunk/gsa/src/gsad_omp.c
===================================================================
--- trunk/gsa/src/gsad_omp.c	2010-02-18 16:37:01 UTC (rev 6779)
+++ trunk/gsa/src/gsad_omp.c	2010-02-18 16:41:00 UTC (rev 6780)
@@ -713,7 +713,9 @@
       if (openvas_server_sendf (&session,
                                 "<commands>"
                                 "<get_status task_id=\"%s\" />"
+                                "<get_notes><task id=\"%s\"/></get_notes>"
                                 "</commands>",
+                                task_id,
                                 task_id)
           == -1)
         {

Modified: trunk/gsa/src/html/src/omp.xsl
===================================================================
--- trunk/gsa/src/html/src/omp.xsl	2010-02-18 16:37:01 UTC (rev 6779)
+++ trunk/gsa/src/html/src/omp.xsl	2010-02-18 16:41:00 UTC (rev 6780)
@@ -675,6 +675,32 @@
       </div>
     </div>
   </div>
+  <br/>
+  <div class="gb_window">
+    <div class="gb_window_part_left"></div>
+    <div class="gb_window_part_right"></div>
+    <div class="gb_window_part_center">
+      Notes on Results of "<xsl:value-of select="task/name"/>"
+      <a href="/help/reports.html#reports" title="Help: Notes (Notes)">
+        <img src="/img/help.png"/>
+      </a>
+      <a href="/omp?cmd=get_status&amp;task_id={task/@id}" title="Refresh">
+        <img src="/img/refresh.png" border="0" style="margin-left:3px;"/>
+      </a>
+    </div>
+    <div class="gb_window_part_content_no_pad">
+      <div id="notes">
+        <table class="gbntable" cellspacing="2" cellpadding="4" border="0">
+          <tr class="gbntablehead2">
+            <td>NVT</td>
+            <td>Text</td>
+            <td width="100">Actions</td>
+          </tr>
+          <xsl:apply-templates select="../get_notes_response/note"/>
+        </table>
+      </div>
+    </div>
+  </div>
 </xsl:template>
 
 <xsl:template name="short_timestamp_first">