cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cross...@apache.org
Subject cvs commit: cocoon-2.1/src/blocks/apples/samples/hanoi hanoi.jx hanoi.xsl
Date Tue, 18 Nov 2003 01:21:56 GMT
crossley    2003/11/17 17:21:56

  Modified:    src/blocks/apples/samples/calc displayResult.xsp
                        getNumberB.xsp getOperator.xsp
               src/blocks/apples/samples/guess success.jx
               src/blocks/apples/samples/hanoi hanoi.jx hanoi.xsl
  Log:
  Fix tab2space and missing eol at eof.
  
  Revision  Changes    Path
  1.2       +7 -7      cocoon-2.1/src/blocks/apples/samples/calc/displayResult.xsp
  
  Index: displayResult.xsp
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/apples/samples/calc/displayResult.xsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- displayResult.xsp	29 Aug 2003 22:22:05 -0000	1.1
  +++ displayResult.xsp	18 Nov 2003 01:21:56 -0000	1.2
  @@ -15,20 +15,20 @@
         <form action="./calc.flow" method="post">
           <para>a =
             <a>
  -	        <xsp:attribute name="href"><xsp:expr><jpath:continuation/>+".continue?change=NumberA"</xsp:expr></xsp:attribute>
  -    	    <strong><jpath:value-of select="a"/></strong>
  +          <xsp:attribute name="href"><xsp:expr><jpath:continuation/>+".continue?change=NumberA"</xsp:expr></xsp:attribute>
  +          <strong><jpath:value-of select="a"/></strong>
             </a> 
           </para>
           <para>b =
             <a>
  -	        <xsp:attribute name="href"><xsp:expr><jpath:continuation/>+".continue?change=NumberB"</xsp:expr></xsp:attribute>
  -    	    <strong><jpath:value-of select="b"/></strong>
  +          <xsp:attribute name="href"><xsp:expr><jpath:continuation/>+".continue?change=NumberB"</xsp:expr></xsp:attribute>
  +          <strong><jpath:value-of select="b"/></strong>
             </a> 
           </para> 
           <para>Operator =
             <a>
  -	        <xsp:attribute name="href"><xsp:expr><jpath:continuation/>+".continue?change=Operator"</xsp:expr></xsp:attribute>
  -    	    <strong><jpath:value-of select="operator"/></strong>
  +          <xsp:attribute name="href"><xsp:expr><jpath:continuation/>+".continue?change=Operator"</xsp:expr></xsp:attribute>
  +          <strong><jpath:value-of select="operator"/></strong>
             </a> 
           </para> 
   
  
  
  
  1.3       +3 -3      cocoon-2.1/src/blocks/apples/samples/calc/getNumberB.xsp
  
  Index: getNumberB.xsp
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/apples/samples/calc/getNumberB.xsp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- getNumberB.xsp	30 Sep 2003 20:14:18 -0000	1.2
  +++ getNumberB.xsp	18 Nov 2003 01:21:56 -0000	1.3
  @@ -16,8 +16,8 @@
           <xsp:attribute name="action"><xsp:expr><jpath:continuation/>+".continue"</xsp:expr></xsp:attribute>
           <para>a =
             <a>
  -	        <xsp:attribute name="href"><xsp:expr><jpath:continuation/>+".continue?change=NumberA"</xsp:expr></xsp:attribute>
  -    	    <strong><jpath:value-of select="a"/></strong>
  +          <xsp:attribute name="href"><xsp:expr><jpath:continuation/>+".continue?change=NumberA"</xsp:expr></xsp:attribute>
  +          <strong><jpath:value-of select="a"/></strong>
             </a> 
           </para>
           <para>Enter value of <strong>b</strong>: <input type="text"
name="b"/></para>
  
  
  
  1.3       +5 -5      cocoon-2.1/src/blocks/apples/samples/calc/getOperator.xsp
  
  Index: getOperator.xsp
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/apples/samples/calc/getOperator.xsp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- getOperator.xsp	30 Sep 2003 20:14:18 -0000	1.2
  +++ getOperator.xsp	18 Nov 2003 01:21:56 -0000	1.3
  @@ -16,14 +16,14 @@
           <xsp:attribute name="action"><xsp:expr><jpath:continuation/>+
".continue"</xsp:expr></xsp:attribute>
           <para>a =
             <a>
  -	        <xsp:attribute name="href"><xsp:expr><jpath:continuation/>+".continue?change=NumberA"</xsp:expr></xsp:attribute>
  -    	    <strong><jpath:value-of select="a"/></strong>
  +          <xsp:attribute name="href"><xsp:expr><jpath:continuation/>+".continue?change=NumberA"</xsp:expr></xsp:attribute>
  +          <strong><jpath:value-of select="a"/></strong>
             </a> 
           </para>
           <para>b =
             <a>
  -	        <xsp:attribute name="href"><xsp:expr><jpath:continuation/>+".continue?change=NumberB"</xsp:expr></xsp:attribute>
  -    	    <strong><jpath:value-of select="b"/></strong>
  +          <xsp:attribute name="href"><xsp:expr><jpath:continuation/>+".continue?change=NumberB"</xsp:expr></xsp:attribute>
  +          <strong><jpath:value-of select="b"/></strong>
             </a> 
           </para>        
           <para>Enter operator
  
  
  
  1.2       +3 -3      cocoon-2.1/src/blocks/apples/samples/guess/success.jx
  
  Index: success.jx
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/apples/samples/guess/success.jx,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- success.jx	29 Aug 2003 22:23:36 -0000	1.1
  +++ success.jx	18 Nov 2003 01:21:56 -0000	1.2
  @@ -9,9 +9,9 @@
       <para>The number was indeed: ${random}</para>
       <para>It took you ${guesses} tries.</para>
   
  -	<para/>
  -	
  -	<para><a href="guess.flow">Play again</a></para> 
  +  <para/>
  +  
  +  <para><a href="guess.flow">Play again</a></para> 
       
     </content>
   
  
  
  
  1.2       +4 -5      cocoon-2.1/src/blocks/apples/samples/hanoi/hanoi.jx
  
  Index: hanoi.jx
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/apples/samples/hanoi/hanoi.jx,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- hanoi.jx	29 Aug 2003 22:31:33 -0000	1.1
  +++ hanoi.jx	18 Nov 2003 01:21:56 -0000	1.2
  @@ -19,15 +19,14 @@
         <hn:stacks>
           <jx:forEach var="stack" items="${stacks}">
             <hn:stack>
  -	        <jx:forEach var="disc" items="${stack}">
  -	          <hn:disc size="${disc}" />
  -	        </jx:forEach>
  +          <jx:forEach var="disc" items="${stack}">
  +            <hn:disc size="${disc}" />
  +          </jx:forEach>
             </hn:stack>
  -		</jx:forEach>	        
  +    </jx:forEach>
         </hn:stacks>   
       </hn:hanoi>    
           
     </content>
   
   </page>
  -  
  \ No newline at end of file
  
  
  
  1.2       +32 -32    cocoon-2.1/src/blocks/apples/samples/hanoi/hanoi.xsl
  
  Index: hanoi.xsl
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/apples/samples/hanoi/hanoi.xsl,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- hanoi.xsl	29 Aug 2003 22:31:33 -0000	1.1
  +++ hanoi.xsl	18 Nov 2003 01:21:56 -0000	1.2
  @@ -17,9 +17,9 @@
         <table border="0">
           <!-- fixing col-widths row -->
           <tr>
  -		  <xsl:call-template name="fix-cells" >
  -		    <xsl:with-param name="remaining" select="$cols-total" />
  -		  </xsl:call-template>
  +      <xsl:call-template name="fix-cells" >
  +        <xsl:with-param name="remaining" select="$cols-total" />
  +      </xsl:call-template>
           </tr>
           <!-- /fixing col-widths row -->
           
  @@ -49,26 +49,26 @@
           <tr>
             <td colspan="{$cols-total}"><hr width="70%"/></td>
           </tr>        
  -		<!-- /moving-disc-row -->
  -		
  -		<!-- stack-header-row -->
  -	    <tr>
  -	      <xsl:choose>
  -	        <xsl:when test="$on-the-move" >
  -		      <td colspan="{$cols-per-stack}"><center><a href="?stack=0">Drop
It!</a></center></td>
  -		      <td colspan="{$cols-per-stack}"><center><a href="?stack=1">Drop
It!</a></center></td>
  -		      <td colspan="{$cols-per-stack}"><center><a href="?stack=2">Drop
It!</a></center></td>
  -	        </xsl:when>
  -	        <xsl:otherwise>
  -		      <td colspan="{$cols-per-stack}"><center><a href="?stack=0">Lift
It!</a></center></td>
  -		      <td colspan="{$cols-per-stack}"><center><a href="?stack=1">Lift
It!</a></center></td>
  -		      <td colspan="{$cols-per-stack}"><center><a href="?stack=2">Lift
It!</a></center></td>
  -	        </xsl:otherwise>
  -	      </xsl:choose>
  -	    </tr>
  -		<!-- /stack-header-row -->
  -	
  -		
  +    <!-- /moving-disc-row -->
  +    
  +    <!-- stack-header-row -->
  +      <tr>
  +        <xsl:choose>
  +          <xsl:when test="$on-the-move" >
  +          <td colspan="{$cols-per-stack}"><center><a href="?stack=0">Drop
It!</a></center></td>
  +          <td colspan="{$cols-per-stack}"><center><a href="?stack=1">Drop
It!</a></center></td>
  +          <td colspan="{$cols-per-stack}"><center><a href="?stack=2">Drop
It!</a></center></td>
  +          </xsl:when>
  +          <xsl:otherwise>
  +          <td colspan="{$cols-per-stack}"><center><a href="?stack=0">Lift
It!</a></center></td>
  +          <td colspan="{$cols-per-stack}"><center><a href="?stack=1">Lift
It!</a></center></td>
  +          <td colspan="{$cols-per-stack}"><center><a href="?stack=2">Lift
It!</a></center></td>
  +          </xsl:otherwise>
  +        </xsl:choose>
  +      </tr>
  +    <!-- /stack-header-row -->
  +  
  +    
           <!-- stack-rows -->
           <xsl:call-template name="remaining-stack-rows">
             <xsl:with-param name="remaining" select="$height"/>
  @@ -113,7 +113,7 @@
       <xsl:param name="cols-per-stack"/>
       <xsl:param name="stacks"/>
   
  -	<tr height="5px" bgcolor="#ffffff">	
  +  <tr height="5px" bgcolor="#ffffff">  
         <xsl:for-each select="$stacks/hn:stack">
           <xsl:variable name="stack-ndx" select="position()"/>
   
  @@ -135,7 +135,7 @@
       
       <xsl:variable name="size" select="$disc/@size" />
   
  -	<xsl:choose>
  +  <xsl:choose>
         <xsl:when test="$size &gt; 0" >
           <xsl:choose>
             <xsl:when test="($max_size - $size) &gt; 0" >
  @@ -152,12 +152,12 @@
             </xsl:otherwise>
           </xsl:choose>
         </xsl:when>
  -	  <xsl:otherwise>
  -	    <td colspan="{$max_size}" bgcolor="#ffffff"/>
  -	    <td                       bgcolor="#000000"/>
  -	    <td colspan="{$max_size}" bgcolor="#ffffff"/>
  -	  </xsl:otherwise>
  -	</xsl:choose>    
  +    <xsl:otherwise>
  +      <td colspan="{$max_size}" bgcolor="#ffffff"/>
  +      <td                       bgcolor="#000000"/>
  +      <td colspan="{$max_size}" bgcolor="#ffffff"/>
  +    </xsl:otherwise>
  +  </xsl:choose>    
   
     </xsl:template>
   
  @@ -165,7 +165,7 @@
     <xsl:template name="fix-cells">
       <xsl:param name="remaining"/>
   
  -	<td width="5px" />
  +  <td width="5px" />
   
       <xsl:if test="$remaining &gt; 1">
         <xsl:call-template name="fix-cells">
  
  
  

Mime
View raw message