r78175 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r78174‎ | r78175 | r78176 >
Date:11:53, 10 December 2010
Author:catrope
Status:ok
Tags:
Comment:
1.17: Back out Monobook-to-ResourceLoader port, has issues on IE6. This reverts r74966 in the 1.17 branch (not in trunk; this code can mature there and go in 1.18) as well as its follow-ups r75006, r75367, r75548 and r75551
Modified paths:
  • /branches/REL1_17/phase3/resources/Resources.php (modified) (history)
  • /branches/REL1_17/phase3/skins/MonoBook.php (modified) (history)
  • /branches/REL1_17/phase3/skins/monobook/external-ltr.png (deleted) (history)
  • /branches/REL1_17/phase3/skins/monobook/external.png (added) (history)
  • /branches/REL1_17/phase3/skins/monobook/main.css (modified) (history)

Diff [purge]

Index: branches/REL1_17/phase3/skins/monobook/external-ltr.png
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Index: branches/REL1_17/phase3/skins/monobook/external.png
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Property changes on: branches/REL1_17/phase3/skins/monobook/external.png
___________________________________________________________________
Added: svn:mime-type
11 + image/png
Index: branches/REL1_17/phase3/skins/monobook/main.css
——@@ -41,13 +41,10 @@
4242
4343 body {
4444 font: x-small sans-serif;
45 - /* @embed */
4645 background: #f9f9f9 url(headbg.jpg) 0 0 no-repeat;
4746 color: black;
4847 margin: 0;
4948 padding: 0;
50 - direction: ltr; /* Needed for RTL flipping */
51 - unicode-bidi: embed;
5249 }
5350
5451 /* scale back up to a sane default */
——@@ -146,7 +143,6 @@
147144 list-style-type: square;
148145 margin: .3em 0 0 1.5em;
149146 padding: 0;
150 - /* @embed */
151147 list-style-image: url(bullet.gif);
152148 }
153149 ol {
——@@ -380,7 +376,6 @@
381377 }
382378
383379 /* images */
384 -/* @noflip */
385380 div.floatright, table.floatright {
386381 clear: right;
387382 float: right;
——@@ -393,7 +388,6 @@
394389 */
395390 }
396391 div.floatright p { font-style: italic; }
397 -/* @noflip */
398392 div.floatleft, table.floatleft {
399393 float: left;
400394 clear: left;
——@@ -442,13 +436,11 @@
443437 border: none !important;
444438 background: none !important;
445439 }
446 -/* @noflip */
447440 div.tright {
448441 clear: right;
449442 float: right;
450443 border-width: .5em 0 .8em 1.4em;
451444 }
452 -/* @noflip */
453445 div.tleft {
454446 float: left;
455447 clear: left;
——@@ -500,38 +492,36 @@
501493 */
502494 #bodyContent a.external,
503495 #bodyContent a.external[href ^="gopher://"] {
504 - /* @embed */
505 - background: url(external-ltr.png) center right no-repeat;
506 - padding-right: 13px;
 496+ background: url(external.png) center right no-repeat;
 497+ padding: 0 13px;
507498 }
 499+.rtl #bodyContent a.external,
 500+.rtl #bodyContent a.external[href ^="gopher://"] {
 501+ background-image: url(external-rtl.png);
 502+}
508503 #bodyContent a.external[href ^="https://"],
509504 .link-https {
510 - /* @embed */
511505 background: url(lock_icon.gif) center right no-repeat;
512 - padding-right: 16px;
 506+ padding: 0 16px;
513507 }
514508 #bodyContent a.external[href ^="mailto:"],
515509 .link-mailto {
516 - /* @embed */
517510 background: url(mail_icon.gif) center right no-repeat;
518 - padding-right: 18px;
 511+ padding: 0 18px;
519512 }
520513 #bodyContent a.external[href ^="news://"] {
521 - /* @embed */
522514 background: url(news_icon.png) center right no-repeat;
523 - padding-right: 18px;
 515+ padding: 0 18px;
524516 }
525517 #bodyContent a.external[href ^="ftp://"],
526518 .link-ftp {
527 - /* @embed */
528519 background: url(file_icon.gif) center right no-repeat;
529 - padding-right: 18px;
 520+ padding: 0 18px;
530521 }
531522 #bodyContent a.external[href ^="irc://"],
532523 .link-irc {
533 - /* @embed */
534524 background: url(discussionitem_icon.gif) center right no-repeat;
535 - padding-right: 18px;
 525+ padding: 0 18px;
536526 }
537527 #bodyContent a.external[href $=".ogg"], #bodyContent a.external[href $=".OGG"],
538528 #bodyContent a.external[href $=".mid"], #bodyContent a.external[href $=".MID"],
——@@ -540,28 +530,41 @@
541531 #bodyContent a.external[href $=".wav"], #bodyContent a.external[href $=".WAV"],
542532 #bodyContent a.external[href $=".wma"], #bodyContent a.external[href $=".WMA"],
543533 .link-audio {
544 - /* @embed */
545534 background: url("audio.png") center right no-repeat;
546 - padding-right: 13px;
 535+ padding: 0 13px;
547536 }
548537 #bodyContent a.external[href $=".ogm"], #bodyContent a.external[href $=".OGM"],
549538 #bodyContent a.external[href $=".avi"], #bodyContent a.external[href $=".AVI"],
550539 #bodyContent a.external[href $=".mpeg"], #bodyContent a.external[href $=".MPEG"],
551540 #bodyContent a.external[href $=".mpg"], #bodyContent a.external[href $=".MPG"],
552541 .link-video {
553 - /* @embed */
554542 background: url("video.png") center right no-repeat;
555 - padding-right: 13px;
 543+ padding: 0 13px;
556544 }
557545 #bodyContent a.external[href $=".pdf"], #bodyContent a.external[href $=".PDF"],
558546 #bodyContent a.external[href *=".pdf#"], #bodyContent a.external[href *=".PDF#"],
559547 #bodyContent a.external[href *=".pdf?"], #bodyContent a.external[href *=".PDF?"],
560548 .link-document {
561 - /* @embed */
562549 background: url("document.png") center right no-repeat;
563 - padding-right: 12px;
 550+ padding: 0 12px;
564551 }
565552
 553+/* for rtl wikis */
 554+.rtl #bodyContent a.external {
 555+ background-position: left;
 556+ padding-right: 0;
 557+}
 558+.rtl a.feedlink {
 559+ background-position: right;
 560+ padding-right: 16px;
 561+ padding-left: 0;
 562+}
 563+
 564+/* correction for ltr wikis */
 565+.ltr #bodyContent a.external {
 566+ padding-left: 0;
 567+}
 568+
566569 /* disable interwiki styling */
567570 #bodyContent a.extiw,
568571 #bodyContent a.extiw:active {
——@@ -585,15 +588,6 @@
586589 width: 11.6em;
587590 overflow: hidden;
588591 }
589 -html > body .portlet {
590 - float: left;
591 - clear: left;
592 -}
593 -/* recover IEMac (might be fine with the float, but usually it's close to IE */
594 -*>body .portlet {
595 - float: none;
596 - clear: none;
597 -}
598592 .portlet h4 {
599593 font-size: 95%;
600594 font-weight: normal;
——@@ -639,7 +633,6 @@
640634 .portlet ul {
641635 line-height: 1.5em;
642636 list-style-type: square;
643 - /* @embed */
644637 list-style-image: url(bullet.gif);
645638 font-size: 95%;
646639 }
——@@ -776,7 +769,6 @@
777770 li#pt-userpage,
778771 li#pt-anonuserpage,
779772 li#pt-login {
780 - /* @embed */
781773 background: url(user.gif) top left no-repeat;
782774 padding-left: 20px;
783775 text-transform: none;
——@@ -1031,6 +1023,10 @@
10321024 background-color: #f9f9f9;
10331025 float: left;
10341026 }
 1027+.rtl div#userloginForm form,
 1028+.rtl div#userlogin form#userlogin2 {
 1029+ float: right;
 1030+}
10351031
10361032 div#userloginForm table,
10371033 div#userlogin form#userlogin2 table {
Index: branches/REL1_17/phase3/skins/MonoBook.php
——@@ -25,25 +25,23 @@
2626
2727 function setupSkinUserCss( OutputPage $out ) {
2828 global $wgHandheldStyle;
 29+
2930 parent::setupSkinUserCss( $out );
3031
31 - $out->addModuleStyles( 'skins.monobook' );
32 -
33 - // Ugh. Can't do this properly because $wgHandheldStyle may be a URL
 32+ // Append to the default screen common & print styles...
 33+ $out->addStyle( 'monobook/main.css', 'screen' );
3434 if( $wgHandheldStyle ) {
3535 // Currently in testing... try 'chick/main.css'
3636 $out->addStyle( $wgHandheldStyle, 'handheld' );
3737 }
38 -
39 - // TODO: Migrate all of these
40 - //$out->addStyle( 'monobook/IE50Fixes.css', 'screen', 'lt IE 5.5000' );
41 - //$out->addStyle( 'monobook/IE55Fixes.css', 'screen', 'IE 5.5000' );
42 - //$out->addStyle( 'monobook/IE60Fixes.css', 'screen', 'IE 6' );
43 - //$out->addStyle( 'monobook/IE70Fixes.css', 'screen', 'IE 7' );
4438
45 - // TODO: migrate
46 - //$out->addStyle( 'monobook/rtl.css', 'screen', '', 'rtl' );
 39+ $out->addStyle( 'monobook/IE50Fixes.css', 'screen', 'lt IE 5.5000' );
 40+ $out->addStyle( 'monobook/IE55Fixes.css', 'screen', 'IE 5.5000' );
 41+ $out->addStyle( 'monobook/IE60Fixes.css', 'screen', 'IE 6' );
 42+ $out->addStyle( 'monobook/IE70Fixes.css', 'screen', 'IE 7' );
4743
 44+ $out->addStyle( 'monobook/rtl.css', 'screen', '', 'rtl' );
 45+
4846 }
4947 }
5048
Index: branches/REL1_17/phase3/resources/Resources.php
——@@ -14,13 +14,6 @@
1515 'skins.vector' => array(
1616 'styles' => array( 'skins/vector/screen.css' => array( 'media' => 'screen' ) )
1717 ),
18 - 'skins.monobook' => array(
19 - 'styles' => array(
20 - 'skins/monobook/main.css' => array( 'media' => 'screen' ),
21 - // Honor $wgHandheldStyle. This is kind of evil
22 - //$GLOBALS['wgHandheldStyle'] => array( 'media' => 'handheld' )
23 - )
24 - ),
2518
2619 /* jQuery */
2720

Follow-up revisions

RevisionCommit summaryAuthorDate
r79129MFT r78011 r78014 r78015 r78016 r78099 r78117 r78161 r78170 r78172 r78199 r78......platonides19:58, 28 December 2010

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r74966First shot at porting Monobook to Vector. The only non-straightforward part i...catrope20:35, 18 October 2010
r75006Temp fix for r74966 to stop causing errors everywherenikerabbit08:27, 19 October 2010
r75367Unused since r74966 $wgHandheldStyle is handled by the resourceloader.platonides17:12, 25 October 2010
r75548Followup r74966, r75006: load $wgHandheldStyle again in SkinMonoBook. Can't d...catrope15:21, 27 October 2010
r75551Followup r75548: forgot to put global $wgHandheldStyle; back incatrope15:30, 27 October 2010

Status & tagging log