r100196 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r100195‎ | r100196 | r100197 >
Date:00:47, 19 October 2011
Author:khorn
Status:ok
Tags:fundraising 
Comment:
Merging the fundraising branch of DonationInterface back into trunk.
Halfway done manually merging all the changes to payflowpro_gateway.php that were done in trunk, to the new donationinterface.php installer file.
Rolls in changes from r97006, r98582, r98589, r98600, r99077
As this is a mid-merge commit, the extension will be broken until the merge is completed.
Modified paths:
  • /trunk/extensions/DonationInterface/donationinterface.php (modified) (history)

Diff [purge]

Index: trunk/extensions/DonationInterface/donationinterface.php
@@ -147,7 +147,7 @@
148148 /**
149149 * Global form dir and RapidHTML whitelist
150150 */
151 -$wgDonationInterfaceHtmlFormDir = dirname( __FILE__ ) . "/gateway_forms/html";
 151+$wgDonationInterfaceHtmlFormDir = dirname( __FILE__ ) . "/gateway_forms/rapidhtml/html";
152152 //ffname is the $key from now on.
153153 $wgDonationInterfaceAllowedHtmlForms = array(
154154 'demo' => $wgDonationInterfaceHtmlFormDir . "/demo.html",
@@ -458,6 +458,85 @@
459459 'position' => 'top'
460460 ) + $wgResourceTemplate;
461461
 462+// Resources for ResourceLoader - 98582
 463+$wgResourceTemplate = array(
 464+ 'localBasePath' => $donationinterface_dir . 'gateway_forms',
 465+ 'remoteExtPath' => 'DonationInterface/gateway_forms',
 466+);
 467+$wgResourceModules[ 'pfp.form.rapidhtml.webitects' ] = array(
 468+ 'styles' => array(
 469+ 'rapidhtml/css/lp1.css',
 470+ 'rapidhtml/css/Webitects.css',
 471+ ),
 472+ 'scripts' => array(
 473+ 'rapidhtml/js/jquery.ezpz_hint.js',
 474+ ),
 475+ 'dependencies' => array(
 476+ 'jquery.ui.accordion'
 477+ )
 478+) + $wgResourceTemplate;
 479+
 480+
 481+//99077
 482+// RapidHtml globalcollect_test form resources
 483+$wgResourceModules[ 'pfp.form.rapidhtml.globalcollect_test' ] = array(
 484+ 'styles' => array(
 485+ 'css/TwoStepTwoColumnLetter3.css',
 486+ 'css/gateway.css',
 487+ ),
 488+ 'scripts' => array(),
 489+ 'dependencies' => array(),
 490+) + $wgResourceTemplate;
 491+
 492+// form validation resource
 493+//TODO: Move this somewhere gateway-agnostic.
 494+$wgResourceModules[ 'pfp.form.core.validate' ] = array(
 495+ 'styles' => array(),
 496+ 'scripts' => 'validate_input.js',
 497+ 'dependencies' => 'pfp.form.core.pfp_css',
 498+ 'localBasePath' => $donationinterface_dir . 'payflowpro_gateway',
 499+ 'remoteExtPath' => 'DonationInterface/payflowpro_gateway'
 500+);
 501+
 502+// general PFP css
 503+$wgResourceModules[ 'pfp.form.core.pfp_css' ] = array(
 504+ 'styles' => 'css/gateway.css',
 505+ 'scripts' => array(),
 506+ 'dependencies' => array(),
 507+) + $wgResourceTemplate;
 508+
 509+
 510+//98589 & 98600
 511+// RapidHtml lightbox form resources
 512+$wgResourceModules[ 'pfp.form.rapidhtml.lightbox.js' ] = array(
 513+ 'scripts' => array(
 514+ 'rapidhtml/js/lightbox1.js',
 515+ ),
 516+ 'dependencies' => array(
 517+ 'jquery.ui.core',
 518+ 'jquery.ui.widget',
 519+ 'jquery.ui.mouse',
 520+ 'jquery.ui.position',
 521+ 'jquery.ui.draggable',
 522+ 'jquery.ui.resizable',
 523+ 'jquery.ui.button',
 524+ 'jquery.ui.dialog',
 525+ ),
 526+ 'position' => 'top',
 527+) + $wgResourceTemplate;
 528+
 529+// RapidHtml lightbox form css resources (these are separate from the js
 530+// resources for a good reason but I forget what - I believe to facilitate
 531+// ensuring proper load order?
 532+$wgResourceModules[ 'pfp.form.rapidhtml.lightbox.css' ] = array(
 533+ 'styles' => array(
 534+ 'rapidhtml/css/lightbox1.css',
 535+ ),
 536+ 'position' => 'top',
 537+) + $wgResourceTemplate;
 538+
 539+
 540+
462541 $wgExtensionMessagesFiles['DonateInterface'] = $donationinterface_dir . 'donate_interface/donate_interface.i18n.php';
463542
464543

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r97006Moving RapidHTML forms into more acurately named directorypgehres21:46, 13 September 2011
r98582ResourceLoader-ifying RapidHtml webitects formsawjrichards23:29, 30 September 2011
r98589ResourceLoader-ifying lightbox rapidhtml formawjrichards00:17, 1 October 2011
r98600fixing up some resourceloader stuff for lightbox form - follow-up for r98589....kaldari03:15, 1 October 2011
r99077ResourceLoader-ifying globalcollect_test forms, core CSS for forms and input ...awjrichards04:12, 6 October 2011

Status & tagging log