| Index: trunk/phase3/skins/MonoBook.php |
| — | — | @@ -65,33 +65,36 @@ |
| 66 | 66 | wfSuppressWarnings(); |
| 67 | 67 | |
| 68 | 68 | $this->html( 'headelement' ); |
| 69 | | -?> <div id="globalWrapper"> |
| 70 | | - <div id="column-content"> |
| 71 | | - <div id="content" <?php $this->html("specialpageattributes") ?>> |
| 72 | | - <a id="top"></a> |
| 73 | | - <?php if($this->data['sitenotice']) { ?><div id="siteNotice"><?php $this->html('sitenotice') ?></div><?php } ?> |
| 74 | | - <h1 id="firstHeading" class="firstHeading"><?php $this->html('title') ?></h1> |
| 75 | | - <div id="bodyContent"> |
| 76 | | - <h3 id="siteSub"><?php $this->msg('tagline') ?></h3> |
| 77 | | - <div id="contentSub" <?php $this->html('userlangattributes') ?>><?php $this->html('subtitle') ?></div> |
| 78 | | - <?php if($this->data['undelete']) { ?><div id="contentSub2"><?php $this->html('undelete') ?></div><?php } ?> |
| 79 | | - <?php if($this->data['newtalk'] ) { ?><div class="usermessage"><?php $this->html('newtalk') ?></div><?php } ?> |
| 80 | | - <?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 } ?> |
| 81 | | - <!-- start content --> |
| 82 | | - <?php $this->html('bodytext') ?> |
| 83 | | - <?php if($this->data['catlinks']) { $this->html('catlinks'); } ?> |
| 84 | | - <!-- end content --> |
| 85 | | - <?php if($this->data['dataAfterContent']) { $this->html ('dataAfterContent'); } ?> |
| 86 | | - <div class="visualClear"></div> |
| 87 | | - </div> |
| | 69 | +?><div id="globalWrapper"> |
| | 70 | +<div id="column-content"><div id="content" <?php $this->html("specialpageattributes") ?>> |
| | 71 | + <a id="top"></a> |
| | 72 | + <?php if($this->data['sitenotice']) { ?><div id="siteNotice"><?php $this->html('sitenotice') ?></div><?php } ?> |
| | 73 | + |
| | 74 | + <h1 id="firstHeading" class="firstHeading"><?php $this->html('title') ?></h1> |
| | 75 | + <div id="bodyContent"> |
| | 76 | + <h3 id="siteSub"><?php $this->msg('tagline') ?></h3> |
| | 77 | + <div id="contentSub" <?php $this->html('userlangattributes') ?>><?php $this->html('subtitle') ?></div> |
| | 78 | +<?php if($this->data['undelete']) { ?> |
| | 79 | + <div id="contentSub2"><?php $this->html('undelete') ?></div> |
| | 80 | +<?php } ?><?php if($this->data['newtalk'] ) { ?> |
| | 81 | + <div class="usermessage"><?php $this->html('newtalk') ?></div> |
| | 82 | +<?php } ?><?php if($this->data['showjumplinks']) { ?> |
| | 83 | + <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> |
| | 84 | +<?php } ?> |
| | 85 | + <!-- start content --> |
| | 86 | +<?php $this->html('bodytext') ?> |
| | 87 | + <?php if($this->data['catlinks']) { $this->html('catlinks'); } ?> |
| | 88 | + <!-- end content --> |
| | 89 | + <?php if($this->data['dataAfterContent']) { $this->html ('dataAfterContent'); } ?> |
| | 90 | + <div class="visualClear"></div> |
| 88 | 91 | </div> |
| 89 | | - </div> |
| 90 | | - <div id="column-one" <?php $this->html('userlangattributes') ?>> |
| | 92 | +</div></div> |
| | 93 | +<div id="column-one" <?php $this->html('userlangattributes') ?>> |
| 91 | 94 | <div id="p-cactions" class="portlet"> |
| 92 | 95 | <h5><?php $this->msg('views') ?></h5> |
| 93 | 96 | <div class="pBody"> |
| 94 | | - <ul> |
| 95 | | - <?php foreach($this->data['content_actions'] as $key => $tab) { |
| | 97 | + <ul><?php |
| | 98 | + foreach($this->data['content_actions'] as $key => $tab) { |
| 96 | 99 | echo ' |
| 97 | 100 | <li id="' . Sanitizer::escapeId( "ca-$key" ) . '"'; |
| 98 | 101 | if( $tab['class'] ) { |
| — | — | @@ -112,6 +115,7 @@ |
| 113 | 116 | } |
| 114 | 117 | echo '>'.htmlspecialchars($tab['text']).'</a></li>'; |
| 115 | 118 | } ?> |
| | 119 | + |
| 116 | 120 | </ul> |
| 117 | 121 | </div> |
| 118 | 122 | </div> |
| — | — | @@ -153,16 +157,16 @@ |
| 154 | 158 | } |
| 155 | 159 | } |
| 156 | 160 | ?> |
| 157 | | - </div><!-- end of the left (by default at least) column --> |
| 158 | | - <div class="visualClear"></div> |
| 159 | | - <div id="footer" <?php $this->html('userlangattributes') ?>> |
| | 161 | +</div><!-- end of the left (by default at least) column --> |
| | 162 | +<div class="visualClear"></div> |
| | 163 | +<div id="footer" <?php $this->html('userlangattributes') ?>> |
| 160 | 164 | <?php |
| 161 | | - if($this->data['poweredbyico']) { ?> |
| 162 | | - <div id="f-poweredbyico"><?php $this->html('poweredbyico') ?></div> |
| 163 | | -<?php } |
| 164 | | - if($this->data['copyrightico']) { ?> |
| 165 | | - <div id="f-copyrightico"><?php $this->html('copyrightico') ?></div> |
| 166 | | -<?php } |
| | 165 | +if($this->data['poweredbyico']) { ?> |
| | 166 | + <div id="f-poweredbyico"><?php $this->html('poweredbyico') ?></div> |
| | 167 | +<?php } |
| | 168 | +if($this->data['copyrightico']) { ?> |
| | 169 | + <div id="f-copyrightico"><?php $this->html('copyrightico') ?></div> |
| | 170 | +<?php } |
| 167 | 171 | |
| 168 | 172 | // Generate additional footer links |
| 169 | 173 | $footerlinks = array( |
| — | — | @@ -176,19 +180,19 @@ |
| 177 | 181 | } |
| 178 | 182 | } |
| 179 | 183 | if ( count( $validFooterLinks ) > 0 ) { |
| 180 | | -?> <ul id="f-list"> |
| | 184 | +?> <ul id="f-list"> |
| 181 | 185 | <?php |
| 182 | 186 | foreach( $validFooterLinks as $aLink ) { |
| 183 | 187 | if( isset( $this->data[$aLink] ) && $this->data[$aLink] ) { |
| 184 | | -?> <li id="<?php echo $aLink ?>"><?php $this->html($aLink) ?></li> |
| | 188 | +?> <li id="<?php echo $aLink ?>"><?php $this->html($aLink) ?></li> |
| 185 | 189 | <?php } |
| 186 | 190 | } |
| 187 | 191 | ?> |
| 188 | | - </ul> |
| | 192 | + </ul> |
| 189 | 193 | <?php } |
| 190 | 194 | ?> |
| 191 | | - </div> |
| 192 | 195 | </div> |
| | 196 | +</div> |
| 193 | 197 | <?php $this->html('bottomscripts'); /* JS call to runBodyOnloadHook */ ?> |
| 194 | 198 | <?php $this->html('reporttime') ?> |
| 195 | 199 | <?php if ( $this->data['debug'] ): ?> |