Revert r52410 (Put the [edit] link after the section header instead of before, and don't right-float it anymore) for now because of unresolved issues

RELEASE-NOTES

@@ -81,15 +81,14 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 14866) Messages 'recentchangeslinked-toolbox' and
   'recentchangeslinked-toolbox' were added to allow more fine grained
   customisation of the user interface
-* DISPLAYTITLE now accepts a limited amount of wiki markup (the single-quote
+* DISPLAYTITLE now accepts a limited amount of wiki markup (the single-quote items)
-  items)
 * Special:Search now could search terms in all variant-forms. ONLY apply on
   wikis with LanguageConverter
-* Add autopromote condition APCOND_BLOCKED to autopromote blocked users to
+* Add autopromote condition APCOND_BLOCKED to autopromote blocked users to various
-  various user groups.
+  user groups.
-* Add $wgRevokePermissions as a means of restricting a group's rights. The
+* Add $wgRevokePermissions as a means of restricting a group's rights. The syntax is
-  syntax is identical to $wgGroupPermissions, but users in these groups will
+  identical to $wgGroupPermissions, but users in these groups will have these rights
-  have these rights stripped from them.
+  stripped from them.
 * Added a PHP port of CDB (constant database), for improved local caching when
   the DBA extension is not available.
 
@@ -190,8 +189,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 18925) history.js removes class names of list elements on initialization
 * Multiple whitespace in TOC anchors is now stripped, for consistency with the
   link from the edit comment
-* (bug 19112) Preferences now respects $wgUseExternalEditor,
+* (bug 19112) Preferences now respects $wgUseExternalEditor, $wgExternalDiffEngine
-  $wgExternalDiffEngine
 * (bug 18173) MediaWiki now fails when unable to determine a client IP
 * (bug 19170) Special:Version should follow the content language direction
 * (bug 19160) maintenance/purgeOldText.inc is now compatible with PostgreSQL
@@ -201,12 +199,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   can add/remove *all* groups (have 'userrights' permission).
 * (bug 19294) Always show Sp-contributions-footer(-anon)
 * Attempts to restrict reading of pages while anonymous viewing is allowed
-  via extensions not using the userCan hook and via $wgRevokePermissions now
+  via extensions not using the userCan hook and via $wgRevokePermissions now work.
-  work.
+* (bug 8445) Multiple-character search terms are now handled properly for Chinese
-* (bug 8445) Multiple-character search terms are now handled properly for
-  Chinese
-* (bug 11270) Put the section [edit] linker after the section header in the HTML
-  instead of before
 
 == API changes in 1.16 ==
 

includes/DefaultSettings.php

@@ -1496,7 +1496,7 @@ $wgCacheEpoch = '20030516000000';
  * to ensure that client-side caches do not keep obsolete copies of global
  * styles.
  */
-$wgStyleVersion = '229';
+$wgStyleVersion = '228';
 
 
 # Server-side caching:

includes/Linker.php

@@ -1268,10 +1268,11 @@ class Linker {
 	 * @return string HTML headline
 	 */
 	public function makeHeadline( $level, $attribs, $anchor, $text, $link, $legacyAnchor = false ) {
-		$ret = "<div class=\"mw-h$level\">"
+		$ret = "<a name=\"$anchor\" id=\"$anchor\"></a>"
-			. "<a name=\"$anchor\" id=\"$anchor\"></a>"
+			. "<h$level$attribs"
-			. "<h$level$attribs$text</h$level>"
+			. $link
-			. "$link </div>";
+			. " <span class=\"mw-headline\">$text</span>"
+			. "</h$level>";
 		if ( $legacyAnchor !== false ) {
 			$ret = "<a name=\"$legacyAnchor\" id=\"$legacyAnchor\"></a>$ret";
 		}

skins/MonoBook.php

@@ -114,7 +114,7 @@ class MonoBookTemplate extends QuickTemplate {
 	<div id="content">
 		<a name="top" id="top"></a>
 		<?php if($this->data['sitenotice']) { ?><div id="siteNotice"><?php $this->html('sitenotice') ?></div><?php } ?>
-		<div class="mw-h1 firstHeading"><h1><?php $this->html('title') ?></h1></div>
+		<h1 id="firstHeading" class="firstHeading"><?php $this->html('title') ?></h1>
 		<div id="bodyContent">
 			<h3 id="siteSub"><?php $this->msg('tagline') ?></h3>
 			<div id="contentSub"><?php $this->html('subtitle') ?></div>

skins/Vector.php

@@ -496,7 +496,7 @@ class VectorTemplate extends QuickTemplate {
 			<?php if($this->data['sitenotice']) { ?><div id="siteNotice"><?php $this->html('sitenotice') ?></div><?php } ?>
 			<!-- /sitenotice -->
 			<!-- firstHeading -->
-			<div class="mw-h1 firstHeading"><h1><?php $this->html('title') ?></h1></div>
+			<h1 id="firstHeading" class="firstHeading"><?php $this->html('title') ?></h1>
 			<!-- /firstHeading -->
 			<!-- bodyContent -->
 			<div id="bodyContent">

skins/chick/IE60Fixes.css

@@ -70,6 +70,7 @@ textarea {
     width: 96%;
 }
 
+div.editsection,
 #catlinks,
 div.tright,
 div.tleft {

skins/chick/main.css

@@ -41,35 +41,33 @@ hr {
     margin: 0.2em 0 0.2em 0;
 }
 
-/* Headers */
+h1, h2, h3, h4, h5, h6 {
-.mw-h1, .mw-h2, .mw-h3, .mw-h4, .mw-h5, .mw-h6 {
+    color: Black;
-	color: black;
+    background: none;
-	background: none;
+    font-weight: normal;
-	margin: 0;
+    margin: 0;
-	border-bottom: 1px solid #aaa;
+    padding-top: 0.5em;
+    padding-bottom: 0.17em;
+    border-bottom: 1px solid #aaaaaa;
 }
-.mw-h3, .mw-h4, .mw-h5, .mw-h6 {
+.editsection {
-	border-bottom: none;
-}
-h1, h2 {
 	font-weight: normal;
 }
 h1 { font-size: 188%; }
+h1 .editsection { font-size: 53.2%; }
 h2 { font-size: 150%; }
+h2 .editsection { font-size: 66.7%; }
+h3, h4, h5, h6 {
+    border-bottom: none;
+    font-weight: bold;
+}
 h3 { font-size: 132%; }
+h3 .editsection { font-size: 75.8%; }
 h4 { font-size: 116%; }
+h4 .editsection { font-size: 86.2%; }
 h5 { font-size: 100%; }
 h6 { font-size: 80%;  }
-
+h6 .editsection { font-size: 125%; }
-/* To replicate the old padding, where h# were block-level elements and edit
- * links were floated, we need to multiply .5em top padding and .17em bottom
- * padding by the header text sizes. */
-.mw-h1 { padding: .94em 0 .32em; } /* (0.5*1.88)em 0 (0.17*1.88)em */
-.mw-h2 { padding: .75em 0 .26em; } /* (0.5*1.50)em 0 (0.17*1.50)em */
-.mw-h3 { padding: .66em 0 .22em; } /* etc. */
-.mw-h4 { padding: .58em 0 .20em; }
-.mw-h5 { padding: .50em 0 .17em; }
-.mw-h6 { padding: .40em 0 .14em; }
 
 ul {
     line-height: 1.5em;

skins/common/cologneblue.css

@@ -83,6 +83,7 @@ h1 {
  font-family: Verdana, Arial, sans-serif;
  font-size: 180%; line-height: 21pt;
 }
+h1 .editsection { font-size: 55.6%; }
 h1.pagetitle { padding-bottom: 0; margin-bottom: 0; }
 #article p.subtitle {
  color: #666666; font-size: 11pt; font-weight: bold;
@@ -95,6 +96,6 @@ a:visited { color: #8D0749; }
 a.printable { text-decoration: underline; }
 a.stub, #quickbar a.stub { color:#772233; text-decoration:none; }
 a.new, #quickbar a.new { color: #CC2200; }
-.mw-h2, .mw-h3, .mw-h4, .mw-h5, .mw-h6 { margin-bottom: 0; }
+h2, h3, h4, h5, h6 { margin-bottom: 0; }
 small { font-size: 75%; }
 input.mw-searchInput { width: 106px; }

skins/common/common_rtl.css

@@ -18,6 +18,10 @@ fieldset.operaprefsection {
     margin-right: 1.4em;
     margin-left: 0.4em;
 }
+.editsection {
+	float: left;
+	margin-right: 5px;
+}
 div.tright, div.floatright {
 	clear: none;
 }

skins/common/oldshared.css

@@ -4,6 +4,28 @@
  * CologneBlue, the old pre-Monobook skins
  */
 
+/* For clarity, explicitly state some recommendations from <http://www.w3.org/
+   TR/CSS21/sample.html> to make sure the editsection links scale right */
+
+h1 { font-size: 2em; }
+h2 { font-size: 1.5em; }
+h3 { font-size: 1.17em; }
+h5 { font-size: .83em; }
+h6 { font-size: .75em; }
+h1, h2, h3, h4, h5, h6 { font-weight: bolder }
+
+/* Now the custom parts */
+
+/* Make edit sections (which are inside h# tags) normal-sized */
+.editsection {
+	font-weight: normal;
+}
+h1 .editsection { font-size: 50% }
+h2 .editsection { font-size: 66.7% }
+h3 .editsection { font-size: 85.5% }
+h5 .editsection { font-size: 120% }
+h6 .editsection { font-size: 133% }
+
 #footer { clear: both }
 /* images */
 div.floatright { float: right; clear: right; margin: 0 0 1em 1em; }

skins/common/shared.css

@@ -23,6 +23,12 @@ div#mw-js-message {
 	background-color: #fcfcfc;
 }
 
+/* Edit section links */
+.editsection {
+	float: right;
+	margin-left: 5px;
+}
+
 /**
  * File histories
  */

skins/common/wikistandard.css

@@ -27,12 +27,18 @@ textarea { overflow: auto; }
 
 h1.pagetitle { padding-top: 0; margin-top: 0; padding-bottom: 0; margin-bottom: 0;
 font-size:150%; }
+h1.pagetitle .editsection { font-size: 66.7%; }
 h2 { font-size: 120%; }
+h2 .editsection { font-size: 83.3%; }
 h2, h3, h4, h5, h6 { margin-bottom: 0;}
 h3 { font-size: 106.25%; }
+h3 .editsection { font-size: 94.1%; }
 h4 { font-size: 103.125%; }
+h4 .editsection { font-size: 97.0%; }
 h5 { font-size: 100%; }
+h5 .editsection { font-size: 100%; }
 h6 { font-size: 95%; }
+h6 .editsection { font-size: 105.3%; }
 hr.sep { color:gray;height:1px;background-color:gray;}
 p.subpages { font-size:small;}
 p.subtitle { padding-top: 0; margin-top: 0;}

skins/modern/rtl.css

@@ -3,6 +3,12 @@ body {
 	unicode-bidi: embed;
 }
 
+.editsection {
+	float: left;
+	margin-right: 5px;
+	margin-left: 0; /* bug 9122: undo default LTR */
+}
+
 /* Fix alignment */
 .documentByLine,
 .portletDetails,

skins/monobook/IE60Fixes.css

@@ -85,6 +85,7 @@ textarea {
 	width: 96%;
 }
 
+div.editsection,
 #catlinks,
 div.tright,
 div.tleft {

skins/monobook/IE70Fixes.css

@@ -69,6 +69,7 @@ textarea {
 }
 
 /*
+div.editsection,
 #catlinks,
 div.tright,
 div.tleft {

skins/monobook/main.css

@@ -112,33 +112,31 @@ hr {
 	margin: .2em 0 .2em 0;
 }
 
-/* Headers */
+h1, h2, h3, h4, h5, h6 {
-.mw-h1, .mw-h2, .mw-h3, .mw-h4, .mw-h5, .mw-h6 {
 	color: black;
 	background: none;
+	font-weight: normal;
 	margin: 0;
+	padding-top: .5em;
+	padding-bottom: .17em;
 	border-bottom: 1px solid #aaa;
 }
-.mw-h3, .mw-h4, .mw-h5, .mw-h6 {
-	border-bottom: none;
-}
-h1, h2 { font-weight: normal; }
 h1 { font-size: 188%; }
+h1 .editsection { font-size: 53%; }
 h2 { font-size: 150%; }
+h2 .editsection { font-size: 67%; }
+h3, h4, h5, h6 {
+	border-bottom: none;
+	font-weight: bold;
+}
 h3 { font-size: 132%; }
+h3 .editsection { font-size: 76%; font-weight: normal; }
 h4 { font-size: 116%; }
+h4 .editsection { font-size: 86%; font-weight: normal; }
 h5 { font-size: 100%; }
+h5 .editsection { font-weight: normal; }
 h6 { font-size: 80%;  }
-
+h6 .editsection { font-size: 125%; font-weight: normal; }
-/* To replicate the old padding, where h# were block-level elements and edit
- * links were floated, we need to multiply .5em top padding and .17em bottom
- * padding by the header text sizes. */
-.mw-h1 { padding: .94em 0 .32em; } /* (0.5*1.88)em 0 (0.17*1.88)em */
-.mw-h2 { padding: .75em 0 .26em; } /* (0.5*1.50)em 0 (0.17*1.50)em */
-.mw-h3 { padding: .66em 0 .22em; } /* etc. */
-.mw-h4 { padding: .58em 0 .20em; }
-.mw-h5 { padding: .50em 0 .17em; }
-.mw-h6 { padding: .40em 0 .14em; }
 
 ul {
 	line-height: 1.5em;

skins/monobook/rtl.css

@@ -40,6 +40,11 @@ html > body .portlet {
 	float: right;
 	clear: right;
 }
+.editsection {
+	float: left;
+	margin-right: 5px;
+	margin-left: 0; /* bug 9122: undo default LTR */
+}
 /* recover IEMac (might be fine with the float, but usually it's close to IE */
 *>body .portlet {
 	float: none;

skins/simple/main.css

@@ -1,3 +1,26 @@
+/* For clarity, explicitly state some recommendations from <http://www.w3.org/
+   TR/CSS21/sample.html> to make sure the editsection links scale right */
+
+h1 { font-size: 2em; }
+h2 { font-size: 1.5em; }
+h3 { font-size: 1.17em; }
+h5 { font-size: .83em; }
+h6 { font-size: .75em; }
+h1, h2, h3, h4, h5, h6 { font-weight: bolder }
+
+/* Now the custom parts */
+
+/* Make edit sections (which are inside h# tags) normal-sized */
+.editsection {
+	font-weight: normal;
+}
+h1 .editsection { font-size: 50% }
+h2 .editsection { font-size: 66.7% }
+h3 .editsection { font-size: 85.5% }
+h5 .editsection { font-size: 120% }
+h6 .editsection { font-size: 133% }
+
+
 #toolbar {
   display: none;
 }
@@ -63,22 +86,11 @@ p {
 }
 p img { margin: 0; }
 
-.mw-h1, .mw-h2, .mw-h3, .mw-h4, .mw-h5, .mw-h6 {
+h1, h2, h3, h4, h5, h6 {
-	margin: 0;
+    margin: 0;
+    padding-top: 0.5em;
+    padding-bottom: 0.17em;
 }
-/* To replicate the old padding, where h# were block-level elements and edit
- * links were floated, we need to multiply .5em top padding and .17em bottom
- * padding by the header text sizes.  We assume the W3 recommendations are
- * used: 200%, 150%, 117%, 100%, 83%, 75% size in that order
- * <http://www.w3.org/TR/CSS21/sample.html>.  If not the padding may be margin-
- * ally off. */
-.mw-h1 { padding: .94em 0 .32em; } /* (0.5*1.88)em 0 (0.17*1.88)em */
-.mw-h2 { padding: .75em 0 .26em; } /* (0.5*1.50)em 0 (0.17*1.50)em */
-.mw-h3 { padding: .66em 0 .22em; } /* etc. */
-.mw-h4 { padding: .58em 0 .20em; }
-.mw-h5 { padding: .50em 0 .17em; }
-.mw-h6 { padding: .40em 0 .14em; }
-
 fieldset {
     margin: 1em 0em 1em 0em;
     padding: 0em 1em 1em 1em;
@@ -183,7 +195,7 @@ pre {
   border: solid 1px black;
 }
 
-.firstHeading, .mw-h2 {
+h1.firstHeading, h2 {
   border-bottom: solid 1px black;
 }
 #bodyContent a[href ^="http://"],
@@ -371,5 +383,10 @@ table.collapsed tr.collapsable {
 	display: none;
 }
 
+.editsection {
+	float: right;
+	margin-left: 5px;
+}
+
 .templatesUsed { margin-top: 1.5em; }
 

skins/simple/rtl.css

@@ -40,6 +40,11 @@ html>body .portlet {
 	float: right;
 	clear: right;
 }
+.editsection {
+	float: left;
+	margin-right: 5px;
+	margin-left: 0; /* bug 9122: undo default LTR */
+}
 /* recover IEMac (might be fine with the float, but usually it's close to IE */
 *>body .portlet {
 	float: none;

skins/vector/main.css

@@ -593,38 +593,45 @@ hr {
 }
 
 /* Structural Elements */
-.mw-h1,
+h1,
-.mw-h2,
+h2,
-.mw-h3,
+h3,
-.mw-h4,
+h4,
-.mw-h5,
+h5,
-.mw-h6 {
+h6 {
 	color: black;
 	background: none;
+	font-weight: normal;
 	margin: 0;
+	padding-top: .5em;
+	padding-bottom: .17em;
 	border-bottom: 1px solid #aaa;
 	width: auto;
 }
-.mw-h3, .mw-h4, .mw-h5, .mw-h6 {
-	border-bottom: none;
-}
-h1, h2 { font-weight: normal; }
 h1 { font-size: 188%; }
+h1 .editsection { font-size: 53%; }
 h2 { font-size: 150%; }
+h2 .editsection { font-size: 67%; }
+h3,
+h4,
+h5,
+h6 {
+	border-bottom: none;
+	font-weight: bold;
+}
 h3 { font-size: 132%; }
+h3 .editsection { font-size: 76%; font-weight: normal; }
 h4 { font-size: 116%; }
+h4 .editsection { font-size: 86%; font-weight: normal; }
 h5 { font-size: 100%; }
+h5 .editsection { font-weight: normal; }
 h6 { font-size: 80%;  }
-/* To replicate the old padding, where h# were block-level elements and edit
+h6 .editsection { font-size: 125%; font-weight: normal; }
- * links were floated, we need to multiply .5em top padding and .17em bottom
+body.rtl .editsection {
- * padding by the header text sizes. */
+	float: left;
-.mw-h1 { padding: .94em 0 .32em; } /* (0.5*1.88)em 0 (0.17*1.88)em */
+	margin-right: 5px;
-.mw-h2 { padding: .75em 0 .26em; } /* (0.5*1.50)em 0 (0.17*1.50)em */
+	margin-left: 0; /* bug 9122: undo default LTR */
-.mw-h3 { padding: .66em 0 .22em; } /* etc. */
+}
-.mw-h4 { padding: .58em 0 .20em; }
-.mw-h5 { padding: .50em 0 .17em; }
-.mw-h6 { padding: .40em 0 .14em; }
-
 p {
 	margin: .4em 0 .5em 0;
 	line-height: 1.5em;