| Index: trunk/extensions/FlaggedRevs/presentation/language/RevisionReview.i18n.php |
| — | — | @@ -78,10 +78,9 @@ |
| 79 | 79 | |
| 80 | 80 | Please review all the changes shown below to make your edits appear in the stable version.', |
| 81 | 81 | 'revreview-update-includes' => '\'\'\'Templates/files updated (unreviewed pages in bold):\'\'\'', |
| 82 | | - 'revreview-update-use' => '\'\'\'NOTE:\'\'\' The stable version of each of these templates/files is used in the stable version of this page.', |
| 83 | 82 | |
| 84 | 83 | 'revreview-reject-header' => 'Reject changes for $1', |
| 85 | | - 'revreview-reject-text-list' => 'By completing this action, you will be \'\'\'rejecting\'\'\' the following {{PLURAL:$1|change|changes}}:', |
| | 84 | + 'revreview-reject-text-list' => 'By completing this action you will be \'\'\'rejecting\'\'\' the source text changes from the following {{PLURAL:$1|revision|revisions}} of [[:$2|$2]]:', |
| 86 | 85 | 'revreview-reject-text-revto' => 'This will revert the page back to the [{{fullurl:$1|oldid=$2}} version as of $3].', |
| 87 | 86 | 'revreview-reject-summary' => 'Summary:', |
| 88 | 87 | 'revreview-reject-confirm' => 'Reject these changes', |
| Index: trunk/extensions/FlaggedRevs/presentation/FlaggedPageView.php |
| — | — | @@ -1409,15 +1409,9 @@ |
| 1410 | 1410 | } |
| 1411 | 1411 | # Add include change list... |
| 1412 | 1412 | if ( count( $changeList ) ) { // just inclusion changes |
| 1413 | | - $changeDiv .= '<p>' . |
| | 1413 | + $changeDiv .= "<p>" . |
| 1414 | 1414 | wfMsgExt( 'revreview-update-includes', 'parseinline' ) . |
| 1415 | | - ' ' . implode( ', ', $changeList ) . '</p>'; |
| 1416 | | - # Add include usage notice... |
| 1417 | | - /* |
| 1418 | | - if ( FlaggedRevs::inclusionSetting() == FR_INCLUDES_STABLE ) { |
| 1419 | | - $changeDiv .= wfMsgExt( 'revreview-update-use', 'parse' ); |
| 1420 | | - } |
| 1421 | | - */ |
| | 1415 | + ' ' . implode( ', ', $changeList ) . "</p>\n"; |
| 1422 | 1416 | } |
| 1423 | 1417 | } |
| 1424 | 1418 | if ( $changeDiv != '' ) { |
| Index: trunk/extensions/FlaggedRevs/presentation/RevisionReviewFormUI.php |
| — | — | @@ -104,9 +104,9 @@ |
| 105 | 105 | $reviewTitle = SpecialPage::getTitleFor( 'RevisionReview' ); |
| 106 | 106 | $action = $reviewTitle->getLocalUrl( 'action=submit' ); |
| 107 | 107 | $params = array( 'method' => 'post', 'action' => $action, 'id' => 'mw-fr-reviewform' ); |
| 108 | | - $form = Xml::openElement( 'form', $params ); |
| | 108 | + $form = Xml::openElement( 'form', $params ) . "\n"; |
| 109 | 109 | $form .= Xml::openElement( 'fieldset', |
| 110 | | - array( 'class' => 'flaggedrevs_reviewform noprint' ) ); |
| | 110 | + array( 'class' => 'flaggedrevs_reviewform noprint' ) ) . "\n"; |
| 111 | 111 | # Add appropriate legend text |
| 112 | 112 | $legendMsg = $frev ? 'revreview-reflag' : 'revreview-flag'; |
| 113 | 113 | $form .= Xml::openElement( 'legend', array( 'id' => 'mw-fr-reviewformlegend' ) ); |
| — | — | @@ -136,22 +136,22 @@ |
| 137 | 137 | $form .= wfMsgExt( $msg, 'parseinline', |
| 138 | 138 | $wgLang->date( $ts, true ), $wgLang->time( $ts, true ) ); |
| 139 | 139 | } |
| 140 | | - $form .= '</span></p>'; |
| | 140 | + $form .= "</span></p>\n"; |
| 141 | 141 | } |
| 142 | 142 | |
| 143 | 143 | if ( $disabled ) { |
| 144 | 144 | $form .= Xml::openElement( 'div', array( 'class' => 'fr-rating-controls-disabled', |
| 145 | | - 'id' => 'fr-rating-controls-disabled' ) ); |
| | 145 | + 'id' => 'fr-rating-controls-disabled' ) ) . "\n"; |
| 146 | 146 | } else { |
| 147 | 147 | $form .= Xml::openElement( 'div', array( 'class' => 'fr-rating-controls', |
| 148 | | - 'id' => 'fr-rating-controls' ) ); |
| | 148 | + 'id' => 'fr-rating-controls' ) ) . "\n"; |
| 149 | 149 | } |
| 150 | 150 | |
| 151 | 151 | # Add main checkboxes/selects |
| 152 | 152 | $form .= Xml::openElement( 'span', |
| 153 | | - array( 'id' => 'mw-fr-ratingselects', 'class' => 'fr-rating-options' ) ); |
| | 153 | + array( 'id' => 'mw-fr-ratingselects', 'class' => 'fr-rating-options' ) ) . "\n"; |
| 154 | 154 | $form .= self::ratingInputs( $this->user, $flags, (bool)$disabled, (bool)$frev ); |
| 155 | | - $form .= Xml::closeElement( 'span' ); |
| | 155 | + $form .= Xml::closeElement( 'span' ) . "\n"; |
| 156 | 156 | |
| 157 | 157 | # Get template/file version info as needed |
| 158 | 158 | list( $templateIDs, $imageSHA1Keys ) = $this->getIncludeVersions(); |
| — | — | @@ -159,7 +159,8 @@ |
| 160 | 160 | list( $templateParams, $imageParams, $fileVersion ) = |
| 161 | 161 | RevisionReviewForm::getIncludeParams( $article, $templateIDs, $imageSHA1Keys ); |
| 162 | 162 | |
| 163 | | - $form .= Xml::openElement( 'span', array( 'style' => 'white-space: nowrap;' ) ); |
| | 163 | + $form .= Xml::openElement( 'span', |
| | 164 | + array( 'style' => 'white-space: nowrap;' ) ) . "\n"; |
| 164 | 165 | # Hide comment input if needed |
| 165 | 166 | if ( !$disabled ) { |
| 166 | 167 | if ( count( FlaggedRevs::getTags() ) > 1 ) { |
| — | — | @@ -181,7 +182,7 @@ |
| 182 | 183 | if ( $article->isPageLocked() ) { |
| 183 | 184 | $form .= ' ' . FlaggedRevsXML::logToggle( 'revreview-log-toggle-show' ); |
| 184 | 185 | } |
| 185 | | - $form .= Xml::closeElement( 'span' ); |
| | 186 | + $form .= Xml::closeElement( 'span' ) . "\n";; |
| 186 | 187 | # ..add the actual stability log body here |
| 187 | 188 | if ( $article->isPageLocked() ) { |
| 188 | 189 | $form .= FlaggedRevsXML::stabilityLogExcerpt( $article ); |
| — | — | @@ -206,8 +207,8 @@ |
| 207 | 208 | ); |
| 208 | 209 | $form .= Html::hidden( 'validatedParams', $checkCode ) . "\n"; |
| 209 | 210 | |
| 210 | | - $form .= Xml::closeElement( 'fieldset' ); |
| 211 | | - $form .= Xml::closeElement( 'form' ); |
| | 211 | + $form .= Xml::closeElement( 'fieldset' ) . "\n"; |
| | 212 | + $form .= Xml::closeElement( 'form' ) . "\n"; |
| 212 | 213 | |
| 213 | 214 | return array( $form, true /* ok */ ); |
| 214 | 215 | } |
| Index: trunk/extensions/FlaggedRevs/presentation/modules/review.js |
| — | — | @@ -78,6 +78,9 @@ |
| 79 | 79 | selectedlevel = levels[0].selectedIndex; |
| 80 | 80 | value = levels[0].getElementsByTagName('option')[selectedlevel].value; |
| 81 | 81 | levels[0].className = 'fr-rating-option-' + value; |
| | 82 | + // Fix FF one-time jitter bug of changing an <option> |
| | 83 | + levels[0].selectedIndex = null; |
| | 84 | + levels[0].selectedIndex = selectedlevel; |
| 82 | 85 | } |
| 83 | 86 | } |
| 84 | 87 | }, |
| Index: trunk/extensions/FlaggedRevs/presentation/RejectConfirmationFormUI.php |
| — | — | @@ -62,7 +62,7 @@ |
| 63 | 63 | |
| 64 | 64 | // List of revisions being undone... |
| 65 | 65 | $form .= wfMsgExt( 'revreview-reject-text-list', 'parseinline', |
| 66 | | - $wgLang->formatNum( count( $rejectIds ) ) ); |
| | 66 | + $wgLang->formatNum( count( $rejectIds ) ), $oldRev->getTitle()->getPrefixedText() ); |
| 67 | 67 | $form .= '<ul>'; |
| 68 | 68 | // FIXME: we need a generic revision list class...this is bullshit |
| 69 | 69 | $spRevDelete = SpecialPage::getPage( 'RevisionReview' ); |