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

[scm-commit@wald.intevation.org]

Author: mattm
Date: 2011-11-11 12:06:29 +0100 (Fri, 11 Nov 2011)
New Revision: 12106

Modified:
   trunk/gsa/ChangeLog
   trunk/gsa/src/html/omp.xsl
Log:
	* src/html/omp.xsl (override [details]): Show the override in the active
	style always, with a hint in the title when it's off.  This allows the
	user to see the full text, even when the override is off.
	(override-detailed): Use the override_box_box always, and remove the
	"Active: no".

Modified: trunk/gsa/ChangeLog
===================================================================
--- trunk/gsa/ChangeLog	2011-11-11 07:30:14 UTC (rev 12105)
+++ trunk/gsa/ChangeLog	2011-11-11 11:06:29 UTC (rev 12106)
@@ -1,5 +1,13 @@
 2011-11-11  Matthew Mundell <matthew.mundell at greenbone.net>
 
+	* src/html/omp.xsl (override [details]): Show the override in the active
+	style always, with a hint in the title when it's off.  This allows the
+	user to see the full text, even when the override is off.
+	(override-detailed): Use the override_box_box always, and remove the
+	"Active: no".
+
+2011-11-11  Matthew Mundell <matthew.mundell at greenbone.net>
+
 	* src/html/omp.xsl (override [details]): Only show appearance when active.
 	(result-detailed): Show overrides only when they are active.
 

Modified: trunk/gsa/src/html/omp.xsl
===================================================================
--- trunk/gsa/src/html/omp.xsl	2011-11-11 07:30:14 UTC (rev 12105)
+++ trunk/gsa/src/html/omp.xsl	2011-11-11 11:06:29 UTC (rev 12106)
@@ -10309,17 +10309,16 @@
 
       <xsl:choose>
         <xsl:when test="active = '0'">
-          <h1>Appearance</h1>
-          (Does not appear in reports, because it is not active.)
+          <h1>Appearance when Active</h1>
         </xsl:when>
         <xsl:otherwise>
           <h1>Appearance</h1>
-          <div class="override_top_line"></div>
-          <xsl:call-template name="override-detailed">
-            <xsl:with-param name="override-buttons">0</xsl:with-param>
-          </xsl:call-template>
         </xsl:otherwise>
       </xsl:choose>
+      <div class="override_top_line"></div>
+      <xsl:call-template name="override-detailed">
+        <xsl:with-param name="override-buttons">0</xsl:with-param>
+      </xsl:call-template>
     </div>
   </div>
 </xsl:template>
@@ -11477,13 +11476,7 @@
   <xsl:param name="override-buttons">1</xsl:param>
   <xsl:param name="delta"/>
   <xsl:param name="next">get_report</xsl:param>
-  <xsl:variable name="class">
-    <xsl:choose>
-      <xsl:when test="active='0'">issue_box_box</xsl:when>
-      <xsl:otherwise>override_box_box</xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-  <div class="{$class}">
+  <div class="override_box_box">
     <b>
       Override from
       <xsl:choose>
@@ -11503,7 +11496,6 @@
     <div>
       <xsl:choose>
         <xsl:when test="active='0'">
-          Active: no.
         </xsl:when>
         <xsl:when test="active='1' and string-length (end_time) &gt; 0">
           Active until: