Merge "[mw.notification] Introduce a full fledged notification system into core repla...

diff --combined RELEASE-NOTES-1.20
index eea22b4,9eba4e6..0b48b72
--- 1/RELEASE-NOTES-1.20
--- 2/RELEASE-NOTES-1.20
+++ b/RELEASE-NOTES-1.20
@@@ -24,7 -24,7 +24,7 @@@ upgrade PHP if you have not done so pri
    This only affects installations which have $wgAllowCopyUploads set to true.
  * Removed f-prot support from $wgAntivirusSetup.
  * New variable $wgDBerrorLogTZ to provide dates in the error log in a
 -  different timezone than the wiki timezone set by $wgLocalTimezone.
 +  different timezone than the wiki timezone set by $wgLocaltimezone.
  * New variables $wgDBssl and $wgDBcompress to enable SSL and compression for database
    connections, if either are available for the selected DB type.
  
@@@ -65,7 -65,7 +65,7 @@@
  * (bug 35685) api.php URL and other entry point URLs are now listed on
    Special:Version
  * Edit notices can now be translated.
 -* jQuery upgraded to 1.8.
 +* jQuery upgraded to 1.8.1
  * jQuery UI upgraded to 1.8.23.
  * (bug 35705) QUnit upgraded from v1.2.0 to v1.9.0.
  * (bug 37604) jquery.cookie upgraded to 2011 version.
@@@ -122,7 -122,6 +122,6 @@@
  * HTMLForm mutators can now be chained (they return $this)
  * A new message, "api-error-filetype-banned-type", is available for formatting
    API upload errors due to the file extension blacklist.
- * jsMessage: Redesigned in Vector/Monobook as floating bubble with auto-hide.
  * New hook 'ParserTestGlobals' allows to set globals before running parser tests.
  * Allow importing pages as subpage.
  * Add lang and hreflang attributes to language links on Login page.
@@@ -138,6 -137,10 +137,10 @@@
  * Added ResourceLoader module "jquery.badge".
  * mw.util.$content now points to the overall content area in the skin rather than just
    page text content area. If you need the old behaviour please use $( '#mw-content-text').
+ * jsMessage has been replaced with a floating bubble notification system complete
+   with auto-hide, multi-message support, and message replacement tags.
+ * jquery.messageBox which appears to be unused by both core and extensions has
+   been removed.
  
  === Bug fixes in 1.20 ===
  * (bug 30245) Use the correct way to construct a log page title.

diff --combined resources/Resources.php
index 23f74b1,f831072..4443ece
--- 1/resources/Resources.php
--- 2/resources/Resources.php
+++ b/resources/Resources.php
@@@ -175,10 -175,6 +175,6 @@@ return array
                'styles' => 'resources/jquery/jquery.makeCollapsible.css',
                'messages' => array( 'collapsible-expand', 'collapsible-collapse' ),
        ),
-       'jquery.messageBox' => array(
-               'scripts' => 'resources/jquery/jquery.messageBox.js',
-               'styles' => 'resources/jquery/jquery.messageBox.css',
-       ),
        'jquery.mockjax' => array(
                'scripts' => 'resources/jquery/jquery.mockjax.js',
        ),
@@@ -606,6 -602,16 +602,16 @@@
        'mediawiki.htmlform' => array(
                'scripts' => 'resources/mediawiki/mediawiki.htmlform.js',
        ),
+       'mediawiki.notification' => array(
+               'styles' => 'resources/mediawiki/mediawiki.notification.css',
+               'scripts' => 'resources/mediawiki/mediawiki.notification.js',
+               'dependencies' => array(
+                       'mediawiki.page.startup',
+               ),
+       ),
+       'mediawiki.notify' => array(
+               'scripts' => 'resources/mediawiki/mediawiki.notify.js',
+       ),
        'mediawiki.Title' => array(
                'scripts' => 'resources/mediawiki/mediawiki.Title.js',
                'dependencies' => 'mediawiki.util',
@@@ -625,8 -631,8 +631,8 @@@
                'dependencies' => array(
                        'jquery.client',
                        'jquery.cookie',
-                       'jquery.messageBox',
                        'jquery.mwExtension',
+                       'mediawiki.notify',
                ),
                'messages' => array( 'showtoc', 'hidetoc' ),
                'position' => 'top', // For $wgPreloadJavaScriptMwUtil
@@@ -781,7 -787,8 +787,8 @@@
                'dependencies' => array(
                        'mediawiki.page.startup',
                        'mediawiki.api.watch',
-                       'mediawiki.util'
+                       'mediawiki.util',
+                       'mediawiki.notify',
                ),
                'messages' => array(
                        'watch',
@@@ -923,10 -930,7 +930,10 @@@
                'scripts' => 'common/preview.js',
                'remoteBasePath' => $GLOBALS['wgStylePath'],
                'localBasePath' => $GLOBALS['wgStyleDirectory'],
 -              'dependencies' => 'mediawiki.legacy.wikibits',
 +              'dependencies' => array(
 +                      'mediawiki.legacy.wikibits',
 +                      'jquery.form',
 +              )
        ),
        'mediawiki.legacy.protect' => array(
                'scripts' => 'common/protect.js',

diff --combined skins/common/shared.css
index 94ed322,c45948b..4cc0ad3
--- 1/skins/common/shared.css
--- 2/skins/common/shared.css
+++ b/skins/common/shared.css
@@@ -121,16 -121,6 +121,6 @@@ span.texhtml 
        cursor: pointer;
  }
  
- div#mw-js-message {
-       margin: 1em 5%;
-       padding: 0.5em 2.5%;
-       border: solid 1px #ddd;
-       background-color: #fcfcfc;
-       /* Message hides on-click */
-       /* See also mw.util.jsMessage */
-       cursor: pointer;
- }
- 
  /* Edit section links */
  /* Correct directionality when page dir is different from site/user dir */
  /* @noflip */
@@@ -260,7 -250,6 +250,7 @@@ tr.mw-htmlform-vertical-label td.mw-lab
  
  input#wpSummary {
        width: 80%;
 +      margin: 1em 0;
  }
  
  /**