Merge branch 'MDL-41646' of git://github.com/apsdehal/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 18 Feb 2014 04:40:56 +0000 (12:40 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 18 Feb 2014 04:40:56 +0000 (12:40 +0800)
mod/wiki/pagelib.php
mod/wiki/styles.css

index c815398..79bd3ac 100644 (file)
@@ -1045,7 +1045,7 @@ class page_wiki_preview extends page_wiki_edit {
             }
             $parseroutput = wiki_parse_content($data->contentformat, $text, $options);
             $this->set_newcontent($text);
-            echo $OUTPUT->notification(get_string('previewwarning', 'wiki'), 'notifyproblem wiki_info');
+            echo $OUTPUT->notification(get_string('previewwarning', 'wiki'), 'notifyproblem');
             $content = format_text($parseroutput['parsed_text'], FORMAT_HTML, array('overflowdiv'=>true, 'filter'=>false));
             echo $OUTPUT->box($content, 'generalbox wiki_previewbox');
             $content = $this->newcontent;
index c752d3f..d028184 100644 (file)
     border: thin solid blue;
 }
 
-.wiki_info {
-    color: darkred;
-    text-decoration: underline;
-}
-
 .wiki_button {
     margin: 5px;
 }