Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Rename mediawiki.action.history.diff to mediawiki.diff.styles"

Browse source
This commit is contained in:
jenkins-bot 2016-09-06 15:56:17 +00:00 committed by Gerrit Code Review
commit 7e350ba150
5 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
docs/uidesign/mediawiki.action.history.diff.html → docs/uidesign/mediawiki.diff.html
View file

@ -2,14 +2,14 @@
<html lang="en" dir="ltr">
<head>
<meta charset="utf-8">
<link rel="stylesheet" href="../../resources/src/mediawiki.action/mediawiki.action.history.diff.css">
<link rel="stylesheet" media="print" href="../../resources/src/mediawiki.action/mediawiki.action.history.diff.print.css">
<link rel="stylesheet" href="../../resources/src/mediawiki/mediawiki.diff.styles.css">
<link rel="stylesheet" media="print" href="../../resources/src/mediawiki/mediawiki.diff.styles.print.css">
</head>
<body>
<p>This show various styles for our diff action. Style sheet: <code><a href="../../resources/src/mediawiki.action/mediawiki.action.history.diff.css">resources/src/mediawiki.action/mediawiki.action.history.diff.css</a></code>.</p>
<p>This show various styles for our diff action. Style sheet: <code><a href="../../resources/src/mediawiki/mediawiki.diff.styles.css">resources/src/mediawiki/mediawiki.diff.styles.css</a></code>.</p>
<p>This file might help us fix our diff colors which have been a recurring issues among the community for a loooong time.</p>
<p>Try it out in print mode, too. Style sheet: <code><a href="../../resources/src/mediawiki.action/mediawiki.action.history.diff.print.css">resources/src/mediawiki.action/mediawiki.action.history.diff.print.css</a></code>.</p>
<p>Try it out in print mode, too. Style sheet: <code><a href="../../resources/src/mediawiki/mediawiki.diff.styles.print.css">resources/src/mediawiki/mediawiki.diff.styles.print.css</a></code>.</p>
<p>Practical example copied from MediaWiki's HTML output:</p>

4
includes/diff/DifferenceEngine.php
View file

@ -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' );
}
/**

17
resources/Resources.php
View file

@ -989,6 +989,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',
@ -1484,7 +1494,7 @@ return [
'jquery.spinner',
'jquery.textSelection',
'mediawiki.api',
'mediawiki.action.history.diff',
'mediawiki.diff.styles',
'mediawiki.util',
'mediawiki.jqueryMsg',
],
@ -1511,11 +1521,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'
],
],

0
resources/src/mediawiki.action/mediawiki.action.history.diff.css → resources/src/mediawiki/mediawiki.diff.styles.css
View file

0
resources/src/mediawiki.action/mediawiki.action.history.diff.print.css → resources/src/mediawiki/mediawiki.diff.styles.print.css
View file