You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by vg...@apache.org on 2003/12/02 17:52:51 UTC

cvs commit: cocoon-2.1/src/webapp/stylesheets/system directory2html.xslt error2html.xslt linkstatus2html.xslt sitemap2html.xslt xmlform2html.xslt

vgritsenko    2003/12/02 08:52:51

  Modified:    src/webapp/stylesheets/system directory2html.xslt
                        error2html.xslt linkstatus2html.xslt
                        sitemap2html.xslt xmlform2html.xslt
  Log:
  cleanup
  
  Revision  Changes    Path
  1.3       +33 -33    cocoon-2.1/src/webapp/stylesheets/system/directory2html.xslt
  
  Index: directory2html.xslt
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/webapp/stylesheets/system/directory2html.xslt,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- directory2html.xslt	17 Mar 2003 00:47:43 -0000	1.2
  +++ directory2html.xslt	2 Dec 2003 16:52:51 -0000	1.3
  @@ -3,46 +3,46 @@
   <!-- CVS $Id$ -->
   
   <xsl:stylesheet version="1.0"
  - xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
  - xmlns:dir="http://apache.org/cocoon/directory/2.0">
  +                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
  +                xmlns:dir="http://apache.org/cocoon/directory/2.0">
   
     <xsl:template match="/">
  -   <html>
  -    <head>
  -     <title><xsl:value-of select="dir:directory/@name"/></title>
  -	 <style>
  -		<xsl:comment>
  -			body { background-color: #ffffff }
  -		</xsl:comment>
  -	 </style>
  -    </head>
  -    <body>
  -     <h1>Directory Listing of <xsl:value-of select="dir:directory/@name"/></h1>
  -     <table border="0">
  -      <tr>
  -       <td><a href="../"><i>parent directory</i></a></td>
  -      </tr>
  -      <tr>
  -       <td>&#160;</td>
  -      </tr>
  -      <xsl:apply-templates/>
  -     </table>
  -    </body>
  -   </html>
  +    <html>
  +      <head>
  +        <title><xsl:value-of select="dir:directory/@name"/></title>
  +        <style>
  +          <xsl:comment>
  +            body { background-color: #ffffff }
  +          </xsl:comment>
  +        </style>
  +      </head>
  +      <body>
  +        <h1>Directory Listing of <xsl:value-of select="dir:directory/@name"/></h1>
  +        <table border="0">
  +          <tr>
  +            <td><a href="../"><i>parent directory</i></a></td>
  +          </tr>
  +          <tr>
  +            <td>&#160;</td>
  +          </tr>
  +          <xsl:apply-templates/>
  +        </table>
  +      </body>
  +    </html>
     </xsl:template>
   
     <xsl:template match="dir:directory/dir:directory">
  -   <tr>
  -    <td><a href="{@name}/"><i><xsl:value-of select="@name"/></i></a></td>
  -    <td><xsl:value-of select="@date"/></td>
  -   </tr>
  +    <tr>
  +      <td><a href="{@name}/"><i><xsl:value-of select="@name"/></i></a></td>
  +      <td><xsl:value-of select="@date"/></td>
  +    </tr>
     </xsl:template>
   
     <xsl:template match="dir:file">
  -   <tr>
  -    <td><a href="{@name}"><xsl:value-of select="@name"/></a></td>
  -    <td><xsl:value-of select="@date"/></td>
  -   </tr>
  +    <tr>
  +      <td><a href="{@name}"><xsl:value-of select="@name"/></a></td>
  +      <td><xsl:value-of select="@date"/></td>
  +    </tr>
     </xsl:template>
   
   </xsl:stylesheet>
  
  
  
  1.10      +111 -143  cocoon-2.1/src/webapp/stylesheets/system/error2html.xslt
  
  Index: error2html.xslt
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/webapp/stylesheets/system/error2html.xslt,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- error2html.xslt	3 Sep 2003 10:50:48 -0000	1.9
  +++ error2html.xslt	2 Dec 2003 16:52:51 -0000	1.10
  @@ -1,143 +1,111 @@
  -<?xml version="1.0"?>
  -
  -<!-- CVS $Id$ -->
  -
  -<xsl:stylesheet version="1.0"
  - xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
  - xmlns:error="http://apache.org/cocoon/error/2.1">
  -
  -<xsl:param name="contextPath" select="string('/cocoon')"/>
  -
  -<!-- let sitemap override default page title -->
  -<xsl:param name="pageTitle" select="//error:notify/error:title"/>
  -
  -<xsl:template match="error:notify">
  - <html>
  -  <head>
  -   <title>
  -    <xsl:value-of select="$pageTitle"/>
  -   </title>
  -   <link href="{$contextPath}/styles/main.css" type="text/css" rel="stylesheet"/>
  -   <style>
  -		h1 { color: #336699; text-align: left; margin: 0px 0px 30px 0px; padding: 0px; border-width: 0px 0px 1px 0px; border-style: solid; border-color: #336699;}
  -		p.message { padding: 10px 30px 10px 30px; font-weight: bold; font-size: 130%; border-width: 1px; border-style: dashed; border-color: #336699; }
  -		p.description { padding: 10px 30px 20px 30px; border-width: 0px 0px 1px 0px; border-style: solid; border-color: #336699;}
  -		p.topped { padding-top: 10px; border-width: 1px 0px 0px 0px; border-style: solid; border-color: #336699; }
  -   </style>
  -   <script src="{$contextPath}/scripts/main.js" type="text/javascript"/>
  -  </head>
  -  <body>
  -   <h1><xsl:value-of select="$pageTitle"/></h1>
  -
  -   <p class="message">
  -    <xsl:call-template name="returns2br">
  -     <xsl:with-param name="string" select="error:message"/>
  -    </xsl:call-template>
  -   </p>
  -
  -   <p class="description">
  -    <xsl:call-template name="returns2br">
  -     <xsl:with-param name="string" select="error:description"/>
  -    </xsl:call-template>
  -   </p>
  -
  -   <xsl:apply-templates select="error:extra"/>
  -
  -   <p class="topped">
  -    If you need help and this information is not enough, you
  -    are invited to read the
  -    <a href="http://cocoon.apache.org/2.1/faq/">Cocoon FAQ</a>.<br/>
  -    If you still don't find the answers you need,
  -    can send a mail to the
  -    <a>
  -    <xsl:attribute name="href">mailto:users@cocoon.apache.org?subject=[HELP]<xsl:value-of select="error:message"/>&amp;body=Description:<xsl:value-of select="error:description"/></xsl:attribute>
  -    Cocoon users mailing list</a>,
  -    remembering to:
  -   </p>
  -
  -   <ul>
  -    <li>specify the version of Cocoon you're using, or we'll assume that you
  -          are talking about the latest released version;</li>
  -    <li>specify the platform-operating system-version-servlet container version;</li>
  -    <li>send any pertinent error message;</li>
  -    <li>send pertinent log snippets;</li>
  -    <li>send pertinent sitemap snippets;</li>
  -    <li>send pertinent parts of the page that give you problems.</li>
  -   </ul>
  -
  -   <p>
  -    For more detailed technical information, take a look at the log
  -    files in the log directory of Cocoon, which is placed by default in
  -    the <code>WEB-INF/logs/</code> folder of your cocoon webapp context.<br/>
  -    If the logs don't give you enough information, you might want to increase the
  -    log level by changing the Logging configuration which is by default the
  -    <code>WEB-INF/logkit.xconf</code> file.
  -   </p>
  -
  -   <p>
  -    If you think you found a bug, please report it to
  -    <a href="http://nagoya.apache.org/bugzilla/">Apache's Bugzilla</a>;
  -    a message will automatically be sent to the developer mailing list and you'll
  -    be kept in contact automatically with the further progress on that bug.
  -   </p>
  -
  -   <p>
  -     Thanks, and sorry for the trouble if this is our fault.
  -   </p>
  -
  -   <p class="topped">
  -    The <a href="http://cocoon.apache.org/">Apache Cocoon</a> Project
  -   </p>
  -  </body>
  - </html>
  -</xsl:template>
  -
  -<xsl:template match="error:extra">
  - <xsl:choose>
  -  <xsl:when test="contains(@error:description,'stacktrace')">
  -   <p class="stacktrace">
  -    <span class="description"><xsl:value-of select="@error:description"/></span>
  -    <span class="switch" id="{@error:description}-switch" onclick="toggle('{@error:description}')">[show]</span>
  -    <pre id="{@error:description}" style="display: none">
  -     <xsl:call-template name="returns2br">
  -      <xsl:with-param name="string" select="."/>
  -     </xsl:call-template>
  -    </pre>
  -   </p>
  -  </xsl:when>
  -  <xsl:otherwise>
  -   <p class="extra">
  -    <span class="description"><xsl:value-of select="@error:description"/>:&#160;</span>
  -    <xsl:call-template name="returns2br">
  -     <xsl:with-param name="string" select="."/>
  -    </xsl:call-template>
  -   </p>
  -  </xsl:otherwise>
  - </xsl:choose>
  -</xsl:template>
  -
  -<xsl:template name="returns2br">
  -  <xsl:param name="string"/>
  -  <xsl:value-of select="$string"/>
  -  <!--
  -    Disabled this template since it can cause a StackOverflowError on longer
  -    stacktraces, and doesn't seem to be needed anyhow.
  -  -->
  -  <!--
  -  <xsl:variable name="return" select="'&#xa;'"/>
  -  <xsl:choose>
  -    <xsl:when test="contains($string,$return)">
  -      <xsl:value-of select="substring-before($string,$return)"/>
  -      <br/>
  -      <xsl:call-template name="returns2br">
  -        <xsl:with-param name="string" select="substring-after($string,$return)"/>
  -      </xsl:call-template>
  -    </xsl:when>
  -    <xsl:otherwise>
  -      <xsl:value-of select="$string"/>
  -    </xsl:otherwise>
  -  </xsl:choose>
  -  -->
  -</xsl:template>
  -
  -</xsl:stylesheet>
  +<?xml version="1.0"?>
  +
  +<!-- CVS $Id$ -->
  +
  +<xsl:stylesheet version="1.0"
  +                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
  +                xmlns:error="http://apache.org/cocoon/error/2.1">
  +
  +  <xsl:param name="contextPath" select="string('/cocoon')"/>
  +
  +  <!-- let sitemap override default page title -->
  +  <xsl:param name="pageTitle" select="//error:notify/error:title"/>
  +
  +  <xsl:template match="error:notify">
  +    <html>
  +      <head>
  +        <title>
  +          <xsl:value-of select="$pageTitle"/>
  +        </title>
  +        <link href="{$contextPath}/styles/main.css" type="text/css" rel="stylesheet"/>
  +        <style>
  +          h1 { color: #336699; text-align: left; margin: 0px 0px 30px 0px; padding: 0px; border-width: 0px 0px 1px 0px; border-style: solid; border-color: #336699;}
  +          p.message { padding: 10px 30px 10px 30px; font-weight: bold; font-size: 130%; border-width: 1px; border-style: dashed; border-color: #336699; }
  +          p.description { padding: 10px 30px 20px 30px; border-width: 0px 0px 1px 0px; border-style: solid; border-color: #336699;}
  +          p.topped { padding-top: 10px; border-width: 1px 0px 0px 0px; border-style: solid; border-color: #336699; }
  +        </style>
  +        <script src="{$contextPath}/scripts/main.js" type="text/javascript"/>
  +      </head>
  +      <body>
  +        <h1><xsl:value-of select="$pageTitle"/></h1>
  +
  +        <p class="message">
  +          <xsl:value-of select="error:message"/>
  +        </p>
  +
  +        <p class="description">
  +          <xsl:value-of select="error:description"/>
  +        </p>
  +
  +        <xsl:apply-templates select="error:extra"/>
  +
  +        <p class="topped">
  +          If you need help and this information is not enough, you
  +          are invited to read the
  +          <a href="http://cocoon.apache.org/2.1/faq/">Cocoon FAQ</a>.<br/>
  +          If you still don't find the answers you need,
  +          can send a mail to the
  +          <a>
  +          <xsl:attribute name="href">mailto:users@cocoon.apache.org?subject=[HELP]<xsl:value-of select="error:message"/>&amp;body=Description:<xsl:value-of select="error:description"/></xsl:attribute>
  +          Cocoon users mailing list</a>,
  +          remembering to:
  +        </p>
  +
  +        <ul>
  +          <li>specify the version of Cocoon you're using, or we'll assume that you
  +              are talking about the latest released version;</li>
  +          <li>specify the platform-operating system-version-servlet container version;</li>
  +          <li>send any pertinent error message;</li>
  +          <li>send pertinent log snippets;</li>
  +          <li>send pertinent sitemap snippets;</li>
  +          <li>send pertinent parts of the page that give you problems.</li>
  +        </ul>
  +
  +        <p>
  +          For more detailed technical information, take a look at the log
  +          files in the log directory of Cocoon, which is placed by default in
  +          the <code>WEB-INF/logs/</code> folder of your cocoon webapp context.<br/>
  +          If the logs don't give you enough information, you might want to increase the
  +          log level by changing the Logging configuration which is by default the
  +          <code>WEB-INF/logkit.xconf</code> file.
  +        </p>
  +
  +        <p>
  +          If you think you found a bug, please report it to
  +          <a href="http://nagoya.apache.org/bugzilla/">Apache's Bugzilla</a>;
  +          a message will automatically be sent to the developer mailing list and you'll
  +          be kept in contact automatically with the further progress on that bug.
  +        </p>
  +
  +        <p>
  +          Thanks, and sorry for the trouble if this is our fault.
  +        </p>
  +
  +        <p class="topped">
  +          The <a href="http://cocoon.apache.org/">Apache Cocoon</a> Project
  +        </p>
  +      </body>
  +    </html>
  +  </xsl:template>
  +
  +  <xsl:template match="error:extra">
  +    <xsl:choose>
  +     <xsl:when test="contains(@error:description,'stacktrace')">
  +      <p class="stacktrace">
  +       <span class="description"><xsl:value-of select="@error:description"/></span>
  +       <span class="switch" id="{@error:description}-switch" onclick="toggle('{@error:description}')">[show]</span>
  +       <pre id="{@error:description}" style="display: none">
  +         <xsl:value-of select="."/>
  +       </pre>
  +      </p>
  +     </xsl:when>
  +     <xsl:otherwise>
  +      <p class="extra">
  +       <span class="description"><xsl:value-of select="@error:description"/>:&#160;</span>
  +       <xsl:value-of select="."/>
  +      </p>
  +     </xsl:otherwise>
  +    </xsl:choose>
  +  </xsl:template>
  +
  +</xsl:stylesheet>
  
  
  
  1.2       +27 -24    cocoon-2.1/src/webapp/stylesheets/system/linkstatus2html.xslt
  
  Index: linkstatus2html.xslt
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/webapp/stylesheets/system/linkstatus2html.xslt,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- linkstatus2html.xslt	26 Mar 2003 21:21:30 -0000	1.1
  +++ linkstatus2html.xslt	2 Dec 2003 16:52:51 -0000	1.2
  @@ -1,33 +1,36 @@
   <?xml version="1.0"?>
  -<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
  -xmlns:linkstatus="http://apache.org/cocoon/linkstatus/2.0">
  +
  +<!-- CVS $Id$ -->
  +
  +<xsl:stylesheet version="1.0"
  +                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
  +                xmlns:linkstatus="http://apache.org/cocoon/linkstatus/2.0">
   
     <xsl:template match="linkstatus:linkstatus">
  -   <html>
  -     <body>
  -      <table border="1">
  -       <tr><th>URL</th><th>referrer</th><th>content-type</th><th>status</th><th>message</th></tr>
  -	   <xsl:apply-templates/>
  -      </table>
  -     </body>
  -	</html>
  +    <html>
  +      <body>
  +        <table border="1">
  +          <tr><th>URL</th><th>referrer</th><th>content-type</th><th>status</th><th>message</th></tr>
  +          <xsl:apply-templates/>
  +        </table>
  +      </body>
  +    </html>
     </xsl:template>
   
     <xsl:template match="linkstatus:link">
  -    <tr><xsl:attribute name = "bgcolor" ><xsl:choose>
  -     	<xsl:when test="normalize-space(@status)='200'">#00ff00</xsl:when>
  -     	<xsl:when test="normalize-space(@status)='404'">#ffff00</xsl:when>     	
  -    	<xsl:otherwise>#ff0000</xsl:otherwise></xsl:choose>
  -    </xsl:attribute>
  -    
  -    
  -     <td><a><xsl:attribute name="href"><xsl:value-of select="@href"/></xsl:attribute>
  -            <xsl:value-of select="@href"/></a></td>
  -     <td><a><xsl:attribute name="href"><xsl:value-of select="@referrer"/></xsl:attribute>
  -            referrer</a></td>
  -     <td><xsl:value-of select="@content"/></td> 
  -     <td><xsl:value-of select="@status"/></td> 
  -     <td><xsl:value-of select="@message"/></td>
  +    <tr>
  +      <xsl:attribute name = "bgcolor">
  +        <xsl:choose>
  +          <xsl:when test="normalize-space(@status)='200'">#00ff00</xsl:when>
  +          <xsl:when test="normalize-space(@status)='404'">#ffff00</xsl:when>     	
  +          <xsl:otherwise>#ff0000</xsl:otherwise>
  +        </xsl:choose>
  +      </xsl:attribute>
  +      <td><a href="{@href}"><xsl:value-of select="@href"/></a></td>
  +      <td><a href="{@referrer}">referrer</a></td>
  +      <td><xsl:value-of select="@content"/></td> 
  +      <td><xsl:value-of select="@status"/></td> 
  +      <td><xsl:value-of select="@message"/></td>
       </tr>
     </xsl:template>
   
  
  
  
  1.2       +4 -2      cocoon-2.1/src/webapp/stylesheets/system/sitemap2html.xslt
  
  Index: sitemap2html.xslt
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/webapp/stylesheets/system/sitemap2html.xslt,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- sitemap2html.xslt	25 Mar 2003 17:10:35 -0000	1.1
  +++ sitemap2html.xslt	2 Dec 2003 16:52:51 -0000	1.2
  @@ -1,8 +1,10 @@
   <?xml version="1.0"?>
   
  +<!-- CVS $Id$ -->
  +
   <xsl:stylesheet version="1.0"
  -  xmlns:map="http://apache.org/cocoon/sitemap/1.0"
  -  xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
  +                xmlns:map="http://apache.org/cocoon/sitemap/1.0"
  +                xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   
    <xsl:template match="/">
     <html>
  
  
  
  1.3       +0 -2      cocoon-2.1/src/webapp/stylesheets/system/xmlform2html.xslt
  
  Index: xmlform2html.xslt
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/webapp/stylesheets/system/xmlform2html.xslt,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- xmlform2html.xslt	19 May 2003 10:30:26 -0000	1.2
  +++ xmlform2html.xslt	2 Dec 2003 16:52:51 -0000	1.3
  @@ -1,8 +1,6 @@
   <?xml version="1.0" encoding="iso-8859-1" ?>
   
  -
   <!-- 
  -
     Basic XMLForm processing stylesheet.  
     Converts XMLForm tags to HTML tags.