Merge "Special:PagesWithProp: Distinguish content from interface"

diff --combined includes/specials/SpecialPagesWithProp.php
index 1c77a0c,61aa4d2..e22b42a
--- 1/includes/specials/SpecialPagesWithProp.php
--- 2/includes/specials/SpecialPagesWithProp.php
+++ b/includes/specials/SpecialPagesWithProp.php
@@@ -42,6 -42,7 +42,7 @@@ class SpecialPagesWithProp extends Quer
        function execute( $par ) {
                $this->setHeaders();
                $this->outputHeader();
+               $this->getOutput()->addModuleStyles( 'mediawiki.special.pagesWithProp' );
  
                $request = $this->getRequest();
                $propname = $request->getVal( 'propname', $par );
@@@ -54,7 -55,6 +55,7 @@@
                        __METHOD__,
                        array( 'DISTINCT', 'ORDER BY' => 'pp_propname' )
                );
 +              $propnames = array();
                foreach ( $res as $row ) {
                        $propnames[$row->pp_propname] = $row->pp_propname;
                }
@@@ -136,7 -136,7 +137,7 @@@
                        if ( $isBinary || $isTooLong ) {
                                $message = $this
                                        ->msg( $isBinary ? 'pageswithprop-prophidden-binary' : 'pageswithprop-prophidden-long' )
 -                                      ->numParams( round( $valueLength / 1024, 2 ) );
 +                                      ->params( $this->getLanguage()->formatSize( $valueLength ) );
  
                                $propValue = Html::element( 'span', array( 'class' => 'prop-value-hidden' ), $message->text() );
                        } else {

diff --combined resources/Resources.php
index 8648b70,0c94df7..eeb3ae7
--- 1/resources/Resources.php
--- 2/resources/Resources.php
+++ b/resources/Resources.php
@@@ -719,30 -719,17 +719,30 @@@ return array
        'mediawiki.action.edit' => array(
                'scripts' => 'resources/mediawiki.action/mediawiki.action.edit.js',
                'dependencies' => array(
 -                      'mediawiki.legacy.wikibits',
 +                      'mediawiki.action.edit.styles',
                        'jquery.textSelection',
                        'jquery.byteLimit',
                ),
                'position' => 'top',
        ),
 +      'mediawiki.action.edit.styles' => array(
 +              'styles' => 'resources/mediawiki.action/mediawiki.action.edit.styles.css',
 +              'position' => 'top',
 +      ),
 +      'mediawiki.action.edit.collapsibleFooter' => array(
 +              'scripts' => 'resources/mediawiki.action/mediawiki.action.edit.collapsibleFooter.js',
 +              'styles' => 'resources/mediawiki.action/mediawiki.action.edit.collapsibleFooter.css',
 +              'dependencies' => array(
 +                      'jquery.makeCollapsible',
 +                      'mediawiki.icon',
 +              ),
 +      ),
        'mediawiki.action.edit.preview' => array(
                'scripts' => 'resources/mediawiki.action/mediawiki.action.edit.preview.js',
                'dependencies' => array(
                        'jquery.form',
                        'jquery.spinner',
 +                      'mediawiki.action.history.diff',
                ),
        ),
        'mediawiki.action.history' => array(
@@@ -848,16 -835,6 +848,16 @@@
                'targets' => array( 'desktop', 'mobile' ),
        ),
  
 +      'mediawiki.language.months' => array(
 +              'scripts' => 'resources/mediawiki.language/mediawiki.language.months.js',
 +              'dependencies' => 'mediawiki.language',
 +              'messages' => array_merge(
 +                      Language::$mMonthMsgs,
 +                      Language::$mMonthGenMsgs,
 +                      Language::$mMonthAbbrevMsgs
 +              )
 +      ),
 +
        /* MediaWiki Libs */
  
        'mediawiki.libs.jpegmeta' => array(
@@@ -866,9 -843,6 +866,9 @@@
  
        /* MediaWiki Page */
  
 +      'mediawiki.page.gallery' => array(
 +              'scripts' => 'resources/mediawiki.page/mediawiki.page.gallery.js',
 +      ),
        'mediawiki.page.ready' => array(
                'scripts' => 'resources/mediawiki.page/mediawiki.page.ready.js',
                'dependencies' => array(
@@@ -925,10 -899,6 +925,10 @@@
                        'watcherrortext',
                ),
        ),
 +      'mediawiki.page.image.pagination' => array(
 +              'scripts' => 'resources/mediawiki.page/mediawiki.page.image.pagination.js',
 +              'dependencies' => array( 'jquery.spinner' )
 +      ),
  
        /* MediaWiki Special pages */
  
@@@ -963,6 -933,9 +963,9 @@@
                'scripts' => 'resources/mediawiki.special/mediawiki.special.movePage.js',
                'dependencies' => 'jquery.byteLimit',
        ),
+       'mediawiki.special.pagesWithProp' => array(
+               'styles' => 'resources/mediawiki.special/mediawiki.special.pagesWithProp.css',
+       ),
        'mediawiki.special.preferences' => array(
                'scripts' => 'resources/mediawiki.special/mediawiki.special.preferences.js',
                'styles' => 'resources/mediawiki.special/mediawiki.special.preferences.css',
@@@ -1102,8 -1075,6 +1105,8 @@@
                'remoteBasePath' => $GLOBALS['wgStylePath'],
                'localBasePath' => $GLOBALS['wgStyleDirectory'],
                'dependencies' => array(
 +                      'mediawiki.api',
 +                      'mediawiki.Title',
                        'mediawiki.legacy.wikibits',
                        'mediawiki.util',
                ),