giacomo 01/12/29 03:22:14
Modified: webapp/resources/images cocoon.gif
webapp/stylesheets/system status2html.xsl
Log:
Patch submitted by Nicola Ken Barozzi
Revision Changes Path
1.3 +16 -13 xml-cocoon2/webapp/resources/images/cocoon.gif
<<Binary file>>
1.6 +120 -121 xml-cocoon2/webapp/stylesheets/system/status2html.xsl
Index: status2html.xsl
===================================================================
RCS file: /home/cvs/xml-cocoon2/webapp/stylesheets/system/status2html.xsl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- status2html.xsl 14 Dec 2001 01:30:46 -0000 1.5
+++ status2html.xsl 29 Dec 2001 11:22:14 -0000 1.6
@@ -11,138 +11,136 @@
</head>
<body bgcolor="white">
- <table bgcolor="#000000" cellspacing="0" cellpadding="2" width="100%">
- <tr>
- <td>
-
- <table bgcolor="#ffffff" noshade="noshade" cellspacing="0" cellpadding="6"
width="100%">
- <tr>
- <td bgcolor="#0086b2" valign="top" align="left">
- <img src="images/cocoon.gif" border="0"/>
- </td>
- <td bgcolor="#0086b2" valign="top" align="right">
- <FONT face="arial,helvetica,sanserif" color="#ffffff">
- [<xsl:value-of select="@status:host"/>] <xsl:value-of select="@status:date"/>
- </FONT>
- </td>
- </tr>
- </table>
-
- </td>
- </tr>
- </table>
-
- <table bgcolor="#000000" cellspacing="0" cellpadding="2" width="100%">
- <tr>
- <td bgcolor="#ffffff" valign="top" align="left" colspan="2" height="12">
- </td>
- </tr>
- </table>
+ <table bgcolor="#000000" cellspacing="0" cellpadding="2" width="97%">
+ <tr>
+ <td>
+
+ <table border="0" bgcolor="#000000" cellpadding="0" cellspacing="0"
width="100%">
+ <tr>
+ <td>
+
+ <table bgcolor="#ffffff" noshade="noshade" cellspacing="0"
cellpadding="6" width="100%">
+ <tr>
+ <td bgcolor="#0086b2" valign="top" align="left">
+ <img src="images/cocoon.gif" border="0"/>
+ </td>
+ <td bgcolor="#0086b2" valign="top" align="right">
+ <FONT face="arial,helvetica,sanserif" color="#ffffff">
+ [<xsl:value-of select="@status:host"/>] <xsl:value-of
select="@status:date"/>
+ </FONT>
+ </td>
+ </tr>
+ </table>
- <xsl:apply-templates />
+ </td>
+ </tr>
+ </table>
+
+ </td>
+ </tr>
+ </table>
+
+ <xsl:call-template name="spacer">
+ <xsl:with-param name="height" select="number(10)"/>
+ </xsl:call-template>
+
+ <xsl:apply-templates />
+
</body>
</html>
</xsl:template>
<xsl:template match="status:group">
- <table bgcolor="#000000" noshade="noshade" border="0" cellspacing="2"
cellpadding="6" width="100%">
- <tr>
- <td bgcolor="#0086b2" valign="top" align="left" colspan="2">
- <FONT color="#ffffff" face="arial,helvetica,sanserif" size="+1">
- -<xsl:value-of select="@status:name"/>
- </FONT>
- </td>
- </tr>
- <tr>
- <td bgcolor="ffffff" width="100%" colspan="2">
- <table bgcolor="#000000" noshade="noshade" border="0" cellspacing="2"
cellpadding="6" bordercolor="black" width="100%">
- <xsl:apply-templates />
- </table>
- </td>
- </tr>
- </table>
-
- <table bgcolor="#000000" cellspacing="0" cellpadding="2" width="100%">
- <tr>
- <td bgcolor="#ffffff" valign="top" align="left" colspan="2" height="8">
- </td>
- </tr>
- </table>
+ <table border="0" bgcolor="#000000" cellpadding="0" cellspacing="0"
width="100%">
+ <tr>
+ <td>
+
+ <table bgcolor="#000000" border="0" cellspacing="2" cellpadding="6"
width="100%">
+ <tr>
+ <td bgcolor="#0086b2" valign="top" align="left" colspan="2">
+ <FONT color="#ffffff" face="arial,helvetica,sanserif" size="+1">
+ -<xsl:value-of select="@status:name"/>
+ </FONT>
+ </td>
+ </tr>
+ <tr>
+
+ <td bgcolor="#ffffff">
+
+ <table border="0" bgcolor="#000000" cellpadding="0" cellspacing="0"
width="100%">
+ <tr>
+ <td>
+
+ <table width="100%" bgcolor="#000000" border="0" cellspacing="2"
cellpadding="6">
+ <xsl:apply-templates select="status:value"/>
+ <xsl:call-template name="spacer">
+ <xsl:with-param name="height" select="number(8)"/>
+ </xsl:call-template>
+ <xsl:apply-templates select="status:group"/>
+ </table>
+
+ </td>
+ </tr>
+ </table>
+
+ </td>
+
+
+ </tr>
+ </table>
+
+ </td>
+ </tr>
+ </table>
+
+
+ <xsl:call-template name="spacer">
+ <xsl:with-param name="height" select="number(6)"/>
+ </xsl:call-template>
</xsl:template>
- <!--xsl:template match="status:value">
- <tr>
- <td bgcolor="#0086b2" valign="top" align="left">
- <FONT face="arial,helvetica,sanserif" color="#ffffff">
+ <xsl:template match="status:value">
+ <tr>
+ <td bgcolor="#0086b2" valign="top" align="left" width="1%">
+ <font face="arial,helvetica,sanserif" color="#ffffff">
<xsl:value-of select="@status:name"/>
- </FONT>
- </td>
- <td bgcolor="ffffff" width="100%">
- <FONT face="arial,helvetica,sanserif">
- <xsl:value-of select="." />
- </FONT>
- </td>
- </tr>
-
- </xsl:template-->
-
- <xsl:template match="status:value[count(status:line) <= 1]">
- <tr>
- <td bgcolor="#0086b2" valign="top" align="left">
- <font face="arial,helvetica,sanserif"
color="#ffffff">
- <xsl:value-of select="@status:name"/>
- </font>
- </td>
- <td bgcolor="ffffff" width="100%">
- <font face="arial,helvetica,sanserif">
- <xsl:value-of select="status:line" />
- </font>
- </td>
- </tr>
- </xsl:template>
-
- <xsl:template match="status:value[count(status:line) > 1]">
- <tr>
- <td bgcolor="#0086b2" valign="top" align="left">
- <font face="arial,helvetica,sanserif"
color="#ffffff">
- <xsl:value-of select="@status:name"/>
- </font>
- </td>
- <td bgcolor="ffffff" width="100%">
- <ul>
- <xsl:apply-templates />
- </ul>
- </td>
- </tr>
- </xsl:template>
-
+ </font>
+ </td>
+
+ <td bgcolor="#eeeeee" width="100%">
+
+ <xsl:choose>
+ <xsl:when test="../@status:name='memory' and ( @status:name='total' or
@status:name='free')">
+ <font face="arial,helvetica,sanserif">
+ <xsl:call-template name="suffix">
+ <xsl:with-param
+ name="bytes"
+ select="number(.)"/>
+ </xsl:call-template>
+ </font>
+ </xsl:when>
+ <xsl:when test="count(status:line) <= 1">
+ <font face="arial,helvetica,sanserif">
+ <xsl:value-of select="status:line" />
+ </font>
+ </xsl:when>
+ <xsl:otherwise>
+ <ul>
+ <xsl:apply-templates />
+ </ul>
+ </xsl:otherwise>
+ </xsl:choose>
+ </td>
+ </tr>
+ </xsl:template>
- <xsl:template match="status:line">
- <li>
- <font face="arial,helvetica,sanserif">
- <xsl:value-of select="." />
- </font>
- </li>
- </xsl:template>
-
- <xsl:template match="status:value[../@status:name='memory' and (
@status:name='total' or @status:name='free')]">
- <tr>
- <td bgcolor="#0086b2" valign="top" align="left">
- <FONT face="arial,helvetica,sanserif" color="#ffffff">
- <xsl:value-of select="@status:name"/>
- </FONT>
- </td>
- <td bgcolor="ffffff" width="100%">
- <FONT face="arial,helvetica,sanserif">
- <xsl:call-template name="suffix">
- <xsl:with-param
- name="bytes"
- select="number(.)"/>
- </xsl:call-template>
- </FONT>
- </td>
- </tr>
+ <xsl:template match="status:line">
+ <li>
+ <font face="arial,helvetica,sanserif">
+ <xsl:value-of select="." />
+ </font>
+ </li>
</xsl:template>
<xsl:template name="suffix">
@@ -185,3 +183,4 @@
</xsl:stylesheet>
+
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
