r60194 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r60193‎ | r60194 | r60195 >
Date:00:20, 18 December 2009
Author:aaron
Status:resolved (Comments)
Tags:
Comment:
* reviewedpages
**Don't show level menu when there is only one
**Don't show "go" when there are no fields
* stablepages
** general form cleanup/fixes
Modified paths:
  • /trunk/extensions/FlaggedRevs/specialpages/ReviewedPages_body.php (modified) (history)
  • /trunk/extensions/FlaggedRevs/specialpages/StablePages_body.php (modified) (history)

Diff [purge]

Index: trunk/extensions/FlaggedRevs/specialpages/ReviewedPages_body.php
@@ -42,14 +42,20 @@
4343 );
4444 $showhideredirs = wfMsgHtml( 'whatlinkshere-hideredirs', $link );
4545
 46+ $fields = array();
4647 $namespaces = FlaggedRevs::getReviewNamespaces();
4748 if( count($namespaces) > 1 ) {
48 - $form .= FlaggedRevsXML::getNamespaceMenu( $this->namespace ) . ' ';
 49+ $fields[] = FlaggedRevsXML::getNamespaceMenu( $this->namespace ) . ' ';
4950 }
50 - $form .= FlaggedRevsXML::getLevelMenu( $this->type ) . ' ';
51 - $form .= $showhideredirs . ' ';
 51+ if( FlaggedRevs::qualityVersions() ) {
 52+ $fields[] = FlaggedRevsXML::getLevelMenu( $this->type ) . ' ';
 53+ }
 54+ $form .= implode(' ',$fields) . ' ';
 55+ $form .= $showhideredirs;
5256
53 - $form .= " ".Xml::submitButton( wfMsg( 'go' ) );
 57+ if( count($fields) ) {
 58+ $form .= " ".Xml::submitButton( wfMsg( 'go' ) );
 59+ }
5460 $form .= Xml::hidden( 'title', $this->getTitle()->getPrefixedDBKey() );
5561 $form .= "</fieldset></form>\n";
5662
Index: trunk/extensions/FlaggedRevs/specialpages/StablePages_body.php
@@ -26,16 +26,23 @@
2727 protected function showForm() {
2828 global $wgOut, $wgScript;
2929 $wgOut->addHTML( wfMsgExt('stablepages-text', array('parseinline') ) );
 30+ $fields = array();
3031 $namespaces = FlaggedRevs::getReviewNamespaces();
3132 if( count($namespaces) > 1 ) {
 33+ $fields[] = FlaggedRevsXML::getNamespaceMenu( $this->namespace );
 34+ }
 35+ if( FlaggedRevs::qualityVersions() ) {
 36+ $fields[] = Xml::label( wfMsg('stablepages-precedence'), 'wpPrecedence' ) .
 37+ '&nbsp;' . FlaggedRevsXML::getPrecedenceMenu( $this->precedence );
 38+ }
 39+ if( count($fields) ) {
3240 $form = Xml::openElement( 'form', array( 'name' => 'stablepages', 'action' => $wgScript, 'method' => 'get' ) );
3341 $form .= "<fieldset><legend>".wfMsg('stablepages')."</legend>\n";
34 - $form .= FlaggedRevsXML::getNamespaceMenu( $this->namespace ) . '&nbsp;';
35 - $form .= Xml::label( wfMsg('stablepages-precedence'), 'wpPrecedence' ) . '&nbsp;';
36 - $form .= FlaggedRevsXML::getPrecedenceMenu( $this->precedence ) . '&nbsp;';
 42+ $form .= implode('&nbsp',$fields) . '&nbsp';
3743 $form .= " ".Xml::submitButton( wfMsg( 'go' ) );
3844 $form .= Xml::hidden( 'title', $this->getTitle()->getPrefixedDBKey() );
39 - $form .= "</fieldset></form>\n";
 45+ $form .= "</fieldset>\n";
 46+ $form .= Xml::closeElement( 'form' );
4047 $wgOut->addHTML( $form );
4148 }
4249 }

Follow-up revisions

RevisionCommit summaryAuthorDate
r60977Fixed typo from r60194aaron19:10, 12 January 2010

Comments

#Comment by Tim Starling (talk | contribs)   06:25, 12 January 2010

Invalid HTML entity "&nbsp", should have a semicolon:

+			$form .= implode('&nbsp',$fields) . '&nbsp';

Status & tagging log