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

[scm-commit@wald.intevation.org]

Author: mattm
Date: 2011-09-22 20:06:53 +0200 (Thu, 22 Sep 2011)
New Revision: 11669

Modified:
   trunk/gsa/ChangeLog
   trunk/gsa/src/html/omp.xsl
Log:
	* src/html/omp.xsl (html-task-table, task): Replace owner column with
	owner icon in task column.  Also add icons for observers and slave.

Modified: trunk/gsa/ChangeLog
===================================================================
--- trunk/gsa/ChangeLog	2011-09-22 17:08:16 UTC (rev 11668)
+++ trunk/gsa/ChangeLog	2011-09-22 18:06:53 UTC (rev 11669)
@@ -1,5 +1,10 @@
 2011-09-22  Matthew Mundell <matthew.mundell at greenbone.net>
 
+	* src/html/omp.xsl (html-task-table, task): Replace owner column with
+	owner icon in task column.  Also add icons for observers and slave.
+
+2011-09-22  Matthew Mundell <matthew.mundell at greenbone.net>
+
 	* src/html/oap.xsl (html-create-user-form, user [edit]): Add observer
 	role.
 

Modified: trunk/gsa/src/html/omp.xsl
===================================================================
--- trunk/gsa/src/html/omp.xsl	2011-09-22 17:08:16 UTC (rev 11668)
+++ trunk/gsa/src/html/omp.xsl	2011-09-22 18:06:53 UTC (rev 11669)
@@ -530,7 +530,6 @@
             <td colspan="3">Reports</td>
             <td width="1" rowspan="2">Threat</td>
             <td width="1" rowspan="2">Trend</td>
-            <td width="1" rowspan="2">Owner</td>
             <td width="115" rowspan="2">Actions</td>
           </tr>
           <tr class="gbntablehead2">
@@ -3155,6 +3154,40 @@
       <tr class="{$class}">
         <td>
           <b><xsl:value-of select="name"/></b>
+          <div class="float_right">
+            <xsl:choose>
+              <xsl:when test="string-length(slave/@id) &gt; 0">
+                <img src="/img/refresh.png"
+                     style="margin-left:3px;"
+                     border="0"
+                     alt="Task is configured to run on slave {slave/name}"
+                     title="Task is configured to run on slave {slave/name}"/>
+              </xsl:when>
+              <xsl:otherwise>
+              </xsl:otherwise>
+            </xsl:choose>
+            <xsl:choose>
+              <xsl:when test="string-length (observers) &gt; 0">
+                <img src="/img/details.png"
+                     border="0"
+                     alt="Task is observed by: {observers}"
+                     title="Task is observed by: {observers}"/>
+              </xsl:when>
+              <xsl:otherwise>
+              </xsl:otherwise>
+            </xsl:choose>
+            <xsl:choose>
+              <xsl:when test="owner/name=/envelope/login/text()">
+              </xsl:when>
+              <xsl:otherwise>
+                <img src="/img/new.png"
+                     style="margin-left:3px;"
+                     border="0"
+                     alt="Observing task owned by {owner/name}"
+                     title="Observing task owned by {owner/name}"/>
+              </xsl:otherwise>
+            </xsl:choose>
+          </div>
           <xsl:choose>
             <xsl:when test="comment != ''">
               <br/>(<xsl:value-of select="comment"/>)
@@ -3228,15 +3261,6 @@
             </xsl:otherwise>
           </xsl:choose>
         </td>
-        <td style="text-align:center;">
-          <xsl:choose>
-            <xsl:when test="owner/name=/envelope/login/text()">
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:value-of select="owner/name"/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </td>
         <td>
           <xsl:variable name="observed" select="owner/name!=/envelope/login/text()"/>
           <xsl:choose>