(bug 18438) Tweak HTML for preview bar for consistency and accessibility (patch contr...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index a3c3397..8be866e 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -127,6 +127,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 16912) Tooltips on images with link= disappear
 * (bug 18389) Localise numbers in EXIF data
 * (bug 18522) Wrap MediaWiki:Protect-cascadeon in a div for identification
+* (bug 18438) Tweak HTML for preview bar for consistency and accessibility
 
 == API changes in 1.16 ==
 

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 0c146d5..dcc4c0e 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1479,7 +1479,7 @@ $wgCacheEpoch = '20030516000000';
  * to ensure that client-side caches don't keep obsolete copies of global
  * styles.
  */
-$wgStyleVersion = '218';
+$wgStyleVersion = '219';
 
 
 # Server-side caching:

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 16230f5..f3ef632 100644 (file)
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -1797,12 +1797,16 @@ END
                        }
                }
 
-               $previewhead = '<h2>' . htmlspecialchars( wfMsg( 'preview' ) ) . "</h2>\n" .
-                       "<div class='previewnote'>" . $wgOut->parse( $note ) . "</div>\n";
-               if ( $this->isConflict ) {
-                       $previewhead .='<h2>' . htmlspecialchars( wfMsg( 'previewconflict' ) ) . "</h2>\n";
+               if( $this->isConflict ) {
+                       $conflict = '<h2 id="mw-previewconflict">' . htmlspecialchars( wfMsg( 'previewconflict' ) ) . "</h2>\n";
+               } else {
+                       $conflict = '<hr />';
                }
 
+               $previewhead = "<div class='previewnote'>\n" .
+                       '<h2 id="mw-previewheader">' . htmlspecialchars( wfMsg( 'preview' ) ) . "</h2>" .
+                       $wgOut->parse( $note ) . $conflict . "</div>\n";
+
                wfProfileOut( __METHOD__ );
                return $previewhead . $previewHTML;
        }

diff --git a/skins/monobook/main.css b/skins/monobook/main.css
index a8213e9..f430349 100644 (file)
--- a/skins/monobook/main.css
+++ b/skins/monobook/main.css
@@ -1242,16 +1242,13 @@ span.changedby {
 }
 
 .previewnote {
-       text-indent: 3em;
        color: #c00;
-       border-bottom: 1px solid #aaa;
-       padding-bottom: 1em;
        margin-bottom: 1em;
 }
 
 .previewnote p {
-       margin: 0;
-       padding: 0;
+       text-indent: 3em;
+       margin: 0.8em 0;
 }
 
 .editExternally {