[CS-Project-svn_notify] SF.net SVN: cs-project: [665] trunk
Brought to you by:
crazedsanity
From: <cra...@us...> - 2007-11-21 20:52:01
|
Revision: 665 http://cs-project.svn.sourceforge.net/cs-project/?rev=665&view=rev Author: crazedsanity Date: 2007-11-21 12:51:59 -0800 (Wed, 21 Nov 2007) Log Message: ----------- More formatting of issue body & notes. Modified Paths: -------------- trunk/includes/content/helpdesk.inc trunk/includes/extern/helpdesk.inc trunk/templates/extern/helpdesk/view.content.tmpl Modified: trunk/includes/content/helpdesk.inc =================================================================== --- trunk/includes/content/helpdesk.inc 2007-11-21 20:34:21 UTC (rev 664) +++ trunk/includes/content/helpdesk.inc 2007-11-21 20:51:59 UTC (rev 665) @@ -247,7 +247,7 @@ $page->add_template_var("select_category_list", $categoryList); //convert the returned data into htmlentities so brackets show properly. - $helpdeskData['subject'] = $bbCodeParser->parseString(cleanString($helpdeskData['subject'], "htmlentity_plus_brackets"), TRUE); + $helpdeskData['subject'] = $bbCodeParser->parseString(cleanString($helpdeskData['subject'], "htmlentity_plus_brackets")); $helpdeskData['subject'] = preg_replace('/\s\s/', ' ', $helpdeskData['subject']); $helpdeskData['subject'] = preg_replace('/\S\s\s/', ' ', $helpdeskData['subject']); Modified: trunk/includes/extern/helpdesk.inc =================================================================== --- trunk/includes/extern/helpdesk.inc 2007-11-21 20:34:21 UTC (rev 664) +++ trunk/includes/extern/helpdesk.inc 2007-11-21 20:51:59 UTC (rev 665) @@ -146,8 +146,9 @@ unset($helpdeskData['notes']); //make the wrapping SANE. - $helpdeskData['subject'] = wordwrap($helpdeskData['subject'], FORMAT_WORDWRAP); - $helpdeskData['subject'] = $bbCodeParser->parseString($helpdeskData['subject'], TRUE); + #$helpdeskData['subject'] = wordwrap($helpdeskData['subject'], FORMAT_WORDWRAP); + $helpdeskData['subject'] = cleanString($helpdeskData['subject'], "htmlentity_plus_brackets"); + $helpdeskData['subject'] = $bbCodeParser->parseString($helpdeskData['subject']); $helpdeskData['subject'] = preg_replace('/\s\s/', ' ', $helpdeskData['subject']); $helpdeskData['subject'] = preg_replace('/\S\s\s/', ' ', $helpdeskData['subject']); @@ -179,7 +180,7 @@ $baseRow = $page->templateRows['issueNotes']; foreach($myNotes as $repArr) { $repArr['body'] = cleanString($repArr['body'], "htmlentity_plus_brackets"); - $repArr['body'] = $bbCodeParser->parseString($repArr['body'], TRUE); + $repArr['body'] = $bbCodeParser->parseString($repArr['body'], FALSE); $repArr['body'] = preg_replace('/\s\s/', ' ', $repArr['body']); $repArr['body'] = preg_replace('/\S\s\s/', ' ', $repArr['body']); Modified: trunk/templates/extern/helpdesk/view.content.tmpl =================================================================== --- trunk/templates/extern/helpdesk/view.content.tmpl 2007-11-21 20:34:21 UTC (rev 664) +++ trunk/templates/extern/helpdesk/view.content.tmpl 2007-11-21 20:51:59 UTC (rev 665) @@ -43,7 +43,8 @@ <th style="border-bottom:solid #000 1px;" align="right">Notes:<BR><font size="-3"><i>(Includes previous/current<BR>solution(s), if available)</i></font></th> <td style="border-bottom:solid #000 1px;" colspan="2"> <!-- BEGIN issueNotes --><div style="border-top:dashed #000 1px;">%%solutionIndicator%% <u> [#%%note_id%%] <b>%%subject%%</b> (%%fname%%@%%created%%)</u></div> - <div style="width:100%; overflow:auto"><code style="font-size:10px;">%%body%%</code></div> + + <BR><div style="width:100%; overflow:auto"><code style="font-size:10px;">%%body%%</code></div> <!-- END issueNotes --> </td> </tr> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |