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

[scm-commit@wald.intevation.org]

Author: mattm
Date: 2011-11-22 18:35:28 +0100 (Tue, 22 Nov 2011)
New Revision: 12160

Modified:
   trunk/gsa/ChangeLog
   trunk/gsa/src/html/omp.xsl
Log:
	* src/html/omp.xsl (host): Always print arrows, even if time is empty.

Modified: trunk/gsa/ChangeLog
===================================================================
--- trunk/gsa/ChangeLog	2011-11-22 17:31:17 UTC (rev 12159)
+++ trunk/gsa/ChangeLog	2011-11-22 17:35:28 UTC (rev 12160)
@@ -1,5 +1,9 @@
 2011-11-22  Matthew Mundell <matthew.mundell at greenbone.net>
 
+	* src/html/omp.xsl (host): Always print arrows, even if time is empty.
+
+2011-11-22  Matthew Mundell <matthew.mundell at greenbone.net>
+
 	* src/html/omp.xsl (host, report [report-assets]): Handle ISO time.
 
 2011-11-21  Matthew Mundell <matthew.mundell at greenbone.net>

Modified: trunk/gsa/src/html/omp.xsl
===================================================================
--- trunk/gsa/src/html/omp.xsl	2011-11-22 17:31:17 UTC (rev 12159)
+++ trunk/gsa/src/html/omp.xsl	2011-11-22 17:35:28 UTC (rev 12160)
@@ -11149,29 +11149,29 @@
         <tr>
           <td>Report:</td>
           <td>
+            <xsl:variable name="pos" select="detail[name/text() = 'report/pos']/value"/>
             <xsl:choose>
+              <xsl:when test="$pos &lt; $report_count">
+                <a href="/omp?cmd=get_report&amp;type=assets&amp;host={ip}&amp;pos={$pos + 1}&amp;levels={../../../../levels}&amp;search_phrase={../../../../search_phrase}&amp;first_result={../../../../hosts/@start}&amp;max_results={../../../../hosts/@max}&amp;overrides={$apply-overrides}&amp;token={/envelope/token}">
+                  &lt;&lt;
+                </a>
+              </xsl:when>
+            </xsl:choose>
+            <xsl:choose>
               <xsl:when test="start/text() != ''">
-                <xsl:variable name="pos" select="detail[name/text() = 'report/pos']/value"/>
-                <xsl:choose>
-                  <xsl:when test="$pos &lt; $report_count">
-                    <a href="/omp?cmd=get_report&amp;type=assets&amp;host={ip}&amp;pos={$pos + 1}&amp;levels={../../../../levels}&amp;search_phrase={../../../../search_phrase}&amp;first_result={../../../../hosts/@start}&amp;max_results={../../../../hosts/@max}&amp;overrides={$apply-overrides}&amp;token={/envelope/token}">
-                      &lt;&lt;
-                    </a>
-                  </xsl:when>
-                </xsl:choose>
                 <a style="margin-left: 5px; margin-right: 5px;" href="/omp?cmd=get_report&amp;report_id={detail[name = 'report/@id' and source/name = 'openvasmd']/value}&amp;notes=1&amp;overrides={$apply-overrides}&amp;result_hosts_only=1&amp;search_phrase={ip}&amp;token={/envelope/token}">
                   <xsl:value-of select="concat (date:month-abbreviation (start/text()), ' ', date:day-in-month (start/text()), ' ', date:year (start/text()))"/>
                 </a>
-                <xsl:choose>
-                  <xsl:when test="$pos &gt; 1">
-                    <a href="/omp?cmd=get_report&amp;type=assets&amp;host={ip}&amp;pos={$pos - 1}&amp;levels={../../../../levels}&amp;search_phrase={../../../../search_phrase}&amp;first_result={../../../../hosts/@start}&amp;max_results={../../../../hosts/@max}&amp;overrides={$apply-overrides}&amp;token={/envelope/token}">
-                      &gt;&gt;
-                    </a>
-                  </xsl:when>
-                </xsl:choose>
               </xsl:when>
               <xsl:otherwise>(not finished)</xsl:otherwise>
             </xsl:choose>
+            <xsl:choose>
+              <xsl:when test="$pos &gt; 1">
+                <a href="/omp?cmd=get_report&amp;type=assets&amp;host={ip}&amp;pos={$pos - 1}&amp;levels={../../../../levels}&amp;search_phrase={../../../../search_phrase}&amp;first_result={../../../../hosts/@start}&amp;max_results={../../../../hosts/@max}&amp;overrides={$apply-overrides}&amp;token={/envelope/token}">
+                  &gt;&gt;
+                </a>
+              </xsl:when>
+            </xsl:choose>
           </td>
         </tr>
         <tr>