r68745 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r68744‎ | r68745 | r68746 >
Date:21:18, 29 June 2010
Author:catrope
Status:deferred
Tags:
Comment:
1.16wmf4: Merge Vector fixes from trunk: r68079, r68105, r68109, r68177, r68224, r68677
Modified paths:
  • /branches/wmf/1.16wmf4/includes/Preferences.php (modified) (history)
  • /branches/wmf/1.16wmf4/includes/Skin.php (modified) (history)
  • /branches/wmf/1.16wmf4/includes/SkinTemplate.php (modified) (history)
  • /branches/wmf/1.16wmf4/languages/messages/MessagesEn.php (modified) (history)
  • /branches/wmf/1.16wmf4/skins (modified) (history)
  • /branches/wmf/1.16wmf4/skins/MonoBook.php (modified) (history)
  • /branches/wmf/1.16wmf4/skins/Vector.php (modified) (history)
  • /branches/wmf/1.16wmf4/skins/vector (modified) (history)
  • /branches/wmf/1.16wmf4/skins/vector/main-ltr.css (modified) (history)
  • /branches/wmf/1.16wmf4/skins/vector/main-rtl.css (modified) (history)

Diff [purge]

Index: branches/wmf/1.16wmf4/skins/Vector.php
——@@ -625,7 +625,7 @@
626626 <div class="body">
627627 <ul>
628628 <?php foreach ( $this->data['language_urls'] as $langlink ): ?>
629 - <li class="<?php echo htmlspecialchars( $langlink['class'] ) ?>"><a href="<?php echo htmlspecialchars( $langlink['href'] ) ?>"><?php echo $langlink['text'] ?></a></li>
 629+ <li class="<?php echo htmlspecialchars( $langlink['class'] ) ?>"><a href="<?php echo htmlspecialchars( $langlink['href'] ) ?>" title="<?php echo htmlspecialchars( $langlink['title'] ) ?>"><?php echo $langlink['text'] ?></a></li>
630630 <?php endforeach; ?>
631631 </ul>
632632 </div>
——@@ -661,7 +661,7 @@
662662 * when UI is in RTL mode
663663 */
664664 private function renderNavigation( $elements ) {
665 - global $wgContLang, $wgVectorUseSimpleSearch, $wgVectorShowVariantName;
 665+ global $wgContLang, $wgVectorUseSimpleSearch, $wgVectorShowVariantName, $wgUser;
666666
667667 // If only one element was given, wrap it in an array, allowing more
668668 // flexible arguments
——@@ -754,7 +754,7 @@
755755 <h5<?php $this->html('userlangattributes') ?>><label for="searchInput"><?php $this->msg( 'search' ) ?></label></h5>
756756 <form action="<?php $this->text( 'wgScript' ) ?>" id="searchform">
757757 <input type='hidden' name="title" value="<?php $this->text( 'searchtitle' ) ?>"/>
758 - <?php if ( $wgVectorUseSimpleSearch ): ?>
 758+ <?php if ( $wgVectorUseSimpleSearch && $wgUser->getOption( 'vector-simplesearch' ) ): ?>
759759 <div id="simpleSearch">
760760 <input id="searchInput" name="search" type="text" <?php echo $this->skin->tooltipAndAccesskey( 'search' ); ?> <?php if( isset( $this->data['search'] ) ): ?> value="<?php $this->text( 'search' ) ?>"<?php endif; ?> />
761761 <button id="searchButton" type='submit' name='button' <?php echo $this->skin->tooltipAndAccesskey( 'search-fulltext' ); ?>>&nbsp;</button>
Property changes on: branches/wmf/1.16wmf4/skins/Vector.php
___________________________________________________________________
Name: svn:mergeinfo
762762 - /branches/wmf-deployment/skins/Vector.php:60970
/trunk/phase3/skins/Vector.php:63545-63546,63549,63643,63764,63897-63901,65015,65387,65391,65555,65590,66374,66403,67537,67544,67576,67631,67640,67703,67893
763763 + /branches/wmf-deployment/skins/Vector.php:60970
/trunk/phase3/skins/Vector.php:63545-63546,63549,63643,63764,63897-63901,65015,65387,65391,65555,65590,66374,66403,67537,67544,67576,67631,67640,67703,67893,68079,68105,68108-68109,68177,68677
Index: branches/wmf/1.16wmf4/skins/vector/main-ltr.css
——@@ -71,7 +71,7 @@
7272 #p-personal {
7373 position: absolute;
7474 top: 0;
75 - margin-left: 10em;
 75+ padding-left: 10em;
7676 right: 0.75em;
7777 }
7878 #p-personal h5 {
——@@ -87,10 +87,12 @@
8888 line-height: 1.125em;
8989 float: left;
9090 }
 91+ /* This one flips! */
9192 #p-personal li {
9293 margin-left: 0.75em;
9394 margin-top: 0.5em;
9495 font-size: 0.75em;
 96+ white-space: nowrap;
9597 }
9698 /* Navigation Containers */
9799 #left-navigation {
——@@ -363,7 +365,7 @@
364366 margin: 0;
365367 border-width: 0;
366368 padding: 3px;
367 - line-height: 1em;
 369+ vertical-align: top;
368370 font-size: 13px;
369371 width: 14em;
370372 background-color: transparent;
——@@ -901,11 +903,13 @@
902904 border: none !important;
903905 background: none !important;
904906 }
 907+/* @noflip */
905908 div.tright {
906909 clear: right;
907910 float: right;
908911 border-width: .5em 0 .8em 1.4em;
909912 }
 913+/* @noflip */
910914 div.tleft {
911915 float: left;
912916 clear: left;
Index: branches/wmf/1.16wmf4/skins/vector/main-rtl.css
——@@ -71,7 +71,7 @@
7272 #p-personal {
7373 position: absolute;
7474 top: 0;
75 - margin-right: 10em;
 75+ padding-right: 10em;
7676 left: 0.75em;
7777 }
7878 #p-personal h5 {
——@@ -87,10 +87,12 @@
8888 line-height: 1.125em;
8989 float: left;
9090 }
 91+ /* This one flips! */
9192 #p-personal li {
9293 margin-right: 0.75em;
9394 margin-top: 0.5em;
9495 font-size: 0.75em;
 96+ white-space: nowrap;
9597 }
9698 /* Navigation Containers */
9799 #left-navigation {
——@@ -363,7 +365,7 @@
364366 margin: 0;
365367 border-width: 0;
366368 padding: 3px;
367 - line-height: 1em;
 369+ vertical-align: top;
368370 font-size: 13px;
369371 width: 14em;
370372 background-color: transparent;
——@@ -901,17 +903,19 @@
902904 border: none !important;
903905 background: none !important;
904906 }
 907+/* @noflip */
905908 div.tright {
 909+ clear: right;
 910+ float: right;
 911+ border-width: .5em 0 .8em 1.4em;
 912+}
 913+/* @noflip */
 914+div.tleft {
 915+ float: left;
906916 clear: left;
907 - float: left;
 917+ margin-right: .5em;
908918 border-width: .5em 1.4em .8em 0;
909919 }
910 -div.tleft {
911 - float: right;
912 - clear: right;
913 - margin-left: .5em;
914 - border-width: .5em 0 .8em 1.4em;
915 -}
916920 img.thumbborder {
917921 border: 1px solid #dddddd;
918922 }
Property changes on: branches/wmf/1.16wmf4/skins/vector
___________________________________________________________________
Name: svn:mergeinfo
919923 - /branches/wmf-deployment/skins/vector:60970
/trunk/phase3/skins/vector:63545-63546,63549,63643,63764,63897-63901,64456,65015,65380,65383,65387,65391,65555,65590-65591,65965,66151,66158,66614,67537,67544,67576,67631,67640,67703,67871
920924 + /branches/wmf-deployment/skins/vector:60970
/trunk/phase3/skins/vector:63545-63546,63549,63643,63764,63897-63901,64456,65015,65380,65383,65387,65391,65555,65590-65591,65965,66151,66158,66614,67537,67544,67576,67631,67640,67703,67871,68079,68105,68108-68109,68177,68677
Index: branches/wmf/1.16wmf4/skins/MonoBook.php
——@@ -309,7 +309,8 @@
310310 <ul>
311311 <?php foreach($this->data['language_urls'] as $langlink) { ?>
312312 <li class="<?php echo htmlspecialchars($langlink['class'])?>"><?php
313 - ?><a href="<?php echo htmlspecialchars($langlink['href']) ?>"><?php echo $langlink['text'] ?></a></li>
 313+ ?><a href="<?php echo htmlspecialchars($langlink['href']) ?>" title="<?php
 314+ echo htmlspecialchars($langlink['title']) ?>"><?php echo $langlink['text'] ?></a></li>
314315 <?php } ?>
315316 </ul>
316317 </div>
Property changes on: branches/wmf/1.16wmf4/skins
___________________________________________________________________
Name: svn:mergeinfo
317318 - /branches/wmf-deployment/skins:60970
/trunk/phase3/skins:63545-63546,63549,63643,63764,63897-63901,65015,65387,65391,65555,65590,67537,67544,67576,67631,67640,67703,67836
318319 + /branches/wmf-deployment/skins:60970
/trunk/phase3/skins:63545-63546,63549,63643,63764,63897-63901,65015,65387,65391,65555,65590,67537,67544,67576,67631,67640,67703,67836,68079,68105,68108-68109,68177,68677
Index: branches/wmf/1.16wmf4/includes/SkinTemplate.php
——@@ -473,6 +473,7 @@
474474 'href' => $nt->getFullURL(),
475475 'text' => ( $wgContLang->getLanguageName( $nt->getInterwiki() ) != '' ?
476476 $wgContLang->getLanguageName( $nt->getInterwiki() ) : $l ),
 477+ 'title' => $nt->getText(),
477478 'class' => $class
478479 );
479480 }
Index: branches/wmf/1.16wmf4/includes/Preferences.php
——@@ -938,6 +938,15 @@
939939 'section' => 'searchoptions/display',
940940 );
941941 }
 942+
 943+ global $wgVectorUseSimpleSearch;
 944+ if ( $wgVectorUseSimpleSearch ) {
 945+ $defaultPreferences['vector-simplesearch'] = array(
 946+ 'type' => 'toggle',
 947+ 'label-message' => 'vector-simplesearch-preference',
 948+ 'section' => 'searchoptions/display'
 949+ );
 950+ }
942951
943952 $defaultPreferences['searcheverything'] =
944953 array(
Property changes on: branches/wmf/1.16wmf4/includes/Preferences.php
___________________________________________________________________
Name: svn:mergeinfo
945954 + /branches/REL1_15/phase3/includes/Preferences.php:51646
/branches/sqlite/includes/Preferences.php:58211-58321
/branches/wmf-deployment/includes/Preferences.php:53381,60970
/trunk/phase3/includes/Preferences.php:63549,63764,63897-63901,64113,64509,65387,65391,65555,65590,65650,65816,68079,68105,68224,68677
Index: branches/wmf/1.16wmf4/includes/Skin.php
——@@ -1887,12 +1887,13 @@
18881888 $nt = Title::newFromText( $l );
18891889 $url = $nt->escapeFullURL();
18901890 $text = $wgContLang->getLanguageName( $nt->getInterwiki() );
 1891+ $title = htmlspecialchars( $nt->getText() );
18911892
18921893 if ( $text == '' ) {
18931894 $text = $l;
18941895 }
18951896 $style = $this->getExternalLinkAttributes();
1896 - $s .= "<a href=\"{$url}\"{$style}>{$text}</a>";
 1897+ $s .= "<a href=\"{$url}\" title=\"{$title}\"{$style}>{$text}</a>";
18971898 }
18981899 if( $wgContLang->isRTL() ) {
18991900 $s .= '</span>';
Index: branches/wmf/1.16wmf4/languages/messages/MessagesEn.php
——@@ -791,6 +791,7 @@
792792 'vector-namespace-talk' => 'Discussion',
793793 'vector-namespace-template' => 'Template',
794794 'vector-namespace-user' => 'User page',
 795+'vector-simplesearch-preference' => 'Enable enhanced search suggestions (Vector skin only)',
795796 'vector-view-create' => 'Create',
796797 'vector-view-edit' => 'Edit',
797798 'vector-view-history' => 'View history',
Property changes on: branches/wmf/1.16wmf4/languages/messages/MessagesEn.php
___________________________________________________________________
Name: svn:mergeinfo
798799 - /branches/wmf/1.16wmf3/languages/messages/MessagesEn.php:64760
/branches/wmf-deployment/languages/messages/MessagesEn.php:60970
/trunk/phase3/languages/messages/MessagesEn.php:63545-63546,63549,63643,63764,63897-63901,64784,64786,64789,64800,64851,64876,65027,65112,66823
799800 + /branches/wmf/1.16wmf3/languages/messages/MessagesEn.php:64760
/branches/wmf-deployment/languages/messages/MessagesEn.php:60970
/trunk/phase3/languages/messages/MessagesEn.php:63545-63546,63549,63643,63764,63897-63901,64784,64786,64789,64800,64851,64876,65027,65112,66823,68224

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r68079Add the titles of interlanguage links to the tooltip of those pages (title at...hartman15:06, 15 June 2010
r68105Improved the wrapping of personal tools for Vector in IE 5.5 and 6.tparscal20:16, 15 June 2010
r68109Complimetary CSS changes for r68108. Changes here pertaining to consistency i...adam22:29, 15 June 2010
r68177(bug 23520) Add preference for SimpleSearch so users can disable it, and make...catrope19:01, 17 June 2010
r68224Followup to r68177: per CR, move SimpleSearch preference to core.catrope17:36, 18 June 2010
r68677Added @noflip to div.tleft and div.rlefttparscal19:46, 28 June 2010

Status & tagging log