Index: trunk/phase3/maintenance/language/messages.inc |
— | — | @@ -3192,7 +3192,6 @@ |
3193 | 3193 | 'confirm-purge-bottom', |
3194 | 3194 | ), |
3195 | 3195 | 'separators' => array( |
3196 | | - 'catseparator', |
3197 | 3196 | 'semicolon-separator', |
3198 | 3197 | 'comma-separator', |
3199 | 3198 | 'colon-separator', |
Index: trunk/phase3/maintenance/language/messageTypes.inc |
— | — | @@ -378,7 +378,6 @@ |
379 | 379 | 'hebrew-calendar-m12-gen', |
380 | 380 | 'version-api', |
381 | 381 | 'version-svn-revision', |
382 | | - 'catseparator', |
383 | 382 | 'semicolon-separator', |
384 | 383 | 'comma-separator', |
385 | 384 | 'colon-separator', |
Index: trunk/phase3/skins/CologneBlue.php |
— | — | @@ -77,7 +77,7 @@ |
78 | 78 | |
79 | 79 | $s .= '<font size="-1"><span id="langlinks">'; |
80 | 80 | $s .= str_replace( '<br />', '', $this->otherLanguages() ); |
81 | | - $cat = $this->getSkin()->getCategoryLinks(); |
| 81 | + $cat = '<div id="catlinks" class="catlinks">' . $this->getSkin()->getCategoryLinks() . '</div>'; |
82 | 82 | if( $cat ) { |
83 | 83 | $s .= "<br />$cat\n"; |
84 | 84 | } |
Index: trunk/phase3/skins/common/shared.css |
— | — | @@ -179,6 +179,27 @@ |
180 | 180 | .magnify { float: right; } |
181 | 181 | |
182 | 182 | /** |
| 183 | + * Categories |
| 184 | + */ |
| 185 | +#catlinks ul, #catlinks li { |
| 186 | + display:inline; |
| 187 | + margin: 0px; |
| 188 | + list-style:none; |
| 189 | + list-style-type:none; |
| 190 | + list-style-image:none; |
| 191 | +} |
| 192 | + |
| 193 | +#catlinks li { |
| 194 | + padding: 0 .7em; |
| 195 | + border-left: 1px solid #AAA; |
| 196 | +} |
| 197 | + |
| 198 | +#catlinks li:first-child { |
| 199 | + padding-left: .4em; |
| 200 | + border-left: none; |
| 201 | +} |
| 202 | + |
| 203 | +/** |
183 | 204 | * Hidden categories |
184 | 205 | */ |
185 | 206 | .mw-hidden-cats-hidden { display: none; } |
Index: trunk/phase3/skins/Nostalgia.php |
— | — | @@ -54,7 +54,7 @@ |
55 | 55 | $s .= '<br />' . $ol; |
56 | 56 | } |
57 | 57 | |
58 | | - $cat = $this->getSkin()->getCategoryLinks(); |
| 58 | + $cat = '<div id="catlinks" class="catlinks">' . $this->getSkin()->getCategoryLinks() . '</div>'; |
59 | 59 | if( $cat ) { |
60 | 60 | $s .= '<br />' . $cat; |
61 | 61 | } |
Index: trunk/phase3/includes/Skin.php |
— | — | @@ -530,26 +530,23 @@ |
531 | 531 | return ''; |
532 | 532 | } |
533 | 533 | |
534 | | - # Separator |
535 | | - $sep = wfMsgExt( 'catseparator', array( 'parsemag', 'escapenoentities' ) ); |
536 | | - |
537 | 534 | // Use Unicode bidi embedding override characters, |
538 | 535 | // to make sure links don't smash each other up in ugly ways. |
539 | 536 | $dir = $wgContLang->getDir(); |
540 | | - $embed = "<span dir='$dir'>"; |
541 | | - $pop = '</span>'; |
| 537 | + $embed = "<li dir='$dir'>"; |
| 538 | + $pop = "</li>"; |
542 | 539 | |
543 | 540 | $allCats = $out->getCategoryLinks(); |
544 | 541 | $s = ''; |
545 | 542 | $colon = wfMsgExt( 'colon-separator', 'escapenoentities' ); |
546 | 543 | |
547 | 544 | if ( !empty( $allCats['normal'] ) ) { |
548 | | - $t = $embed . implode( "{$pop} {$sep} {$embed}" , $allCats['normal'] ) . $pop; |
| 545 | + $t = $embed . implode( "{$pop} {$embed}" , $allCats['normal'] ) . $pop; |
549 | 546 | |
550 | 547 | $msg = wfMsgExt( 'pagecategories', array( 'parsemag', 'escapenoentities' ), count( $allCats['normal'] ) ); |
551 | 548 | $s .= '<div id="mw-normal-catlinks">' . |
552 | 549 | Linker::link( Title::newFromText( wfMsgForContent( 'pagecategorieslink' ) ), $msg ) |
553 | | - . $colon . $t . '</div>'; |
| 550 | + . $colon . '<ul>' . $t . '</ul>' . '</div>'; |
554 | 551 | } |
555 | 552 | |
556 | 553 | # Hidden categories |
— | — | @@ -564,7 +561,7 @@ |
565 | 562 | |
566 | 563 | $s .= "<div id=\"mw-hidden-catlinks\" class=\"$class\">" . |
567 | 564 | wfMsgExt( 'hidden-categories', array( 'parsemag', 'escapenoentities' ), count( $allCats['hidden'] ) ) . |
568 | | - $colon . $embed . implode( "$pop $sep $embed", $allCats['hidden'] ) . $pop . |
| 565 | + $colon . '<ul>' . $embed . implode( "{$pop} {$embed}" , $allCats['hidden'] ) . $pop . '</ul>' . |
569 | 566 | '</div>'; |
570 | 567 | } |
571 | 568 | |
Index: trunk/phase3/languages/messages/MessagesEn.php |
— | — | @@ -510,7 +510,6 @@ |
511 | 511 | 'accesskey-t-specialpages', |
512 | 512 | 'accesskey-t-whatlinkshere', |
513 | 513 | 'anonnotice', |
514 | | - 'catseparator', |
515 | 514 | 'colon-separator', |
516 | 515 | 'currentevents', |
517 | 516 | 'currentevents-url', |
— | — | @@ -4293,7 +4292,6 @@ |
4294 | 4293 | 'confirm-unwatch-top' => 'Remove this page to your watchlist?', |
4295 | 4294 | |
4296 | 4295 | # Separators for various lists, etc. |
4297 | | -'catseparator' => '|', # only translate this message to other languages if you have to change it |
4298 | 4296 | 'semicolon-separator' => '; ', # only translate this message to other languages if you have to change it |
4299 | 4297 | 'comma-separator' => ', ', # only translate this message to other languages if you have to change it |
4300 | 4298 | 'colon-separator' => ': ', # only translate this message to other languages if you have to change it |