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

scm-commit@wald.intevation.org scm-commit at wald.intevation.org
Mon Dec 21 09:27:56 CET 2009


Author: mwiegand
Date: 2009-12-21 09:27:56 +0100 (Mon, 21 Dec 2009)
New Revision: 6209

Modified:
   trunk/gsa/ChangeLog
   trunk/gsa/src/html/src/oap.xsl
Log:
* src/html/src/oap.xsl: Include settings error message if there is one.
Make sure filename is correctly aligned, even in Konqueror.


Modified: trunk/gsa/ChangeLog
===================================================================
--- trunk/gsa/ChangeLog	2009-12-21 08:24:07 UTC (rev 6208)
+++ trunk/gsa/ChangeLog	2009-12-21 08:27:56 UTC (rev 6209)
@@ -1,3 +1,8 @@
+2009-12-21  Michael Wiegand <michael.wiegand at intevation.de>
+
+	* src/html/src/oap.xsl: Include settings error message if there is one.
+	Make sure filename is correctly aligned, even in Konqueror.
+
 2009-12-18  Matthew Mundell <matthew.mundell at intevation.de>
 
 	Enable agent download button.

Modified: trunk/gsa/src/html/src/oap.xsl
===================================================================
--- trunk/gsa/src/html/src/oap.xsl	2009-12-21 08:24:07 UTC (rev 6208)
+++ trunk/gsa/src/html/src/oap.xsl	2009-12-21 08:27:56 UTC (rev 6209)
@@ -270,7 +270,7 @@
       </a>
     </div>
     <div class="gb_window_part_content_no_pad">
-      <div>From file: <xsl:value-of select="@sourcefile"/></div>
+      <div style="text-align:left">From file: <xsl:value-of select="@sourcefile"/></div>
       <div id="settings">
         <table class="gbntable" cellspacing="2" cellpadding="4" border="0">
           <tr class="gbntablehead2">
@@ -304,7 +304,22 @@
 <!--     GET_SETTINGS_RESPONSE -->
 
 <xsl:template match="get_settings_response">
-  <xsl:call-template name="html-settings-table"/>
+    <xsl:choose>
+      <xsl:when test="@status = '200' or @status = '201' or @status = '202'">
+        <xsl:call-template name="html-settings-table"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:call-template name="command_result_dialog">
+          <xsl:with-param name="operation">List Settings</xsl:with-param>
+          <xsl:with-param name="status">
+            <xsl:value-of select="@status"/>
+          </xsl:with-param>
+          <xsl:with-param name="msg">
+            <xsl:value-of select="@status_text"/>
+          </xsl:with-param>
+        </xsl:call-template>
+      </xsl:otherwise>
+    </xsl:choose>
 </xsl:template>
 
 <!-- END SETTINGS MANAGEMENT -->



More information about the Openvas-commits mailing list