From: Tom Gilder Date: Thu, 13 Oct 2005 01:25:55 +0000 (+0000) Subject: (Bug 3690) Allowed wikitext in previewnote, moved to notice X-Git-Tag: 1.6.0~1442 X-Git-Url: http://git.cyclocoop.org/%22.%24match%5B1%5D.%22?a=commitdiff_plain;h=77401697c1941dd465c0fd9d5146affdead74270;p=lhc%2Fweb%2Fwiklou.git (Bug 3690) Allowed wikitext in previewnote, moved to notice --- diff --git a/includes/EditPage.php b/includes/EditPage.php index b233bb9cd3..7a22527e3f 100644 --- a/includes/EditPage.php +++ b/includes/EditPage.php @@ -981,10 +981,9 @@ END wfProfileIn( $fname ); $previewhead = '

' . htmlspecialchars( wfMsg( 'preview' ) ) . "

\n" . - "

" . htmlspecialchars( wfMsg( 'previewnote' ) ) . "

\n"; + "
" . $wgOut->parse( wfMsg( 'previewnote' ) ) . "
\n"; if ( $this->isConflict ) { - $previewhead.='

' . htmlspecialchars( wfMsg( 'previewconflict' ) ) . - "

\n"; + $previewhead.='

' . htmlspecialchars( wfMsg( 'previewconflict' ) ) . "

\n"; } $parserOptions = ParserOptions::newFromUser( $wgUser ); diff --git a/languages/Language.php b/languages/Language.php index 86d610d865..8df507d296 100644 --- a/languages/Language.php +++ b/languages/Language.php @@ -717,7 +717,7 @@ If you are here by mistake, just click your browser's '''back''' button.", 'userjspreview' => "'''Remember that you are only testing/previewing your user JavaScript, it has not yet been saved!'''", 'updated' => '(Updated)', 'note' => 'Note: ', -'previewnote' => 'This is only a preview, changes have not yet been saved!', +'previewnote' => 'This is only a preview; changes have not yet been saved!', 'previewconflict' => 'This preview reflects the text in the upper text editing area as it will appear if you choose to save.', 'editing' => "Editing $1", diff --git a/skins/monobook/main.css b/skins/monobook/main.css index e79a71cf7e..227f918a5c 100644 --- a/skins/monobook/main.css +++ b/skins/monobook/main.css @@ -1178,6 +1178,11 @@ span.changedby { margin-bottom: 1em; } +.previewnote p { + margin: 0; + padding: 0; +} + .editExternally { border: 1px solid gray; background-color: #ffffff;