From: Leo Koppelkamm Date: Thu, 28 Jul 2011 12:26:04 +0000 (+0000) Subject: Redo r93284 ( Make editsection link more understandable by positioning it directly... X-Git-Tag: 1.31.0-rc.0~28563 X-Git-Url: http://git.cyclocoop.org/%24href?a=commitdiff_plain;h=0b182044d743b52d80de94da5d36d3c7e13d1595;p=lhc%2Fweb%2Fwiklou.git Redo r93284 ( Make editsection link more understandable by positioning it directly left ( RTL: right ) of the title ) in a more simple way and also include parserTests and release notes this time --- diff --git a/RELEASE-NOTES-1.19 b/RELEASE-NOTES-1.19 index c2f47fcb59..3b810cd0fb 100644 --- a/RELEASE-NOTES-1.19 +++ b/RELEASE-NOTES-1.19 @@ -29,6 +29,7 @@ production. until the second was introduced in 1.17. * (bug 25355) Parser generates edit section links for special pages * (bug 13766) Change table of content syntax to be semantically correct +* (bug 11270 & bug 11555) Make editsection link more understandable by positioning it next to the header. === API changes in 1.19 === * (bug 19838) siprop=interwikimap can now use the interwiki cache. diff --git a/includes/Linker.php b/includes/Linker.php index 525a6fad5a..bb2a0148bc 100644 --- a/includes/Linker.php +++ b/includes/Linker.php @@ -1507,8 +1507,8 @@ class Linker { */ public static function makeHeadline( $level, $attribs, $anchor, $text, $link, $legacyAnchor = false ) { $ret = "$text " . $link - . " $text" . ""; if ( $legacyAnchor !== false ) { $ret = "
$ret"; diff --git a/skins/common/shared.css b/skins/common/shared.css index b0d0689a32..f3babf97d1 100644 --- a/skins/common/shared.css +++ b/skins/common/shared.css @@ -84,12 +84,8 @@ div#mw-js-message { /* Edit section links */ .editsection { - float: right; margin-left: 5px; } -/* Correct directionality when page dir is different from site/user dir */ -/* @noflip */.mw-content-ltr .editsection, .mw-content-rtl .mw-content-ltr .editsection { float: right; } -/* @noflip */.mw-content-rtl .editsection, .mw-content-ltr .mw-content-rtl .editsection { float: left; } /** * File histories */ diff --git a/skins/vector/screen.css b/skins/vector/screen.css index ba604b42de..70c23eee4a 100644 --- a/skins/vector/screen.css +++ b/skins/vector/screen.css @@ -762,7 +762,6 @@ h5 { font-size: 100%; } h5 .editsection { font-weight: normal; } h6 { font-size: 80%; } h6 .editsection { font-size: 125%; font-weight: normal; } -.editsection { float: right; } p { margin: .4em 0 .5em 0; line-height: 1.5em; diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt index c4a0015a99..fe8c625b12 100644 --- a/tests/parser/parserTests.txt +++ b/tests/parser/parserTests.txt @@ -1813,7 +1813,7 @@ Heading inside table (affected by r85922)
-

[edit] Heading

+

Heading [edit]
@@ -3491,8 +3491,8 @@ Bug 6563: Edit link generation for section shown by !! input {{includeonly section}} !! result -

[edit] Includeonly section

-

[edit] Section T-1

+

Includeonly section [edit]

+

Section T-1 [edit]

!! end @@ -3518,7 +3518,7 @@ Bug 6563: Edit link generation for section suppressed by ==Section 1== !! result -

[edit] Section 1

+

Section 1 [edit]

!! end @@ -4537,13 +4537,13 @@ More ===Smaller headline=== Blah blah !! result -

[edit] Headline 1

+

Headline 1 [edit]

Some text

-

[edit] Headline 2

+

Headline 2 [edit]

More

-

[edit] Smaller headline

+

Smaller headline [edit]

Blah blah

!! end @@ -4582,14 +4582,14 @@ Some text -

[edit] Headline 1

-

[edit] Subheadline 1

-
[edit] Skipping a level
-
[edit] Skipping a level
-

[edit] Headline 2

+

Headline 1 [edit]

+

Subheadline 1 [edit]

+
Skipping a level [edit]
+
Skipping a level [edit]
+

Headline 2 [edit]

Some text

-

[edit] Another headline

+

Another headline [edit]

!! end @@ -4637,16 +4637,16 @@ Handling of sections up to level 6 and beyond -

[edit] Level 1 Heading

-

[edit] Level 2 Heading

-

[edit] Level 3 Heading

-

[edit] Level 4 Heading

-
[edit] Level 5 Heading
-
[edit] Level 6 Heading
-
[edit] = Level 7 Heading=
-
[edit] == Level 8 Heading==
-
[edit] === Level 9 Heading===
-
[edit] ==== Level 10 Heading====
+

Level 1 Heading [edit]

+

Level 2 Heading [edit]

+

Level 3 Heading [edit]

+

Level 4 Heading [edit]

+
Level 5 Heading [edit]
+
Level 6 Heading [edit]
+
= Level 7 Heading= [edit]
+
== Level 8 Heading== [edit]
+
=== Level 9 Heading=== [edit]
+
==== Level 10 Heading==== [edit]
!! end @@ -4679,12 +4679,12 @@ TOC regression (bug 9764) -

[edit] title 1

-

[edit] title 1.1

-

[edit] title 1.1.1

-

[edit] title 1.2

-

[edit] title 2

-

[edit] title 2.1

+

title 1 [edit]

+

title 1.1 [edit]

+

title 1.1.1 [edit]

+

title 1.2 [edit]

+

title 2 [edit]

+

title 2.1 [edit]

!! end @@ -4715,12 +4715,12 @@ wgMaxTocLevel=3 -

[edit] title 1

-

[edit] title 1.1

-

[edit] title 1.1.1

-

[edit] title 1.2

-

[edit] title 2

-

[edit] title 2.1

+

title 1 [edit]

+

title 1.1 [edit]

+

title 1.1.1 [edit]

+

title 1.2 [edit]

+

title 2 [edit]

+

title 2.1 [edit]

!! end @@ -4745,11 +4745,11 @@ wgMaxTocLevel=3
  • 2 Section 2
    • -

    [edit] Section 1

    -

    [edit] Section 1.1

    -

    [edit] Section 1.1.1

    -

    [edit] Section 1.1.1.1

    -

    [edit] Section 2

    +

    Section 1 [edit]

    +

    Section 1.1 [edit]

    +

    Section 1.1.1 [edit]

    +

    Section 1.1.1.1 [edit]

    +

    Section 2 [edit]

    !! end @@ -4760,8 +4760,8 @@ Resolving duplicate section names == Foo bar == == Foo bar == !! result -

    [edit] Foo bar

    -

    [edit] Foo bar

    +

    Foo bar [edit]

    +

    Foo bar [edit]

    !! end @@ -4771,8 +4771,8 @@ Resolving duplicate section names with differing case (bug 10721) == Foo bar == == Foo Bar == !! result -

    [edit] Foo bar

    -

    [edit] Foo Bar

    +

    Foo bar [edit]

    +

    Foo Bar [edit]

    !! end @@ -4791,10 +4791,10 @@ __NOTOC__ {{sections}} ==Section 4== !! result -

    [edit] Section 0

    -

    [edit] Section 1

    -

    [edit] Section 2

    -

    [edit] Section 4

    +

    Section 0 [edit]

    +

    Section 1 [edit]

    +

    Section 2 [edit]

    +

    Section 4 [edit]

    !! end @@ -4805,8 +4805,8 @@ __NOEDITSECTION__ ==Section 1== ==Section 2== !! result -

    Section 1

    -

    Section 2

    +

    Section 1

    +

    Section 2

    !! end @@ -4815,7 +4815,7 @@ Link inside a section heading !! input ==Section with a [[Main Page|link]] in it== !! result -

    [edit] Section with a link in it

    +

    Section with a link in it [edit]

    !! end @@ -4837,9 +4837,9 @@ __TOC__
  • 2 title 2
    • -

    [edit] title 1

    -

    [edit] title 1.1

    -

    [edit] title 2

    +

    title 1 [edit]

    +

    title 1.1 [edit]

    +

    title 2 [edit]

    !! end @@ -4861,10 +4861,10 @@ The line above must have a trailing space! --> But just in case it doesn't... !! result -

    [edit] =

    +

    = [edit]

    The line above must have a trailing space!

    -

    [edit] =

    +

    = [edit]

    But just in case it doesn't...

    !! end @@ -4900,19 +4900,19 @@ section 5
  • 5 text " text
    • -

    [edit] text > text

    +

    text > text [edit]

    section 1

    -

    [edit] text < text

    +

    text < text [edit]

    section 2

    -

    [edit] text & text

    +

    text & text [edit]

    section 3

    -

    [edit] text ' text

    +

    text ' text [edit]

    section 4

    -

    [edit] text " text

    +

    text " text [edit]

    section 5

    !! end @@ -6118,7 +6118,7 @@ Fuzz testing: Parser14 == onmouseover= == http://__TOC__ !! result -

    [edit] onmouseover=

    +

    onmouseover= [edit]

    http://

    Contents

    • 1 onmouseover=
      • @@ -6134,7 +6134,7 @@ Fuzz testing: Parser14-table {| STYLE=__TOC__ |foo !! result -

      [edit] a

      +

      a [edit]

      foo @@ -7938,7 +7938,7 @@ Inclusion of !userCanEdit() content !! input {{MediaWiki:Fake}} !! result -

      [edit] header

      +

      header [edit]

      !! end @@ -7969,12 +7969,12 @@ Out-of-order TOC heading levels -

      [edit] 2

      -
      [edit] 6
      -

      [edit] 3

      -

      [edit] 1

      -
      [edit] 5
      -

      [edit] 2

      +

      2 [edit]

      +
      6 [edit]
      +

      3 [edit]

      +

      1 [edit]

      +
      5 [edit]
      +

      2 [edit]

      !! end @@ -8081,7 +8081,7 @@ anchorencode encodes like the TOC generator: (bug 18431) {{anchorencode: _ +:.3A%3A&&]] }} __NOEDITSECTION__ !! result -

      _ +:.3A%3A&&]]

      +

      _ +:.3A%3A&&]]

      .2B:.3A.253A.26.26.5D.5D

      !! end @@ -8272,7 +8272,7 @@ language=sr variant=sr-ec !! input == -{Naslov}- == !! result -

      [уреди] Naslov

      +

      Naslov [уреди]

      !! end @@ -8520,7 +8520,7 @@ Morwen/13: Unclosed link followed by heading !! result

      [[link

      -

      [edit] heading

      +

      heading [edit]

      !! end @@ -8532,7 +8532,7 @@ HHP2.1: Heuristics for headings in preprocessor parenthetical structures !! result

      {{foo|

      -

      heading

      +

      heading

      !! end @@ -8544,7 +8544,7 @@ HHP2.2: Heuristics for headings in preprocessor parenthetical structures !! result

      {{foo|

      -

      [edit] heading

      +

      heading [edit]

      !! end