Move CSS for patrol from mediawiki.legacy to new module mediawiki.page.patrol

Also change the selector from
	div.patrollink
to
	.patrollink

Bug: T89981
Change-Id: Ib79d17fab61b1a7b940b2acff6d19a58a3fe0bc9

diff --git a/includes/diff/DifferenceEngine.php b/includes/diff/DifferenceEngine.php
index 33955b2..89d2389 100644 (file)
--- a/includes/diff/DifferenceEngine.php
+++ b/includes/diff/DifferenceEngine.php
@@ -533,6 +533,7 @@ class DifferenceEngine extends ContextSource {
                        // Build the link
                        if ( $rcid ) {
                                $this->getOutput()->preventClickjacking();
+                               $this->getOutput()->addModuleStyles( 'mediawiki.page.patrol' );
                                if ( $wgEnableAPI && $wgEnableWriteAPI
                                        && $user->isAllowed( 'writeapi' )
                                ) {

diff --git a/includes/page/Article.php b/includes/page/Article.php
index 6396aaa..f5a860e 100644 (file)
--- a/includes/page/Article.php
+++ b/includes/page/Article.php
@@ -1196,6 +1196,7 @@ class Article implements Page {
                $token = $user->getEditToken( $rcid );
 
                $outputPage->preventClickjacking();
+               $outputPage->addModuleStyles( 'mediawiki.page.patrol' );
                if ( $wgEnableAPI && $wgEnableWriteAPI && $user->isAllowed( 'writeapi' ) ) {
                        $outputPage->addModules( 'mediawiki.page.patrol.ajax' );
                }

diff --git a/includes/specials/SpecialNewpages.php b/includes/specials/SpecialNewpages.php
index 718a6dc..d2513ed 100644 (file)
--- a/includes/specials/SpecialNewpages.php
+++ b/includes/specials/SpecialNewpages.php
@@ -349,6 +349,7 @@ class SpecialNewpages extends IncludableSpecialPage {
 
                if ( $this->patrollable( $result ) ) {
                        $classes[] = 'not-patrolled';
+                       $this->getOutput()->addModuleStyles( 'mediawiki.page.patrol' );
                }
 
                # Add a class for zero byte pages

diff --git a/resources/Resources.php b/resources/Resources.php
index 5c60201..0d8d39f 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1706,6 +1706,14 @@ return [
                '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 --git a/resources/src/mediawiki.legacy/commonPrint.css b/resources/src/mediawiki.legacy/commonPrint.css
index d387a2d..6a7c76a 100644 (file)
--- a/resources/src/mediawiki.legacy/commonPrint.css
+++ b/resources/src/mediawiki.legacy/commonPrint.css
@@ -19,7 +19,6 @@ div#column-one,
 #footer-places,
 .mw-hidden-catlinks,
 .usermessage,
-.patrollink,
 .ns-0 .mw-redirectedfrom,
 div.magnify,
 #mw-navigation,

diff --git a/resources/src/mediawiki.legacy/oldshared.css b/resources/src/mediawiki.legacy/oldshared.css
index 7ccf59e..786f53d 100644 (file)
--- a/resources/src/mediawiki.legacy/oldshared.css
+++ b/resources/src/mediawiki.legacy/oldshared.css
@@ -289,11 +289,6 @@ table.small {
        font-style: italic;
 }
 
-span.unpatrolled {
-       font-weight: bold;
-       color: #f00;
-}
-
 div.gallerybox {
        width: 150px;
 }

diff --git a/resources/src/mediawiki.legacy/shared.css b/resources/src/mediawiki.legacy/shared.css
index 8fcc667..e9cbbcb 100644 (file)
--- a/resources/src/mediawiki.legacy/shared.css
+++ b/resources/src/mediawiki.legacy/shared.css
@@ -123,23 +123,6 @@ 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
  */

diff --git a/resources/src/mediawiki/page/mediawiki.page.patrol.css b/resources/src/mediawiki/page/mediawiki.page.patrol.css
new file mode 100644 (file)
index 0000000..f237dbd
--- /dev/null
+++ b/resources/src/mediawiki/page/mediawiki.page.patrol.css
@@ -0,0 +1,13 @@
+.not-patrolled {
+       background-color: #ffa;
+}
+
+.unpatrolled {
+       font-weight: bold;
+       color: #f00;
+}
+
+.patrollink {
+       font-size: 75%;
+       text-align: right;
+}

diff --git a/resources/src/mediawiki/page/mediawiki.page.patrol.print.css b/resources/src/mediawiki/page/mediawiki.page.patrol.print.css
new file mode 100644 (file)
index 0000000..497bceb
--- /dev/null
+++ b/resources/src/mediawiki/page/mediawiki.page.patrol.print.css
@@ -0,0 +1,3 @@
+.patrollink {
+       display: none;
+}