| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -4203,6 +4203,13 @@ |
| 4204 | 4204 | $wgVectorUseIconWatch = false; |
| 4205 | 4205 | |
| 4206 | 4206 | /** |
| | 4207 | + * Show the name of the current variant as a label in the variants drop-down menu |
| | 4208 | + * true = Show the label |
| | 4209 | + * false = Do not show the label |
| | 4210 | + */ |
| | 4211 | +$wgVectorShowVariantName = false; |
| | 4212 | + |
| | 4213 | +/** |
| 4207 | 4214 | * Add extra stylesheets for Vector - This is only being used so that we can play around with different options while |
| 4208 | 4215 | * keeping our CSS code in the SVN and not having to change the main Vector styles. This will probably go away later on. |
| 4209 | 4216 | * null = add no extra styles |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -60,6 +60,10 @@ |
| 61 | 61 | on, allowing skins to use .htc files which are not cross-domain friendly. |
| 62 | 62 | * ajaxwatch now uses the API and JQuery, and can be used to animate arbitrary |
| 63 | 63 | watch links, not just to watch the page the link is on. |
| | 64 | +* (bug 20193) Added $wgVectorShowVariantName global configuration varaible |
| | 65 | + which causes Vector to render the the variants drop-down menu with a label |
| | 66 | + showing the current variant name. This is off by default, pending further |
| | 67 | + research into it's user experience implications. |
| 64 | 68 | |
| 65 | 69 | === Bug fixes in 1.17 === |
| 66 | 70 | * (bug 17560) Half-broken deletion moved image files to deletion archive |
| Index: trunk/phase3/skins/Vector.php |
| — | — | @@ -676,7 +676,7 @@ |
| 677 | 677 | * when UI is in RTL mode |
| 678 | 678 | */ |
| 679 | 679 | private function renderNavigation( $elements ) { |
| 680 | | - global $wgContLang, $wgVectorUseSimpleSearch, $wgStylePath; |
| | 680 | + global $wgContLang, $wgVectorUseSimpleSearch, $wgVectorShowVariantName, $wgStylePath; |
| 681 | 681 | |
| 682 | 682 | // If only one element was given, wrap it in an array, allowing more |
| 683 | 683 | // flexible arguments |
| — | — | @@ -707,6 +707,15 @@ |
| 708 | 708 | case 'VARIANTS': |
| 709 | 709 | ?> |
| 710 | 710 | <div id="p-variants" class="vectorMenu<?php if ( count( $this->data['variant_urls'] ) == 0 ) echo ' emptyPortlet'; ?>"> |
| | 711 | + <?php if ( $wgVectorShowVariantName ): ?> |
| | 712 | + <h4> |
| | 713 | + <?php foreach ($this->data['variant_urls'] as $key => $link ): ?> |
| | 714 | + <?php if ( stripos( $link['attributes'], 'selected' ) !== false ): ?> |
| | 715 | + <?php echo htmlspecialchars( $link['text'] ) ?> |
| | 716 | + <?php endif; ?> |
| | 717 | + <?php endforeach; ?> |
| | 718 | + </h4> |
| | 719 | + <?php endif; ?> |
| 711 | 720 | <h5><span><?php $this->msg('variants') ?></span><a href="#"></a></h5> |
| 712 | 721 | <div class="menu"> |
| 713 | 722 | <?php if ( count( $this->data['variant_urls'] ) ): ?> |