From 5d68836825a698328ba7adb377f58d078bc1cf27 Mon Sep 17 00:00:00 2001
From: Krinkle <krinkle@users.mediawiki.org>
Date: Mon, 27 Feb 2012 00:03:14 +0000
Subject: [PATCH] [mediawik.special.changeslist] Remove ugly arrow swapping
 hack * Use CSS and change the background image, instead of displaying 2 <img>
 tags and hiding one based on the parent element's class * touches bug 17616 a
 bit, although it doesn't address the focus issue yet, but does improve the
 overal structure of this module * Also speeds up by: - Outputting less markup
 - Having 1 embedded images in the CSS file instead of (N changes)*<img> tags
 * jquery.makeCollapsible:

---
 includes/ChangesList.php                      |  14 +------
 .../images/arrow-collapsed-ltr.png            | Bin 0 -> 206 bytes
 .../images/arrow-collapsed-rtl.png            | Bin 0 -> 257 bytes
 .../images/arrow-expanded.png                 | Bin 0 -> 205 bytes
 .../mediawiki.special.changeslist.css         |  35 +++++++++++-------
 5 files changed, 24 insertions(+), 25 deletions(-)
 create mode 100644 resources/mediawiki.special/images/arrow-collapsed-ltr.png
 create mode 100644 resources/mediawiki.special/images/arrow-collapsed-rtl.png
 create mode 100644 resources/mediawiki.special/images/arrow-expanded.png

diff --git a/includes/ChangesList.php b/includes/ChangesList.php
index 4611611d23..686ee092aa 100644
--- a/includes/ChangesList.php
+++ b/includes/ChangesList.php
@@ -860,16 +860,7 @@ class EnhancedChangesList extends ChangesList {
 		$users = ' <span class="changedby">[' .
 			implode( $this->message['semicolon-separator'], $users ) . ']</span>';
 
-		# Title for <a> tags
-		$expandTitle = htmlspecialchars( wfMsg( 'rc-enhanced-expand' ) );
-		$closeTitle = htmlspecialchars( wfMsg( 'rc-enhanced-hide' ) );
-
-		$tl = "<span class='mw-collapsible-toggle'>"
-			. "<span class='mw-rc-openarrow'>"
-			. "<a href='#' title='$expandTitle'>{$this->sideArrow()}</a>"
-			. "</span><span class='mw-rc-closearrow'>"
-			. "<a href='#' title='$closeTitle'>{$this->downArrow()}</a>"
-			. "</span></span>";
+		$tl = '<span class="mw-collapsible-toggle mw-enhancedchanges-arrow"></span>';
 		$r .= "<td>$tl</td>";
 
 		# Main line
@@ -974,7 +965,6 @@ class EnhancedChangesList extends ChangesList {
 			$classes = array();
 			$type = $rcObj->mAttribs['rc_type'];
 
-			#$r .= '<tr><td valign="top">'.$this->spacerArrow();
 			$r .= '<tr><td></td><td class="mw-enhanced-rc">';
 			$r .= $this->recentChangesFlags( array(
 				'newpage' => $rcObj->mAttribs['rc_new'],
@@ -1119,7 +1109,7 @@ class EnhancedChangesList extends ChangesList {
 		$r = Html::openElement( 'table', array( 'class' => $classes ) ) .
 			Html::openElement( 'tr' );
 
-		$r .= '<td class="mw-enhanced-rc">' . $this->spacerArrow();
+		$r .= '<td class="mw-enhanced-rc"><span class="mw-enhancedchanges-arrow mw-enhancedchanges-arrow-space"></span>';
 		# Flag and Timestamp
 		if( $type == RC_MOVE || $type == RC_MOVE_OVER_REDIRECT ) {
 			$r .= '&#160;&#160;&#160;&#160;'; // 4 flags -> 4 spaces
diff --git a/resources/mediawiki.special/images/arrow-collapsed-ltr.png b/resources/mediawiki.special/images/arrow-collapsed-ltr.png
new file mode 100644
index 0000000000000000000000000000000000000000..467a555a4ddfb7eb746377d16d454bbb971bbcd8
GIT binary patch
literal 206
zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$3?vg*uel1OYyx~jTpcwoC<m=li`unt*Gp-K
z7LC}0ohu*j-@hLyf8p+z!s++aWA?ENsqQ%a&d|`%tK^7E*rv$TN@u?$Z*T7ot1BQ2
z7)yfuf*Bm1-ADs+96VhdLn`7zPe$@J81OhdPAa+I`1}6W%vRN3`)odyK6}D{PLFA7
z=Z@3t-nTADUpVuYG1%$$fh&`a##CH$(SLT6rHzU4#vwB{BcNFfp00i_>zopr05?rd
AvH$=8

literal 0
HcmV?d00001

diff --git a/resources/mediawiki.special/images/arrow-collapsed-rtl.png b/resources/mediawiki.special/images/arrow-collapsed-rtl.png
new file mode 100644
index 0000000000000000000000000000000000000000..f49e20a2ece71901ea2445af9a67164d308073c0
GIT binary patch
literal 257
zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$3?vg*uel1OYyx~jTpcwoC<m=li`vz>^07wj
zL1~AUg}Yu}xcfyVY?D{Xk;v3a^_YEy)9>v#{civM{Xk8IhKB4ys?L5%-rnBU)3Q$i
zg&0eM{DK)Ap4~_Tagw~<T^Kr8Wj%l#&H|6fVg?3oArNM~bhqvgP>{XE)7O>#3NtT<
zlKLO1FX=!bJ5LwKkczn66YfF{20YGzF_&K6`M)mXn1=R0FaOi^H#?G??Vl`D+I2LN
u)pEo47S}n)r*arM{NkEmZt(NSjJ;i-nI!cUc}##NF?hQAxvX<aXaWH6+E*q3

literal 0
HcmV?d00001

diff --git a/resources/mediawiki.special/images/arrow-expanded.png b/resources/mediawiki.special/images/arrow-expanded.png
new file mode 100644
index 0000000000000000000000000000000000000000..58a9fc6673baf053c5321bdee60cacc5956bde36
GIT binary patch
literal 205
zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$3?vg*uel1OYyx~jT!D1w%ExL^yB6+xxqtuu
z!s+)e-2I{+vrjo_6}ynCM(jbLf*q&d85$aTdwWYev^e`Ed6gVd3ELEzT6t~W0t=ut
zV@Z%-FoVOh8)-m}y{C&~NJU)eNq4>m2Z198IA@=D`M=&(>=kqA=A8O>+F7bbNyl~u
y*FK2gddPe^En{J$H*;n70^=i+m*m=}<nKAv$P}j6@lYCQ6oaR$pUXO@geCwQu1V|w

literal 0
HcmV?d00001

diff --git a/resources/mediawiki.special/mediawiki.special.changeslist.css b/resources/mediawiki.special/mediawiki.special.changeslist.css
index 42afbcd7e7..cdc970426a 100644
--- a/resources/mediawiki.special/mediawiki.special.changeslist.css
+++ b/resources/mediawiki.special/mediawiki.special.changeslist.css
@@ -31,20 +31,29 @@ table.mw-enhanced-rc td.mw-enhanced-rc-nested {
 	float: none;
 }
 
-/**
- * If JS is disabled, the arrow is still needed
- * for spacing, but ideally shouldn't be shown
- */
-.mw-enhanced-rc .mw-rc-openarrow {
-	visibility: hidden;
+/* If JS is disabled, the arrow shouldn't be shown */
+.client-nojs .mw-enhancedchanges-arrow.mw-collapsible-toggle {
+	display: none;
 }
 
-.mw-enhanced-rc.mw-made-collapsible .mw-rc-openarrow,
-.mw-enhanced-rc .mw-rc-closearrow {
-	visibility: visible;
-	display: none;
+.mw-enhancedchanges-arrow {
+	display: inline-block;
+	*display: inline; /* IE7 and below */
+	zoom: 1;
+	width: 15px;
+	height: 15px;
 }
-.mw-enhanced-rc.mw-made-collapsible .mw-collapsible-toggle-collapsed .mw-rc-openarrow,
-.mw-enhanced-rc.mw-made-collapsible .mw-collapsible-toggle-expanded .mw-rc-closearrow {
-	display: inline;
+
+.mw-enhancedchanges-arrow.mw-enhancedchanges-arrow-space {
+	background: none;
+}
+
+.mw-enhancedchanges-arrow.mw-collapsible-toggle-collapsed {
+	/* @embed */
+	background: url(images/arrow-collapsed-ltr.png) no-repeat left center;
+}
+
+.mw-enhancedchanges-arrow.mw-collapsible-toggle-expanded {
+	/* @embed */
+	background: url(images/arrow-expanded.png) no-repeat left center;
 }
-- 
2.20.1