| Index: trunk/phase3/maintenance/language/messages.inc |
| — | — | @@ -58,9 +58,6 @@ |
| 59 | 59 | 'underline-never', |
| 60 | 60 | 'underline-default', |
| 61 | 61 | ), |
| 62 | | - 'skinpreview' => array( |
| 63 | | - 'skinpreview', |
| 64 | | - ), |
| 65 | 62 | 'dates' => array( |
| 66 | 63 | 'sunday', |
| 67 | 64 | 'monday', |
| — | — | @@ -754,6 +751,10 @@ |
| 755 | 752 | 'qbsettings-floatingright', |
| 756 | 753 | 'changepassword', |
| 757 | 754 | 'skin', |
| | 755 | + 'skin-header', |
| | 756 | + 'skin-preview', |
| | 757 | + 'skin-link-to-css', |
| | 758 | + 'skin-link-to-js', |
| 758 | 759 | 'math', |
| 759 | 760 | 'dateformat', |
| 760 | 761 | 'datedefault', |
| — | — | @@ -2626,7 +2627,6 @@ |
| 2627 | 2628 | XHTML id names.", |
| 2628 | 2629 | 'toggles' => 'User preference toggles', |
| 2629 | 2630 | 'underline' => '', |
| 2630 | | - 'skinpreview' => '', |
| 2631 | 2631 | 'dates' => 'Dates', |
| 2632 | 2632 | 'categorypages' => 'Categories related messages', |
| 2633 | 2633 | 'mainpage' => '', |
| Index: trunk/phase3/includes/specials/SpecialPreferences.php |
| — | — | @@ -814,9 +814,14 @@ |
| 815 | 815 | |
| 816 | 816 | # Skin |
| 817 | 817 | # |
| 818 | | - $wgOut->addHTML( "<fieldset>\n<legend>\n" . wfMsg('skin') . "</legend>\n" ); |
| | 818 | + $wgOut->addHTML( |
| | 819 | + Xml::openElement( 'fieldset' ) . |
| | 820 | + Xml::element( 'legend', null, wfMsg( 'skin' ) ) . "\n" . |
| | 821 | + wfMsg( 'skin-header' ) . "<br /><br />" |
| | 822 | + ); |
| | 823 | + |
| 819 | 824 | $mptitle = Title::newMainPage(); |
| 820 | | - $previewtext = wfMsg('skinpreview'); |
| | 825 | + $previewtext = wfMsg('skin-preview'); |
| 821 | 826 | # Only show members of Skin::getSkinNames() rather than |
| 822 | 827 | # $skinNames (skins is all skin names from Language.php) |
| 823 | 828 | $validSkinNames = Skin::getSkinNames(); |
| — | — | @@ -832,15 +837,20 @@ |
| 833 | 838 | if ( in_array( $skinkey, $wgSkipSkins ) ) { |
| 834 | 839 | continue; |
| 835 | 840 | } |
| | 841 | + $pageCSS = Title::makeTitle( NS_USER, $wgUser->getName() . '/' . $skinkey . '.css' ); |
| | 842 | + $pageJS = Title::makeTitle( NS_USER, $wgUser->getName() . '/' . $skinkey . '.js' ); |
| | 843 | + $linkToCSS = $sk->link( $pageCSS, wfMsg( 'skin-link-to-css' ) ); |
| | 844 | + $linkToJS = $sk->link( $pageJS, wfMsg( 'skin-link-to-js' ) ); |
| 836 | 845 | $checked = $skinkey == $this->mSkin ? ' checked="checked"' : ''; |
| 837 | 846 | |
| 838 | 847 | $mplink = htmlspecialchars($mptitle->getLocalURL("useskin=$skinkey")); |
| 839 | | - $previewlink = "<a target='_blank' href=\"$mplink\">$previewtext</a>"; |
| 840 | | - if( $skinkey == $wgDefaultSkin ) |
| | 848 | + $linkLine = " (<a target='_blank' href=\"$mplink\">$previewtext</a> | " . $linkToCSS . " | " . $linkToJS . ')'; |
| | 849 | + if( $skinkey == $wgDefaultSkin ) { |
| 841 | 850 | $sn .= ' (' . wfMsg( 'default' ) . ')'; |
| 842 | | - $wgOut->addHTML( "<input type='radio' name='wpSkin' id=\"wpSkin$skinkey\" value=\"$skinkey\"$checked /> <label for=\"wpSkin$skinkey\">{$sn}</label> $previewlink<br />\n" ); |
| | 851 | + } |
| | 852 | + $wgOut->addHTML( "<input type='radio' name='wpSkin' id=\"wpSkin$skinkey\" value=\"$skinkey\"$checked /> <label for=\"wpSkin$skinkey\">{$sn}</label>$linkLine<br />\n" ); |
| 843 | 853 | } |
| 844 | | - $wgOut->addHTML( "</fieldset>\n\n" ); |
| | 854 | + $wgOut->addHTML( Xml::closeElement( 'fieldset' ) ); |
| 845 | 855 | |
| 846 | 856 | # Math |
| 847 | 857 | # |
| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -537,8 +537,6 @@ |
| 538 | 538 | 'underline-never' => 'Never', |
| 539 | 539 | 'underline-default' => 'Browser default', |
| 540 | 540 | |
| 541 | | -'skinpreview' => '(Preview)', |
| 542 | | - |
| 543 | 541 | # Dates |
| 544 | 542 | 'sunday' => 'Sunday', |
| 545 | 543 | 'monday' => 'Monday', |
| — | — | @@ -1405,6 +1403,10 @@ |
| 1406 | 1404 | 'qbsettings-floatingright' => 'Floating right', |
| 1407 | 1405 | 'changepassword' => 'Change password', |
| 1408 | 1406 | 'skin' => 'Skin', |
| | 1407 | +'skin-header' => 'Available skins. You can customize each skin with the associated cascading style sheet (CSS) and JavaScript pages.', |
| | 1408 | +'skin-preview' => 'Preview', |
| | 1409 | +'skin-link-to-css' => 'associated CSS', |
| | 1410 | +'skin-link-to-js' => 'associated JS', |
| 1409 | 1411 | 'math' => 'Math', |
| 1410 | 1412 | 'dateformat' => 'Date format', |
| 1411 | 1413 | 'datedefault' => 'No preference', |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -44,6 +44,7 @@ |
| 45 | 45 | ables into into the output of Skin::makeVariablesScript |
| 46 | 46 | * Added $wgAddGroups and $wgRemoveGroups display on Special:ListGroupRights |
| 47 | 47 | * (bug 14377) Add a date selector to history pages |
| | 48 | +* (bug 2314) Add links to users custom CSS and JS into Special:Preferences |
| 48 | 49 | |
| 49 | 50 | === Bug fixes in 1.14 === |
| 50 | 51 | |