more whitespace cleanup
authorEileen McNaughton <eileen@fuzion.co.nz>
Wed, 29 Oct 2014 04:11:04 +0000 (17:11 +1300)
committerEileen McNaughton <eileen@fuzion.co.nz>
Wed, 29 Oct 2014 04:11:04 +0000 (17:11 +1300)
111 files changed:
js/jquery/jquery.dashboard.js
templates/CRM/Case/Form/ActivityToCase.tpl
templates/CRM/Case/Page/ConfigureError.tpl
templates/CRM/Contact/Form/DedupeFind.tpl
templates/CRM/Contact/Form/Edit/Address/county.tpl
templates/CRM/Contact/Form/Edit/IM.tpl
templates/CRM/Contact/Form/Edit/Individual.tpl
templates/CRM/Contact/Form/Edit/Notes.tpl
templates/CRM/Contact/Form/Inline/Address.tpl
templates/CRM/Contact/Form/Inline/CommunicationPreferences.tpl
templates/CRM/Contact/Form/Inline/ContactInfo.tpl
templates/CRM/Contact/Form/Inline/ContactName.tpl
templates/CRM/Contact/Form/Inline/Website.tpl
templates/CRM/Contact/Form/Search/Advanced.tpl
templates/CRM/Contact/Form/Search/Builder.js
templates/CRM/Contact/Form/Search/Criteria/Task.tpl
templates/CRM/Contact/Form/Search/Intro.tpl
templates/CRM/Contact/Form/Task/AlterPreferences.tpl
templates/CRM/Contact/Form/Task/EmailCommon.js
templates/CRM/Contact/Form/Task/Label.tpl
templates/CRM/Contact/Form/Task/Map.tpl
templates/CRM/Contact/Form/Task/Map/OpenStreetMaps.tpl
templates/CRM/Contact/Form/Task/PickProfile.tpl
templates/CRM/Contact/Form/Task/RemoveFromGroup.tpl
templates/CRM/Contact/Import/Form/Mapper.tpl
templates/CRM/Contact/Import/Form/Summary.tpl
templates/CRM/Contact/Page/Inline/Address.tpl
templates/CRM/Contact/Page/Inline/ContactInfo.tpl
templates/CRM/Contact/Page/Inline/Email.tpl
templates/CRM/Contact/Page/View/RelationshipSelector.tpl
templates/CRM/Contact/Page/View/Useradd.tpl
templates/CRM/Contribute/Form/AdditionalPayment.tpl
templates/CRM/Contribute/Form/ContributionPage/Amount.tpl
templates/CRM/Contribute/Form/Search/AdvancedSearchPane.tpl
templates/CRM/Contribute/Form/SearchContribution.tpl
templates/CRM/Contribute/Form/Task.tpl
templates/CRM/Contribute/Page/ContributionTotals.tpl
templates/CRM/Core/APIDoc.tpl
templates/CRM/Core/Form/RecurringEntity.tpl
templates/CRM/Custom/Form/MoveField.tpl
templates/CRM/Event/Cart/Form/Checkout/ConferenceEvents.tpl
templates/CRM/Event/Form/ManageEvent/ConfirmRepeatMode.tpl
templates/CRM/Event/Form/ManageEvent/Location.tpl
templates/CRM/Event/Form/ManageEvent/Tab.tpl
templates/CRM/Event/Form/Search/AdvancedSearchPane.tpl
templates/CRM/Event/Form/Search/Common.tpl
templates/CRM/Event/Form/SearchEvent.tpl
templates/CRM/Event/Form/Task.tpl
templates/CRM/Event/Form/Task/Badge.tpl
templates/CRM/Event/Form/Task/Cancel.tpl
templates/CRM/Event/Form/Task/Print.tpl
templates/CRM/Event/Import/Form/Preview.tpl
templates/CRM/Event/Import/Form/Summary.tpl
templates/CRM/Event/Page/UserDashboard.tpl
templates/CRM/Event/Page/iCalLinks.tpl
templates/CRM/Financial/Form/FinancialTypeAccount.tpl
templates/CRM/Grant/Form/Search/AdvancedSearchPane.tpl
templates/CRM/Grant/Form/Search/Common.tpl
templates/CRM/Grant/Form/Task.tpl
templates/CRM/Grant/Form/Task/Print.tpl
templates/CRM/Grant/Form/Task/Update.tpl
templates/CRM/Grant/Page/DashBoard.tpl
templates/CRM/Mailing/Form/Search/AdvancedSearchPane.tpl
templates/CRM/Mailing/Form/Task.tpl
templates/CRM/Mailing/Form/Task/Print.tpl
templates/CRM/Mailing/Form/Test.tpl
templates/CRM/Member/Form/MembershipStandalone.js
templates/CRM/Member/Form/Task.tpl
templates/CRM/Member/Form/Task/Print.tpl
templates/CRM/Member/Import/Form/MapField.tpl
templates/CRM/Member/Import/Form/Preview.tpl
templates/CRM/Member/Import/Form/Summary.tpl
templates/CRM/Queue/Page/Runner.tpl
templates/CRM/common/WizardHeader.tpl
templates/CRM/common/navigation.js.tpl
templates/CRM/common/searchResultTasks.tpl
tests/phpunit/api/v3/ParticipantTest.php
tests/phpunit/api/v3/TaxContributionPageTest.php
tools/bin/scripts/createdoc.sh
tools/bin/scripts/runTest.sh
tools/bin/scripts/soapClient.php.txt
tools/bin/scripts/test_sandbox.sh
tools/drupal/modules/multicurrency/multicurrency.module.discount
tools/drupal/modules/multicurrency/multicurrency.module.original
tools/drupal/modules/multicurrency/templates/CRM/Event/Form/Registration/4/Register.tpl
tools/drupal/modules/multicurrency/templates/CRM/Event/Form/Registration/8/Register.tpl
tools/drupal/modules/multicurrency/templates/CRM/Event/Page/4/EventInfo.tpl
tools/drupal/modules/multicurrency/templates/CRM/Event/Page/8/EventInfo.tpl
tools/extensions/org.civicrm.demoqueue/CRM/Demoqueue/Page/DemoQueue.php
tools/extensions/org.civicrm.payment.googlecheckout/info.xml
tools/extensions/org.civicrm.payment.googlecheckout/packages/Google/README
tools/extensions/org.civicrm.report.baykeeper/Baykeeper.php
tools/extensions/org.civicrm.search.activity/templates/ActivitySearch.tpl
tools/scripts/demo/update-demo-all
tools/scripts/git/pre-commit
tools/scripts/phpunit-xslt/coverage-frames.xsl
tools/scripts/phpunit-xslt/log.xsl
tools/scripts/phpunit-xslt/phpunit-frames.xsl
tools/scripts/phpunit-xslt/phpunit-noframes.xsl
tools/scripts/phpunit-xslt/str.replace.function.xsl
tools/scripts/releaser/releaser
tools/scripts/solr/database.xml
tools/scripts/solr/schema.xml
tools/scripts/solr/solrconfig.xml
tools/scripts/upgrade-test/run-upgrade-test.sh
tools/sql/civiauction_sample.mysql
tools/templates/CRM/Auction/Form/Item.tpl
tools/templates/CRM/Auction/Form/ItemAccount.tpl
tools/templates/CRM/Auction/Form/SearchAuction.tpl
tools/templates/CRM/Auction/Form/SearchItem.tpl
tools/templates/CRM/Auction/Page/ManageItem.tpl

index c56cbcec0c0182ed401f1270f884ed6e4a14bec9..46d0c2e33f1ee8cb99ae4dcce52cfb94d4dc6172 100644 (file)
     /**
      * Private properties of dashboard.
      */
-    
+
     // Used to determine whether there are any incomplete ajax requests pending initialization of the dashboard.
     var asynchronousRequestCounter = 0;
 
               initialWidgets: Array(),
               element: $('<ul id="column-' + c + '" class="column column-' + c + '"></ul>').appendTo(dashboard.element)
           };
-        
+
           // Add the empty placeholder now, hide it and save it.
           col.emptyPlaceholder = $(markup).appendTo(col.element).hide();
 
                   initialColumn: col,
                   minimized: ( widgets[c][widgetID[1]] > 0  ? true : false )
               });
-          
+
               //set empty Dashboard to false
               emptyDashboard = false;
           }
       if ( emptyDashboard ) {
           emptyDashboardCondition( );
       }
-      
+
       invokeCallback(opts.callbacks.init, dashboard);
     }
 
         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.
         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
         }
 
         // 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.
         }
         CRM.loadPage(widget.fullscreenUrl);
       };
-      
+
       // Exit fullscreen mode.
       widget.exitFullscreen = function() {
         // This is just a wrapper for dashboard.exitFullscreen() which does the heavy lifting.
 
       // 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 = '<a class="widget-icon ' + id + '-icon" alt="' + control.description + '" title="' + control.description + '"></a>';    
+          var markup = '<a class="widget-icon ' + id + '-icon" alt="' + control.description + '" title="' + control.description + '"></a>';
           control.element = $(markup).prependTo($('.widget-controls', widget.element)).click(control.callback);
       };
 
 
       // 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();
index 72518648caa306b07336d7080a9c7c07a4c961f7..f4add4c7ba538d09afff9fa347ad41ce3c7c762f 100644 (file)
         }
       );
     }
-    
+
     CRM.confirm({
       title: dialogTitle,
       width: '600',
       options: {yes: "{/literal}{ts escape='js'}Save{/ts}{literal}", no: "{/literal}{ts escape='js'}Cancel{/ts}{literal}"},
       url: dataUrl
     }).on('crmConfirm:yes', save);
-    
+
   }
 })(CRM.$);
 </script>
index e3ad949660b9dd47519a462118fa2590815c74c3..d4774dc606314dff2bb783bfb6a476aa9e0ac33f 100644 (file)
@@ -28,7 +28,7 @@
 {capture assign=docLink}{docURL page="user/case-management/setup" text="CiviCase Setup documentation"}{/capture}
 
 <div class="messages status no-popup">
-      <div class="icon inform-icon"></div>&nbsp;    
+      <div class="icon inform-icon"></div>&nbsp;
       <strong>{ts}You need to setup and load Case and Activity configuration files before you can begin using the CiviCase component.{/ts}</strong>
       {ts 1=$docLink}Refer to the %1 to learn about this process.{/ts}
 </div>
index 4b522d04834306a46de456af71627b1cac73336b..0a45bc4a0ef1c20741c1c020a2b14f8cdeabfb90 100644 (file)
@@ -25,9 +25,9 @@
 *}
 <div class="crm-block crm-form-block crm-dedupe-find-form-block">
 <div id="help">
-    {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}
 </div>
-   <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div> 
+   <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
    <table class="form-layout-compressed">
      <tr class="crm-dedupe-find-form-block-group_id">
        <td class="label">{$form.group_id.label}</td>
index eaee41dd9c799665a1cfee358bad4c2e6a9dfb16..b5167d0b887f4233df88f31e86de7b9821d4a3fd 100644 (file)
@@ -30,4 +30,4 @@
         {$form.address.$blockId.county_id.html}<br />
      </td>
    </tr>
-{/if}  
+{/if}
index cacf24fe48e85425259269925360df0d3e380f97..22eb4065d104acbb9b0386332708a8c82dddccec 100644 (file)
@@ -43,7 +43,7 @@
     <td align="center" id="IM-Primary-html" {if $blockId eq 1}class="hiddenElement"{/if}>{$form.im.$blockId.is_primary.1.html}</td>
     {if $blockId gt 1}
         <td><a href="#" title="{ts}Delete IM Block{/ts}" onClick="removeBlock('IM','{$blockId}'); return false;">{ts}delete{/ts}</a></td>
-    {/if}    
+    {/if}
 </tr>
 {if !$addBlock}
 <tr>
index 80e543ea40710b0f9df46fe895767fcc4f527bab..7cdf703d990d4af915ce91a4477cdc41e011aa2c 100644 (file)
@@ -86,7 +86,7 @@ CRM.$(function($) {
     {/if}
     {if $form.first_name}
     <td>
-      {$form.first_name.label}<br /> 
+      {$form.first_name.label}<br />
       {$form.first_name.html}
     </td>
     {/if}
index cf41e8e797caeb44004c631aa8b90e7eca6f61a2..d166dd52e9607c7e44081ff92ecad7e6a8bd3a35 100644 (file)
@@ -25,7 +25,7 @@
 *}
 <div class="crm-accordion-wrapper crm-notesBlock-accordion collapsed">
  <div class="crm-accordion-header">
-   
+
     {$title}
   </div><!-- /.crm-accordion-header -->
   <div class="crm-accordion-body" id="notesBlock">
index ff6a3ca3f0d79d13b584d849689851ecd97ce99d..0df5f2f9a05a4e827b618c1997a8f0ea018f8a2c 100644 (file)
@@ -28,7 +28,7 @@
   <table class="form-layout crm-edit-address-form crm-inline-edit-form">
     <tr>
       <td>
-        <div class="crm-submit-buttons"> 
+        <div class="crm-submit-buttons">
           {include file="CRM/common/formButtons.tpl"}
           {if $addressId}
             &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
            <span class="crm-address-element is_billing-address-element">{$form.address.$blockId.is_billing.html}</span>
         </td>
      </tr>
-     
+
      {* include shared address template *}
      {include file="CRM/Contact/Form/ShareAddress.tpl"}
+
      <tr>
       <td>
         <table id="address_table_{$blockId}" class="form-layout-compressed">
       </td>
      </tr>
   </table>
-  
-  <div class="crm-edit-address-custom_data crm-inline-edit-form crm-address-custom-set-block-{$blockId}"> 
+
+  <div class="crm-edit-address-custom_data crm-inline-edit-form crm-address-custom-set-block-{$blockId}">
     {include file="CRM/Contact/Form/Edit/Address/CustomData.tpl"}
-  </div> 
+  </div>
 {literal}
 <script type="text/javascript">
   {/literal}{* // Enforce unique location_type_id fields *}{literal}
index 2e713af264eaf2ae3e2f066e61e1ef7b92d127b4..e790c7d3c30dd5212bbf61b3cdd0ddeb39d39845 100644 (file)
          </div>
        </div>
       {/if}
-      
+
 
       {if !empty($form.postal_greeting_id)}
       <div class="crm-summary-row">
          </div>
        </div>
       {/if}
+
     </div>
  </div>
 
index 4b9c9d3b28fc7f14862c6a2602e2ab2dc0eb1577..2cb141ea6e556656b1d639ecdef5d08aea3655cd 100644 (file)
@@ -29,7 +29,7 @@
     {include file="CRM/common/formButtons.tpl"}
   </div>
 
-  <div class="crm-clear">  
+  <div class="crm-clear">
     {if $contactType eq 'Individual'}
     <div class="crm-summary-row">
       <div class="crm-label">{$form.employer_id.label}&nbsp;{help id="id-current-employer" file="CRM/Contact/Form/Contact.hlp"}</div>
index 438e062aca3bef81c9480205df35419930451667..891623fc8d7e5d0db4e8717f3031324c0c5882b4 100644 (file)
@@ -44,7 +44,7 @@
     {/if}
     {if $form.first_name}
       <div class="crm-inline-edit-field">
-        {$form.first_name.label}<br /> 
+        {$form.first_name.label}<br />
         {$form.first_name.html}
       </div>
     {/if}
index 2805e24e4873b9e043781b4e5d98c0eba1b83983..9937b505a264c4b74d058840306892922b04f86c 100644 (file)
@@ -28,7 +28,7 @@
 <table class="crm-inline-edit-form">
     <tr>
       <td colspan="5">
-        <div class="crm-submit-buttons"> 
+        <div class="crm-submit-buttons">
           {include file="CRM/common/formButtons.tpl"}
         </div>
       </td>
     </tr>
 
     {section name='i' start=1 loop=$totalBlocks}
-    {assign var='blockId' value=$smarty.section.i.index} 
+    {assign var='blockId' value=$smarty.section.i.index}
     <tr id="Website_Block_{$blockId}" {if $blockId gt $actualBlockCount}class="hiddenElement"{/if}>
       <td>{$form.website.$blockId.url.html|crmAddClass:url}&nbsp;</td>
       <td>{$form.website.$blockId.website_type_id.html}</td>
       <td>
-        {if $blockId > 1} 
+        {if $blockId > 1}
           <a class="crm-delete-inline crm-hover-button action-item" href="#" title="{ts}Delete Website{/ts}"><span class="icon delete-icon"></span></a>
         {/if}
        </td>
@@ -66,7 +66,7 @@
       $('tr[id^="Website_Block_"]' ).each( function() {
           if( $(this).find('td:first span').length > 0 ) {
             $(this).removeClass('hiddenElement');
-          } 
+          }
       });
     });
 </script>
index da9e006801a02f736cfab1785adbe59bc0cd412c..deaac1e45584992edd02c9c70dbb6c1e5781a917 100644 (file)
@@ -77,7 +77,7 @@
         {include file="CRM/Contact/Form/Search/ResultTasks.tpl"}
       {/if}
     </div>
-    
+
     {* This section displays the rows along and includes the paging controls *}
     <div class="crm-search-results">
       {if $resultFile}
index 5a572419b398650d2b382d2570b0fe1eeb9cb3b4..5a0a26ace24b64c847e084c58784ef7d39248c10 100644 (file)
@@ -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('<select class="crm-form-' + multiSelect.substr(0, 5) + 'select required" ' + multiSelect + '><option value="">' + ts('Loading') + '...</option></select>');
-    
+
     fetchOptions(row, field);
   }
 
index 00d6876388a87f3a99e603150d71ec58022666f1..e9f68b61db26109735bd471cf9a3c5a9c4ca7c39 100644 (file)
@@ -38,8 +38,8 @@
             </td>
             <td>
                 {$form.task_status_id.html}
-            </td>    
+            </td>
         </tr>
-      </table>         
+      </table>
     </div>
 {/if}
index 9ad792c60066a9197bb56e211d1f5026612bb631..3528566e4a936d22f6e737b9211805bbde532c3d 100644 (file)
@@ -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}
         <div class="crm-submit-buttons">
             <a href="{$editSmartGroupURL}" class="button no-popup"><span><div class="icon edit-icon"></div> {ts 1=$group.title}Edit Smart Group Search Criteria for %1{/ts}</span></a>
             {help id="id-edit-smartGroup"}
index 3034054ac35c8dca9c6bb3dfdc6a8c2297c5f947..1b98cb42713b822feaed562132b25a2cf3e70299 100644 (file)
@@ -45,4 +45,4 @@
     <tr><td>{include file="CRM/Contact/Form/Task.tpl"}</td></tr>
 </table>
     <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
-</div> 
+</div>
index 0005f3cc8e88efbd56ec3491e0e9e2c440fbe16a..456a2216891c0d389471ef0667db859dedee852b 100644 (file)
@@ -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(){
index d2c2fdb7b9f24274b6e34e605fe66e9fb1ff1ce4..403ed9606f0ffc5443c9a42c693a6ed96be3f6fc 100644 (file)
@@ -26,7 +26,7 @@
 <div class="crm-block crm-form-block crm-contact-task-mailing-label-form-block">
 <div class="messages status no-popup">{include file="CRM/Contact/Form/Task.tpl"}</div>
 <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
-<table class="form-layout-compressed"> 
+<table class="form-layout-compressed">
      <tr class="crm-contact-task-mailing-label-form-block-label_name">
         <td class="label">{$form.label_name.label}</td>
         <td>{$form.label_name.html} {help id="id-select-label" file="CRM/Contact/Form/Task/Label.hlp"}</td>
index 27b11e6b189d42add00c42c0c9fadb3dff383983..c8a5de317a8b1bbe60050665be8eb1b49b1edc35 100644 (file)
@@ -27,4 +27,4 @@
 {include file="CRM/Contact/Form/Task/Map/`$mapProvider`.tpl"}
 
 <p></p>
-<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>                            
+<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
index eaca7bca9b1337ef94352d4e408c43afd4b971d0..45ee57a1412d5ef315ac182b48ca25375e5241b2 100644 (file)
 {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}
 <script src="http://openlayers.org/api/OpenLayers.js" type="text/javascript"></script>
 <script type="text/javascript">
         map.addLayer(new OpenLayers.Layer.OSM());
 
         var lonLat = new OpenLayers.LonLat(
-            {/literal}{$center.lng}{literal}, 
+            {/literal}{$center.lng}{literal},
             {/literal}{$center.lat}{literal}).transform(
                 new OpenLayers.Projection("EPSG:4326"),
                 map.getProjectionObject()
             );
 
         map.setCenter(lonLat, {/literal}{$defaultZoom}{literal});
-        
+
         setMapOptions(map);
     }
-    
+
     function setMapOptions(map) {
         markers = new OpenLayers.Layer.Markers("Markers");
         map.addLayer(markers);
             {/literal}
             {if $location.lat}
                 point = new OpenLayers.LonLat(
-                    {$location.lng}, 
+                    {$location.lng},
                     {$location.lat}).transform(
                         new OpenLayers.Projection("EPSG:4326"),
                         map.getProjectionObject()
             {/if}
         {/foreach}
         map.setCenter(bounds.getCenterLonLat());
-        {if count($locations) gt 1}  
+        {if count($locations) gt 1}
             map.zoomToExtent(bounds);
         {elseif $location.marker_class eq 'Event' || $location.marker_class eq 'Individual'|| $location.marker_class eq 'Household' || $location.marker_class eq 'Organization' }
             map.zoomTo({$defaultZoom});
-        {else} 
-            map.zoomTo({$defaultZoom}); 
+        {else}
+            map.zoomTo({$defaultZoom});
         {/if}
         {literal}
         //attribution sits awkwardly high, move it down
 
     function createMarker(map, markers, point, data, image) {
         var marker = new OpenLayers.Marker(point);
-        
+
         var size = new OpenLayers.Size(20,20);
         var offset = new OpenLayers.Pixel(-(size.w/2), -size.h);
         marker.icon.size = size;
 
     function gpopUp() {
         var from   = document.getElementById('from').value;
-        var to     = document.getElementById('to').value;   
+        var to     = document.getElementById('to').value;
         var URL    = "http://maps.google.com/maps?saddr=" + from + "&daddr=" + to;
         day = new Date();
         id  = day.getTime();
index 23e7862ea224828ff8d94614a35822a910351f96..5987e8f0d993f7adf758877bcf8b375a2d50e861 100644 (file)
@@ -30,7 +30,7 @@
        <td class="label">{$form.uf_group_id.label}</td>
        <td>{$form.uf_group_id.html}</td>
     </tr>
-    <tr> 
+    <tr>
         <td class="label"></td>
         <td>
             {include file="CRM/Contact/Form/Task.tpl"}
index 7775ee663f15dfc81c897f93b3e40ba6392e8dc0..4bdd3509b47d5e9dec78fc48cf31d1b64ebf4c20 100644 (file)
@@ -26,7 +26,7 @@
 <div class="crm-form-block crm-block crm-contact-task-removefromgroup-form-block">
 <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
  <table class="form-layout-compressed">
-     <tr class="crm-contact-task-removefromgroupform-block-group_id">  
+     <tr class="crm-contact-task-removefromgroupform-block-group_id">
         <td class="label">{if $group.id}{ts}Group{/ts}{else}{$form.group_id.label}{/if}</td>
         <td>{$form.group_id.html}</td>
       </tr>
index 84f9125342d8cd5e4b6c9774d0d91df98ca0fbb8..02d0e1cd0ba5d3c279fc689afda5ec16e81c3080 100644 (file)
@@ -45,9 +45,9 @@
        {/literal}
 
      {/section}
-   </dl>    
+   </dl>
 </div>
-    
+
 <div id="crm-submit-buttons" class="form-item">
 <dl>
    <dt>&nbsp;</dt><dd>{$form.buttons.html}</dd>
index e54a96a0f08f1cfee519b611442266b7d307aae9..9c2f01cb3ae59a50aebd8786465fbc8a9c16a6e7 100644 (file)
@@ -34,7 +34,7 @@
     <p>
     {ts}<strong>Import has completed successfully.</strong> The information below summarizes the results.{/ts}
     </p>
-    
+
    {if $unMatchCount }
         <p class="error">
         {ts count=$unMatchCount plural='CiviCRM has detected mismatched contact IDs. These records have not been updated.'}CiviCRM has detected mismatched contact ID. This record has not been updated.{/ts}
@@ -42,8 +42,8 @@
         <p class="error">
         {ts 1=$downloadMismatchRecordsUrl}You can <a href='%1'>Download Mismatched Contacts</a>. You may then correct them, and import the new file with the corrected data.{/ts}
         </p>
-    {/if} 
-   
+    {/if}
+
     {if $invalidRowCount }
         <p class="error">
         {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}
@@ -77,8 +77,8 @@
         {ts 1=$downloadAddressRecordsUrl}You can <a href='%1'>Download Street Address Records </a>. You may then edit those contact records and update the street address accordingly.{/ts}
         </p>
     {/if}
- </div> 
- <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>   
+ </div>
+ <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
  {* Summary of Import Results (record counts) *}
  <table id="summary-counts" class="report">
     <tr><td class="label">{ts}Total Rows{/ts}</td>
@@ -96,7 +96,7 @@
         </td>
     </tr>
     {/if}
-    
+
     {if $unMatchCount }
     <tr class="error"><td class="label">{ts}Mismatched Rows (skipped){/ts}</td>
         <td class="data">{$unMatchCount}</td>
         </td>
     </tr>
     {/if}
-    
+
     {if $conflictRowCount}
     <tr class="error"><td class="label">{ts}Conflicting Rows (skipped){/ts}</td>
         <td class="data">{$conflictRowCount}</td>
         </td>
     </tr>
     {/if}
-    
+
     <tr><td class="label">{ts}Total Contacts{/ts}</td>
         <td class="data">{$validRowCount}</td>
         <td class="explanation">{ts}Total number of contact records created or modified during the import.{/ts}</td>
     {/if}
 
  </table>
+
  <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
 </div>
+
index 430b826b4a1cbcf3064fbc3b08190ef25e84b047..ea2c78de78bbac0bac732f11a4e10caefb1550e0 100644 (file)
@@ -57,8 +57,8 @@
     {foreach from=$add.custom item=customGroup key=cgId} {* start of outer foreach *}
       {assign var="isAddressCustomPresent" value=1}
       {foreach from=$customGroup item=customValue key=cvId}
-        <div id="address_custom_{$cgId}_{$locationIndex}" 
-        class="crm-collapsible crm-address-custom-{$cgId}-{$locationIndex}-accordion 
+        <div id="address_custom_{$cgId}_{$locationIndex}"
+        class="crm-collapsible crm-address-custom-{$cgId}-{$locationIndex}-accordion
         {if $customValue.collapse_display}collapsed{/if}">
         <div class="collapsible-title">
           {$customValue.title}
index 286dcf1aa19448aa55b4ef9283758476c05469e6..7c52e927a3e769806b67245044d42af094c30edc 100644 (file)
@@ -35,7 +35,7 @@
       <div class="crm-summary-row">
         <div class="crm-label">{ts}Employer{/ts}</div>
         <div class="crm-content crm-contact-current_employer">
-          {if !empty($current_employer_id)} 
+          {if !empty($current_employer_id)}
           <a href="{crmURL p='civicrm/contact/view' q="reset=1&cid=`$current_employer_id`"}" title="{ts}view current employer{/ts}">{$current_employer}</a>
           {/if}
         </div>
index 5173302d540d5ef7a698ae522c1d820e2e2277b6..f2fa09f9ce933f07f74827e333768a303bade957 100644 (file)
@@ -75,7 +75,7 @@
 <script type="text/javascript">
 
 function showHideSignature( blockId ) {
-  cj("#Email_Block_" + blockId + "_signature").show( );   
+  cj("#Email_Block_" + blockId + "_signature").show( );
 
   cj("#Email_Block_" + blockId + "_signature").dialog({
       title: "Signature",
@@ -86,10 +86,10 @@ function showHideSignature( blockId ) {
         cj(this).dialog("destroy");
       },
       buttons: {
-        "Done": function() { 
-                  cj(this).dialog("destroy"); 
-                } 
-      } 
+        "Done": function() {
+                  cj(this).dialog("destroy");
+                }
+      }
   });
 }
 </script>
index 965aada020accbc4eca7973a0ec15abf3fce184a..f1f7f90eb3206911aadb38d0260919635a6fab3e 100644 (file)
             $(nRow).addClass('crm-entity');
           }
         }
-      });    
+      });
     }
   });
 </script>
index 8945dc9bd823f24d9318c431ce8d2cb5273d33a0..da0c54049c9bf7df47b9998808f712006648b2ab 100755 (executable)
@@ -24,7 +24,7 @@
  +--------------------------------------------------------------------+
 *}
 <div class="crm-block crm-form-block crm-useradd-form-block">
-    <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>                  
+    <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
         <table class="form-layout-compressed">
             <tr>
                 <td class="label">{$form.name.label}</td><td>{$form.name.html}</td>
@@ -44,7 +44,7 @@
                 <td class="label">{$form.email.label}</td><td>{$form.email.html}</td>
             </tr>
         </table>
-    <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div> 
+    <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
 </div>
 <script type="text/javascript">
 {include file="CRM/common/checkUsernameAvailable.tpl"}
index b8ef319c5c370e575791547a7c97f1449f4e3322..c7122f8655bc2b7bb4502ddd1a064c1b74daa9d7 100644 (file)
   <div class="crm-submit-buttons">
     {include file="CRM/common/formButtons.tpl"}
   </div>
-  <table class="form-layout-compressed">    
+  <table class="form-layout-compressed">
     <tr>
       <td class="font-size12pt label"><strong>{ts}Participant{/ts}</strong></td><td class="font-size12pt"><strong>{$displayName}</strong></td>
     </tr>
     {if $contributionMode}
       <tr class="crm-payment-form-block-payment_processor_id"><td class="label nowrap">{$form.payment_processor_id.label}<span class="marker"> * </span></td><td>{$form.payment_processor_id.html}</td></tr>
-    {/if}   
+    {/if}
     <tr>
       <td class='label'>{ts}Event{/ts}</td><td>{$eventName}</td>
     </tr>
                 </span><br />
                 {$form.receipt_text.html|crmAddClass:huge}
             </td>
-          </tr>   
+          </tr>
            <tr class="crm-payment-form-block-fee_amount"><td class="label">{$form.fee_amount.label}</td><td{$valueStyle}>{$form.fee_amount.html|crmMoney:$currency:'XXX':'YYY'}<br />
             <span class="description">{ts}Processing fee for this transaction (if applicable).{/ts}</span></td></tr>
            <tr class="crm-payment-form-block-net_amount"><td class="label">{$form.net_amount.label}</td><td{$valueStyle}>{$form.net_amount.html|crmMoney:$currency:'':1}<br />
index 3e673ae38819b286f87577ef1773b4e3a5a25ca5..163536f25bb27b5791061c21092851482e412b65 100644 (file)
@@ -66,7 +66,7 @@
                   <span class="description">{ts}Instructions added to Confirmation and Thank-you pages, as well as the confirmation email, when the user selects the 'pay later' option (e.g. 'Mail your check to ... within 3 business days.').{/ts}</span></td></tr>
 
                 <tr><th scope="row" class="label">{$form.is_billing_required.label}</th>
-                <td>{$form.is_billing_required.html}</td></tr> 
+                <td>{$form.is_billing_required.html}</td></tr>
             </table>
             </td>
         </tr>
index f3e720cabab61b558e1b93fb5e648965a92ecec5..73cab0d4d7a62c04cb6f5ff2aacfcc0586fb5081 100644 (file)
@@ -25,7 +25,7 @@
 *}
 {if $validCiviContribute}
     <div id="contributeForm" class="crm-contribution-search-advanced_search-form-block">
-    <table class="form-layout"> 
+    <table class="form-layout">
        {include file="CRM/Contribute/Form/Search/Common.tpl"}
     </table>
     </div>
index a237774082f418dc76a3d402822192ebe8a67d5f..8ee1835aadee11f379b0ad66ca4fc3b4f9a225fc 100644 (file)
@@ -31,9 +31,9 @@
             <div class="description font-italic">
                 {ts}Complete OR partial Contribution Page title.{/ts}
             </div>
-            <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl"}</div>  
+            <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl"}</div>
         </td>
-        
+
         <td>
             <label>{ts}Financial Type{/ts}</label>
             <div class="listing-box">
@@ -47,7 +47,7 @@
     </tr>
 
     {* campaign in contribution page search *}
-    {include file="CRM/Campaign/Form/addCampaignToComponent.tpl" 
+    {include file="CRM/Campaign/Form/addCampaignToComponent.tpl"
     campaignContext="componentSearch" campaignTrClass='' campaignTdClass=''}
 
  </table>
index 9e9b538d273647fd4bf81c9b32f215051b2de6da..a2674349a048ce58ce2b8b271b8a054dff28ae5a 100644 (file)
@@ -25,7 +25,7 @@
 *}
 {ts 1=$totalSelectedContributions}Number of selected contributions: %1{/ts}
 
-{if $rows } 
+{if $rows }
 <div class="crm-block crm-form-block crm-contribution-task-form-block">
 <table width="30%">
   <tr class="columnheader">
index 1fe10a85e4a13a32ed7eb9a51c8800f485a30ea7..d5a875b2f8472fd20b9eebcc131334ecac262c1c 100644 (file)
@@ -26,7 +26,7 @@
 {*Table displays contribution totals for a contact or search result-set *}
 {if $annual.count OR $contributionSummary}
     <table class="form-layout-compressed">
-    
+
     {if $annual.count}
         <tr>
             <th class="contriTotalLeft right">{ts}Current Year-to-Date{/ts} - {$annual.amount}</th>
           {if $contributionSummary.cancel.amount}
             <th class="disabled right contriTotalRight"> &nbsp; {ts}Total Cancelled Amount{/ts} - {$contributionSummary.cancel.amount}</th>
           {/if}
-      </tr>  
+      </tr>
       {if $contributionSummary.soft_credit.count}
       <tr>
         <th class="contriTotalLeft right">{ts}Total Soft Credit Amount{/ts} - {$contributionSummary.soft_credit.amount}</th>
         <th class="right"> &nbsp; {ts}# Completed Soft Credits{/ts} - {$contributionSummary.soft_credit.count}</th>
         <th class="right contriTotalRight"> &nbsp; {ts}Avg Soft Credit Amount{/ts} - {$contributionSummary.soft_credit.avg}</th>
-      </tr>  
+      </tr>
       {/if}
     {/if}
-    
+
     </table>
 {/if}
index 191908f4e5f2be7647c6335d517ca8caed9cf93c..20bf48d8579cbb4f41113f003a8d41451ea64ca4 100644 (file)
@@ -11,22 +11,22 @@ h2.entity {cursor:pointer}
 {/literal}
 </style>
 <script>
-if (!jQuery) {ldelim}  
+if (!jQuery) {ldelim}
 var head= document.getElementsByTagName('head')[0];
 var script= document.createElement('script');
 script.type= 'text/javascript';
 script.src= CRM.config.resourceBase + 'js/packages/jquery/jquery.js';
 head.appendChild(script);
-{rdelim} 
+{rdelim}
 restURL = '{crmURL p="civicrm/api/json"}';
 if (restURL.indexOf('?') == -1 )
 restURL = restURL + '?';
-else 
+else
 restURL = restURL + '&';
 {literal}
 if (typeof $ == "undefined") {
   $ = cj;
-} 
+}
 
 function APIDoc(entity){
   $detail=$('#detail_'+entity);
@@ -64,7 +64,7 @@ function APIDoc(entity){
 
 
 CRM.$(function($) {
-    $('h2.entity').click ( function(){APIDoc($(this).attr('id'))} ); 
+    $('h2.entity').click ( function(){APIDoc($(this).attr('id'))} );
     entity=window.location.hash;
     if (entity.substring(0, 1) === '#') {
       $entity=$(entity);
index ca723d0118cc94975d0ab047141348d64a688319..74429855adedeee54e4d8b5d9b79dd2ec5635065 100644 (file)
@@ -90,7 +90,7 @@
 </div>
 <div id="preview-dialog" class="hide-block">
     <div id="generated_dates" class="show-block"></div>
-    
+
 </div>
 {literal}
 <script type="text/javascript">
       cj('.crm-core-form-recurringentity-block-repeats_by td').hide();
     }
     cj("#repeats-every-text").html(cj('#repetition_frequency_unit').val()+'(s)');
-    
+
     /***********On Load Set Ends Value (Edit Mode) **********/
     if (cj('input:radio[name=ends]:checked').val() == 1) {
       cj('#start_action_offset').removeAttr('disabled').attr('enabled','enabled');
       //Just in-case block shows up, disable it
       cj('#limit_to, #entity_status_1, #entity_status_2').removeAttr('enabled').attr('disabled','disabled');
     }
-    
+
     cj('#repetition_frequency_unit').change(function () {
       if (cj(this).val()==='hour') {
         cj('#repeats-every-text').html(cj(this).val()+'(s)');
         cj('.crm-core-form-recurringentity-block-repeats_by td').hide();
       } else if (cj(this).val()==='week') {
         cj('#repeats-every-text').html(cj(this).val()+'(s)');
-        //Show "Repeats On" block when week is selected 
+        //Show "Repeats On" block when week is selected
         cj('.crm-core-form-recurringentity-block-start_action_condition').show();
         cj('.crm-core-form-recurringentity-block-repeats_by td').hide();
       } else if (cj(this).val()==='month') {
         cj('#repeats-every-text').html(cj(this).val()+'(s)');
         cj('.crm-core-form-recurringentity-block-start_action_condition').hide();
-        //Show "Repeats By" block when month is selected 
+        //Show "Repeats By" block when month is selected
         cj('.crm-core-form-recurringentity-block-repeats_by td').show();
       } else if (cj(this).val()==='year') {
         cj('#repeats-every-text').html(cj(this).val()+'(s)');
         cj('.crm-core-form-recurringentity-block-repeats_by td').hide();
       }
     });
-    
+
     // For "Ends" block
     cj('input:radio[name=ends]').click(function() {
       if (cj(this).val() == 1) {
         cj('#repeat_absolute_date_display').removeAttr('enabled').attr('disabled','disabled');
       }
     });
-    
+
     //For "Repeats By" block
     cj('input:radio[name=repeats_by]').click(function() {
       if (cj(this).val() == 1) {
         cj('#entity_status_2').removeAttr('enabled').attr('disabled','disabled');
       }
     });
-    
+
     //Select all options in selectbox before submitting
     cj(this).submit(function() {
       cj('#exclude_date_list option').attr('selected',true);
           return false;
         }
       }
-        
+
     });
-        
+
     //Dialog for preview repeat Configuration dates
     cj('#preview-dialog').dialog({ autoOpen: false });
     cj('#_qf_Repeat_submit-top, #_qf_Repeat_submit-bottom').click( function () {
             }
             html += '</table>';
             var warningHtml = '';
-            if (Object.keys(participantData).length > 0) {               
+            if (Object.keys(participantData).length > 0) {
               warningHtml += '<div class="messages status no-popup"><div class="icon inform-icon"></div>&nbsp;There are registrations for the repeating events already present in the set, continuing with the process would unlink them and repeating events without registration would be trashed. </div><table id="options" class="display"><thead><tr><th>Event ID</th><th>Event</th><th>Participant Count</th></tr><thead>';
               for (var id in participantData) {
                 for(var data in participantData[id]) {
       });
       return false;
     });
-    
+
     //Build Summary
     var finalSummary = '';
     var numberText = '';
       numberText = 's';
     }
     finalSummary = "Every " + interval + cj('#repetition_frequency_unit option:selected').val() + numberText;
-    
+
     //Case Week
     var dayOfWeek = new Array();
     if (cj('#repetition_frequency_unit option:selected').val() == "week") {
       });
       finalSummary += ' on ' + dayOfWeek.join();
     }
-    
+
     //Case Monthly
     if (cj('#repetition_frequency_unit option:selected').val() == "month") {
       if (cj('input:radio[name=repeats_by]:checked').val() == 1) {
         finalSummary += ' on ' + cj('#entity_status_1').val().substr(0, 1).toUpperCase() + cj('#entity_status_1').val().substr(1).toLowerCase() + ' ' + cj('#entity_status_2').val().substr(0, 1).toUpperCase() + cj('#entity_status_2').val().substr(1).toLowerCase();
       }
     }
-    
+
     //Case Ends
     if (cj('input:radio[name=ends]:checked').val() == 1) {
       var timeText = ''
       var monthNames = new Array("January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December");
       var date = new Date(cj('#repeat_absolute_date_display').val());
       function addOrdinal(d) {
-        if (d>3 && d<21) return 'th'; 
+        if (d>3 && d<21) return 'th';
         switch (d % 10) {
           case 1:  return "st";
           case 2:  return "nd";
           case 3:  return "rd";
           default: return "th";
         }
-      } 
+      }
       var newDate = monthNames[(date.getMonth())] + ' ' + date.getDate()+ addOrdinal() + ' ' +  date.getFullYear();
       finalSummary += ', untill '+ newDate;
     }
-    
+
     //Build/Attach final Summary
     cj('#rec-summary').html(finalSummary);
-    
+
 });
-    
+
   //Exclude list function
   function addToExcludeList(val) {
     if (val !== "") {
     }
   }
 </script>
-{/literal}  
+{/literal}
index 1374b501a429d7470534bdc67502238e44ca864e..f7fbd6c53a49ee3877427a5940c6141c077cfbfe 100644 (file)
@@ -30,7 +30,7 @@
             <td>{$form.dst_group_id.html}<br />
                 <span class="description">{ts}Select a different Custom Data Set for this field.{/ts}
             </td>
-        </tr> 
+        </tr>
         <tr><td class="label">{$form.is_copy.label}</td><td>{$form.is_copy.html}</td></tr>
     </table>
     <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
index 7b759d9637826629906d5aab3068b232f349d5c3..37a016e446e43356ebdd16e133acd72c33b3c4ba 100644 (file)
@@ -15,7 +15,7 @@
       </ul>
     </div>
   </fieldset>
-{/foreach}    
+{/foreach}
 
 <script type="text/javascript">
 var session_options = {$session_options};
index b38d3ff429f64ace85d3e3097152e14624526671..3ee71b085fcd378f30b9254d441881f34bc629c7 100644 (file)
@@ -60,7 +60,7 @@
                 'CRM_Friend_Form_Event': 'civicrm_tell_friend',
                 'CRM_PCP_Form_Event': 'civicrm_pcp_block'
                 };
-    
+
     var form = '';
     $('#crm-main-content-wrapper').on('click', 'div.crm-submit-buttons span.crm-button input[value="Save"], div.crm-submit-buttons span.crm-button input[value="Save and Done"]', function() {
         form = $(this).parents('form:first').attr('class');
           }).dialog('open');
           return false;
         }
-    }); 
+    });
 
     $(".only-this-event").click(function() {
       updateMode(1);
     });
-  
+
     cj(".this-and-all-following-event").click(function() {
       updateMode(2);
     });
-  
+
     cj(".all-events").click(function() {
       updateMode(3);
     });
-    
+
     function updateMode(mode) {
       var eventID = {/literal}{$id}{literal};
       if (eventID != "" && mode && form != "") {
index 36455dcfffbb16175b4751192aa31746b5c26d26..47be38aed406862d28ddb3a9a794b1060280e4d0 100644 (file)
         <td id="locUsedMsg" colspan="3">
         </td>
       </tr>
-     
+
     </table>
     {/if}
-    
+
 
 
     <div id="newLocation">
@@ -186,7 +186,7 @@ CRM.$(function($) {
       }
     }
   }
-  
+
   $('input[name=location_option]').click(showLocFields);
   showLocFields(false);
 
index eca262bef7a3a867c3b97a7951e2f4e8180a54a4..0ca74b9e5e4659e461ee1a99ed9f66419bb86b2c 100644 (file)
@@ -86,7 +86,7 @@ CRM.$(function($) {
     event.stopPropagation();
     return false;
   });
-  
+
   $('#crm-participant-link').click(function(event) {
     $('#crm-participant-list').toggle();
     $('#crm-event-links-list').hide();
index d2d9ec71f00b8984087d0488b3f4f2d2a68b6ccc..9bc52cd5c720c72455834df6a78c6d06a6c069e8 100644 (file)
@@ -25,7 +25,7 @@
 *}
 {if $validCiviEvent}
     <div id="participantForm" class="form-item">
-    <table class="form-layout"> 
+    <table class="form-layout">
         {include file="CRM/Event/Form/Search/Common.tpl"}
     </table>
     </div>
index 76631269d8f3e9ffcf5ba65f166ebe1c1d0a9abe..7bd688cfabaf29112602f1fbfeaafc1af0b6e43a 100644 (file)
@@ -24,7 +24,7 @@
  +--------------------------------------------------------------------+
 *}
 <tr>
-  <td class="crm-event-form-block-event_id"> 
+  <td class="crm-event-form-block-event_id">
       {$form.event_id.label}  <br />{$form.event_id.html|crmAddClass:huge} <br/>
       {$form.event_include_repeating_events.label}&nbsp;&nbsp;{$form.event_include_repeating_events.html}
   </td>
index e0afe550997126f4bae34dc3fb8e2d4f41cb8b9f..5c06f028e96692a05cea5ec4f8cbb0193a292792 100644 (file)
@@ -42,9 +42,9 @@
                 {/foreach}
             </div>
         </td>
-        <td class="right" rowspan="2">&nbsp;{include file="CRM/common/formButtons.tpl"}</td>  
+        <td class="right" rowspan="2">&nbsp;{include file="CRM/common/formButtons.tpl"}</td>
     </tr>
-  
+
     <tr>
        <td colspan="2">
        <table class="form-layout-compressed" id="id_fromToDates">
         </tr>
         <tr class="crm-event-searchevent-form-block-end_date" >
             <td class="label">{$form.end_date.label}</td>
-            <td>{include file="CRM/common/jcalendar.tpl" elementName=end_date}</td>             
+            <td>{include file="CRM/common/jcalendar.tpl" elementName=end_date}</td>
         </tr>
-      </table> 
-    </td></tr>  
+      </table>
+    </td></tr>
 
     {* campaign in event search *}
-    {include file="CRM/Campaign/Form/addCampaignToComponent.tpl" campaignContext="componentSearch" 
+    {include file="CRM/Campaign/Form/addCampaignToComponent.tpl" campaignContext="componentSearch"
     campaignTrClass='crm-event-searchevent-form-block-campaign_id' campaignTdClass=''}
 
   </table>
 
 {include file="CRM/common/showHide.tpl"}
 
-{literal} 
+{literal}
 <script type="text/javascript">
 if ( document.getElementsByName('eventsByDates')[1].checked ) {
   cj('#id_fromToDates').show();
 }
 </script>
-{/literal} 
+{/literal}
index 8982d0cbd7e38ba3c9da77300c2fe12ec10f39a7..b2e01126cb5475f5c4a4793f9554534ab231b34f 100644 (file)
@@ -25,7 +25,7 @@
 *}
 {ts 1=$totalSelectedParticipants}Number of selected participants: %1{/ts}
 
-{if $rows } 
+{if $rows }
 <div class="form-item">
 <table width="30%">
   <tr class="columnheader">
index b06302bf18a5ea4793d1d1b4e9a71accfbf800f2..6e6c5bb39ef6e4ec3f31342d4d15fab40173e381 100644 (file)
@@ -27,7 +27,7 @@
 <div class="crm-section crm-task-count">
     {include file="CRM/Event/Form/Task.tpl"}
 </div>
-<table class="form-layout-compressed"> 
+<table class="form-layout-compressed">
      <tr class="crm-event-badge-form-block-label_id">
         <td class="label">{$form.badge_id.label}</td>
         <td>{$form.badge_id.html}</td>
index f0208b8cac5283262c1f99085703863b17a78ace..86714c6e58d412cafba6e77f1600c63f8b086e36 100644 (file)
@@ -26,7 +26,7 @@
 {* Confirmation of Cancel Registration *}
 <div class="crm-block crm-form-block crm-event-cancel-form-block">
 <div class="crm-submit-buttons">
-  {include file="CRM/common/formButtons.tpl" location="top"} 
+  {include file="CRM/common/formButtons.tpl" location="top"}
 </div>
 <div class="messages status no-popup">
   <div class="icon inform-icon"></div>
@@ -37,6 +37,6 @@
 </div>
 
 <div class="crm-submit-buttons">
-  {include file="CRM/common/formButtons.tpl" location="bottom"} 
+  {include file="CRM/common/formButtons.tpl" location="bottom"}
 </div>
 </div>
index 0408a27c237b47934ca185d860eb3f32be4a0e57..95de69e4369edba42798b87d95dd3815c54c4d85 100644 (file)
@@ -25,7 +25,7 @@
 *}
 <p>
 
-{if $rows } 
+{if $rows }
 <div class="crm-submit-buttons">
      <span class="element-right">{include file="CRM/common/formButtons.tpl" location="top"}</span>
 </div>
index 808f2967a1c01f2c743a0d1f813f6b500776151f..dc88ac70b251e7c2e30e1f228441e59a031cac32 100644 (file)
 *}
 {* 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 *}
-   
+
 <div class="crm-block crm-form-block crm-event-import-preview-form-block">
  {* WizardHeader.tpl provides visual display of steps thru the wizard as well as title for current step *}
  {include file="CRM/common/WizardHeader.tpl"}
 
 <div id="help">
     <p>
-    {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}
     </p>
-    
+
     {if $invalidRowCount}
         <p class="error">
         {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 - <a href='%2'>Download Errors</a>. 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 - <a href='%2'>Download Conflicts</a>. Then correct them in the original import file, cancel this import and begin again at step 1.{/ts}
         </p>
     {/if}
-    
+
 
     <p>{ts}Click 'Import Now' if you are ready to proceed.{/ts}</p>
  </div>
@@ -60,7 +60,7 @@
         <td class="data">{$totalRowCount}</td>
         <td class="explanation">{ts}Total rows (participant records) in uploaded file.{/ts}</td>
     </tr>
-    
+
     {if $invalidRowCount}
     <tr class="error"><td class="label">{ts}Rows with Errors{/ts}</td>
         <td class="data">{$invalidRowCount}</td>
@@ -71,7 +71,7 @@
         </td>
     </tr>
     {/if}
-    
+
     {if $conflictRowCount}
     <tr class="error"><td class="label">{ts}Conflicting Rows{/ts}</td>
         <td class="data">{$conflictRowCount}</td>
         <td class="explanation">{ts}Total rows to be imported.{/ts}</td>
     </tr>
  </table>
-  
+
 
  {* Table for mapping preview *}
  {include file="CRM/Event/Import/Form/MapTable.tpl}
+
+
  <div class="crm-submit-buttons">
     {include file="CRM/common/formButtons.tpl" location="bottom"}
  </div>
index 42ad05d94b725c2e095128c76ad0ba79851c250c..f4bec163797e33fd336d7405f6239d3c38d5989f 100644 (file)
 
  {* WizardHeader.tpl provides visual display of steps thru the wizard as well as title for current step *}
  {include file="CRM/common/WizardHeader.tpl"}
+
 <div id="help">
     <p>
     <strong>{ts}Import has completed successfully.{/ts}</strong> {ts}The information below summarizes the results.{/ts}
     </p>
-    
+
    {if $unMatchCount }
         <p class="error">
         {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 @@
         <p class="error">
         {ts 1=$downloadMismatchRecordsUrl}You can <a href="%1">Download Mismatched Participants</a>. You may then correct them, and import the new file with the corrected data.{/ts}
         </p>
-    {/if} 
-   
+    {/if}
+
     {if $invalidRowCount }
         <p class="error">
         {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}
         </p>
     {/if}
  </div>
+
 <div class="crm-submit-buttons">
     {include file="CRM/common/formButtons.tpl" location="top"}
-</div> 
+</div>
  {* Summary of Import Results (record counts) *}
  <table id="summary-counts" class="report">
     <tr><td class="label">{ts}Total Rows{/ts}</td>
@@ -93,7 +93,7 @@
         </td>
     </tr>
     {/if}
-    
+
     {if $unMatchCount }
     <tr class="error"><td class="label">{ts}Mismatched Rows (skipped){/ts}</td>
         <td class="data">{$unMatchCount}</td>
         </td>
     </tr>
     {/if}
-    
+
     {if $conflictRowCount}
     <tr class="error"><td class="label">{ts}Conflicting Rows (skipped){/ts}</td>
         <td class="data">{$conflictRowCount}</td>
         </td>
     </tr>
     {/if}
-    
+
     <tr><td class="label">{ts}Records Imported{/ts}</td>
         <td class="data">{$validRowCount}</td>
         <td class="explanation">{ts}Rows imported successfully.{/ts}</td>
     </tr>
 
  </table>
+
  <div class="crm-submit-buttons">
     {include file="CRM/common/formButtons.tpl" location="bottom"}
  </div>
index 7f4205a93d820809c5fa0dcc4f0ac59ccb6d9d82..fae0daae1ed1699ec5edf8984981a466b4cbf27d 100644 (file)
@@ -55,7 +55,7 @@
                        <td class="crm-participant-participant_status">{$row.participant_status}</td>
                        <td class="crm-participant-showConfirmUrl">
                             {if $row.showConfirmUrl}
-                                <a href="{crmURL p='civicrm/event/confirm' q="reset=1&participantId=`$row.participant_id`"}">{ts}Confirm Registration{/ts}</a>                            
+                                <a href="{crmURL p='civicrm/event/confirm' q="reset=1&participantId=`$row.participant_id`"}">{ts}Confirm Registration{/ts}</a>
                             {/if}
                         </td>
                     </tr>
@@ -66,7 +66,7 @@
         <div class="messages status no-popup">
            <div class="icon inform-icon"></div>&nbsp;
                  {ts}You are not registered for any current or upcoming Events.{/ts}
-               
+
         </div>
     {/if}
 </div>
index 6648cf0ff1eea328d1bec2020504aa5c01b80fc4..183753e117ca3fd6190d27946d8f3a9db6b3a5cb 100644 (file)
@@ -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}
 <div class="action-link section iCal_links-section">
-    <a href="{$icalFile}" title="{ts}Download iCalendar entry for this event.{/ts}"><img src="{$config->resourceBase}i/office-calendar.png" alt="{ts}Download iCalendar entry for this event.{/ts}"></a>&nbsp;&nbsp;<a href="{$icalFeed}" title="{ts}iCalendar feed for this event.{/ts}"><img src="{$config->resourceBase}i/ical_feed.gif" alt="{ts}iCalendar feed for this event.{/ts}" style="margin-bottom: 4px;" /></a> 
+    <a href="{$icalFile}" title="{ts}Download iCalendar entry for this event.{/ts}"><img src="{$config->resourceBase}i/office-calendar.png" alt="{ts}Download iCalendar entry for this event.{/ts}"></a>&nbsp;&nbsp;<a href="{$icalFeed}" title="{ts}iCalendar feed for this event.{/ts}"><img src="{$config->resourceBase}i/ical_feed.gif" alt="{ts}iCalendar feed for this event.{/ts}" style="margin-bottom: 4px;" /></a>
 </div>
index 1dc67719f4a141c2e76634265af0594f3bce1aa8..e9966ee141221235822302d036a0cb0fe34e67e1 100644 (file)
@@ -27,7 +27,7 @@
 <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. Unbalanced transactions may be created if you delete this account.{/ts} {ts}Do you want to continue?{/ts}
       </div>
   {else}
index d977fc0f90bc8951f3a051d32ed98ab4334bfe65..61fedde5ff6a40aa63c234a74225c831ca2db859 100644 (file)
@@ -24,7 +24,7 @@
  +--------------------------------------------------------------------+
 *}
 <div id="GrantForm" class="form-item">
-    <table class="form-layout"> 
+    <table class="form-layout">
        {include file="CRM/Grant/Form/Search/Common.tpl"}
     </table>
 </div>
index 9678b56a8631c50e03d8192aefacd1f081e6975a..12383177cf60ce5dfcabbd902b63c31eecddc7a6 100644 (file)
     </td>
     <td>
         {$form.grant_type_id.label}<br />
-        {$form.grant_type_id.html} 
+        {$form.grant_type_id.html}
     </td>
 </tr>
 <tr>
     <td>
         {$form.grant_amount_low.label}<br />
         {$form.grant_amount_low.html}
-    </td> 
+    </td>
     <td colspan="2">
         {$form.grant_amount_high.label}<br />
         {$form.grant_amount_high.html}
@@ -56,7 +56,7 @@
         {$form.grant_application_received_date_high.label}<br />
         {include file="CRM/common/jcalendar.tpl" elementName=grant_application_received_date_high}
         &nbsp;{$form.grant_application_received_notset.html}&nbsp;&nbsp;{ts}Date is not set{/ts}
-    </td>          
+    </td>
 </tr>
 <tr>
     <td>
         {include file="CRM/common/jcalendar.tpl" elementName=grant_decision_date_low}
     </td>
     <td colspan="2">
-        {$form.grant_decision_date_high.label}<br /> 
+        {$form.grant_decision_date_high.label}<br />
         {include file="CRM/common/jcalendar.tpl" elementName=grant_decision_date_high}
         &nbsp;{$form.grant_decision_date_notset.html}&nbsp;&nbsp;{ts}Date is not set{/ts}
-    </td>          
+    </td>
 </tr>
 <tr>
-    <td> 
-        {$form.grant_money_transfer_date_low.label}<br /> 
+    <td>
+        {$form.grant_money_transfer_date_low.label}<br />
         {include file="CRM/common/jcalendar.tpl" elementName=grant_money_transfer_date_low}
     </td>
-    <td colspan="2">                 
-        {$form.grant_money_transfer_date_high.label}<br /> 
+    <td colspan="2">
+        {$form.grant_money_transfer_date_high.label}<br />
         {include file="CRM/common/jcalendar.tpl" elementName=grant_money_transfer_date_high}
         &nbsp;{$form.grant_money_transfer_date_notset.html}&nbsp;&nbsp;{ts}Date is not set{/ts}
-    </td>          
+    </td>
 </tr>
 <tr>
     <td>
@@ -89,7 +89,7 @@
         {$form.grant_due_date_high.label}<br />
         {include file="CRM/common/jcalendar.tpl" elementName=grant_due_date_high}
         &nbsp;{$form.grant_due_date_notset.html}&nbsp;&nbsp;{ts}Date is not set{/ts}
-    </td>          
+    </td>
 </tr>
 {if $grantGroupTree}
 <tr>
index e8ca97fc8dba679859722c21dc07463ff503b351..dcb2d12052c1d8468dbc21607e0c05c12dc6bed9 100644 (file)
@@ -26,7 +26,7 @@
 {if $totalSelectedGrants}
     {ts 1=$totalSelectedGrants}Number of selected grants: %1{/ts}
 {/if}
-{if $rows } 
+{if $rows }
 <div class="form-item">
 <table width="30%">
   <tr class="columnheader">
index 0eccf29b492a1d1ca6caee1ecb28a025c9cd8c14..248c4ea01e6a5ff96ac5702febc75c5a6b9982ee 100644 (file)
@@ -25,7 +25,7 @@
 *}
 <p>
 
-{if $rows } 
+{if $rows }
 <div class="crm-submit-buttons element-right">{$form.buttons.html}</div>
 <div class="spacer"></div>
 <br />
index 6c7878709444c791b0866ccb93e21bbe74cc8370..4036e7a6a84a686c3ac4cfc052a39de6fd23cb44 100644 (file)
@@ -23,7 +23,7 @@
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
 *}
-{* Update Grants *} 
+{* Update Grants *}
 <div class="crm-block crm-form-block crm-grants-update-form-block">
     <p>{ts}Enter values for the fields you wish to update. Leave fields blank to preserve existing values.{/ts}</p>
     <table class="form-layout-compressed">
index 57c88b32012a862dbae6db2787bad78a7e734adf..271f5dfea35184cc4d74c84f073fb0283afea3bc 100644 (file)
@@ -62,7 +62,7 @@ You have {$grantSummary.total_grants} grant(s) registered in your database.
 
 
 {if $pager->_totalItems}
-    
+
     <h3>{ts}Recent Grants{/ts}</h3>
     <div class="form-item">
         {include file="CRM/Grant/Form/Selector.tpl" context="DashBoard"}
index 7573c4e4184ccade86fa88a1bdf8e32c7c9335ea..77f8ba51d0bffc3046d925c77e01ce8a09fac361 100644 (file)
@@ -1,6 +1,6 @@
 {if $validCiviMailing}
     <div id="mailingForm" class="form-item">
-    <table class="form-layout"> 
+    <table class="form-layout">
        {include file="CRM/Mailing/Form/Search/Common.tpl"}
     </table>
     </div>
index 5861ee4ab2831a3ac0d8dec28dc725884205524a..6f9206969807c543325163125e3c7e1d64110a1a 100644 (file)
@@ -25,7 +25,7 @@
 *}
 {ts 1=$totalSelectedMailingRecipients}Number of selected Mailing Recipients: %1{/ts}
 
-{if $rows } 
+{if $rows }
 <div class="crm-block crm-form-block crm-mailing-task-form-block">
 <table width="30%">
   <tr class="columnheader">
index a34b21d4198aee08c70dec44eda72a898fc949b8..4d623a4f40ba377c02a0542ec1a3f4f965efa09f 100644 (file)
@@ -25,7 +25,7 @@
 *}
 <p>
 
-{if $rows} 
+{if $rows}
 <div class="form-item crm-block crm-form-block crm-mailing-form-block">
      <span class="element-right">{$form.buttons.html}</span>
 </div>
@@ -42,7 +42,7 @@
     <th>{ts}Completed Date{/ts}</th>
   </tr>
 {foreach from=$rows item=row}
-    <tr class="{cycle values="odd-row,even-row"} crm-mailing">       
+    <tr class="{cycle values="odd-row,even-row"} crm-mailing">
       <td class='crm-mailing-sort_name'>{$row.sort_name}</td>
       <td {if ($row.email_on_hold eq 1) or ($row.contact_opt_out eq 1)}class='font-red'{/if}>{$row.email}</td>
       <td class='crm-mailing-mailing_name'>{$row.mailing_name}</td>
index 434537656bad9fcdf586d25ee9c273a607eabeb3..d76e95caeb89f90acf86c4a1d123517cb82e6a78 100644 (file)
   <table class="form-layout">
     <tr class="crm-mailing-test-form-block-test_email"><td class="label">{$form.test_email.label}</td><td>{$form.test_email.html} {ts}(filled with your contact's token values){/ts}</td></tr>
     <tr class="crm-mailing-test-form-block-test_group"><td class="label">{$form.test_group.label}</td><td>{$form.test_group.html}</td></tr>
-    <tr><td></td><td>{$form.sendtest.html}</td>  
+    <tr><td></td><td>{$form.sendtest.html}</td>
   </table>
 </fieldset>
 
 <div class="crm-accordion-wrapper crm-plain_text_email-accordion collapsed">
     <div class="crm-accordion-header">
-         
+
         {ts}Preview Mailing{/ts}
     </div><!-- /.crm-accordion-header -->
     <div class="crm-accordion-body">
@@ -59,8 +59,8 @@
           {/if}
         </table>
     </div><!-- /.crm-accordion-body -->
-</div><!-- /.crm-accordion-wrapper -->    
+</div><!-- /.crm-accordion-wrapper -->
 
 <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl"}</div>
-    
+
 </div><!-- / .crm-form-block -->
index ec61fdf26f3897f8fb62254af93f97a6d0557c96..aca7c5902a0d4bb437b8e1a3e96583bbc4a009a5 100644 (file)
@@ -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})
                   + '<ul><li><a href="' + renewUrl + '">'
index 23e976bf73b37c48e88f80422ea98cd8cf112dad..138cdc55a3684c4a475fc4fac2fe977dbb0f9cd5 100644 (file)
@@ -25,7 +25,7 @@
 *}
 {ts 1=$totalSelectedMembers}Number of selected memberships: %1{/ts}
 
-{if $rows } 
+{if $rows }
 <div class="form-item">
 <table width="30%">
   <tr class="columnheader">
index b6b0e7ef62248c21a9aae8807be63c0dced0d5e3..2b6c76629ebee393bc111aa99f96f90959b29d80 100644 (file)
@@ -24,7 +24,7 @@
  +--------------------------------------------------------------------+
 *}
 <p>
-{if $rows } 
+{if $rows }
 <div class="form-item">
      <span class="element-right">{include file="CRM/common/formButtons.tpl" location="top"}</span>
 </div>
index b440a6ca4a0bde9eecee57d1bd21081c3582cb9f..81023ab80d43d6a44fc0f4e0b002a408861d699a 100644 (file)
@@ -39,7 +39,7 @@
 
  {* Table for mapping data to CRM fields *}
  {include file="CRM/Member/Import/Form/MapTable.tpl}
+
 <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
 </div>
  {$initHideBoxes}
@@ -48,6 +48,6 @@
 if ( document.getElementsByName("saveMapping")[0].checked ) {
     document.getElementsByName("updateMapping")[0].checked = true;
     document.getElementsByName("saveMapping")[0].checked = false;
-} 
+}
 </script>
 {/literal}
index dadd419e9777c33d8d95015fddcaf5525b67dd84..cfc5119e3ee5aa210815920f3b4eb198133d2ed8 100644 (file)
 
  {* WizardHeader.tpl provides visual display of steps thru the wizard as well as title for current step *}
  {include file="CRM/common/WizardHeader.tpl"}
+
  <div id="help">
     <p>
-    {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}
     </p>
-    
+
     {if $invalidRowCount}
         <p class="error">
         {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 - <a href='%2'>Download Errors</a>. Then correct them in the original import file, cancel this import and begin again at step 1.{/ts}
         {ts 1=$conflictRowCount 2=$downloadConflictRecordsUrl}CiviCRM has detected %1 records with conflicting transaction ids within this data file. If you continue, these records will be skipped. OR, you can download a file with just these problem records - <a href='%2'>Download Conflicts</a>. Then correct them in the original import file, cancel this import and begin again at step 1.{/ts}
         </p>
     {/if}
-    
+
 
     <p>{ts}Click 'Import Now' if you are ready to proceed.{/ts}</p>
  </div>
- <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>   
+ <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
  {* Summary Preview (record counts) *}
  <table id="preview-counts" class="report">
     <tr><td class="label">{ts}Total Rows{/ts}</td>
         <td class="data">{$totalRowCount}</td>
         <td class="explanation">{ts}Total rows (membership records) in uploaded file.{/ts}</td>
     </tr>
-    
+
     {if $invalidRowCount}
     <tr class="error"><td class="label">{ts}Rows with Errors{/ts}</td>
         <td class="data">{$invalidRowCount}</td>
@@ -68,7 +68,7 @@
         </td>
     </tr>
     {/if}
-    
+
     {if $conflictRowCount}
     <tr class="error"><td class="label">{ts}Conflicting Rows{/ts}</td>
         <td class="data">{$conflictRowCount}</td>
         <td class="explanation">{ts}Total rows to be imported.{/ts}</td>
     </tr>
  </table>
-  
+
 
  {* Table for mapping preview *}
  {include file="CRM/Member/Import/Form/MapTable.tpl}
+
+
  <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
  </div>
index c04ccab752f6e987cfcc5e48c711920f1ef36644..5edf2ec265ba15b27f2c82d525387b9eb02c728f 100644 (file)
 <div class="crm-block crm-form-block crm-member-import-summary-form-block">
  {* WizardHeader.tpl provides visual display of steps thru the wizard as well as title for current step *}
  {include file="CRM/common/WizardHeader.tpl"}
+
  <div id="help">
     <p>
     <strong>{ts}Import has completed successfully.{/ts}</strong> {ts}The information below summarizes the results.{/ts}
     </p>
-    
+
    {if $unMatchCount }
         <p class="error">
         {ts count=$unMatchCount plural='CiviCRM has detected mismatched membership IDs. These records have not been Updated.'}CiviCRM has detected mismatched membership ID. This record has not been updated.{/ts}
@@ -42,8 +42,8 @@
         <p class="error">
         {ts 1=$downloadMismatchRecordsUrl}You can <a href='%1'>Download Mismatched Memberships</a>. You may then correct them, and import the new file with the corrected data.{/ts}
         </p>
-    {/if} 
-   
+    {/if}
+
     {if $invalidRowCount }
         <p class="error">
         {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}
@@ -71,7 +71,7 @@
         </p>
     {/if}
  </div>
- <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>   
+ <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
  {* Summary of Import Results (record counts) *}
  <table id="summary-counts" class="report">
     <tr><td class="label">{ts}Total Rows{/ts}</td>
@@ -89,7 +89,7 @@
         </td>
     </tr>
     {/if}
-    
+
     {if $unMatchCount }
     <tr class="error"><td class="label">{ts}Mismatched Rows (skipped){/ts}</td>
         <td class="data">{$unMatchCount}</td>
         </td>
     </tr>
     {/if}
-    
+
     {if $conflictRowCount}
     <tr class="error"><td class="label">{ts}Conflicting Rows (skipped){/ts}</td>
         <td class="data">{$conflictRowCount}</td>
         </td>
     </tr>
     {/if}
-    
+
     <tr><td class="label">{ts}Records Imported{/ts}</td>
         <td class="data">{$validRowCount}</td>
         <td class="explanation">{ts}Rows imported successfully.{/ts}</td>
     </tr>
 
  </table>
+
  <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
  </div>
index f8b2cb09a6b4b9f3b6af837dbd26e7d65dd6eff1..5f191a8158a9f855ae8baf109e364147e04145db 100644 (file)
@@ -18,7 +18,7 @@ CRM.$(function($) {
   // Note: Queue API provides "#remaining tasks" but not "#completed tasks" or "#total tasks".
   // To compute a %complete, we manually track #completed. This only works nicely if we
   // assume that the queue began with a fixed #tasks.
-  
+
   var queueRunnerData = {/literal}{$queueRunnerData|@json}{literal};
 
   var displayResponseData = function(data, textStatus, jqXHR) {
@@ -26,10 +26,10 @@ CRM.$(function($) {
       window.location.href = data.redirect_url;
       return;
     }
-    
+
     var pct = 100 * queueRunnerData.completed / (queueRunnerData.completed + queueRunnerData.numberOfItems);
     $("#crm-queue-runner-progress").progressbar({ value: pct });
-    
+
     if (data.is_error) {
       $("#crm-queue-runner-buttonset").show();
       if (queueRunnerData.isEnded) {
@@ -41,24 +41,24 @@ CRM.$(function($) {
     } else {
       $('#crm-queue-runner-title').text('Executed: ' + data.last_task_title);
     }
-    
+
     if (data.exception) {
       $('#crm-queue-runner-message').html('');
       $('<div></div>').html(data.exception).prependTo('#crm-queue-runner-message');
     }
-    
+
   };
-  
+
   var handleError = function(jqXHR, textStatus, errorThrown) {
     // Do this regardless of whether the response was well-formed
     $("#crm-queue-runner-buttonset").show();
-    
+
     var data = $.parseJSON(jqXHR.responseText)
     if (data) {
       displayResponseData(data);
     }
   };
-  
+
   var handleSuccess = function(data, textStatus, jqXHR) {
     if (!data.is_error) {
       queueRunnerData.completed++;
@@ -66,9 +66,9 @@ CRM.$(function($) {
     if (data.numberOfItems) {
       queueRunnerData.numberOfItems = parseInt(data.numberOfItems);
     }
-    
+
     displayResponseData(data);
-    
+
     // FIXME re-consider merits of is_continue in the corner-case of executing last step
     if (data.is_continue) {
       window.setTimeout(runNext, 50);
@@ -77,7 +77,7 @@ CRM.$(function($) {
       window.setTimeout(runNext, 50);
     }
   };
-  
+
   // Dequeue and execute the next item
   var runNext = function() {
     $.ajax({
@@ -94,12 +94,12 @@ CRM.$(function($) {
       success: handleSuccess
     });
   }
-  
+
   var retryNext = function() {
     $('#crm-queue-runner-message').html('');
     runNext();
   }
-  
+
   // Dequeue and the next item, then move on to runNext for the subsequent items
   var skipNext = function() {
     $.ajax({
@@ -117,9 +117,9 @@ CRM.$(function($) {
       success: handleSuccess
     });
   }
-  
+
   // Set up the UI
-  
+
   $("#crm-queue-runner-progress").progressbar({ value: 0 });
   if (queueRunnerData.buttons.retry == 1) {
   $("#crm-queue-runner-retry").button({
index 7540165a6251559da2a23a3388218700f63290ac..bde34cdd40183af3ea655407bad0edff19f299aa 100644 (file)
@@ -74,9 +74,9 @@
             {if !$wizard.steps[step].valid}
                 {assign var="stepClass" value="$stepClass not-valid"}
             {/if}
-            {* wizard.steps[step].link value is passed for wizards/steps which allow clickable navigation *} 
+            {* wizard.steps[step].link value is passed for wizards/steps which allow clickable navigation *}
             <li class="{$stepClass}">{$stepPrefix}{if $wizard.steps[step].link}<a href="{$wizard.steps[step].link}">{/if}{$title}{if $wizard.steps[step].link}</a>{/if}</li>
-        {/if} 
+        {/if}
     {/section}
    </ul>
 </div>
index ff627c457d0c7517ac306888664547f1a5dd719c..9ae419b61cd46944f5f732599da8668b2eb65ec0 100644 (file)
@@ -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;
index b51b2fda50c065679227a013df93af96c0e0f76d..41d2cba1354313a76525b9699ba34e688c46617a 100644 (file)
@@ -63,7 +63,7 @@
     {elseif !empty($form._qf_Search_next_print)}
        {$form._qf_Search_next_print.html} &nbsp; &nbsp;
      {/if}
-   
+
       <span id='task-section'>
         {$form.task.html}
         {if $actionButtonName}
index 91ca2e99f45efc9a210b44036f50246abf8d372d..85ffd721f42aa3d2812fe4e592e66e9654d90d1c 100644 (file)
@@ -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']);
index 0ab0ac71d222d75e9a57aec81e77b21efcf425f9..599a12ae2a9836b0f55b3c922822d03ce26c0585 100644 (file)
@@ -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,
     );
index a67388b87a65e54d42c963945f74b55159223f46..f80dd358cc2223321515ecabcf35fbad98e2bd76 100755 (executable)
@@ -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
 }
 
index 13cc25053ca527e5a1cce8b3de9e321a0e32c96e..d5966b8c4109ac498d6006259c51dd6b11b93620 100755 (executable)
@@ -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;
index 1e29615a69e65d5035c283516e1e9ae525f3afd5..34a8fb76c03afa7152e7bc6c50b3632f29eca820 100644 (file)
@@ -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 );
index 56c1dd98f5f4414b059e3a32f18f2132e390088b..4a91b2fc23bfe732d25307520ca0672dc3f64fe8 100755 (executable)
@@ -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
index ac495fef04d6e47a88bc3d3f4e1e65d85af800a6..31b1ee0fae01d17fbaafb5b29ded686ddaddf315 100644 (file)
@@ -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;
index 1f3375e77aa2f48e5e36c22a27c809df1c1c671c..cc994ef5329e54bbe34df0d10faa056fe9a3ed5e 100644 (file)
@@ -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 );
     }
index 0ace60350eb2d788580ae592b02c0c48c1717431..3afa67feb8e04311f2ec9eb6c27aa6fda9380d16 100644 (file)
@@ -35,7 +35,7 @@
                                 {assign var="count" value=`$count+1`}
                             {/if}
                         {/if}
-                     {/foreach}
+                {/foreach}
                     </tr>
                 </table>
             </dd>
@@ -53,7 +53,7 @@
 <div class="form-item">
      <dt></dt>
      <dd>{include file="CRM/Event/Form/CalculatePriceset.tpl"}</dd>
-</div> 
+</div>
 {if $priceSet.help_post}
   <dt>&nbsp;</dt>
   <dd class="description">{$priceSet.help_post}</dd>
                 <td>{$form.additional_participants.html|crmReplace:class:two}<br />
                     <span class="description">{ts}You will be able to enter registration information for each additional person after you complete this page and click Continue.{/ts}</span>
                 </td>
-                   </tr>
+             </tr>
             </table>
         </div>
-    </div> 
+    </div>
 
 {* 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'}
 </div>
 
 {* 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}
 <script type="text/javascript">
 
     function allowParticipant( ) {
-       var additionalParticipant = document.getElementById('additional_participants').value; 
-       var validNumber = "";
-       for( i = 0; i< additionalParticipant.length; i++ ) {
-           if ( additionalParticipant.charAt(i) >=1 || additionalParticipant.charAt(i) <=9 ) {
-               validNumber += additionalParticipant.charAt(i);
-           } else {
-               document.getElementById('additional_participants').value = validNumber;
-           }
-       }
+  var additionalParticipant = document.getElementById('additional_participants').value;
+  var validNumber = "";
+  for( i = 0; i< additionalParticipant.length; i++ ) {
+      if ( additionalParticipant.charAt(i) >=1 || additionalParticipant.charAt(i) <=9 ) {
+    validNumber += additionalParticipant.charAt(i);
+      } else {
+    document.getElementById('additional_participants').value = validNumber;
+      }
+  }
     }
-    {/literal}{if $form.is_pay_later and $paymentProcessor.payment_processor_type EQ 'PayPal_Express'}{literal} 
-       showHidePayPalExpressOption();
+    {/literal}{if $form.is_pay_later and $paymentProcessor.payment_processor_type EQ 'PayPal_Express'}{literal}
+  showHidePayPalExpressOption();
     {/literal} {/if}{literal}
     function showHidePayPalExpressOption()
     {
         if (document.getElementsByName("is_pay_later")[0].checked) {
-           show("crm-submit-buttons");
-           hide("paypalExpress");
-       } else {
+      show("crm-submit-buttons");
+      hide("paypalExpress");
+  } else {
             show("paypalExpress");
             hide("crm-submit-buttons");
         }
     }
 
 </script>
-{/literal} 
+{/literal}
index 0ace60350eb2d788580ae592b02c0c48c1717431..3afa67feb8e04311f2ec9eb6c27aa6fda9380d16 100644 (file)
@@ -35,7 +35,7 @@
                                 {assign var="count" value=`$count+1`}
                             {/if}
                         {/if}
-                     {/foreach}
+                {/foreach}
                     </tr>
                 </table>
             </dd>
@@ -53,7 +53,7 @@
 <div class="form-item">
      <dt></dt>
      <dd>{include file="CRM/Event/Form/CalculatePriceset.tpl"}</dd>
-</div> 
+</div>
 {if $priceSet.help_post}
   <dt>&nbsp;</dt>
   <dd class="description">{$priceSet.help_post}</dd>
                 <td>{$form.additional_participants.html|crmReplace:class:two}<br />
                     <span class="description">{ts}You will be able to enter registration information for each additional person after you complete this page and click Continue.{/ts}</span>
                 </td>
-                   </tr>
+             </tr>
             </table>
         </div>
-    </div> 
+    </div>
 
 {* 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'}
 </div>
 
 {* 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}
 <script type="text/javascript">
 
     function allowParticipant( ) {
-       var additionalParticipant = document.getElementById('additional_participants').value; 
-       var validNumber = "";
-       for( i = 0; i< additionalParticipant.length; i++ ) {
-           if ( additionalParticipant.charAt(i) >=1 || additionalParticipant.charAt(i) <=9 ) {
-               validNumber += additionalParticipant.charAt(i);
-           } else {
-               document.getElementById('additional_participants').value = validNumber;
-           }
-       }
+  var additionalParticipant = document.getElementById('additional_participants').value;
+  var validNumber = "";
+  for( i = 0; i< additionalParticipant.length; i++ ) {
+      if ( additionalParticipant.charAt(i) >=1 || additionalParticipant.charAt(i) <=9 ) {
+    validNumber += additionalParticipant.charAt(i);
+      } else {
+    document.getElementById('additional_participants').value = validNumber;
+      }
+  }
     }
-    {/literal}{if $form.is_pay_later and $paymentProcessor.payment_processor_type EQ 'PayPal_Express'}{literal} 
-       showHidePayPalExpressOption();
+    {/literal}{if $form.is_pay_later and $paymentProcessor.payment_processor_type EQ 'PayPal_Express'}{literal}
+  showHidePayPalExpressOption();
     {/literal} {/if}{literal}
     function showHidePayPalExpressOption()
     {
         if (document.getElementsByName("is_pay_later")[0].checked) {
-           show("crm-submit-buttons");
-           hide("paypalExpress");
-       } else {
+      show("crm-submit-buttons");
+      hide("paypalExpress");
+  } else {
             show("paypalExpress");
             hide("crm-submit-buttons");
         }
     }
 
 </script>
-{/literal} 
+{/literal}
index d60a4f800274713eb8865f1c394b99bdb82a8370..617d31abebd5bee5538ad89f9b851a4ef0ef5806 100644 (file)
@@ -1,38 +1,38 @@
 {* this template is used for displaying event information *}
 
 <div class="vevent">
-       <h2><span class="summary">{$event.title}</span></h2>    
+  <h2><span class="summary">{$event.title}</span></h2>
     <div class="display-block">
-       <table class="form-layout">
-       {if $event.summary}
-               <tr><td colspan="2" class="report">{$event.summary}</td></tr>
-       {/if}
-       {if $event.description}
-               <tr><td colspan="2" class="report">
-               <span class="summary">{$event.description}</span></td></tr>
-       {/if}
-       <tr><td><label>{ts}When{/ts}</label></td>
+  <table class="form-layout">
+        {if $event.summary}
+    <tr><td colspan="2" class="report">{$event.summary}</td></tr>
+        {/if}
+        {if $event.description}
+          <tr><td colspan="2" class="report">
+    <span class="summary">{$event.description}</span></td></tr>
+  {/if}
+  <tr><td><label>{ts}When{/ts}</label></td>
             <td width="90%">
-           <abbr class="dtstart" title="{$event.event_start_date|crmDate}">
-               {$event.event_start_date|crmDate}</abbr>
-       
-       {if $event.event_end_date}
-               &nbsp; {ts}through{/ts} &nbsp;
+      <abbr class="dtstart" title="{$event.event_start_date|crmDate}">
+        {$event.event_start_date|crmDate}</abbr>
+
+  {if $event.event_end_date}
+    &nbsp; {ts}through{/ts} &nbsp;
                 {* 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"}
-                       <abbr class="dtend" title="{$event.event_end_date|crmDate:0:1}">
-                       {$event.event_end_date|crmDate:0:1}
-                       </abbr>        
+      <abbr class="dtend" title="{$event.event_end_date|crmDate:0:1}">
+      {$event.event_end_date|crmDate:0:1}
+      </abbr>
                 {else}
-                       <abbr class="dtend" title="{$event.event_end_date|crmDate}">
-                       {$event.event_end_date|crmDate}
-                       </abbr>         
+      <abbr class="dtend" title="{$event.event_end_date|crmDate}">
+      {$event.event_end_date|crmDate}
+      </abbr>
                 {/if}
             {/if}
             </td>
-       </tr>
-       
-       {if $isShowLocation}
+  </tr>
+
+  {if $isShowLocation}
         {if $location.1.name || $location.1.address}
             <tr><td><label>{ts}Location{/ts}</label></td>
                 <td>
                 {/if}
                 </td>
             </tr>
-               {/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}
         <tr><td><label>{ts}Contact{/ts}</label></td>
-            <td>       {* loop on any phones and emails for this event *}
+            <td>  {* 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}:
                     <span class="tel">{$phone.phone}</span> <br />
                     {/if}
                 {/foreach}
@@ -66,7 +66,7 @@
             </td>
         </tr>
     {/if}
-       </table>
+  </table>
 
     {include file="CRM/Custom/Page/CustomDataView.tpl"}
 
@@ -79,5 +79,5 @@
     { if $event.is_public }
         <br />{include file="CRM/Event/Page/iCalLinks.tpl"}
     {/if}
-       </div>
+  </div>
 </div>
index d60a4f800274713eb8865f1c394b99bdb82a8370..617d31abebd5bee5538ad89f9b851a4ef0ef5806 100644 (file)
@@ -1,38 +1,38 @@
 {* this template is used for displaying event information *}
 
 <div class="vevent">
-       <h2><span class="summary">{$event.title}</span></h2>    
+  <h2><span class="summary">{$event.title}</span></h2>
     <div class="display-block">
-       <table class="form-layout">
-       {if $event.summary}
-               <tr><td colspan="2" class="report">{$event.summary}</td></tr>
-       {/if}
-       {if $event.description}
-               <tr><td colspan="2" class="report">
-               <span class="summary">{$event.description}</span></td></tr>
-       {/if}
-       <tr><td><label>{ts}When{/ts}</label></td>
+  <table class="form-layout">
+        {if $event.summary}
+    <tr><td colspan="2" class="report">{$event.summary}</td></tr>
+        {/if}
+        {if $event.description}
+          <tr><td colspan="2" class="report">
+    <span class="summary">{$event.description}</span></td></tr>
+  {/if}
+  <tr><td><label>{ts}When{/ts}</label></td>
             <td width="90%">
-           <abbr class="dtstart" title="{$event.event_start_date|crmDate}">
-               {$event.event_start_date|crmDate}</abbr>
-       
-       {if $event.event_end_date}
-               &nbsp; {ts}through{/ts} &nbsp;
+      <abbr class="dtstart" title="{$event.event_start_date|crmDate}">
+        {$event.event_start_date|crmDate}</abbr>
+
+  {if $event.event_end_date}
+    &nbsp; {ts}through{/ts} &nbsp;
                 {* 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"}
-                       <abbr class="dtend" title="{$event.event_end_date|crmDate:0:1}">
-                       {$event.event_end_date|crmDate:0:1}
-                       </abbr>        
+      <abbr class="dtend" title="{$event.event_end_date|crmDate:0:1}">
+      {$event.event_end_date|crmDate:0:1}
+      </abbr>
                 {else}
-                       <abbr class="dtend" title="{$event.event_end_date|crmDate}">
-                       {$event.event_end_date|crmDate}
-                       </abbr>         
+      <abbr class="dtend" title="{$event.event_end_date|crmDate}">
+      {$event.event_end_date|crmDate}
+      </abbr>
                 {/if}
             {/if}
             </td>
-       </tr>
-       
-       {if $isShowLocation}
+  </tr>
+
+  {if $isShowLocation}
         {if $location.1.name || $location.1.address}
             <tr><td><label>{ts}Location{/ts}</label></td>
                 <td>
                 {/if}
                 </td>
             </tr>
-               {/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}
         <tr><td><label>{ts}Contact{/ts}</label></td>
-            <td>       {* loop on any phones and emails for this event *}
+            <td>  {* 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}:
                     <span class="tel">{$phone.phone}</span> <br />
                     {/if}
                 {/foreach}
@@ -66,7 +66,7 @@
             </td>
         </tr>
     {/if}
-       </table>
+  </table>
 
     {include file="CRM/Custom/Page/CustomDataView.tpl"}
 
@@ -79,5 +79,5 @@
     { if $event.is_public }
         <br />{include file="CRM/Event/Page/iCalLinks.tpl"}
     {/if}
-       </div>
+  </div>
 </div>
index 997b3de98a5ff5229b1ee65c3a07d4caa5e0a28f..29e022a3f940757a51e62e8142fb259003ac94eb 100644 (file)
@@ -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
    */
index 1b6c7fc4ad466bd8d6e91591980171e1d73e5ed7..94936edf4856ac4c88d711d07e3986246091ec97 100644 (file)
@@ -36,5 +36,5 @@
    <billingMode>notify</billingMode>
    <isRecur>0</isRecur>
    <paymentType>1</paymentType>
-  </typeInfo>  
+  </typeInfo>
 </extension>
index 016fe1c67aac3a0351e8dd3c85320734f17ef86c..1abb8025f436b99a1f15e29bfa7068a9598fea4d 100644 (file)
@@ -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.
 
index 69a95cd43364d1038f797ccd31541cd32a5f070d..92ceb9da6a3068cf09ef0a0c282959e0ad093845 100755 (executable)
@@ -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;
index f66785dbcdb17cb3b6913bfa862963780c5571e8..5274280fc8791f54d50cec9bca9b18b79d7b2aea 100644 (file)
@@ -27,7 +27,7 @@
 <div class="crm-form-block crm-search-form-block">
 <div class="crm-accordion-wrapper crm-activity_search-accordion {if $rows}crm-accordion-closed{else}crm-accordion-open{/if}">
  <div class="crm-accordion-header crm-master-accordion-header">
-  <div class="icon crm-accordion-pointer"></div> 
+  <div class="icon crm-accordion-pointer"></div>
    {ts}Edit Search Criteria{/ts}
 </div><!-- /.crm-accordion-header -->
 <div class="crm-accordion-body">
 
 <div class="crm-content-block">
     {if $rowsEmpty}
-       <div class="crm-results-block crm-results-block-empty">
+  <div class="crm-results-block crm-results-block-empty">
     {include file="CRM/Contact/Form/Search/Custom/EmptyResults.tpl"}
     </div>
 {/if}
 
 {if $rows}
-       <div class="crm-results-block">
+  <div class="crm-results-block">
     {* 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 *}
-       <div class="crm-search-tasks">
+  <div class="crm-search-tasks">
     {include file="CRM/Contact/Form/Search/ResultTasks.tpl"}
-       </div>
+  </div>
     {* This section displays the rows along and includes the paging controls *}
     <div class="crm-search-results">
-    
+
     {include file="CRM/common/pager.tpl" location="top"}
 
     {include file="CRM/common/pagerAToZ.tpl"}
                                 {/if}
                                 {if isset($row.activity_subject) AND $row.activity_subject NEQ 'NULL'}{$row.activity_subject}{else}{ts}(no subject){/ts}{/if}</a>
                             </td>
-                        {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}
                             <td>{$row.$fName}</td>
                         {/if}
 
     </div>
     {* END Actions/Results section *}
-       </div>
+  </div>
 {/if}
 </div>
 {/if}
index 96d882448c0b265199ffe05d0c0ba0a6bf91f206..615e6ac472195a9f3bb46fae854af88bb088fd49 100755 (executable)
@@ -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
index 7dcbd6d4e64aeeb9e49d112e3fbb34cf1e14ce2e..acdc4995f0f0e8a4690f4e7ccf550cc3b82dd4fc 100755 (executable)
@@ -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 <remigijus@jarmalavicius.lt> 
+# Author: Remigijus Jarmalavičius <remigijus@jarmalavicius.lt>
 # Author: Vytautas Povilaitis <php-checker@vytux.lt>
 # 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
index 966768eedbb0b0b5541ecf2b60659f2f50d99349..3a3cacc8e6a616da1b489c95b3dd8ffb873ef0e6 100644 (file)
@@ -6,19 +6,19 @@
 <xsl:decimal-format decimal-separator="." grouping-separator="," />
 <!--
     Copyright  2001-2004 The Apache Software Foundation
-   
+
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      You may obtain a copy of the License at
-   
+
          http://www.apache.org/licenses/LICENSE-2.0
-   
+
      Unless required by applicable law or agreed to in writing, software
      distributed under the License is distributed on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
      limitations under the License.
-   
+
 -->
 
 <!--
@@ -172,10 +172,10 @@ TD.uncovered {
     color: #df0000;
 }
 PRE.srcLine {
-  BACKGROUND: #ffffff; MARGIN-TOP: 0px; MARGIN-BOTTOM: 0px; 
+  BACKGROUND: #ffffff; MARGIN-TOP: 0px; MARGIN-BOTTOM: 0px;
 }
 PRE.srcLineHighLight {
-  BACKGROUND: #F0C8C8; MARGIN-TOP: 0px; MARGIN-BOTTOM: 0px; 
+  BACKGROUND: #F0C8C8; MARGIN-TOP: 0px; MARGIN-BOTTOM: 0px;
 }
 td.lineCount, td.coverageCount {
       BACKGROUND: #F0F0F0; PADDING-RIGHT: 3px;
@@ -196,7 +196,7 @@ td.srcLine {
       background: #C8C8F0;
 }
 TD.srcLineClassStart {
-   WIDTH: 100%; BORDER-TOP:#dcdcdc 1px solid; FONT-WEIGHT: bold;    
+   WIDTH: 100%; BORDER-TOP:#dcdcdc 1px solid; FONT-WEIGHT: bold;
 }
 .srcLine , .srcLine ol, .srcLine ol li {margin: 0;}
 .srcLine .de1, .srcLine .de2 {font-family: 'Courier New', Courier, monospace; font-weight: normal;}
@@ -296,7 +296,7 @@ TD.srcLineClassStart {
                 <td class="small">LOC: <xsl:value-of select="count(package/class/sourcefile/sourceline)"/></td>
                 <td class="small">Statements: <xsl:value-of select="@statementcount"/></td>
             </tr>
-        </table>        
+        </table>
         <br/>
 
         <table class="log" cellpadding="5" cellspacing="0" width="100%">
@@ -420,7 +420,7 @@ TD.srcLineClassStart {
                     <td class="small">LOC: <xsl:value-of select="count(class/sourcefile/sourceline)"/></td>
                     <td class="small">Statements: <xsl:value-of select="@statementcount"/></td>
                 </tr>
-            </table>        
+            </table>
             <br/>
 
             <table class="log" cellpadding="5" cellspacing="0" width="100%">
@@ -469,7 +469,7 @@ TD.srcLineClassStart {
                     <td class="small">LOC: <xsl:value-of select="count(sourcefile/sourceline)"/></td>
                     <td class="small">Statements: <xsl:value-of select="@statementcount"/></td>
                 </tr>
-            </table>        
+            </table>
             <br/>
 
             <!-- class summary -->
index f0ef46952277fd66f67a25f92de8c66eaedf1cea..1784ce19205282ea81113e9ab4ad1b3c34d7e32f 100644 (file)
@@ -2,29 +2,29 @@
 <xsl:output method="html" indent="yes" encoding="US-ASCII"/>
 <!--
     Copyright  2000-2004 The Apache Software Foundation
-   
+
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      You may obtain a copy of the License at
-   
+
          http://www.apache.org/licenses/LICENSE-2.0
-   
+
      Unless required by applicable law or agreed to in writing, software
      distributed under the License is distributed on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
      limitations under the License.
-   
+
 -->
+
 <!--
 
   The purpose have this XSL is to provide a nice way to look at the output
   from the Ant XmlLogger (ie: ant -listener org.apache.tools.ant.XmlLogger )
-  
+
   @author <a href="mailto:michiel.rook@gmail.com>Michiel Rook</a>
   @author <a href="mailto:sbailliez@apache.org">Stephane Bailliez</a>
-  
+
 -->
 <xsl:decimal-format decimal-separator="." grouping-separator="," />
 
       color:#FFFFFF;
       font-weight: bold
     }
-    .a td { 
+    .a td {
       background: #efefef;
     }
-    .b td { 
+    .b td {
       background: #fff;
     }
     th, td {
       </td>
     </tr>
     </table>
-      
+
     <table border="0" width="100%">
     <tr><td><hr noshade="yes" size="1"/></td></tr>
     </table>
     </xsl:attribute>
     <tr>
       <xsl:if test="@error">
-        <td nowrap="yes">Build Failed</td> 
+        <td nowrap="yes">Build Failed</td>
       </xsl:if>
       <xsl:if test="not(@error)">
         <td nowrap="yes">Build Complete</td>
index a3147eb9101dc63fc3da5c594a49dcd489115100..28ead3a1c5e617cc72523cbd17991428b065782a 100644 (file)
@@ -221,7 +221,7 @@ a:hover {
     <html>
         <head>
             <title>Unit Test Results: Class <xsl:value-of select="$class.name"/></title>
-            <xsl:if test="$output.sorttable = 1">           
+            <xsl:if test="$output.sorttable = 1">
                 <script language="JavaScript" src="http://www.phing.info/support/sorttable.js"/>
             </xsl:if>
             <xsl:call-template name="create.stylesheet.link">
index d71e58d9b5d125ba32a44d56f6e7b13d3a83c5e0..151e2768c1d2bf1d217c1dea79322fdbf12396ca 100644 (file)
    See the License for the specific language governing permissions and
    limitations under the License.
  -->
+
 <!--
+
  Sample stylesheet to be used with Phing/PHPUnit output.
  Based on JUnit stylesheets from Apache Ant.
+
  It creates a non-framed report that can be useful to send via
  e-mail or such.
+
  @author Michiel Rook <a href="mailto:michiel.rook@gmail.com"/>
  @author Stephane Bailliez <a href="mailto:sbailliez@apache.org"/>
  @author Erik Hatcher <a href="mailto:ehatcher@apache.org"/>
+
 -->
 <xsl:param name="output.sorttable" select="'.'"/>
 
@@ -65,7 +65,7 @@
                    table.details tr td{
                        background:#eeeee0;
                    }
-               
+
                    p {
                        line-height:1.5em;
                        margin-top:0.5em; margin-bottom:1.0em;
         </head>
         <body>
             <a name="top"></a>
-            <xsl:call-template name="pageHeader"/>  
-            
+            <xsl:call-template name="pageHeader"/>
+
             <!-- Summary part -->
             <xsl:call-template name="summary"/>
             <hr size="1" width="95%" align="left"/>
-            
+
             <!-- Package List part -->
             <xsl:call-template name="packagelist"/>
             <hr size="1" width="95%" align="left"/>
-            
+
             <!-- For each package create its part -->
             <xsl:call-template name="packages"/>
             <hr size="1" width="95%" align="left"/>
-            
+
             <!-- For each class create the  part -->
             <xsl:call-template name="classes"/>
-            
-            <xsl:call-template name="pageFooter"/>  
+
+            <xsl:call-template name="pageFooter"/>
         </body>
     </html>
 </xsl:template>
-    
-    
-    
+
+
+
     <!-- ================================================================== -->
     <!-- Write a list of all packages with an hyperlink to the anchor of    -->
     <!-- of the package name.                                               -->
     <!-- ================================================================== -->
-    <xsl:template name="packagelist">   
+    <xsl:template name="packagelist">
         <h2>Packages</h2>
         Note: package statistics are not computed recursively, they only sum up all of its testsuites numbers.
         <table class="details sortable" border="0" cellpadding="5" cellspacing="2" width="95%">
                 <xsl:variable name="errorCount" select="sum($testsuites-in-package/@errors)"/>
                 <xsl:variable name="failureCount" select="sum($testsuites-in-package/@failures)"/>
                 <xsl:variable name="timeCount" select="sum($testsuites-in-package/@time)"/>
-                
+
                 <!-- write a summary for the package -->
                 <tr valign="top">
                     <!-- set a nice color depending if there is an error/failure -->
                     </td>
                 </tr>
             </xsl:for-each>
-        </table>        
+        </table>
     </xsl:template>
-    
-    
+
+
     <!-- ================================================================== -->
     <!-- Write a package level report                                       -->
     <!-- It creates a table with values from the document:                  -->
             <xsl:sort select="@package"/>
                 <a name="{@package}"></a>
                 <h3>Package <xsl:value-of select="@package"/></h3>
-                
+
                 <table class="details sortable" border="0" cellpadding="5" cellspacing="2" width="95%">
                     <xsl:call-template name="testsuite.test.header"/>
-            
+
                     <!-- match the testsuites of this package -->
                     <xsl:apply-templates select="/testsuites/testsuite[./@package = current()/@package]" mode="print.test"/>
                 </table>
                 <p/>
         </xsl:for-each>
     </xsl:template>
-    
+
     <xsl:template name="classes">
         <xsl:for-each select="testsuite">
             <xsl:sort select="@name"/>
             <!-- create an anchor to this class name -->
             <a name="{@name}"></a>
             <h3>TestCase <xsl:value-of select="@name"/></h3>
-            
+
             <table class="details sortable" border="0" cellpadding="5" cellspacing="2" width="95%">
               <xsl:call-template name="testcase.test.header"/>
               <!--
                 <xsl:apply-templates select="./testcase | ./testsuite/testcase" mode="print.test"/>
             </table>
             <p/>
-            
+
             <a href="#top">Back to top</a>
         </xsl:for-each>
     </xsl:template>
-    
+
     <xsl:template name="summary">
         <h2>Summary</h2>
         <xsl:variable name="testCount" select="sum(testsuite/@tests)"/>
         </tr>
         </table>
     </xsl:template>
-      
+
 <!-- Page HEADER -->
 <xsl:template name="pageHeader">
     <h1>Unit Test Results</h1>
                 <xsl:when test="@errors[.&gt; 0]">Error</xsl:when>
             </xsl:choose>
         </xsl:attribute>
-    
+
         <!-- print testsuite information -->
         <td><a href="#{@name}"><xsl:value-of select="@name"/></a></td>
         <td><xsl:value-of select="@tests"/></td>
index 5d74e86cd5a83e5e8538b4367e9edc69c0af6ec8..bf120b0776ada5112e42d9786e4ae608f013cdc1 100644 (file)
@@ -84,7 +84,7 @@
           <xsl:call-template name="str:_replace">\r
             <xsl:with-param name="string" select="substring-before($string, $search)" />\r
             <xsl:with-param name="replacements" select="$replacements[position() > 1]" />\r
-          </xsl:call-template>      \r
+          </xsl:call-template>\r
           <xsl:copy-of select="$replacement/node()" />\r
           <xsl:call-template name="str:_replace">\r
             <xsl:with-param name="string" select="substring-after($string, $search)" />\r
   </xsl:choose>\r
 </xsl:template>\r
 \r
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>\r
index 17bc700fb2bca8958f6de06b9461034e49236018..08238b5a80efda23e27ef6006c8baed59a653cd9 100755 (executable)
@@ -200,7 +200,7 @@ function do_update() {
     fi
   else
     echo "No version entered. Aborting version update."
-  fi 
+  fi
 }
 
 #################################################
index de3415f93020ab69cc08f55464ebbd87e9c5143c..6ddbec95fa094c3f855d429a581336a3d9c309e9 100644 (file)
@@ -1,4 +1,4 @@
+
 <add>
   <doc>
     <field name="id">1</field>
index 362ca52aa45f297165ac7a9e1602aec0a3bc74b3..74af34fe4cf0d4033cbbfc8f5907fc57d772dc8e 100644 (file)
@@ -18,7 +18,7 @@
 
 <!-- This is the Solr schema file. This file should be named "schema.xml" and
  should be in the conf directory under the solr home
- (i.e. ./solr/conf/schema.xml by default) 
+ (i.e. ./solr/conf/schema.xml by default)
  or located where the classloader for the Solr webapp can find it.
 
  For more information, on how to customize this file, please see
@@ -42,7 +42,7 @@
        org.apache.solr.analysis package.
     -->
 
-    <!-- The StrField type is not analyzed, but indexed/stored verbatim.  
+    <!-- The StrField type is not analyzed, but indexed/stored verbatim.
        - StrField and TextField support an optional compressThreshold which
        limits compression (if enabled in the derived fields) to values which
        exceed a certain size (in characters).
@@ -63,7 +63,7 @@
        - If sortMissingLast="false" and sortMissingFirst="false" (the default),
          then default lucene sorting will be used which places docs without the
          field first in an ascending sort and last in a descending sort.
-    -->    
+    -->
 
 
     <!-- numeric field types that store and index the text
@@ -87,7 +87,7 @@
 
     <!-- The format for this date field is of the form 1995-12-31T23:59:59Z, and
          is a more restricted form of the canonical representation of dateTime
-         http://www.w3.org/TR/xmlschema-2/#dateTime    
+         http://www.w3.org/TR/xmlschema-2/#dateTime
          The trailing "Z" designates UTC time and is mandatory.
          Optional fractional seconds are allowed: 1995-12-31T23:59:59.999Z
          All other components are mandatory.
                NOW/DAY+6MONTHS+3DAYS
                   ... 6 months and 3 days in the future from the start of
                       the current day
-                      
+
          Consult the DateField javadocs for more information.
       -->
     <fieldtype name="date" class="solr.DateField" sortMissingLast="true" omitNorms="true"/>
index 87e6b3152e0b836c5635a367d285fd6ec308b2b0..76556d7d02c2ea525d04e39de7b23eb2cb14eece 100644 (file)
@@ -44,7 +44,7 @@
     <maxMergeDocs>2147483647</maxMergeDocs>
     <maxFieldLength>10000</maxFieldLength>
 
-    <!-- If true, unlock any held write or commit locks on startup. 
+    <!-- If true, unlock any held write or commit locks on startup.
          This defeats the locking mechanism that allows multiple
          processes to safely access a lucene index, and should be
          used with care. -->
@@ -59,8 +59,8 @@
          org.apache.solr.(search|update|request|core|analysis)
      -->
 
-    <!-- autocommit pending docs if certain criteria are met 
-    <autoCommit> 
+    <!-- autocommit pending docs if certain criteria are met
+    <autoCommit>
       <maxDocs>10000</maxDocs>
     </autoCommit>
     -->
@@ -82,7 +82,7 @@
     </listener>
     -->
     <!-- A postOptimize event is fired only after every optimize command, useful
-         in conjunction with index distribution to only distribute optimized indicies 
+         in conjunction with index distribution to only distribute optimized indicies
     <listener event="postOptimize" class="solr.RunExecutableListener">
       <str name="exe">snapshooter</str>
       <str name="dir">solr/bin</str>
@@ -99,7 +99,7 @@
         queries.  An exception is thrown if exceeded.  -->
     <maxBooleanClauses>1024</maxBooleanClauses>
 
-    
+
     <!-- Cache used by SolrIndexSearcher for filters (DocSets),
          unordered sets of *all* documents that match a query.
          When a new searcher is opened, its caches may be prepopulated
     <!-- default values for query parameters -->
      <lst name="defaults">
        <str name="echoParams">explicit</str>
-       <!-- 
+       <!--
        <int name="rows">10</int>
        <str name="fl">*</str>
        <str name="version">2.1</str>
   </requestHandler>
 
   <!-- DisMaxRequestHandler allows easy searching across multiple fields
-       for simple user-entered phrases. 
+       for simple user-entered phrases.
        see http://wiki.apache.org/solr/DisMaxRequestHandler
    -->
   <requestHandler name="dismax" class="solr.DisMaxRequestHandler" >
   <!-- queryResponseWriter plugins... query responses will be written using the
     writer specified by the 'wt' request parameter matching the name of a registered
     writer.
-    The "standard" writer is the default and will be used if 'wt' is not specified 
+    The "standard" writer is the default and will be used if 'wt' is not specified
     in the request. XMLResponseWriter will be used if nothing is specified here.
     The json, python, and ruby writers are also available by default.
 
 
   <!-- XSLT response writer transforms the XML output by any xslt file found
        in Solr's conf/xslt directory.  Changes to xslt files are checked for
-       every xsltCacheLifetimeSeconds.  
+       every xsltCacheLifetimeSeconds.
    -->
   <queryResponseWriter name="xslt" class="org.apache.solr.request.XSLTResponseWriter">
     <int name="xsltCacheLifetimeSeconds">5</int>
-  </queryResponseWriter> 
-    
-  <!-- config for the admin interface --> 
+  </queryResponseWriter>
+
+  <!-- config for the admin interface -->
   <admin>
     <defaultQuery>civicrm</defaultQuery>
     <gettableFiles>solrconfig.xml schema.xml admin-extra.html</gettableFiles>
index 91b97db755afa114ee99d501f41ce16a22176f44..3bd74c86246feb18edaab1743c9054f2271aaf78 100755 (executable)
@@ -2,13 +2,13 @@
 
 SELF=$(cd $(dirname $0); pwd -P)/$(basename $0)
 
-# define your database name here, will be overriden by 
+# define your database name here, will be overriden by
 # FIRST command line argument if given
 DBNAME=
-# define your database usernamename here, will be overriden by 
+# define your database usernamename here, will be overriden by
 # SECOND command line argument if given
 DBUSER=
-# define your database password here, will be overriden by 
+# define your database password here, will be overriden by
 # THIRD command line argument if given
 DBPASS=
 
index 118b9288f385115b354efc80f92d8f6de1e159b2..eb3acb5422e843fddbaaf87b9dbe1d19df676bd8 100644 (file)
@@ -36,13 +36,13 @@ SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";
 -- Create Donors / Bidders.
 --
 
-INSERT INTO `civicrm_contact` (`contact_type`, `sort_name`, `display_name`, `first_name`, `last_name`) 
+INSERT INTO `civicrm_contact` (`contact_type`, `sort_name`, `display_name`, `first_name`, `last_name`)
 VALUES
 ('Individual', 'Mouse Micky', 'Mouse Micky', 'Mickey', 'Mouse');
 
 SELECT @donorID := id FROM `civicrm_contact` where `display_name` like 'Mouse Micky';
 
-INSERT INTO `civicrm_contact` (`contact_type`, `sort_name`, `display_name`, `first_name`, `last_name`) 
+INSERT INTO `civicrm_contact` (`contact_type`, `sort_name`, `display_name`, `first_name`, `last_name`)
 VALUES
 ('Individual', 'Doo Scooby', 'Doo Scooby', 'Scooby', 'Doo');
 
index 6d12de72c6e4cb4702f0adf97e21aa1e3f8a181d..77f04c227ed247ce7c185146a930b7aed53acd6d 100644 (file)
@@ -23,7 +23,7 @@
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
 *}
-<div class="form-item"> 
+<div class="form-item">
 <fieldset><legend>{ts}Item Information{/ts}</legend>
     <table class="form-layout-compressed">
          <tr><td class="label">{ts}Auction{/ts}</td><td>{$auctionTitle}</td></tr>
          <tr><td class="label">{$form.buy_now_value.label}</td><td>{$form.buy_now_value.html|crmReplace:class:four}<br />
 
          <tr><td>&nbsp;</td><td>{$form.is_group.html} {$form.is_group.label}<br />
-         <tr><td>&nbsp;</td><td>{$form.is_active.html} {$form.is_active.label}</td></tr> 
+         <tr><td>&nbsp;</td><td>{$form.is_active.html} {$form.is_active.label}</td></tr>
         <tr><td>&nbsp;</td><td>&nbsp;</td></tr>
     </table>
 
 {include file="CRM/Form/attachment.tpl" context="pcpCampaign"}
 
-    <dl>    
-       <dt></dt><dd class="html-adjust">{$form.buttons.html}</dd>   
-    </dl> 
-</fieldset>     
+    <dl>
+       <dt></dt><dd class="html-adjust">{$form.buttons.html}</dd>
+    </dl>
+</fieldset>
 </div>
index 9cbd85f8dcb87ac897c501dfdae33038e54f6d0b..fa3cd6cd930bbc3e5d3e91ca37a4135b3481d43d 100644 (file)
 {if $profileDisplay}
 <div class="messages status">
 <dl>
-       <dt><img src="{$config->resourceBase}i/Eyeball.gif" alt="{ts}Profile{/ts}"/></dt>
-       <dd><p><strong>{ts}Profile is not configured with Email address.{/ts}</strong></p></dd>
+    <dt><img src="{$config->resourceBase}i/Eyeball.gif" alt="{ts}Profile{/ts}"/></dt>
+      <dd><p><strong>{ts}Profile is not configured with Email address.{/ts}</strong></p></dd>
 </dl>
 </div>
 {else}
 <div class="form-item">
-{include file="CRM/common/CMSUser.tpl"} 
-{include file="CRM/UF/Form/Block.tpl" fields=$fields} 
-{if $isCaptcha} 
-{include file='CRM/common/ReCAPTCHA.tpl'} 
+{include file="CRM/common/CMSUser.tpl"}
+{include file="CRM/UF/Form/Block.tpl" fields=$fields}
+{if $isCaptcha}
+{include file='CRM/common/ReCAPTCHA.tpl'}
 {/if}
 <dl>
-       <dt></dt>
-       <dd class="html-adjust">{$form.buttons.html}</dd>
+  <dt></dt>
+  <dd class="html-adjust">{$form.buttons.html}</dd>
 </dl>
 </div>
-{/if}
\ No newline at end of file
+{/if}
index 954b5f2ab39505b501543d6dc8e59898d4ed2bf5..d94be7dfa6aebac8794f072727f72c6c847816b2 100644 (file)
@@ -34,7 +34,7 @@
              </div>
              <div style="height: auto; vertical-align: bottom">{$form.auctionsByDates.html}</div>
         </td>
-        <td class="left" rowspan="2">&nbsp;{$form.buttons.html}</td>  
+        <td class="left" rowspan="2">&nbsp;{$form.buttons.html}</td>
     </tr>
     <tr>
        <td></td>
             <td>&nbsp;{$form.end_date.html}&nbsp;
              &nbsp;{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}
-            </td> 
+            </td>
           </tr>
-       </table> 
+       </table>
        </td>
-    </tr>  
+    </tr>
   </table>
 </fieldset>
 </div>
 
 {include file="CRM/common/showHide.tpl"}
 
-{literal} 
+{literal}
 <script type="text/javascript">
 if ( document.getElementsByName('auctionsByDates')[1].checked ) {
   cj('#id_fromToDates').show();
 }
 </script>
-{/literal} 
+{/literal}
index e1e485ba4e2567994091641bb4531d27f5aa8521..c16476e5779d49713ad1c3f75d66b82acf31780a 100644 (file)
@@ -34,7 +34,7 @@
              </div>
         </td>
         <td></td>
-        <td class="left" colspan="2">{$form.buttons.html}&nbsp;&nbsp;&nbsp;</td>  
+        <td class="left" colspan="2">{$form.buttons.html}&nbsp;&nbsp;&nbsp;</td>
     </tr>
     <tr>
         <td class="label">{$form.start_date.label}</td>
@@ -46,7 +46,7 @@
         <td>&nbsp;{$form.end_date.html}&nbsp;
             &nbsp;{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}
-        </td> 
+        </td>
     </tr>
   </table>
 </fieldset>
index a8aa2953fc95c6d937dc7d39f595cee2cda51177..69e8f06bd36562fd39d139c0cea1916adb0e92c3 100644 (file)
@@ -59,8 +59,8 @@
             <td>{$row.buy_now_value}</td>
             <td>{$row.min_bid_value}</td>
             <td>{$row.min_bid_increment}</td>
-           <td>{if $row.is_active eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}</td>
-           <td>{$row.action}</td>
+      <td>{if $row.is_active eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}</td>
+      <td>{$row.action}</td>
           </tr>
         {/foreach}
         </table>