From 7dc4b5861589f2cef472195273c41a86083f69d4 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Bartosz=20Dziewo=C5=84ski?= <matma.rex@gmail.com>
Date: Fri, 5 Sep 2014 16:12:04 +0200
Subject: [PATCH] Article: Don't hardcode <img> tags on redirect page

* Created a ResourceLoader module for redirect page styling.
* Fixed a couple of bugs in Article code.

Keeping two of the old files for a while because they might still be
referenced by something (bug 69277 comment 11).

Bug: 69277
Change-Id: I8fa565833545e41d0232101566da8c5ffa850e36
---
 includes/content/WikitextContent.php          |   1 +
 includes/page/Article.php                     |  60 +++++-------------
 resources/Resources.php                       |   4 ++
 .../images/nextredirect-ltr.png               | Bin
 .../images/nextredirect-rtl.png               | Bin
 .../mediawiki.action/images/redirect-ltr.png  | Bin 0 -> 128 bytes
 .../mediawiki.action/images/redirect-rtl.png  | Bin 0 -> 132 bytes
 .../mediawiki.action.view.redirectPage.css    |  53 ++++++++++++++++
 resources/src/mediawiki.legacy/oldshared.css  |   5 --
 9 files changed, 75 insertions(+), 48 deletions(-)
 rename skins/common/images/nextredirectltr.png => resources/src/mediawiki.action/images/nextredirect-ltr.png (100%)
 rename skins/common/images/nextredirectrtl.png => resources/src/mediawiki.action/images/nextredirect-rtl.png (100%)
 create mode 100644 resources/src/mediawiki.action/images/redirect-ltr.png
 create mode 100644 resources/src/mediawiki.action/images/redirect-rtl.png
 create mode 100644 resources/src/mediawiki.action/mediawiki.action.view.redirectPage.css

diff --git a/includes/content/WikitextContent.php b/includes/content/WikitextContent.php
index d23f925d80..3ab6a6dbea 100644
--- a/includes/content/WikitextContent.php
+++ b/includes/content/WikitextContent.php
@@ -336,6 +336,7 @@ class WikitextContent extends TextContent {
 					Article::getRedirectHeaderHtml( $title->getPageLanguage(), $chain, false ) .
 					$output->getText()
 				);
+				$output->addModuleStyles( 'mediawiki.action.view.redirectPage' );
 			}
 		}
 	}
diff --git a/includes/page/Article.php b/includes/page/Article.php
index 71350ac783..9772d4f3f6 100644
--- a/includes/page/Article.php
+++ b/includes/page/Article.php
@@ -1466,10 +1466,11 @@ class Article implements Page {
 	 */
 	public function viewRedirect( $target, $appendSubtitle = true, $forceKnown = false ) {
 		$lang = $this->getTitle()->getPageLanguage();
+		$out = $this->getContext()->getOutput();
 		if ( $appendSubtitle ) {
-			$out = $this->getContext()->getOutput();
 			$out->addSubtitle( wfMessage( 'redirectpagesub' )->parse() );
 		}
+		$out->addModuleStyles( 'mediawiki.action.view.redirectPage' );
 		return static::getRedirectHeaderHtml( $lang, $target, $forceKnown );
 	}
 
@@ -1486,57 +1487,30 @@ class Article implements Page {
 	 * @return string Containing HTML with redirect link
 	 */
 	public static function getRedirectHeaderHtml( Language $lang, $target, $forceKnown = false ) {
-		global $wgStylePath;
-
 		if ( !is_array( $target ) ) {
 			$target = array( $target );
 		}
 
-		$imageDir = $lang->getDir();
-
-		// the loop prepends the arrow image before the link, so the first case needs to be outside
-
-		/** @var $title Title */
-		$title = array_shift( $target );
-
-		if ( $forceKnown ) {
-			$link = Linker::linkKnown( $title, htmlspecialchars( $title->getFullText() ) );
-		} else {
-			$link = Linker::link( $title, htmlspecialchars( $title->getFullText() ) );
-		}
-
-		$nextRedirect = $wgStylePath . '/common/images/nextredirect' . $imageDir . '.png';
-		$alt = $lang->isRTL() ? '←' : '→';
-
-		// Automatically append redirect=no to each link, since most of them are
-		// redirect pages themselves.
-		/** @var Title $rt */
-		foreach ( $target as $rt ) {
-			$link .= Html::element( 'img', array( 'src' => $nextRedirect, 'alt' => $alt ) );
-			if ( $forceKnown ) {
-				$link .= Linker::linkKnown(
-					$rt,
-					htmlspecialchars( $rt->getFullText(),
-					array(),
-					array( 'redirect' => 'no' )
-				)
-				);
-			} else {
-				$link .= Linker::link(
-					$rt,
-					htmlspecialchars( $rt->getFullText() ),
-					array(),
-					array( 'redirect' => 'no' )
-				);
-			}
+		$html = '<ul class="redirectText">';
+		/** @var Title $title */
+		foreach ( $target as $title ) {
+			$html .= '<li>' . Linker::link(
+				$title,
+				htmlspecialchars( $title->getFullText() ),
+				array(),
+				// Automatically append redirect=no to each link, since most of them are
+				// redirect pages themselves.
+				array( 'redirect' => 'no' ),
+				( $forceKnown ? array( 'known', 'noclasses' ) : array() )
+			) . '</li>';
 		}
 
 		$redirectToText = wfMessage( 'redirectto' )->inLanguage( $lang )->text();
 
-		$imageUrl = $wgStylePath . '/common/images/redirect' . $imageDir . '.png';
 		return '<div class="redirectMsg">' .
-			Html::element( 'img', array( 'src' => $imageUrl, 'alt' => $redirectToText ) ) .
-			'<span class="redirectText">' . $link . '</span></div>';
+			'<p>' . $redirectToText . '</p>' .
+			$html .
+			'</div>';
 	}
 
 	/**
diff --git a/resources/Resources.php b/resources/Resources.php
index 946f3c9463..07f3cf9d1b 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1062,6 +1062,10 @@ return array(
 		'dependencies' => 'mediawiki.action.view.redirect',
 		'position' => 'top',
 	),
+	'mediawiki.action.view.redirectPage' => array(
+		'styles' => 'resources/src/mediawiki.action/mediawiki.action.view.redirectPage.css',
+		'position' => 'top',
+	),
 	'mediawiki.action.view.rightClickEdit' => array(
 		'scripts' => 'resources/src/mediawiki.action/mediawiki.action.view.rightClickEdit.js',
 	),
diff --git a/skins/common/images/nextredirectltr.png b/resources/src/mediawiki.action/images/nextredirect-ltr.png
similarity index 100%
rename from skins/common/images/nextredirectltr.png
rename to resources/src/mediawiki.action/images/nextredirect-ltr.png
diff --git a/skins/common/images/nextredirectrtl.png b/resources/src/mediawiki.action/images/nextredirect-rtl.png
similarity index 100%
rename from skins/common/images/nextredirectrtl.png
rename to resources/src/mediawiki.action/images/nextredirect-rtl.png
diff --git a/resources/src/mediawiki.action/images/redirect-ltr.png b/resources/src/mediawiki.action/images/redirect-ltr.png
new file mode 100644
index 0000000000000000000000000000000000000000..695f2a13c4a33750b46885e70fd8b08d5265bb0f
GIT binary patch
literal 128
zcmeAS@N?(olHy`uVBq!ia0vp^`amqg!2%?=PhR5*q})AS978JN-d@_s%b>u+?AZVA
z;-;IyN{uTHEIPT|-u&Y6E~lM6fd*e%^7mB+vs5asQ!C4PI^S1f?)$n$1(WV~U)anb
cTXiOn!Js(4AiY{~3(!agPgg&ebxsLQ0RP%8wg3PC

literal 0
HcmV?d00001

diff --git a/resources/src/mediawiki.action/images/redirect-rtl.png b/resources/src/mediawiki.action/images/redirect-rtl.png
new file mode 100644
index 0000000000000000000000000000000000000000..c954a2ad09b40c648a8f912e0cbf185e10621887
GIT binary patch
literal 132
zcmeAS@N?(olHy`uVBq!ia0vp^`amqg!2%?=PhR5*q`W;{978JN-d;M$#h}2!9AIBN
z|JnSt3!2*%n#^82*duD=*t>qRk5r|ApPj^6^ZLT43+Cz1QheTh@5k3)e)3#?az5t^
hv_4(6ie7O^(pfFO;Ou#&lR#q`JYD@<);T3K0RUI4E~@|l

literal 0
HcmV?d00001

diff --git a/resources/src/mediawiki.action/mediawiki.action.view.redirectPage.css b/resources/src/mediawiki.action/mediawiki.action.view.redirectPage.css
new file mode 100644
index 0000000000..8feca4a158
--- /dev/null
+++ b/resources/src/mediawiki.action/mediawiki.action.view.redirectPage.css
@@ -0,0 +1,53 @@
+/*!
+ * Display neat icons on redirect pages.
+ */
+
+/* Hide, but keep accessible for screen-readers. */
+.redirectTo {
+	overflow: hidden;
+	height: 0;
+	zoom: 1;
+}
+
+.redirectText {
+	list-style: none none;
+	display: inline;
+	/* shared.css has some very weird directionality-specific rules for 'ul' we need to override,
+	   search for "Correct directionality when page dir is different from site/user dir" */
+	margin: 0 !important;
+	padding: 0 !important;
+}
+
+/* @noflip */
+.mw-content-ltr .redirectText li {
+	display: inline;
+	margin: 0;
+	padding: 0;
+	padding-left: 42px;
+	/* @embed */
+	background: url(images/nextredirect-ltr.png) bottom left no-repeat;
+}
+
+/* @noflip */
+.mw-content-ltr .redirectText li:first-child {
+	padding-left: 47px;
+	/* @embed */
+	background: url(images/redirect-ltr.png) bottom left no-repeat;
+}
+
+/* @noflip */
+.mw-content-rtl .redirectText li {
+	display: inline;
+	margin: 0;
+	padding: 0;
+	padding-right: 42px;
+	/* @embed */
+	background: url(images/nextredirect-rtl.png) bottom right no-repeat;
+}
+
+/* @noflip */
+.mw-content-rtl .redirectText li:first-child {
+	padding-right: 47px;
+	/* @embed */
+	background: url(images/redirect-rtl.png) bottom right no-repeat;
+}
diff --git a/resources/src/mediawiki.legacy/oldshared.css b/resources/src/mediawiki.legacy/oldshared.css
index 4741074912..4424fbdd7d 100644
--- a/resources/src/mediawiki.legacy/oldshared.css
+++ b/resources/src/mediawiki.legacy/oldshared.css
@@ -300,11 +300,6 @@ table.small {
 	padding-right: 0.5em;
 }
 
-.redirectText {
-	font-size: 150%;
-	margin: 5px;
-}
-
 .sharedUploadNotice {
 	font-style: italic;
 }
-- 
2.20.1