r54598 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r54597‎ | r54598 | r54599 >
Date:20:18, 7 August 2009
Author:brion
Status:ok
Tags:
Comment:
Merge r53427, r53344 from trunk...
* fix for tooltips in vector
* plainlinks class to common styles, so now included in Vector
Modified paths:
  • /branches/wmf-deployment (modified) (history)
  • /branches/wmf-deployment/RELEASE-NOTES (modified) (history)
  • /branches/wmf-deployment/extensions (modified) (history)
  • /branches/wmf-deployment/extensions/CentralAuth (modified) (history)
  • /branches/wmf-deployment/extensions/CodeReview (modified) (history)
  • /branches/wmf-deployment/extensions/HoneypotIntegration (modified) (history)
  • /branches/wmf-deployment/extensions/MWSearch (modified) (history)
  • /branches/wmf-deployment/extensions/SecurePoll (modified) (history)
  • /branches/wmf-deployment/extensions/SecurePoll/cli/wm-scripts (modified) (history)
  • /branches/wmf-deployment/extensions/TitleKey (modified) (history)
  • /branches/wmf-deployment/includes/ConfEditor.php (modified) (history)
  • /branches/wmf-deployment/includes/DefaultSettings.php (modified) (history)
  • /branches/wmf-deployment/includes/Skin.php (modified) (history)
  • /branches/wmf-deployment/includes/api/ApiQueryCategoryMembers.php (modified) (history)
  • /branches/wmf-deployment/includes/specials (modified) (history)
  • /branches/wmf-deployment/includes/specials/SpecialSearch.php (modified) (history)
  • /branches/wmf-deployment/includes/specials/SpecialUserrights.php (modified) (history)
  • /branches/wmf-deployment/skins/common/shared.css (modified) (history)
  • /branches/wmf-deployment/skins/common/wikibits.js (modified) (history)
  • /branches/wmf-deployment/skins/modern/main.css (modified) (history)
  • /branches/wmf-deployment/skins/monobook (modified) (history)
  • /branches/wmf-deployment/skins/monobook/main.css (modified) (history)

Diff [purge]

Index: branches/wmf-deployment/skins/monobook/main.css
@@ -573,12 +573,6 @@
574574 #bodyContent a.external {
575575 color: #36b;
576576 }
577 -/* this can be used in the content area to switch off
578 -special external link styling */
579 -#bodyContent .plainlinks a {
580 - background: none !important;
581 - padding: 0 !important;
582 -}
583577 /*
584578 ** Structural Elements
585579 */
Property changes on: branches/wmf-deployment/skins/monobook
___________________________________________________________________
Name: svn:mergeinfo
586580 - /branches/REL1_15/phase3/skins/monobook:51646
/trunk/phase3/skins/monobook:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53012,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53369,53777,54384,54494,54592
587581 + /branches/REL1_15/phase3/skins/monobook:51646
/trunk/phase3/skins/monobook:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53012,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53344,53369,53427,53777,54384,54494,54592
Index: branches/wmf-deployment/skins/modern/main.css
@@ -531,12 +531,6 @@
532532 .hiddenStructure {
533533 display: none;
534534 }
535 -
536 -#mw_content .plainlinks a {
537 - background: none !important;
538 - padding: 0 !important;
539 -}
540 -
541535 .mw-warning {
542536 border: 1px solid #aaa;
543537 background-color: #f9f9f9;
Index: branches/wmf-deployment/skins/common/shared.css
@@ -514,6 +514,13 @@
515515 padding-left: 16px;
516516 }
517517
 518+/* Plainlinks - this can be used to switch
 519+ * off special external link styling */
 520+.plainlinks a {
 521+ background: none !important;
 522+ padding: 0 !important;
 523+}
 524+
518525 /* wikitable class for skinning normal tables */
519526 table.wikitable {
520527 margin: 1em 1em 1em 0;
Index: branches/wmf-deployment/skins/common/wikibits.js
@@ -216,10 +216,19 @@
217217 */
218218 function updateTooltipAccessKeys( nodeList ) {
219219 if ( !nodeList ) {
220 - // skins without a "column-one" element don't seem to have links with accesskeys either
221 - var columnOne = document.getElementById("column-one");
222 - if ( columnOne )
223 - updateTooltipAccessKeys( columnOne.getElementsByTagName("a") );
 220+ // Rather than scan all links on the whole page, we can just scan these
 221+ // containers which contain the relevant links. This is really just an
 222+ // optimization technique.
 223+ var linkContainers = [
 224+ "column-one", // Monobook and Modern
 225+ "head", "panel", "p-logo" // Vector
 226+ ];
 227+ for ( var i in linkContainers ) {
 228+ var linkContainer = document.getElementById( linkContainers[i] );
 229+ if ( linkContainer ) {
 230+ updateTooltipAccessKeys( linkContainer.getElementsByTagName("a") );
 231+ }
 232+ }
224233 // these are rare enough that no such optimization is needed
225234 updateTooltipAccessKeys( document.getElementsByTagName("input") );
226235 updateTooltipAccessKeys( document.getElementsByTagName("label") );
Property changes on: branches/wmf-deployment/extensions/CodeReview
___________________________________________________________________
Name: svn:mergeinfo
227236 - /branches/REL1_15/phase3/extensions/CodeReview:51646
/trunk/extensions/CodeReview:52089-54497
/trunk/phase3/CodeReview:52859,53272
/trunk/phase3/extensions/CodeReview:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52879,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53369,53502-53504,53506,53777,54384,54494,54592
228237 + /branches/REL1_15/phase3/extensions/CodeReview:51646
/trunk/extensions/CodeReview:52089-54497
/trunk/phase3/CodeReview:52859,53272
/trunk/phase3/extensions/CodeReview:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52879,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592
Property changes on: branches/wmf-deployment/extensions/HoneypotIntegration
___________________________________________________________________
Name: svn:mergeinfo
229238 - /branches/REL1_15/phase3/extensions/HoneypotIntegration:51646
/trunk/extensions/HoneypotIntegration:52089-54593
/trunk/phase3/HoneypotIntegration:52859,53272
/trunk/phase3/extensions/HoneypotIntegration:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53369,53502-53504,53506,53777,54384,54494,54592
230239 + /branches/REL1_15/phase3/extensions/HoneypotIntegration:51646
/trunk/extensions/HoneypotIntegration:52089-54593
/trunk/phase3/HoneypotIntegration:52859,53272
/trunk/phase3/extensions/HoneypotIntegration:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592
Property changes on: branches/wmf-deployment/extensions/TitleKey
___________________________________________________________________
Name: svn:mergeinfo
231240 - /branches/REL1_15/phase3/extensions/TitleKey:51646
/trunk/extensions/TitleKey:52089-54533
/trunk/phase3/TitleKey:52859,53272
/trunk/phase3/extensions/TitleKey:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53369,53502-53504,53506,53777,54384,54494,54592
232241 + /branches/REL1_15/phase3/extensions/TitleKey:51646
/trunk/extensions/TitleKey:52089-54533
/trunk/phase3/TitleKey:52859,53272
/trunk/phase3/extensions/TitleKey:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592
Property changes on: branches/wmf-deployment/extensions/MWSearch
___________________________________________________________________
Name: svn:mergeinfo
233242 - /branches/REL1_15/phase3/extensions/MWSearch:51646
/trunk/extensions/MWSearch:52859,52871-52872,52876,53191,53205-53206,53272,54125
/trunk/phase3/MWSearch:52859,53272
/trunk/phase3/extensions/MWSearch:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53369,53777,54384,54494,54592
234243 + /branches/REL1_15/phase3/extensions/MWSearch:51646
/trunk/extensions/MWSearch:52859,52871-52872,52876,53191,53205-53206,53272,54125
/trunk/phase3/MWSearch:52859,53272
/trunk/phase3/extensions/MWSearch:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53344,53369,53427,53777,54384,54494,54592
Property changes on: branches/wmf-deployment/extensions/CentralAuth
___________________________________________________________________
Name: svn:mergeinfo
235244 - /branches/REL1_15/phase3/extensions/CentralAuth:51646
/trunk/extensions/CentralAuth:52859,52871-52872,52876,53191,53205-53206,53272,53602
/trunk/phase3/CentralAuth:52859,53272
/trunk/phase3/extensions/CentralAuth:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53369,53502-53504,53506,53777,54384,54494,54592
236245 + /branches/REL1_15/phase3/extensions/CentralAuth:51646
/trunk/extensions/CentralAuth:52859,52871-52872,52876,53191,53205-53206,53272,53602
/trunk/phase3/CentralAuth:52859,53272
/trunk/phase3/extensions/CentralAuth:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592
Property changes on: branches/wmf-deployment/extensions/SecurePoll/cli/wm-scripts
___________________________________________________________________
Name: svn:mergeinfo
237246 - /branches/REL1_15/phase3/extensions/SecurePoll/cli/wm-scripts:51646
/trunk/extensions/SecurePoll/cli/wm-scripts:52089-53866,54105
/trunk/phase3/SecurePoll/cli/wm-scripts:52859,53272
/trunk/phase3/extensions/SecurePoll/cli/wm-scripts:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53369,53502-53504,53506,53777,54384,54494,54592
238247 + /branches/REL1_15/phase3/extensions/SecurePoll/cli/wm-scripts:51646
/trunk/extensions/SecurePoll/cli/wm-scripts:52089-53866,54105
/trunk/phase3/SecurePoll/cli/wm-scripts:52859,53272
/trunk/phase3/extensions/SecurePoll/cli/wm-scripts:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592
Property changes on: branches/wmf-deployment/extensions/SecurePoll
___________________________________________________________________
Name: svn:mergeinfo
239248 - /branches/REL1_15/phase3/extensions/SecurePoll:51646
/trunk/extensions/SecurePoll:52089-53866
/trunk/phase3/SecurePoll:52859,53272
/trunk/phase3/extensions/SecurePoll:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53369,53502-53504,53506,53777,54384,54494,54592
240249 + /branches/REL1_15/phase3/extensions/SecurePoll:51646
/trunk/extensions/SecurePoll:52089-53866
/trunk/phase3/SecurePoll:52859,53272
/trunk/phase3/extensions/SecurePoll:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592
Property changes on: branches/wmf-deployment/extensions
___________________________________________________________________
Name: svn:mergeinfo
241250 - /branches/REL1_15/phase3/extensions:51646
/trunk/extensions:52859,52871-52872,52876,53191,53205-53206,53272
/trunk/phase3:52859,53272
/trunk/phase3/extensions:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53369,53502-53504,53506,53777,54384,54494,54592
242251 + /branches/REL1_15/phase3/extensions:51646
/trunk/extensions:52859,52871-52872,52876,53191,53205-53206,53272
/trunk/phase3:52859,53272
/trunk/phase3/extensions:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592
Property changes on: branches/wmf-deployment/includes/api/ApiQueryCategoryMembers.php
___________________________________________________________________
Name: svn:mergeinfo
243252 - /branches/REL1_15/phase3/includes/api/ApiQueryCategoryMembers.php:51646
/trunk/phase3/includes/api/ApiQueryCategoryMembers.php:28215,52089-53052,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53369,53502-53504,53506,53777,54384,54494,54592
244253 + /branches/REL1_15/phase3/includes/api/ApiQueryCategoryMembers.php:51646
/trunk/phase3/includes/api/ApiQueryCategoryMembers.php:28215,52089-53052,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592
Property changes on: branches/wmf-deployment/includes/ConfEditor.php
___________________________________________________________________
Name: svn:mergeinfo
245254 - /trunk/phase3/includes/ConfEditor.php:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53369,53502-53504,53506,53777,54384,54494,54592
246255 + /trunk/phase3/includes/ConfEditor.php:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592
Index: branches/wmf-deployment/includes/DefaultSettings.php
@@ -1501,7 +1501,7 @@
15021502 * to ensure that client-side caches do not keep obsolete copies of global
15031503 * styles.
15041504 */
1505 -$wgStyleVersion = '230';
 1505+$wgStyleVersion = '233x';
15061506
15071507
15081508 # Server-side caching:
Property changes on: branches/wmf-deployment/includes/specials/SpecialUserrights.php
___________________________________________________________________
Name: svn:mergeinfo
15091509 - /trunk/phase3/includes/specials/SpecialUserrights.php:36354-52116,52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53369,53502-53504,53506,53777,54384,54494,54592
15101510 + /trunk/phase3/includes/specials/SpecialUserrights.php:36354-52116,52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592
Property changes on: branches/wmf-deployment/includes/specials/SpecialSearch.php
___________________________________________________________________
Name: svn:mergeinfo
15111511 - /trunk/phase3/includes/specials/SpecialSearch.php:36354-52665,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53369,53502-53504,53506,53777,54384,54494,54592
15121512 + /trunk/phase3/includes/specials/SpecialSearch.php:36354-52665,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592
Property changes on: branches/wmf-deployment/includes/specials
___________________________________________________________________
Name: svn:mergeinfo
15131513 - /trunk/phase3/includes/specials:36354-52088,52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53369,53502-53504,53506,53777,54384,54494,54592
15141514 + /trunk/phase3/includes/specials:36354-52088,52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592
Property changes on: branches/wmf-deployment/includes/Skin.php
___________________________________________________________________
Name: svn:mergeinfo
15151515 - /branches/REL1_15/phase3/includes/Skin.php:51646
/trunk/phase3/includes/Skin.php:52089-52361,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52879,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53369,53502-53504,53506,53777,54384,54494,54592
15161516 + /branches/REL1_15/phase3/includes/Skin.php:51646
/trunk/phase3/includes/Skin.php:52089-52361,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52879,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592
Index: branches/wmf-deployment/RELEASE-NOTES
@@ -204,6 +204,7 @@
205205 not have the 'userrights' permission.
206206 * Log in and log out links no longer return to page view when clicked from
207207 history view, edit page, or something similar
 208+* (bug 18708) CSS plainlinks class now available to all skins
208209
209210 == API changes in 1.16 ==
210211
Property changes on: branches/wmf-deployment
___________________________________________________________________
Name: svn:mergeinfo
211212 - /branches/REL1_15/phase3:51646
/trunk/phase3:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53369,53502-53504,53506,53777,54384,54494,54592
212213 + /branches/REL1_15/phase3:51646
/trunk/phase3:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r53344(bug 18708) CSS plainlinks class now available to all skinsdemon23:36, 15 July 2009
r53427Fixes bug 19506 by searching through a few more containers for links which ne...tparscal22:49, 17 July 2009

Status & tagging log