r100238 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r100237‎ | r100238 | r100239 >
Date:16:57, 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 r99162, r99215, r99278
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
@@ -458,46 +458,37 @@
459459 'position' => 'top'
460460 ) + $wgResourceTemplate;
461461
462 -// Resources for ResourceLoader - 98582
 462+// load any rapidhtml related resources
 463+require_once( $donationinterface_dir . 'gateway_forms/rapidhtml/RapidHtmlResources.php' );
 464+
 465+
463466 $wgResourceTemplate = array(
464467 'localBasePath' => $donationinterface_dir . 'gateway_forms',
465468 'remoteExtPath' => 'DonationInterface/gateway_forms',
466469 );
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;
479470
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 -
492471 // form validation resource
493472 //TODO: Move this somewhere gateway-agnostic.
494473 $wgResourceModules[ 'pfp.form.core.validate' ] = array(
495 - 'styles' => array(),
496474 'scripts' => 'validate_input.js',
497475 'dependencies' => 'pfp.form.core.pfp_css',
498476 'localBasePath' => $donationinterface_dir . 'payflowpro_gateway',
499477 'remoteExtPath' => 'DonationInterface/payflowpro_gateway'
500478 );
501479
 480+// form placeholders
 481+//TODO: Move this somewhere gateway-agnostic.
 482+$wgResourceModules[ 'pfp.form.core.placeholders' ] = array(
 483+ 'scripts' => 'form_placeholders.js',
 484+ 'dependencies' => 'pfp.form.core.validate',
 485+ 'messages' => array(
 486+ 'payflowpro_gateway-donor-fname',
 487+ 'payflowpro_gateway-donor-lname'
 488+ ),
 489+ 'localBasePath' => $donationinterface_dir . 'payflowpro_gateway',
 490+ 'remoteExtPath' => 'DonationInterface/payflowpro_gateway',
 491+);
 492+
502493 // general PFP css
503494 $wgResourceModules[ 'pfp.form.core.pfp_css' ] = array(
504495 'styles' => 'css/gateway.css',
@@ -505,37 +496,28 @@
506497 'dependencies' => array(),
507498 ) + $wgResourceTemplate;
508499
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',
 500+// TowStepTwoColumnLetter3
 501+$wgResourceModules[ 'pfp.form.TwoStepTwoColumnLetter3' ] = array(
 502+ 'styles' => 'css/TwoStepTwoColumnLetter3.css',
 503+ 'dependencies' => 'pfp.form.core.validate',
527504 ) + $wgResourceTemplate;
528505
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;
 506+// API JS
 507+//TODO: Either move this somewhere gateway-agnostic, or move it to the pfp installer section.
 508+$wgResourceModules[ 'pfp.form.core.api' ] = array(
 509+ 'scripts' => 'pfp_api_controller.js',
 510+ 'localBasePath' => $donationinterface_dir . 'payflowpro_gateway',
 511+ 'remoteExtPath' => 'DonationInterface/payflowpro_gateway',
 512+);
538513
 514+// Logo link override
 515+//TODO: Move this somewhere gateway-agnostic.
 516+$wgResourceModules[ 'pfp.core.logolink_override' ] = array(
 517+ 'scripts' => 'logolink_override.js',
 518+ 'localBasePath' => $donationinterface_dir . 'payflowpro_gateway',
 519+ 'remoteExtPath' => 'DonationInterface/payflowpro_gateway',
539520
 521+);
540522
541523 $wgExtensionMessagesFiles['DonateInterface'] = $donationinterface_dir . 'donate_interface/donate_interface.i18n.php';
542524

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r99162Removing no longer needed jquery files now that we're using 1.17; Adding sepa...awjrichards22:59, 6 October 2011
r99215Moved logo link override JS into it's own file and resource loader-ified; loa...awjrichards16:10, 7 October 2011
r99278fixing linebreak double escaping, using some jQuery for the placeholder code,...kaldari22:56, 7 October 2011

Status & tagging log