| Index: trunk/extensions/CodeReview/CodeRevisionView.php |
| — | — | @@ -88,11 +88,6 @@ |
| 89 | 89 | "});</script>\n"; |
| 90 | 90 | } |
| 91 | 91 | |
| 92 | | - $changes = $this->formatPropChanges(); |
| 93 | | - if( $changes ) { |
| 94 | | - $html .= "<h2 id='code-changes'>". wfMsgHtml( 'code-prop-changes' ) ."</h2>\n" . $changes; |
| 95 | | - } |
| 96 | | - |
| 97 | 92 | $html .= '<div>' . |
| 98 | 93 | Xml::submitButton( wfMsg( 'code-rev-submit' ), array( 'name' => 'wpSave' ) ) . |
| 99 | 94 | ' ' . |
| — | — | @@ -101,6 +96,11 @@ |
| 102 | 97 | Xml::submitButton( wfMsg( 'code-rev-comment-preview' ), array( 'name' => 'wpPreview' ) ) . |
| 103 | 98 | '</div>' . |
| 104 | 99 | '</form>'; |
| | 100 | + |
| | 101 | + $changes = $this->formatPropChanges(); |
| | 102 | + if( $changes ) { |
| | 103 | + $html .= "<h2 id='code-changes'>". wfMsgHtml( 'code-prop-changes' ) ."</h2>\n" . $changes; |
| | 104 | + } |
| 105 | 105 | |
| 106 | 106 | $wgOut->addHTML( $html ); |
| 107 | 107 | } |
| — | — | @@ -206,10 +206,8 @@ |
| 207 | 207 | if( $wgUser->isAllowed( 'codereview-set-status' ) ) { |
| 208 | 208 | $repo = $this->mRepo->getName(); |
| 209 | 209 | $rev = $this->mRev->getId(); |
| 210 | | - return |
| 211 | | - Xml::openElement( 'select', array( 'name' => 'wpStatus' ) ) . |
| 212 | | - $this->buildStatusList() . |
| 213 | | - '</select>'; |
| | 210 | + return Xml::openElement( 'select', array( 'name' => 'wpStatus' ) ) . |
| | 211 | + $this->buildStatusList() . xml::closeElement('select'); |
| 214 | 212 | } else { |
| 215 | 213 | return htmlspecialchars( $this->statusDesc( $this->mRev->getStatus() ) ); |
| 216 | 214 | } |
| — | — | @@ -219,10 +217,7 @@ |
| 220 | 218 | $states = CodeRevision::getPossibleStates(); |
| 221 | 219 | $out = ''; |
| 222 | 220 | foreach( $states as $state ) { |
| 223 | | - $list[$state] = $this->statusDesc( $state ); |
| 224 | | - $out .= Xml::option( |
| 225 | | - $this->statusDesc( $state ), |
| 226 | | - $state, |
| | 221 | + $out .= Xml::option( $this->statusDesc( $state ), $state, |
| 227 | 222 | $this->mRev->getStatus() == $state ); |
| 228 | 223 | } |
| 229 | 224 | return $out; |