remove newly added tabs (in favour of two spaces)
authoreileen <eileen@fuzion.co.nz>
Tue, 18 Jun 2013 01:27:25 +0000 (13:27 +1200)
committereileen <eileen@fuzion.co.nz>
Tue, 18 Jun 2013 01:27:25 +0000 (13:27 +1200)
CRM/Upgrade/Incremental/sql/4.2.3.mysql.tpl
templates/CRM/Admin/Form/ScheduleReminders.tpl
templates/CRM/Contact/Page/View/Summary.tpl
templates/CRM/Contribute/Form/Contribution.tpl
templates/CRM/Contribute/Form/SoftCredit.js
templates/CRM/Financial/Form/FinancialTypeAccount.tpl
templates/CRM/Mailing/Form/Search.tpl
templates/CRM/Mailing/Page/Browse.tpl
templates/CRM/Member/Form/Membership.tpl
tests/phpunit/api/v3/dataset/mailing_bounced.xml

index 07b11833783b267f0b69046fe0bfd208b00886fd..4721762e1b06b67889d3312613a09f447e6b8a92 100644 (file)
@@ -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
index 70bb68408b3a1bdc21ed64b4b330ab3579cb31a9..d663f1d24009b193e244ccad925e6f3ade11e6b2 100644 (file)
      </td>
     </tr>
     <tr class="crm-scheduleReminder-form-block-recipient">
-       <td id="recipientLabel" class="right">{$form.recipient.label}</td><td colspan="3">{$form.limit_to.html}&nbsp;&nbsp;{$form.recipient.html}&nbsp;&nbsp;{help id="recipient" title=$form.recipient.label}</td>
+      <td id="recipientLabel" class="right">{$form.recipient.label}</td><td colspan="3">{$form.limit_to.html}&nbsp;&nbsp;{$form.recipient.html}&nbsp;&nbsp;{help id="recipient" title=$form.recipient.label}</td>
     </tr>
     <tr id="recipientList" class="crm-scheduleReminder-form-block-recipientListing">
         <td class="right">{$form.recipient_listing.label}</td><td colspan="3">{$form.recipient_listing.html}</td>
index 8637835141a88ea1eb8034e2e6d082b3eee1cec3..aa51c41ae2096b795b16ec699ecde74a7c6fe09a 100644 (file)
 
         {* 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')}
               <li class="crm-contact-activity crm-summary-block">
                   {include file="CRM/Contact/Page/Inline/Actions.tpl"}
               </li>
-             {/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')}
               <li>
                   {assign var='editParams' value=$urlParams|cat:"&action=update&cid=$contactId"}
                   <a href="{crmURL p='civicrm/contact/add' q=$editParams}" class="edit button" title="{ts}Edit{/ts}">
                   <span><div class="icon edit-icon"></div>{ts}Edit{/ts}</span>
                   </a>
               </li>
-             {/if}
+        {/if}
           {/if}
 
           {* Check for permissions to provide Restore and Delete Permanently buttons for contacts that are in the trash. *}
index e6de065d72db75498878a0abaf63a168fb6e6041..23d313564a47606c339aba2c5b451abb70e09e02 100644 (file)
     {/if}
 
   </table>
-         <!-- start of soft credit -->
-         <div class="crm-accordion-wrapper crm-accordion_title-accordion crm-accordion-processed" id="softCredit">
-                 <div class="crm-accordion-header">
-                         {ts}Soft Credit{/ts}&nbsp;{help id="id-soft_credit"}
-                 </div>
-                 <div class="crm-accordion-body">
-                         <table class="form-layout-compressed">
-                                 {if $siteHasPCPs}
-                                         <tr class="crm-contribution-pcp-block-link">
-                                                 <td colspan="2">
-                                                         <div id="showPCP">
+    <!-- start of soft credit -->
+    <div class="crm-accordion-wrapper crm-accordion_title-accordion crm-accordion-processed" id="softCredit">
+      <div class="crm-accordion-header">
+        {ts}Soft Credit{/ts}&nbsp;{help id="id-soft_credit"}
+      </div>
+      <div class="crm-accordion-body">
+        <table class="form-layout-compressed">
+          {if $siteHasPCPs}
+            <tr class="crm-contribution-pcp-block-link">
+              <td colspan="2">
+                <div id="showPCP">
                   <a href='#'>{ts}credit this contribution to a personal campaign page{/ts}</a>
-                                                         </div>
-                                                 </td>
-                                         </tr>
-                                         <tr class="crm-contribution-pcp-block crm-contribution-form-block-pcp_made_through_id hiddenElement">
-                                                 <td class="label">{$form.pcp_made_through.label}</td>
-                                                 <td>
-                                                         {$form.pcp_made_through.html} &nbsp;
-                                                               <span class="showSoftCreditLink">
-                                                                       <a href="#" id="showSoftCredit">{ts}unlink from personal campaign page{/ts}</a>
-                                                               </span><br/>
-                                                               <span class="description">{ts}Search for the Personal Campaign Page by the fund-raiser's last name or
-                                                                email address.{/ts}</span>
-
-                                                         <div class="spacer"></div>
-                                                         <div class="crm-contribution-form-block-pcp_details">
-                                                                 <table class="crm-contribution-form-table-credit_to_pcp">
-                                                                         <tr id="pcpDisplayRollID" class="crm-contribution-form-block-pcp_display_in_roll">
-                                                                                 <td class="label">{$form.pcp_display_in_roll.label}</td>
-                                                                                 <td>{$form.pcp_display_in_roll.html}</td>
-                                                                         </tr>
-                                                                         <tr id="nickID" class="crm-contribution-form-block-pcp_roll_nickname">
-                                                                                 <td class="label">{$form.pcp_roll_nickname.label}</td>
-                                                                                 <td>{$form.pcp_roll_nickname.html|crmAddClass:big}<br/>
-                                                                                               <span class="description">{ts}Name or nickname contributor wants to be displayed in the Honor
-                                                                                       Roll. Enter "Anonymous" for anonymous contributions.{/ts}</span>
-                                                                                 </td>
-                                                                         </tr>
-                                                                         <tr id="personalNoteID" class="crm-contribution-form-block-pcp_personal_note">
-                                                                                 <td class="label" style="vertical-align: top">{$form.pcp_personal_note.label}</td>
-                                                                                 <td>
-                                                                                         {$form.pcp_personal_note.html}
-                                                                                         <span
-                                                                                                 class="description">{ts}Personal message submitted by contributor for display in the Honor Roll.{/ts}</span>
-                                                                                 </td>
-                                                                         </tr>
-                                                                 </table>
-                                                         </div>
-                                                 </td>
-                                         </tr>
-                                 {/if}
-                                 <tr class="crm-contribution-form-block-soft_credit_to">
-                                         <td colspan="2">
-                                                 {include file="CRM/Contribute/Form/SoftCredit.tpl"}
-                                         </td>
-                                 </tr>
-                         </table>
-                 </div>
-         </div>
-         <!-- end of soft credit -->
+                </div>
+              </td>
+            </tr>
+            <tr class="crm-contribution-pcp-block crm-contribution-form-block-pcp_made_through_id hiddenElement">
+              <td class="label">{$form.pcp_made_through.label}</td>
+              <td>
+                {$form.pcp_made_through.html} &nbsp;
+                <span class="showSoftCreditLink">
+                  <a href="#" id="showSoftCredit">{ts}unlink from personal campaign page{/ts}</a>
+                </span><br/>
+                <span class="description">{ts}Search for the Personal Campaign Page by the fund-raiser's last name or
+                 email address.{/ts}</span>
+
+                <div class="spacer"></div>
+                <div class="crm-contribution-form-block-pcp_details">
+                  <table class="crm-contribution-form-table-credit_to_pcp">
+                    <tr id="pcpDisplayRollID" class="crm-contribution-form-block-pcp_display_in_roll">
+                      <td class="label">{$form.pcp_display_in_roll.label}</td>
+                      <td>{$form.pcp_display_in_roll.html}</td>
+                    </tr>
+                    <tr id="nickID" class="crm-contribution-form-block-pcp_roll_nickname">
+                      <td class="label">{$form.pcp_roll_nickname.label}</td>
+                      <td>{$form.pcp_roll_nickname.html|crmAddClass:big}<br/>
+                        <span class="description">{ts}Name or nickname contributor wants to be displayed in the Honor
+                      Roll. Enter "Anonymous" for anonymous contributions.{/ts}</span>
+                      </td>
+                    </tr>
+                    <tr id="personalNoteID" class="crm-contribution-form-block-pcp_personal_note">
+                      <td class="label" style="vertical-align: top">{$form.pcp_personal_note.label}</td>
+                      <td>
+                        {$form.pcp_personal_note.html}
+                        <span
+                          class="description">{ts}Personal message submitted by contributor for display in the Honor Roll.{/ts}</span>
+                      </td>
+                    </tr>
+                  </table>
+                </div>
+              </td>
+            </tr>
+          {/if}
+          <tr class="crm-contribution-form-block-soft_credit_to">
+            <td colspan="2">
+              {include file="CRM/Contribute/Form/SoftCredit.tpl"}
+            </td>
+          </tr>
+        </table>
+      </div>
+    </div>
+    <!-- end of soft credit -->
     {if !$contributionMode}
     <div class="crm-accordion-wrapper crm-accordion_title-accordion crm-accordion-processed" id="paymentDetails_Information">
       <div class="crm-accordion-header">
       CRM.buildCustomData( '{$customDataType}', {$customDataSubType} );
     {/if}
 
-         {if $buildPriceSet}{literal}buildAmount( );{/literal}{/if}
+    {if $buildPriceSet}{literal}buildAmount( );{/literal}{/if}
     {literal}
     });
 
       }
     }
   }
-  
+
   function status() {
     cj("#cancel_date").val('');
     cj("#cancel_reason").val('');
 
     {/literal}{if !$contributionMode}{literal}
      cj( function( ) {
-      showHideCancelInfo(cj('#contribution_status_id'));       
-      
+      showHideCancelInfo(cj('#contribution_status_id'));
+
       cj('#contribution_status_id').change(function() {
        showHideCancelInfo(this);
       }
          cj('#cancelInfo').show( );
        }
        else {
-                status();          
+          status();
          cj('#cancelInfo').hide( );
        }
      }
 
     {/literal}{/if}{literal}
-    </script>  
+    </script>
     {/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);
index 42225066bee382a5a6ac57d0a4cd6d0c59a77ebe..9be83558a070b180cabab0c7e2f349a6e6113d85 100644 (file)
@@ -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(''); 
       }
     }
index 280f3d21810675e884e4bc6c688c25ef45239a4d..2047d2d92b76e72e3ed4beeda490dbf815e126c2 100644 (file)
 <div class="crm-block crm-form-block crm-financial_type-form-block">
   {if $action eq 8}
     <div class="messages status">
-      <div class="icon inform-icon"></div>    
+      <div class="icon inform-icon"></div>
       {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}
       </div>
   {else}
     <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
+
     <table class="form-layout">
-     
-      <tr class="crm-contribution-form-block-account_relationship">     
-       <td class="label">{$form.account_relationship.label}</td>
-       <td class="html-adjust">{$form.account_relationship.html}</td>
+
+      <tr class="crm-contribution-form-block-account_relationship">
+      <td class="label">{$form.account_relationship.label}</td>
+  <td class="html-adjust">{$form.account_relationship.html}</td>
       </tr>
-      <tr class="crm-contribution-form-block-financial_account_id">     
-       <td class="label">{$form.financial_account_id.label}</td>
-       <td class="html-adjust">{$form.financial_account_id.html}</td>
+      <tr class="crm-contribution-form-block-financial_account_id">
+      <td class="label">{$form.financial_account_id.label}</td>
+  <td class="html-adjust">{$form.financial_account_id.html}</td>
       </tr>
-    
+
     </table>
    {/if}
    <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="botttom"}</div>
@@ -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}
index 3b6d381e2663303bd04ab748dee219c16a3b1d2e..9fc51401d951207191d072f536708677ab16e4ec 100644 (file)
@@ -32,7 +32,7 @@
     </tr>
     <tr>
         <td>
-           <label>{if $sms eq 1}{ts}SMS Date{/ts}{else}{ts}Mailing Date{/ts}{/if}</label>
+      <label>{if $sms eq 1}{ts}SMS Date{/ts}{else}{ts}Mailing Date{/ts}{/if}</label>
   </td>
     </tr>
     <tr>
index f0fd7ca870a1d87ff0b0c19bde4162b857a5085a..4eeb0fddf0a48ad521e00b5cd923fb7cfaab742d 100644 (file)
@@ -37,7 +37,7 @@
 
 {if $showLinks}
     <div class="action-link">
-       <a accesskey="N" href="{crmURL p=$newMassUrl q='reset=1'}" class="button"><span><div class="icon email-icon"></div>{ts}{$linkTitle}{/ts}</span></a><br/><br/>
+      <a accesskey="N" href="{crmURL p=$newMassUrl q='reset=1'}" class="button"><span><div class="icon email-icon"></div>{ts}{$linkTitle}{/ts}</span></a><br/><br/>
     </div>
 {/if}
 {include file="CRM/Mailing/Form/Search.tpl"}
     <div class="status messages">
         <table class="form-layout">
             <tr><div class="icon inform-icon"></div>
-               {ts 1=$componentName}No %1 match your search criteria. Suggestions:{/ts} 
+               {ts 1=$componentName}No %1 match your search criteria. Suggestions:{/ts}
       </tr>
                 <div class="spacer"></div>
                 <ul>
             {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 <a href='%1'>create and send one</a>{/ts}{/if}{if $archiveLinks}{ts 1=$archiveURL 2=$componentName} OR you can search the <a href='%1'>Archived %2</a>{/ts}{/if}.          
+      {if $showLinks}{ts 1=$crmURL}You can <a href='%1'>create and send one</a>{/ts}{/if}{if $archiveLinks}{ts 1=$archiveURL 2=$componentName} OR you can search the <a href='%1'>Archived %2</a>{/ts}{/if}.
    </div>
 {/if}
index b2c1989a58b970db1b972a97c58695e977c36273..45947d6ef5317a5fad864729e27e2eaf4727df7c 100644 (file)
             }
           }
         );
-       }
-       else {
+  }
+  else {
         cj("#email-receipt").hide( );
         cj("#notice").hide( );
       }
 
     function buildAmount( priceSetId ) {
   if ( !priceSetId ) {
-         priceSetId = cj("#price_set_id").val( );
+    priceSetId = cj("#price_set_id").val( );
   }
         var fname = '#priceset';
         if ( !priceSetId ) {
index a4e6ab24d27c8248c2d86d52e88afa97c673a52e..86f67b6cdeb3dc50f013b04741603945c4f40583 100644 (file)
 <!--  $Id: mailing_delivered.xml 30511 2013-04-30 11:36:36Z shot $  -->
 <dataset>  
   <table name="civicrm_mailing">
-       <column>id</column>
-       <column>domain_id</column>
-       <column>header_id</column>
-       <column>footer_id</column>
-       <column>reply_id</column>
-       <column>unsubscribe_id</column>
-       <column>resubscribe_id</column>
-       <column>optout_id</column>
-       <column>name</column>
-       <column>from_name</column>
-       <column>from_email</column>
-       <column>replyto_email</column>
-       <column>subject</column>
-       <column>body_text</column>
-       <column>body_html</column>
-       <column>url_tracking</column>
-       <column>forward_replies</column>
-       <column>auto_responder</column>
-       <column>open_tracking</column>
-       <column>is_completed</column>
-       <column>msg_template_id</column>
-       <column>override_verp</column>
-       <column>created_id</column>
-       <column>created_date</column>
-       <column>scheduled_id</column>
-       <column>scheduled_date</column>
-       <column>approver_id</column>
-       <column>approval_date</column>
-       <column>approval_status_id</column>
-       <column>approval_note</column>
-       <column>is_archived</column>
-       <column>visibility</column>
-       <column>campaign_id</column>
-       <column>dedupe_email</column>
-       <column>sms_provider_id</column>
-       <row>
-               <value>2</value> <!--  id  -->
-               <value>1</value> <!--  domain_id -->
-               <value>1</value> <!--  header_id -->
-               <value>2</value> <!--  footer_id -->
-               <null /> <!--  reply_id  -->
-               <null /> <!--  unsubscribe_id  -->
-               <null /> <!--  resubscribe_id  -->
-               <null /> <!--  optout_id  -->
-               <value>Test Mailing</value> <!--  name  -->
-               <null /> <!--  from_name  -->
-               <null /> <!--  from_email  -->
-               <value>somereply@testing.org</value> <!--  replyto_email  -->
-               <value>Some Subject</value> <!--  subject            -->
-               <value>Just a body... nothing to see here.</value> <!--  body_text          -->
-               <value><html>Just some html...</html></value> <!--  body_html          -->
-               <null /> <!--  url_tracking       -->
-               <null /> <!--  forward_replies    -->
-               <null /> <!--  auto_responder     -->
-               <value>0</value> <!--  open_tracking      -->
-               <value>1</value> <!--  is_completed       -->
-               <null /> <!--  msg_template_id    -->
-               <null /> <!--  override_verp      -->
-               <value>1</value> <!--  created_id         -->
-               <null /> <!--  created_date       -->
-               <null /> <!--  scheduled_id       -->
-               <null /> <!--  scheduled_date     -->
-               <null /> <!--  approver_id        -->
-               <null /> <!--  approval_date      -->
-               <null /> <!--  approval_status_id -->
-               <null /> <!--  approval_note      -->
-               <value>0</value> <!--  is_archived        -->
-               <value>User and User Admin Only</value> <!--  visibility         -->
-               <null /> <!--  campaign_id        -->
-               <value>0</value> <!--  dedupe_email       -->
-               <null /> <!--  sms_provider_id    -->
-       </row>
+  <column>id</column>
+  <column>domain_id</column>
+  <column>header_id</column>
+  <column>footer_id</column>
+  <column>reply_id</column>
+  <column>unsubscribe_id</column>
+  <column>resubscribe_id</column>
+  <column>optout_id</column>
+  <column>name</column>
+  <column>from_name</column>
+  <column>from_email</column>
+  <column>replyto_email</column>
+  <column>subject</column>
+  <column>body_text</column>
+  <column>body_html</column>
+  <column>url_tracking</column>
+  <column>forward_replies</column>
+  <column>auto_responder</column>
+  <column>open_tracking</column>
+  <column>is_completed</column>
+  <column>msg_template_id</column>
+  <column>override_verp</column>
+  <column>created_id</column>
+  <column>created_date</column>
+  <column>scheduled_id</column>
+  <column>scheduled_date</column>
+  <column>approver_id</column>
+  <column>approval_date</column>
+  <column>approval_status_id</column>
+  <column>approval_note</column>
+  <column>is_archived</column>
+  <column>visibility</column>
+  <column>campaign_id</column>
+  <column>dedupe_email</column>
+  <column>sms_provider_id</column>
+  <row>
+    <value>2</value> <!--  id  -->
+    <value>1</value> <!--  domain_id -->
+    <value>1</value> <!--  header_id -->
+    <value>2</value> <!--  footer_id -->
+    <null /> <!--  reply_id  -->
+    <null /> <!--  unsubscribe_id  -->
+    <null /> <!--  resubscribe_id  -->
+    <null /> <!--  optout_id  -->
+    <value>Test Mailing</value> <!--  name  -->
+    <null /> <!--  from_name  -->
+    <null /> <!--  from_email  -->
+    <value>somereply@testing.org</value> <!--  replyto_email  -->
+    <value>Some Subject</value> <!--  subject            -->
+    <value>Just a body... nothing to see here.</value> <!--  body_text          -->
+    <value><html>Just some html...</html></value> <!--  body_html          -->
+    <null /> <!--  url_tracking       -->
+    <null /> <!--  forward_replies    -->
+    <null /> <!--  auto_responder     -->
+    <value>0</value> <!--  open_tracking      -->
+    <value>1</value> <!--  is_completed       -->
+    <null /> <!--  msg_template_id    -->
+    <null /> <!--  override_verp      -->
+    <value>1</value> <!--  created_id         -->
+    <null /> <!--  created_date       -->
+    <null /> <!--  scheduled_id       -->
+    <null /> <!--  scheduled_date     -->
+    <null /> <!--  approver_id        -->
+    <null /> <!--  approval_date      -->
+    <null /> <!--  approval_status_id -->
+    <null /> <!--  approval_note      -->
+    <value>0</value> <!--  is_archived        -->
+    <value>User and User Admin Only</value> <!--  visibility         -->
+    <null /> <!--  campaign_id        -->
+    <value>0</value> <!--  dedupe_email       -->
+    <null /> <!--  sms_provider_id    -->
+  </row>
   </table>
   <table name="civicrm_mailing_job">
-       <column>id</column>
-       <column>mailing_id</column>
-       <column>scheduled_date</column>
-       <column>start_date</column>
-       <column>end_date</column>
-       <column>status</column>
-       <column>is_test</column>
-       <column>job_type</column>
-       <column>parent_id</column>
-       <column>job_offset</column>
-       <column>job_limit</column>
-       <row>
-               <value>2</value>
-               <value>2</value>
-               <null />
-               <null />
-               <null />
-               <value>complete</value>
-               <value>0</value>
-               <null />
-               <null />
-               <value>0</value>
-               <value>0</value>
-       </row>
+  <column>id</column>
+  <column>mailing_id</column>
+  <column>scheduled_date</column>
+  <column>start_date</column>
+  <column>end_date</column>
+  <column>status</column>
+  <column>is_test</column>
+  <column>job_type</column>
+  <column>parent_id</column>
+  <column>job_offset</column>
+  <column>job_limit</column>
+  <row>
+    <value>2</value>
+    <value>2</value>
+    <null />
+    <null />
+    <null />
+    <value>complete</value>
+    <value>0</value>
+    <null />
+    <null />
+    <value>0</value>
+    <value>0</value>
+  </row>
   </table>
   <table name="civicrm_mailing_event_queue">
   <column>id</column>
   <column>hash</column>
   <column>phone_id</column>
   <row>
-       <value>2</value>
-       <value>2</value>
-       <value>1</value>
-       <value>23</value>
-       <value>80569af03942f016</value>
-       <null />
+  <value>2</value>
+  <value>2</value>
+  <value>1</value>
+  <value>23</value>
+  <value>80569af03942f016</value>
+  <null />
   </row>
   </table>
   <table name="civicrm_mailing_event_bounce">
-       <column>id</column>
-       <column>event_queue_id</column>
-       <column>bounce_type_id</column>
-       <column>bounce_reason</column>
-       <column>time_stamp</column>
-       <row>
-               <value>1</value>
-               <value>2</value>
-               <value>6</value>
-               <null />
-               <value>2013-04-30 18:11:26</value>
-       </row>
+  <column>id</column>
+  <column>event_queue_id</column>
+  <column>bounce_type_id</column>
+  <column>bounce_reason</column>
+  <column>time_stamp</column>
+  <row>
+    <value>1</value>
+    <value>2</value>
+    <value>6</value>
+    <null />
+    <value>2013-04-30 18:11:26</value>
+  </row>
   </table>
 </dataset>