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

[scm-commit@wald.intevation.org]

Author: mattm
Date: 2011-11-09 15:00:26 +0100 (Wed, 09 Nov 2011)
New Revision: 12065

Modified:
   trunk/gsa/ChangeLog
   trunk/gsa/src/html/omp.xsl
Log:
	* src/html/omp.xsl (override-detailed): Skip active field if always on.
	Simplify active field if on with time limit.

Modified: trunk/gsa/ChangeLog
===================================================================
--- trunk/gsa/ChangeLog	2011-11-09 13:13:12 UTC (rev 12064)
+++ trunk/gsa/ChangeLog	2011-11-09 14:00:26 UTC (rev 12065)
@@ -1,3 +1,8 @@
+2011-11-09  Matthew Mundell <matthew.mundell at greenbone.net>
+
+	* src/html/omp.xsl (override-detailed): Skip active field if always on.
+	Simplify active field if on with time limit.
+
 2011-11-08  Matthew Mundell <matthew.mundell at greenbone.net>
 
 	* src/gsad.c (init_validator): Add active and days.

Modified: trunk/gsa/src/html/omp.xsl
===================================================================
--- trunk/gsa/src/html/omp.xsl	2011-11-09 13:13:12 UTC (rev 12064)
+++ trunk/gsa/src/html/omp.xsl	2011-11-09 14:00:26 UTC (rev 12065)
@@ -11493,17 +11493,15 @@
       </xsl:call-template>
     </pre>
     <div>
-      Active:
       <xsl:choose>
         <xsl:when test="active='0'">
-          no.
+          Active: no.
         </xsl:when>
         <xsl:when test="active='1' and string-length (end_time) &gt; 0">
-          yes, until
+          Active: Until
           <xsl:value-of select="end_time"/>.
         </xsl:when>
         <xsl:otherwise>
-          yes.
         </xsl:otherwise>
       </xsl:choose>
     </div>