[Openvas-commits] r9576 - in trunk/openvas-manager: . doc src/schema_formats/HTML
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Tue Nov 30 22:24:16 CET 2010
Author: mattm
Date: 2010-11-30 22:24:15 +0100 (Tue, 30 Nov 2010)
New Revision: 9576
Modified:
trunk/openvas-manager/ChangeLog
trunk/openvas-manager/doc/omp.html
trunk/openvas-manager/src/schema_formats/HTML/HTML.xsl
Log:
* src/schema_formats/HTML/HTML.xsl (structure-line): Remove type check
from global element case, because the type is the global element type.
* doc/omp.html: Update from source.
Modified: trunk/openvas-manager/ChangeLog
===================================================================
--- trunk/openvas-manager/ChangeLog 2010-11-30 21:17:20 UTC (rev 9575)
+++ trunk/openvas-manager/ChangeLog 2010-11-30 21:24:15 UTC (rev 9576)
@@ -1,5 +1,12 @@
2010-11-30 Matthew Mundell <matthew.mundell at greenbone.net>
+ * src/schema_formats/HTML/HTML.xsl (structure-line): Remove type check
+ from global element case, because the type is the global element type.
+
+ * doc/omp.html: Update from source.
+
+2010-11-30 Matthew Mundell <matthew.mundell at greenbone.net>
+
* src/schema_formats/HTML/HTML.xsl (structure-line): In the global element
case link the tag text to the element details.
Modified: trunk/openvas-manager/doc/omp.html
===================================================================
--- trunk/openvas-manager/doc/omp.html 2010-11-30 21:17:20 UTC (rev 9575)
+++ trunk/openvas-manager/doc/omp.html 2010-11-30 21:24:15 UTC (rev 9576)
@@ -685,20 +685,20 @@
<ul style="list-style: none"><li><ul style="list-style: none"><li>
<i>One of</i><ul style="list-style: none">
<li>
- <<a href="#element_c"><b>c</b></a>>
- <div style="margin-left: 15px; display: inline;">A reference to a command.</div>
+ <<a href="#element_c"><b>c</b></a>>
+ <div style="margin-left: 15px; display: inline;">A reference to a command.</div>
</li>
<li>
- <<a href="#element_e"><b>e</b></a>>
- <div style="margin-left: 15px; display: inline;">A reference to an element.</div>
+ <<a href="#element_e"><b>e</b></a>>
+ <div style="margin-left: 15px; display: inline;">A reference to an element.</div>
</li>
<li>
- <<a href="#element_r"><b>r</b></a>>
- <div style="margin-left: 15px; display: inline;">A reference to a response.</div>
+ <<a href="#element_r"><b>r</b></a>>
+ <div style="margin-left: 15px; display: inline;">A reference to a response.</div>
</li>
<li>
- <<a href="#element_g"><b>g</b></a>>
- <div style="margin-left: 15px; display: inline;">A group of pattern items.</div>
+ <<a href="#element_g"><b>g</b></a>>
+ <div style="margin-left: 15px; display: inline;">A group of pattern items.</div>
</li>
</ul>
</li></ul></li></ul>
@@ -721,24 +721,24 @@
<h4>6.5.1 Structure</h4>
<ul style="list-style: none"><li><ul style="list-style: none">
<li>
- <<a href="#element_c"><b>c</b></a>>
- *<div style="margin-left: 15px; display: inline;">A reference to a command.</div>
+ <<a href="#element_c"><b>c</b></a>>
+ *<div style="margin-left: 15px; display: inline;">A reference to a command.</div>
</li>
<li>
- <<a href="#element_e"><b>e</b></a>>
- *<div style="margin-left: 15px; display: inline;">A reference to an element.</div>
+ <<a href="#element_e"><b>e</b></a>>
+ *<div style="margin-left: 15px; display: inline;">A reference to an element.</div>
</li>
<li>
- <<a href="#element_r"><b>r</b></a>>
- *<div style="margin-left: 15px; display: inline;">A reference to a response.</div>
+ <<a href="#element_r"><b>r</b></a>>
+ *<div style="margin-left: 15px; display: inline;">A reference to a response.</div>
</li>
<li>
- <<a href="#element_o"><b>o</b></a>>
- *<div style="margin-left: 15px; display: inline;">An optional pattern item.</div>
+ <<a href="#element_o"><b>o</b></a>>
+ *<div style="margin-left: 15px; display: inline;">An optional pattern item.</div>
</li>
<li>
- <<a href="#element_any"><b>any</b></a>>
- *<div style="margin-left: 15px; display: inline;">Pattern item indicating "any number of".</div>
+ <<a href="#element_any"><b>any</b></a>>
+ *<div style="margin-left: 15px; display: inline;">Pattern item indicating "any number of".</div>
</li>
</ul></li></ul>
<h4>6.5.2 RNC</h4>
@@ -762,20 +762,20 @@
<ul style="list-style: none"><li><ul style="list-style: none"><li>
<i>One of</i><ul style="list-style: none">
<li>
- <<a href="#element_c"><b>c</b></a>>
- <div style="margin-left: 15px; display: inline;">A reference to a command.</div>
+ <<a href="#element_c"><b>c</b></a>>
+ <div style="margin-left: 15px; display: inline;">A reference to a command.</div>
</li>
<li>
- <<a href="#element_e"><b>e</b></a>>
- <div style="margin-left: 15px; display: inline;">A reference to an element.</div>
+ <<a href="#element_e"><b>e</b></a>>
+ <div style="margin-left: 15px; display: inline;">A reference to an element.</div>
</li>
<li>
- <<a href="#element_r"><b>r</b></a>>
- <div style="margin-left: 15px; display: inline;">A reference to a response.</div>
+ <<a href="#element_r"><b>r</b></a>>
+ <div style="margin-left: 15px; display: inline;">A reference to a response.</div>
</li>
<li>
- <<a href="#element_g"><b>g</b></a>>
- <div style="margin-left: 15px; display: inline;">A group of pattern items.</div>
+ <<a href="#element_g"><b>g</b></a>>
+ <div style="margin-left: 15px; display: inline;">A group of pattern items.</div>
</li>
</ul>
</li></ul></li></ul>
@@ -819,28 +819,28 @@
</ul>
</li>
<li>
- <<a href="#element_c"><b>c</b></a>>
- *<div style="margin-left: 15px; display: inline;">A reference to a command.</div>
+ <<a href="#element_c"><b>c</b></a>>
+ *<div style="margin-left: 15px; display: inline;">A reference to a command.</div>
</li>
<li>
- <<a href="#element_e"><b>e</b></a>>
- *<div style="margin-left: 15px; display: inline;">A reference to an element.</div>
+ <<a href="#element_e"><b>e</b></a>>
+ *<div style="margin-left: 15px; display: inline;">A reference to an element.</div>
</li>
<li>
- <<a href="#element_r"><b>r</b></a>>
- *<div style="margin-left: 15px; display: inline;">A reference to a response.</div>
+ <<a href="#element_r"><b>r</b></a>>
+ *<div style="margin-left: 15px; display: inline;">A reference to a response.</div>
</li>
<li>
- <<a href="#element_o"><b>o</b></a>>
- *<div style="margin-left: 15px; display: inline;">An optional pattern item.</div>
+ <<a href="#element_o"><b>o</b></a>>
+ *<div style="margin-left: 15px; display: inline;">An optional pattern item.</div>
</li>
<li>
- <<a href="#element_g"><b>g</b></a>>
- *<div style="margin-left: 15px; display: inline;">A group of pattern items.</div>
+ <<a href="#element_g"><b>g</b></a>>
+ *<div style="margin-left: 15px; display: inline;">A group of pattern items.</div>
</li>
<li>
- <<a href="#element_any"><b>any</b></a>>
- *<div style="margin-left: 15px; display: inline;">Pattern item indicating "any number of".</div>
+ <<a href="#element_any"><b>any</b></a>>
+ *<div style="margin-left: 15px; display: inline;">Pattern item indicating "any number of".</div>
</li>
<li>
<<b>t</b>>
Modified: trunk/openvas-manager/src/schema_formats/HTML/HTML.xsl
===================================================================
--- trunk/openvas-manager/src/schema_formats/HTML/HTML.xsl 2010-11-30 21:17:20 UTC (rev 9575)
+++ trunk/openvas-manager/src/schema_formats/HTML/HTML.xsl 2010-11-30 21:24:15 UTC (rev 9576)
@@ -485,18 +485,9 @@
<xsl:otherwise>
<xsl:variable name="global-element"
select="/protocol/element[name=$element-name]"/>
- <xsl:choose>
- <xsl:when test="$global-element/type">
- <<b><xsl:value-of select="text()"/></b>>
- <xsl:value-of select="$element-suffix"/>
- <div style="margin-left: 15px; display: inline;">(<xsl:apply-templates select="$global-element/type" mode="element"/>)</div>
- </xsl:when>
- <xsl:otherwise>
- <<a href="#element_{$global-element/name}"><b><xsl:value-of select="text()"/></b></a>>
- <xsl:value-of select="$element-suffix"/>
- <div style="margin-left: 15px; display: inline;"><xsl:value-of select="normalize-space($global-element/summary)"/>.</div>
- </xsl:otherwise>
- </xsl:choose>
+ <<a href="#element_{$global-element/name}"><b><xsl:value-of select="text()"/></b></a>>
+ <xsl:value-of select="$element-suffix"/>
+ <div style="margin-left: 15px; display: inline;"><xsl:value-of select="normalize-space($global-element/summary)"/>.</div>
</xsl:otherwise>
</xsl:choose>
</li>
More information about the Openvas-commits
mailing list