From 96cfe0d7002baed1344886d3f44cfdae0d36d51d Mon Sep 17 00:00:00 2001 From: eileen Date: Tue, 18 Jun 2013 13:27:25 +1200 Subject: [PATCH] remove newly added tabs (in favour of two spaces) --- CRM/Upgrade/Incremental/sql/4.2.3.mysql.tpl | 8 +- .../CRM/Admin/Form/ScheduleReminders.tpl | 2 +- templates/CRM/Contact/Page/View/Summary.tpl | 8 +- .../CRM/Contribute/Form/Contribution.tpl | 134 +++++----- templates/CRM/Contribute/Form/SoftCredit.js | 4 +- .../Financial/Form/FinancialTypeAccount.tpl | 106 ++++---- templates/CRM/Mailing/Form/Search.tpl | 2 +- templates/CRM/Mailing/Page/Browse.tpl | 6 +- templates/CRM/Member/Form/Membership.tpl | 6 +- .../api/v3/dataset/mailing_bounced.xml | 228 +++++++++--------- 10 files changed, 252 insertions(+), 252 deletions(-) diff --git a/CRM/Upgrade/Incremental/sql/4.2.3.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.2.3.mysql.tpl index 07b1183378..4721762e1b 100644 --- a/CRM/Upgrade/Incremental/sql/4.2.3.mysql.tpl +++ b/CRM/Upgrade/Incremental/sql/4.2.3.mysql.tpl @@ -14,12 +14,12 @@ VALUES SELECT @optionID := max(id) FROM civicrm_option_value WHERE name = 'BULK SMS'; {if $multilingual} {foreach from=$locales item=locale} - UPDATE `civicrm_option_value` SET label_{$locale} = '{ts escape="sql"}Mass SMS{/ts}',name = 'Mass SMS',description_{$locale} = '{ts escape="sql"}Mass SMS{/ts}' WHERE id = @optionID; - ALTER TABLE `civicrm_price_field_value` CHANGE name name VARCHAR(255) NULL DEFAULT NULL, CHANGE label_{$locale} label_{$locale} VARCHAR(255) NULL DEFAULT NULL; + UPDATE `civicrm_option_value` SET label_{$locale} = '{ts escape="sql"}Mass SMS{/ts}',name = 'Mass SMS',description_{$locale} = '{ts escape="sql"}Mass SMS{/ts}' WHERE id = @optionID; + ALTER TABLE `civicrm_price_field_value` CHANGE name name VARCHAR(255) NULL DEFAULT NULL, CHANGE label_{$locale} label_{$locale} VARCHAR(255) NULL DEFAULT NULL; {/foreach} {else} - UPDATE `civicrm_option_value` SET label = '{ts escape="sql"}Mass SMS{/ts}',name = 'Mass SMS',description = '{ts escape="sql"}Mass SMS{/ts}' WHERE name = 'BULK SMS'; - ALTER TABLE `civicrm_price_field_value` CHANGE `name` `name` VARCHAR(255) NULL DEFAULT NULL, CHANGE `label` `label` VARCHAR(255) NULL DEFAULT NULL; + UPDATE `civicrm_option_value` SET label = '{ts escape="sql"}Mass SMS{/ts}',name = 'Mass SMS',description = '{ts escape="sql"}Mass SMS{/ts}' WHERE name = 'BULK SMS'; + ALTER TABLE `civicrm_price_field_value` CHANGE `name` `name` VARCHAR(255) NULL DEFAULT NULL, CHANGE `label` `label` VARCHAR(255) NULL DEFAULT NULL; {/if} -- CRM-11014 diff --git a/templates/CRM/Admin/Form/ScheduleReminders.tpl b/templates/CRM/Admin/Form/ScheduleReminders.tpl index 70bb68408b..d663f1d240 100644 --- a/templates/CRM/Admin/Form/ScheduleReminders.tpl +++ b/templates/CRM/Admin/Form/ScheduleReminders.tpl @@ -108,7 +108,7 @@ - {$form.recipient.label}{$form.limit_to.html}  {$form.recipient.html}  {help id="recipient" title=$form.recipient.label} + {$form.recipient.label}{$form.limit_to.html}  {$form.recipient.html}  {help id="recipient" title=$form.recipient.label} {$form.recipient_listing.label}{$form.recipient_listing.html} diff --git a/templates/CRM/Contact/Page/View/Summary.tpl b/templates/CRM/Contact/Page/View/Summary.tpl index 8637835141..aa51c41ae2 100644 --- a/templates/CRM/Contact/Page/View/Summary.tpl +++ b/templates/CRM/Contact/Page/View/Summary.tpl @@ -51,19 +51,19 @@ {* Include the Actions and Edit buttons if user has 'edit' permission and contact is NOT in trash. *} {if $permission EQ 'edit' and !$isDeleted} - {if call_user_func(array('CRM_Core_Permission','check'), 'access CiviCRM')} + {if call_user_func(array('CRM_Core_Permission','check'), 'access CiviCRM')}
  • {include file="CRM/Contact/Page/Inline/Actions.tpl"}
    • - {/if} - {if call_user_func(array('CRM_Core_Permission','check'), 'edit my contact')} + {/if} + {if call_user_func(array('CRM_Core_Permission','check'), 'edit my contact')}
  • {assign var='editParams' value=$urlParams|cat:"&action=update&cid=$contactId"}
    {ts}Edit{/ts}
    • - {/if} + {/if} {/if} {* Check for permissions to provide Restore and Delete Permanently buttons for contacts that are in the trash. *} diff --git a/templates/CRM/Contribute/Form/Contribution.tpl b/templates/CRM/Contribute/Form/Contribution.tpl index e6de065d72..23d313564a 100644 --- a/templates/CRM/Contribute/Form/Contribution.tpl +++ b/templates/CRM/Contribute/Form/Contribution.tpl @@ -221,67 +221,67 @@ {/if} - -
    -
    - {ts}Soft Credit{/ts} {help id="id-soft_credit"} -
    -
    - - {if $siteHasPCPs} - - + + + + + + {/if} + + + +
    -
    + +
    +
    + {ts}Soft Credit{/ts} {help id="id-soft_credit"} +
    +
    + + {if $siteHasPCPs} + + - - - - - - {/if} - - - -
    + -
    {$form.pcp_made_through.label} - {$form.pcp_made_through.html}   - - {ts}unlink from personal campaign page{/ts} -
    - {ts}Search for the Personal Campaign Page by the fund-raiser's last name or - email address.{/ts} - -
    -
    - - - - - - - - - - - - - -
    {$form.pcp_display_in_roll.label}{$form.pcp_display_in_roll.html}
    {$form.pcp_roll_nickname.label}{$form.pcp_roll_nickname.html|crmAddClass:big}
    - {ts}Name or nickname contributor wants to be displayed in the Honor - Roll. Enter "Anonymous" for anonymous contributions.{/ts} -
    {$form.pcp_personal_note.label} - {$form.pcp_personal_note.html} - {ts}Personal message submitted by contributor for display in the Honor Roll.{/ts} -
    -
    -
    - {include file="CRM/Contribute/Form/SoftCredit.tpl"} -
    -
    -
    - +
    +
    {$form.pcp_made_through.label} + {$form.pcp_made_through.html}   + + {ts}unlink from personal campaign page{/ts} +
    + {ts}Search for the Personal Campaign Page by the fund-raiser's last name or + email address.{/ts} + +
    +
    + + + + + + + + + + + + + +
    {$form.pcp_display_in_roll.label}{$form.pcp_display_in_roll.html}
    {$form.pcp_roll_nickname.label}{$form.pcp_roll_nickname.html|crmAddClass:big}
    + {ts}Name or nickname contributor wants to be displayed in the Honor + Roll. Enter "Anonymous" for anonymous contributions.{/ts} +
    {$form.pcp_personal_note.label} + {$form.pcp_personal_note.html} + {ts}Personal message submitted by contributor for display in the Honor Roll.{/ts} +
    +
    +
    + {include file="CRM/Contribute/Form/SoftCredit.tpl"} +
    +
    +
    + {if !$contributionMode}
    @@ -354,7 +354,7 @@ CRM.buildCustomData( '{$customDataType}', {$customDataSubType} ); {/if} - {if $buildPriceSet}{literal}buildAmount( );{/literal}{/if} + {if $buildPriceSet}{literal}buildAmount( );{/literal}{/if} {literal} }); @@ -465,7 +465,7 @@ } } } - + function status() { cj("#cancel_date").val(''); cj("#cancel_reason").val(''); @@ -497,8 +497,8 @@ {/literal}{if !$contributionMode}{literal} cj( function( ) { - showHideCancelInfo(cj('#contribution_status_id')); - + showHideCancelInfo(cj('#contribution_status_id')); + cj('#contribution_status_id').change(function() { showHideCancelInfo(this); } @@ -511,13 +511,13 @@ cj('#cancelInfo').show( ); } else { - status(); + status(); cj('#cancelInfo').hide( ); } } {/literal}{/if}{literal} - + {/literal} {if !$contributionMode} {include file="CRM/common/showHideByFieldValue.tpl" @@ -618,7 +618,7 @@ function showStartDate( ) { {/literal}{/if}{literal} cj('#fee_amount').change( function() { var totalAmount = cj('#total_amount').val(); - var feeAmount = cj('#fee_amount').val(); + var feeAmount = cj('#fee_amount').val(); var netAmount = totalAmount.replace(/,/g, '') - feeAmount.replace(/,/g, ''); if (!cj('#net_amount').val()) { cj('#net_amount').val(netAmount); diff --git a/templates/CRM/Contribute/Form/SoftCredit.js b/templates/CRM/Contribute/Form/SoftCredit.js index 42225066be..9be83558a0 100644 --- a/templates/CRM/Contribute/Form/SoftCredit.js +++ b/templates/CRM/Contribute/Form/SoftCredit.js @@ -67,8 +67,8 @@ cj(function($) { if (rowNum > 1) { var scAmount = Number($('#soft_credit_amount_'+ (rowNum - 1)).val().replace(thousandMarker,'')); if (scAmount < totalAmount) { - //if user enters less than the total amount and adds another soft credit row, - //the soft credit amount default will be left empty + //if user enters less than the total amount and adds another soft credit row, + //the soft credit amount default will be left empty $('#soft_credit_amount_'+ rowNum).val(''); } } diff --git a/templates/CRM/Financial/Form/FinancialTypeAccount.tpl b/templates/CRM/Financial/Form/FinancialTypeAccount.tpl index 280f3d2181..2047d2d92b 100644 --- a/templates/CRM/Financial/Form/FinancialTypeAccount.tpl +++ b/templates/CRM/Financial/Form/FinancialTypeAccount.tpl @@ -28,23 +28,23 @@
    {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.{/ts} {ts}Do you want to continue?{/ts}
    {else}
    {include file="CRM/common/formButtons.tpl" location="top"}
    - + - - - - + + + + - - - + + + - +
    {/if}
    {include file="CRM/common/formButtons.tpl" location="botttom"}
    @@ -66,19 +66,19 @@ cj("#financial_account_id").change(function() { url: callbackURL, context: document.body, success: function(data, textStatus) { - cj(relationID).html("");//clear old options - data = eval(data);//get json array + cj(relationID).html("");//clear old options + data = eval(data);//get json array if (data != null) { - for (i = 0; i < data.length; i++) { - if (data[i].selected == 'Selected') { - var idf = data[i].value; + for (i = 0; i < data.length; i++) { + if (data[i].selected == 'Selected') { + var idf = data[i].value; } - cj(relationID).get(0).add(new Option(data[i].name, data[i].value), document.all ? i : null); - } + cj(relationID).get(0).add(new Option(data[i].name, data[i].value), document.all ? i : null); + } + } + if (idf != null) { + cj(relationID).val(idf); } - if (idf != null) { - cj(relationID).val(idf); - } } }); if (financialId == 'select') { @@ -90,20 +90,20 @@ cj("#financial_account_id").change(function() { url: callbackURLs, context: document.body, success: function(data, textStatus) { - cj(financialAccountID).html("");//clear old options - data = eval(data);//get json array + cj(financialAccountID).html("");//clear old options + data = eval(data);//get json array if (data != null) { - for (i = 0; i < data.length; i++) { - cj(financialAccountID).get(0).add(new Option(data[i].name, data[i].value), document.all ? i : null); - } - } - } + for (i = 0; i < data.length; i++) { + cj(financialAccountID).get(0).add(new Option(data[i].name, data[i].value), document.all ? i : null); + } + } + } }); } } }); {/literal} -{literal} +{literal} cj("#account_relationship").change(function() { {/literal} relationID = "#account_relationship" @@ -118,46 +118,46 @@ cj("#account_relationship").change(function() { url: callbackURLs, context: document.body, success: function(data, textStatus) { - cj(financialAccountID).html("");//clear old options - data = eval(data);//get json array + cj(financialAccountID).html("");//clear old options + data = eval(data);//get json array if (data != null) { - for (i = 0; i < data.length; i++) { - if (data[i].selected == 'Selected') { - var idf = data[i].value; + for (i = 0; i < data.length; i++) { + if (data[i].selected == 'Selected') { + var idf = data[i].value; } - cj(financialAccountID).get(0).add(new Option(data[i].name, data[i].value), document.all ? i : null); - } - } - if (idf != null) { - cj(financialAccountID).val(idf); + cj(financialAccountID).get(0).add(new Option(data[i].name, data[i].value), document.all ? i : null); + } + } + if (idf != null) { + cj(financialAccountID).val(idf); } - } + } }); if (financialId == 'select') { {/literal} - callbackURL = "{crmURL p='civicrm/ajax/rest' h=0 q='className=CRM_Financial_Page_AJAX&fnName=jqFinancialRelation'}" -{literal} + callbackURL = "{crmURL p='civicrm/ajax/rest' h=0 q='className=CRM_Financial_Page_AJAX&fnName=jqFinancialRelation'}" +{literal} callbackURL = callbackURL+"&_value=select"; cj.ajax({ url: callbackURL, context: document.body, success: function(data, textStatus) { - cj(relationID).html("");//clear old options - data = eval(data);//get json array + cj(relationID).html("");//clear old options + data = eval(data);//get json array if (data != null) { - for (i = 0; i < data.length; i++) { - if (data[i].selected == 'Selected') { - var idf = data[i].value; + for (i = 0; i < data.length; i++) { + if (data[i].selected == 'Selected') { + var idf = data[i].value; } - cj(relationID).get(0).add(new Option(data[i].name, data[i].value), document.all ? i : null); - } - } - if (idf != null) { - cj(relationID).val(idf); + cj(relationID).get(0).add(new Option(data[i].name, data[i].value), document.all ? i : null); + } + } + if (idf != null) { + cj(relationID).val(idf); } } - }); - } + }); + } } }); {/literal} diff --git a/templates/CRM/Mailing/Form/Search.tpl b/templates/CRM/Mailing/Form/Search.tpl index 3b6d381e26..9fc51401d9 100644 --- a/templates/CRM/Mailing/Form/Search.tpl +++ b/templates/CRM/Mailing/Form/Search.tpl @@ -32,7 +32,7 @@ - + diff --git a/templates/CRM/Mailing/Page/Browse.tpl b/templates/CRM/Mailing/Page/Browse.tpl index f0fd7ca870..4eeb0fddf0 100644 --- a/templates/CRM/Mailing/Page/Browse.tpl +++ b/templates/CRM/Mailing/Page/Browse.tpl @@ -37,7 +37,7 @@ {if $showLinks}
    - {ts}{$linkTitle}{/ts}

    + {ts}{$linkTitle}{/ts}

    {/if} {include file="CRM/Mailing/Form/Search.tpl"} @@ -119,7 +119,7 @@
    - {ts 1=$componentName}No %1 match your search criteria. Suggestions:{/ts} + {ts 1=$componentName}No %1 match your search criteria. Suggestions:{/ts}
      @@ -150,6 +150,6 @@ {capture assign=crmURL}{crmURL p=$newMassUrl q='reset=1'}{/capture} {capture assign=archiveURL}{crmURL p='civicrm/mailing/browse/archived' q='reset=1'}{$qVal}{/capture} {ts 1=$componentName}There are no Scheduled or Sent %1.{/ts} - {if $showLinks}{ts 1=$crmURL}You can create and send one{/ts}{/if}{if $archiveLinks}{ts 1=$archiveURL 2=$componentName} OR you can search the Archived %2{/ts}{/if}. + {if $showLinks}{ts 1=$crmURL}You can create and send one{/ts}{/if}{if $archiveLinks}{ts 1=$archiveURL 2=$componentName} OR you can search the Archived %2{/ts}{/if}. {/if} diff --git a/templates/CRM/Member/Form/Membership.tpl b/templates/CRM/Member/Form/Membership.tpl index b2c1989a58..45947d6ef5 100644 --- a/templates/CRM/Member/Form/Membership.tpl +++ b/templates/CRM/Member/Form/Membership.tpl @@ -485,8 +485,8 @@ } } ); - } - else { + } + else { cj("#email-receipt").hide( ); cj("#notice").hide( ); } @@ -617,7 +617,7 @@ function buildAmount( priceSetId ) { if ( !priceSetId ) { - priceSetId = cj("#price_set_id").val( ); + priceSetId = cj("#price_set_id").val( ); } var fname = '#priceset'; if ( !priceSetId ) { diff --git a/tests/phpunit/api/v3/dataset/mailing_bounced.xml b/tests/phpunit/api/v3/dataset/mailing_bounced.xml index a4e6ab24d2..86f67b6cde 100644 --- a/tests/phpunit/api/v3/dataset/mailing_bounced.xml +++ b/tests/phpunit/api/v3/dataset/mailing_bounced.xml @@ -2,104 +2,104 @@
    - id - domain_id - header_id - footer_id - reply_id - unsubscribe_id - resubscribe_id - optout_id - name - from_name - from_email - replyto_email - subject - body_text - body_html - url_tracking - forward_replies - auto_responder - open_tracking - is_completed - msg_template_id - override_verp - created_id - created_date - scheduled_id - scheduled_date - approver_id - approval_date - approval_status_id - approval_note - is_archived - visibility - campaign_id - dedupe_email - sms_provider_id - - 2 - 1 - 1 - 2 - - - - - Test Mailing - - - somereply@testing.org - Some Subject - Just a body... nothing to see here. - Just some html... - - - - 0 - 1 - - - 1 - - - - - - - - 0 - User and User Admin Only - - 0 - - + id + domain_id + header_id + footer_id + reply_id + unsubscribe_id + resubscribe_id + optout_id + name + from_name + from_email + replyto_email + subject + body_text + body_html + url_tracking + forward_replies + auto_responder + open_tracking + is_completed + msg_template_id + override_verp + created_id + created_date + scheduled_id + scheduled_date + approver_id + approval_date + approval_status_id + approval_note + is_archived + visibility + campaign_id + dedupe_email + sms_provider_id + + 2 + 1 + 1 + 2 + + + + + Test Mailing + + + somereply@testing.org + Some Subject + Just a body... nothing to see here. + Just some html... + + + + 0 + 1 + + + 1 + + + + + + + + 0 + User and User Admin Only + + 0 + +
    - id - mailing_id - scheduled_date - start_date - end_date - status - is_test - job_type - parent_id - job_offset - job_limit - - 2 - 2 - - - - complete - 0 - - - 0 - 0 - + id + mailing_id + scheduled_date + start_date + end_date + status + is_test + job_type + parent_id + job_offset + job_limit + + 2 + 2 + + + + complete + 0 + + + 0 + 0 +
    id @@ -109,26 +109,26 @@ hashphone_id - 2 - 2 - 1 - 23 - 80569af03942f016 - + 2 + 2 + 1 + 23 + 80569af03942f016 +
    - id - event_queue_id - bounce_type_id - bounce_reason - time_stamp - - 1 - 2 - 6 - - 2013-04-30 18:11:26 - + id + event_queue_id + bounce_type_id + bounce_reason + time_stamp + + 1 + 2 + 6 + + 2013-04-30 18:11:26 +
    -- 2.25.1