Updated documentation for Reports.

Added Subversion Revision Info to nodes-digest and overview-stats HTML reports

added new report type with table of machines called overview-matrix-www


git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@1824 ce84e21b-d406-0410-9b95-82705330c041

5 files changed, 129 insertions, 16 deletions

diff --git a/reports/xsl-transforms/nodes-digest-www.xsl b/reports/xsl-transforms/nodes-digest-www.xsl
index 95026120f..40de7490c 100644
--- a/reports/xsl-transforms/nodes-digest-www.xsl
+++ b/reports/xsl-transforms/nodes-digest-www.xsl
@@ -51,7 +51,7 @@
                                         <xsl:sort select="Client/@name"/>
                                         <xsl:if test="count(Statistics/Good) > 0">
                                             <li><b>Node: </b>
-                                            <tt><a href="#{Client/@name}"><xsl:value-of select="Client/@name" /></a></tt></li>
+                                            <tt><a href="#{Client/@name}"><xsl:value-of select="Client/@name" /></a></tt><span class="mini-date"><xsl:value-of select="Statistics/@time" /></span></li>
                                         </xsl:if>
                                     </xsl:for-each>
                                 </ul></div>
@@ -67,7 +67,7 @@
                                         <xsl:sort select="Client/@name"/>
                                         <xsl:if test="count(Statistics/Bad) > 0">
                                             <li><b>Node: </b>
-                                            <tt><a href="#{Client/@name}"><xsl:value-of select="Client/@name" /></a></tt></li>
+                                            <tt><a href="#{Client/@name}"><xsl:value-of select="Client/@name" /></a></tt><span class="mini-date"><xsl:value-of select="Statistics/@time" /></span></li>
                                         </xsl:if>
                                     </xsl:for-each>
                                 </ul></div>
@@ -82,7 +82,7 @@
                                         <xsl:sort select="Client/@name"/>
                                         <xsl:if test="count(Statistics/Extra) > 0">
                                             <li><b>Node: </b>
-                                            <tt><a href="#{Client/@name}"><xsl:value-of select="Client/@name" /></a></tt></li>
+                                            <tt><a href="#{Client/@name}"><xsl:value-of select="Client/@name" /></a></tt><span class="mini-date"><xsl:value-of select="Statistics/@time" /></span></li>
                                         </xsl:if>
                                     </xsl:for-each>
                                 </ul></div>
@@ -99,7 +99,7 @@
                                         <xsl:sort select="Client/@name"/>
                                         <xsl:if test="count(Statistics/Modified) > 0">
                                             <li><b>Node: </b>
-                                            <tt><a href="#{Client/@name}"><xsl:value-of select="Client/@name" /></a></tt></li>
+                                            <tt><a href="#{Client/@name}"><xsl:value-of select="Client/@name" /></a></tt><span class="mini-date"><xsl:value-of select="Statistics/@time" /></span></li>
                                         </xsl:if>
                                     </xsl:for-each>
                                 </ul></div>
@@ -114,7 +114,7 @@
                                         <xsl:sort select="Client/@name"/>
                                         <xsl:if test="count(Statistics/Stale)-count(Client[@pingable='N']) > 0">
                                             <li><b>Node: </b>
-                                            <tt><a href="#{Client/@name}"><xsl:value-of select="Client/@name" /></a></tt></li>
+                                            <tt><a href="#{Client/@name}"><xsl:value-of select="Client/@name" /></a></tt><span class="mini-date"><xsl:value-of select="Statistics/@time" /></span></li>
                                         </xsl:if>
                                     </xsl:for-each>
                                 </ul></div>
@@ -130,7 +130,7 @@
                                         <xsl:sort select="Client/@name"/>
                                         <xsl:if test="count(Statistics/Stale) > 0">
                                             <li><b>Node: </b>
-                                            <tt><a href="#{Client/@name}"><xsl:value-of select="Client/@name" /></a></tt></li>
+                                            <tt><a href="#{Client/@name}"><xsl:value-of select="Client/@name" /></a></tt><span class="mini-date"><xsl:value-of select="Statistics/@time" /></span></li>
                                         </xsl:if>
                                     </xsl:for-each>
                                 </ul></div>
@@ -147,7 +147,7 @@
                                         <xsl:sort select="Client/@name"/>
                                         <xsl:if test="count(Client[@pingable='N']) > 0">
                                             <li><b>Node: </b>
-                                            <tt><a href="#{Client/@name}"><xsl:value-of select="Client/@name" /></a></tt></li>
+                                            <tt><a href="#{Client/@name}"><xsl:value-of select="Client/@name" /></a></tt><span class="mini-date"><xsl:value-of select="Statistics/@time" /></span></li>
                                         </xsl:if>
                                     </xsl:for-each>
                                 </ul></div>
diff --git a/reports/xsl-transforms/overview-matrix-www.xsl b/reports/xsl-transforms/overview-matrix-www.xsl
new file mode 100644
index 000000000..d51ca2a85
--- /dev/null
+++ b/reports/xsl-transforms/overview-matrix-www.xsl
@@ -0,0 +1,68 @@
+<?xml version="1.0"?> 
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
+                xmlns="http://www.w3.org/1999/xhtml">
+    <xsl:include href="xsl-transform-includes/html-templates.xsl" />
+    <xsl:include href="xsl-transform-includes/main-js.xsl" />
+    <xsl:include href="xsl-transform-includes/sorttable-js.xsl" />
+
+    <xsl:include href="xsl-transform-includes/boxypastel-css.xsl" />    <xsl:output method="xml" media-type="text/html" doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"/>
+    <xsl:template match="Report">
+        <html>
+              <head>
+                    <title>
+                        BCFG Overview Matrix
+                    </title>
+                    
+                    <xsl:copy-of select="$boxypastel-css" />
+                    <xsl:copy-of select="$main-js" />
+                    <xsl:copy-of select="$sorttable-js" />
+
+              </head>
+              <body bgcolor="#ffffff">
+                    <div class="header">
+                        <h1>
+                            BCFG Overview Matrix
+                        </h1><span class="notebox">Report Run @ <xsl:value-of select="@time" /></span>
+                    </div>
+                    <br/>                     
+                    <center> 
+                        <table id="t1" class="sortable">
+                            <tr>
+                                <th class="sortable">Hostname</th>
+                                <th class="sortable">Revision</th>
+                                <th class="sortable">Correctness</th>
+                            </tr>                     
+                            <xsl:apply-templates select="Node">
+                                <xsl:sort select="Client/@name" order="ascending"/>
+                                <xsl:sort select="@name"/>
+                            </xsl:apply-templates>
+                        </table>
+                    </center>
+            <br/>
+            <br/>
+            <p>
+                <a href="http://validator.w3.org/check?uri=referer">Valid XHTML 1.0!</a>
+            </p>
+            </body>
+        </html>
+    </xsl:template>
+    
+    
+    <xsl:template match="Node">
+            <tr>
+                <td width="43%"><h2><span class="nodename"><xsl:value-of select="Client/@name" /></span></h2></td>
+                <td width="23%"><xsl:if test="Statistics/@revision &gt; -1" ><xsl:value-of select="Statistics/@revision" /></xsl:if></td>
+                <td width="33%">
+                <font style="font-size: 1px;">
+                <xsl:value-of select="(((Statistics/@total)-(Statistics/@good)) div (Statistics/@total))*100"/>
+                <xsl:text disable-output-escaping="yes">&amp;nbsp;</xsl:text>
+                </font>
+                <div class="statusborder">
+                <div class="greenbar" style="width: {((Statistics/@good) div (Statistics/@total))*100}%;"><xsl:text disable-output-escaping="yes">&amp;nbsp;</xsl:text></div>
+                <div class="redbar" style="width: {(((Statistics/@total)-(Statistics/@good)) div (Statistics/@total))*100}%;"><xsl:text disable-output-escaping="yes">&amp;nbsp;</xsl:text></div>
+                </div>
+                </td>
+            </tr>
+    </xsl:template>
+    
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/reports/xsl-transforms/overview-stats-www.xsl b/reports/xsl-transforms/overview-stats-www.xsl
index 3b1e252ac..9522cd713 100644
--- a/reports/xsl-transforms/overview-stats-www.xsl
+++ b/reports/xsl-transforms/overview-stats-www.xsl
@@ -34,7 +34,7 @@
                                     <xsl:for-each select="Node">
                                         <xsl:sort select="Client/@name"/>
                                         <xsl:if test="count(Statistics/Good) > 0">
-                                            <tt><xsl:value-of select="Client/@name" /></tt><br/>
+                                            <tt><xsl:value-of select="Client/@name" /></tt><span class="mini-date"><xsl:value-of select="Statistics/@time" /></span><br/>
                                         </xsl:if>
                                     </xsl:for-each>
                                 </ul></div>
@@ -49,7 +49,7 @@
                                     <xsl:for-each select="Node">
                                         <xsl:sort select="Client/@name"/>
                                         <xsl:if test="count(Statistics/Bad) > 0">
-                                            <tt><xsl:value-of select="Client/@name" /></tt><br/>
+                                            <tt><xsl:value-of select="Client/@name" /></tt><span class="mini-date"><xsl:value-of select="Statistics/@time" /></span><br/>
                                         </xsl:if>
                                     </xsl:for-each>
                                 </ul></div>
@@ -64,7 +64,7 @@
                                     <xsl:for-each select="Node">
                                         <xsl:sort select="Client/@name"/>
                                         <xsl:if test="count(Statistics/Modified) > 0">
-                                            <tt><xsl:value-of select="Client/@name" /></tt><br/>
+                                            <tt><xsl:value-of select="Client/@name" /></tt><span class="mini-date"><xsl:value-of select="Statistics/@time" /></span><br/>
                                         </xsl:if>
                                     </xsl:for-each>
                                 </ul></div>
@@ -79,7 +79,7 @@
                                     <xsl:for-each select="Node">
                                         <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/>
+                                            <tt><xsl:value-of select="Client/@name" /></tt><span class="mini-date"><xsl:value-of select="Statistics/@time" /></span><br/>
                                         </xsl:if>
                                     </xsl:for-each>
                                 </ul></div>
@@ -96,7 +96,7 @@
                                     <xsl:for-each select="Node">
                                         <xsl:sort select="Client/@name"/>
                                         <xsl:if test="count(Client[@pingable='N']) > 0">
-                                            <tt><xsl:value-of select="Client/@name" /></tt><br/>
+                                            <tt><xsl:value-of select="Client/@name" /></tt><span class="mini-date"><xsl:value-of select="Statistics/@time" /></span><br/>
                                         </xsl:if>
                                     </xsl:for-each>
                                 </ul></div>
diff --git a/reports/xsl-transforms/xsl-transform-includes/boxypastel-css.xsl b/reports/xsl-transforms/xsl-transform-includes/boxypastel-css.xsl
index 2fdd7aee4..d24239830 100644
--- a/reports/xsl-transforms/xsl-transform-includes/boxypastel-css.xsl
+++ b/reports/xsl-transforms/xsl-transform-includes/boxypastel-css.xsl
@@ -112,15 +112,48 @@ div.header {
     text-indent:50px;
     position:relative;
     }
+/*Divs For Statusbar*/
+div.redbar {
+    border: 0px solid #660000;
+    background: #FF6666;
+    margin: 0px;
+    float: left;
+    }
     
+div.greenbar {
+    border: 0px solid #006600;
+    background: #66FF66;
+    margin: 0px;
+    float: left;
+    }
+div.statusborder {
+    border: 1px solid #000000;
+    background: #FF6666;
+    margin: 0px;
+    float: right;
+    width: 100%;
+    }
+    /*invisitable*/
+table.invisitable {
+    width: 100%;
+    border: 0px;
+    cell-padding: 0px;
+    padding: 0px;
+    border-width: 0px;
+    }
 /*Spans*/
-.nodename {
+span.nodename {
     font-style: italic;
     }
-.nodelisttitle {
+span.nodelisttitle {
     font-size: 14px;
     }
-    
+span.mini-date {
+    font-size: 10px;
+    position: absolute;
+    right: 65px;
+    }
+
 h2	{
     font-size: 16px;
     color: #000;
diff --git a/reports/xsl-transforms/xsl-transform-includes/html-templates.xsl b/reports/xsl-transforms/xsl-transform-includes/html-templates.xsl
index 7e9e08055..6e358df8b 100644
--- a/reports/xsl-transforms/xsl-transform-includes/html-templates.xsl
+++ b/reports/xsl-transforms/xsl-transform-includes/html-templates.xsl
@@ -6,7 +6,19 @@
         <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/@profile" />)</span>
-            <h2>Node: <span class="nodename"><xsl:value-of select="Client/@name" /></span></h2>
+            
+            <table class="invisitable">
+            <tr><td width="43%"><h2>Node: <span class="nodename"><xsl:value-of select="Client/@name" /></span></h2></td>
+            <td width="23%"><xsl:if test="Statistics/@revision &gt; -1" > Revision: <xsl:value-of select="Statistics/@revision" /></xsl:if></td>
+            
+            
+            <td width="33%"><div class="statusborder">
+            <div class="greenbar" style="width: {((Statistics/@good) div (Statistics/@total))*100}%;"><xsl:text disable-output-escaping="yes">&amp;nbsp;</xsl:text></div>
+            <div class="redbar" style="width: {(((Statistics/@total)-(Statistics/@good)) div (Statistics/@total))*100}%;"><xsl:text disable-output-escaping="yes">&amp;nbsp;</xsl:text></div>
+            </div>
+            </td></tr>
+            </table>
+            
                 <xsl:apply-templates select="Statistics" />
         </div>
 	</xsl:if>