Merge "mediawiki.action.edit: Add styles for edit form's footer"

diff --combined includes/EditPage.php
index fe1ca00,22cf795..6281589
--- 1/includes/EditPage.php
--- 2/includes/EditPage.php
+++ b/includes/EditPage.php
@@@ -1920,6 -1920,7 +1920,7 @@@ class EditPage 
                global $wgOut, $wgUser;
  
                $wgOut->addModules( 'mediawiki.action.edit' );
+               $wgOut->addModuleStyles( 'mediawiki.action.edit.styles' );
  
                if ( $wgUser->getOption( 'uselivepreview', false ) ) {
                        $wgOut->addModules( 'mediawiki.action.edit.preview' );
@@@ -2279,9 -2280,6 +2280,9 @@@
                $wgOut->addHTML( Html::rawElement( 'div', array( 'class' => 'hiddencats' ),
                        Linker::formatHiddenCategories( $this->mArticle->getHiddenCategories() ) ) );
  
 +              $wgOut->addHTML( Html::rawElement( 'div', array( 'class' => 'limitreport' ),
 +                      self::getPreviewLimitReport( $this->mParserOutput ) ) );
 +
                $wgOut->addModules( 'mediawiki.action.edit.collapsibleFooter' );
  
                if ( $this->isConflict ) {
@@@ -2861,59 -2859,6 +2862,59 @@@ HTM
                        call_user_func_array( 'wfMessage', $copywarnMsg )->plain() . "\n</div>";
        }
  
 +      /**
 +       * Get the Limit report for page previews
 +       *
 +       * @since 1.22
 +       * @param ParserOutput $output ParserOutput object from the parse
 +       * @return string HTML
 +       */
 +      public static function getPreviewLimitReport( $output ) {
 +              if ( !$output || !$output->getLimitReportData() ) {
 +                      return '';
 +              }
 +
 +              wfProfileIn( __METHOD__ );
 +
 +              $limitReport = Html::rawElement( 'div', array( 'class' => 'mw-limitReportExplanation' ),
 +                      wfMessage( 'limitreport-title' )->parseAsBlock()
 +              );
 +
 +              // Show/hide animation doesn't work correctly on a table, so wrap it in a div.
 +              $limitReport .= Html::openElement( 'div', array( 'class' => 'preview-limit-report-wrapper' ) );
 +
 +              $limitReport .= Html::openElement( 'table', array(
 +                      'class' => 'preview-limit-report wikitable'
 +              ) ) .
 +                      Html::openElement( 'tbody' );
 +
 +              foreach ( $output->getLimitReportData() as $key => $value ) {
 +                      if ( wfRunHooks( 'ParserLimitReportFormat',
 +                              array( $key, $value, &$limitReport, true, true )
 +                      ) ) {
 +                              $keyMsg = wfMessage( $key );
 +                              $valueMsg = wfMessage( array( "$key-value-html", "$key-value" ) );
 +                              if ( !$valueMsg->exists() ) {
 +                                      $valueMsg = new RawMessage( '$1' );
 +                              }
 +                              if ( !$keyMsg->isDisabled() && !$valueMsg->isDisabled() ) {
 +                                      $limitReport .= Html::openElement( 'tr' ) .
 +                                              Html::rawElement( 'th', null, $keyMsg->parse() ) .
 +                                              Html::rawElement( 'td', null, $valueMsg->params( $value )->parse() ) .
 +                                              Html::closeElement( 'tr' );
 +                              }
 +                      }
 +              }
 +
 +              $limitReport .= Html::closeElement( 'tbody' ) .
 +                      Html::closeElement( 'table' ) .
 +                      Html::closeElement( 'div' );
 +
 +              wfProfileOut( __METHOD__ );
 +
 +              return $limitReport;
 +      }
 +
        protected function showStandardInputs( &$tabindex = 2 ) {
                global $wgOut;
                $wgOut->addHTML( "<div class='editOptions'>\n" );

diff --combined resources/Resources.php
index 1b0e33c,565f0f4..6965ef7
--- 1/resources/Resources.php
--- 2/resources/Resources.php
+++ b/resources/Resources.php
@@@ -719,12 -719,17 +719,17 @@@ return array
        'mediawiki.action.edit' => array(
                'scripts' => 'resources/mediawiki.action/mediawiki.action.edit.js',
                'dependencies' => array(
+                       'mediawiki.action.edit.styles',
                        'mediawiki.legacy.wikibits',
                        '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',
@@@ -851,9 -856,6 +856,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(
@@@ -1083,8 -1085,6 +1088,8 @@@
                'remoteBasePath' => $GLOBALS['wgStylePath'],
                'localBasePath' => $GLOBALS['wgStyleDirectory'],
                'dependencies' => array(
 +                      'mediawiki.api',
 +                      'mediawiki.Title',
                        'mediawiki.legacy.wikibits',
                        'mediawiki.util',
                ),