| Index: trunk/phase3/skins/Vector.php |
| — | — | @@ -177,6 +177,16 @@ |
| 178 | 178 | <!-- bodytext --> |
| 179 | 179 | <?php $this->html( 'bodytext' ) ?> |
| 180 | 180 | <!-- /bodytext --> |
| | 181 | + <?php if ( $this->data['printfooter'] ): ?> |
| | 182 | + <!-- printfooter --> |
| | 183 | + <div class="printfooter"> |
| | 184 | + <?php $this->html( 'printfooter' ); ?> |
| | 185 | + </div> |
| | 186 | + <!-- /printfooter --> |
| | 187 | + <?php endif; ?> |
| | 188 | + <!-- debughtml --> |
| | 189 | + <?php $this->html('debughtml'); ?> |
| | 190 | + <!-- /debughtml --> |
| 181 | 191 | <?php if ( $this->data['catlinks'] ): ?> |
| 182 | 192 | <!-- catlinks --> |
| 183 | 193 | <?php $this->html( 'catlinks' ); ?> |
| Index: trunk/phase3/skins/MonoBook.php |
| — | — | @@ -91,6 +91,8 @@ |
| 92 | 92 | <?php } ?> |
| 93 | 93 | <!-- start content --> |
| 94 | 94 | <?php $this->html('bodytext') ?> |
| | 95 | + <?php if($this->data['printfooter']) { ?><div class="printfooter"><?php $this->html('printfooter'); ?></div><?php } ?> |
| | 96 | + <?php $this->html('debughtml'); ?> |
| 95 | 97 | <?php if($this->data['catlinks']) { $this->html('catlinks'); } ?> |
| 96 | 98 | <!-- end content --> |
| 97 | 99 | <?php if($this->data['dataAfterContent']) { $this->html ('dataAfterContent'); } ?> |
| Index: trunk/phase3/skins/Modern.php |
| — | — | @@ -85,6 +85,8 @@ |
| 86 | 86 | <?php if($this->data['showjumplinks']) { ?><div id="jump-to-nav"><?php $this->msg('jumpto') ?> <a href="#mw_portlets"><?php $this->msg('jumptonavigation') ?></a>, <a href="#searchInput"><?php $this->msg('jumptosearch') ?></a></div><?php } ?> |
| 87 | 87 | |
| 88 | 88 | <?php $this->html('bodytext') ?> |
| | 89 | + <?php if($this->data['printfooter']) { ?><div class="printfooter"><?php $this->html('printfooter'); ?></div><?php } ?> |
| | 90 | + <?php $this->html('debughtml'); ?> |
| 89 | 91 | <div class='mw_clear'></div> |
| 90 | 92 | <?php if($this->data['catlinks']) { $this->html('catlinks'); } ?> |
| 91 | 93 | <?php $this->html ('dataAfterContent') ?> |
| Index: trunk/phase3/includes/SkinLegacy.php |
| — | — | @@ -68,6 +68,10 @@ |
| 69 | 69 | $this->html( 'headelement' ); |
| 70 | 70 | echo $this->beforeContent(); |
| 71 | 71 | $this->html( 'bodytext' ); |
| | 72 | + echo '<div class=\"printfooter\">'; |
| | 73 | + $this->html( 'printfooter' ); |
| | 74 | + echo '</div>'; |
| | 75 | + $this->html( 'debughtml' ); |
| 72 | 76 | echo "\n"; |
| 73 | 77 | echo $this->afterContent(); |
| 74 | 78 | $this->html( 'dataAfterContent' ); |
| Index: trunk/phase3/includes/SkinTemplate.php |
| — | — | @@ -452,15 +452,13 @@ |
| 453 | 453 | $tpl->set( 'reporttime', wfReportTime() ); |
| 454 | 454 | $tpl->set( 'sitenotice', $this->getSiteNotice() ); |
| 455 | 455 | $tpl->set( 'bottomscripts', $this->bottomScripts( $out ) ); |
| | 456 | + $tpl->set( 'printfooter', $this->printSource() ); |
| 456 | 457 | |
| 457 | | - // @todo Give printfooter userlangattributes |
| 458 | | - $printfooter = "<div class=\"printfooter\">\n" . $this->printSource() . "</div>\n"; |
| 459 | 458 | global $wgBetterDirectionality; |
| 460 | 459 | if ( $wgBetterDirectionality ) { |
| 461 | 460 | $realBodyAttribs = array( 'lang' => $wgLanguageCode, 'dir' => $wgContLang->getDir() ); |
| 462 | 461 | $out->mBodytext = Html::rawElement( 'div', $realBodyAttribs, $out->mBodytext ); |
| 463 | 462 | } |
| 464 | | - $out->mBodytext .= $printfooter . $this->generateDebugHTML( $out ); |
| 465 | 463 | $tpl->setRef( 'bodytext', $out->mBodytext ); |
| 466 | 464 | |
| 467 | 465 | # Language links |
| — | — | @@ -508,6 +506,8 @@ |
| 509 | 507 | $tpl->set( 'headscripts', $out->getScript() ); |
| 510 | 508 | } |
| 511 | 509 | |
| | 510 | + $tpl->set( 'debughtml', $this->generateDebugHTML( $out ) ); |
| | 511 | + |
| 512 | 512 | // original version by hansm |
| 513 | 513 | if( !wfRunHooks( 'SkinTemplateOutputPageBeforeExec', array( &$this, &$tpl ) ) ) { |
| 514 | 514 | wfDebug( __METHOD__ . ": Hook SkinTemplateOutputPageBeforeExec broke outputPage execution!\n" ); |
| Index: trunk/extensions/skins/Daddio/Daddio.class.php |
| — | — | @@ -99,6 +99,8 @@ |
| 100 | 100 | <?php if($this->data['showjumplinks']) { ?><div id="jump-to-nav"><?php $this->msg('jumpto') ?> <a href="#column-one"><?php $this->msg('jumptonavigation') ?></a>, <a href="#searchInput"><?php $this->msg('jumptosearch') ?></a></div><?php } ?> |
| 101 | 101 | |
| 102 | 102 | <?php $this->html('bodytext') ?> |
| | 103 | + <?php if(isset($this->data['printfooter'])) { ?><div class="printfooter"><?php $this->html('printfooter'); ?></div><?php } ?> |
| | 104 | + <?php if(isset($this->data['debughtml'])) { $this->html('debughtml'); } ?> |
| 103 | 105 | <div class='mw_clear'></div> |
| 104 | 106 | <?php if($this->data['catlinks']) { $this->html('catlinks'); } ?> |
| 105 | 107 | <?php $this->html('dataAfterContent') ?> |