From a2462d8fcd4a5cf454da040a7d3de9d4b99a65b9 Mon Sep 17 00:00:00 2001 From: Chad Horohoe Date: Wed, 29 Jul 2009 22:15:52 +0000 Subject: [PATCH] * (bug 16311) Make recent change flags acronyms instead of spans. Also move this crap to common, we don't need identical declarations in 5 different skins. --- RELEASE-NOTES | 1 + includes/ChangesList.php | 6 +++--- includes/PageHistory.php | 2 +- includes/diff/DifferenceEngine.php | 4 ++-- includes/specials/SpecialContributions.php | 4 ++-- includes/specials/SpecialDeletedContributions.php | 2 +- skins/chick/main.css | 3 --- skins/common/shared.css | 5 +++++ skins/modern/main.css | 5 ----- skins/monobook/main.css | 3 --- skins/vector/main-ltr.css | 5 +---- skins/vector/main-rtl.css | 5 +---- 12 files changed, 17 insertions(+), 28 deletions(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index f4fd47dc55..2095a68706 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -348,6 +348,7 @@ this. Was used when mwEmbed was going to be an extension. longer sent * (bug 19957) All known-failing tests now marked disabled; added --run-disabled option to parser test suite to run disabled tests if desired. +* (bug 16311) Make recent change flags (n/m/b) s instead of s == API changes in 1.16 == diff --git a/includes/ChangesList.php b/includes/ChangesList.php index 66ca29491b..cf6db5b0c5 100644 --- a/includes/ChangesList.php +++ b/includes/ChangesList.php @@ -87,10 +87,10 @@ class ChangesList { */ protected function recentChangesFlags( $new, $minor, $patrolled, $nothing = ' ', $bot = false ) { $f = $new ? - '' . $this->message['newpageletter'] . '' : $nothing; + '' . $this->message['newpageletter'] . '' : $nothing; $f .= $minor ? - '' . $this->message['minoreditletter'] . '' : $nothing; - $f .= $bot ? '' . $this->message['boteditletter'] . '' : $nothing; + '' . $this->message['minoreditletter'] . '' : $nothing; + $f .= $bot ? '' . $this->message['boteditletter'] . '' : $nothing; $f .= $patrolled ? '!' : $nothing; return $f; } diff --git a/includes/PageHistory.php b/includes/PageHistory.php index 6e80eb3275..1a36f16b6f 100644 --- a/includes/PageHistory.php +++ b/includes/PageHistory.php @@ -321,7 +321,7 @@ class PageHistory { $s .= " " . $this->mSkin->revUserTools( $rev, true ) . ""; if( $rev->isMinor() ) { - $s .= ' ' . Xml::element( 'span', array( 'class' => 'minor' ), wfMsg( 'minoreditletter') ); + $s .= ' ' . Xml::element( 'abbr', array( 'class' => 'minor' ), wfMsg( 'minoreditletter') ); } if( !is_null( $size = $rev->getSize() ) && !$rev->isDeleted( Revision::DELETED_TEXT ) ) { diff --git a/includes/diff/DifferenceEngine.php b/includes/diff/DifferenceEngine.php index d1c2888ab6..b789d87879 100644 --- a/includes/diff/DifferenceEngine.php +++ b/includes/diff/DifferenceEngine.php @@ -304,10 +304,10 @@ CONTROL; $newminor = ''; if( $this->mOldRev->isMinor() ) { - $oldminor = Xml::span( wfMsg( 'minoreditletter' ), 'minor' ) . ' '; + $oldminor = Xml::element( 'abbr', array( 'class' => 'minor' ), wfMsg( 'minoreditletter') ) . ' '; } if( $this->mNewRev->isMinor() ) { - $newminor = Xml::span( wfMsg( 'minoreditletter' ), 'minor' ) . ' '; + $newminor = Xml::element( 'abbr', array( 'class' => 'minor' ), wfMsg( 'minoreditletter') ) . ' '; } $rdel = ''; $ldel = ''; diff --git a/includes/specials/SpecialContributions.php b/includes/specials/SpecialContributions.php index c21329368c..21cb838a58 100644 --- a/includes/specials/SpecialContributions.php +++ b/includes/specials/SpecialContributions.php @@ -562,13 +562,13 @@ class ContribsPager extends ReverseChronologicalPager { } if( $rev->getParentId() === 0 ) { - $nflag = '' . $this->messages['newpageletter'] . ''; + $nflag = '' . $this->messages['newpageletter'] . ''; } else { $nflag = ''; } if( $rev->isMinor() ) { - $mflag = '' . $this->messages['minoreditletter'] . ' '; + $mflag = '' . $this->messages['minoreditletter'] . ' '; } else { $mflag = ''; } diff --git a/includes/specials/SpecialDeletedContributions.php b/includes/specials/SpecialDeletedContributions.php index 79bd134b89..3ac6b79b70 100644 --- a/includes/specials/SpecialDeletedContributions.php +++ b/includes/specials/SpecialDeletedContributions.php @@ -183,7 +183,7 @@ class DeletedContribsPager extends IndexPager { $pagelink = $sk->link( $page ); if( $rev->isMinor() ) { - $mflag = '' . $this->messages['minoreditletter'] . ' '; + $mflag = '' . $this->messages['minoreditletter'] . ' '; } else { $mflag = ''; } diff --git a/skins/chick/main.css b/skins/chick/main.css index ef52a7962b..dd231b9b9b 100644 --- a/skins/chick/main.css +++ b/skins/chick/main.css @@ -376,9 +376,6 @@ div.patrollink { font-size: 75%; text-align: right; } -span.newpage, span.minor { - font-weight: bold; -} span.updatedmarker { color:black; diff --git a/skins/common/shared.css b/skins/common/shared.css index e99e926d25..127ab6fd62 100644 --- a/skins/common/shared.css +++ b/skins/common/shared.css @@ -435,6 +435,11 @@ td.os-suggest-result-hl { border: 1px dashed #aaa; } +/** Generic minor/bot/newpage styling */ +abbr.newpage, abbr.minor, abbr.bot { + font-weight: bold; +} + /* Special:Contributions styling */ .mw-uctop { font-weight: bold; diff --git a/skins/modern/main.css b/skins/modern/main.css index 909c03c3da..dedf1a7503 100644 --- a/skins/modern/main.css +++ b/skins/modern/main.css @@ -633,11 +633,6 @@ img.thumbborder { display: none; } - -span.newpage, span.minor, span.bot { - font-weight: bold; -} - .sharedUploadNotice { font-style: italic; } diff --git a/skins/monobook/main.css b/skins/monobook/main.css index d545f9525f..ab91779f1a 100644 --- a/skins/monobook/main.css +++ b/skins/monobook/main.css @@ -1125,9 +1125,6 @@ div#userloginForm .captcha { div.patrollink { clear: both; } -span.newpage, span.minor, span.bot { - font-weight: bold; -} .sharedUploadNotice { font-style: italic; diff --git a/skins/vector/main-ltr.css b/skins/vector/main-ltr.css index 69005eaa6c..99cd93287e 100644 --- a/skins/vector/main-ltr.css +++ b/skins/vector/main-ltr.css @@ -980,10 +980,7 @@ table.small { padding-left: 15px !important; text-transform: none; } -/* To be sorted */ -span.newpage, span.minor, span.bot { - font-weight: bold; -} + .toccolours { border: 1px solid #aaa; background-color: #f9f9f9; diff --git a/skins/vector/main-rtl.css b/skins/vector/main-rtl.css index 8d6bc0986a..f2c67be70e 100644 --- a/skins/vector/main-rtl.css +++ b/skins/vector/main-rtl.css @@ -980,10 +980,7 @@ table.small { padding-right: 15px !important; text-transform: none; } -/* To be sorted */ -span.newpage, span.minor, span.bot { - font-weight: bold; -} + .toccolours { border: 1px solid #aaa; background-color: #f9f9f9; -- 2.20.1