[Openvas-commits] r12117 - in trunk/gsa: . src/html
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Tue Nov 15 16:17:07 CET 2011
Author: mattm
Date: 2011-11-15 16:17:06 +0100 (Tue, 15 Nov 2011)
New Revision: 12117
Modified:
trunk/gsa/ChangeLog
trunk/gsa/src/html/help.xsl
trunk/gsa/src/html/omp.xsl
Log:
* src/html/omp.xsl (assets): Add override selector. Add overrides flag
to links.
(html-report-details): Add overrides flag to Prognostic Report link.
(host): Add override selector. Add overrides flag to links.
(report [assets]): Add overrides flag to links.
* src/html/help.xsl (hosts.html): Add note about applying overrides.
Modified: trunk/gsa/ChangeLog
===================================================================
--- trunk/gsa/ChangeLog 2011-11-15 14:54:02 UTC (rev 12116)
+++ trunk/gsa/ChangeLog 2011-11-15 15:17:06 UTC (rev 12117)
@@ -1,5 +1,15 @@
2011-11-14 Matthew Mundell <matthew.mundell at greenbone.net>
+ * src/html/omp.xsl (assets): Add override selector. Add overrides flag
+ to links.
+ (html-report-details): Add overrides flag to Prognostic Report link.
+ (host): Add override selector. Add overrides flag to links.
+ (report [assets]): Add overrides flag to links.
+
+ * src/html/help.xsl (hosts.html): Add note about applying overrides.
+
+2011-11-14 Matthew Mundell <matthew.mundell at greenbone.net>
+
* src/html/omp.xsl (assets): When there are 0 hosts skip the host
counts and table, and put "0 hosts". This matches the behaviour for
0 results in a report.
Modified: trunk/gsa/src/html/help.xsl
===================================================================
--- trunk/gsa/src/html/help.xsl 2011-11-15 14:54:02 UTC (rev 12116)
+++ trunk/gsa/src/html/help.xsl 2011-11-15 15:17:06 UTC (rev 12117)
@@ -150,6 +150,20 @@
the "Apply" button will update the overview.
</p>
+ <a name="overrides"></a>
+ <h3>Overrides</h3>
+ <p>
+ By default the configured <a href="glossary.html?token={/envelope/token}#override">overrides</a> are applied.
+ The selection allows to switch to a view without applying overrides.
+ In the Filtered Hosts table the hosts and the threat counts might change
+ when switching this selection.
+ By pressing the refresh
+ <img src="/img/refresh.png" alt="Refresh" title="Refresh" /> icon a change is confirmed.
+ </p>
+ <p>
+ The selection that is active for the present page is marked with a hook (√).
+ </p>
+
<a name="filtered"></a>
<h2>Filtered Hosts</h2>
<p>
Modified: trunk/gsa/src/html/omp.xsl
===================================================================
--- trunk/gsa/src/html/omp.xsl 2011-11-15 14:54:02 UTC (rev 12116)
+++ trunk/gsa/src/html/omp.xsl 2011-11-15 15:17:06 UTC (rev 12117)
@@ -622,6 +622,35 @@
<a href="/help/hosts.html?token={/envelope/token}" title="Help: Hosts">
<img src="/img/help.png" border="0"/>
</a>
+ <div id="small_inline_form" style="display: inline; margin-left: 40px; font-weight: normal;">
+ <form action="" method="get">
+ <input type="hidden" name="token" value="{/envelope/token}"/>
+ <input type="hidden" name="cmd" value="get_report"/>
+ <input type="hidden" name="type" value="assets"/>
+ <input type="hidden" name="levels" value="{$levels}"/>
+ <input type="hidden" name="search_phrase" value="{report/filters/phrase}"/>
+ <!-- Switch back to the first page if the override state changes, because
+ this could lead to changes in the number of hosts in the table. -->
+ <input type="hidden" name="first_result" value="1"/>
+ <input type="hidden" name="max_results" value="{report/hosts/@max}"/>
+ <select style="margin-bottom: 0px;" name="overrides" size="1">
+ <xsl:choose>
+ <xsl:when test="$apply-overrides = 0">
+ <option value="0" selected="1">√No overrides</option>
+ <option value="1" >Apply overrides</option>
+ </xsl:when>
+ <xsl:otherwise>
+ <option value="0">No overrides</option>
+ <option value="1" selected="1">√Apply overrides</option>
+ </xsl:otherwise>
+ </xsl:choose>
+ </select>
+ <input type="image"
+ name="Update"
+ src="/img/refresh.png"
+ alt="Update" style="margin-left:3px;margin-right:3px;"/>
+ </form>
+ </div>
</div>
<div class="gb_window_part_content">
<div style="background-color: #EEEEEE;">
@@ -814,7 +843,7 @@
style="margin-left:3px;"/>
</xsl:when>
<xsl:otherwise>
- <a href="/omp?cmd=get_report&type=prognostic&pos=1&host_search_phrase={report/filters/phrase}&host_levels={gsa:build-levels(report/filters)}&host_first_result={report/hosts/@start}&host_max_results={report/hosts/@max}&result_hosts_only=1&token={/envelope/token}"
+ <a href="/omp?cmd=get_report&type=prognostic&pos=1&host_search_phrase={report/filters/phrase}&host_levels={gsa:build-levels(report/filters)}&host_first_result={report/hosts/@start}&host_max_results={report/hosts/@max}&result_hosts_only=1&overrides={$apply-overrides}&token={/envelope/token}"
title="Prognostic Report" style="margin-left:3px;">
<img src="/img/prognosis.png" border="0" alt="Prognostic Report"/>
</a>
@@ -922,7 +951,7 @@
<xsl:choose>
<xsl:when test="@type='prognostic'">
<div class="float_right">
- <a href="?cmd=get_report&type=assets&levels={../../host_levels}&search_phrase={../../host_search_phrase}&first_result={../../results/@start}&max_results={../../results/@max}&token={/envelope/token}">Hosts</a>
+ <a href="?cmd=get_report&type=assets&levels={../../host_levels}&search_phrase={../../host_search_phrase}&first_result={../../results/@start}&max_results={../../results/@max}&overrides={$apply-overrides}&token={/envelope/token}">Hosts</a>
</div>
</xsl:when>
<xsl:otherwise>
@@ -11040,6 +11069,7 @@
</xsl:template>
<xsl:template match="host">
+ <xsl:variable name="apply-overrides" select="../filters/apply_overrides"/>
<div class="gb_window">
<div class="gb_window_part_left"></div>
<div class="gb_window_part_right"></div>
@@ -11053,11 +11083,42 @@
title="Prognostic Report" style="margin-left:3px;">
<img src="/img/prognosis.png" border="0" alt="Prognostic Report"/>
</a>
+ <div id="small_inline_form" style="display: inline; margin-left: 40px; font-weight: normal;">
+ <form action="" method="get">
+ <input type="hidden" name="token" value="{/envelope/token}"/>
+ <input type="hidden" name="cmd" value="get_report"/>
+ <input type="hidden" name="type" value="assets"/>
+ <input type="hidden" name="pos" value="{detail[name/text() = 'report/pos']/value}"/>
+ <input type="hidden" name="host" value="{ip}"/>
+ <input type="hidden" name="levels" value="{../../../../levels}"/>
+ <input type="hidden" name="search_phrase" value="{../../../../search_phrase}"/>
+ <!-- Switch back to the first page if the override state changes, because
+ this could lead to changes in the number of hosts in the table. -->
+ <input type="hidden" name="first_result" value="1"/>
+ <input type="hidden" name="max_results" value="{../../../../hosts/@max}"/>
+ <select style="margin-bottom: 0px;" name="overrides" size="1">
+ <xsl:choose>
+ <xsl:when test="$apply-overrides = 0">
+ <option value="0" selected="1">√No overrides</option>
+ <option value="1" >Apply overrides</option>
+ </xsl:when>
+ <xsl:otherwise>
+ <option value="0">No overrides</option>
+ <option value="1" selected="1">√Apply overrides</option>
+ </xsl:otherwise>
+ </xsl:choose>
+ </select>
+ <input type="image"
+ name="Update"
+ src="/img/refresh.png"
+ alt="Update" style="margin-left:3px;margin-right:3px;"/>
+ </form>
+ </div>
</div>
<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&type=assets&levels={../../../../levels}&search_phrase={../../../../search_phrase}&first_result={../../../../hosts/@start}&max_results={../../../../hosts/@max}&token={/envelope/token}">Hosts</a>
+ <a href="?cmd=get_report&type=assets&levels={../../../../levels}&search_phrase={../../../../search_phrase}&first_result={../../../../hosts/@start}&max_results={../../../../hosts/@max}&overrides={$apply-overrides}&token={/envelope/token}">Hosts</a>
</div>
<table>
<tr>
@@ -11078,18 +11139,18 @@
<xsl:variable name="pos" select="detail[name/text() = 'report/pos']/value"/>
<xsl:choose>
<xsl:when test="$pos < $report_count">
- <a href="/omp?cmd=get_report&type=assets&host={ip}&pos={$pos + 1}&levels={../../../../levels}&search_phrase={../../../../search_phrase}&first_result={../../../../hosts/@start}&max_results={../../../../hosts/@max}&token={/envelope/token}">
+ <a href="/omp?cmd=get_report&type=assets&host={ip}&pos={$pos + 1}&levels={../../../../levels}&search_phrase={../../../../search_phrase}&first_result={../../../../hosts/@start}&max_results={../../../../hosts/@max}&overrides={$apply-overrides}&token={/envelope/token}">
<<
</a>
</xsl:when>
</xsl:choose>
- <a style="margin-left: 5px; margin-right: 5px;" href="/omp?cmd=get_report&report_id={detail[name = 'report/@id' and source/name = 'openvasmd']/value}&notes=1&overrides=1&result_hosts_only=1&search_phrase={ip}&token={/envelope/token}">
+ <a style="margin-left: 5px; margin-right: 5px;" href="/omp?cmd=get_report&report_id={detail[name = 'report/@id' and source/name = 'openvasmd']/value}&notes=1&overrides={$apply-overrides}&result_hosts_only=1&search_phrase={ip}&token={/envelope/token}">
<xsl:value-of select="substring(start/text(),5,6)"/>
<xsl:value-of select="substring(start/text(),20,21)"/>
</a>
<xsl:choose>
<xsl:when test="$pos > 1">
- <a href="/omp?cmd=get_report&type=assets&host={ip}&pos={$pos - 1}&levels={../../../../levels}&search_phrase={../../../../search_phrase}&first_result={../../../../hosts/@start}&max_results={../../../../hosts/@max}&token={/envelope/token}">
+ <a href="/omp?cmd=get_report&type=assets&host={ip}&pos={$pos - 1}&levels={../../../../levels}&search_phrase={../../../../search_phrase}&first_result={../../../../hosts/@start}&max_results={../../../../hosts/@max}&overrides={$apply-overrides}&token={/envelope/token}">
>>
</a>
</xsl:when>
@@ -12246,7 +12307,7 @@
<xsl:value-of select="detail[name = 'report_count' and source/name = 'openvasmd']/value"/>
</td>
<td>
- <a href="/omp?cmd=get_report&type=assets&host={ip}&pos=1&search_phrase={../filters/phrase}&levels={gsa:build-levels(../filters)}&first_result={../hosts/@start}&max_results={../hosts/@max}&token={/envelope/token}"
+ <a href="/omp?cmd=get_report&type=assets&host={ip}&pos=1&search_phrase={../filters/phrase}&levels={gsa:build-levels(../filters)}&first_result={../hosts/@start}&max_results={../hosts/@max}&overrides={../filters/apply_overrides}&token={/envelope/token}"
title="Host Details" style="margin-left:3px;">
<img src="/img/details.png" border="0" alt="Details"/>
</a>
@@ -12256,7 +12317,7 @@
style="margin-left:3px;"/>
</xsl:when>
<xsl:otherwise>
- <a href="/omp?cmd=get_report&type=prognostic&host={ip}&pos=1&host_search_phrase={../filters/phrase}&host_levels={gsa:build-levels(../filters)}&host_first_result={../hosts/@start}&host_max_results={../hosts/@max}&result_hosts_only=1&token={/envelope/token}"
+ <a href="/omp?cmd=get_report&type=prognostic&host={ip}&pos=1&host_search_phrase={../filters/phrase}&host_levels={gsa:build-levels(../filters)}&host_first_result={../hosts/@start}&host_max_results={../hosts/@max}&result_hosts_only=1&overrides={../filters/apply_overrides}&token={/envelope/token}"
title="Prognostic Report" style="margin-left:3px;">
<img src="/img/prognosis.png" border="0" alt="Prognostic Report"/>
</a>
More information about the Openvas-commits
mailing list