From: Leszek Manicki Date: Wed, 31 Aug 2016 08:14:48 +0000 (+0200) Subject: Rename mediawiki.action.history.diff to mediawiki.diff.styles X-Git-Tag: 1.31.0-rc.0~5751^2 X-Git-Url: https://git.cyclocoop.org//%22?a=commitdiff_plain;h=a6b402c1c3ab0088c3c2c99ee694007ab5f9b445;p=lhc%2Fweb%2Fwiklou.git Rename mediawiki.action.history.diff to mediawiki.diff.styles Diff is not shown on action=history, so the name was not valid. This module contains only styles, so let's make it explicit in its name too. mediawiki.action.history.diff module is temporarily left for backwards compatibility. It should be removed when no longer used. This also renames docs/uidesign/mediawiki.action.history.diff.html to docs/uidesign/mediawiki.diff.html. Change-Id: I7ecc08417c5f1870ed6f2ca139fd953d68f6ec8e --- diff --git a/docs/uidesign/mediawiki.action.history.diff.html b/docs/uidesign/mediawiki.action.history.diff.html deleted file mode 100644 index 615558f206..0000000000 --- a/docs/uidesign/mediawiki.action.history.diff.html +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - - -

This show various styles for our diff action. Style sheet: resources/src/mediawiki.action/mediawiki.action.history.diff.css.

This file might help us fix our diff colors which have been a recurring issues among the community for a loooong time.

Try it out in print mode, too. Style sheet: resources/src/mediawiki.action/mediawiki.action.history.diff.print.css.

- -

Practical example copied from MediaWiki's HTML output:

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

Below are some basic lines being applied one or two classes. Mainly for debugging purposes.

- - - - - - - - - - - - - -

Diff
`diff-addedline`: added line
`diff-deletedline`: deleted line
`diff-context`: context
Same as above with a `<ins>` or `<del>` child element having the `diffchange` class:
Diffchange
Added line + diffchange
~~Deleted line + diffchange~~

- - - diff --git a/docs/uidesign/mediawiki.diff.html b/docs/uidesign/mediawiki.diff.html new file mode 100644 index 0000000000..0372595ce9 --- /dev/null +++ b/docs/uidesign/mediawiki.diff.html @@ -0,0 +1,92 @@ + + + + + + + + + +

This show various styles for our diff action. Style sheet: resources/src/mediawiki/mediawiki.diff.styles.css.

This file might help us fix our diff colors which have been a recurring issues among the community for a loooong time.

Try it out in print mode, too. Style sheet: resources/src/mediawiki/mediawiki.diff.styles.print.css.

+ +

Practical example copied from MediaWiki's HTML output:

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

Below are some basic lines being applied one or two classes. Mainly for debugging purposes.

+ + + + + + + + + + + + + +

Diff
`diff-addedline`: added line
`diff-deletedline`: deleted line
`diff-context`: context
Same as above with a `<ins>` or `<del>` child element having the `diffchange` class:
Diffchange
Added line + diffchange
~~Deleted line + diffchange~~

+ + + diff --git a/includes/diff/DifferenceEngine.php b/includes/diff/DifferenceEngine.php index baec396ed0..6fada55974 100644 --- a/includes/diff/DifferenceEngine.php +++ b/includes/diff/DifferenceEngine.php @@ -695,10 +695,10 @@ class DifferenceEngine extends ContextSource { } /** - * Add style sheets and supporting JS for diff display. + * Add style sheets for diff display. */ public function showDiffStyle() { - $this->getOutput()->addModuleStyles( 'mediawiki.action.history.diff' ); + $this->getOutput()->addModuleStyles( 'mediawiki.diff.styles' ); } /** diff --git a/resources/Resources.php b/resources/Resources.php index ef56cd340a..2d8d3a014f 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -988,6 +988,16 @@ return [ // must be loaded on the bottom 'position' => 'bottom', ], + 'mediawiki.diff.styles' => [ + 'position' => 'top', + 'styles' => [ + 'resources/src/mediawiki/mediawiki.diff.styles.css', + 'resources/src/mediawiki/mediawiki.diff.styles.print.css' => [ + 'media' => 'print' + ], + ], + 'targets' => [ 'desktop', 'mobile' ], + ], 'mediawiki.feedback' => [ 'scripts' => 'resources/src/mediawiki/mediawiki.feedback.js', 'styles' => 'resources/src/mediawiki/mediawiki.feedback.css', @@ -1483,7 +1493,7 @@ return [ 'jquery.spinner', 'jquery.textSelection', 'mediawiki.api', - 'mediawiki.action.history.diff', + 'mediawiki.diff.styles', 'mediawiki.util', 'mediawiki.jqueryMsg', ], @@ -1510,11 +1520,12 @@ return [ 'position' => 'top', 'styles' => 'resources/src/mediawiki.action/mediawiki.action.history.styles.css', ], + // using this module is deprecated, for diff styles use mediawiki.diff.styles instead 'mediawiki.action.history.diff' => [ 'position' => 'top', 'styles' => [ - 'resources/src/mediawiki.action/mediawiki.action.history.diff.css', - 'resources/src/mediawiki.action/mediawiki.action.history.diff.print.css' => [ + 'resources/src/mediawiki/mediawiki.diff.styles.css', + 'resources/src/mediawiki/mediawiki.diff.styles.print.css' => [ 'media' => 'print' ], ], diff --git a/resources/src/mediawiki.action/mediawiki.action.history.diff.css b/resources/src/mediawiki.action/mediawiki.action.history.diff.css deleted file mode 100644 index 327c9c8dd0..0000000000 --- a/resources/src/mediawiki.action/mediawiki.action.history.diff.css +++ /dev/null @@ -1,120 +0,0 @@ -/*! - * Diff rendering - */ -table.diff { - border: none; - border-spacing: 4px; - margin: 0; - width: 100%; - /* Ensure that colums are of equal width */ - table-layout: fixed; -} - -table.diff td { - padding: 0.33em 0.5em; -} - -table.diff td.diff-marker { - /* Compensate padding for increased font-size */ - padding: 0.25em; -} - -table.diff col.diff-marker { - width: 2%; -} - -table.diff col.diff-content { - width: 48%; -} - -table.diff td div { - /* Force-wrap very long lines such as URLs or page-widening char strings */ - word-wrap: break-word; -} - -td.diff-otitle, -td.diff-ntitle { - text-align: center; -} - -td.diff-lineno { - font-weight: bold; -} - -td.diff-marker { - text-align: right; - font-weight: bold; - font-size: 1.25em; - line-height: 1.2; -} - -td.diff-addedline, -td.diff-deletedline, -td.diff-context { - font-size: 88%; - line-height: 1.6; - vertical-align: top; - white-space: -moz-pre-wrap; - white-space: pre-wrap; - border-style: solid; - border-width: 1px 1px 1px 4px; - border-radius: 0.33em; -} - -td.diff-addedline { - border-color: #a3d3ff; -} - -td.diff-deletedline { - border-color: #ffe49c; -} - -td.diff-context { - background: #f9f9f9; - border-color: #e6e6e6; - color: #333; -} - -.diffchange { - font-weight: bold; - text-decoration: none; -} - -td.diff-addedline .diffchange, -td.diff-deletedline .diffchange { - border-radius: 0.33em; - padding: 0.25em 0; -} - -td.diff-addedline .diffchange { - background: #d8ecff; -} - -td.diff-deletedline .diffchange { - background: #feeec8; -} - -/* Correct user & content directionality when viewing a diff */ -.diff-currentversion-title, -.diff { - direction: ltr; - unicode-bidi: embed; -} - -/* @noflip */ .diff-contentalign-right td { - direction: rtl; - unicode-bidi: embed; -} - -/* @noflip */ .diff-contentalign-left td { - direction: ltr; - unicode-bidi: embed; -} - -.diff-multi, -.diff-otitle, -.diff-ntitle, -.diff-lineno { - direction: ltr !important; - unicode-bidi: embed; -} diff --git a/resources/src/mediawiki.action/mediawiki.action.history.diff.print.css b/resources/src/mediawiki.action/mediawiki.action.history.diff.print.css deleted file mode 100644 index 76b5c9b7ae..0000000000 --- a/resources/src/mediawiki.action/mediawiki.action.history.diff.print.css +++ /dev/null @@ -1,16 +0,0 @@ -/*! - * Diff rendering - */ -td.diff-context, -td.diff-addedline .diffchange, -td.diff-deletedline .diffchange { - background-color: transparent; -} - -td.diff-addedline .diffchange { - text-decoration: underline; -} - -td.diff-deletedline .diffchange { - text-decoration: line-through; -} diff --git a/resources/src/mediawiki/mediawiki.diff.styles.css b/resources/src/mediawiki/mediawiki.diff.styles.css new file mode 100644 index 0000000000..327c9c8dd0 --- /dev/null +++ b/resources/src/mediawiki/mediawiki.diff.styles.css @@ -0,0 +1,120 @@ +/*! + * Diff rendering + */ +table.diff { + border: none; + border-spacing: 4px; + margin: 0; + width: 100%; + /* Ensure that colums are of equal width */ + table-layout: fixed; +} + +table.diff td { + padding: 0.33em 0.5em; +} + +table.diff td.diff-marker { + /* Compensate padding for increased font-size */ + padding: 0.25em; +} + +table.diff col.diff-marker { + width: 2%; +} + +table.diff col.diff-content { + width: 48%; +} + +table.diff td div { + /* Force-wrap very long lines such as URLs or page-widening char strings */ + word-wrap: break-word; +} + +td.diff-otitle, +td.diff-ntitle { + text-align: center; +} + +td.diff-lineno { + font-weight: bold; +} + +td.diff-marker { + text-align: right; + font-weight: bold; + font-size: 1.25em; + line-height: 1.2; +} + +td.diff-addedline, +td.diff-deletedline, +td.diff-context { + font-size: 88%; + line-height: 1.6; + vertical-align: top; + white-space: -moz-pre-wrap; + white-space: pre-wrap; + border-style: solid; + border-width: 1px 1px 1px 4px; + border-radius: 0.33em; +} + +td.diff-addedline { + border-color: #a3d3ff; +} + +td.diff-deletedline { + border-color: #ffe49c; +} + +td.diff-context { + background: #f9f9f9; + border-color: #e6e6e6; + color: #333; +} + +.diffchange { + font-weight: bold; + text-decoration: none; +} + +td.diff-addedline .diffchange, +td.diff-deletedline .diffchange { + border-radius: 0.33em; + padding: 0.25em 0; +} + +td.diff-addedline .diffchange { + background: #d8ecff; +} + +td.diff-deletedline .diffchange { + background: #feeec8; +} + +/* Correct user & content directionality when viewing a diff */ +.diff-currentversion-title, +.diff { + direction: ltr; + unicode-bidi: embed; +} + +/* @noflip */ .diff-contentalign-right td { + direction: rtl; + unicode-bidi: embed; +} + +/* @noflip */ .diff-contentalign-left td { + direction: ltr; + unicode-bidi: embed; +} + +.diff-multi, +.diff-otitle, +.diff-ntitle, +.diff-lineno { + direction: ltr !important; + unicode-bidi: embed; +} diff --git a/resources/src/mediawiki/mediawiki.diff.styles.print.css b/resources/src/mediawiki/mediawiki.diff.styles.print.css new file mode 100644 index 0000000000..76b5c9b7ae --- /dev/null +++ b/resources/src/mediawiki/mediawiki.diff.styles.print.css @@ -0,0 +1,16 @@ +/*! + * Diff rendering + */ +td.diff-context, +td.diff-addedline .diffchange, +td.diff-deletedline .diffchange { + background-color: transparent; +} + +td.diff-addedline .diffchange { + text-decoration: underline; +} + +td.diff-deletedline .diffchange { + text-decoration: line-through; +}

-Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
+Lorem ipsum dolor sit amet, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
-Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
 Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.
-Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+Excepteur sint occaecat cupidatat non proident, sunt reprehenderit in voluptate in culpa qui officia deserunt mollit anim.
+Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.

-Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
+Lorem ipsum dolor sit amet, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
-Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
 Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.
-Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+Excepteur sint occaecat cupidatat non proident, sunt reprehenderit in voluptate in culpa qui officia deserunt mollit anim.
+Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.