| Index: branches/REL1_18/phase3/skins/common/commonPrint.css |
| — | — | @@ -346,3 +346,31 @@ |
| 347 | 347 | widows: 3; |
| 348 | 348 | orphans: 3; |
| 349 | 349 | } |
| | 350 | + |
| | 351 | +/** |
| | 352 | + * Categories |
| | 353 | + */ |
| | 354 | +.catlinks ul { |
| | 355 | + display: inline; |
| | 356 | + margin: 0px; |
| | 357 | + list-style: none; |
| | 358 | + list-style-type: none; |
| | 359 | + list-style-image: none; |
| | 360 | + vertical-align: middle !ie; |
| | 361 | +} |
| | 362 | + |
| | 363 | +.catlinks li { |
| | 364 | + display: inline-block; |
| | 365 | + line-height: 1.15em; |
| | 366 | + padding: 0 .4em; |
| | 367 | + border-left: 1px solid #AAA; |
| | 368 | + margin: 0.1em 0; |
| | 369 | + zoom: 1; |
| | 370 | + display: inline !ie; |
| | 371 | +} |
| | 372 | + |
| | 373 | +.catlinks li:first-child { |
| | 374 | + padding-left: .2em; |
| | 375 | + border-left: none; |
| | 376 | +} |
| | 377 | + |
| Index: branches/REL1_18/phase3/skins/common/shared.css |
| — | — | @@ -179,9 +179,10 @@ |
| 180 | 180 | #catlinks ul { |
| 181 | 181 | display:inline; |
| 182 | 182 | margin: 0px; |
| 183 | | - list-style:none; |
| 184 | | - list-style-type:none; |
| 185 | | - list-style-image:none; |
| | 183 | + padding: 0px; |
| | 184 | + list-style: none; |
| | 185 | + list-style-type: none; |
| | 186 | + list-style-image: none; |
| 186 | 187 | vertical-align: middle !ie; |
| 187 | 188 | } |
| 188 | 189 | |
| — | — | @@ -847,4 +848,4 @@ |
| 848 | 849 | } |
| 849 | 850 | |
| 850 | 851 | /* bug 12205 */ |
| 851 | | -#mw-credits a { unicode-bidi: embed; } |
| \ No newline at end of file |
| | 852 | +#mw-credits a { unicode-bidi: embed; } |
| Index: branches/REL1_18/phase3/docs/hooks.txt |
| — | — | @@ -1905,6 +1905,10 @@ |
| 1906 | 1906 | 'UserGetAllRights': after calculating a list of all available rights |
| 1907 | 1907 | &$rights: Array of rights, which may be added to. |
| 1908 | 1908 | |
| | 1909 | +'UserGetDefaultOptions': after fetching the core default, this hook is ran |
| | 1910 | +right before returning the options to the caller. |
| | 1911 | +&$defaultOptions: Array of preference keys and their default values. |
| | 1912 | + |
| 1909 | 1913 | 'UserGetEmail': called when getting an user email address |
| 1910 | 1914 | $user: User object |
| 1911 | 1915 | &$email: email, change this to override local email |
| Property changes on: branches/REL1_18/phase3/docs/hooks.txt |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 1912 | 1916 | Merged /trunk/phase3/docs/hooks.txt:r96775,97362,97365,97381,97405-97407 |
| Index: branches/REL1_18/phase3/RELEASE-NOTES-1.18 |
| — | — | @@ -203,6 +203,13 @@ |
| 204 | 204 | Vary: X-Forwarded-Proto headers. |
| 205 | 205 | * New maintenance script to refresh image metadata (maintenance/refreshImageMetadata.php) |
| 206 | 206 | * (bug 16428) Include permalink in printable version |
| | 207 | +* (bug 30940) Add a hook in User:getDefaultOptions. |
| | 208 | + To give extensions a better and more flexible way of providing default |
| | 209 | + values for preferences a hook has been introdiced in User:getDefaultOptions(). |
| | 210 | + Setting preferences in $wgDefaultUserOptions still work fine, but when reading |
| | 211 | + them (i.e. with array_keys) to get a list of all preferences, then |
| | 212 | + $wgDefaultUserOptions should no longer be used as it will contain those set via |
| | 213 | + User:getDefaultOptions(). |
| 207 | 214 | |
| 208 | 215 | === Bug fixes in 1.18 === |
| 209 | 216 | * mw.util.getScript has been implemented (like wfScript in GlobalFunctions.php) |
| Property changes on: branches/REL1_18/phase3/RELEASE-NOTES-1.18 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 210 | 217 | Merged /trunk/phase3/RELEASE-NOTES-1.18:r96775,97362,97365,97381 |
| Index: branches/REL1_18/phase3/includes/User.php |
| — | — | @@ -1208,6 +1208,8 @@ |
| 1209 | 1209 | } |
| 1210 | 1210 | $defOpt['skin'] = $wgDefaultSkin; |
| 1211 | 1211 | |
| | 1212 | + wfRunHooks( 'UserGetDefaultOptions', array( &$defOpt ) ); |
| | 1213 | + |
| 1212 | 1214 | return $defOpt; |
| 1213 | 1215 | } |
| 1214 | 1216 | |
| Index: branches/REL1_18/phase3/resources/Resources.php |
| — | — | @@ -39,8 +39,10 @@ |
| 40 | 40 | 'localBasePath' => $GLOBALS['wgStyleDirectory'], |
| 41 | 41 | ), |
| 42 | 42 | 'skins.modern' => array( |
| 43 | | - 'styles' => array( 'modern/main.css' => array( 'media' => 'screen' ), |
| 44 | | - 'modern/print.css' => array( 'media' => 'print' ) ), |
| | 43 | + 'styles' => array( |
| | 44 | + 'modern/main.css' => array( 'media' => 'screen' ), |
| | 45 | + 'modern/print.css' => array( 'media' => 'print' ), |
| | 46 | + ), |
| 45 | 47 | 'remoteBasePath' => $GLOBALS['wgStylePath'], |
| 46 | 48 | 'localBasePath' => $GLOBALS['wgStyleDirectory'], |
| 47 | 49 | ), |
| Index: branches/REL1_18/phase3/resources/mediawiki/mediawiki.js |
| — | — | @@ -500,6 +500,7 @@ |
| 501 | 501 | for ( var i = 0; i < style.length; i++ ) { |
| 502 | 502 | getMarker().before( mw.html.element( 'link', { |
| 503 | 503 | 'type': 'text/css', |
| | 504 | + 'media': media, |
| 504 | 505 | 'rel': 'stylesheet', |
| 505 | 506 | 'href': style[i] |
| 506 | 507 | } ) ); |