srchub-old Commit Details

Date:

2014-03-24 22:10:00 (10 years 6 months ago)

Author:

Natalie Adams

Branch:

default

Commit:

1c4b0c50f37f

Parents:

7d92c7ed8bd9

Message:

Updating css for word wrapping syntaxhighlighting

Updating issues with syntaxhighlighting and html tags

Changes:

M	indefero/src/IDF/FileUtil.php (1 diff)
M	indefero/www/media/idf/css/syntaxhighlight/shCore.css (1 diff)

File differences

-84
85 85
86 86
87 
88 
87
88
89
90
89 91
90 92
91 93
+            $ext = self::$map[$fileinfo[2]];␊
        else␊
            $ext = "text";␊
␊
        $content = '<div id="highlight"><script type="syntaxhighlighter" class="brush: ' . $ext . '">' . $content . '</script></div>';␊
        if ($ext == "php" || $ext == "html" || $ext == "htm" || $ext == "js")␊
            $content = '<div id="highlight"><pre class="brush: ' . $ext . '">' . str_replace("<", "&lt;", $content)  . '</pre></div>';␊
        else␊
            $content = '<div id="highlight"><script type="syntaxhighlighter" class="brush: ' . $ext . '">' . $content . '</script></div>';␊
        return  Pluf_Template::markSafe($content);␊
    }␊
␊
             $ext = self::$map[$fileinfo[2]];␊
         else␊
             $ext = "text";␊
-␊
-        $content = '<div id="highlight"><script type="syntaxhighlighter" class="brush: ' . $ext . '">' . $content . '</script></div>';␊
+        if ($ext == "php" || $ext == "html" || $ext == "htm" || $ext == "js")␊
+            $content = '<div id="highlight"><pre class="brush: ' . $ext . '">' . str_replace("<", "&lt;", $content)  . '</pre></div>';␊
+        else␊
+            $content = '<div id="highlight"><script type="syntaxhighlighter" class="brush: ' . $ext . '">' . $content . '</script></div>';␊
         return  Pluf_Template::markSafe($content);␊
     }␊
 ␊

-261
262 262
263 263
264 
264
265
266
267
268
+␊
/* Strings */␊
.syntaxhighlighter .asmstring␊
{ color: #b0002d; font-weight: normal !important; }
{ color: #b0002d; font-weight: normal !important; }␊
␊
body .syntaxhighlighter .line {␊
    white-space: pre-wrap !important; /* make code wrap */␊
}
 ␊
 /* Strings */␊
 .syntaxhighlighter .asmstring␊
-{ color: #b0002d; font-weight: normal !important; }
+{ color: #b0002d; font-weight: normal !important; }␊
+␊
+body .syntaxhighlighter .line {␊
+    white-space: pre-wrap !important; /* make code wrap */␊
+}