http://www.mediawiki.org/wiki/Special:Code/MediaWiki/76333
Revision: 76333
Author: kaldari
Date: 2010-11-08 19:56:45 +0000 (Mon, 08 Nov 2010)
Log Message:
-----------
adding sql patch for multi-project support, deleting unused newCentralNotice.js
Modified Paths:
--------------
trunk/extensions/CentralNotice/CentralNotice.php
trunk/extensions/CentralNotice/patches/patch-notice_languages.sql
Added Paths:
-----------
trunk/extensions/CentralNotice/patches/patch-notice_projects.sql
Removed Paths:
-------------
trunk/extensions/CentralNotice/newCentralNotice.js
Modified: trunk/extensions/CentralNotice/CentralNotice.php
===================================================================
--- trunk/extensions/CentralNotice/CentralNotice.php 2010-11-08 19:54:53 UTC
(rev 76332)
+++ trunk/extensions/CentralNotice/CentralNotice.php 2010-11-08 19:56:45 UTC
(rev 76333)
@@ -133,6 +133,8 @@
$base . '/patches/patch-template_settings.sql'
);
$wgExtNewTables[] = array( 'cn_notice_countries',
$base . '/patches/patch-notice_countries.sql' );
+ $wgExtNewTables[] = array( 'cn_notice_projects',
+ $base . '/patches/patch-notice_projects.sql' );
}
} else {
if ( $updater->getDB()->getType() == 'mysql' ) {
@@ -146,6 +148,8 @@
$base . '/patches/patch-template_settings.sql'
) );
$updater->addExtensionUpdate( array( 'addTable',
'cn_notice_countries',
$base . '/patches/patch-notice_countries.sql' )
);
+ $updater->addExtensionUpdate( array( 'addTable',
'cn_notice_projects',
+ $base . '/patches/patch-notice_projects.sql' )
);
}
}
return true;
Deleted: trunk/extensions/CentralNotice/newCentralNotice.js
===================================================================
--- trunk/extensions/CentralNotice/newCentralNotice.js 2010-11-08 19:54:53 UTC
(rev 76332)
+++ trunk/extensions/CentralNotice/newCentralNotice.js 2010-11-08 19:56:45 UTC
(rev 76333)
@@ -1,102 +0,0 @@
-/*
- * New Central Notice Javascript
- *
- * Mostly stubbed functionallity for central notice improvements
- * May or may not be used, definitely will be changed.
- * More of a sketch of what we think needs to be done.
- */
-( function( $ ) {
- $.centralNotice = {
- 'data': {
- 'getVars': {}
- },
- 'fn': {
- 'loadBanner': function( bannerName ) {
- // get the requested banner
- var bannerPage =
'Special:BannerLoader?banner='+bannerName+'&userlang='+wgContentLanguage+'&sitename='+wgNoticeProject;
- var bannerURL = wgArticlePath.replace( '$1',
bannerPage );
- var request = $.ajax( {
- url: bannerURL,
- dataType: 'html',
- success: function( data ) {
-
$.centralNotice.fn.displayBanner( data );
- }
- });
- },
- 'loadBannerList': function( timestamp ) {
- var bannerListURL;
- if ( timestamp ) {
- bannerListURL = "TBD"
- } else {
- // http://geoiplookup.wikimedia.org/
- var geoLocation = 'US'; // Hard-coding
for now
- var bannerListPage =
'Special:BannerListLoader?language='+wgContentLanguage+'&project='+wgNoticeProject+'&location='+geoLocation;
- bannerListURL = wgArticlePath.replace(
'$1', bannerListPage );
- }
- var request = $.ajax( {
- url: bannerListURL,
- dataType: 'json',
- success: $.centralNotice.fn.chooseBanner
- } );
- },
- 'chooseBanner': function( bannerList ) {
- // convert the json object to a true array
- bannerList = Array.prototype.slice.call(
bannerList );
-
- // Make sure there are some banners to choose
from
- if ( bannerList.length == 0 ) return false;
-
- var totalWeight = 0;
- // run through the bannerlist and sum the
weights of all banners
- for( var i = 0; i < bannerList.length; i++ ) {
- totalWeight += bannerList[i].weight;
- }
-
- // select a random integer between 0 and our
total weight
- var pointer = Math.floor( Math.random() *
totalWeight ),
- selectedBanner = bannerList[0],
- w = 0;
- // run through the banner list and start
accumulating weights
- for( var i = 0; i < bannerList.length; i++ ) {
- w += bannerList[i].weight;
- // when the weight tally exceeds the
random integer, return the banner and stop the loop
- if( w > pointer ) {
- selectedBanner = bannerList[i];
- break;
- }
- }
- // return our selected banner
- $.centralNotice.fn.loadBanner(
- selectedBanner.name
- );
- },
- 'displayBanner': function( bannerHTML ) {
- // inject the banner html into the page
- $( '#siteNotice' )
- .prepend( '<div id="centralnotice"
class="' + ( wgNoticeToggleState ? 'expanded' : 'collapsed' ) + '">' +
bannerHTML + '</div>' );
- },
- 'getQueryStringVariables': function() {
- document.location.search.replace(
/\??(?:([^=]+)=([^&]*)&?)/g, function () {
- function decode( s ) {
- return decodeURIComponent(
s.split( "+" ).join( " " ) );
- }
- $.centralNotice.data.getVars[decode(
arguments[1] )] = decode( arguments[2] );
- } );
- }
- }
- }
- $( document ).ready( function () {
- // initialize the query string vars
- $.centralNotice.fn.getQueryStringVariables();
- if( $.centralNotice.data.getVars['forceBanner'] ) {
- // if we're forcing one banner
- $.centralNotice.fn.loadBanner(
$.centralNotice.data.getVars['forceBanner'] );
- } else if ( $.centralNotice.data.getVars['forceTimestamp'] ) {
- // if we're forcing a future campaign time
- $.centralNotice.fn.loadBannerList(
$.centralNotice.data.getVars['forceTimestamp'] );
- } else {
- // look for banners ready to go NOW
- $.centralNotice.fn.loadBannerList( );
- }
- } ); //document ready
-} )( jQuery );
Modified: trunk/extensions/CentralNotice/patches/patch-notice_languages.sql
===================================================================
--- trunk/extensions/CentralNotice/patches/patch-notice_languages.sql
2010-11-08 19:54:53 UTC (rev 76332)
+++ trunk/extensions/CentralNotice/patches/patch-notice_languages.sql
2010-11-08 19:56:45 UTC (rev 76333)
@@ -1,4 +1,4 @@
--- Update to allow for any number of languages per notice.
+-- Update to allow for any number of languages per campaign.
CREATE TABLE IF NOT EXISTS /*$wgDBprefix*/cn_notice_languages (
`nl_notice_id` int unsigned NOT NULL,
Added: trunk/extensions/CentralNotice/patches/patch-notice_projects.sql
===================================================================
--- trunk/extensions/CentralNotice/patches/patch-notice_projects.sql
(rev 0)
+++ trunk/extensions/CentralNotice/patches/patch-notice_projects.sql
2010-11-08 19:56:45 UTC (rev 76333)
@@ -0,0 +1,7 @@
+-- Update to allow for any number of projects per campaign.
+
+CREATE TABLE IF NOT EXISTS /*$wgDBprefix*/cn_notice_projects (
+ `np_notice_id` int unsigned NOT NULL,
+ `np_project` varchar(32) NOT NULL
+) /*$wgDBTableOptions*/;
+CREATE UNIQUE INDEX /*i*/np_notice_id_project ON
/*$wgDBprefix*/cn_notice_projects (np_notice_id, np_project);
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
