* (bug 4525) Move section links down to same level as headings (editsection links...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index b3e037f..b1bfd49 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -42,6 +42,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 6918) Stopped borders and backgrounds from showing through floated
   tables in Monobook
 * (bug 6868) Un-hardcode section edit link style
+* (bug 4525) Move section links down to same level as headings (editsection
+  links are now inside the h# elements)
 
 == Languages updated ==
 

diff --git a/includes/Linker.php b/includes/Linker.php
index bc5fb64..53deb39 100644 (file)
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -1046,11 +1046,11 @@ class Linker {
                $editurl = '&section='.$section;
                $url = $this->makeKnownLinkObj( $title, wfMsg('editsection'), 'action=edit'.$editurl );
 
-               return "<div class=\"editsection\">[".$url."]</div>";
+               return "<span class=\"editsection\">[".$url."]</span>";
 
        }
 
-       /** 
+       /**
         * @param $title Title object.
         * @param $section Integer: section number.
         * @param $hint Link String: title, or default if omitted or empty
@@ -1062,7 +1062,7 @@ class Linker {
                $hint = ( $hint=='' ) ? '' : ' title="' . wfMsgHtml( 'editsectionhint', htmlspecialchars( $hint ) ) . '"';
                $url = $this->makeKnownLinkObj( $nt, wfMsg('editsection'), 'action=edit'.$editurl, '', '', '',  $hint );
 
-               return "<div class=\"editsection\">[".$url."]</div>";
+               return "<span class=\"editsection\">[".$url."]</span>";
        }
 
        /**

diff --git a/includes/Parser.php b/includes/Parser.php
index cd2cb4f..05538e9 100644 (file)
--- a/includes/Parser.php
+++ b/includes/Parser.php
@@ -3501,6 +3501,9 @@ class Parser
                        if( $enoughToc && ( !isset($wgMaxTocLevel) || $toclevel<$wgMaxTocLevel ) ) {
                                $toc .= $sk->tocLine($anchor, $tocline, $numbering, $toclevel);
                        }
+                       # give headline the correct <h#> tag
+                       @$head[$headlineCount] .= "<a name=\"$anchor\"></a><h".$level.$matches[2][$headlineCount];
+
                        if( $showEditLink && ( !$istemplate || $templatetitle !== "" ) ) {
                                if ( empty( $head[$headlineCount] ) ) {
                                        $head[$headlineCount] = '';
@@ -3510,9 +3513,7 @@ class Parser
                                else
                                        $head[$headlineCount] .= $sk->editSectionLink($this->mTitle, $sectionCount+1, $headline_hint);
                        }
-
-                       # give headline the correct <h#> tag
-                       @$head[$headlineCount] .= "<a name=\"$anchor\"></a><h".$level.$matches[2][$headlineCount] .$headline.'</h'.$level.'>';
+                        $head[$headlineCount] .= $headline.'</h'.$level.'>';
 
                        $headlineCount++;
                        if( !$istemplate )

diff --git a/skins/chick/main.css b/skins/chick/main.css
index 5d3d15b..8c117fa 100644 (file)
--- a/skins/chick/main.css
+++ b/skins/chick/main.css
@@ -50,16 +50,26 @@ h1, h2, h3, h4, h5, h6 {
     padding-bottom: 0.17em;
     border-bottom: 1px solid #aaaaaa;
 }
+.editsection {
+       font-weight: normal;
+       float: right;
+       margin-left: 5px;
+}
 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%; }
 
 ul {
     line-height: 1.5em;

diff --git a/skins/common/cologneblue.css b/skins/common/cologneblue.css
index 33c12ab..d108264 100644 (file)
--- a/skins/common/cologneblue.css
+++ b/skins/common/cologneblue.css
@@ -78,8 +78,9 @@ td.bottom {
 h1 {
  color: #666666;
  font-family: Verdana, Arial, sans-serif;
- font-size: 18pt; font-weight: bold; line-height: 21pt;
+ 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;

diff --git a/skins/common/common.css b/skins/common/common.css
index 57619f0..bcc5263 100644 (file)
--- a/skins/common/common.css
+++ b/skins/common/common.css
@@ -2,6 +2,31 @@
  * common.css
  * This file contains CSS settings common to Wikistandard, Nostalgia and CologneBlue
  */
+
+/* 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;
+       float: right;
+       margin-left: 5px;
+}
+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; margin: 0 0 1em 1em; }
@@ -314,11 +339,6 @@ li span.deleted {
        font-style: italic;
 }
 
-div.editsection {
-       float: right;
-       margin-left: 5px;
-}
-
 /* Classes for EXIF data display */
 table.mw_metadata {
        margin-left: 0.5em;

diff --git a/skins/common/commonPrint.css b/skins/common/commonPrint.css
index 7dcb570..36e08c7 100644 (file)
--- a/skins/common/commonPrint.css
+++ b/skins/common/commonPrint.css
@@ -130,7 +130,10 @@ ul {
 
 h1, h2, h3, h4, h5, h6
 {
-    font-weight: bold;
+       font-weight: bold;
+}
+.editsection {
+       font-weight: normal;
 }
 
 p, .documentDescription {

diff --git a/skins/common/common_rtl.css b/skins/common/common_rtl.css
index a5ba2d7..20c7813 100644 (file)
--- a/skins/common/common_rtl.css
+++ b/skins/common/common_rtl.css
@@ -13,7 +13,7 @@ fieldset.operaprefsection {
     margin-right: 1.4em;
     margin-left: 0.4em;
 }
-div.editsection {
+.editsection {
        float: left;
        margin-right: 5px;
 }
\ No newline at end of file

diff --git a/skins/common/wikistandard.css b/skins/common/wikistandard.css
index 3985f1d..bf96845 100644 (file)
--- a/skins/common/wikistandard.css
+++ b/skins/common/wikistandard.css
@@ -29,12 +29,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;}

diff --git a/skins/monobook/main.css b/skins/monobook/main.css
index 6b57ed9..78c9a4a 100644 (file)
--- a/skins/monobook/main.css
+++ b/skins/monobook/main.css
@@ -119,17 +119,23 @@ h1, h2, h3, h4, h5, h6 {
        border-bottom: 1px solid #aaa;
 }
 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; }
 
-div.editsection {
+.editsection {
        float: right;
        margin-left: 5px;
 }

diff --git a/skins/monobook/rtl.css b/skins/monobook/rtl.css
index bf88e43..f4a6768 100644 (file)
--- a/skins/monobook/rtl.css
+++ b/skins/monobook/rtl.css
@@ -41,7 +41,7 @@ html>body .portlet {
        float: right;
        clear: right;
 }
-div.editsection {
+.editsection {
        float: left;
        margin-right: 5px;
 }

diff --git a/skins/simple/main.css b/skins/simple/main.css
index d55552f..c0f34e9 100644 (file)
--- a/skins/simple/main.css
+++ b/skins/simple/main.css
@@ -1,3 +1,29 @@
+/* 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
+   and otherwise format */
+.editsection {
+       font-weight: normal;
+       float: right;
+       margin-left: 5px;
+}
+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;
 }