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

scm-commit@wald.intevation.org scm-commit at wald.intevation.org
Mon Sep 19 15:54:50 CEST 2011


Author: mattm
Date: 2011-09-19 15:54:49 +0200 (Mon, 19 Sep 2011)
New Revision: 11636

Modified:
   trunk/gsa/ChangeLog
   trunk/gsa/src/html/gsad.xsl
   trunk/gsa/src/html/help.xsl
   trunk/gsa/src/html/omp.xsl
Log:
	* src/html/gsad.xsl: Rename assets to hosts.

	* src/html/help.xsl (assets.html): Remove to hosts.html.
	(hosts.html): New template.  Was assets.html.  Rename assets to hosts.
	Add prognosis column and icons.
	(contents.html): Add Asset Management.

	* src/html/omp.xsl (assets, html-report-details, host): Rename assets to
	hosts.

Modified: trunk/gsa/ChangeLog
===================================================================
--- trunk/gsa/ChangeLog	2011-09-19 12:00:59 UTC (rev 11635)
+++ trunk/gsa/ChangeLog	2011-09-19 13:54:49 UTC (rev 11636)
@@ -1,12 +1,24 @@
 2011-09-19  Matthew Mundell <matthew.mundell at greenbone.net>
 
+	* src/html/gsad.xsl: Rename assets to hosts.
+
+	* src/html/help.xsl (assets.html): Remove to hosts.html.
+	(hosts.html): New template.  Was assets.html.  Rename assets to hosts.
+	Add prognosis column and icons.
+	(contents.html): Add Asset Management.
+
+	* src/html/omp.xsl (assets, html-report-details, host): Rename assets to
+	hosts.
+
+2011-09-19  Matthew Mundell <matthew.mundell at greenbone.net>
+
 	Add multi-host prognosis report.
 
 	* src/gsad.c (init_validator): Add host_levels alias.
 
 	* src/html/omp.xsl (html-report-details): Correct path in Back to Assets
 	link.
-	(report [assets]):
+	(report [assets]): Pass Back to Assets link levels in host_levels.
 
 2011-09-16  Matthew Mundell <matthew.mundell at greenbone.net>
 

Modified: trunk/gsa/src/html/gsad.xsl
===================================================================
--- trunk/gsa/src/html/gsad.xsl	2011-09-19 12:00:59 UTC (rev 11635)
+++ trunk/gsa/src/html/gsad.xsl	2011-09-19 13:54:49 UTC (rev 11636)
@@ -766,7 +766,7 @@
       <a href="/omp?cmd=get_report&amp;type=assets&amp;overrides=1&amp;levels=hm&amp;token={/envelope/token}">Asset Management</a>
       <ul>
        <li class="pointy"></li>
-       <li class="last"><a href="/omp?cmd=get_report&amp;type=assets&amp;overrides=1&amp;levels=hm&amp;token={/envelope/token}">Assets</a></li>
+       <li class="last"><a href="/omp?cmd=get_report&amp;type=assets&amp;overrides=1&amp;levels=hm&amp;token={/envelope/token}">Hosts</a></li>
       </ul>
      </li>
     </ul>

Modified: trunk/gsa/src/html/help.xsl
===================================================================
--- trunk/gsa/src/html/help.xsl	2011-09-19 12:00:59 UTC (rev 11635)
+++ trunk/gsa/src/html/help.xsl	2011-09-19 13:54:49 UTC (rev 11636)
@@ -129,32 +129,32 @@
   </div>
 </xsl:template>
 
-<xsl:template mode="help" match="assets.html">
-  <div class="gb_window_part_center">Help: Assets</div>
+<xsl:template mode="help" match="hosts.html">
+  <div class="gb_window_part_center">Help: Hosts</div>
   <div class="gb_window_part_content">
     <div style="float:left;"><a href="/help/contents.html?token={/envelope/token}">Help Contents</a></div>
     <div class="float_right"><a href="/omp?cmd=get_report&amp;type=assets&amp;overrides=1&amp;levels=hm&amp;token={/envelope/token}">Jump to dialog</a></div>
     <div style="text-align:left">
 
       <br/>
-      <h1>Assets</h1>
+      <h1>Hosts</h1>
       <p>
        This page provides an overview of all the hosts found in all tasks.
       </p>
 
       <a name="filtering"></a>
-      <h2>Asset Filtering</h2>
+      <h2>Host Filtering</h2>
       <p>
-        The Asset Filtering window shows how the assets of the scan have been
+        The Host Filtering window shows how the hosts of the scan have been
         filtered to produce the overview.  Modifying any of the values and clicking
         the "Apply" button will update the overview.
       </p>
 
       <a name="filtered"></a>
-      <h2>Filtered Assets</h2>
+      <h2>Filtered Hosts</h2>
       <p>
-        The Filtered Assets window shows all the hosts, filtered
-        according to the Asset Filtering window.
+        The Filtered Hosts window shows all the hosts, filtered
+        according to the Hosts Filtering window.
       </p>
 
       <table class="gbntable">
@@ -224,6 +224,13 @@
             most recent report.
           </td>
         </tr>
+        <tr>
+          <td>Prognosis</td>
+          <td>
+            The maximum threat on the host, predicted from what is currently
+            known about the host.
+          </td>
+        </tr>
       </table>
 
       <a name="actions"></a>
@@ -235,6 +242,13 @@
        switch to an overview of this host.
       </p>
 
+      <h4>Prognostic Report</h4>
+      <p>
+       Pressing the prognostic report icon
+       <img src="/img/new.png" alt="Prognostic Report" title="Prognostic Report" />
+       will switch to a prognostic report on this host.
+      </p>
+
       <!--
       <a name="overrides"></a>
       <h3>Overrides</h3>
@@ -264,11 +278,11 @@
       </p>
       -->
 
-      <a name="asset_details"></a>
-      <h2>Asset Details</h2>
+      <a name="host_details"></a>
+      <h2>Host Details</h2>
       <p>
-       Provides detailed information about the asset.
-       This includes all the information from the Filtered Assets table, plus the list of
+       Provides detailed information about the host.
+       This includes all the information from the Filtered Hosts table, plus the list of
        open ports and the list of Apps.
       </p>
     </div>
@@ -1874,6 +1888,10 @@
             <li> <a href="overrides.html?token={/envelope/token}">Overrides</a></li>
             <li> <a href="performance.html?token={/envelope/token}">Performance</a></li>
           </ul>
+          <li> Asset Management</li>
+          <ul>
+            <li> <a href="hosts.html?token={/envelope/token}">Hosts</a></li>
+          </ul>
           <li> Configuration</li>
           <ul>
             <li> <a href="configure_scanconfigs.html?token={/envelope/token}">Configure Scan Configs</a></li>

Modified: trunk/gsa/src/html/omp.xsl
===================================================================
--- trunk/gsa/src/html/omp.xsl	2011-09-19 12:00:59 UTC (rev 11635)
+++ trunk/gsa/src/html/omp.xsl	2011-09-19 13:54:49 UTC (rev 11636)
@@ -596,8 +596,8 @@
     <div class="gb_window_part_left"></div>
     <div class="gb_window_part_right"></div>
     <div class="gb_window_part_center">
-      Asset Filtering
-      <a href="/help/assets.html?token={/envelope/token}" title="Help: Assets">
+      Host Filtering
+      <a href="/help/hosts.html?token={/envelope/token}" title="Help: Hosts">
         <img src="/img/help.png" border="0"/>
       </a>
     </div>
@@ -767,7 +767,7 @@
     <div class="gb_window_part_right"></div>
     <div class="gb_window_part_center">
       <xsl:variable name="last" select="report/hosts/@start + count(report/host) - 1"/>
-      Filtered Assets
+      Filtered Hosts
       <xsl:if test = "report/hosts/@start &gt; 1">
         <a style="margin-right: 5px" class="gb_window_part_center" href="?cmd=get_report&amp;type=assets&amp;first_result={report/hosts/@start - report/hosts/@max}&amp;max_results={report/hosts/@max}&amp;sort_field={report/sort/field/text()}&amp;sort_order={report/sort/field/order}&amp;overrides={report/filters/apply_overrides}&amp;search_phrase={report/filters/phrase}&amp;levels={$levels}&amp;search_phrase={report/filters/phrase}&amp;token={/envelope/token}">&lt;&lt;</a>
       </xsl:if>
@@ -777,7 +777,7 @@
       <xsl:if test = "$last &lt; report/host_count/filtered">
         <a style="margin-left: 5px; text-align: right" class="gb_window_part_center" href="?cmd=get_report&amp;type=assets&amp;first_result={report/hosts/@start + report/hosts/@max}&amp;max_results={report/hosts/@max}&amp;overrides={report/filters/apply_overrides}&amp;&amp;search_phrase={report/filters/phrase}&amp;levels={$levels}&amp;search_phrase={report/filters/phrase}&amp;token={/envelope/token}">&gt;&gt;</a>
       </xsl:if>
-      <a style="margin-left: 7px" href="/help/assets.html?token={/envelope/token}" title="Help: Assets">
+      <a style="margin-left: 7px" href="/help/hosts.html?token={/envelope/token}" title="Help: Hosts">
         <img src="/img/help.png" border="0"/>
       </a>
       <a href="/omp?cmd=get_report&amp;type=prognostic&amp;pos=1&amp;host_search_phrase={report/filters/phrase}&amp;host_levels={gsa:build-levels(report/filters)}&amp;host_first_result={hosts/@start}&amp;host_max_results={hosts/@max}&amp;token={/envelope/token}"
@@ -877,7 +877,7 @@
       <xsl:choose>
         <xsl:when test="@type='prognostic'">
           <div class="float_right">
-            <a href="?cmd=get_report&amp;type=assets&amp;levels={../../host_levels}&amp;search_phrase={../../host_search_phrase}&amp;first_result={../../results/@start}&amp;max_results={../../results/@max}&amp;token={/envelope/token}">Back to Assets</a>
+            <a href="?cmd=get_report&amp;type=assets&amp;levels={../../host_levels}&amp;search_phrase={../../host_search_phrase}&amp;first_result={../../results/@start}&amp;max_results={../../results/@max}&amp;token={/envelope/token}">Back to Hosts</a>
           </div>
         </xsl:when>
         <xsl:otherwise>
@@ -10391,8 +10391,8 @@
     <div class="gb_window_part_left"></div>
     <div class="gb_window_part_right"></div>
     <div class="gb_window_part_center">
-       Asset Details
-       <a href="/help/assets.html?token={/envelope/token}#asset_details"
+       Host Details
+       <a href="/help/hosts.html?token={/envelope/token}#host_details"
          title="Help: Assets (Asset Details)">
          <img src="/img/help.png"/>
        </a>
@@ -10400,7 +10400,7 @@
     <div class="gb_window_part_content">
       <xsl:variable name="report_count" select="detail[name = 'report_count' and source/name = 'openvasmd']/value"/>
       <div class="float_right">
-        <a href="?cmd=get_report&amp;type=assets&amp;levels={../../../../levels}&amp;search_phrase={../../../../search_phrase}&amp;first_result={../../../../hosts/@start}&amp;max_results={../../../../hosts/@max}&amp;token={/envelope/token}">Back to Assets</a>
+        <a href="?cmd=get_report&amp;type=assets&amp;levels={../../../../levels}&amp;search_phrase={../../../../search_phrase}&amp;first_result={../../../../hosts/@start}&amp;max_results={../../../../hosts/@max}&amp;token={/envelope/token}">Back to Hosts</a>
       </div>
       <table>
         <tr>



More information about the Openvas-commits mailing list