| Index: trunk/phase3/skins/monobook/main.css |
| — | — | @@ -682,6 +682,10 @@ |
| 683 | 683 | z-index: 3; |
| 684 | 684 | } |
| 685 | 685 | |
| | 686 | +#p-navigation strong { |
| | 687 | + font-weight: normal; |
| | 688 | +} |
| | 689 | + |
| 686 | 690 | /* |
| 687 | 691 | ** Search portlet |
| 688 | 692 | */ |
| Index: trunk/phase3/skins/MonoBook.php |
| — | — | @@ -48,6 +48,7 @@ |
| 49 | 49 | */ |
| 50 | 50 | function execute() { |
| 51 | 51 | // Suppress warnings to prevent notices about missing indexes in $this->data |
| | 52 | + global $action; |
| 52 | 53 | wfSuppressWarnings(); |
| 53 | 54 | |
| 54 | 55 | ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> |
| — | — | @@ -97,11 +98,11 @@ |
| 98 | 99 | <div id="p-cactions" class="portlet"> |
| 99 | 100 | <h5><?php $this->msg('views') ?></h5> |
| 100 | 101 | <ul> |
| 101 | | - <?php foreach($this->data['content_actions'] as $key => $action) { |
| | 102 | + <?php foreach($this->data['content_actions'] as $key => $tab) { |
| 102 | 103 | ?><li id="ca-<?php echo htmlspecialchars($key) ?>" |
| 103 | | - <?php if($action['class']) { ?>class="<?php echo htmlspecialchars($action['class']) ?>"<?php } ?> |
| 104 | | - ><a href="<?php echo htmlspecialchars($action['href']) ?>"><?php |
| 105 | | - echo htmlspecialchars($action['text']) ?></a></li><?php |
| | 104 | + <?php if($tab['class']) { ?>class="<?php echo htmlspecialchars($tab['class']) ?>"<?php } ?> |
| | 105 | + ><a href="<?php echo htmlspecialchars($tab['href']) ?>"><?php |
| | 106 | + echo htmlspecialchars($tab['text']) ?></a></li><?php |
| 106 | 107 | } ?> |
| 107 | 108 | </ul> |
| 108 | 109 | </div> |
| — | — | @@ -130,9 +131,15 @@ |
| 131 | 132 | <h5><?php $out = wfMsg( $bar ); if (wfEmptyMsg($bar, $out)) echo $bar; else echo $out; ?></h5> |
| 132 | 133 | <div class='pBody'> |
| 133 | 134 | <ul> |
| 134 | | - <?php foreach($cont as $key => $val) { ?> |
| 135 | | - <li id="<?php echo htmlspecialchars($val['id']) ?>"><a href="<?php echo htmlspecialchars($val['href']) ?>"><?php echo htmlspecialchars($val['text'])?></a></li> |
| 136 | | - <?php } ?> |
| | 135 | + <?php foreach($cont as $key => $val) { |
| | 136 | + echo '<li id="' . htmlspecialchars($val['id']) . '">'; |
| | 137 | + if ( $val['active'] ) echo '<strong>'; |
| | 138 | + if ( $val['dolink'] ) echo '<a href="' . htmlspecialchars($val['href']) . '">'; |
| | 139 | + echo htmlspecialchars($val['text']); |
| | 140 | + if ( $val['active'] ) echo '</strong>'; |
| | 141 | + if ( $val['dolink'] ) echo '</a>'; |
| | 142 | + echo '</li>'; |
| | 143 | + } ?> |
| 137 | 144 | </ul> |
| 138 | 145 | </div> |
| 139 | 146 | </div> |
| Index: trunk/phase3/includes/Skin.php |
| — | — | @@ -1312,7 +1312,10 @@ |
| 1313 | 1313 | * @access private |
| 1314 | 1314 | */ |
| 1315 | 1315 | function buildSidebar() { |
| | 1316 | + global $wgTitle, $action; |
| | 1317 | + |
| 1316 | 1318 | $fname = 'SkinTemplate::buildSidebar'; |
| | 1319 | + $pageurl = $wgTitle->getLocalURL(); |
| 1317 | 1320 | wfProfileIn( $fname ); |
| 1318 | 1321 | |
| 1319 | 1322 | $bar = array(); |
| — | — | @@ -1333,10 +1336,14 @@ |
| 1334 | 1337 | $text = $line[1]; |
| 1335 | 1338 | if (wfEmptyMsg($line[0], $link)) |
| 1336 | 1339 | $link = $line[0]; |
| | 1340 | + $href = $this->makeInternalOrExternalUrl( $link ); |
| | 1341 | + $active = ( $pageurl == $href ); |
| 1337 | 1342 | $bar[$heading][] = array( |
| 1338 | 1343 | 'text' => $text, |
| 1339 | | - 'href' => $this->makeInternalOrExternalUrl( $link ), |
| | 1344 | + 'href' => $href, |
| 1340 | 1345 | 'id' => 'n-' . strtr($line[1], ' ', '-'), |
| | 1346 | + 'active' => $active, |
| | 1347 | + 'dolink' => ( !$active || ($action != 'view' && $action != 'purge' ) ) |
| 1341 | 1348 | ); |
| 1342 | 1349 | } else { continue; } |
| 1343 | 1350 | } |