| Index: trunk/phase3/includes/specials/SpecialVersion.php |
| — | — | @@ -199,24 +199,24 @@ |
| 200 | 200 | |
| 201 | 201 | if ( count( $wgExtensionFunctions ) ) { |
| 202 | 202 | $out .= $this->openExtType( wfMsg( 'version-extension-functions' ) ); |
| 203 | | - $out .= '<tr><td colspan="3">' . $this->listToText( $wgExtensionFunctions ) . "</td></tr>\n"; |
| | 203 | + $out .= '<tr><td colspan="4">' . $this->listToText( $wgExtensionFunctions ) . "</td></tr>\n"; |
| 204 | 204 | } |
| 205 | 205 | |
| 206 | 206 | if ( $cnt = count( $tags = $wgParser->getTags() ) ) { |
| 207 | 207 | for ( $i = 0; $i < $cnt; ++$i ) |
| 208 | 208 | $tags[$i] = "<{$tags[$i]}>"; |
| 209 | 209 | $out .= $this->openExtType( wfMsg( 'version-parser-extensiontags' ) ); |
| 210 | | - $out .= '<tr><td colspan="3">' . $this->listToText( $tags ). "</td></tr>\n"; |
| | 210 | + $out .= '<tr><td colspan="4">' . $this->listToText( $tags ). "</td></tr>\n"; |
| 211 | 211 | } |
| 212 | 212 | |
| 213 | 213 | if( $cnt = count( $fhooks = $wgParser->getFunctionHooks() ) ) { |
| 214 | 214 | $out .= $this->openExtType( wfMsg( 'version-parser-function-hooks' ) ); |
| 215 | | - $out .= '<tr><td colspan="3">' . $this->listToText( $fhooks ) . "</td></tr>\n"; |
| | 215 | + $out .= '<tr><td colspan="4">' . $this->listToText( $fhooks ) . "</td></tr>\n"; |
| 216 | 216 | } |
| 217 | 217 | |
| 218 | 218 | if ( count( $wgSkinExtensionFunctions ) ) { |
| 219 | 219 | $out .= $this->openExtType( wfMsg( 'version-skin-extension-functions' ) ); |
| 220 | | - $out .= '<tr><td colspan="3">' . $this->listToText( $wgSkinExtensionFunctions ) . "</td></tr>\n"; |
| | 220 | + $out .= '<tr><td colspan="4">' . $this->listToText( $wgSkinExtensionFunctions ) . "</td></tr>\n"; |
| 221 | 221 | } |
| 222 | 222 | $out .= Xml::closeElement( 'table' ); |
| 223 | 223 | return $out; |
| — | — | @@ -235,6 +235,7 @@ |
| 236 | 236 | } |
| 237 | 237 | |
| 238 | 238 | function formatCredits( $name, $version = null, $subVersion = null, $subVersionCo = null, $subVersionURL = null, $author = null, $url = null, $description = null, $descriptionMsg = null ) { |
| | 239 | + $haveSubversion = $subVersion; |
| 239 | 240 | $extension = isset( $url ) ? "[$url $name]" : $name; |
| 240 | 241 | $version = isset( $version ) ? wfMsg( 'version-version', $version ) : ''; |
| 241 | 242 | $subVersion = isset( $subVersion ) ? wfMsg( 'version-svn-revision', $subVersion, $subVersionCo ) : ''; |
| — | — | @@ -248,11 +249,19 @@ |
| 249 | 250 | } |
| 250 | 251 | } |
| 251 | 252 | |
| 252 | | - return "<tr> |
| 253 | | - <td><em>$extension $version $subVersion</em></td> |
| 254 | | - <td>$description</td> |
| 255 | | - <td>" . $this->listToText( (array)$author ) . "</td> |
| 256 | | - </tr>\n"; |
| | 253 | + if ( $haveSubversion ) { |
| | 254 | + $extNameVer = "<tr> |
| | 255 | + <td><em>$extension $version</em></td> |
| | 256 | + <td><em>$subVersion</em></td>"; |
| | 257 | + } else { |
| | 258 | + $extNameVer = "<tr> |
| | 259 | + <td colspan=\"2\"><em>$extension $version</em></td>"; |
| | 260 | + } |
| | 261 | + $extDescAuthor = "<td>$description</td> |
| | 262 | + <td>" . $this->listToText( (array)$author ) . "</td> |
| | 263 | + </tr>\n"; |
| | 264 | + return $ret = $extNameVer . $extDescAuthor; |
| | 265 | + return $ret; |
| 257 | 266 | } |
| 258 | 267 | |
| 259 | 268 | /** |
| — | — | @@ -285,7 +294,7 @@ |
| 286 | 295 | } |
| 287 | 296 | |
| 288 | 297 | private function openExtType($text, $name = null) { |
| 289 | | - $opt = array( 'colspan' => 3 ); |
| | 298 | + $opt = array( 'colspan' => 4 ); |
| 290 | 299 | $out = ''; |
| 291 | 300 | |
| 292 | 301 | if(!$this->firstExtOpened) { |