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

[scm-commit@wald.intevation.org]

Author: mattm
Date: 2011-03-16 06:09:25 +0100 (Wed, 16 Mar 2011)
New Revision: 10556

Modified:
   trunk/gsa/ChangeLog
   trunk/gsa/src/html/gsad.xsl
   trunk/gsa/src/html/help.xsl
   trunk/gsa/src/html/omp.xsl
Log:
	* src/html/gsad.xsl (error_dialog): Get token from param.
	(gsad_response): New template.  From omp.xsl.

	* src/html/omp.xsl (gsad_response): Remove.  To gsad.xsl.

	* src/html/help.xsl (error_messages.html): Correct provoke link.

Modified: trunk/gsa/ChangeLog
===================================================================
--- trunk/gsa/ChangeLog	2011-03-16 04:34:20 UTC (rev 10555)
+++ trunk/gsa/ChangeLog	2011-03-16 05:09:25 UTC (rev 10556)
@@ -1,3 +1,12 @@
+2011-03-16  Matthew Mundell <matthew.mundell at greenbone.net>
+
+	* src/html/gsad.xsl (error_dialog): Get token from param.
+	(gsad_response): New template.  From omp.xsl.
+
+	* src/html/omp.xsl (gsad_response): Remove.  To gsad.xsl.
+
+	* src/html/help.xsl (error_messages.html): Correct provoke link.
+
 2011-03-15  Matthew Mundell <matthew.mundell at greenbone.net>
 
 	* src/html/omp.xsl (get_trash): Correct help link.

Modified: trunk/gsa/src/html/gsad.xsl
===================================================================
--- trunk/gsa/src/html/gsad.xsl	2011-03-16 04:34:20 UTC (rev 10555)
+++ trunk/gsa/src/html/gsad.xsl	2011-03-16 05:09:25 UTC (rev 10556)
@@ -181,7 +181,7 @@
         <div class="gb_window_part_center_error">Error Message</div>
         <div class="gb_window_part_content_error" style="text-align:center;">
           <div class="float_right">
-            <a href="/help/error_messages.html?token={/envelope/token}" title="Help: Error Message">
+            <a href="/help/error_messages.html?token={$token}" title="Help: Error Message">
               <img src="/img/help.png"/>
             </a>
           </div>
@@ -215,6 +215,25 @@
   </center>
 </xsl:template>
 
+<!-- GSAD_RESPONSE -->
+
+<xsl:template match="gsad_response">
+  <xsl:call-template name="error_dialog">
+    <xsl:with-param name="title">
+      <xsl:value-of select="title"/>
+    </xsl:with-param>
+    <xsl:with-param name="message">
+      <xsl:value-of select="message"/>
+    </xsl:with-param>
+    <xsl:with-param name="backurl">
+      <xsl:value-of select="backurl"/>
+    </xsl:with-param>
+    <xsl:with-param name="token">
+      <xsl:value-of select="token"/>
+    </xsl:with-param>
+  </xsl:call-template>
+</xsl:template>
+
 <!-- COMMON TEMPLATES -->
 
 <xsl:template name="command_result_dialog">

Modified: trunk/gsa/src/html/help.xsl
===================================================================
--- trunk/gsa/src/html/help.xsl	2011-03-16 04:34:20 UTC (rev 10555)
+++ trunk/gsa/src/html/help.xsl	2011-03-16 05:09:25 UTC (rev 10556)
@@ -1763,7 +1763,7 @@
   <div class="gb_window_part_center">Help: Error Messages</div>
   <div class="gb_window_part_content">
     <div style="float:left;"><a href="/help/contents.html?token={/envelope/token}">Help Contents</a></div>
-    <div class="float_right"><a href="/omp?cmd=unknown_cmd?token={/envelope/token}">Provoke a harmless internal error</a> (use <img src="/img/help.png"/> to get back here)</div>
+    <div class="float_right"><a href="/omp?cmd=unknown_cmd&amp;token={/envelope/token}">Provoke a harmless internal error</a> (use <img src="/img/help.png"/> to get back here)</div>
     <div style="text-align:left">
 
       <br/>

Modified: trunk/gsa/src/html/omp.xsl
===================================================================
--- trunk/gsa/src/html/omp.xsl	2011-03-16 04:34:20 UTC (rev 10555)
+++ trunk/gsa/src/html/omp.xsl	2011-03-16 05:09:25 UTC (rev 10556)
@@ -9810,25 +9810,6 @@
 
 <!-- END TRASH MANAGEMENT -->
 
-<!-- GSAD_RESPONSE -->
-
-<xsl:template match="gsad_response">
-  <xsl:call-template name="error_dialog">
-    <xsl:with-param name="title">
-      <xsl:value-of select="title"/>
-    </xsl:with-param>
-    <xsl:with-param name="message">
-      <xsl:value-of select="message"/>
-    </xsl:with-param>
-    <xsl:with-param name="backurl">
-      <xsl:value-of select="backurl"/>
-    </xsl:with-param>
-    <xsl:with-param name="token">
-      <xsl:value-of select="token"/>
-    </xsl:with-param>
-  </xsl:call-template>
-</xsl:template>
-
 <!-- NEW_TASK -->
 
 <xsl:template match="new_task">