From 31037a4250529895c3f32ab15ecac2aa00a5c313 Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Wed, 29 Oct 2014 17:11:04 +1300 Subject: [PATCH] more whitespace cleanup --- js/jquery/jquery.dashboard.js | 36 +++--- templates/CRM/Case/Form/ActivityToCase.tpl | 4 +- templates/CRM/Case/Page/ConfigureError.tpl | 2 +- templates/CRM/Contact/Form/DedupeFind.tpl | 4 +- .../CRM/Contact/Form/Edit/Address/county.tpl | 2 +- templates/CRM/Contact/Form/Edit/IM.tpl | 2 +- .../CRM/Contact/Form/Edit/Individual.tpl | 2 +- templates/CRM/Contact/Form/Edit/Notes.tpl | 2 +- templates/CRM/Contact/Form/Inline/Address.tpl | 12 +- .../Form/Inline/CommunicationPreferences.tpl | 4 +- .../CRM/Contact/Form/Inline/ContactInfo.tpl | 2 +- .../CRM/Contact/Form/Inline/ContactName.tpl | 2 +- templates/CRM/Contact/Form/Inline/Website.tpl | 8 +- .../CRM/Contact/Form/Search/Advanced.tpl | 2 +- templates/CRM/Contact/Form/Search/Builder.js | 4 +- .../CRM/Contact/Form/Search/Criteria/Task.tpl | 4 +- templates/CRM/Contact/Form/Search/Intro.tpl | 2 +- .../Contact/Form/Task/AlterPreferences.tpl | 2 +- .../CRM/Contact/Form/Task/EmailCommon.js | 2 +- templates/CRM/Contact/Form/Task/Label.tpl | 2 +- templates/CRM/Contact/Form/Task/Map.tpl | 2 +- .../Contact/Form/Task/Map/OpenStreetMaps.tpl | 22 ++-- .../CRM/Contact/Form/Task/PickProfile.tpl | 2 +- .../CRM/Contact/Form/Task/RemoveFromGroup.tpl | 2 +- templates/CRM/Contact/Import/Form/Mapper.tpl | 4 +- templates/CRM/Contact/Import/Form/Summary.tpl | 20 +-- templates/CRM/Contact/Page/Inline/Address.tpl | 4 +- .../CRM/Contact/Page/Inline/ContactInfo.tpl | 2 +- templates/CRM/Contact/Page/Inline/Email.tpl | 10 +- .../Page/View/RelationshipSelector.tpl | 2 +- templates/CRM/Contact/Page/View/Useradd.tpl | 4 +- .../CRM/Contribute/Form/AdditionalPayment.tpl | 6 +- .../Form/ContributionPage/Amount.tpl | 2 +- .../Form/Search/AdvancedSearchPane.tpl | 2 +- .../Contribute/Form/SearchContribution.tpl | 6 +- templates/CRM/Contribute/Form/Task.tpl | 2 +- .../Contribute/Page/ContributionTotals.tpl | 8 +- templates/CRM/Core/APIDoc.tpl | 10 +- templates/CRM/Core/Form/RecurringEntity.tpl | 42 +++--- templates/CRM/Custom/Form/MoveField.tpl | 2 +- .../Cart/Form/Checkout/ConferenceEvents.tpl | 2 +- .../Form/ManageEvent/ConfirmRepeatMode.tpl | 10 +- .../CRM/Event/Form/ManageEvent/Location.tpl | 6 +- templates/CRM/Event/Form/ManageEvent/Tab.tpl | 2 +- .../Event/Form/Search/AdvancedSearchPane.tpl | 2 +- templates/CRM/Event/Form/Search/Common.tpl | 2 +- templates/CRM/Event/Form/SearchEvent.tpl | 16 +-- templates/CRM/Event/Form/Task.tpl | 2 +- templates/CRM/Event/Form/Task/Badge.tpl | 2 +- templates/CRM/Event/Form/Task/Cancel.tpl | 4 +- templates/CRM/Event/Form/Task/Print.tpl | 2 +- templates/CRM/Event/Import/Form/Preview.tpl | 18 +-- templates/CRM/Event/Import/Form/Summary.tpl | 20 +-- templates/CRM/Event/Page/UserDashboard.tpl | 4 +- templates/CRM/Event/Page/iCalLinks.tpl | 2 +- .../Financial/Form/FinancialTypeAccount.tpl | 2 +- .../Grant/Form/Search/AdvancedSearchPane.tpl | 2 +- templates/CRM/Grant/Form/Search/Common.tpl | 22 ++-- templates/CRM/Grant/Form/Task.tpl | 2 +- templates/CRM/Grant/Form/Task/Print.tpl | 2 +- templates/CRM/Grant/Form/Task/Update.tpl | 2 +- templates/CRM/Grant/Page/DashBoard.tpl | 2 +- .../Form/Search/AdvancedSearchPane.tpl | 2 +- templates/CRM/Mailing/Form/Task.tpl | 2 +- templates/CRM/Mailing/Form/Task/Print.tpl | 4 +- templates/CRM/Mailing/Form/Test.tpl | 8 +- .../CRM/Member/Form/MembershipStandalone.js | 4 +- templates/CRM/Member/Form/Task.tpl | 2 +- templates/CRM/Member/Form/Task/Print.tpl | 2 +- templates/CRM/Member/Import/Form/MapField.tpl | 4 +- templates/CRM/Member/Import/Form/Preview.tpl | 20 +-- templates/CRM/Member/Import/Form/Summary.tpl | 18 +-- templates/CRM/Queue/Page/Runner.tpl | 30 ++--- templates/CRM/common/WizardHeader.tpl | 4 +- templates/CRM/common/navigation.js.tpl | 2 +- templates/CRM/common/searchResultTasks.tpl | 2 +- tests/phpunit/api/v3/ParticipantTest.php | 2 +- .../api/v3/TaxContributionPageTest.php | 14 +- tools/bin/scripts/createdoc.sh | 24 ++-- tools/bin/scripts/runTest.sh | 6 +- tools/bin/scripts/soapClient.php.txt | 2 +- tools/bin/scripts/test_sandbox.sh | 122 +++++++++--------- .../multicurrency.module.discount | 18 +-- .../multicurrency.module.original | 12 +- .../Event/Form/Registration/4/Register.tpl | 56 ++++---- .../Event/Form/Registration/8/Register.tpl | 56 ++++---- .../templates/CRM/Event/Page/4/EventInfo.tpl | 62 ++++----- .../templates/CRM/Event/Page/8/EventInfo.tpl | 62 ++++----- .../CRM/Demoqueue/Page/DemoQueue.php | 12 +- .../info.xml | 2 +- .../packages/Google/README | 84 ++++++------ .../Baykeeper.php | 16 +-- .../templates/ActivitySearch.tpl | 18 +-- tools/scripts/demo/update-demo-all | 2 +- tools/scripts/git/pre-commit | 6 +- .../scripts/phpunit-xslt/coverage-frames.xsl | 20 +-- tools/scripts/phpunit-xslt/log.xsl | 22 ++-- tools/scripts/phpunit-xslt/phpunit-frames.xsl | 2 +- .../scripts/phpunit-xslt/phpunit-noframes.xsl | 58 ++++----- .../phpunit-xslt/str.replace.function.xsl | 4 +- tools/scripts/releaser/releaser | 2 +- tools/scripts/solr/database.xml | 2 +- tools/scripts/solr/schema.xml | 10 +- tools/scripts/solr/solrconfig.xml | 24 ++-- .../scripts/upgrade-test/run-upgrade-test.sh | 6 +- tools/sql/civiauction_sample.mysql | 4 +- tools/templates/CRM/Auction/Form/Item.tpl | 12 +- .../CRM/Auction/Form/ItemAccount.tpl | 18 +-- .../CRM/Auction/Form/SearchAuction.tpl | 12 +- .../templates/CRM/Auction/Form/SearchItem.tpl | 4 +- .../templates/CRM/Auction/Page/ManageItem.tpl | 4 +- 111 files changed, 633 insertions(+), 633 deletions(-) diff --git a/js/jquery/jquery.dashboard.js b/js/jquery/jquery.dashboard.js index c56cbcec0c..46d0c2e33f 100644 --- a/js/jquery/jquery.dashboard.js +++ b/js/jquery/jquery.dashboard.js @@ -146,7 +146,7 @@ /** * Private properties of dashboard. */ - + // Used to determine whether there are any incomplete ajax requests pending initialization of the dashboard. var asynchronousRequestCounter = 0; @@ -182,7 +182,7 @@ initialWidgets: Array(), element: $('').appendTo(dashboard.element) }; - + // Add the empty placeholder now, hide it and save it. col.emptyPlaceholder = $(markup).appendTo(col.element).hide(); @@ -196,7 +196,7 @@ initialColumn: col, minimized: ( widgets[c][widgetID[1]] > 0 ? true : false ) }); - + //set empty Dashboard to false emptyDashboard = false; } @@ -205,7 +205,7 @@ if ( emptyDashboard ) { emptyDashboardCondition( ); } - + invokeCallback(opts.callbacks.init, dashboard); } @@ -214,7 +214,7 @@ cj(".show-refresh").hide( ); cj("#empty-message").show( ); } - + // Contructors for each widget call this when initialization has finished so that dashboard can complete it's intitialization. function completeInit() { // Don't do anything if any widgets are waiting for ajax requests to complete in order to finish initialization. @@ -230,18 +230,18 @@ handle: '.widget-header', // The class of placeholder elements (the 'ghost' widget showing where the dragged item would land if released now.) - placeholder: 'placeholder', - activate: function(event, ui) { - var h= cj(ui.item).height(); + placeholder: 'placeholder', + activate: function(event, ui) { + var h= cj(ui.item).height(); $('.placeholder').css('height', h +'px'); }, - + opacity: 0.2, // Maks sure that only widgets are sortable, and not empty placeholders. items: '> .widget', - + forcePlaceholderSize: true, - + // Callback functions. update: resorted, start: hideEmptyPlaceholders @@ -365,10 +365,10 @@ } // Things get messy here. - // @todo Refactor to use currentState and targetedState properties to determine what needs - // to be done to get to any desired state on any UI or AJAX event – since these don't always - // match. - // E.g. When a user starts a new UI event before the Ajax event handler from a previous + // @todo Refactor to use currentState and targetedState properties to determine what needs + // to be done to get to any desired state on any UI or AJAX event – since these don't always + // match. + // E.g. When a user starts a new UI event before the Ajax event handler from a previous // UI event gets invoked. // Hide the settings first of all. @@ -413,7 +413,7 @@ } CRM.loadPage(widget.fullscreenUrl); }; - + // Exit fullscreen mode. widget.exitFullscreen = function() { // This is just a wrapper for dashboard.exitFullscreen() which does the heavy lifting. @@ -422,7 +422,7 @@ // Adds controls to a widget. id is for internal use and image file name in images/dashboard/ (a .gif). widget.addControl = function(id, control) { - var markup = ''; + var markup = ''; control.element = $(markup).prependTo($('.widget-controls', widget.element)).click(control.callback); }; @@ -435,7 +435,7 @@ // Removes the widget from the dashboard, and saves columns. widget.remove = function() { - if ( confirm( 'Are you sure you want to remove "' + widget.title + '"?') ) { + if ( confirm( 'Are you sure you want to remove "' + widget.title + '"?') ) { invokeCallback(opts.widgetCallbacks.remove, widget); widget.element.fadeOut(opts.animationSpeed, function() { $(this).remove(); diff --git a/templates/CRM/Case/Form/ActivityToCase.tpl b/templates/CRM/Case/Form/ActivityToCase.tpl index 72518648ca..f4add4c7ba 100644 --- a/templates/CRM/Case/Form/ActivityToCase.tpl +++ b/templates/CRM/Case/Form/ActivityToCase.tpl @@ -122,7 +122,7 @@ } ); } - + CRM.confirm({ title: dialogTitle, width: '600', @@ -130,7 +130,7 @@ options: {yes: "{/literal}{ts escape='js'}Save{/ts}{literal}", no: "{/literal}{ts escape='js'}Cancel{/ts}{literal}"}, url: dataUrl }).on('crmConfirm:yes', save); - + } })(CRM.$); diff --git a/templates/CRM/Case/Page/ConfigureError.tpl b/templates/CRM/Case/Page/ConfigureError.tpl index e3ad949660..d4774dc606 100644 --- a/templates/CRM/Case/Page/ConfigureError.tpl +++ b/templates/CRM/Case/Page/ConfigureError.tpl @@ -28,7 +28,7 @@ {capture assign=docLink}{docURL page="user/case-management/setup" text="CiviCase Setup documentation"}{/capture}
-
  +
  {ts}You need to setup and load Case and Activity configuration files before you can begin using the CiviCase component.{/ts} {ts 1=$docLink}Refer to the %1 to learn about this process.{/ts}
diff --git a/templates/CRM/Contact/Form/DedupeFind.tpl b/templates/CRM/Contact/Form/DedupeFind.tpl index 4b522d0483..0a45bc4a0e 100644 --- a/templates/CRM/Contact/Form/DedupeFind.tpl +++ b/templates/CRM/Contact/Form/DedupeFind.tpl @@ -25,9 +25,9 @@ *}
- {ts}You can search all contacts for duplicates or limit the search to a specific group.{/ts} + {ts}You can search all contacts for duplicates or limit the search to a specific group.{/ts}
-
{include file="CRM/common/formButtons.tpl" location="top"}
+
{include file="CRM/common/formButtons.tpl" location="top"}
diff --git a/templates/CRM/Contact/Form/Edit/Address/county.tpl b/templates/CRM/Contact/Form/Edit/Address/county.tpl index eaee41dd9c..b5167d0b88 100644 --- a/templates/CRM/Contact/Form/Edit/Address/county.tpl +++ b/templates/CRM/Contact/Form/Edit/Address/county.tpl @@ -30,4 +30,4 @@ {$form.address.$blockId.county_id.html}
-{/if} +{/if} diff --git a/templates/CRM/Contact/Form/Edit/IM.tpl b/templates/CRM/Contact/Form/Edit/IM.tpl index cacf24fe48..22eb4065d1 100644 --- a/templates/CRM/Contact/Form/Edit/IM.tpl +++ b/templates/CRM/Contact/Form/Edit/IM.tpl @@ -43,7 +43,7 @@ {if $blockId gt 1} - {/if} + {/if} {if !$addBlock} diff --git a/templates/CRM/Contact/Form/Edit/Individual.tpl b/templates/CRM/Contact/Form/Edit/Individual.tpl index 80e543ea40..7cdf703d99 100644 --- a/templates/CRM/Contact/Form/Edit/Individual.tpl +++ b/templates/CRM/Contact/Form/Edit/Individual.tpl @@ -86,7 +86,7 @@ CRM.$(function($) { {/if} {if $form.first_name} {/if} diff --git a/templates/CRM/Contact/Form/Edit/Notes.tpl b/templates/CRM/Contact/Form/Edit/Notes.tpl index cf41e8e797..d166dd52e9 100644 --- a/templates/CRM/Contact/Form/Edit/Notes.tpl +++ b/templates/CRM/Contact/Form/Edit/Notes.tpl @@ -25,7 +25,7 @@ *}
{$form.group_id.label}
{$form.im.$blockId.is_primary.1.html}{ts}delete{/ts}
- {$form.first_name.label}
+ {$form.first_name.label}
{$form.first_name.html}
- + {* include shared address template *} {include file="CRM/Contact/Form/ShareAddress.tpl"} - + + -
-
+
{include file="CRM/common/formButtons.tpl"} {if $addressId}        @@ -50,10 +50,10 @@ {$form.address.$blockId.is_billing.html}
@@ -66,10 +66,10 @@
- -
+ +
{include file="CRM/Contact/Form/Edit/Address/CustomData.tpl"} -
+
{literal} diff --git a/templates/CRM/Contact/Form/Search/Advanced.tpl b/templates/CRM/Contact/Form/Search/Advanced.tpl index da9e006801..deaac1e455 100644 --- a/templates/CRM/Contact/Form/Search/Advanced.tpl +++ b/templates/CRM/Contact/Form/Search/Advanced.tpl @@ -77,7 +77,7 @@ {include file="CRM/Contact/Form/Search/ResultTasks.tpl"} {/if} - + {* This section displays the rows along and includes the paging controls *}
{if $resultFile} diff --git a/templates/CRM/Contact/Form/Search/Builder.js b/templates/CRM/Contact/Form/Search/Builder.js index 5a572419b3..5a0a26ace2 100644 --- a/templates/CRM/Contact/Form/Search/Builder.js +++ b/templates/CRM/Contact/Form/Search/Builder.js @@ -5,7 +5,7 @@ /** * Handle user input - field or operator selection. * - * Decide whether to display select drop down, regular text or date + * Decide whether to display select drop down, regular text or date * field for the given field and row. */ function handleUserInputField() { @@ -63,7 +63,7 @@ $('input[id^=value]', row) .hide() .after(''); - + fetchOptions(row, field); } diff --git a/templates/CRM/Contact/Form/Search/Criteria/Task.tpl b/templates/CRM/Contact/Form/Search/Criteria/Task.tpl index 00d6876388..e9f68b61db 100644 --- a/templates/CRM/Contact/Form/Search/Criteria/Task.tpl +++ b/templates/CRM/Contact/Form/Search/Criteria/Task.tpl @@ -38,8 +38,8 @@
{$form.task_status_id.html} -
+
{/if} diff --git a/templates/CRM/Contact/Form/Search/Intro.tpl b/templates/CRM/Contact/Form/Search/Intro.tpl index 9ad792c600..3528566e4a 100644 --- a/templates/CRM/Contact/Form/Search/Intro.tpl +++ b/templates/CRM/Contact/Form/Search/Intro.tpl @@ -34,7 +34,7 @@ {capture assign=editSmartGroupURL}{crmURL p="civicrm/contact/search/custom" q="reset=1&force=1&ssID=`$ssID`"}{/capture} {else} {capture assign=editSmartGroupURL}{crmURL p="civicrm/contact/search/advanced" q="reset=1&force=1&ssID=`$ssID`"}{/capture} - {/if} + {/if}
{ts 1=$group.title}Edit Smart Group Search Criteria for %1{/ts} {help id="id-edit-smartGroup"} diff --git a/templates/CRM/Contact/Form/Task/AlterPreferences.tpl b/templates/CRM/Contact/Form/Task/AlterPreferences.tpl index 3034054ac3..1b98cb4271 100644 --- a/templates/CRM/Contact/Form/Task/AlterPreferences.tpl +++ b/templates/CRM/Contact/Form/Task/AlterPreferences.tpl @@ -45,4 +45,4 @@ {include file="CRM/Contact/Form/Task.tpl"}
{include file="CRM/common/formButtons.tpl" location="bottom"}
-
+ diff --git a/templates/CRM/Contact/Form/Task/EmailCommon.js b/templates/CRM/Contact/Form/Task/EmailCommon.js index 0005f3cc8e..456a221689 100644 --- a/templates/CRM/Contact/Form/Task/EmailCommon.js +++ b/templates/CRM/Contact/Form/Task/EmailCommon.js @@ -4,7 +4,7 @@ CRM.$(function($) { // NOTE: Might be safer to say $('[name=_qf_Email_upload]') $('.crm-form-submit').not('.cancel').on("click", function() { $('.crm-form-submit').not('.cancel').attr({value: ts('Processing')}); - // CRM-13449 : setting a 0 ms timeout is needed + // CRM-13449 : setting a 0 ms timeout is needed // for some browsers like chrome. Used for purpose of // submit the form and stop accidental multiple clicks setTimeout(function(){ diff --git a/templates/CRM/Contact/Form/Task/Label.tpl b/templates/CRM/Contact/Form/Task/Label.tpl index d2c2fdb7b9..403ed9606f 100644 --- a/templates/CRM/Contact/Form/Task/Label.tpl +++ b/templates/CRM/Contact/Form/Task/Label.tpl @@ -26,7 +26,7 @@
{include file="CRM/Contact/Form/Task.tpl"}
{include file="CRM/common/formButtons.tpl" location="top"}
- +
diff --git a/templates/CRM/Contact/Form/Task/Map.tpl b/templates/CRM/Contact/Form/Task/Map.tpl index 27b11e6b18..c8a5de317a 100644 --- a/templates/CRM/Contact/Form/Task/Map.tpl +++ b/templates/CRM/Contact/Form/Task/Map.tpl @@ -27,4 +27,4 @@ {include file="CRM/Contact/Form/Task/Map/`$mapProvider`.tpl"}

-
{include file="CRM/common/formButtons.tpl" location="bottom"}
+
{include file="CRM/common/formButtons.tpl" location="bottom"}
diff --git a/templates/CRM/Contact/Form/Task/Map/OpenStreetMaps.tpl b/templates/CRM/Contact/Form/Task/Map/OpenStreetMaps.tpl index eaca7bca9b..45ee57a141 100644 --- a/templates/CRM/Contact/Form/Task/Map/OpenStreetMaps.tpl +++ b/templates/CRM/Contact/Form/Task/Map/OpenStreetMaps.tpl @@ -26,11 +26,11 @@ {if $showDirectly} {assign var=height value="350px"} {assign var=width value="425px"} -{else} +{else} {assign var=height value="600px"} {assign var=width value="100%"} {/if} -{assign var=defaultZoom value=12} +{assign var=defaultZoom value=12} {literal} diff --git a/templates/CRM/Contact/Page/View/RelationshipSelector.tpl b/templates/CRM/Contact/Page/View/RelationshipSelector.tpl index 965aada020..f1f7f90eb3 100644 --- a/templates/CRM/Contact/Page/View/RelationshipSelector.tpl +++ b/templates/CRM/Contact/Page/View/RelationshipSelector.tpl @@ -118,7 +118,7 @@ $(nRow).addClass('crm-entity'); } } - }); + }); } }); diff --git a/templates/CRM/Contact/Page/View/Useradd.tpl b/templates/CRM/Contact/Page/View/Useradd.tpl index 8945dc9bd8..da0c54049c 100755 --- a/templates/CRM/Contact/Page/View/Useradd.tpl +++ b/templates/CRM/Contact/Page/View/Useradd.tpl @@ -24,7 +24,7 @@ +--------------------------------------------------------------------+ *}
-
{include file="CRM/common/formButtons.tpl" location="top"}
+
{include file="CRM/common/formButtons.tpl" location="top"}
{$form.label_name.label} {$form.label_name.html} {help id="id-select-label" file="CRM/Contact/Form/Task/Label.hlp"}
@@ -44,7 +44,7 @@
{$form.name.label}{$form.name.html}{$form.email.label}{$form.email.html}
-
{include file="CRM/common/formButtons.tpl" location="bottom"}
+
{include file="CRM/common/formButtons.tpl" location="bottom"}
-{/literal} +{/literal} diff --git a/templates/CRM/Custom/Form/MoveField.tpl b/templates/CRM/Custom/Form/MoveField.tpl index 1374b501a4..f7fbd6c53a 100644 --- a/templates/CRM/Custom/Form/MoveField.tpl +++ b/templates/CRM/Custom/Form/MoveField.tpl @@ -30,7 +30,7 @@ {$form.dst_group_id.html}
{ts}Select a different Custom Data Set for this field.{/ts} - + {$form.is_copy.label}{$form.is_copy.html}
{include file="CRM/common/formButtons.tpl" location="top"}
diff --git a/templates/CRM/Event/Cart/Form/Checkout/ConferenceEvents.tpl b/templates/CRM/Event/Cart/Form/Checkout/ConferenceEvents.tpl index 7b759d9637..37a016e446 100644 --- a/templates/CRM/Event/Cart/Form/Checkout/ConferenceEvents.tpl +++ b/templates/CRM/Event/Cart/Form/Checkout/ConferenceEvents.tpl @@ -15,7 +15,7 @@ -{/foreach} +{/foreach} -{/literal} +{/literal} diff --git a/templates/CRM/Event/Form/Task.tpl b/templates/CRM/Event/Form/Task.tpl index 8982d0cbd7..b2e01126cb 100644 --- a/templates/CRM/Event/Form/Task.tpl +++ b/templates/CRM/Event/Form/Task.tpl @@ -25,7 +25,7 @@ *} {ts 1=$totalSelectedParticipants}Number of selected participants: %1{/ts} -{if $rows } +{if $rows }
diff --git a/templates/CRM/Event/Form/Task/Badge.tpl b/templates/CRM/Event/Form/Task/Badge.tpl index b06302bf18..6e6c5bb39e 100644 --- a/templates/CRM/Event/Form/Task/Badge.tpl +++ b/templates/CRM/Event/Form/Task/Badge.tpl @@ -27,7 +27,7 @@
{include file="CRM/Event/Form/Task.tpl"}
-
+
diff --git a/templates/CRM/Event/Form/Task/Cancel.tpl b/templates/CRM/Event/Form/Task/Cancel.tpl index f0208b8cac..86714c6e58 100644 --- a/templates/CRM/Event/Form/Task/Cancel.tpl +++ b/templates/CRM/Event/Form/Task/Cancel.tpl @@ -26,7 +26,7 @@ {* Confirmation of Cancel Registration *}
- {include file="CRM/common/formButtons.tpl" location="top"} + {include file="CRM/common/formButtons.tpl" location="top"}
@@ -37,6 +37,6 @@
- {include file="CRM/common/formButtons.tpl" location="bottom"} + {include file="CRM/common/formButtons.tpl" location="bottom"}
diff --git a/templates/CRM/Event/Form/Task/Print.tpl b/templates/CRM/Event/Form/Task/Print.tpl index 0408a27c23..95de69e436 100644 --- a/templates/CRM/Event/Form/Task/Print.tpl +++ b/templates/CRM/Event/Form/Task/Print.tpl @@ -25,7 +25,7 @@ *}

-{if $rows } +{if $rows }

{include file="CRM/common/formButtons.tpl" location="top"}
diff --git a/templates/CRM/Event/Import/Form/Preview.tpl b/templates/CRM/Event/Import/Form/Preview.tpl index 808f2967a1..dc88ac70b2 100644 --- a/templates/CRM/Event/Import/Form/Preview.tpl +++ b/templates/CRM/Event/Import/Form/Preview.tpl @@ -25,16 +25,16 @@ *} {* Participant Import Wizard - Step 3 (preview import results prior to actual data loading) *} {* @var $form Contains the array for the form elements and other form associated information assigned to the template by the controller *} - +
{* WizardHeader.tpl provides visual display of steps thru the wizard as well as title for current step *} {include file="CRM/common/WizardHeader.tpl"}

- {ts}The information below previews the results of importing your data in CiviCRM. Review the totals to ensure that they represent your expected results.{/ts} + {ts}The information below previews the results of importing your data in CiviCRM. Review the totals to ensure that they represent your expected results.{/ts}

- + {if $invalidRowCount}

{ts 1=$invalidRowCount 2=$downloadErrorRecordsUrl}CiviCRM has detected invalid data or formatting errors in %1 records. If you continue, these records will be skipped. OR, you can download a file with just these problem records - Download Errors. Then correct them in the original import file, cancel this import and begin again at step 1.{/ts} @@ -46,7 +46,7 @@ {ts 1=$conflictRowCount 2=$downloadConflictRecordsUrl}CiviCRM has detected %1 records with conflicting participant IDs within this data file. If you continue, these records will be skipped. OR, you can download a file with just these problem records - Download Conflicts. Then correct them in the original import file, cancel this import and begin again at step 1.{/ts}

{/if} - +

{ts}Click 'Import Now' if you are ready to proceed.{/ts}

@@ -60,7 +60,7 @@
- + {if $invalidRowCount} @@ -71,7 +71,7 @@ {/if} - + {if $conflictRowCount} @@ -88,12 +88,12 @@
{$form.badge_id.label} {$form.badge_id.html}{$totalRowCount} {ts}Total rows (participant records) in uploaded file.{/ts}
{ts}Rows with Errors{/ts} {$invalidRowCount}
{ts}Conflicting Rows{/ts} {$conflictRowCount}{ts}Total rows to be imported.{/ts}
- + {* Table for mapping preview *} {include file="CRM/Event/Import/Form/MapTable.tpl} - - + +
{include file="CRM/common/formButtons.tpl" location="bottom"}
diff --git a/templates/CRM/Event/Import/Form/Summary.tpl b/templates/CRM/Event/Import/Form/Summary.tpl index 42ad05d94b..f4bec16379 100644 --- a/templates/CRM/Event/Import/Form/Summary.tpl +++ b/templates/CRM/Event/Import/Form/Summary.tpl @@ -30,12 +30,12 @@ {* WizardHeader.tpl provides visual display of steps thru the wizard as well as title for current step *} {include file="CRM/common/WizardHeader.tpl"} - +

{ts}Import has completed successfully.{/ts} {ts}The information below summarizes the results.{/ts}

- + {if $unMatchCount }

{ts count=$unMatchCount plural='CiviCRM has detected mismatched participant IDs. These records have not been updated.'}CiviCRM has detected a mismatched participant ID. This record has not been updated.{/ts} @@ -43,8 +43,8 @@

{ts 1=$downloadMismatchRecordsUrl}You can Download Mismatched Participants. You may then correct them, and import the new file with the corrected data.{/ts}

- {/if} - + {/if} + {if $invalidRowCount }

{ts count=$invalidRowCount plural='CiviCRM has detected invalid data and/or formatting errors in %count records. These records have not been imported.'}CiviCRM has detected invalid data and/or formatting errors in one record. This record has not been imported.{/ts} @@ -72,10 +72,10 @@

{/if}
- +
{include file="CRM/common/formButtons.tpl" location="top"} -
+
{* Summary of Import Results (record counts) *} @@ -93,7 +93,7 @@ {/if} - + {if $unMatchCount } @@ -104,7 +104,7 @@ {/if} - + {if $conflictRowCount} @@ -126,14 +126,14 @@ {/if} - +
{ts}Total Rows{/ts}
{ts}Mismatched Rows (skipped){/ts} {$unMatchCount}
{ts}Conflicting Rows (skipped){/ts} {$conflictRowCount}
{ts}Records Imported{/ts} {$validRowCount} {ts}Rows imported successfully.{/ts}
- +
{include file="CRM/common/formButtons.tpl" location="bottom"}
diff --git a/templates/CRM/Event/Page/UserDashboard.tpl b/templates/CRM/Event/Page/UserDashboard.tpl index 7f4205a93d..fae0daae1e 100644 --- a/templates/CRM/Event/Page/UserDashboard.tpl +++ b/templates/CRM/Event/Page/UserDashboard.tpl @@ -55,7 +55,7 @@ {$row.participant_status} {if $row.showConfirmUrl} - {ts}Confirm Registration{/ts} + {ts}Confirm Registration{/ts} {/if} @@ -66,7 +66,7 @@
  {ts}You are not registered for any current or upcoming Events.{/ts} - +
{/if} diff --git a/templates/CRM/Event/Page/iCalLinks.tpl b/templates/CRM/Event/Page/iCalLinks.tpl index 6648cf0ff1..183753e117 100644 --- a/templates/CRM/Event/Page/iCalLinks.tpl +++ b/templates/CRM/Event/Page/iCalLinks.tpl @@ -27,5 +27,5 @@ {capture assign=icalFile}{crmURL p='civicrm/event/ical' q="reset=1&id=`$event.id`" fe=1 a=1}{/capture} {capture assign=icalFeed}{crmURL p='civicrm/event/ical' q="reset=1&list=1&id=`$event.id`" fe=1 a=1}{/capture}
- {ts}Download iCalendar entry for this event.{/ts}  {ts}iCalendar feed for this event.{/ts} + {ts}Download iCalendar entry for this event.{/ts}  {ts}iCalendar feed for this event.{/ts}
diff --git a/templates/CRM/Financial/Form/FinancialTypeAccount.tpl b/templates/CRM/Financial/Form/FinancialTypeAccount.tpl index 1dc67719f4..e9966ee141 100644 --- a/templates/CRM/Financial/Form/FinancialTypeAccount.tpl +++ b/templates/CRM/Financial/Form/FinancialTypeAccount.tpl @@ -27,7 +27,7 @@
{if $action eq 8}
-
+
{ts}WARNING: You cannot delete a financial type if it is currently used by any Contributions, Contribution Pages or Membership Types. Consider disabling this option instead.{/ts} {ts}Deleting a financial type cannot be undone. Unbalanced transactions may be created if you delete this account.{/ts} {ts}Do you want to continue?{/ts}
{else} diff --git a/templates/CRM/Grant/Form/Search/AdvancedSearchPane.tpl b/templates/CRM/Grant/Form/Search/AdvancedSearchPane.tpl index d977fc0f90..61fedde5ff 100644 --- a/templates/CRM/Grant/Form/Search/AdvancedSearchPane.tpl +++ b/templates/CRM/Grant/Form/Search/AdvancedSearchPane.tpl @@ -24,7 +24,7 @@ +--------------------------------------------------------------------+ *}
- +
{include file="CRM/Grant/Form/Search/Common.tpl"}
diff --git a/templates/CRM/Grant/Form/Search/Common.tpl b/templates/CRM/Grant/Form/Search/Common.tpl index 9678b56a86..12383177cf 100644 --- a/templates/CRM/Grant/Form/Search/Common.tpl +++ b/templates/CRM/Grant/Form/Search/Common.tpl @@ -34,14 +34,14 @@ {$form.grant_type_id.label}
- {$form.grant_type_id.html} + {$form.grant_type_id.html} {$form.grant_amount_low.label}
{$form.grant_amount_low.html} - + {$form.grant_amount_high.label}
{$form.grant_amount_high.html} @@ -56,7 +56,7 @@ {$form.grant_application_received_date_high.label}
{include file="CRM/common/jcalendar.tpl" elementName=grant_application_received_date_high}  {$form.grant_application_received_notset.html}  {ts}Date is not set{/ts} - + @@ -64,21 +64,21 @@ {include file="CRM/common/jcalendar.tpl" elementName=grant_decision_date_low} - {$form.grant_decision_date_high.label}
+ {$form.grant_decision_date_high.label}
{include file="CRM/common/jcalendar.tpl" elementName=grant_decision_date_high}  {$form.grant_decision_date_notset.html}  {ts}Date is not set{/ts} - + - - {$form.grant_money_transfer_date_low.label}
+ + {$form.grant_money_transfer_date_low.label}
{include file="CRM/common/jcalendar.tpl" elementName=grant_money_transfer_date_low} - - {$form.grant_money_transfer_date_high.label}
+ + {$form.grant_money_transfer_date_high.label}
{include file="CRM/common/jcalendar.tpl" elementName=grant_money_transfer_date_high}  {$form.grant_money_transfer_date_notset.html}  {ts}Date is not set{/ts} - + @@ -89,7 +89,7 @@ {$form.grant_due_date_high.label}
{include file="CRM/common/jcalendar.tpl" elementName=grant_due_date_high}  {$form.grant_due_date_notset.html}  {ts}Date is not set{/ts} - + {if $grantGroupTree} diff --git a/templates/CRM/Grant/Form/Task.tpl b/templates/CRM/Grant/Form/Task.tpl index e8ca97fc8d..dcb2d12052 100644 --- a/templates/CRM/Grant/Form/Task.tpl +++ b/templates/CRM/Grant/Form/Task.tpl @@ -26,7 +26,7 @@ {if $totalSelectedGrants} {ts 1=$totalSelectedGrants}Number of selected grants: %1{/ts} {/if} -{if $rows } +{if $rows }
diff --git a/templates/CRM/Grant/Form/Task/Print.tpl b/templates/CRM/Grant/Form/Task/Print.tpl index 0eccf29b49..248c4ea01e 100644 --- a/templates/CRM/Grant/Form/Task/Print.tpl +++ b/templates/CRM/Grant/Form/Task/Print.tpl @@ -25,7 +25,7 @@ *}

-{if $rows } +{if $rows }

{$form.buttons.html}

diff --git a/templates/CRM/Grant/Form/Task/Update.tpl b/templates/CRM/Grant/Form/Task/Update.tpl index 6c78787094..4036e7a6a8 100644 --- a/templates/CRM/Grant/Form/Task/Update.tpl +++ b/templates/CRM/Grant/Form/Task/Update.tpl @@ -23,7 +23,7 @@ | see the CiviCRM license FAQ at http://civicrm.org/licensing | +--------------------------------------------------------------------+ *} -{* Update Grants *} +{* Update Grants *}

{ts}Enter values for the fields you wish to update. Leave fields blank to preserve existing values.{/ts}

diff --git a/templates/CRM/Grant/Page/DashBoard.tpl b/templates/CRM/Grant/Page/DashBoard.tpl index 57c88b3201..271f5dfea3 100644 --- a/templates/CRM/Grant/Page/DashBoard.tpl +++ b/templates/CRM/Grant/Page/DashBoard.tpl @@ -62,7 +62,7 @@ You have {$grantSummary.total_grants} grant(s) registered in your database. {if $pager->_totalItems} - +

{ts}Recent Grants{/ts}

{include file="CRM/Grant/Form/Selector.tpl" context="DashBoard"} diff --git a/templates/CRM/Mailing/Form/Search/AdvancedSearchPane.tpl b/templates/CRM/Mailing/Form/Search/AdvancedSearchPane.tpl index 7573c4e418..77f8ba51d0 100644 --- a/templates/CRM/Mailing/Form/Search/AdvancedSearchPane.tpl +++ b/templates/CRM/Mailing/Form/Search/AdvancedSearchPane.tpl @@ -1,6 +1,6 @@ {if $validCiviMailing}
-
+
{include file="CRM/Mailing/Form/Search/Common.tpl"}
diff --git a/templates/CRM/Mailing/Form/Task.tpl b/templates/CRM/Mailing/Form/Task.tpl index 5861ee4ab2..6f92069698 100644 --- a/templates/CRM/Mailing/Form/Task.tpl +++ b/templates/CRM/Mailing/Form/Task.tpl @@ -25,7 +25,7 @@ *} {ts 1=$totalSelectedMailingRecipients}Number of selected Mailing Recipients: %1{/ts} -{if $rows } +{if $rows }
diff --git a/templates/CRM/Mailing/Form/Task/Print.tpl b/templates/CRM/Mailing/Form/Task/Print.tpl index a34b21d419..4d623a4f40 100644 --- a/templates/CRM/Mailing/Form/Task/Print.tpl +++ b/templates/CRM/Mailing/Form/Task/Print.tpl @@ -25,7 +25,7 @@ *}

-{if $rows} +{if $rows}

{$form.buttons.html}
@@ -42,7 +42,7 @@ {foreach from=$rows item=row} - + diff --git a/templates/CRM/Mailing/Form/Test.tpl b/templates/CRM/Mailing/Form/Test.tpl index 434537656b..d76e95caeb 100644 --- a/templates/CRM/Mailing/Form/Test.tpl +++ b/templates/CRM/Mailing/Form/Test.tpl @@ -36,13 +36,13 @@
{ts}Completed Date{/ts}
{$row.sort_name} {$row.email} {$row.mailing_name}
- +
{$form.test_email.label}{$form.test_email.html} {ts}(filled with your contact's token values){/ts}
{$form.test_group.label}{$form.test_group.html}
{$form.sendtest.html}
{$form.sendtest.html}
+
{include file="CRM/common/formButtons.tpl"}
- +
diff --git a/templates/CRM/Member/Form/MembershipStandalone.js b/templates/CRM/Member/Form/MembershipStandalone.js index ec61fdf26f..aca7c5902a 100644 --- a/templates/CRM/Member/Form/MembershipStandalone.js +++ b/templates/CRM/Member/Form/MembershipStandalone.js @@ -32,7 +32,7 @@ CRM.$(function($) { if (this.end_date) { andEndDate = ' ' + ts("and end date of %1", {1:this.end_date}); } - + var renewUrl = CRM.url('civicrm/contact/view/membership', "reset=1&action=renew&cid="+this.contact_id+"&id="+this['id']+"&context=membership&selectedChild=member" ); @@ -42,7 +42,7 @@ CRM.$(function($) { ); var org = $('option:selected', "select[name='membership_type_id[0]']").text(); - + alert = CRM.alert( ts('This contact has an existing %1 membership at %2 with %3 status%4.', {1: CRM.existingMems.memtypes[this.membership_type_id], 2: org, 3: membership_status, 4: andEndDate}) + ' diff --git a/templates/CRM/common/navigation.js.tpl b/templates/CRM/common/navigation.js.tpl index ff627c457d..9ae419b61c 100644 --- a/templates/CRM/common/navigation.js.tpl +++ b/templates/CRM/common/navigation.js.tpl @@ -113,7 +113,7 @@ $('#civicrm-menu').ready(function() { }, focus: function (event, ui){ return false; - }, + }, select: function (event, ui) { document.location = CRM.url('civicrm/contact/view', {reset: 1, cid: ui.item.value}); return false; diff --git a/templates/CRM/common/searchResultTasks.tpl b/templates/CRM/common/searchResultTasks.tpl index b51b2fda50..41d2cba135 100644 --- a/templates/CRM/common/searchResultTasks.tpl +++ b/templates/CRM/common/searchResultTasks.tpl @@ -63,7 +63,7 @@ {elseif !empty($form._qf_Search_next_print)} {$form._qf_Search_next_print.html}     {/if} - + {$form.task.html} {if $actionButtonName} diff --git a/tests/phpunit/api/v3/ParticipantTest.php b/tests/phpunit/api/v3/ParticipantTest.php index 91ca2e99f4..85ffd721f4 100644 --- a/tests/phpunit/api/v3/ParticipantTest.php +++ b/tests/phpunit/api/v3/ParticipantTest.php @@ -487,7 +487,7 @@ class api_v3_ParticipantTest extends CiviUnitTestCase { $this->assertEquals(2, $lineItems['count']); // Check quantity, label and unit price of lines. - // TODO: These assertions depend on the order of the line items, which is + // TODO: These assertions depend on the order of the line items, which is // technically incorrect. $lineItem = array_pop($lineItems['values']); diff --git a/tests/phpunit/api/v3/TaxContributionPageTest.php b/tests/phpunit/api/v3/TaxContributionPageTest.php index 0ab0ac71d2..599a12ae2a 100644 --- a/tests/phpunit/api/v3/TaxContributionPageTest.php +++ b/tests/phpunit/api/v3/TaxContributionPageTest.php @@ -126,15 +126,15 @@ class api_v3_TaxContributionPageTest extends CiviUnitTestCase { ); $halfFinancialAccount = CRM_Financial_BAO_FinancialAccount::add($financialAccHalftax); $this->halfFinancialAccId = $halfFinancialAccount->id; - $halfFinancialtypeHalftax = array( + $halfFinancialtypeHalftax = array( 'name' => 'grassvariety2'.substr(sha1(rand()), 0, 7), 'is_reserved' => 0, 'is_active' => 1, ); - + $halfFinancialType = CRM_Financial_BAO_FinancialType::add($halfFinancialtypeHalftax); $this->halfFinancialTypeId = $halfFinancialType->id ; - $financialRelationHalftax = array( + $financialRelationHalftax = array( 'entity_table' => 'civicrm_financial_type', 'entity_id' => $this->halfFinancialTypeId, 'account_relationship' => 10, @@ -254,8 +254,8 @@ class api_v3_TaxContributionPageTest extends CiviUnitTestCase { 'source' => 'SSF', 'contribution_status_id' => 1 ); - - $contribution = $this->callAPIAndDocument('contribution', 'create', $params, __FUNCTION__, __FILE__); + + $contribution = $this->callAPIAndDocument('contribution', 'create', $params, __FUNCTION__, __FILE__); $this->_ids['contributionId'] = $contribution['id']; $this->assertEquals($contribution['values'][$contribution['id']]['contact_id'], $this->_individualId, 'In line ' . __LINE__); $this->assertEquals($contribution['values'][$contribution['id']]['total_amount'], 120.00, 'In line ' . __LINE__); @@ -363,7 +363,7 @@ class api_v3_TaxContributionPageTest extends CiviUnitTestCase { } /* - * Updation of contrbution + * Updation of contrbution * Function tests that line items, financial records are updated when contribution amount is changed */ function testCreateUpdateContributionChangeTotal() { @@ -372,7 +372,7 @@ class api_v3_TaxContributionPageTest extends CiviUnitTestCase { 'contact_id' => $this->_individualId, 'receive_date' => '20120511', 'total_amount' => 100.00, - 'financial_type_id' => $this->financialtypeID, + 'financial_type_id' => $this->financialtypeID, 'source' => 'SSF', 'contribution_status_id' => 1, ); diff --git a/tools/bin/scripts/createdoc.sh b/tools/bin/scripts/createdoc.sh index a67388b87a..f80dd358cc 100755 --- a/tools/bin/scripts/createdoc.sh +++ b/tools/bin/scripts/createdoc.sh @@ -6,12 +6,12 @@ P=`dirname $0` # Current dir ORIGPWD=`pwd` -# Function to Create Folder where documentation will be generated. +# Function to Create Folder where documentation will be generated. create_doc_folder() { cd $ORIGPWD/../ - - if [ ! -d "Documentation" ] ; then + + if [ ! -d "Documentation" ] ; then mkdir Documentation fi } @@ -22,42 +22,42 @@ create_documentation() # folder to be parsed # PARSE_FOLDER=$ORIGPWD/../ - + # # target folder (documents will be generated in this folder) # TARGET_FOLDER=$ORIGPWD/../Documentation - + # # title of generated documentation - # + # TITLE="CiviCRM" - + # # parse @internal and elements marked private with @access # PRIVATE=on - + # # JavaDoc-compliant description parsing # JAVADOC_STYLE=off - + # # parse a PEAR-style repository # PEAR_STYLE=on - + # # generate highlighted sourcecode for every parced file # SOURCECODE=on - + # # output information (output:converter:templatedir) # OUTPUT=HTML:frames:phpedit - + phpdoc -t $TARGET_FOLDER -o $OUTPUT -d $PARSE_FOLDER -ti "$TITLE" -pp $PRIVATE -j $JAVADOC_STYLE -p $PEAR_STYLE -s $SOURCECODE } diff --git a/tools/bin/scripts/runTest.sh b/tools/bin/scripts/runTest.sh index 13cc25053c..d5966b8c41 100755 --- a/tools/bin/scripts/runTest.sh +++ b/tools/bin/scripts/runTest.sh @@ -49,7 +49,7 @@ run_seleniumTest() sub_menu echo "Enter Your Option: " read choice - + cd $ORIGPWD/../test/selenium-ruby/CRM # Running Selenium (ruby) Tests ruby ruby_unit_tests.rb $choice @@ -136,7 +136,7 @@ run_option() echo "Unit Tests Successfully Completed. Log stored in the File : " $PATH4LOG/Result/$logUT; echo; echo " **************************************************************************** "; ;; - + # Stress Tests "ST" | "st" | "St") echo "Running Stress Tests"; echo; @@ -144,7 +144,7 @@ run_option() echo "Stress Tests Successfully Completed."; echo; echo " **************************************************************************** "; ;; - + # Selenium (Ruby) Tests "SRT" | "srt" | "Srt") echo "Running Selenium (Ruby) Tests"; echo; diff --git a/tools/bin/scripts/soapClient.php.txt b/tools/bin/scripts/soapClient.php.txt index 1e29615a69..34a8fb76c0 100644 --- a/tools/bin/scripts/soapClient.php.txt +++ b/tools/bin/scripts/soapClient.php.txt @@ -6,7 +6,7 @@ $client =& new SoapClient(null, array( ); $key = $client->authenticate( USER_NAME, USER_PASSWORD ); -$params = array('contact_id' => 101, +$params = array('contact_id' => 101, 'return.display_name' => 1 ); $result =& $client->get_contact( $key, $params ); diff --git a/tools/bin/scripts/test_sandbox.sh b/tools/bin/scripts/test_sandbox.sh index 56c1dd98f5..4a91b2fc23 100755 --- a/tools/bin/scripts/test_sandbox.sh +++ b/tools/bin/scripts/test_sandbox.sh @@ -7,149 +7,149 @@ cd ../test/maxq # This script is used to run maxq generated test scripts. # Before running these scripts please see Common.py # In Common.py comment and uncomment the constants as per the need -# Below commands use someof the modes of maxq. The modes used are : +# Below commands use someof the modes of maxq. The modes used are : # The -r mode is for running maxq generated test scripts. # The -q mode is for quite mode while testing. # Instead of -q (quite mode), -d(debug mode) can be used. -# For all other options, fire $ maxq --help +# For all other options, fire $ maxq --help ############################ -# Test for Adding Contacts # +# Test for Adding Contacts # ############################ -maxq -q -r testAddContactIndividual.py -maxq -q -r testAddContactHousehold.py +maxq -q -r testAddContactIndividual.py +maxq -q -r testAddContactHousehold.py maxq -q -r testAddContactOrganization.py ############################# -# Test for Editing Contacts # +# Test for Editing Contacts # ############################# -maxq -q -r testEditContactIndividual.py -maxq -q -r testEditContactHousehold.py +maxq -q -r testEditContactIndividual.py +maxq -q -r testEditContactHousehold.py maxq -q -r testEditContactOrganization.py ############################# -# Test for Viewing Contacts # +# Test for Viewing Contacts # ############################# -maxq -q -r testViewContactIndividual.py -maxq -q -r testViewContactHousehold.py +maxq -q -r testViewContactIndividual.py +maxq -q -r testViewContactHousehold.py maxq -q -r testViewContactOrganization.py ############################################# -# Test for Relationship By Relationship Tab # +# Test for Relationship By Relationship Tab # ############################################# -maxq -q -r testAddRelByRelTab.py -maxq -q -r testEditRelByRelTab.py -maxq -q -r testViewRelByRelTab.py +maxq -q -r testAddRelByRelTab.py +maxq -q -r testEditRelByRelTab.py +maxq -q -r testViewRelByRelTab.py maxq -q -r testDisableEnableRelByRelTab.py -maxq -q -r testDeleteRelByRelTab.py +maxq -q -r testDeleteRelByRelTab.py ######################################## -# Test for Relationship By Contact Tab # +# Test for Relationship By Contact Tab # ######################################### maxq -q -r testAddRelByContactTab.py -maxq -q -r testEditRelByContactTab.py +maxq -q -r testEditRelByContactTab.py ############################### -# Test for Group By Group Tab # +# Test for Group By Group Tab # ############################### -maxq -q -r testGroupAllByGroupTab.py +maxq -q -r testGroupAllByGroupTab.py maxq -q -r testGroupAllByContactTab.py ############################# -# Test for Tags By Tags Tab # +# Test for Tags By Tags Tab # ############################# maxq -q -r testTagsAllByTagsTab.py ############################## -# Test for Notes By Note Tab # +# Test for Notes By Note Tab # ############################## -maxq -q -r testAddNoteByNoteTab.py -maxq -q -r testEditNoteByNoteTab.py -maxq -q -r testViewNoteByNoteTab.py +maxq -q -r testAddNoteByNoteTab.py +maxq -q -r testEditNoteByNoteTab.py +maxq -q -r testViewNoteByNoteTab.py maxq -q -r testDeleteNoteByNoteTab.py ################################# -# Test for Notes By Contact Tab # +# Test for Notes By Contact Tab # ################################# -maxq -q -r testAddNoteByContactTab.py +maxq -q -r testAddNoteByContactTab.py maxq -q -r testEditNoteByContactTab.py maxq -q -r testDeleteNoteByNoteTab.py ####################### -# Test for Admin Tags # +# Test for Admin Tags # ####################### -maxq -q -r testAdminAddTags.py -maxq -q -r testAdminEditTags.py +maxq -q -r testAdminAddTags.py +maxq -q -r testAdminEditTags.py maxq -q -r testAdminDeleteTag.py ################################ -# Test for Admin Location Type # +# Test for Admin Location Type # ################################ -maxq -q -r testAdminAddLocationType.py -maxq -q -r testAdminEditLocationType.py +maxq -q -r testAdminAddLocationType.py +maxq -q -r testAdminEditLocationType.py maxq -q -r testAdminEnableDisableLocationType.py maxq -q -r testAdminDeleteLocationType.py ################################## -# Test for Admin Mobile Provider # +# Test for Admin Mobile Provider # ################################## -maxq -q -r testAdminAddMobileProvider.py -maxq -q -r testAdminEditMobileProvider.py +maxq -q -r testAdminAddMobileProvider.py +maxq -q -r testAdminEditMobileProvider.py maxq -q -r testAdminEnableDisableMobileProvider.py maxq -q -r testAdminDeleteMobileProvider.py ############################## -# Test for Admin IM Provider # +# Test for Admin IM Provider # ############################## -maxq -q -r testAdminAddIMProvider.py +maxq -q -r testAdminAddIMProvider.py maxq -q -r testAdminEditIMProvider.py maxq -q -r testAdminEnableDisableIMProvider.py maxq -q -r testAdminDeleteIMProvider.py ##################################### -# Test for Admin Relationship Types # +# Test for Admin Relationship Types # ##################################### -maxq -q -r testAdminAddRel.py -maxq -q -r testAdminEditRel.py -maxq -q -r testAdminViewRel.py +maxq -q -r testAdminAddRel.py +maxq -q -r testAdminEditRel.py +maxq -q -r testAdminViewRel.py maxq -q -r testAdminEnableDisableRel.py maxq -q -r testAdminDeleteRel.py #################################### -# Test for Admin Custom Data Group # +# Test for Admin Custom Data Group # #################################### -maxq -q -r testAdminAddCustomDataGroup.py -maxq -q -r testAdminEditCustomDataGroup.py +maxq -q -r testAdminAddCustomDataGroup.py +maxq -q -r testAdminEditCustomDataGroup.py maxq -q -r testAdminEnableDisableCustomDataGroup.py maxq -q -r testAdminPreviewCustomDataGroup.py #################################### -# Test for Admin Custom Data Field # +# Test for Admin Custom Data Field # #################################### -maxq -q -r testAdminAddCustomDataField.py -maxq -q -r testAdminEditCustomDataField.py +maxq -q -r testAdminAddCustomDataField.py +maxq -q -r testAdminEditCustomDataField.py maxq -q -r testAdminEnableDisableCustomDataField.py maxq -q -r testAdminPreviewCustomDataField.py ######################## -# Test for Custom Data # +# Test for Custom Data # ######################## maxq -r -q testEditCustomDataInline.py @@ -158,7 +158,7 @@ maxq -r -q testEditCustomDataInline.py #maxq -q -r adminDeleteCustomDataGroup.py ############################## -# Test for Admin CiviDonate # +# Test for Admin CiviDonate # ############################## ################### @@ -189,20 +189,20 @@ maxq -r testAdminDisableEnableCiviDonatePaymentInstrument.py maxq -r testAdminDeleteCiviDonatePaymentInstrument.py ########################## -# Test for Basic Search # +# Test for Basic Search # ########################## -maxq -q -r testSearchByLNameIndividual.py -maxq -q -r testSearchByHNameHousehold.py -maxq -q -r testSearchByONameOraganization.py -maxq -q -r testSearchByNoCriteria.py -maxq -q -r testSearchByGroup.py -maxq -q -r testSearchByContactTagGroupName.py +maxq -q -r testSearchByLNameIndividual.py +maxq -q -r testSearchByHNameHousehold.py +maxq -q -r testSearchByONameOraganization.py +maxq -q -r testSearchByNoCriteria.py +maxq -q -r testSearchByGroup.py +maxq -q -r testSearchByContactTagGroupName.py ############################# -# Test for Advanced Search # +# Test for Advanced Search # ############################# -maxq -q -r testAdvSearchByAllCriteria.py -maxq -q -r testAdvSearchByContactName.py -maxq -q -r testAdvSearchByContactGroupCategory.py +maxq -q -r testAdvSearchByAllCriteria.py +maxq -q -r testAdvSearchByContactName.py +maxq -q -r testAdvSearchByContactGroupCategory.py diff --git a/tools/drupal/modules/multicurrency/multicurrency.module.discount b/tools/drupal/modules/multicurrency/multicurrency.module.discount index ac495fef04..31b1ee0fae 100644 --- a/tools/drupal/modules/multicurrency/multicurrency.module.discount +++ b/tools/drupal/modules/multicurrency/multicurrency.module.discount @@ -37,15 +37,15 @@ define( 'MULTICURRENCY_EVENT_ID', 4 ); define( 'DISCOUNT_EVENT_ID', 4 ); function multicurrency_civicrm_buildForm( $formName, - &$form ) { + &$form ) { if ( ( strpos( $formName, 'CRM_Event_Form_Registration_' ) !== false ) && - ( $form->getVar( '_eventId' ) == MULTICURRENCY_EVENT_ID ) ) { + ( $form->getVar( '_eventId' ) == MULTICURRENCY_EVENT_ID ) ) { multicurrency_set_currency( $form ); } //------- Coupon field --------// if ( $formName == 'CRM_Event_Form_Registration_Register' && - $form->getVar( '_eventId' ) == DISCOUNT_EVENT_ID ) { + $form->getVar( '_eventId' ) == DISCOUNT_EVENT_ID ) { $form->addElement( 'text', 'discountCode', ts( 'Discount Code' ) ); // also assign to template @@ -85,16 +85,16 @@ function multicurrency_set_currency( &$form ) { } function multicurrency_civicrm_buildAmount( $pageType, - &$form, - &$amount ) { + &$form, + &$amount ) { // only modify the event pages for the UK event if ( $form->getVar( '_eventId' ) == MULTICURRENCY_EVENT_ID ) { $currency = multicurrency_set_currency( $form ); - + // as of may 5th: 1 USD = 0.75 EUR, 1 USD = 0.667 GBP $ratio = ( $currency == 'EUR' ) ? 0.75 : ( 2.0 / 3.0 ); - + foreach ( $amount as $amountID =>& $amountInfo ) { $amountInfo['value'] = ceil( $amountInfo['value'] * $ratio ); } @@ -160,7 +160,7 @@ AND g.name = %2 } } return array( null, null, null ); - + } /* @@ -172,7 +172,7 @@ function multicurrency_civicrm_postProcess( $class, &$form ) { $eventID != DISCOUNT_EVENT_ID ) { return; } - + $discountCode = CRM_Utils_Request::retrieve( 'discountCode', 'String', $form, false, null, $_REQUEST ); if ( ! $discountCode ) { return; diff --git a/tools/drupal/modules/multicurrency/multicurrency.module.original b/tools/drupal/modules/multicurrency/multicurrency.module.original index 1f3375e77a..cc994ef532 100644 --- a/tools/drupal/modules/multicurrency/multicurrency.module.original +++ b/tools/drupal/modules/multicurrency/multicurrency.module.original @@ -36,9 +36,9 @@ define( 'MULTICURRENCY_EVENT_ID', 4 ); function multicurrency_civicrm_buildForm( $formName, - &$form ) { + &$form ) { if ( ( strpos( $formName, 'CRM_Event_Form_Registration_' ) !== false ) && - ( $form->getVar( '_eventId' ) == MULTICURRENCY_EVENT_ID ) ) { + ( $form->getVar( '_eventId' ) == MULTICURRENCY_EVENT_ID ) ) { multicurrency_set_currency( $form ); } } @@ -63,16 +63,16 @@ function multicurrency_set_currency( &$form ) { } function multicurrency_civicrm_buildAmount( $pageType, - &$form, - &$amount ) { + &$form, + &$amount ) { // only modify the event pages for the UK event if ( $form->getVar( '_eventId' ) == MULTICURRENCY_EVENT_ID ) { $currency = multicurrency_set_currency( $form ); - + // as of may 5th: 1 USD = 0.75 EUR, 1 USD = 0.667 GBP $ratio = ( $currency == 'EUR' ) ? 0.75 : ( 2.0 / 3.0 ); - + foreach ( $amount as $amountID =>& $amountInfo ) { $amountInfo['value'] = ceil( $amountInfo['value'] * $ratio ); } diff --git a/tools/drupal/modules/multicurrency/templates/CRM/Event/Form/Registration/4/Register.tpl b/tools/drupal/modules/multicurrency/templates/CRM/Event/Form/Registration/4/Register.tpl index 0ace60350e..3afa67feb8 100644 --- a/tools/drupal/modules/multicurrency/templates/CRM/Event/Form/Registration/4/Register.tpl +++ b/tools/drupal/modules/multicurrency/templates/CRM/Event/Form/Registration/4/Register.tpl @@ -35,7 +35,7 @@ {assign var="count" value=`$count+1`} {/if} {/if} - {/foreach} + {/foreach} @@ -53,7 +53,7 @@
{include file="CRM/Event/Form/CalculatePriceset.tpl"}
-
+ {if $priceSet.help_post}
 
{$priceSet.help_post}
@@ -108,21 +108,21 @@ {$form.additional_participants.html|crmReplace:class:two}
{ts}You will be able to enter registration information for each additional person after you complete this page and click Continue.{/ts} - + - + {* User account registration option. Displays if enabled for one of the profiles on this page. *} {include file="CRM/common/CMSUser.tpl"} -{include file="CRM/UF/Form/Block.tpl" fields=$customPre} +{include file="CRM/UF/Form/Block.tpl" fields=$customPre} -{if $paidEvent} - {include file='CRM/Core/BillingBlock.tpl'} -{/if} +{if $paidEvent} + {include file='CRM/Core/BillingBlock.tpl'} +{/if} -{include file="CRM/UF/Form/Block.tpl" fields=$customPost} +{include file="CRM/UF/Form/Block.tpl" fields=$customPost} {if $isCaptcha} {include file='CRM/common/ReCAPTCHA.tpl'} @@ -153,43 +153,43 @@ {* Hide Credit Card Block and Billing information if registration is pay later. *} -{if $form.is_pay_later and $hidePaymentInformation} -{include file="CRM/common/showHideByFieldValue.tpl" +{if $form.is_pay_later and $hidePaymentInformation} +{include file="CRM/common/showHideByFieldValue.tpl" trigger_field_id ="is_pay_later" trigger_value ="" - target_element_id ="payment_information" + target_element_id ="payment_information" target_element_type ="table-row" field_type ="radio" invert = 1 } {/if} -{literal} +{literal} -{/literal} +{/literal} diff --git a/tools/drupal/modules/multicurrency/templates/CRM/Event/Form/Registration/8/Register.tpl b/tools/drupal/modules/multicurrency/templates/CRM/Event/Form/Registration/8/Register.tpl index 0ace60350e..3afa67feb8 100644 --- a/tools/drupal/modules/multicurrency/templates/CRM/Event/Form/Registration/8/Register.tpl +++ b/tools/drupal/modules/multicurrency/templates/CRM/Event/Form/Registration/8/Register.tpl @@ -35,7 +35,7 @@ {assign var="count" value=`$count+1`} {/if} {/if} - {/foreach} + {/foreach} @@ -53,7 +53,7 @@
{include file="CRM/Event/Form/CalculatePriceset.tpl"}
-
+ {if $priceSet.help_post}
 
{$priceSet.help_post}
@@ -108,21 +108,21 @@ {$form.additional_participants.html|crmReplace:class:two}
{ts}You will be able to enter registration information for each additional person after you complete this page and click Continue.{/ts} - + - + {* User account registration option. Displays if enabled for one of the profiles on this page. *} {include file="CRM/common/CMSUser.tpl"} -{include file="CRM/UF/Form/Block.tpl" fields=$customPre} +{include file="CRM/UF/Form/Block.tpl" fields=$customPre} -{if $paidEvent} - {include file='CRM/Core/BillingBlock.tpl'} -{/if} +{if $paidEvent} + {include file='CRM/Core/BillingBlock.tpl'} +{/if} -{include file="CRM/UF/Form/Block.tpl" fields=$customPost} +{include file="CRM/UF/Form/Block.tpl" fields=$customPost} {if $isCaptcha} {include file='CRM/common/ReCAPTCHA.tpl'} @@ -153,43 +153,43 @@ {* Hide Credit Card Block and Billing information if registration is pay later. *} -{if $form.is_pay_later and $hidePaymentInformation} -{include file="CRM/common/showHideByFieldValue.tpl" +{if $form.is_pay_later and $hidePaymentInformation} +{include file="CRM/common/showHideByFieldValue.tpl" trigger_field_id ="is_pay_later" trigger_value ="" - target_element_id ="payment_information" + target_element_id ="payment_information" target_element_type ="table-row" field_type ="radio" invert = 1 } {/if} -{literal} +{literal} -{/literal} +{/literal} diff --git a/tools/drupal/modules/multicurrency/templates/CRM/Event/Page/4/EventInfo.tpl b/tools/drupal/modules/multicurrency/templates/CRM/Event/Page/4/EventInfo.tpl index d60a4f8002..617d31abeb 100644 --- a/tools/drupal/modules/multicurrency/templates/CRM/Event/Page/4/EventInfo.tpl +++ b/tools/drupal/modules/multicurrency/templates/CRM/Event/Page/4/EventInfo.tpl @@ -1,38 +1,38 @@ {* this template is used for displaying event information *}
-

{$event.title}

+

{$event.title}

- - {if $event.summary} - - {/if} - {if $event.description} - - {/if} - +
{$event.summary}
- {$event.description}
+ {if $event.summary} + + {/if} + {if $event.description} + + {/if} + - - - {if $isShowLocation} + + + {if $isShowLocation} {if $location.1.name || $location.1.address} - {/if} - {/if}{*End of isShowLocation condition*} + {/if} + {/if}{*End of isShowLocation condition*} - {if $location.1.phone.1.phone || $location.1.email.1.email} + {if $location.1.phone.1.phone || $location.1.email.1.email} - {/if} -
{$event.summary}
+ {$event.description}
- - {$event.event_start_date|crmDate} - - {if $event.event_end_date} -   {ts}through{/ts}   + + {$event.event_start_date|crmDate} + + {if $event.event_end_date} +   {ts}through{/ts}   {* Only show end time if end date = start date *} {if $event.event_end_date|date_format:"%Y%m%d" == $event.event_start_date|date_format:"%Y%m%d"} - - {$event.event_end_date|crmDate:0:1} - + + {$event.event_end_date|crmDate:0:1} + {else} - - {$event.event_end_date|crmDate} - + + {$event.event_end_date|crmDate} + {/if} {/if}
@@ -45,15 +45,15 @@ {/if}
{* loop on any phones and emails for this event *} + {* loop on any phones and emails for this event *} {foreach from=$location.1.phone item=phone} {if $phone.phone} - {if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if}: + {if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if}: {$phone.phone}
{/if} {/foreach} @@ -66,7 +66,7 @@
+ {include file="CRM/Custom/Page/CustomDataView.tpl"} @@ -79,5 +79,5 @@ { if $event.is_public }
{include file="CRM/Event/Page/iCalLinks.tpl"} {/if} -
+
diff --git a/tools/drupal/modules/multicurrency/templates/CRM/Event/Page/8/EventInfo.tpl b/tools/drupal/modules/multicurrency/templates/CRM/Event/Page/8/EventInfo.tpl index d60a4f8002..617d31abeb 100644 --- a/tools/drupal/modules/multicurrency/templates/CRM/Event/Page/8/EventInfo.tpl +++ b/tools/drupal/modules/multicurrency/templates/CRM/Event/Page/8/EventInfo.tpl @@ -1,38 +1,38 @@ {* this template is used for displaying event information *}
-

{$event.title}

+

{$event.title}

- - {if $event.summary} - - {/if} - {if $event.description} - - {/if} - +
{$event.summary}
- {$event.description}
+ {if $event.summary} + + {/if} + {if $event.description} + + {/if} + - - - {if $isShowLocation} + + + {if $isShowLocation} {if $location.1.name || $location.1.address} - {/if} - {/if}{*End of isShowLocation condition*} + {/if} + {/if}{*End of isShowLocation condition*} - {if $location.1.phone.1.phone || $location.1.email.1.email} + {if $location.1.phone.1.phone || $location.1.email.1.email} - {/if} -
{$event.summary}
+ {$event.description}
- - {$event.event_start_date|crmDate} - - {if $event.event_end_date} -   {ts}through{/ts}   + + {$event.event_start_date|crmDate} + + {if $event.event_end_date} +   {ts}through{/ts}   {* Only show end time if end date = start date *} {if $event.event_end_date|date_format:"%Y%m%d" == $event.event_start_date|date_format:"%Y%m%d"} - - {$event.event_end_date|crmDate:0:1} - + + {$event.event_end_date|crmDate:0:1} + {else} - - {$event.event_end_date|crmDate} - + + {$event.event_end_date|crmDate} + {/if} {/if}
@@ -45,15 +45,15 @@ {/if}
{* loop on any phones and emails for this event *} + {* loop on any phones and emails for this event *} {foreach from=$location.1.phone item=phone} {if $phone.phone} - {if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if}: + {if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if}: {$phone.phone}
{/if} {/foreach} @@ -66,7 +66,7 @@
+ {include file="CRM/Custom/Page/CustomDataView.tpl"} @@ -79,5 +79,5 @@ { if $event.is_public }
{include file="CRM/Event/Page/iCalLinks.tpl"} {/if} -
+
diff --git a/tools/extensions/org.civicrm.demoqueue/CRM/Demoqueue/Page/DemoQueue.php b/tools/extensions/org.civicrm.demoqueue/CRM/Demoqueue/Page/DemoQueue.php index 997b3de98a..29e022a3f9 100644 --- a/tools/extensions/org.civicrm.demoqueue/CRM/Demoqueue/Page/DemoQueue.php +++ b/tools/extensions/org.civicrm.demoqueue/CRM/Demoqueue/Page/DemoQueue.php @@ -7,14 +7,14 @@ require_once 'CRM/Core/Page.php'; */ class CRM_Demoqueue_Page_DemoQueue extends CRM_Core_Page { const QUEUE_NAME = 'demo-queue'; - + function run() { $queue = CRM_Queue_Service::singleton()->create(array( 'type' => 'Sql', 'name' => self::QUEUE_NAME, 'reset' => TRUE, )); - + for ($i = 0; $i < 5; $i++) { $queue->createItem(new CRM_Queue_Task( array('CRM_Demoqueue_Page_DemoQueue', 'doMyWork'), // callback @@ -29,7 +29,7 @@ class CRM_Demoqueue_Page_DemoQueue extends CRM_Core_Page { )); } } - + $runner = new CRM_Queue_Runner(array( 'title' => ts('Demo Queue Runner'), 'queue' => $queue, @@ -38,7 +38,7 @@ class CRM_Demoqueue_Page_DemoQueue extends CRM_Core_Page { )); $runner->runAllViaWeb(); // does not return } - + /** * Perform some business logic */ @@ -51,7 +51,7 @@ class CRM_Demoqueue_Page_DemoQueue extends CRM_Core_Page { //throw new Exception('whoz'); // broken, exception return TRUE; // success } - + /** * Perform some business logic */ @@ -68,7 +68,7 @@ class CRM_Demoqueue_Page_DemoQueue extends CRM_Core_Page { } return TRUE; // success } - + /** * Handle the final step of the queue */ diff --git a/tools/extensions/org.civicrm.payment.googlecheckout/info.xml b/tools/extensions/org.civicrm.payment.googlecheckout/info.xml index 1b6c7fc4ad..94936edf48 100644 --- a/tools/extensions/org.civicrm.payment.googlecheckout/info.xml +++ b/tools/extensions/org.civicrm.payment.googlecheckout/info.xml @@ -36,5 +36,5 @@ notify 0 1 - + diff --git a/tools/extensions/org.civicrm.payment.googlecheckout/packages/Google/README b/tools/extensions/org.civicrm.payment.googlecheckout/packages/Google/README index 016fe1c67a..1abb8025f4 100644 --- a/tools/extensions/org.civicrm.payment.googlecheckout/packages/Google/README +++ b/tools/extensions/org.civicrm.payment.googlecheckout/packages/Google/README @@ -3,67 +3,67 @@ Sample PHP code for integration of Google Checkout with the merchant site File structure and function ---------------------------- -There are two folders and a log file in the top level directory of +There are two folders and a log file in the top level directory of google-checkout-php-sample. 1. "demo" directory: This contains two files cartdemo.php and responsehandlerdemo.php - a)cartdemo.php: + a)cartdemo.php: --------------- - This file demonstrates the steps required to add items, shipping, taxes and - merchant-calculations to the cart before it is posted to the Checkout server. - There are three use case functions defined with different settings for + This file demonstrates the steps required to add items, shipping, taxes and + merchant-calculations to the cart before it is posted to the Checkout server. + There are three use case functions defined with different settings for shipping and taxes along with different button usages. - b)responsehandler.php: + b)responsehandler.php: ---------------------- - This file will be used to handle the notifications, callbacks and order - processing steps. - The path for this file must be specified in the merchant's API callback + This file will be used to handle the notifications, callbacks and order + processing steps. + The path for this file must be specified in the merchant's API callback URL in Settings->Integration of the merchant's seller account. - This file can be used as is and modified by the merchant as per their - business workflow details. - Some of the intial steps performed in this file include collecting the - XML response, request that has been received and get a parsed result in a + This file can be used as is and modified by the merchant as per their + business workflow details. + Some of the intial steps performed in this file include collecting the + XML response, request that has been received and get a parsed result in a PHP associative array for easy accesibility - (For details of parse output refer xmlparser.php which has an + (For details of parse output refer xmlparser.php which has an example of how an XML maps to the object). Order processing can be done using the SendProcessOrder(..) type of methods provided in googleresponse.php. Some sample order processing - command invocations have been provided as comments in the code - + command invocations have been provided as comments in the code + 2. "library" directory: -This contains the classes defined to describe the API structure so as to easily +This contains the classes defined to describe the API structure so as to easily define and add XML entries by defining objects of these classes. - a) googlecart.php: + a) googlecart.php: ------------------ - This is the main class which must be instantiated to post a cart. - It requires a merchant ID and key to be set and there is an option - to specify which server is to be used for the transactions - (Sandbox or Production). - It also has methods to add items, shipping options, tax options and + This is the main class which must be instantiated to post a cart. + It requires a merchant ID and key to be set and there is an option + to specify which server is to be used for the transactions + (Sandbox or Production). + It also has methods to add items, shipping options, tax options and merchant-calculation details. - b) googleitem.php: + b) googleitem.php: ------------------ - This class is instantiated for every item to be added to the cart. + This class is instantiated for every item to be added to the cart. It requires the item name, description, price and quantity to be specified. - c) googleshipping.php: + c) googleshipping.php: ---------------------- - This class is instantiated for every shipping option that is to be added to the cart. - It requires the shipping name type an price to be specified. + This class is instantiated for every shipping option that is to be added to the cart. + It requires the shipping name type an price to be specified. Other methods allow specification of the shipping restrictions. d) googletaxrule.php: --------------------- - This class is used to define all tax rules for the tax tables. These may be - rules for default or alternate tax tables. Methods have been provided to add + This class is used to define all tax rules for the tax tables. These may be + rules for default or alternate tax tables. Methods have been provided to add states and zip patterns for the tax rules. - + e) googletaxtable.php: ---------------------- This class is used to aggregate all the defined tax rules to define a tax table. @@ -74,21 +74,21 @@ define and add XML entries by defining objects of these classes. An instance of this class is created in the responsehandlerdemo.php. This again requires the merchant id and merchant key to be specified. There are methods provided to send all the different order processing - commands. - All notifications are parsed and the merchant can take required action - when a particular notification is received. + commands. + All notifications are parsed and the merchant can take required action + when a particular notification is received. g) googleresult.php: -------------------- - This class is used for merchant-calculations and is invoked for - each result in the merchant-calculations-result sent from the + This class is used for merchant-calculations and is invoked for + each result in the merchant-calculations-result sent from the merchant in response to a callback. - + h) googlemerchantcalculations.php: ---------------------------------- In order to process merchant calculations, an instance of this - class is created. It is used to aggregate merchant results and - respond with the XML response for the callback. + class is created. It is used to aggregate merchant results and + respond with the XML response for the callback. f) "xml-processing" directory: ------------------------------ @@ -104,12 +104,12 @@ define and add XML entries by defining objects of these classes. ----------------- This class parses XML documents using the SAX parser and is compatible with PHP v4 and 5. It converts them to DOM form - returning the XML data in a PHP associative array. + returning the XML data in a PHP associative array. This is used internally by the library classes to parse - XML requests and responses that are received from the + XML requests and responses that are received from the Checkout server. 3. googlemessage.log: -The log file records all the notification and order processing commands that are +The log file records all the notification and order processing commands that are sent and received and can be useful information for debugging purposes. diff --git a/tools/extensions/org.civicrm.report.baykeeper/Baykeeper.php b/tools/extensions/org.civicrm.report.baykeeper/Baykeeper.php index 69a95cd433..92ceb9da6a 100755 --- a/tools/extensions/org.civicrm.report.baykeeper/Baykeeper.php +++ b/tools/extensions/org.civicrm.report.baykeeper/Baykeeper.php @@ -336,7 +336,7 @@ class CRM_Report_Form_Contribute_Baykeeper extends CRM_Report_Form { } else { $select[] = "{$field['dbAlias']} as {$tableName}_{$fieldName}"; } - */ + */ // only include statistics columns if set @@ -411,9 +411,9 @@ class CRM_Report_Form_Contribute_Baykeeper extends CRM_Report_Form { ON {$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_contribution']}.contact_id AND {$this->_aliases['civicrm_contribution']}.is_test = 0 $contribJoin JOIN (SELECT c.id, IF(COUNT(oc.id) = 0, 0, 1) AS ordinality FROM civicrm_contribution c LEFT JOIN civicrm_contribution oc ON c.contact_id = oc.contact_id AND oc.receive_date < c.receive_date GROUP BY c.id) {$this->_aliases['civicrm_contribution_ordinality']} ON {$this->_aliases['civicrm_contribution_ordinality']}.id = {$this->_aliases['civicrm_contribution']}.id - LEFT JOIN civicrm_note {$this->_aliases['civicrm_note']} + LEFT JOIN civicrm_note {$this->_aliases['civicrm_note']} ON ({$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_note']}.contact_id AND - {$this->_aliases['civicrm_contribution']}.id = {$this->_aliases['civicrm_note']}.entity_id ) + {$this->_aliases['civicrm_contribution']}.id = {$this->_aliases['civicrm_note']}.entity_id ) LEFT JOIN civicrm_phone {$this->_aliases['civicrm_phone']} ON ({$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_phone']}.contact_id AND {$this->_aliases['civicrm_phone']}.is_primary = 1) @@ -426,9 +426,9 @@ class CRM_Report_Form_Contribute_Baykeeper extends CRM_Report_Form { LEFT JOIN civicrm_contact {$alias_creditor} ON {$this->_aliases['civicrm_contribution_soft']}.contact_id = {$alias_creditor}.id - LEFT JOIN civicrm_contact {$this->_aliases['civicrm_contact_hon_mem']} - ON {$this->_aliases['civicrm_contribution']}.honor_contact_id = {$this->_aliases['civicrm_contact_hon_mem']}.id - "; + LEFT JOIN civicrm_contact {$this->_aliases['civicrm_contact_hon_mem']} + ON {$this->_aliases['civicrm_contribution']}.honor_contact_id = {$this->_aliases['civicrm_contact_hon_mem']}.id + "; // add group - concatenated $this->_from .= " LEFT JOIN civicrm_group_contact gc ON {$this->_aliases['civicrm_contact']}.id = gc.contact_id AND gc.status = 'Added' LEFT JOIN civicrm_group {$this->_aliases['civicrm_group_field']} ON {$this->_aliases['civicrm_group_field']}.id = gc.group_id "; @@ -482,13 +482,13 @@ class CRM_Report_Form_Contribute_Baykeeper extends CRM_Report_Form { /* - $statistics['counts']['amount'] = array( 'value' => $dao->amount, + $statistics['counts']['amount'] = array( 'value' => $dao->amount, 'title' => 'Total Amount', 'type' => CRM_Utils_Type::T_MONEY ); $statistics['counts']['avg'] = array( 'value' => $dao->avg, 'title' => 'Average', 'type' => CRM_Utils_Type::T_MONEY ); - */ + */ } return $statistics; diff --git a/tools/extensions/org.civicrm.search.activity/templates/ActivitySearch.tpl b/tools/extensions/org.civicrm.search.activity/templates/ActivitySearch.tpl index f66785dbcd..5274280fc8 100644 --- a/tools/extensions/org.civicrm.search.activity/templates/ActivitySearch.tpl +++ b/tools/extensions/org.civicrm.search.activity/templates/ActivitySearch.tpl @@ -27,7 +27,7 @@
-
+
{ts}Edit Search Criteria{/ts}
@@ -59,22 +59,22 @@
{if $rowsEmpty} -
+
{include file="CRM/Contact/Form/Search/Custom/EmptyResults.tpl"}
{/if} {if $rows} -
+
{* Search request has returned 1 or more matching rows. Display results and collapse the search criteria fieldset. *} - + {* This section handles form elements for action task select and submit *} -
+
{include file="CRM/Contact/Form/Search/ResultTasks.tpl"} -
+
{* This section displays the rows along and includes the paging controls *}
- + {include file="CRM/common/pager.tpl" location="top"} {include file="CRM/common/pagerAToZ.tpl"} @@ -119,7 +119,7 @@ {/if} {if isset($row.activity_subject) AND $row.activity_subject NEQ 'NULL'}{$row.activity_subject}{else}{ts}(no subject){/ts}{/if} - {elseif ($fName eq 'activity_id') or ($fName eq 'activity_type_id') or ($fName eq 'case_id')} + {elseif ($fName eq 'activity_id') or ($fName eq 'activity_type_id') or ($fName eq 'case_id')} {else} {$row.$fName} {/if} @@ -136,7 +136,7 @@
{* END Actions/Results section *} -
+
{/if}
{/if} diff --git a/tools/scripts/demo/update-demo-all b/tools/scripts/demo/update-demo-all index 96d882448c..615e6ac472 100755 --- a/tools/scripts/demo/update-demo-all +++ b/tools/scripts/demo/update-demo-all @@ -52,7 +52,7 @@ if [ $JOOMLA_DEMO_DBNAME ]; then echo "Dropping civicrm_* tables from civicrm-joomla-demo db.." mysql $JOOMLA_DEMO_DBNAME < civicrm_drop.mysql echo "Reloading civicrm-joomla-demo with fresh civicrm_* tables.." - mysql $JOOMLA_DEMO_DBNAME < $TMP_DUMP_FILE + mysql $JOOMLA_DEMO_DBNAME < $TMP_DUMP_FILE echo "Taking civicrm-joomla-demo db dump.." mysqldump $JOOMLA_DEMO_DBNAME > $TMP_DUMP_FILE if [ -f $JOOMLA_DEMO_PRISTINE ]; then diff --git a/tools/scripts/git/pre-commit b/tools/scripts/git/pre-commit index 7dcbd6d4e6..acdc4995f0 100755 --- a/tools/scripts/git/pre-commit +++ b/tools/scripts/git/pre-commit @@ -3,7 +3,7 @@ # Note: This shell script should be designed and tested for cross-platform use # URL: https://github.com/totten/git-php-syntax-checker/ -# Author: Remigijus Jarmalavičius +# Author: Remigijus Jarmalavičius # Author: Vytautas Povilaitis # License: GPLv3 @@ -26,10 +26,10 @@ do fi done if [ "$ERRORS_BUFFER" != "" ]; then - echo + echo echo "These errors were found in try-to-commit files: " echo -e $ERRORS_BUFFER - echo + echo echo "Can't commit, fix errors first." exit 1 else diff --git a/tools/scripts/phpunit-xslt/coverage-frames.xsl b/tools/scripts/phpunit-xslt/coverage-frames.xsl index 966768eedb..3a3cacc8e6 100644 --- a/tools/scripts/phpunit-xslt/coverage-frames.xsl +++ b/tools/scripts/phpunit-xslt/coverage-frames.xsl @@ -6,19 +6,19 @@ diff --git a/tools/scripts/phpunit-xslt/log.xsl b/tools/scripts/phpunit-xslt/log.xsl index f0ef469522..1784ce1920 100644 --- a/tools/scripts/phpunit-xslt/log.xsl +++ b/tools/scripts/phpunit-xslt/log.xsl @@ -2,29 +2,29 @@ - + @@ -75,10 +75,10 @@ color:#FFFFFF; font-weight: bold } - .a td { + .a td { background: #efefef; } - .b td { + .b td { background: #fff; } th, td { @@ -124,7 +124,7 @@ - +
@@ -153,7 +153,7 @@ - Build Failed + Build Failed Build Complete diff --git a/tools/scripts/phpunit-xslt/phpunit-frames.xsl b/tools/scripts/phpunit-xslt/phpunit-frames.xsl index a3147eb910..28ead3a1c5 100644 --- a/tools/scripts/phpunit-xslt/phpunit-frames.xsl +++ b/tools/scripts/phpunit-xslt/phpunit-frames.xsl @@ -221,7 +221,7 @@ a:hover { Unit Test Results: Class <xsl:value-of select="$class.name"/> - + -{/literal} +{/literal} diff --git a/tools/templates/CRM/Auction/Form/SearchItem.tpl b/tools/templates/CRM/Auction/Form/SearchItem.tpl index e1e485ba4e..c16476e577 100644 --- a/tools/templates/CRM/Auction/Form/SearchItem.tpl +++ b/tools/templates/CRM/Auction/Form/SearchItem.tpl @@ -34,7 +34,7 @@
- {$form.buttons.html}    + {$form.buttons.html}    {$form.start_date.label} @@ -46,7 +46,7 @@  {$form.end_date.html}   {include file="CRM/common/calendar/desc.tpl" trigger=trigger_search_member_2} {include file="CRM/common/calendar/body.tpl" dateVar=end_date startDate=startYear endDate=endYear offset=5 trigger=trigger_search_member_2} - + diff --git a/tools/templates/CRM/Auction/Page/ManageItem.tpl b/tools/templates/CRM/Auction/Page/ManageItem.tpl index a8aa2953fc..69e8f06bd3 100644 --- a/tools/templates/CRM/Auction/Page/ManageItem.tpl +++ b/tools/templates/CRM/Auction/Page/ManageItem.tpl @@ -59,8 +59,8 @@ {$row.buy_now_value} {$row.min_bid_value} {$row.min_bid_increment} - {if $row.is_active eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if} - {$row.action} + {if $row.is_active eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if} + {$row.action} {/foreach} -- 2.25.1