| Index: trunk/phase3/skins/monobook/rtl.css |
| — | — | @@ -239,3 +239,8 @@ |
| 240 | 240 | html > body div#bodyContent ul#filetoc { |
| 241 | 241 | display: block; |
| 242 | 242 | } |
| | 243 | +/* Special:Prefixindex styling */ |
| | 244 | +td#mw-prefixindex-nav-form { |
| | 245 | + text-align: left; |
| | 246 | +} |
| | 247 | + |
| Index: trunk/phase3/skins/modern/rtl.css |
| — | — | @@ -151,3 +151,9 @@ |
| 152 | 152 | html > body div#mw_contentholder ul#filetoc { |
| 153 | 153 | display: block; |
| 154 | 154 | } |
| | 155 | + |
| | 156 | +/* Special:Prefixindex styling */ |
| | 157 | +td#mw-prefixindex-nav-form { |
| | 158 | + text-align: left; |
| | 159 | +} |
| | 160 | + |
| Index: trunk/phase3/skins/common/shared.css |
| — | — | @@ -297,6 +297,19 @@ |
| 298 | 298 | font-weight: bold; |
| 299 | 299 | } |
| 300 | 300 | |
| | 301 | +/* Special:Prefixindex styling */ |
| | 302 | +table#mw-prefixindex-list-table, |
| | 303 | +table#mw-prefixindex-nav-table { |
| | 304 | + width: 98%; |
| | 305 | + background-color: transparent; |
| | 306 | +} |
| | 307 | +td#mw-prefixindex-nav-form { |
| | 308 | + font-size: smaller; |
| | 309 | + margin-bottom: 1em; |
| | 310 | + text-align: right; |
| | 311 | + vertical-align: top; |
| | 312 | +} |
| | 313 | + |
| 301 | 314 | /* |
| 302 | 315 | * Recreating deleted page warning |
| 303 | 316 | * Reupload file warning |
| Index: trunk/phase3/skins/simple/rtl.css |
| — | — | @@ -174,3 +174,8 @@ |
| 175 | 175 | html > body div#bodyContent ul { |
| 176 | 176 | display: table; |
| 177 | 177 | } |
| | 178 | +/* Special:Prefixindex styling */ |
| | 179 | +td#mw-prefixindex-nav-form { |
| | 180 | + text-align: left; |
| | 181 | +} |
| | 182 | + |
| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -1463,7 +1463,7 @@ |
| 1464 | 1464 | * to ensure that client-side caches don't keep obsolete copies of global |
| 1465 | 1465 | * styles. |
| 1466 | 1466 | */ |
| 1467 | | -$wgStyleVersion = '205'; |
| | 1467 | +$wgStyleVersion = '206'; |
| 1468 | 1468 | |
| 1469 | 1469 | |
| 1470 | 1470 | # Server-side caching: |
| Index: trunk/phase3/includes/specials/SpecialPrefixindex.php |
| — | — | @@ -6,9 +6,6 @@ |
| 7 | 7 | */ |
| 8 | 8 | class SpecialPrefixindex extends SpecialAllpages { |
| 9 | 9 | // Inherit $maxPerPage |
| 10 | | - |
| 11 | | - // Define other properties |
| 12 | | - protected $nsfromMsg = 'allpagesprefix'; |
| 13 | 10 | |
| 14 | 11 | function __construct(){ |
| 15 | 12 | parent::__construct( 'Prefixindex' ); |
| — | — | @@ -63,7 +60,7 @@ |
| 64 | 61 | $out .= Xml::openElement( 'table', array( 'id' => 'nsselect', 'class' => 'allpages' ) ); |
| 65 | 62 | $out .= "<tr> |
| 66 | 63 | <td class='mw-label'>" . |
| 67 | | - Xml::label( wfMsg( 'allpagesfrom' ), 'nsfrom' ) . |
| | 64 | + Xml::label( wfMsg( 'allpagesprefix' ), 'nsfrom' ) . |
| 68 | 65 | "</td> |
| 69 | 66 | <td class='mw-input'>" . |
| 70 | 67 | Xml::input( 'from', 30, str_replace('_',' ',$from), array( 'id' => 'nsfrom' ) ) . |
| — | — | @@ -99,7 +96,6 @@ |
| 100 | 97 | $fromList = $this->getNamespaceKeyAndText($namespace, $from); |
| 101 | 98 | $prefixList = $this->getNamespaceKeyAndText($namespace, $prefix); |
| 102 | 99 | $namespaces = $wgContLang->getNamespaces(); |
| 103 | | - $align = $wgContLang->isRtl() ? 'left' : 'right'; |
| 104 | 100 | |
| 105 | 101 | if ( !$prefixList || !$fromList ) { |
| 106 | 102 | $out = wfMsgWikiHtml( 'allpagesbadtitle' ); |
| — | — | @@ -134,7 +130,7 @@ |
| 135 | 131 | |
| 136 | 132 | $n = 0; |
| 137 | 133 | if( $res->numRows() > 0 ) { |
| 138 | | - $out = '<table style="background: inherit;" border="0" width="100%">'; |
| | 134 | + $out = Xml::openElement( 'table', array( 'border' => '0', 'id' => 'mw-prefixindex-list-table' ) ); |
| 139 | 135 | |
| 140 | 136 | while( ( $n < $this->maxPerPage ) && ( $s = $res->fetchObject() ) ) { |
| 141 | 137 | $t = Title::makeTitle( $s->page_namespace, $s->page_title ); |
| — | — | @@ -157,7 +153,7 @@ |
| 158 | 154 | if( ($n % 3) != 0 ) { |
| 159 | 155 | $out .= '</tr>'; |
| 160 | 156 | } |
| 161 | | - $out .= '</table>'; |
| | 157 | + $out .= Xml::closeElement( 'table' ); |
| 162 | 158 | } else { |
| 163 | 159 | $out = ''; |
| 164 | 160 | } |
| — | — | @@ -168,23 +164,27 @@ |
| 169 | 165 | } else { |
| 170 | 166 | $nsForm = $this->namespacePrefixForm( $namespace, $prefix ); |
| 171 | 167 | $self = $this->getTitle(); |
| 172 | | - $out2 = '<table style="background: inherit;" width="100%" cellpadding="0" cellspacing="0" border="0">'; |
| 173 | | - $out2 .= '<tr valign="top"><td>' . $nsForm; |
| 174 | | - $out2 .= '</td><td align="' . $align . '" style="font-size: smaller; margin-bottom: 1em;">' . |
| 175 | | - $sk->makeKnownLinkObj( $self, |
| 176 | | - wfMsg ( 'allpages' ) ); |
| | 168 | + $out2 = Xml::openElement( 'table', array( 'border' => '0', 'id' => 'mw-prefixindex-nav-table' ) ) . |
| | 169 | + '<tr> |
| | 170 | + <td>' . |
| | 171 | + $nsForm . |
| | 172 | + '</td> |
| | 173 | + <td id="mw-prefixindex-nav-form">' . |
| | 174 | + $sk->makeKnownLinkObj( $self, wfMsg ( 'allpages' ) ); |
| | 175 | + |
| 177 | 176 | if( isset( $res ) && $res && ( $n == $this->maxPerPage ) && ( $s = $res->fetchObject() ) ) { |
| 178 | 177 | $namespaceparam = $namespace ? "&namespace=$namespace" : ""; |
| 179 | 178 | $out2 = $wgLang->pipeList( array( |
| 180 | 179 | $out2, |
| 181 | 180 | $sk->makeKnownLinkObj( |
| 182 | 181 | $self, |
| 183 | | - wfMsgHtml( 'nextpage', htmlspecialchars( $s->page_title ) ), |
| | 182 | + wfMsgHtml( 'nextpage', str_replace( '_',' ', htmlspecialchars( $s->page_title ) ) ), |
| 184 | 183 | "from=" . wfUrlEncode( $s->page_title ) . |
| 185 | 184 | "&prefix=" . wfUrlEncode( $prefix ) . $namespaceparam ) |
| 186 | 185 | ) ); |
| 187 | 186 | } |
| 188 | | - $out2 .= "</td></tr></table>"; |
| | 187 | + $out2 .= "</td></tr>" . |
| | 188 | + Xml::closeElement( 'table' ); |
| 189 | 189 | } |
| 190 | 190 | |
| 191 | 191 | $wgOut->addHTML( $out2 . $out ); |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -174,6 +174,9 @@ |
| 175 | 175 | maintenance/cleanupWatchlist.php |
| 176 | 176 | * (bug 17488) RSS/Atom links in left toolbar are now localized |
| 177 | 177 | * (bug 17472) use print <<<EOF in maintenance/importTextFile.php |
| | 178 | +* Special:PrefixIndex: Move table styling to shared.css, add CSS IDs to tables |
| | 179 | + use correct message 'allpagesprefix' for input form label, replace _ with ' ' |
| | 180 | + in next page link |
| 178 | 181 | |
| 179 | 182 | == API changes in 1.15 == |
| 180 | 183 | * (bug 16858) Revamped list=deletedrevs to make listing deleted contributions |