From: Huji Date: Sun, 5 Oct 2008 18:02:11 +0000 (+0000) Subject: (bug 15831) Modern skin RTL support is bugous X-Git-Tag: 1.31.0-rc.0~44909 X-Git-Url: http://git.cyclocoop.org/url?a=commitdiff_plain;h=047e73ef43a07a3d55a9fd316b010196b31695b9;p=lhc%2Fweb%2Fwiklou.git (bug 15831) Modern skin RTL support is bugous --- diff --git a/RELEASE-NOTES b/RELEASE-NOTES index ec35c0e3a0..672dcb670c 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -241,6 +241,7 @@ The following extensions are migrated into MediaWiki 1.14: * (bug 15388) Title of Special:PrefixIndex * Links with no title but a curid parameter now use the curid to pick a page * (bug 10323) Special:Undelete should have "inverse selection" button +* (bug 15831) Modern skin RTL support is bugous === API changes in 1.14 === diff --git a/skins/Modern.php b/skins/Modern.php index d0e6066849..a493030e7a 100644 --- a/skins/Modern.php +++ b/skins/Modern.php @@ -1,368 +1,369 @@ -Powered by MediaWiki $wgVersion"; - } - - function initPage( OutputPage $out ) { - parent::initPage( $out ); - $this->skinname = 'modern'; - $this->stylename = 'modern'; - $this->template = 'ModernTemplate'; - } - - function setupSkinUserCss( OutputPage $out ){ - // Do not call parent::setupSkinUserCss(), we have our own print style - $out->addStyle( 'common/shared.css', 'screen' ); - $out->addStyle( 'modern/main.css', 'screen' ); - $out->addStyle( 'modern/print.css', 'print' ); - } -} - -/** - * @todo document - * @ingroup Skins - */ -class ModernTemplate extends QuickTemplate { - var $skin; - /** - * Template filter callback for Modern skin. - * Takes an associative array of data set from a SkinTemplate-based - * class, and a wrapper for MediaWiki's localization database, and - * outputs a formatted page. - * - * @access private - */ - function execute() { - global $wgRequest; - $this->skin = $skin = $this->data['skin']; - $action = $wgRequest->getText( 'action' ); - - // Suppress warnings to prevent notices about missing indexes in $this->data - wfSuppressWarnings(); - -?> -data['xhtmlnamespaces'] as $tag => $ns) { - ?>xmlns:xml:lang="text('lang') ?>" lang="text('lang') ?>" dir="text('dir') ?>"> - - - html('headlinks') ?> - <?php $this->text('pagetitle') ?> - html('csslinks') ?> - - - data ); ?> - - - -html('headscripts') ?> -data['jsvarurl' ]) { ?> - - -data['pagecss' ]) { ?> - -data['usercss' ]) { ?> - -data['userjs' ]) { ?> - -data['userjsprev']) { ?> - -data['trackbackhtml']) print $this->data['trackbackhtml']; ?> - -data['body_ondblclick']) { ?> ondblclick="text('body_ondblclick') ?>" -data['body_onload' ]) { ?> onload="text('body_onload') ?>" - class="mediawiki text('dir') ?> text('pageclass') ?> text('skinnameclass') ?>"> - - -

data['displaytitle']!=""?$this->html('title'):$this->text('title') ?>

- -
-
- -
-
msg('views') ?>
-
- -
-
- - -
- -
-
-
msg('tagline') ?>
- data['newtalk'] ) { - ?>
html('newtalk') ?>
- - data['sitenotice']) { - ?>
html('sitenotice') ?>
- -
- -
html('subtitle') ?>
- - data['undelete']) { ?>
html('undelete') ?>
- data['showjumplinks']) { ?> - - html('bodytext') ?> -
- data['catlinks']) { $this->html('catlinks'); } ?> - html ('dataAfterContent') ?> -
-
-
- -
- - - data['sidebar']; - if ( !isset( $sidebar['SEARCH'] ) ) $sidebar['SEARCH'] = true; - if ( !isset( $sidebar['TOOLBOX'] ) ) $sidebar['TOOLBOX'] = true; - if ( !isset( $sidebar['LANGUAGES'] ) ) $sidebar['LANGUAGES'] = true; - - foreach ($sidebar as $boxName => $cont) { - if ( $boxName == 'SEARCH' ) { - $this->searchBox(); - } elseif ( $boxName == 'TOOLBOX' ) { - $this->toolbox(); - } elseif ( $boxName == 'LANGUAGES' ) { - $this->languageBox(); - } else { - $this->customBox( $boxName, $cont ); - } - } - ?> - -
- - -
- -
- - -
-
msg('personaltools') ?>
-
- -
-
- - - - - - html('bottomscripts'); /* JS call to runBodyOnloadHook */ ?> -html('reporttime') ?> -data['debug'] ): ?> - - - - - - - - -
-
msg('toolbox') ?>
-
- -
-
- - -data['language_urls'] ) { ?> -
-
msg('otherlanguages') ?>
-
-
    -data['language_urls'] as $langlink) { ?> -
    • - -
-
-
- -
skin->tooltip('p-'.$bar) ?>> -
-
- - - -
-
- +Powered by MediaWiki $wgVersion"; + } + + function initPage( OutputPage $out ) { + parent::initPage( $out ); + $this->skinname = 'modern'; + $this->stylename = 'modern'; + $this->template = 'ModernTemplate'; + } + + function setupSkinUserCss( OutputPage $out ){ + // Do not call parent::setupSkinUserCss(), we have our own print style + $out->addStyle( 'common/shared.css', 'screen' ); + $out->addStyle( 'modern/main.css', 'screen' ); + $out->addStyle( 'modern/print.css', 'print' ); + $out->addStyle( 'modern/rtl.css', 'screen', '', 'rtl' ); + } +} + +/** + * @todo document + * @ingroup Skins + */ +class ModernTemplate extends QuickTemplate { + var $skin; + /** + * Template filter callback for Modern skin. + * Takes an associative array of data set from a SkinTemplate-based + * class, and a wrapper for MediaWiki's localization database, and + * outputs a formatted page. + * + * @access private + */ + function execute() { + global $wgRequest; + $this->skin = $skin = $this->data['skin']; + $action = $wgRequest->getText( 'action' ); + + // Suppress warnings to prevent notices about missing indexes in $this->data + wfSuppressWarnings(); + +?> +data['xhtmlnamespaces'] as $tag => $ns) { + ?>xmlns:xml:lang="text('lang') ?>" lang="text('lang') ?>" dir="text('dir') ?>"> + + + html('headlinks') ?> + <?php $this->text('pagetitle') ?> + html('csslinks') ?> + + + data ); ?> + + + +html('headscripts') ?> +data['jsvarurl' ]) { ?> + + +data['pagecss' ]) { ?> + +data['usercss' ]) { ?> + +data['userjs' ]) { ?> + +data['userjsprev']) { ?> + +data['trackbackhtml']) print $this->data['trackbackhtml']; ?> + +data['body_ondblclick']) { ?> ondblclick="text('body_ondblclick') ?>" +data['body_onload' ]) { ?> onload="text('body_onload') ?>" + class="mediawiki text('dir') ?> text('pageclass') ?> text('skinnameclass') ?>"> + + +

data['displaytitle']!=""?$this->html('title'):$this->text('title') ?>

+ +
+
+ +
+
msg('views') ?>
+
+ +
+
+ + +
+ +
+
+
msg('tagline') ?>
+ data['newtalk'] ) { + ?>
html('newtalk') ?>
+ + data['sitenotice']) { + ?>
html('sitenotice') ?>
+ +
+ +
html('subtitle') ?>
+ + data['undelete']) { ?>
html('undelete') ?>
+ data['showjumplinks']) { ?> + + html('bodytext') ?> +
+ data['catlinks']) { $this->html('catlinks'); } ?> + html ('dataAfterContent') ?> +
+
+
+ +
+ + + data['sidebar']; + if ( !isset( $sidebar['SEARCH'] ) ) $sidebar['SEARCH'] = true; + if ( !isset( $sidebar['TOOLBOX'] ) ) $sidebar['TOOLBOX'] = true; + if ( !isset( $sidebar['LANGUAGES'] ) ) $sidebar['LANGUAGES'] = true; + + foreach ($sidebar as $boxName => $cont) { + if ( $boxName == 'SEARCH' ) { + $this->searchBox(); + } elseif ( $boxName == 'TOOLBOX' ) { + $this->toolbox(); + } elseif ( $boxName == 'LANGUAGES' ) { + $this->languageBox(); + } else { + $this->customBox( $boxName, $cont ); + } + } + ?> + +
+ + +
+ +
+ + +
+
msg('personaltools') ?>
+
+ +
+
+ + + + + + html('bottomscripts'); /* JS call to runBodyOnloadHook */ ?> +html('reporttime') ?> +data['debug'] ): ?> + + + + + + + + +
+
msg('toolbox') ?>
+
+ +
+
+ + +data['language_urls'] ) { ?> +
+
msg('otherlanguages') ?>
+
+
    +data['language_urls'] as $langlink) { ?> +
    • + +
+
+
+ +
skin->tooltip('p-'.$bar) ?>> +
+
+ + + +
+
+ diff --git a/skins/modern/rtl.css b/skins/modern/rtl.css index a9eca51530..d7aae76984 100644 --- a/skins/modern/rtl.css +++ b/skins/modern/rtl.css @@ -100,7 +100,7 @@ table.filehistory th { margin: 0 -15em 0 0; float: left; } - + #mw_content { margin: 0 14em 0 0; border-left: none; @@ -142,6 +142,12 @@ table.filehistory th { html > body div#mw_contentholder ul { display: table; } +html > body div#mw_contentholder ul li { + margin-right:10px; +} +html > body div.pBody ul li { + margin-right:4px; +} html > body div#mw_contentholder ul#filetoc { display: block; }