[CS-Project-svn_notify] SF.net SVN: cs-project: [686] trunk

[<cra...@us...>]

Revision: 686
          http://cs-project.svn.sourceforge.net/cs-project/?rev=686&view=rev
Author:   crazedsanity
Date:     2007-11-23 13:34:48 -0800 (Fri, 23 Nov 2007)

Log Message:
-----------
Fix note display to be unified (hopefully).

Modified Paths:
--------------
    trunk/includes/content/helpdesk.inc
    trunk/includes/extern/helpdesk.inc
    trunk/templates/content/project/view/related_note.content.tmpl

Modified: trunk/includes/content/helpdesk.inc
===================================================================
--- trunk/includes/content/helpdesk.inc	2007-11-23 21:26:18 UTC (rev 685)
+++ trunk/includes/content/helpdesk.inc	2007-11-23 21:34:48 UTC (rev 686)
@@ -370,8 +370,6 @@
 			$baseRow = $page->templateRows['issueNotes'];
 			foreach($myNotes as $repArr) {
 				$repArr['body'] = $bbCodeParser->parseString($repArr['body']);
-				$repArr['body'] = preg_replace('/\s\s/', '  ', $repArr['body']);
-				$repArr['body'] = preg_replace('/\S\s\s/', '  ', $repArr['body']);
 				
 				$repArr['subject'] = cleanString($repArr['subject'], "htmlentity_plus_brackets");
 		

Modified: trunk/includes/extern/helpdesk.inc
===================================================================
--- trunk/includes/extern/helpdesk.inc	2007-11-23 21:26:18 UTC (rev 685)
+++ trunk/includes/extern/helpdesk.inc	2007-11-23 21:34:48 UTC (rev 686)
@@ -149,7 +149,6 @@
 		#$helpdeskData['subject'] = wordwrap($helpdeskData['subject'], FORMAT_WORDWRAP);
 		$helpdeskData['subject'] = cleanString($helpdeskData['subject'], "htmlentity_plus_brackets");
 		$helpdeskData['subject'] = $bbCodeParser->parseString($helpdeskData['subject'], TRUE);
-		$helpdeskData['subject'] = preg_replace('/\s\s/', '  ', $helpdeskData['subject']);
 		$helpdeskData['subject'] = preg_replace('/\S\s\s/', '  ', $helpdeskData['subject']);
 		
 		//add everything to the page as a template var...

Modified: trunk/templates/content/project/view/related_note.content.tmpl
===================================================================
--- trunk/templates/content/project/view/related_note.content.tmpl	2007-11-23 21:26:18 UTC (rev 685)
+++ trunk/templates/content/project/view/related_note.content.tmpl	2007-11-23 21:34:48 UTC (rev 686)
@@ -9,7 +9,7 @@
 	<td width="100%"><a href="/content/notes/view?ID=%%id%%"><img src="/images/pixel_blue.gif" alt="" border="0" width="7"></a>
 	<a name="note_%%id%%"></a>
 	<a href="/content/notes/view?ID=%%id%%" target="_top"> <u>[%%updated%%: <b>%%fname%% %%lname%%</b>]</u> &nbsp;%%subject%%</a><BR>
-	<pre style="text-decoration:normal;font-size:10pt;">%%body%%</pre></td>
+	<code style="text-decoration:normal;font-size:10pt;">%%body%%</code></td>
 </tr>
 <!-- END related_note_row -->
 		


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.