- web: make [pre] work similar to [code]. fixes #798

Note: I had to move [pre] to the top of the
    preg list to make this work.  Not sure why.


svn path=/trunk/boinc/; revision=18285
This commit is contained in:
David Anderson 2009-06-03 23:00:43 +00:00
parent 8cd8f99bef
commit c127a5c355
3 changed files with 20 additions and 2 deletions

View File

@ -5018,3 +5018,14 @@ David 3 June 2009
client/
cs_statefile.cpp
David 3 June 2009
- web: make [pre] work similar to [code]. fixes #798
Note: I had to move [pre] to the top of the
preg list to make this work. Not sure why.
html/
inc/
text_transform.inc
user/
main.css

View File

@ -108,6 +108,7 @@ function bb2html($text) {
$httpsregex = "(?:\"?)https\:\/\/([^\[\"<\ ]+)(?:\"?)";
// List of allowable tags
$bbtags = array (
"@\[pre\](.*?)\[/pre\]@eis",
"@\[code\](.*?)\[/code\]@eis",
"@\[b\](.*?)\[/b\]@is",
"@\[i\](.*?)\[/i\]@is",
@ -122,7 +123,6 @@ function bb2html($text) {
"@\[quote\](.*?)\[/quote\]@is",
"@\[list\](.*?)\[/list\]@is",
"@\[list=1\](.*?)\[/list\]@is",
"@\[pre\](.*?)\[/pre\]@eis",
"@\[img\]$urlregex\[/img\]@is",
"@\[color=(?:\"?)(.{3,8})(?:\"?)\](.*?)\[/color\]@is",
"@((?:<ol>|<ul>).*?)\n\*([^\n]+)\n(.*?(</ol>|</ul>))@is",
@ -139,6 +139,7 @@ function bb2html($text) {
// What the above tags are turned in to
$htmltags = array (
"'<div class=\"pre\">'.stop_recursion('\\1').'</div>'",
"'<div class=\"code\">'.stop_recursion('\\1').'</div>'",
"<b>\\1</b>",
"<i>\\1</i>",
@ -153,7 +154,6 @@ function bb2html($text) {
"<blockquote class='postbody'>\\1</blockquote>",
"<ul>\\1</ul><p>",
"<ol>\\1</ol><p>",
"'<pre>'.remove_br('\\1').'</pre>'",
"<img src=\"http://\\2\">",
"<font color=\"\\1\">\\2</font>",
"\\1<li>\\2\n\\3",

View File

@ -373,6 +373,13 @@ span.inboxunread {
white-space: nowrap;
}
div.pre {
font-family: "Courier New", courier, monospace;
display: block;
white-space: nowrap;
overflow: auto;
}
.code {
font-family: "Courier New", courier, monospace;
display: block;