Merge branch 'MDL-41646' of git://github.com/apsdehal/moodle

This commit is contained in:
Damyon Wiese 2014-02-18 12:40:56 +08:00
commit 62f641efd3
2 changed files with 1 additions and 6 deletions

View 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;

View File

@ -48,11 +48,6 @@
border: thin solid blue;
}
.wiki_info {
color: darkred;
text-decoration: underline;
}
.wiki_button {
margin: 5px;
}