Merge "add basic print styles to CologneBlue"

diff --combined resources/Resources.php
index 0d8b330,61b8820..5bf4061
--- 1/resources/Resources.php
--- 2/resources/Resources.php
+++ b/resources/Resources.php
@@@ -20,7 -20,7 +20,7 @@@
   * @file
   */
  
 -if( !defined( 'MEDIAWIKI' ) ) {
 +if ( !defined( 'MEDIAWIKI' ) ) {
        die( 'Not an entry point.' );
  }
  
@@@ -61,7 -61,10 +61,10 @@@ return array
         * See Vector for an example.
         */
        'skins.cologneblue' => array(
-               'styles' => array( 'cologneblue/screen.css' => array( 'media' => 'screen' ) ),
+               'styles' => array(
+                       'cologneblue/screen.css' => array( 'media' => 'screen' ),
+                       'cologneblue/print.css' => array( 'media' => 'print' ),
+               ),
                'remoteBasePath' => $GLOBALS['wgStylePath'],
                'localBasePath' => $GLOBALS['wgStyleDirectory'],
        ),
@@@ -141,10 -144,6 +144,10 @@@
                'scripts' => 'resources/jquery/jquery.checkboxShiftClick.js',
                'targets' => array( 'desktop', 'mobile' ),
        ),
 +      'jquery.chosen' => array(
 +              'scripts' => 'resources/jquery.chosen/chosen.jquery.js',
 +              'styles' => 'resources/jquery.chosen/chosen.css',
 +      ),
        'jquery.client' => array(
                'scripts' => 'resources/jquery/jquery.client.js',
                'targets' => array( 'desktop', 'mobile' ),
@@@ -640,7 -639,6 +643,7 @@@
        ),
        'mediawiki.htmlform' => array(
                'scripts' => 'resources/mediawiki/mediawiki.htmlform.js',
 +              'messages' => array( 'htmlform-chosen-placeholder' ),
        ),
        'mediawiki.notification' => array(
                'styles' => 'resources/mediawiki/mediawiki.notification.css',
@@@ -742,12 -740,6 +745,12 @@@
        'mediawiki.action.view.rightClickEdit' => array(
                'scripts' => 'resources/mediawiki.action/mediawiki.action.view.rightClickEdit.js',
        ),
 +      'mediawiki.action.edit.editWarning' => array(
 +              'scripts' => 'resources/mediawiki.action/mediawiki.action.edit.editWarning.js',
 +              'messages' => array(
 +                      'editwarning-warning',
 +              ),
 +      ),
        // Alias for backwards compatibility
        'mediawiki.action.watch.ajax' => array(
                'dependencies' => 'mediawiki.page.watch.ajax'
@@@ -907,7 -899,7 +910,7 @@@
        ),
        'mediawiki.special.preferences' => array(
                'scripts' => 'resources/mediawiki.special/mediawiki.special.preferences.js',
 -              'styles'  => 'resources/mediawiki.special/mediawiki.special.preferences.css',
 +              'styles' => 'resources/mediawiki.special/mediawiki.special.preferences.css',
        ),
        'mediawiki.special.recentchanges' => array(
                'scripts' => 'resources/mediawiki.special/mediawiki.special.recentchanges.js',
@@@ -942,29 -934,6 +945,29 @@@
        'mediawiki.special.userlogin.signup' => array(
                'scripts' => 'resources/mediawiki.special/mediawiki.special.userLogin.signup.js',
        ),
 +      'mediawiki.special.userlogin.vform' => array(
 +              'styles' => array(
 +                      'resources/mediawiki.special/mediawiki.special.vforms.css',
 +                      'resources/mediawiki.special/mediawiki.special.userLogin.vform.css',
 +              ),
 +              'position' => 'top',
 +      ),
 +      'mediawiki.special.createaccount.vform' => array(
 +              'styles' => array(
 +                      'resources/mediawiki.special/mediawiki.special.vforms.css',
 +                      'resources/mediawiki.special/mediawiki.special.createAccount.vform.css',
 +              ),
 +              'position' => 'top',
 +      ),
 +      'mediawiki.special.createaccount.vform.js' => array(
 +              'scripts' => 'resources/mediawiki.special/mediawiki.special.createAccount.vform.js',
 +              'messages' => array(
 +                      'createacct-captcha',
 +                      'createacct-imgcaptcha-ph'
 +              ),
 +              'dependencies' => 'mediawiki.jqueryMsg',
 +              'position' => 'top',
 +      ),
        'mediawiki.special.javaScriptTest' => array(
                'scripts' => 'resources/mediawiki.special/mediawiki.special.javaScriptTest.js',
                'messages' => array_merge( Skin::getSkinNameMessages(), array(
@@@ -1064,11 -1033,4 +1067,11 @@@
                'remoteBasePath' => $GLOBALS['wgStylePath'],
                'localBasePath' => $GLOBALS['wgStyleDirectory'],
        ),
 +      'mediawiki.ui' => array(
 +              'skinStyles' => array(
 +                      'default' => 'resources/mediawiki.ui/mediawiki.ui.default.css',
 +                      'vector' => 'resources/mediawiki.ui/mediawiki.ui.vector.css',
 +              ),
 +              'position' => 'top',
 +      ),
  );

diff --combined skins/CologneBlue.php
index 3ada578,8b2bbb8..d766b64
--- 1/skins/CologneBlue.php
--- 2/skins/CologneBlue.php
+++ b/skins/CologneBlue.php
@@@ -22,7 -22,7 +22,7 @@@
   * @ingroup Skins
   */
  
 -if( !defined( 'MEDIAWIKI' ) ) {
 +if ( !defined( 'MEDIAWIKI' ) ) {
        die( -1 );
  }
  
@@@ -39,7 -39,7 +39,7 @@@ class SkinCologneBlue extends SkinTempl
         * @param $out OutputPage
         */
        function setupSkinUserCss( OutputPage $out ) {
-               $out->addModuleStyles( 'mediawiki.legacy.shared' );
+               parent::setupSkinUserCss( $out );
                $out->addModuleStyles( 'mediawiki.legacy.oldshared' );
                $out->addModuleStyles( 'skins.cologneblue' );
        }
@@@ -127,7 -127,7 +127,7 @@@ class CologneBlueTemplate extends BaseT
         *
         * @return string
         */
 -      function processBottomLink( $key, $navlink, $message=null ) {
 +      function processBottomLink( $key, $navlink, $message = null ) {
                if ( !$navlink ) {
                        // Empty navlinks might be passed.
                        return null;
@@@ -202,7 -202,7 +202,7 @@@
                $companionTitle = $title->isTalkPage() ? $title->getSubjectPage() : $title->getTalkPage();
                $companionNamespace = $companionTitle->getNamespace();
  
 -              // TODO these messages appear to only be used by CologneBlue and legacy skins,
 +              // TODO these messages are only be used by CologneBlue,
                // kill and replace with something more sensibly named?
                $nsToMessage = array(
                        NS_MAIN => 'articlepage',
@@@ -234,7 -234,7 +234,7 @@@
  
                // Use the regular navigational link, but replace its text. Everything else stays unmodified.
                $namespacesLinks = $this->data['content_navigation']['namespaces'];
 -              return $this->processBottomLink( $message,  $namespacesLinks[$key], $message );
 +              return $this->processBottomLink( $message, $namespacesLinks[$key], $message );
        }
  
        /**
@@@ -246,7 -246,7 +246,7 @@@
         * @param $navlink array Navigational link generated by SkinTemplate
         * @param $idPrefix mixed Prefix to add to id of this navlink. If false, id is removed entirely. Default is 'cb-'.
         */
 -      function processNavlinkForDocument( $navlink, $idPrefix='cb-' ) {
 +      function processNavlinkForDocument( $navlink, $idPrefix = 'cb-' ) {
                if ( $navlink['id'] ) {
                        $navlink['single-id'] = $navlink['id']; // to allow for tooltip generation
                        $navlink['tooltiponly'] = true; // but no accesskeys
@@@ -255,7 -255,7 +255,7 @@@
                        if ( $idPrefix === false ) {
                                unset( $navlink['id'] );
                        } else {
 -                              $navlink['id'] =  $idPrefix . $navlink['id'];
 +                              $navlink['id'] = $idPrefix . $navlink['id'];
                        }
                }
  
@@@ -316,7 -316,8 +316,8 @@@
                ob_start();
  ?>
        </div>
-       <div id="footer" role="contentinfo">
+       <div id="footer">
+               <div id="footer-navigation" role="navigation">
  <?php
                // Page-related links
                echo $this->bottomLinks();
@@@ -328,8 -329,10 +329,10 @@@
                        $this->getSkin()->aboutLink(),
                        $this->searchForm( 'footer' )
                ) );
-               echo "\n<br />";
- 
+ ?>
+               </div>
+               <div id="footer-info" role="contentinfo">
+ <?php
                // Standard footer info
                $footlinks = $this->getFooterLinks();
                if ( $footlinks['info'] ) {
@@@ -338,6 -341,7 +341,7 @@@
                        }
                }
  ?>
+               </div>
        </div>
  </div>
  <div id="mw-navigation">
@@@ -376,7 -380,7 +380,7 @@@
                );
  
                $personalUrls = $this->getPersonalTools();
 -              foreach ( array ( 'logout', 'createaccount', 'login', 'anonlogin' ) as $key ) {
 +              foreach ( array( 'logout', 'createaccount', 'login', 'anonlogin' ) as $key ) {
                        if ( $personalUrls[$key] ) {
                                $s[] = $this->makeListItem( $key, $personalUrls[$key], array( 'tag' => 'span' ) );
                        }
@@@ -417,7 -421,7 +421,7 @@@
  
                // Personal tools ("My pages")
                $qbmyoptions = $this->getPersonalTools();
 -              foreach ( array ( 'logout', 'createaccount', 'login', 'anonlogin' ) as $key ) {
 +              foreach ( array( 'logout', 'createaccount', 'login', 'anonlogin' ) as $key ) {
                        $qbmyoptions[$key] = null;
                }
  
@@@ -532,17 -536,17 +536,17 @@@
  
                $search = $this->getSkin()->getRequest()->getText( 'search' );
                $action = $this->data['searchaction'];
 -              $s = "<form id=\"searchform-" . htmlspecialchars($which) . "\" method=\"get\" class=\"inline\" action=\"$action\">";
 -              if( $which == 'footer' ) {
 +              $s = "<form id=\"searchform-" . htmlspecialchars( $which ) . "\" method=\"get\" class=\"inline\" action=\"$action\">";
 +              if ( $which == 'footer' ) {
                        $s .= wfMessage( 'qbfind' )->text() . ": ";
                }
  
                $s .= "<input type='text' class=\"mw-searchInput\" name=\"search\" size=\"14\" value=\""
                        . htmlspecialchars( substr( $search, 0, 256 ) ) . "\" />"
 -                      . ($which == 'footer' ? " " : "<br />")
 +                      . ( $which == 'footer' ? " " : "<br />" )
                        . "<input type='submit' class=\"searchButton\" name=\"go\" value=\"" . wfMessage( 'searcharticle' )->escaped() . "\" />";
  
 -              if( $wgUseTwoButtonsSearchForm ) {
 +              if ( $wgUseTwoButtonsSearchForm ) {
                        $s .= " <input type='submit' class=\"searchButton\" name=\"fulltext\" value=\"" . wfMessage( 'searchbutton' )->escaped() . "\" />\n";
                } else {
                        $s .= '<div><a href="' . $action . '" rel="search">' . wfMessage( 'powersearch-legend' )->escaped() . "</a></div>\n";