From edca0b698637c3fd0a70af7e4752a46afca938d3 Mon Sep 17 00:00:00 2001
From: Narayan Desai <desai@mcs.anl.gov>
Date: Mon, 23 Jan 2006 22:35:40 +0000
Subject: last step of repo switches

git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@1716 ce84e21b-d406-0410-9b95-82705330c041
---
 reports/xsl-transforms/nodes-digest-www.xsl        | 40 +++++++++++-----------
 reports/xsl-transforms/overview-stats-mail.xsl     | 28 +++++++--------
 reports/xsl-transforms/overview-stats-rss.xsl      | 28 +++++++--------
 reports/xsl-transforms/overview-stats-www.xsl      | 30 ++++++++--------
 reports/xsl-transforms/timing-summary-www.xsl      |  4 +--
 .../xsl-transform-includes/boxypastel-css.xsl      |  4 +--
 .../xsl-transform-includes/html-templates.xsl      |  6 ++--
 .../xsl-transform-includes/text-templates.xsl      |  4 +--
 8 files changed, 72 insertions(+), 72 deletions(-)

(limited to 'reports')
diff --git a/reports/xsl-transforms/nodes-digest-www.xsl b/reports/xsl-transforms/nodes-digest-www.xsl
index 9585738c9..95026120f 100644
--- a/reports/xsl-transforms/nodes-digest-www.xsl
+++ b/reports/xsl-transforms/nodes-digest-www.xsl
@@ -10,8 +10,8 @@
         <xsl:variable name="dirtynodes" select="/Report/Node[count(Statistics/Bad)>0]"/>
         <xsl:variable name="modifiednodes" select="/Report/Node[count(Statistics/Modified)>0]"/>
         <xsl:variable name="stalenodes" select="/Report/Node[count(Statistics/Stale)>0]"/>
-        <xsl:variable name="unpingablenodes" select="/Report/Node[HostInfo/@pingable='N']"/>
-        <xsl:variable name="pingablenodes" select="/Report/Node[HostInfo/@pingable='Y']"/>
+        <xsl:variable name="unpingablenodes" select="/Report/Node[Client/@pingable='N']"/>
+        <xsl:variable name="pingablenodes" select="/Report/Node[Client/@pingable='Y']"/>
     
         <html>
               <head>
@@ -48,10 +48,10 @@
                                 <div class="items" id="goodsummary"><ul class="plain">                                    
                                     
                                     <xsl:for-each select="Node">
-                                        <xsl:sort select="HostInfo/@fqdn"/>
+                                        <xsl:sort select="Client/@name"/>
                                         <xsl:if test="count(Statistics/Good) > 0">
                                             <li><b>Node: </b>
-                                            <tt><a href="#{HostInfo/@fqdn}"><xsl:value-of select="HostInfo/@fqdn" /></a></tt></li>
+                                            <tt><a href="#{Client/@name}"><xsl:value-of select="Client/@name" /></a></tt></li>
                                         </xsl:if>
                                     </xsl:for-each>
                                 </ul></div>
@@ -64,10 +64,10 @@
                                 
                                 <div class="items" id="badsummary"><ul class="plain">
                                     <xsl:for-each select="Node">
-                                        <xsl:sort select="HostInfo/@fqdn"/>
+                                        <xsl:sort select="Client/@name"/>
                                         <xsl:if test="count(Statistics/Bad) > 0">
                                             <li><b>Node: </b>
-                                            <tt><a href="#{HostInfo/@fqdn}"><xsl:value-of select="HostInfo/@fqdn" /></a></tt></li>
+                                            <tt><a href="#{Client/@name}"><xsl:value-of select="Client/@name" /></a></tt></li>
                                         </xsl:if>
                                     </xsl:for-each>
                                 </ul></div>
@@ -79,10 +79,10 @@
                                 <span class="nodelisttitle"><a href="javascript:toggleLayer('extrasummary');" title="Click to Expand" class="commentLink"><xsl:value-of select="count(/Report/Node/Statistics/Extra)" /></a> nodes have extra configuration. (includes both good and bad nodes)<br /></span>
                                 <div class="items" id="extrasummary"><ul class="plain">
                                     <xsl:for-each select="Node">
-                                        <xsl:sort select="HostInfo/@fqdn"/>
+                                        <xsl:sort select="Client/@name"/>
                                         <xsl:if test="count(Statistics/Extra) > 0">
                                             <li><b>Node: </b>
-                                            <tt><a href="#{HostInfo/@fqdn}"><xsl:value-of select="HostInfo/@fqdn" /></a></tt></li>
+                                            <tt><a href="#{Client/@name}"><xsl:value-of select="Client/@name" /></a></tt></li>
                                         </xsl:if>
                                     </xsl:for-each>
                                 </ul></div>
@@ -96,10 +96,10 @@
                                 
                                 <div class="items" id="modifiedsummary"><ul class="plain">
                                     <xsl:for-each select="Node">
-                                        <xsl:sort select="HostInfo/@fqdn"/>
+                                        <xsl:sort select="Client/@name"/>
                                         <xsl:if test="count(Statistics/Modified) > 0">
                                             <li><b>Node: </b>
-                                            <tt><a href="#{HostInfo/@fqdn}"><xsl:value-of select="HostInfo/@fqdn" /></a></tt></li>
+                                            <tt><a href="#{Client/@name}"><xsl:value-of select="Client/@name" /></a></tt></li>
                                         </xsl:if>
                                     </xsl:for-each>
                                 </ul></div>
@@ -111,10 +111,10 @@
                                 <span class="nodelisttitle"><a href="javascript:toggleLayer('vstalesummary');" title="Click to Expand" class="commentLink"><xsl:value-of select="count($stalenodes[count(.|$pingablenodes)= count($pingablenodes)])" /></a> nodes did not run within the last 24 hours but were pingable.<br /></span>
                                 <div class="items" id="vstalesummary"><ul class="plain">
                                     <xsl:for-each select="Node">
-                                        <xsl:sort select="HostInfo/@fqdn"/>
-                                        <xsl:if test="count(Statistics/Stale)-count(HostInfo[@pingable='N']) > 0">
+                                        <xsl:sort select="Client/@name"/>
+                                        <xsl:if test="count(Statistics/Stale)-count(Client[@pingable='N']) > 0">
                                             <li><b>Node: </b>
-                                            <tt><a href="#{HostInfo/@fqdn}"><xsl:value-of select="HostInfo/@fqdn" /></a></tt></li>
+                                            <tt><a href="#{Client/@name}"><xsl:value-of select="Client/@name" /></a></tt></li>
                                         </xsl:if>
                                     </xsl:for-each>
                                 </ul></div>
@@ -127,10 +127,10 @@
                                 
                                 <div class="items" id="stalesummary"><ul class="plain">
                                     <xsl:for-each select="Node">
-                                        <xsl:sort select="HostInfo/@fqdn"/>
+                                        <xsl:sort select="Client/@name"/>
                                         <xsl:if test="count(Statistics/Stale) > 0">
                                             <li><b>Node: </b>
-                                            <tt><a href="#{HostInfo/@fqdn}"><xsl:value-of select="HostInfo/@fqdn" /></a></tt></li>
+                                            <tt><a href="#{Client/@name}"><xsl:value-of select="Client/@name" /></a></tt></li>
                                         </xsl:if>
                                     </xsl:for-each>
                                 </ul></div>
@@ -138,16 +138,16 @@
                             </div>
                          </xsl:if>
 
-                        <xsl:if test="count(/Report/Node[HostInfo/@pingable='N']) > 0">
+                        <xsl:if test="count(/Report/Node[Client/@pingable='N']) > 0">
                             <div class="down">
-                                <span class="nodelisttitle"><a href="javascript:toggleLayer('unpingablesummary');" title="Click to Expand" class="commentLink"><xsl:value-of select="count(/Report/Node/HostInfo[@pingable='N'])" /></a> nodes were down.<br /></span>
+                                <span class="nodelisttitle"><a href="javascript:toggleLayer('unpingablesummary');" title="Click to Expand" class="commentLink"><xsl:value-of select="count(/Report/Node/Client[@pingable='N'])" /></a> nodes were down.<br /></span>
                                 
                                 <div class="items" id="unpingablesummary"><ul class="plain">
                                     <xsl:for-each select="Node">
-                                        <xsl:sort select="HostInfo/@fqdn"/>
-                                        <xsl:if test="count(HostInfo[@pingable='N']) > 0">
+                                        <xsl:sort select="Client/@name"/>
+                                        <xsl:if test="count(Client[@pingable='N']) > 0">
                                             <li><b>Node: </b>
-                                            <tt><a href="#{HostInfo/@fqdn}"><xsl:value-of select="HostInfo/@fqdn" /></a></tt></li>
+                                            <tt><a href="#{Client/@name}"><xsl:value-of select="Client/@name" /></a></tt></li>
                                         </xsl:if>
                                     </xsl:for-each>
                                 </ul></div>
diff --git a/reports/xsl-transforms/overview-stats-mail.xsl b/reports/xsl-transforms/overview-stats-mail.xsl
index a134d8048..8527defe5 100644
--- a/reports/xsl-transforms/overview-stats-mail.xsl
+++ b/reports/xsl-transforms/overview-stats-mail.xsl
@@ -8,8 +8,8 @@
 <xsl:variable name="dirtynodes" select="/Report/Node[count(Statistics/Bad)>0]"/>
 <xsl:variable name="modifiednodes" select="/Report/Node[count(Statistics/Modified)>0]"/>
 <xsl:variable name="stalenodes" select="/Report/Node[count(Statistics/Stale)>0]"/>
-<xsl:variable name="unpingablenodes" select="/Report/Node[HostInfo/@pingable='N']"/>
-<xsl:variable name="pingablenodes" select="/Report/Node[HostInfo/@pingable='Y']"/>
+<xsl:variable name="unpingablenodes" select="/Report/Node[Client/@pingable='N']"/>
+<xsl:variable name="pingablenodes" select="/Report/Node[Client/@pingable='Y']"/>
 
 Summary:
 <xsl:text>    </xsl:text><xsl:value-of select="count($cleannodes)" /> nodes are clean.
@@ -26,9 +26,9 @@ Summary:
 <xsl:if test="count($cleannodes) > 0">
 CLEAN:
 <xsl:for-each select="Node">
-<xsl:sort select="HostInfo/@fqdn"/>
+<xsl:sort select="Client/@name"/>
 <xsl:if test="count(Statistics/Good) > 0">
-<xsl:text>    </xsl:text><xsl:value-of select="HostInfo/@fqdn" /><xsl:text>
+<xsl:text>    </xsl:text><xsl:value-of select="Client/@name" /><xsl:text>
 </xsl:text>
 </xsl:if>
 </xsl:for-each><xsl:text>
@@ -38,9 +38,9 @@ CLEAN:
 <xsl:if test="count($dirtynodes) > 0">
 DIRTY:
 <xsl:for-each select="Node">
-<xsl:sort select="HostInfo/@fqdn"/>
+<xsl:sort select="Client/@name"/>
 <xsl:if test="count(Statistics/Bad) > 0">
-<xsl:text>    </xsl:text><xsl:value-of select="HostInfo/@fqdn" /><xsl:text>
+<xsl:text>    </xsl:text><xsl:value-of select="Client/@name" /><xsl:text>
 </xsl:text>
 </xsl:if>
 </xsl:for-each><xsl:text>
@@ -50,9 +50,9 @@ DIRTY:
 <xsl:if test="count($modifiednodes) > 0">
 MODIFIED:
 <xsl:for-each select="Node">
-<xsl:sort select="HostInfo/@fqdn"/>
+<xsl:sort select="Client/@name"/>
 <xsl:if test="count(Statistics/Modified) > 0">
-<xsl:text>    </xsl:text><xsl:value-of select="HostInfo/@fqdn" /><xsl:text>
+<xsl:text>    </xsl:text><xsl:value-of select="Client/@name" /><xsl:text>
 </xsl:text>
 </xsl:if>
 </xsl:for-each><xsl:text>
@@ -63,9 +63,9 @@ MODIFIED:
 <xsl:if test="count($stalenodes[count(.|$pingablenodes)= count($pingablenodes)]) > 0">
 STALE:
 <xsl:for-each select="Node">
-<xsl:sort select="HostInfo/@fqdn"/>
-<xsl:if test="count(Statistics/Stale)-count(HostInfo[@pingable='N']) > 0">
-<xsl:text>    </xsl:text><xsl:value-of select="HostInfo/@fqdn" /><xsl:text>
+<xsl:sort select="Client/@name"/>
+<xsl:if test="count(Statistics/Stale)-count(Client[@pingable='N']) > 0">
+<xsl:text>    </xsl:text><xsl:value-of select="Client/@name" /><xsl:text>
 </xsl:text>
 </xsl:if>
 </xsl:for-each><xsl:text>
@@ -76,9 +76,9 @@ STALE:
 <xsl:if test="count($unpingablenodes) > 0">
 UNPINGABLE:
 <xsl:for-each select="Node">
-<xsl:sort select="HostInfo/@fqdn"/>
-<xsl:if test="count(HostInfo[@pingable='N']) > 0">
-<xsl:text>    </xsl:text><xsl:value-of select="HostInfo/@fqdn" /><xsl:text>
+<xsl:sort select="Client/@name"/>
+<xsl:if test="count(Client[@pingable='N']) > 0">
+<xsl:text>    </xsl:text><xsl:value-of select="Client/@name" /><xsl:text>
 </xsl:text>
 </xsl:if>
 </xsl:for-each><xsl:text>
diff --git a/reports/xsl-transforms/overview-stats-rss.xsl b/reports/xsl-transforms/overview-stats-rss.xsl
index c4c689a99..1df5e29cf 100644
--- a/reports/xsl-transforms/overview-stats-rss.xsl
+++ b/reports/xsl-transforms/overview-stats-rss.xsl
@@ -12,8 +12,8 @@ Report Run @ <xsl:value-of select="@time" />
 <xsl:variable name="dirtynodes" select="/Report/Node[count(Statistics/Bad)>0]"/>
 <xsl:variable name="modifiednodes" select="/Report/Node[count(Statistics/Modified)>0]"/>
 <xsl:variable name="stalenodes" select="/Report/Node[count(Statistics/Stale)>0]"/>
-<xsl:variable name="unpingablenodes" select="/Report/Node[HostInfo/@pingable='N']"/>
-<xsl:variable name="pingablenodes" select="/Report/Node[HostInfo/@pingable='Y']"/>
+<xsl:variable name="unpingablenodes" select="/Report/Node[Client/@pingable='N']"/>
+<xsl:variable name="pingablenodes" select="/Report/Node[Client/@pingable='Y']"/>
 
 Summary:
 <xsl:text>    </xsl:text><xsl:value-of select="count($cleannodes)" /> nodes are clean.
@@ -30,9 +30,9 @@ Summary:
 <xsl:if test="count($cleannodes) > 0">
 CLEAN:
 <xsl:for-each select="Node">
-<xsl:sort select="HostInfo/@fqdn"/>
+<xsl:sort select="Client/@name"/>
 <xsl:if test="count(Statistics/Good) > 0">
-<xsl:text>    </xsl:text><xsl:value-of select="HostInfo/@fqdn" /><xsl:text>
+<xsl:text>    </xsl:text><xsl:value-of select="Client/@name" /><xsl:text>
 </xsl:text>
 </xsl:if>
 </xsl:for-each><xsl:text>
@@ -42,9 +42,9 @@ CLEAN:
 <xsl:if test="count($dirtynodes) > 0">
 DIRTY:
 <xsl:for-each select="Node">
-<xsl:sort select="HostInfo/@fqdn"/>
+<xsl:sort select="Client/@name"/>
 <xsl:if test="count(Statistics/Bad) > 0">
-<xsl:text>    </xsl:text><xsl:value-of select="HostInfo/@fqdn" /><xsl:text>
+<xsl:text>    </xsl:text><xsl:value-of select="Client/@name" /><xsl:text>
 </xsl:text>
 </xsl:if>
 </xsl:for-each><xsl:text>
@@ -54,9 +54,9 @@ DIRTY:
 <xsl:if test="count($modifiednodes) > 0">
 MODIFIED:
 <xsl:for-each select="Node">
-<xsl:sort select="HostInfo/@fqdn"/>
+<xsl:sort select="Client/@name"/>
 <xsl:if test="count(Statistics/Modified) > 0">
-<xsl:text>    </xsl:text><xsl:value-of select="HostInfo/@fqdn" /><xsl:text>
+<xsl:text>    </xsl:text><xsl:value-of select="Client/@name" /><xsl:text>
 </xsl:text>
 </xsl:if>
 </xsl:for-each><xsl:text>
@@ -67,9 +67,9 @@ MODIFIED:
 <xsl:if test="count($stalenodes[count(.|$pingablenodes)= count($pingablenodes)]) > 0">
 STALE:
 <xsl:for-each select="Node">
-<xsl:sort select="HostInfo/@fqdn"/>
-<xsl:if test="count(Statistics/Stale)-count(HostInfo[@pingable='N']) > 0">
-<xsl:text>    </xsl:text><xsl:value-of select="HostInfo/@fqdn" /><xsl:text>
+<xsl:sort select="Client/@name"/>
+<xsl:if test="count(Statistics/Stale)-count(Client[@pingable='N']) > 0">
+<xsl:text>    </xsl:text><xsl:value-of select="Client/@name" /><xsl:text>
 </xsl:text>
 </xsl:if>
 </xsl:for-each><xsl:text>
@@ -80,9 +80,9 @@ STALE:
 <xsl:if test="count($unpingablenodes) > 0">
 UNPINGABLE:
 <xsl:for-each select="Node">
-<xsl:sort select="HostInfo/@fqdn"/>
-<xsl:if test="count(HostInfo[@pingable='N']) > 0">
-<xsl:text>    </xsl:text><xsl:value-of select="HostInfo/@fqdn" /><xsl:text>
+<xsl:sort select="Client/@name"/>
+<xsl:if test="count(Client[@pingable='N']) > 0">
+<xsl:text>    </xsl:text><xsl:value-of select="Client/@name" /><xsl:text>
 </xsl:text>
 </xsl:if>
 </xsl:for-each><xsl:text>
diff --git a/reports/xsl-transforms/overview-stats-www.xsl b/reports/xsl-transforms/overview-stats-www.xsl
index afcd06de4..3b1e252ac 100644
--- a/reports/xsl-transforms/overview-stats-www.xsl
+++ b/reports/xsl-transforms/overview-stats-www.xsl
@@ -8,8 +8,8 @@
 	<xsl:variable name="dirtynodes" select="/Report/Node[count(Statistics/Bad)>0]"/>
 	<xsl:variable name="modifiednodes" select="/Report/Node[count(Statistics/Modified)>0]"/>
 	<xsl:variable name="stalenodes" select="/Report/Node[count(Statistics/Stale)>0]"/>
-	<xsl:variable name="unpingablenodes" select="/Report/Node[HostInfo/@pingable='N']"/>
-	<xsl:variable name="pingablenodes" select="/Report/Node[HostInfo/@pingable='Y']"/>
+	<xsl:variable name="unpingablenodes" select="/Report/Node[Client/@pingable='N']"/>
+	<xsl:variable name="pingablenodes" select="/Report/Node[Client/@pingable='Y']"/>
 
         <html>
               <head>
@@ -32,9 +32,9 @@
                                 <div class="items" id="goodsummary"><ul class="plain">                                    
                                     
                                     <xsl:for-each select="Node">
-                                        <xsl:sort select="HostInfo/@fqdn"/>
+                                        <xsl:sort select="Client/@name"/>
                                         <xsl:if test="count(Statistics/Good) > 0">
-                                            <tt><xsl:value-of select="HostInfo/@fqdn" /></tt><br/>
+                                            <tt><xsl:value-of select="Client/@name" /></tt><br/>
                                         </xsl:if>
                                     </xsl:for-each>
                                 </ul></div>
@@ -47,9 +47,9 @@
                                 
                                 <div class="items" id="badsummary"><ul class="plain">
                                     <xsl:for-each select="Node">
-                                        <xsl:sort select="HostInfo/@fqdn"/>
+                                        <xsl:sort select="Client/@name"/>
                                         <xsl:if test="count(Statistics/Bad) > 0">
-                                            <tt><xsl:value-of select="HostInfo/@fqdn" /></tt><br/>
+                                            <tt><xsl:value-of select="Client/@name" /></tt><br/>
                                         </xsl:if>
                                     </xsl:for-each>
                                 </ul></div>
@@ -62,9 +62,9 @@
                                 
                                 <div class="items" id="modifiedsummary"><ul class="plain">
                                     <xsl:for-each select="Node">
-                                        <xsl:sort select="HostInfo/@fqdn"/>
+                                        <xsl:sort select="Client/@name"/>
                                         <xsl:if test="count(Statistics/Modified) > 0">
-                                            <tt><xsl:value-of select="HostInfo/@fqdn" /></tt><br/>
+                                            <tt><xsl:value-of select="Client/@name" /></tt><br/>
                                         </xsl:if>
                                     </xsl:for-each>
                                 </ul></div>
@@ -77,9 +77,9 @@
                                 
                                 <div class="items" id="stalesummary"><ul class="plain">
                                     <xsl:for-each select="Node">
-                                        <xsl:sort select="HostInfo/@fqdn"/>
-                                        <xsl:if test="count(Statistics/Stale)-count(HostInfo[@pingable='N']) > 0">
-                                            <tt><xsl:value-of select="HostInfo/@fqdn" /></tt><br/>
+                                        <xsl:sort select="Client/@name"/>
+                                        <xsl:if test="count(Statistics/Stale)-count(Client[@pingable='N']) > 0">
+                                            <tt><xsl:value-of select="Client/@name" /></tt><br/>
                                         </xsl:if>
                                     </xsl:for-each>
                                 </ul></div>
@@ -90,13 +90,13 @@
                             
                             <xsl:if test="count($unpingablenodes) > 0">
                             <div class="down">
-                                <span class="nodelisttitle"><a href="javascript:toggleLayer('unpingablesummary');" title="Click to Expand" class="commentLink"><xsl:value-of select="count(/Report/Node/HostInfo[@pingable='N'])" /></a> nodes were down.<br /></span>
+                                <span class="nodelisttitle"><a href="javascript:toggleLayer('unpingablesummary');" title="Click to Expand" class="commentLink"><xsl:value-of select="count(/Report/Node/Client[@pingable='N'])" /></a> nodes were down.<br /></span>
                                 
                                 <div class="items" id="unpingablesummary"><ul class="plain">
                                     <xsl:for-each select="Node">
-                                        <xsl:sort select="HostInfo/@fqdn"/>
-                                        <xsl:if test="count(HostInfo[@pingable='N']) > 0">
-                                            <tt><xsl:value-of select="HostInfo/@fqdn" /></tt><br/>
+                                        <xsl:sort select="Client/@name"/>
+                                        <xsl:if test="count(Client[@pingable='N']) > 0">
+                                            <tt><xsl:value-of select="Client/@name" /></tt><br/>
                                         </xsl:if>
                                     </xsl:for-each>
                                 </ul></div>
diff --git a/reports/xsl-transforms/timing-summary-www.xsl b/reports/xsl-transforms/timing-summary-www.xsl
index 838995243..2b8b94699 100644
--- a/reports/xsl-transforms/timing-summary-www.xsl
+++ b/reports/xsl-transforms/timing-summary-www.xsl
@@ -36,7 +36,7 @@
                                 <th class="sortable">Total</th>
                             </tr>                     
                             <xsl:apply-templates select="Node">
-                                <xsl:sort select="HostInfo/@fqdn" order="ascending"/>
+                                <xsl:sort select="Client/@name" order="ascending"/>
                                 <xsl:sort select="@name"/>
                             </xsl:apply-templates>
                         </table>
@@ -54,7 +54,7 @@
     <xsl:template match="Node">
         <xsl:if test="count(Statistics/OpStamps) > 0">
             <tr>
-                <td class="sortable"><xsl:value-of select="HostInfo/@fqdn" /></td><!--node name-->
+                <td class="sortable"><xsl:value-of select="Client/@name" /></td><!--node name-->
                 <td class="sortable"><xsl:value-of select="format-number(number(Statistics/OpStamps/@config_parse - Statistics/OpStamps/@config_download),'#.##')"/></td><!--parse-->
                 <td class="sortable"><xsl:value-of select="format-number(number(Statistics/OpStamps/@probe_upload - Statistics/OpStamps/@start),'#.##')"/></td><!--probe download-->
                 <td class="sortable"><xsl:value-of select="format-number(number(Statistics/OpStamps/@inventory - Statistics/OpStamps/@initialization),'#.##')"/></td><!--inventory-->
diff --git a/reports/xsl-transforms/xsl-transform-includes/boxypastel-css.xsl b/reports/xsl-transforms/xsl-transform-includes/boxypastel-css.xsl
index 1ac508ea6..2fdd7aee4 100644
--- a/reports/xsl-transforms/xsl-transform-includes/boxypastel-css.xsl
+++ b/reports/xsl-transforms/xsl-transform-includes/boxypastel-css.xsl
@@ -144,8 +144,8 @@ ul.plain {
 
 .configbox {
     position: absolute;
-    top: 1.6em;
-    right: 1px;
+    bottom: 0px;
+    right: 0px;
     padding: 1px;
     text-indent:0px;
     border: 1px solid #999;
diff --git a/reports/xsl-transforms/xsl-transform-includes/html-templates.xsl b/reports/xsl-transforms/xsl-transform-includes/html-templates.xsl
index cfe494b05..7e9e08055 100644
--- a/reports/xsl-transforms/xsl-transform-includes/html-templates.xsl
+++ b/reports/xsl-transforms/xsl-transform-includes/html-templates.xsl
@@ -3,10 +3,10 @@
       <xsl:template match="Node">
 	<xsl:if test="count(Statistics/Good)+count(Statistics/Bad)+count(Statistics/Extra)+count(Statistics/Modified)+count(Statistics/Stale) > 0">
         
-        <div class="nodebox" name="{HostInfo/@fqdn}">
+        <div class="nodebox" name="{Client/@name}">
             <span class="notebox">Time Ran: <xsl:value-of select="Statistics/@time" /></span>
-              <span class="configbox">(<xsl:value-of select="Client/@image" />/<xsl:value-of select="Client/@profile" />)</span>
-            <h2>Node: <span class="nodename"><xsl:value-of select="HostInfo/@fqdn" /></span></h2>
+              <span class="configbox">(<xsl:value-of select="Client/@profile" />)</span>
+            <h2>Node: <span class="nodename"><xsl:value-of select="Client/@name" /></span></h2>
                 <xsl:apply-templates select="Statistics" />
         </div>
 	</xsl:if>
diff --git a/reports/xsl-transforms/xsl-transform-includes/text-templates.xsl b/reports/xsl-transforms/xsl-transform-includes/text-templates.xsl
index c393692a4..8b820415b 100644
--- a/reports/xsl-transforms/xsl-transform-includes/text-templates.xsl
+++ b/reports/xsl-transforms/xsl-transform-includes/text-templates.xsl
@@ -5,9 +5,9 @@
 
 <xsl:text>
 
-    </xsl:text>Node:<xsl:value-of select="HostInfo/@fqdn" /><xsl:text>
+    </xsl:text>Node:<xsl:value-of select="Client/@name" /><xsl:text>
         </xsl:text>Time Ran: <xsl:value-of select="Statistics/@time" />.<xsl:text>
-        </xsl:text>(<xsl:value-of select="Client/@image" />/<xsl:value-of select="Client/@profile" />)
+        </xsl:text>(<xsl:value-of select="Client/@profile" />)
 <xsl:apply-templates select="Statistics" />
 	</xsl:if>
 </xsl:template>
-- 
cgit v1.2.3-1-g7c22

