From 11731e3b3bff37b189d0664c26a0a6faac669677 Mon Sep 17 00:00:00 2001 From: Rotem Liss Date: Tue, 3 Jun 2008 12:56:33 +0000 Subject: [PATCH] Reverting new Special:SpecialPages layout: Problems in RTL wikis in Firefox (didn't check other browsers), list bullets are indented to the left. The change to the restricted special pages was not reverted, and they are still in the combined list. --- RELEASE-NOTES | 3 +-- includes/DefaultSettings.php | 2 +- includes/SpecialSpecialpages.php | 32 +++++++++++++++++++++----------- skins/common/common_rtl.css | 5 ----- skins/common/shared.css | 19 ++----------------- skins/modern/rtl.css | 5 ----- skins/monobook/rtl.css | 5 ----- 7 files changed, 25 insertions(+), 46 deletions(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index e30fa58fc1..3be863aaff 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -129,8 +129,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN * Add information about user group membership to Special:Preferences * (bug 14146) Wrap usage section on imagepages into
s. * New layout for Special:Specialpages. Restricted pages are marked but not separated - from other pages in their group. And the page uses css rather than tables to create - a column layout which grades well in all sizes of browsers. + from other pages in their group. * (bug 14263) Show a diff of the revert on rollback notification page. * (bug 13434) Show a warning when hash identical files exist diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index 5f60a08b1d..28e9de0967 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -1324,7 +1324,7 @@ $wgCacheEpoch = '20030516000000'; * to ensure that client-side caches don't keep obsolete copies of global * styles. */ -$wgStyleVersion = '151'; +$wgStyleVersion = '152'; # Server-side caching: diff --git a/includes/SpecialSpecialpages.php b/includes/SpecialSpecialpages.php index 3179577245..eb037107a1 100644 --- a/includes/SpecialSpecialpages.php +++ b/includes/SpecialSpecialpages.php @@ -16,12 +16,12 @@ function wfSpecialSpecialpages() { $sk = $wgUser->getSkin(); $pages = SpecialPage::getUsablePages(); - + if( count( $pages ) == 0 ) { # Yeah, that was pointless. Thanks for coming. return; } - + /** Put them into a sortable array */ $groups = array(); foreach ( $pages as $page ) { @@ -30,45 +30,55 @@ function wfSpecialSpecialpages() { if( !isset($groups[$group]) ) { $groups[$group] = array(); } + //$groups[$group][$page->getDescription()] = $page->getTitle(); $groups[$group][$page->getDescription()] = array( $page->getTitle(), $page->isRestricted() ); } } - + /** Sort */ if ( $wgSortSpecialPages ) { foreach( $groups as $group => $sortedPages ) { ksort( $groups[$group] ); } } - + /** Always move "other" to end */ if( array_key_exists('other',$groups) ) { $other = $groups['other']; unset( $groups['other'] ); $groups['other'] = $other; } - + /** Now output the HTML */ $restrictedPages = false; foreach ( $groups as $group => $sortedPages ) { + $middle = ceil( count($sortedPages)/2 ); + $total = count($sortedPages); + $count = 0; + $wgOut->addHTML( "

".wfMsgHtml("specialpages-group-$group")."

\n" ); - $wgOut->addHTML( "