[Rapforums-developer] src/stylesheets/edu/fullcoll/uportal/channels/rap/forum thread.xml,1.1.1.1,1.2

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/rapforums/src/stylesheets/edu/fullcoll/uportal/channels/rap/forum
In directory sc8-pr-cvs1:/tmp/cvs-serv17361/stylesheets/edu/fullcoll/uportal/channels/rap/forum

Modified Files:
	thread.xml thread.xsl 
Log Message:
no message

Index: thread.xml
===================================================================
RCS file: /cvsroot/rapforums/src/stylesheets/edu/fullcoll/uportal/channels/rap/forum/thread.xml,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** thread.xml	17 Sep 2003 19:54:03 -0000	1.1.1.1
--- thread.xml	25 Sep 2003 22:57:08 -0000	1.2
***************
*** 1,81 ****
  <?xml version="1.0" encoding="UTF-8"?>
  <rap>
!   <username>dick head</username>
!   <currentPage>1</currentPage>
  	<rapForum>
!     <forumID>1</forumID><!-- needed for link back to forum -->
!     <forumName>This is test forum 1</forumName><!--needed-->
!     <forumCategoryID>1</forumCategoryID><!-- need -->
!     <forumCategoryName>General</forumCategoryName><!-- needed -->
!     <threadID>1</threadID><!--needed-->
!     <numComments>25</numComments>
!     
!     <rapComments>
!       <rapComment>
!         <commentID>1</commentID>
!         <parentCommentID>1</parentCommentID>
!         <threadID>1</threadID>
!         <forumID>1</forumID>
!         <userID>00001149</userID>
!         <subject>Test Comment Insert</subject>
!         <body>Test comment body</body>
!         <modValue>0</modValue>
!         <bonusPoints>0</bonusPoints>
!         <creationDate>Friday, October 18, 2002 3:15:00 PM PDT</creationDate>
!         <modifiedDate>Friday, October 18, 2002 3:15:00 PM PDT</modifiedDate>
!       </rapComment>
!       <rapComment>
!         <commentID>2</commentID>
!         <parentCommentID>1</parentCommentID>
!         <threadID>1</threadID>
!         <forumID>1</forumID>
!         <userID>00001149</userID>
!         <subject>Test Comment Insert</subject>
!         <body>Test comment body</body>
!         <modValue>0</modValue>
!         <bonusPoints>0</bonusPoints>
!         <creationDate>Friday, October 18, 2002 3:15:00 PM PDT</creationDate>
!         <modifiedDate>Friday, October 18, 2002 3:15:00 PM PDT</modifiedDate>
!       </rapComment>
!       <rapComment>
!         <commentID>3</commentID>
!         <parentCommentID>1</parentCommentID>
!         <threadID>1</threadID>
!         <forumID>1</forumID>
!         <userID>00001149</userID>
!         <subject>Test Comment Insert</subject>
!         <body>Test comment body</body>
!         <modValue>0</modValue>
!         <bonusPoints>0</bonusPoints>
!         <creationDate>Friday, October 18, 2002 3:15:00 PM PDT</creationDate>
!         <modifiedDate>Friday, October 18, 2002 3:15:00 PM PDT</modifiedDate>
!       </rapComment>
!       <rapComment>
!         <commentID>4</commentID>
!         <parentCommentID>1</parentCommentID>
!         <threadID>1</threadID>
!         <forumID>1</forumID>
!         <userID>00001149</userID>
!         <subject>Test Comment Insert</subject>
!         <body>Test comment body</body>
!         <modValue>0</modValue>
!         <bonusPoints>0</bonusPoints>
!         <creationDate>Friday, October 18, 2002 3:15:00 PM PDT</creationDate>
!         <modifiedDate>Friday, October 18, 2002 3:15:00 PM PDT</modifiedDate>
!       </rapComment>
!       <rapComment>
!         <commentID>5</commentID>
!         <parentCommentID>1</parentCommentID>
!         <threadID>1</threadID>
!         <forumID>1</forumID>
!         <userID>00001149</userID>
!         <subject>Test Comment Insert</subject>
!         <body>Test comment body</body>
!         <modValue>0</modValue>
!         <bonusPoints>0</bonusPoints>
!         <creationDate>Friday, October 18, 2002 3:15:00 PM PDT</creationDate>
!         <modifiedDate>Friday, October 18, 2002 3:15:00 PM PDT</modifiedDate>
!       </rapComment>
!     </rapComments>
  	</rapForum>
  </rap>
--- 1,87 ----
  <?xml version="1.0" encoding="UTF-8"?>
  <rap>
! 	<username>dick head</username>
! 	<currentPage>1</currentPage>
  	<rapForum>
! 		<forumID>1</forumID>
! 		<!-- needed for link back to forum -->
! 		<forumName>This is test forum 1</forumName>
! 		<!--needed-->
! 		<forumCategoryID>1</forumCategoryID>
! 		<!-- need -->
! 		<forumCategoryName>General</forumCategoryName>
! 		<!-- needed -->
! 		<threadID>1</threadID>
! 		<!--needed-->
! 		<numComments>25</numComments>
! 		<rapComments>
! 			<rapComment>
! 				<commentID>1</commentID>
! 				<parentCommentID>1</parentCommentID>
! 				<threadID>1</threadID>
! 				<forumID>1</forumID>
! 				<userID>00001149</userID>
! 				<subject>Test Comment Insert</subject>
! 				<body>Test comment body
! 						testing carriage returns...
! 				</body>
! 				<modValue>0</modValue>
! 				<bonusPoints>0</bonusPoints>
! 				<creationDate>Friday, October 18, 2002 3:15:00 PM PDT</creationDate>
! 				<modifiedDate>Friday, October 18, 2002 3:15:00 PM PDT</modifiedDate>
! 			</rapComment>
! 			<rapComment>
! 				<commentID>2</commentID>
! 				<parentCommentID>1</parentCommentID>
! 				<threadID>1</threadID>
! 				<forumID>1</forumID>
! 				<userID>00001149</userID>
! 				<subject>Test Comment Insert</subject>
! 				<body>Test comment body2</body>
! 				<modValue>0</modValue>
! 				<bonusPoints>0</bonusPoints>
! 				<creationDate>Friday, October 18, 2002 3:15:00 PM PDT</creationDate>
! 				<modifiedDate>Friday, October 18, 2002 3:15:00 PM PDT</modifiedDate>
! 			</rapComment>
! 			<rapComment>
! 				<commentID>3</commentID>
! 				<parentCommentID>1</parentCommentID>
! 				<threadID>1</threadID>
! 				<forumID>1</forumID>
! 				<userID>00001149</userID>
! 				<subject>Test Comment Insert</subject>
! 				<body>Test comment body3</body>
! 				<modValue>0</modValue>
! 				<bonusPoints>0</bonusPoints>
! 				<creationDate>Friday, October 18, 2002 3:15:00 PM PDT</creationDate>
! 				<modifiedDate>Friday, October 18, 2002 3:15:00 PM PDT</modifiedDate>
! 			</rapComment>
! 			<rapComment>
! 				<commentID>4</commentID>
! 				<parentCommentID>1</parentCommentID>
! 				<threadID>1</threadID>
! 				<forumID>1</forumID>
! 				<userID>00001149</userID>
! 				<subject>Test Comment Insert</subject>
! 				<body>Test comment body4</body>
! 				<modValue>0</modValue>
! 				<bonusPoints>0</bonusPoints>
! 				<creationDate>Friday, October 18, 2002 3:15:00 PM PDT</creationDate>
! 				<modifiedDate>Friday, October 18, 2002 3:15:00 PM PDT</modifiedDate>
! 			</rapComment>
! 			<rapComment>
! 				<commentID>5</commentID>
! 				<parentCommentID>1</parentCommentID>
! 				<threadID>1</threadID>
! 				<forumID>1</forumID>
! 				<userID>00001149</userID>
! 				<subject>Test Comment Insert</subject>
! 				<body>Test comment body5</body>
! 				<modValue>0</modValue>
! 				<bonusPoints>0</bonusPoints>
! 				<creationDate>Friday, October 18, 2002 3:15:00 PM PDT</creationDate>
! 				<modifiedDate>Friday, October 18, 2002 3:15:00 PM PDT</modifiedDate>
! 			</rapComment>
! 		</rapComments>
  	</rapForum>
  </rap>

Index: thread.xsl
===================================================================
RCS file: /cvsroot/rapforums/src/stylesheets/edu/fullcoll/uportal/channels/rap/forum/thread.xsl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** thread.xsl	17 Sep 2003 19:54:03 -0000	1.1.1.1
--- thread.xsl	25 Sep 2003 22:57:08 -0000	1.2
***************
*** 12,16 ****
    <xsl:variable name="mediaPath" select="'media/edu/fullcoll/uportal/channels/rap'"/>
  
- 
  <!-- helper functions -->
  <xsl:template name="incr">
--- 12,15 ----
***************
*** 57,75 ****
    </xsl:template>
  
! 
! 
! 
! 
! 
!   <xsl:template match="/">
!   
!   
!     <!-- todo remove 
!   <base href="G:/uportal/FCForums/FCForums/webpages/"/>
!     <link rel="stylesheet" href="file://G:/uportal/FCForums/FCForums/webpages/stylesheets/edu/fullcoll/uportal/channels/rap/forum/sun001.css"></link>
!     -->
    
      <style type="text/css">
!     PRE {
          font-size : 9pt;
      }
--- 56,64 ----
    </xsl:template>
  
!   <xsl:template match="/">  
    
      <style type="text/css">
!     .PRE {
!     	  font-family: Courier;
          font-size : 9pt;
      }
***************
*** 83,90 ****
      </style>
  
- 
- 
- 
- 
  <!-- show our logo -->
  <table class="uportal-background-light" cellpadding="1" cellspacing="0" border="0" width="100%">
--- 72,75 ----
***************
*** 156,160 ****
      <xsl:variable name="pages">
    	<xsl:value-of select="/rap/rapForum/numComments div 5"/>
!   </xsl:variable>  
    <xsl:value-of select="ceiling($pages)"/>
    &#160;Pages &#160; <b> [&#160;
--- 141,145 ----
      <xsl:variable name="pages">
    	<xsl:value-of select="/rap/rapForum/numComments div 5"/>
!   	</xsl:variable>  
    <xsl:value-of select="ceiling($pages)"/>
    &#160;Pages &#160; <b> [&#160;
***************
*** 209,215 ****
              <tr>
                  <td>
!                 	<pre>
! 	                    <xsl:value-of select="body"/>
!                     </pre>
                  </td>
              </tr>
--- 194,202 ----
              <tr>
                  <td>
!                 	<div class="PRE">
! 	               	<xsl:call-template name="break">
! 	               		<xsl:with-param name="text" select="body"/>
! 	               	</xsl:call-template>
! 	               </div>
                  </td>
              </tr>
***************
*** 289,293 ****
--- 276,295 ----
  </tr>
  </table>
+ 	                    
+ </xsl:template>
  
+ <xsl:template name="break">
+ 	<xsl:param name="text" select="."/>
+ 	<xsl:choose>
+ 		<xsl:when test="contains($text, '&#xA;')">
+ 			<br/>
+ 			<xsl:call-template name="break">
+ 				<xsl:with-param name="text" select="substring-after($text, '&#xA;')"/>
+ 			</xsl:call-template>
+ 		</xsl:when>
+ 		<xsl:otherwise>
+ 			<xsl:value-of select="$text"/>
+ 		</xsl:otherwise>
+ 	</xsl:choose>
  </xsl:template>
  </xsl:stylesheet>

[Rapforums-developer] src/stylesheets/edu/fullcoll/uportal/channels/rap/forum thread.xml,1.1.1.1,1.2

[Rapforums-developer] src/stylesheets/edu/fullcoll/uportal/channels/rap/forum thread.xml,1.1.1.1,1.2 thread.xsl,1.1.1.1,1.2