| Index: trunk/phase3/skins/Vector.php |
| — | — | @@ -174,9 +174,9 @@ |
| 175 | 175 | </div> |
| 176 | 176 | <!-- /jumpto --> |
| 177 | 177 | <?php endif; ?> |
| 178 | | - <!-- bodytext --> |
| 179 | | - <?php $this->html( 'bodytext' ) ?> |
| 180 | | - <!-- /bodytext --> |
| | 178 | + <!-- bodycontent --> |
| | 179 | + <?php $this->html( 'bodycontent' ) ?> |
| | 180 | + <!-- /bodycontent --> |
| 181 | 181 | <?php if ( $this->data['printfooter'] ): ?> |
| 182 | 182 | <!-- printfooter --> |
| 183 | 183 | <div class="printfooter"> |
| Index: trunk/phase3/skins/MonoBook.php |
| — | — | @@ -91,8 +91,6 @@ |
| 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'); ?> |
| 97 | 95 | <?php if($this->data['catlinks']) { $this->html('catlinks'); } ?> |
| 98 | 96 | <!-- end content --> |
| 99 | 97 | <?php if($this->data['dataAfterContent']) { $this->html ('dataAfterContent'); } ?> |
| Index: trunk/phase3/skins/Modern.php |
| — | — | @@ -88,8 +88,6 @@ |
| 89 | 89 | <?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 } ?> |
| 90 | 90 | |
| 91 | 91 | <?php $this->html('bodytext') ?> |
| 92 | | - <?php if($this->data['printfooter']) { ?><div class="printfooter"><?php $this->html('printfooter'); ?></div><?php } ?> |
| 93 | | - <?php $this->html('debughtml'); ?> |
| 94 | 92 | <div class='mw_clear'></div> |
| 95 | 93 | <?php if($this->data['catlinks']) { $this->html('catlinks'); } ?> |
| 96 | 94 | <?php $this->html ('dataAfterContent') ?> |
| Index: trunk/phase3/includes/SkinLegacy.php |
| — | — | @@ -74,10 +74,6 @@ |
| 75 | 75 | $this->html( 'headelement' ); |
| 76 | 76 | echo $this->beforeContent(); |
| 77 | 77 | $this->html( 'bodytext' ); |
| 78 | | - echo '<div class="printfooter">'; |
| 79 | | - $this->html( 'printfooter' ); |
| 80 | | - echo '</div>'; |
| 81 | | - $this->html( 'debughtml' ); |
| 82 | 78 | echo "\n"; |
| 83 | 79 | echo $this->afterContent(); |
| 84 | 80 | $this->html( 'dataAfterContent' ); |
| Index: trunk/phase3/includes/SkinTemplate.php |
| — | — | @@ -483,6 +483,15 @@ |
| 484 | 484 | wfDebug( __METHOD__ . ": Hook SkinTemplateOutputPageBeforeExec broke outputPage execution!\n" ); |
| 485 | 485 | } |
| 486 | 486 | |
| | 487 | + // Set the bodytext to another key so that skins can just output it on it's own |
| | 488 | + // and output printfooter and debughtml separately |
| | 489 | + $tpl->set( 'bodycontent', $tpl->data['bodytext'] ); |
| | 490 | + |
| | 491 | + // Append printfooter and debughtml onto bodytext so that skins that were already |
| | 492 | + // using bodytext before they were split out don't suddenly start not outputting information |
| | 493 | + $tpl->data['bodytext'] .= Html::element( 'div', array( 'class' => 'printfooter' ), "\n{$tpl->data['printfooter']}" ) . "\n"; |
| | 494 | + $tpl->data['bodytext'] .= $tpl->data['debughtml']; |
| | 495 | + |
| 487 | 496 | // allow extensions adding stuff after the page content. |
| 488 | 497 | // See Skin::afterContentHook() for further documentation. |
| 489 | 498 | $tpl->set( 'dataAfterContent', $this->afterContentHook() ); |