| Index: trunk/extensions/FlaggedRevs/FlaggedRevs.php |
| — | — | @@ -14,7 +14,7 @@ |
| 15 | 15 | $wgExtensionCredits['specialpage'][] = array( |
| 16 | 16 | 'name' => 'Flagged Revisions', |
| 17 | 17 | 'author' => array( 'Aaron Schulz', 'Joerg Baach' ), |
| 18 | | - 'version' => '1.027', |
| | 18 | + 'version' => '1.0271', |
| 19 | 19 | 'url' => 'http://www.mediawiki.org/wiki/Extension:FlaggedRevs', |
| 20 | 20 | 'descriptionmsg' => 'flaggedrevs-desc', |
| 21 | 21 | ); |
| — | — | @@ -169,7 +169,7 @@ |
| 170 | 170 | ######### |
| 171 | 171 | |
| 172 | 172 | # Bump this number every time you change flaggedrevs.css/flaggedrevs.js |
| 173 | | -$wgFlaggedRevStyleVersion = 8; |
| | 173 | +$wgFlaggedRevStyleVersion = 9; |
| 174 | 174 | |
| 175 | 175 | $wgExtensionFunctions[] = 'efLoadFlaggedRevs'; |
| 176 | 176 | |
| — | — | @@ -223,6 +223,7 @@ |
| 224 | 224 | ######### Hook attachments ######### |
| 225 | 225 | $wgHooks['OutputPageParserOutput'][] = 'FlaggedRevs::InjectStyle'; |
| 226 | 226 | $wgHooks['EditPage::showEditForm:initial'][] = 'FlaggedRevs::InjectStyle'; |
| | 227 | + $wgHooks['PageHistoryBeforeList'][] = 'FlaggedRevs::InjectStyle'; |
| 227 | 228 | # Main hooks, overrides pages content, adds tags, sets tabs and permalink |
| 228 | 229 | $wgHooks['SkinTemplateTabs'][] = array( $wgFlaggedArticle, 'setActionTabs' ); |
| 229 | 230 | # Update older, incomplete, page caches (ones that lack template Ids/image timestamps) |
| Index: trunk/extensions/FlaggedRevs/flaggedrevs.css |
| — | — | @@ -107,30 +107,6 @@ |
| 108 | 108 | line-height: 16px; |
| 109 | 109 | } |
| 110 | 110 | |
| 111 | | -.fr-icon-current, |
| 112 | | -.fr-icon-stable, |
| 113 | | -.fr-icon-quality { |
| 114 | | - padding: 0px; |
| 115 | | - margin: 0px; |
| 116 | | - width: 20px; |
| 117 | | - height: 18px; |
| 118 | | - position: relative; |
| 119 | | - float: left; |
| 120 | | - vertical-align: middle; |
| 121 | | - background-repeat: no-repeat; |
| 122 | | - background-position: 0px 0px; |
| 123 | | -} |
| 124 | | - |
| 125 | | -.fr-icon-current { |
| 126 | | - background-image: url(../FlaggedRevs/img/1.png); |
| 127 | | -} |
| 128 | | -.fr-icon-stable { |
| 129 | | - background-image: url(../FlaggedRevs/img/2.png); |
| 130 | | -} |
| 131 | | -.fr-icon-quality { |
| 132 | | - background-image: url(../FlaggedRevs/img/3.png); |
| 133 | | -} |
| 134 | | - |
| 135 | 111 | .fr-text { |
| 136 | 112 | height: 1em; |
| 137 | 113 | line-height: 1em; |
| — | — | @@ -170,39 +146,39 @@ |
| 171 | 147 | background-image: url(../FlaggedRevs/img/fr-marker-100.png); |
| 172 | 148 | } |
| 173 | 149 | |
| 174 | | -.flaggedrevs_box0, |
| 175 | | -.flaggedrevs_box1, |
| 176 | | -.flaggedrevs_box2, |
| 177 | | -.flaggedrevs_box3 { |
| | 150 | +.flaggedrevs-box0, |
| | 151 | +.flaggedrevs-box1, |
| | 152 | +.flaggedrevs-box2, |
| | 153 | +.flaggedrevs-box3 { |
| 178 | 154 | border: 1px solid #aaa; |
| 179 | 155 | text-align: center; |
| 180 | 156 | font-size: 85%; |
| 181 | 157 | clear: both; |
| 182 | 158 | } |
| 183 | 159 | |
| 184 | | -.flaggedrevs_box0 { |
| | 160 | +.flaggedrevs-box0 { |
| 185 | 161 | background-color: #f9f9f9; |
| 186 | 162 | } |
| 187 | | -.flaggedrevs_box1 { |
| | 163 | +.flaggedrevs-box1 { |
| 188 | 164 | background-color: #f0f8ff; |
| 189 | 165 | } |
| 190 | | -.flaggedrevs_box2 { |
| | 166 | +.flaggedrevs-box2 { |
| 191 | 167 | background-color: #f0fff0; |
| 192 | 168 | } |
| 193 | | -.flaggedrevs_box3 { |
| | 169 | +.flaggedrevs-box3 { |
| 194 | 170 | background-color: #fffff0; |
| 195 | 171 | } |
| 196 | 172 | |
| 197 | | -.flaggedrevs_box0a { |
| | 173 | +.flaggedrevs-color-0 { |
| 198 | 174 | background-color: #f9f9f9; |
| 199 | 175 | } |
| 200 | | -.flaggedrevs_box1a { |
| | 176 | +.flaggedrevs-color-1 { |
| 201 | 177 | background-color: #f0f8ff; |
| 202 | 178 | } |
| 203 | | -.flaggedrevs_box2a { |
| | 179 | +.flaggedrevs-color-2 { |
| 204 | 180 | background-color: #f0fff0; |
| 205 | 181 | } |
| 206 | | -.flaggedrevs_box3a { |
| | 182 | +.flaggedrevs-color-3 { |
| 207 | 183 | background-color: #fffff0; |
| 208 | 184 | } |
| 209 | 185 | |
| — | — | @@ -211,6 +187,27 @@ |
| 212 | 188 | color: blue; |
| 213 | 189 | } |
| 214 | 190 | |
| | 191 | +.fr-icon-current, |
| | 192 | +.fr-icon-stable, |
| | 193 | +.fr-icon-quality { |
| | 194 | + padding: 0px; |
| | 195 | + margin: 0px; |
| | 196 | + width: 18px; |
| | 197 | + height: 18px; |
| | 198 | + float: left; |
| | 199 | + background-repeat: no-repeat; |
| | 200 | + background-position: center center; |
| | 201 | +} |
| | 202 | +.fr-icon-current { |
| | 203 | + background-image: url(../FlaggedRevs/img/1.png); |
| | 204 | +} |
| | 205 | +.fr-icon-stable { |
| | 206 | + background-image: url(../FlaggedRevs/img/2.png); |
| | 207 | +} |
| | 208 | +.fr-icon-quality { |
| | 209 | + background-image: url(../FlaggedRevs/img/3.png); |
| | 210 | +} |
| | 211 | + |
| 215 | 212 | /* Review form */ |
| 216 | 213 | .flaggedrevs_reviewform { |
| 217 | 214 | background-color: #f9f9f9; |
| Index: trunk/extensions/FlaggedRevs/FlaggedArticle.php |
| — | — | @@ -698,10 +698,22 @@ |
| 699 | 699 | |
| 700 | 700 | if( $quality !== false ) { |
| 701 | 701 | $skin = $wgUser->getSkin(); |
| 702 | | - |
| | 702 | + $quality = intval($quality); |
| | 703 | + switch( $quality ) { |
| | 704 | + case 2: |
| | 705 | + $css = 'flaggedrevs-color-3'; |
| | 706 | + break; |
| | 707 | + case 1: |
| | 708 | + $css = 'flaggedrevs-color-2'; |
| | 709 | + break; |
| | 710 | + default: |
| | 711 | + $css = 'flaggedrevs-color-1'; |
| | 712 | + break; |
| | 713 | + } |
| 703 | 714 | $msg = ($quality >= 1) ? 'hist-quality' : 'hist-stable'; |
| 704 | | - $s .= ' <small><strong>[' . $skin->makeLinkObj( $wgTitle, wfMsgHtml( $msg ), |
| 705 | | - 'stableid=' . $row->rev_id ) . ']</strong></small>'; |
| | 715 | + $s = "<span class='$css'>{$s}</span> <small><strong>[" . |
| | 716 | + $skin->makeLinkObj( $wgTitle, wfMsgHtml( $msg ),'stableid=' . $row->rev_id ) . |
| | 717 | + "]</strong></small>"; |
| 706 | 718 | } |
| 707 | 719 | |
| 708 | 720 | return true; |
| — | — | @@ -895,12 +907,16 @@ |
| 896 | 908 | $pristine = FlaggedRevs::isPristine( $flags ); |
| 897 | 909 | $time = $wgLang->date( $frev->getTimestamp(), true ); |
| 898 | 910 | # Some checks for which tag CSS to use |
| 899 | | - if( $pristine ) |
| 900 | | - $tagClass = 'flaggedrevs_box3'; |
| 901 | | - else if( $quality ) |
| 902 | | - $tagClass = 'flaggedrevs_box2'; |
| 903 | | - else |
| 904 | | - $tagClass = 'flaggedrevs_box1'; |
| | 911 | + if( $pristine ) { |
| | 912 | + $tagClass = 'flaggedrevs-box3'; |
| | 913 | + $color = 'flaggedrevs-color-3'; |
| | 914 | + } else if( $quality ) { |
| | 915 | + $tagClass = 'flaggedrevs-box2'; |
| | 916 | + $color = 'flaggedrevs-color-2'; |
| | 917 | + } else { |
| | 918 | + $tagClass = 'flaggedrevs-box1'; |
| | 919 | + $color = 'flaggedrevs-color-1'; |
| | 920 | + } |
| 905 | 921 | # Construct some tagging |
| 906 | 922 | if( $synced ) { |
| 907 | 923 | $msg = $quality ? 'revreview-quality-same' : 'revreview-basic-same'; |
| — | — | @@ -920,7 +936,7 @@ |
| 921 | 937 | $box .= '<div id="mw-revisionratings" style="clear: both;">' . $html; |
| 922 | 938 | # Add ratings if there are any... |
| 923 | 939 | if( $stable && !empty($flags) ) { |
| 924 | | - $box .= $this->addTagRatings( $flags, true, "{$tagClass}a" ); |
| | 940 | + $box .= $this->addTagRatings( $flags, true, $color ); |
| 925 | 941 | } |
| 926 | 942 | $box .= '</div>'; |
| 927 | 943 | |