* Special:Prefixindex: Move table styling to shared.css

* Add CSS IDs to tables
* Use correct message 'allpagesprefix' for input form label
* Replace _ with ' ' in next page link

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index fe0dfdd..a62c463 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -174,6 +174,9 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   maintenance/cleanupWatchlist.php
 * (bug 17488) RSS/Atom links in left toolbar are now localized
 * (bug 17472) use print <<<EOF in maintenance/importTextFile.php
+* Special:PrefixIndex: Move table styling to shared.css, add CSS IDs to tables
+  use correct message 'allpagesprefix' for input form label, replace _ with ' '
+  in next page link
 
 == API changes in 1.15 ==
 * (bug 16858) Revamped list=deletedrevs to make listing deleted contributions

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 7399a70..b27f7aa 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1463,7 +1463,7 @@ $wgCacheEpoch = '20030516000000';
  * to ensure that client-side caches don't keep obsolete copies of global
  * styles.
  */
-$wgStyleVersion = '205';
+$wgStyleVersion = '206';
 
 
 # Server-side caching:

diff --git a/includes/specials/SpecialPrefixindex.php b/includes/specials/SpecialPrefixindex.php
index 3ed4d15..48f94f7 100644 (file)
--- a/includes/specials/SpecialPrefixindex.php
+++ b/includes/specials/SpecialPrefixindex.php
@@ -6,9 +6,6 @@
  */
 class SpecialPrefixindex extends SpecialAllpages {
        // Inherit $maxPerPage
-
-       // Define other properties
-       protected $nsfromMsg = 'allpagesprefix';
        
        function __construct(){
                parent::__construct( 'Prefixindex' );
@@ -63,7 +60,7 @@ class SpecialPrefixindex extends SpecialAllpages {
                $out .= Xml::openElement( 'table', array( 'id' => 'nsselect', 'class' => 'allpages' ) );
                $out .= "<tr>
                                <td class='mw-label'>" .
-                               Xml::label( wfMsg( 'allpagesfrom' ), 'nsfrom' ) .
+                               Xml::label( wfMsg( 'allpagesprefix' ), 'nsfrom' ) .
                                "</td>
                                <td class='mw-input'>" .
                                        Xml::input( 'from', 30, str_replace('_',' ',$from), array( 'id' => 'nsfrom' ) ) .
@@ -99,7 +96,6 @@ class SpecialPrefixindex extends SpecialAllpages {
                $fromList = $this->getNamespaceKeyAndText($namespace, $from);
                $prefixList = $this->getNamespaceKeyAndText($namespace, $prefix);
                $namespaces = $wgContLang->getNamespaces();
-               $align = $wgContLang->isRtl() ? 'left' : 'right';
 
                if ( !$prefixList || !$fromList ) {
                        $out = wfMsgWikiHtml( 'allpagesbadtitle' );
@@ -134,7 +130,7 @@ class SpecialPrefixindex extends SpecialAllpages {
 
                        $n = 0;
                        if( $res->numRows() > 0 ) {
-                               $out = '<table style="background: inherit;" border="0" width="100%">';
+                               $out = Xml::openElement( 'table', array( 'border' => '0', 'id' => 'mw-prefixindex-list-table' ) );
        
                                while( ( $n < $this->maxPerPage ) && ( $s = $res->fetchObject() ) ) {
                                        $t = Title::makeTitle( $s->page_namespace, $s->page_title );
@@ -157,7 +153,7 @@ class SpecialPrefixindex extends SpecialAllpages {
                                if( ($n % 3) != 0 ) {
                                        $out .= '</tr>';
                                }
-                               $out .= '</table>';
+                               $out .= Xml::closeElement( 'table' );
                        } else {
                                $out = '';
                        }
@@ -168,23 +164,27 @@ class SpecialPrefixindex extends SpecialAllpages {
                } else {
                        $nsForm = $this->namespacePrefixForm( $namespace, $prefix );
                        $self = $this->getTitle();
-                       $out2 = '<table style="background: inherit;" width="100%" cellpadding="0" cellspacing="0" border="0">';
-                       $out2 .= '<tr valign="top"><td>' . $nsForm;
-                       $out2 .= '</td><td align="' . $align . '" style="font-size: smaller; margin-bottom: 1em;">' .
-                                       $sk->makeKnownLinkObj( $self,
-                                               wfMsg ( 'allpages' ) );
+                       $out2 = Xml::openElement( 'table', array( 'border' => '0', 'id' => 'mw-prefixindex-nav-table' ) )  .
+                               '<tr>
+                                       <td>' .
+                                               $nsForm .
+                                       '</td>
+                                       <td id="mw-prefixindex-nav-form">' .
+                                               $sk->makeKnownLinkObj( $self, wfMsg ( 'allpages' ) );
+
                        if( isset( $res ) && $res && ( $n == $this->maxPerPage ) && ( $s = $res->fetchObject() ) ) {
                                $namespaceparam = $namespace ? "&namespace=$namespace" : "";
                                $out2 = $wgLang->pipeList( array(
                                        $out2,
                                        $sk->makeKnownLinkObj(
                                                $self,
-                                               wfMsgHtml( 'nextpage', htmlspecialchars( $s->page_title ) ),
+                                               wfMsgHtml( 'nextpage', str_replace( '_',' ', htmlspecialchars( $s->page_title ) ) ),
                                                "from=" . wfUrlEncode( $s->page_title ) .
                                                "&prefix=" . wfUrlEncode( $prefix ) . $namespaceparam )
                                ) );
                        }
-                       $out2 .= "</td></tr></table>";
+                       $out2 .= "</td></tr>" .
+                               Xml::closeElement( 'table' );
                }
 
                $wgOut->addHTML( $out2 . $out );

diff --git a/skins/common/shared.css b/skins/common/shared.css
index 724b0f4..a053de9 100644 (file)
--- a/skins/common/shared.css
+++ b/skins/common/shared.css
@@ -297,6 +297,19 @@ td#mw-emailuser-sender, td#mw-emailuser-recipient {
        font-weight: bold;
 }
 
+/* Special:Prefixindex styling */
+table#mw-prefixindex-list-table,
+table#mw-prefixindex-nav-table {
+       width: 98%;
+       background-color: transparent;
+}
+td#mw-prefixindex-nav-form  {
+       font-size: smaller;
+       margin-bottom: 1em;
+       text-align: right;
+       vertical-align: top;
+}
+
 /*
  * Recreating deleted page warning
  * Reupload file warning

diff --git a/skins/modern/rtl.css b/skins/modern/rtl.css
index 1ea03bf..d2dcace 100644 (file)
--- a/skins/modern/rtl.css
+++ b/skins/modern/rtl.css
@@ -151,3 +151,9 @@ html > body div.pBody ul li {
 html > body div#mw_contentholder ul#filetoc {
        display: block;
 }
+
+/* Special:Prefixindex styling */
+td#mw-prefixindex-nav-form  {
+       text-align: left;
+}
+

diff --git a/skins/monobook/rtl.css b/skins/monobook/rtl.css
index 660b671..60ffb46 100644 (file)
--- a/skins/monobook/rtl.css
+++ b/skins/monobook/rtl.css
@@ -239,3 +239,8 @@ html > body div#bodyContent ul {
 html > body div#bodyContent ul#filetoc {
        display: block;
 }
+/* Special:Prefixindex styling */
+td#mw-prefixindex-nav-form  {
+       text-align: left;
+}
+

diff --git a/skins/simple/rtl.css b/skins/simple/rtl.css
index 9859ccd..53b3dc0 100644 (file)
--- a/skins/simple/rtl.css
+++ b/skins/simple/rtl.css
@@ -174,3 +174,8 @@ table.filehistory th {
 html > body div#bodyContent ul {
        display: table;
 }
+/* Special:Prefixindex styling */
+td#mw-prefixindex-nav-form  {
+       text-align: left;
+}
+