Merge "Revert "Move CSS for patrol from mediawiki.legacy to new module mediawiki...

diff --combined includes/diff/DifferenceEngine.php
index 4a6ac8e,33955b2..baec396
--- 1/includes/diff/DifferenceEngine.php
--- 2/includes/diff/DifferenceEngine.php
+++ b/includes/diff/DifferenceEngine.php
@@@ -238,14 -238,12 +238,14 @@@ class DifferenceEngine extends ContextS
        }
  
        public function showDiffPage( $diffOnly = false ) {
 -
                # Allow frames except in certain special cases
                $out = $this->getOutput();
                $out->allowClickjacking();
                $out->setRobotPolicy( 'noindex,nofollow' );
  
 +              // Allow extensions to add any extra output here
 +              Hooks::run( 'DifferenceEngineShowDiffPage', [ $out ] );
 +
                if ( !$this->loadRevisionData() ) {
                        $this->showMissingRevision();
  
@@@ -287,8 -285,6 +287,8 @@@
                        $out->setPageTitle( $this->msg( 'difference-title', $this->mNewPage->getPrefixedText() ) );
                        $samePage = true;
                        $oldHeader = '';
 +                      // Allow extensions to change the $oldHeader variable
 +                      Hooks::run( 'DifferenceEngineOldHeaderNoOldRev', [ &$oldHeader ] );
                } else {
                        Hooks::run( 'DiffViewHeader', [ $this, $this->mOldRev, $this->mNewRev ] );
  
@@@ -358,10 -354,6 +358,10 @@@
                                '<div id="mw-diff-otitle5">' . $oldChangeTags[0] . '</div>' .
                                '<div id="mw-diff-otitle4">' . $prevlink . '</div>';
  
 +                      // Allow extensions to change the $oldHeader variable
 +                      Hooks::run( 'DifferenceEngineOldHeader', [ $this, &$oldHeader, $prevlink, $oldminor,
 +                              $diffOnly, $ldel, $this->unhide ] );
 +
                        if ( $this->mOldRev->isDeleted( Revision::DELETED_TEXT ) ) {
                                $deleted = true; // old revisions text is hidden
                                if ( $this->mOldRev->isDeleted( Revision::DELETED_RESTRICTED ) ) {
@@@ -423,10 -415,6 +423,10 @@@
                        '<div id="mw-diff-ntitle5">' . $newChangeTags[0] . '</div>' .
                        '<div id="mw-diff-ntitle4">' . $nextlink . $this->markPatrolledLink() . '</div>';
  
 +              // Allow extensions to change the $newHeader variable
 +              Hooks::run( 'DifferenceEngineNewHeader', [ $this, &$newHeader, $formattedRevisionTools,
 +                      $nextlink, $rollback, $newminor, $diffOnly, $rdel, $this->unhide ] );
 +
                if ( $this->mNewRev->isDeleted( Revision::DELETED_TEXT ) ) {
                        $deleted = true; // new revisions text is hidden
                        if ( $this->mNewRev->isDeleted( Revision::DELETED_RESTRICTED ) ) {
@@@ -499,9 -487,6 +499,9 @@@
                                                        'token' => $linkInfo['token'],
                                                ]
                                        ) . ']</span>';
 +                              // Allow extensions to change the markpatrolled link
 +                              Hooks::run( 'DifferenceEngineMarkPatrolledLink', [ $this,
 +                                      &$this->mMarkPatrolledLink, $linkInfo['rcid'], $linkInfo['token'] ] );
                        }
                }
                return $this->mMarkPatrolledLink;
@@@ -545,17 -530,9 +545,16 @@@
                                // If the user could patrol this it already would be patrolled
                                $rcid = 0;
                        }
 +
 +                      // Allow extensions to possibly change the rcid here
 +                      // For example the rcid might be set to zero due to the user
 +                      // being the same as the performer of the change but an extension
 +                      // might still want to show it under certain conditions
 +                      Hooks::run( 'DifferenceEngineMarkPatrolledRCID', [ &$rcid, $this, $change, $user ] );
 +
                        // Build the link
                        if ( $rcid ) {
                                $this->getOutput()->preventClickjacking();
-                               $this->getOutput()->addModuleStyles( 'mediawiki.page.patrol' );
                                if ( $wgEnableAPI && $wgEnableWriteAPI
                                        && $user->isAllowed( 'writeapi' )
                                ) {
@@@ -640,20 -617,15 +639,20 @@@
  
                                # WikiPage::getParserOutput() should not return false, but just in case
                                if ( $parserOutput ) {
 -                                      $out->addParserOutput( $parserOutput );
 +                                      // Allow extensions to change parser output here
 +                                      if ( Hooks::run( 'DifferenceEngineRenderRevisionAddParserOutput', [ $this, $out, $parserOutput, $wikiPage ] ) ) {
 +                                              $out->addParserOutput( $parserOutput );
 +                                      }
                                }
                        }
                }
                # @codingStandardsIgnoreEnd
  
 -              # Add redundant patrol link on bottom...
 -              $out->addHTML( $this->markPatrolledLink() );
 -
 +              // Allow extensions to optionally not show the final patrolled link
 +              if ( Hooks::run( 'DifferenceEngineRenderRevisionShowFinalPatrolLink' ) ) {
 +                      # Add redundant patrol link on bottom...
 +                      $out->addHTML( $this->markPatrolledLink() );
 +              }
        }
  
        protected function getParserOutput( WikiPage $page, Revision $rev ) {
@@@ -679,9 -651,6 +678,9 @@@
         * @return bool
         */
        public function showDiff( $otitle, $ntitle, $notice = '' ) {
 +              // Allow extensions to affect the output here
 +              Hooks::run( 'DifferenceEngineShowDiff', [ $this ] );
 +
                $diff = $this->getDiff( $otitle, $ntitle, $notice );
                if ( $diff === false ) {
                        $this->showMissingRevision();
@@@ -751,9 -720,7 +750,9 @@@
                if ( $this->mOldRev === false || ( $this->mOldRev && $this->mNewRev
                        && $this->mOldRev->getId() == $this->mNewRev->getId() )
                ) {
 -                      return '';
 +                      if ( Hooks::run( 'DifferenceEngineShowEmptyOldContent', [ $this ] ) ) {
 +                              return '';
 +                      }
                }
                // Cacheable?
                $key = false;

diff --combined resources/Resources.php
index 053c3f3,5c60201..d210aab
--- 1/resources/Resources.php
--- 2/resources/Resources.php
+++ b/resources/Resources.php
@@@ -923,7 -923,6 +923,7 @@@ return 
                        'mediawiki.api.edit',
                        'json',
                ],
 +              'targets' => [ 'desktop', 'mobile' ],
        ],
        'mediawiki.api.user' => [
                'scripts' => 'resources/src/mediawiki/api/user.js',
@@@ -1707,14 -1706,6 +1707,6 @@@
                'position' => 'top',
                'targets' => [ 'desktop', 'mobile' ],
        ],
-       'mediawiki.page.patrol' => [
-               'position' => 'top',
-               'styles' => [
-                       'resources/src/mediawiki/page/mediawiki.page.patrol.css',
-                       'resources/src/mediawiki/page/mediawiki.page.patrol.print.css'
-                               => [ 'media' => 'print' ],
-               ]
-       ],
        'mediawiki.page.patrol.ajax' => [
                'scripts' => 'resources/src/mediawiki/page/patrol.ajax.js',
                'dependencies' => [

diff --combined resources/src/mediawiki.legacy/shared.css
index 38d2a27,8fcc667..de442e9
--- 1/resources/src/mediawiki.legacy/shared.css
--- 2/resources/src/mediawiki.legacy/shared.css
+++ b/resources/src/mediawiki.legacy/shared.css
@@@ -98,6 -98,14 +98,6 @@@ span.comment 
        unicode-bidi: isolate;
  }
  
 -/**
 - * Add a bit of margin space between the preview and the toolbar.
 - * This replaces the ugly <p><br /></p> we used to insert into the page source
 - */
 -#wikiPreview.ontop {
 -      margin-bottom: 1em;
 -}
 -
  /* Stop floats from intruding into edit area in previews */
  #editform,
  #toolbar,
@@@ -115,6 -123,23 +115,23 @@@ span.history-deleted 
        font-style: italic;
  }
  
+ /**
+  * Patrol stuff
+  */
+ .not-patrolled {
+       background-color: #ffa;
+ }
+ 
+ .unpatrolled {
+       font-weight: bold;
+       color: #f00;
+ }
+ 
+ div.patrollink {
+       font-size: 75%;
+       text-align: right;
+ }
+ 
  /**
   * Forms
   */