http://www.mediawiki.org/wiki/Special:Code/MediaWiki/99131
Revision: 99131
Author: aaron
Date: 2011-10-06 19:57:23 +0000 (Thu, 06 Oct 2011)
Log Message:
-----------
* Cleaned up "cancel" button on review form to only show on diffs
* Review form HTML/CSS cleanup
Modified Paths:
--------------
trunk/extensions/FlaggedRevs/presentation/FlaggedPageView.php
trunk/extensions/FlaggedRevs/presentation/RevisionReviewFormUI.php
trunk/extensions/FlaggedRevs/presentation/modules/flaggedrevs.css
Modified: trunk/extensions/FlaggedRevs/presentation/FlaggedPageView.php
===================================================================
--- trunk/extensions/FlaggedRevs/presentation/FlaggedPageView.php
2011-10-06 19:08:37 UTC (rev 99130)
+++ trunk/extensions/FlaggedRevs/presentation/FlaggedPageView.php
2011-10-06 19:57:23 UTC (rev 99131)
@@ -1086,7 +1086,7 @@
}
# Build the review form as needed
if ( $rev && ( !$this->diffRevs || $this->isReviewableDiff ) ) {
- $form = new RevisionReviewFormUI( $reqUser,
$this->article, $rev );
+ $form = new RevisionReviewFormUI( $this->getContext(),
$this->article, $rev );
# Default tags and existence of "reject" button depend
on context
if ( $this->diffRevs ) {
$form->setDiffPriorRev( $this->diffRevs['old']
);
Modified: trunk/extensions/FlaggedRevs/presentation/RevisionReviewFormUI.php
===================================================================
--- trunk/extensions/FlaggedRevs/presentation/RevisionReviewFormUI.php
2011-10-06 19:08:37 UTC (rev 99130)
+++ trunk/extensions/FlaggedRevs/presentation/RevisionReviewFormUI.php
2011-10-06 19:57:23 UTC (rev 99131)
@@ -15,12 +15,13 @@
/**
* Generates a brief review form for a page
- * @param User $user
+ * @param RequestContext $context
* @param FlaggedPage $article
* @param Revision $rev
*/
- public function __construct( User $user, FlaggedPage $article, Revision
$rev ) {
- $this->user = $user;
+ public function __construct( IContextSource $context, FlaggedPage
$article, Revision $rev ) {
+ $this->user = $context->getUser();
+ $this->request = $context->getRequest();
$this->article = $article;
$this->rev = $rev;
}
@@ -142,7 +143,7 @@
} else {
list( $u, $ts ) = FRUserActivity::getUserReviewingPage(
$this->rev->getPage() );
}
- $form .= "<p>";
+ $form .= Xml::openElement( 'p' );
// Page under review (and not by this user)...
if ( $u !== null && $u != $this->user->getName() ) {
$form .= '<span class="fr-under-review">';
@@ -156,64 +157,69 @@
} elseif ( !$frev ) { // rev not already reviewed
$form .= '<span id="mw-fr-reviewing-status"
style="display:none;"></span>'; // JS widget
}
- $form .= "</p>\n";
+ $form .= Xml::closeElement( 'p' ) . "\n";
- if ( $disabled ) {
- $form .= Xml::openElement( 'div', array( 'class' =>
'fr-rating-controls-disabled',
- 'id' => 'fr-rating-controls-disabled' ) ) .
"\n";
- } else {
- $form .= Xml::openElement( 'div', array( 'class' =>
'fr-rating-controls',
- 'id' => 'fr-rating-controls' ) ) . "\n";
- }
+ # Start rating controls
+ $css = $disabled ? 'fr-rating-controls-disabled' :
'fr-rating-controls';
+ $form .= Xml::openElement( 'p', array( 'class' => $css, 'id' =>
'fr-rating-controls') ) . "\n";
# Add main checkboxes/selects
$form .= Xml::openElement( 'span',
array( 'id' => 'mw-fr-ratingselects', 'class' =>
'fr-rating-options' ) ) . "\n";
- $form .= self::ratingInputs( $this->user, $flags,
(bool)$disabled, (bool)$frev );
+ $form .= self::ratingInputs( $this->user, $flags,
(bool)$disabled, (bool)$frev ) . "\n";
$form .= Xml::closeElement( 'span' ) . "\n";
- # Get the file version used for File: pages as needed
- $fileKey = $this->getFileVersion();
- # Get template/file version info as needed
- list( $templateIDs, $imageSHA1Keys ) =
$this->getIncludeVersions();
- # Convert these into flat string params
- list( $templateParams, $imageParams, $fileVersion ) =
- RevisionReviewForm::getIncludeParams( $templateIDs,
$imageSHA1Keys, $fileKey );
+ # Don't put buttons & comment field on the same line as tag
inputs.
+ if ( !$disabled && !FlaggedRevs::binaryFlagging() ) { //
$disabled => no comment/buttons
+ $form .= "<br />";
+ }
- $form .= Xml::openElement( 'span',
- array( 'style' => 'white-space: nowrap;' ) ) . "\n";
+ # Start comment & buttons
+ $form .= Xml::openElement( 'span', array( 'id' =>
'mw-fr-confirmreview' ) ) . "\n";
+
# Hide comment input if needed
if ( !$disabled ) {
- if ( count( FlaggedRevs::getTags() ) > 1 ) {
- $form .= "<br />"; // Don't put too much on one
line
- }
- $form .= "<span id='mw-fr-commentbox'
style='clear:both'>" .
- Xml::inputLabel( wfMsg( 'revreview-log' ),
'wpReason', 'wpReason', 40, '',
- array( 'maxlength' => 255, 'class' =>
'fr-comment-box' ) ) .
- "   </span>\n";
+ $form .= Xml::inputLabel(
+ wfMsg( 'revreview-log' ), 'wpReason',
'wpReason', 40, '',
+ array( 'maxlength' => 255, 'id' =>
'mw-fr-commentbox', 'class' => 'fr-comment-box' )
+ );
+ $form .= "   " . "\n";
}
- # Determine if there will be reject button
- $rejectId = $this->rejectRefRevId();
- # Add the submit buttons
+ # Add the submit buttons...
+ $rejectId = $this->rejectRefRevId(); // determine if there will
be reject button
$form .= self::submitButtons( $rejectId, $frev,
(bool)$disabled, $reviewIncludes );
- # Add "cancel" link
- $form .= Linker::link( $article->getTitle(), wfMsg(
'revreview-cancel' ) );
+ if ( $this->request->getVal( 'diff' ) ) {
+ $form .= Linker::link( $this->article->getTitle(),
wfMsg( 'revreview-cancel' ) );
+ }
# Show stability log if there is anything interesting...
if ( $article->isPageLocked() ) {
$form .= ' ' . FlaggedRevsXML::logToggle(
'revreview-log-toggle-show' );
}
- $form .= Xml::closeElement( 'span' ) . "\n";;
+
+ # End comment & buttons
+ $form .= Xml::closeElement( 'span' ) . "\n";
+
# ..add the actual stability log body here
- if ( $article->isPageLocked() ) {
+ if ( $article->isPageLocked() ) {
$form .= FlaggedRevsXML::stabilityLogExcerpt( $article
);
}
- $form .= Xml::closeElement( 'div' ) . "\n";
+ # End rating controls
+ $form .= Xml::closeElement( 'p' ) . "\n";
+
# Show explanatory text
$form .= $this->bottomNotice;
+ # Get the file version used for File: pages as needed
+ $fileKey = $this->getFileVersion();
+ # Get template/file version info as needed
+ list( $templateIDs, $imageSHA1Keys ) =
$this->getIncludeVersions();
+ # Convert these into flat string params
+ list( $templateParams, $imageParams, $fileVersion ) =
+ RevisionReviewForm::getIncludeParams( $templateIDs,
$imageSHA1Keys, $fileKey );
+
# Hidden params
$form .= Html::hidden( 'title', $reviewTitle->getPrefixedText()
) . "\n";
$form .= Html::hidden( 'target',
$article->getTitle()->getPrefixedDBKey() ) . "\n";
Modified: trunk/extensions/FlaggedRevs/presentation/modules/flaggedrevs.css
===================================================================
--- trunk/extensions/FlaggedRevs/presentation/modules/flaggedrevs.css
2011-10-06 19:08:37 UTC (rev 99130)
+++ trunk/extensions/FlaggedRevs/presentation/modules/flaggedrevs.css
2011-10-06 19:57:23 UTC (rev 99131)
@@ -317,8 +317,12 @@
color: GrayText;
}
+#mw-fr-confirmreview {
+ white-space: nowrap;
+}
.fr-rating-options {
margin-right: 1.5em;
+ white-space: nowrap;
}
.fr-rating-option-0 {
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
