cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bdelacre...@apache.org
Subject cvs commit: cocoon-2.1/src/webapp/samples/common/style/xsl/html simple-samples2html.xsl
Date Wed, 07 May 2003 10:18:19 GMT
bdelacretaz    2003/05/07 03:18:18

  Modified:    src/webapp/resources/styles main.css
               src/webapp/samples/common/style/xsl/html
                        simple-samples2html.xsl
  Log:
  make sample groups and notes more visible - layout tested with Safari, IE and Camino on
macosx
  
  Revision  Changes    Path
  1.3       +27 -1     cocoon-2.1/src/webapp/resources/styles/main.css
  
  Index: main.css
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/webapp/resources/styles/main.css,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- main.css	6 May 2003 19:23:51 -0000	1.2
  +++ main.css	7 May 2003 10:18:17 -0000	1.3
  @@ -26,4 +26,30 @@
   span.switch { cursor: pointer; margin-left: 5px; text-decoration: underline; }
   
   /* Samples */
  -.group { color: #336699; border-width: 0px 0px 1px 0px; border-style: solid; border-color:
#336699; }
  +
  +/* background-color: #ffffcc; would make the groups even more visible but it's a bit heavy
IMHO */
  +.samplesGroup {
  +    color: black;
  +    border-width: 0px 0px 1px 1px;
  +    border-style: solid;
  +    border-color: #336699;
  +    font-size:120%;
  +    padding-left: 0.2em;
  +    padding-top: 0.2em;
  +    padding-bottom: 0.2em;
  +    margin-top: 1em;
  +    margin-bottom: 0;
  +}
  +
  +.samplesNote {
  +    color: #333333;
  +    margin: 0.5em;
  +    padding: 0.2em;
  +    background-color: #ffffcc;
  +    font-style: italic;
  +}
  +
  +.samplesText {
  +    margin-top: 0.2em;
  +}
  +
  
  
  
  1.6       +14 -13    cocoon-2.1/src/webapp/samples/common/style/xsl/html/simple-samples2html.xsl
  
  Index: simple-samples2html.xsl
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/common/style/xsl/html/simple-samples2html.xsl,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- simple-samples2html.xsl	7 May 2003 04:57:13 -0000	1.5
  +++ simple-samples2html.xsl	7 May 2003 10:18:18 -0000	1.6
  @@ -16,7 +16,7 @@
    <xsl:template match="/">
     <html>
      <head>
  -     <title>Apache Cocoon @version@</title>
  +     <title>Apache Cocoon 2.1-M2-dev</title>
        <link rel="SHORTCUT ICON" href="favicon.ico"/>
        <link href="{$contextPath}/styles/main.css" type="text/css" rel="stylesheet"/>
      </head>
  @@ -25,7 +25,7 @@
         <tr>
           <td width="*">The Apache Software Foundation is proud to present...</td>
           <td width="40%" align="center"><img border="0" src="{$contextPath}/images/cocoon.gif"/></td>
  -        <td width="30%" align="center">Version: <b>@version@</b></td>
  +        <td width="30%" align="center">Version: <b>2.1-M2-dev</b></td>
         </tr>
       </table>
   
  @@ -48,7 +48,7 @@
       <xsl:apply-templates select="samples"/>
   
       <p class="copyright">
  -      Copyright &#169; @year@ <a href="http://www.apache.org/">The Apache Software
Foundation</a>.
  +      Copyright &#169; 1999-2003 <a href="http://www.apache.org/">The Apache
Software Foundation</a>.
         All rights reserved.
       </p>
      </body>
  @@ -116,12 +116,12 @@
     <table width="100%" cellspacing="5">
       <tr>
         <td width="50%" valign="top">
  -        <xsl:for-each select="group">  
  +        <xsl:for-each select="group">
             <xsl:variable name="group-position" select="position()"/>
             <xsl:choose>
               <xsl:when test="$group-position &lt;= $half">
  -              <h4 class="group"><xsl:value-of select="@name"/></h4>
  -              <p><xsl:apply-templates/></p>
  +              <h4 class="samplesGroup"><xsl:value-of select="@name"/></h4>
  +              <p class="samplesText"><xsl:apply-templates/></p>
               </xsl:when>
               <xsl:otherwise></xsl:otherwise>
             </xsl:choose>
  @@ -132,8 +132,8 @@
             <xsl:variable name="group-position" select="position()"/>
             <xsl:choose>
               <xsl:when test="$group-position &gt; $half">
  -              <h4 class="group"><xsl:value-of select="@name"/></h4>
  -              <p><xsl:apply-templates/></p>
  +              <h4 class="samplesGroup"><xsl:value-of select="@name"/></h4>
  +              <p class="samplesText"><xsl:apply-templates/></p>
               </xsl:when>
               <xsl:otherwise></xsl:otherwise>
             </xsl:choose>
  @@ -143,7 +143,7 @@
     </table>
    </xsl:template>
   
  - 
  +
    <xsl:template match="sample">
      <xsl:variable name="link">
        <xsl:choose>
  @@ -161,10 +161,11 @@
      <br/>
    </xsl:template>
   
  - 
  +
    <xsl:template match="note">
  -   <xsl:value-of select="."/>
  -   <br/>
  +   <p class="samplesNote">
  +        <xsl:apply-templates/>
  +   </p>
    </xsl:template>
   
   </xsl:stylesheet>
  
  
  

Mime
View raw message