whitespace cleanup
authorEileen McNaughton <eileen@fuzion.co.nz>
Wed, 29 Oct 2014 03:34:42 +0000 (16:34 +1300)
committerEileen McNaughton <eileen@fuzion.co.nz>
Wed, 29 Oct 2014 03:34:42 +0000 (16:34 +1300)
14 files changed:
distmaker/distmaker.sh
templates/CRM/Contribute/Form/Task/Print.tpl
templates/CRM/Contribute/Import/Form/MapField.tpl
templates/CRM/Contribute/Import/Form/Preview.tpl
templates/CRM/Contribute/Import/Form/Summary.tpl
tools/extensions/org.civicrm.search.multivalue/templates/MultipleValues.tpl
tools/scripts/phpunit-jenkins
tools/templates/CRM/Auction/Page/Manage.tpl
tools/templates/CRM/Auction/Page/ManageItem.tpl
tools/templates/CRM/Touchstone/Form/Search/AdvancedSearchPane.tpl
tools/xml/schema/Auction/Auction.xml
tools/xml/schema/Auction/Bid.xml
tools/xml/schema/Auction/Item.xml
xml/templates/message_templates/participant_confirm_text.tpl

index 6c0072eb8c42fc3d260cca502ea380467ae37cff..1388faba1f87d47beb7dbd4e70b943087192cdd6 100755 (executable)
@@ -41,58 +41,58 @@ L10NPACK=0
 # Display usage
 display_usage()
 {
-       echo
-       echo "Usage: "
-       echo "  distmaker.sh OPTION"
-       echo
-       echo "Options available:"
-       echo "  all  - generate all available tarballs"
-       echo "  l10n - generate internationalization data"
-       echo "  d5   - generate Drupal7 PHP5 module"
-       echo "  d5.6 - generate Drupal6 PHP5 module"
-       echo "  j5   - generate Joomla PHP5 module"
-       echo "  wp5  - generate Wordpress PHP5 module"
-       echo "  sk - generate Drupal StarterKit module"
-       echo
-       echo "You also need to have distmaker.conf file in place."
-       echo "See distmaker.conf.dist for example contents."
-       echo
+  echo
+  echo "Usage: "
+  echo "  distmaker.sh OPTION"
+  echo
+  echo "Options available:"
+  echo "  all  - generate all available tarballs"
+  echo "  l10n - generate internationalization data"
+  echo "  d5   - generate Drupal7 PHP5 module"
+  echo "  d5.6 - generate Drupal6 PHP5 module"
+  echo "  j5   - generate Joomla PHP5 module"
+  echo "  wp5  - generate Wordpress PHP5 module"
+  echo "  sk - generate Drupal StarterKit module"
+  echo
+  echo "You also need to have distmaker.conf file in place."
+  echo "See distmaker.conf.dist for example contents."
+  echo
 }
 
 
 # Check if config is ok.
 check_conf()
 {
-       # Test for distmaker.conf file availability, cannot proceed without it anyway
-       if [ ! -f $P/distmaker.conf ] ; then
-               echo; echo "ERROR! No distmaker.conf file available!"; echo;
-               display_usage
-               exit 1
-       else
-               source "$P/distmaker.conf"
-               export DM_SOURCEDIR DM_GENFILESDIR DM_TMPDIR DM_TARGETDIR DM_PHP DM_RSYNC DM_ZIP DM_VERSION DM_REF_CORE DM_REF_DRUPAL DM_REF_DRUPAL6 DM_REF_JOOMLA DM_REF_WORDPRESS DM_REF_PACKAGES
-               if [ ! -d "$DM_SOURCEDIR" ]; then
-                       echo; echo "ERROR! " DM_SOURCEDIR "directory not found!"; echo "(if you get empty directory name, it might mean that one of necessary variables is not set)"; echo;
-               fi
-               for k in "$DM_GENFILESDIR" "$DM_TARGETDIR" "$DM_TMPDIR"; do
-                       if [ -z "$k" ] ; then
-                               echo; echo "ERROR! " $k "directory not found!"; echo "(if you get empty directory name, it might mean that one of necessary variables is not set)"; echo;
-                               exit 1
-                       fi
-                       if [ ! -d "$k" ]; then
-                               mkdir -p "$k"
-                       fi
-               done
-       fi
+  # Test for distmaker.conf file availability, cannot proceed without it anyway
+  if [ ! -f $P/distmaker.conf ] ; then
+    echo; echo "ERROR! No distmaker.conf file available!"; echo;
+    display_usage
+    exit 1
+  else
+    source "$P/distmaker.conf"
+    export DM_SOURCEDIR DM_GENFILESDIR DM_TMPDIR DM_TARGETDIR DM_PHP DM_RSYNC DM_ZIP DM_VERSION DM_REF_CORE DM_REF_DRUPAL DM_REF_DRUPAL6 DM_REF_JOOMLA DM_REF_WORDPRESS DM_REF_PACKAGES
+    if [ ! -d "$DM_SOURCEDIR" ]; then
+      echo; echo "ERROR! " DM_SOURCEDIR "directory not found!"; echo "(if you get empty directory name, it might mean that one of necessary variables is not set)"; echo;
+    fi
+    for k in "$DM_GENFILESDIR" "$DM_TARGETDIR" "$DM_TMPDIR"; do
+      if [ -z "$k" ] ; then
+        echo; echo "ERROR! " $k "directory not found!"; echo "(if you get empty directory name, it might mean that one of necessary variables is not set)"; echo;
+        exit 1
+      fi
+      if [ ! -d "$k" ]; then
+        mkdir -p "$k"
+      fi
+    done
+  fi
 }
 
 # Check if PHP4 converstion happened
 check_php4()
 {
-       if [ ! $PHP4GENERATED = 1 ]; then
-               echo; echo "ERROR! Cannot package PHP4 version without running conversion!"; echo;
-               exit 1
-       fi
+  if [ ! $PHP4GENERATED = 1 ]; then
+    echo; echo "ERROR! Cannot package PHP4 version without running conversion!"; echo;
+    exit 1
+  fi
 }
 
 # Let's go.
@@ -101,58 +101,58 @@ check_conf
 
 # Figure out what to do
 case $1 in
-       # L10N PHP5
-       l10n)
-       echo; echo "Generating L10N module"; echo;
-       L10NPACK=1
-       ;;
-
-       # DRUPAL7 PHP5
-       d5)
-       echo; echo "Generating Drupal7 PHP5 module"; echo;
-       D5PACK=1
-       ;;
-
-       # DRUPAL7 PHP5 StarterKit package
-       sk)
-       echo; echo "Generating Drupal7 PHP5 starter kit minimal module"; echo;
-       SKPACK=1
-       ;;
-
-       # DRUPAL6 PHP5
-       d5.6)
-       echo; echo "Generating Drupal6 PHP5 module"; echo;
-       D56PACK=1
-       ;;
-
-       # JOOMLA PHP5
-       j5)
-       echo; echo "Generating Joomla PHP5 module"; echo;
-       J5PACK=1
-       ;;
-
-       # WORDPRESS PHP5
-       wp5)
-       echo; echo "Generating Wordpress PHP5 module"; echo;
-       WP5PACK=1
-       ;;
-
-       # ALL
-       all)
-       echo; echo "Generating all we've got."; echo;
-       D5PACK=1
-       D56PACK=1
-       J5PACK=1
-       WP5PACK=1
-       SKPACK=1
-       L10NPACK=1
-       ;;
-
-       # USAGE
-       *)
-       display_usage
-       exit 0
-       ;;
+  # L10N PHP5
+  l10n)
+  echo; echo "Generating L10N module"; echo;
+  L10NPACK=1
+  ;;
+
+  # DRUPAL7 PHP5
+  d5)
+  echo; echo "Generating Drupal7 PHP5 module"; echo;
+  D5PACK=1
+  ;;
+
+  # DRUPAL7 PHP5 StarterKit package
+  sk)
+  echo; echo "Generating Drupal7 PHP5 starter kit minimal module"; echo;
+  SKPACK=1
+  ;;
+
+  # DRUPAL6 PHP5
+  d5.6)
+  echo; echo "Generating Drupal6 PHP5 module"; echo;
+  D56PACK=1
+  ;;
+
+  # JOOMLA PHP5
+  j5)
+  echo; echo "Generating Joomla PHP5 module"; echo;
+  J5PACK=1
+  ;;
+
+  # WORDPRESS PHP5
+  wp5)
+  echo; echo "Generating Wordpress PHP5 module"; echo;
+  WP5PACK=1
+  ;;
+
+  # ALL
+  all)
+  echo; echo "Generating all we've got."; echo;
+  D5PACK=1
+  D56PACK=1
+  J5PACK=1
+  WP5PACK=1
+  SKPACK=1
+  L10NPACK=1
+  ;;
+
+  # USAGE
+  *)
+  display_usage
+  exit 0
+  ;;
 
 esac
 
@@ -171,38 +171,38 @@ $DM_PHP GenCode.php schema/Schema.xml $DM_VERSION
 cd $ORIGPWD
 
 if [ "$L10NPACK" = 1 ]; then
-       echo; echo "Packaging for L10N"; echo;
-       bash $P/dists/l10n.sh
+  echo; echo "Packaging for L10N"; echo;
+  bash $P/dists/l10n.sh
 fi
 
 if [ "$D56PACK" = 1 ]; then
-       echo; echo "Packaging for Drupal6, PHP5 version"; echo;
-       dm_git_checkout "$DM_SOURCEDIR/drupal" "$DM_REF_DRUPAL6"
-       bash $P/dists/drupal6_php5.sh
+  echo; echo "Packaging for Drupal6, PHP5 version"; echo;
+  dm_git_checkout "$DM_SOURCEDIR/drupal" "$DM_REF_DRUPAL6"
+  bash $P/dists/drupal6_php5.sh
 fi
 
 if [ "$D5PACK" = 1 ]; then
-       echo; echo "Packaging for Drupal7, PHP5 version"; echo;
-       dm_git_checkout "$DM_SOURCEDIR/drupal" "$DM_REF_DRUPAL"
-       bash $P/dists/drupal_php5.sh
+  echo; echo "Packaging for Drupal7, PHP5 version"; echo;
+  dm_git_checkout "$DM_SOURCEDIR/drupal" "$DM_REF_DRUPAL"
+  bash $P/dists/drupal_php5.sh
 fi
 
 if [ "$SKPACK" = 1 ]; then
-       echo; echo "Packaging for Drupal7, PHP5 StarterKit version"; echo;
-       dm_git_checkout "$DM_SOURCEDIR/drupal" "$DM_REF_DRUPAL"
-       bash $P/dists/drupal_sk_php5.sh
+  echo; echo "Packaging for Drupal7, PHP5 StarterKit version"; echo;
+  dm_git_checkout "$DM_SOURCEDIR/drupal" "$DM_REF_DRUPAL"
+  bash $P/dists/drupal_sk_php5.sh
 fi
 
 if [ "$J5PACK" = 1 ]; then
-       echo; echo "Packaging for Joomla, PHP5 version"; echo;
-       dm_git_checkout "$DM_SOURCEDIR/joomla" "$DM_REF_JOOMLA"
-       bash $P/dists/joomla_php5.sh
+  echo; echo "Packaging for Joomla, PHP5 version"; echo;
+  dm_git_checkout "$DM_SOURCEDIR/joomla" "$DM_REF_JOOMLA"
+  bash $P/dists/joomla_php5.sh
 fi
 
 if [ "$WP5PACK" = 1 ]; then
-       echo; echo "Packaging for Wordpress, PHP5 version"; echo;
-       dm_git_checkout "$DM_SOURCEDIR/WordPress" "$DM_REF_WORDPRESS"
-       bash $P/dists/wordpress_php5.sh
+  echo; echo "Packaging for Wordpress, PHP5 version"; echo;
+  dm_git_checkout "$DM_SOURCEDIR/WordPress" "$DM_REF_WORDPRESS"
+  bash $P/dists/wordpress_php5.sh
 fi
 
 unset DM_SOURCEDIR DM_GENFILESDIR DM_TARGETDIR DM_TMPDIR DM_PHP DM_RSYNC DM_VERSION DM_ZIP
index 32d5a1c2b6628a014c4a094151cca98ea814af04..cc28165cf38410adc9d4d15325ff11e68e984fe2 100644 (file)
@@ -25,7 +25,7 @@
 *}
 <p>
 
-{if $rows } 
+{if $rows }
 <div class="form-item crm-block crm-form-block crm-contribution-form-block">
      <span class="element-right">{$form.buttons.html}</span>
 </div>
     <tr class="{cycle values="odd-row,even-row"} crm-contribution">
         <td class="crm-contribution-sort_name">{$row.sort_name}</td>
         <td class="right bold crm-contribution-total_amount" nowrap>{$row.total_amount|crmMoney}</td>
-        <td class="crm-contribution-type crm-contribution-{$row.financial_type} crm-financial-type crm-contribution-{$row.financial_type}">{$row.financial_type}</td>  
-        <td class="crm-contribution-contribution_source">{$row.contribution_source}</td> 
+        <td class="crm-contribution-type crm-contribution-{$row.financial_type} crm-financial-type crm-contribution-{$row.financial_type}">{$row.financial_type}</td>
+        <td class="crm-contribution-contribution_source">{$row.contribution_source}</td>
         <td class="crm-contribution-receive_date">{$row.receive_date|truncate:10:''|crmDate}</td>
         <td class="crm-contribution-thankyou_date">{$row.thankyou_date|truncate:10:''|crmDate}</td>
-        <td class="crm-contribution-status crm-contribution-status_{$row.contribution_status_id}"> 
+        <td class="crm-contribution-status crm-contribution-status_{$row.contribution_status_id}">
             {$row.contribution_status_id}<br />
-            {if $row.cancel_date}    
+            {if $row.cancel_date}
                 {$row.cancel_date|truncate:10:''|crmDate}
             {/if}
         </td>
index b4246e93403a9f887397be1c5dafdeb1db315d51..2f9e7bd7168a08e45b361948da314e08b4f9a2a5 100644 (file)
@@ -37,9 +37,9 @@
     <p>{ts}If you think you may be importing additional data from the same data source, check 'Save this field mapping' at the bottom of the page before continuing. The saved mapping can then be easily reused the next time data is imported.{/ts}</p>
 </div>
 <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
- {* Table for mapping data to CRM fields *}
+{* Table for mapping data to CRM fields *}
  {include file="CRM/Contribute/Import/Form/MapTable.tpl}
+
 <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
  {$initHideBoxes}
 </div>
@@ -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 8ef517eed8a694c0975bf68fa1c72a240769f1c6..23b6a3afc3f7eb64d036edcf2fc23c723446e38f 100644 (file)
 <div class="crm-block crm-form-block crm-contribution-import-preview-form-block id="upload-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 (contribution 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>
@@ -67,7 +67,7 @@
         </td>
     </tr>
     {/if}
-    
+
     {if $conflictRowCount}
     <tr class="error"><td class="label">{ts}Conflicting Rows{/ts}</td>
         <td class="data">{$conflictRowCount}</td>
@@ -84,9 +84,9 @@
         <td class="explanation">{ts}Total rows to be imported.{/ts}</td>
     </tr>
  </table>
-  
+
 
  {* Table for mapping preview *}
  {include file="CRM/Contribute/Import/Form/MapTable.tpl"}
-  <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>
index cd6614345d3de7a6cdd759224888363bbe1956c6..06f549261447f7ee719d5cc7ace697efb1307965 100644 (file)
 <div class="crm-block crm-form-block  crm-contribution-import-summary-form-block id="upload-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 contribution IDs. These records have not been Updated.'}CiviCRM has detected mismatched contribution ID. This record has not been updated.{/ts}
@@ -41,8 +41,8 @@
         <p class="error">
         {ts 1=$downloadMismatchRecordsUrl}You can <a href='%1'>Download Mismatched Contributions</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}
@@ -70,7 +70,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>
@@ -88,7 +88,7 @@
         </td>
     </tr>
     {/if}
-    
+
     {if $validSoftCreditRowCount }
     <tr><td class="label">{ts}Soft Credits{/ts}</td>
         <td class="data">{$validSoftCreditRowCount}</td>
         </td>
     </tr>
     {/if}
-    
+
     {if $validPledgePaymentRowCount }
     <tr><td class="label">{ts}Pledge Payments Applied{/ts}</td>
         <td class="data">{$validPledgePaymentRowCount}</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}Total number of rows imported successfully.{/ts}</td>
index bfb715299f6c6c63360e767ac9e0b3686cbb740b..dfbbad3e2a30a0b6d7482d596a2ea175bc5bbcce 100644 (file)
@@ -34,8 +34,8 @@
 
 <div id="searchForm" class="crm-block crm-form-block crm-contact-custom-search-multipleValues-form-block">
     <fieldset>
-        <legend><span id="searchForm_hide"><a href="#" onclick="hide('searchForm','searchForm_hide'); show('searchForm_show'); return false;"><img src="{$config->resourceBase}i/TreeMinus.gif" class="action-icon" alt="{ts}close section{/ts}" /></a></span>{ts}Search Criteria{/ts}</legend>  
-        <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>  
+        <legend><span id="searchForm_hide"><a href="#" onclick="hide('searchForm','searchForm_hide'); show('searchForm_show'); return false;"><img src="{$config->resourceBase}i/TreeMinus.gif" class="action-icon" alt="{ts}close section{/ts}" /></a></span>{ts}Search Criteria{/ts}</legend>
+        <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
         <table class="form-layout-compressed">
             <tr class="crm-contact-custom-search-multipleValues-form-block-sort_name">
                 <td><label>{$form.sort_name.label}</label></td>
@@ -76,9 +76,9 @@
     {* Search request has returned 1 or more matching rows. Display results and collapse the search criteria fieldset. *}
     {assign var="showBlock" value="'searchForm_show'"}
     {assign var="hideBlock" value="'searchForm'"}
-    
+
     <fieldset>
-    
+
         {* This section handles form elements for action task select and submit *}
         {include file="CRM/Contact/Form/Search/ResultTasks.tpl"}
 
@@ -86,9 +86,9 @@
         <p>
 
         {include file="CRM/common/pager.tpl" location="top"}
-        
+
         {include file="CRM/common/pagerAToZ.tpl"}
-        
+
         {strip}
         <table class="selector" summary="{ts}Search results listings.{/ts}">
             <thead class="sticky">
index e480a59cf530928bb50da982f982dcdaabf7c53e..ed9f720020f7d3fb4dab5e1ec3cc237fd0e165f5 100755 (executable)
@@ -24,7 +24,7 @@ set -ex
 ##    --tap \
 ##    --log-junit "${WORKSPACE}/build/junit.xml" \
 ##    CRM_AllTests
-## 
+##
 
 if [ -z "$EXECUTOR_NUMBER" -o -z "$WORKSPACE" ]; then
   echo "This script requires the following environment variables:"
index 019aa81f0dd157f73f22b70fda7ec160e6842e63..d90d76a193529603e1259dfc19abef064466d0e8 100644 (file)
@@ -32,7 +32,7 @@
     <div id=auction_status_id>
         {strip}
         {include file="CRM/common/pager.tpl" location="top"}
-        {include file="CRM/common/pagerAToZ.tpl}    
+        {include file="CRM/common/pagerAToZ.tpl}
         <table class="selector">
          <tr class="columnheader">
             <th>{ts}Auction{/ts}</th>
             <th>{ts}Starts{/ts}</th>
             <th>{ts}Ends{/ts}</th>
             <th>{ts}Active?{/ts}</th>
-           <th></th>
+      <th></th>
          </tr>
         {foreach from=$rows item=row}
           <tr class="{cycle values="odd-row,even-row"} {$row.class}{if NOT $row.is_active} disabled{/if}">
             <td>{$row.title}&nbsp;&nbsp;({ts}ID:{/ts} {$row.id})</td>
-            <td>{if $row.is_public eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}</td>    
-           <td>{$row.start_date|crmDate}</td>
+            <td>{if $row.is_public eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}</td>
+          <td>{$row.start_date|crmDate}</td>
             <td>{$row.end_date|crmDate}</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}    
+        {/foreach}
         </table>
         {include file="CRM/common/pager.tpl" location="bottom"}
         {/strip}
-      
+
     </div>
 {else}
    {if $isSearch eq 1}
@@ -81,6 +81,6 @@
         <dt><div class="icon inform-icon"></div></dt>
         <dd>{ts 1=$newAuctionURL}There are no auctions created yet. You can <a href='%1'>add one</a>.{/ts}</dd>
         </dl>
-    </div>    
+    </div>
    {/if}
 {/if}
index 153052685ee5b627aa78f44f3e306a251b7983c4..a8aa2953fc95c6d937dc7d39f595cee2cda51177 100644 (file)
@@ -33,7 +33,7 @@
     <div id=item_status_id>
         {strip}
         {include file="CRM/common/pager.tpl" location="top"}
-        {include file="CRM/common/pagerAToZ.tpl}    
+        {include file="CRM/common/pagerAToZ.tpl}
         <table class="selector">
          <tr class="columnheader">
             <th>{ts}Donor{/ts}</th>
@@ -46,7 +46,7 @@
             <th>{ts}Min Bid Value{/ts}</th>
             <th>{ts}Min Bid Increment{/ts}</th>
             <th>{ts}Approved?{/ts}</th>
-           <th></th>
+      <th></th>
          </tr>
         {foreach from=$rows item=row}
           <tr class="{cycle values="odd-row,even-row"} {$row.class}{if NOT $row.is_active} disabled{/if}">
            <td>{if $row.is_active eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}</td>
            <td>{$row.action}</td>
           </tr>
-        {/foreach}    
+        {/foreach}
         </table>
         {include file="CRM/common/pager.tpl" location="bottom"}
         {/strip}
-      
+
     </div>
 {else}
    {if $isSearch eq 1}
@@ -92,6 +92,6 @@
         <dt><div class="icon inform-icon"></div></dt>
         <dd>{ts 1=$newAuctionURL}There are no auctions created yet. You can <a href='%1'>add one</a>.{/ts}</dd>
         </dl>
-    </div>    
+    </div>
    {/if}
 {/if}
index 24a226175e00a8366042ba96645b64d96a51ce83..c38b0b8f2b09d0ed862a6311812e2abcbf70a326 100644 (file)
 *}
 <div class="form-item">
     <fieldset class="collapsible">
-        <table class="form-layout"> 
+        <table class="form-layout">
 
-           <!-- SEARCH FORM HERE -->
+      <!-- SEARCH FORM HERE -->
 
         </table>
     </fieldset>
-</div>
\ No newline at end of file
+</div>
index 017b667fa9289131127da50fb8b384e09d526a98..10adfdcd4976ba6d66220a963f1f3d7c46b6e05f 100644 (file)
@@ -1,44 +1,44 @@
-<?xml version="1.0" encoding="iso-8859-1" ?> 
-<table> 
-  <base>CRM/Auction</base> 
-  <class>Auction</class> 
-  <name>civicrm_auction</name> 
-  <add>3.0</add> 
-  <field> 
-      <name>id</name> 
-      <type>int unsigned</type> 
-      <required>true</required> 
-      <comment>Auction ID</comment> 
-      <add>3.0</add> 
-  </field> 
-  <primaryKey> 
-       <name>id</name> 
-       <autoincrement>true</autoincrement> 
-  </primaryKey> 
-  <field>        
-      <name>title</name>     
+<?xml version="1.0" encoding="iso-8859-1" ?>
+
+<table>
+  <base>CRM/Auction</base>
+  <class>Auction</class>
+  <name>civicrm_auction</name>
+  <add>3.0</add>
+  <field>
+      <name>id</name>
+      <type>int unsigned</type>
+      <required>true</required>
+      <comment>Auction ID</comment>
+      <add>3.0</add>
+  </field>
+  <primaryKey>
+       <name>id</name>
+       <autoincrement>true</autoincrement>
+  </primaryKey>
+  <field>
+      <name>title</name>
       <uniqueName>auction_title</uniqueName>
-      <type>varchar</type>     
+      <type>varchar</type>
       <import>true</import>
       <title>Auction Title</title>
-      <length>255</length>  
+      <length>255</length>
       <localizable>true</localizable>
       <comment>Auction Title (e.g. Fall Auction Dinner)</comment>
-      <add>3.0</add>     
-  </field>   
-  <field>        
-      <name>description</name>     
-      <type>text</type>     
+      <add>3.0</add>
+  </field>
+  <field>
+      <name>description</name>
+      <type>text</type>
       <uniqueName>auction_description</uniqueName>
-      <title>Auction Description</title>  
+      <title>Auction Description</title>
       <htmlType>textarea</htmlType>
       <rows>8</rows>
       <cols>60</cols>
       <localizable>true</localizable>
       <comment>Full description of auction. Text and html allowed.</comment>
-      <add>3.0</add>     
-  </field>   
+      <add>3.0</add>
+  </field>
   <field>
        <name>start_date</name>
        <type>datetime</type>
        <comment>Date and time that item registration ends. May be NULL if no defined end date/time</comment>
        <add>3.0</add>
   </field>
-  <field> 
-      <name>is_approval_needed</name> 
-      <type>boolean</type> 
+  <field>
+      <name>is_approval_needed</name>
+      <type>boolean</type>
       <title>Do items need to be approved?</title>
-      <default>0</default>                
-      <comment>If true all items needs to be approved before appearing on the auction pages.</comment> 
-      <add>3.0</add> 
+      <default>0</default>
+      <comment>If true all items needs to be approved before appearing on the auction pages.</comment>
+      <add>3.0</add>
   </field>
-  <field> 
-      <name>is_item_groups</name> 
-      <type>boolean</type> 
+  <field>
+      <name>is_item_groups</name>
+      <type>boolean</type>
       <title>Can items be grouped?</title>
-      <default>0</default>                
-      <comment>If true multiple items can be consolidated into one item group.</comment> 
-      <add>3.0</add> 
+      <default>0</default>
+      <comment>If true multiple items can be consolidated into one item group.</comment>
+      <add>3.0</add>
   </field>
-  <field> 
-      <name>max_items</name> 
-      <type>int unsigned</type> 
+  <field>
+      <name>max_items</name>
+      <type>int unsigned</type>
       <title>Max Auction items</title>
       <default>NULL</default>
-      <comment>Maximum number of items that can be added to the auction.</comment> 
-      <add>3.0</add> 
+      <comment>Maximum number of items that can be added to the auction.</comment>
+      <add>3.0</add>
   </field>
-  <field> 
-      <name>max_items_user</name> 
-      <type>int unsigned</type> 
+  <field>
+      <name>max_items_user</name>
+      <type>int unsigned</type>
       <default>NULL</default>
-      <comment>Maximum number of items that can be added to the auction per user.</comment> 
-      <add>3.0</add> 
+      <comment>Maximum number of items that can be added to the auction per user.</comment>
+      <add>3.0</add>
+  </field>
+  <field>
+      <name>event_id</name>
+      <type>int unsigned</type>
+      <comment>Event this auction is linked to</comment>
+      <add>3.0</add>
   </field>
-  <field> 
-      <name>event_id</name> 
-      <type>int unsigned</type>                 
-      <comment>Event this auction is linked to</comment> 
-      <add>3.0</add> 
-  </field> 
-  <foreignKey> 
-       <name>event_id</name> 
-       <table>civicrm_event</table> 
-       <key>id</key> 
+  <foreignKey>
+       <name>event_id</name>
+       <table>civicrm_event</table>
+       <key>id</key>
        <onDelete>SET NULL</onDelete>
   </foreignKey>
-  <field> 
-      <name>donor_profile_id</name> 
-      <type>int unsigned</type>                 
-      <comment>Profile to be used for donor account creation.</comment> 
-      <add>3.0</add> 
-  </field> 
-  <foreignKey> 
-       <name>donor_profile_id</name> 
-       <table>civicrm_uf_group</table> 
-       <key>id</key> 
+  <field>
+      <name>donor_profile_id</name>
+      <type>int unsigned</type>
+      <comment>Profile to be used for donor account creation.</comment>
+      <add>3.0</add>
+  </field>
+  <foreignKey>
+       <name>donor_profile_id</name>
+       <table>civicrm_uf_group</table>
+       <key>id</key>
        <onDelete>SET NULL</onDelete>
   </foreignKey>
-  <field> 
-      <name>is_active</name> 
+  <field>
+      <name>is_active</name>
       <type>boolean</type>
-      <default>0</default>                
-      <comment>Is this Auction enabled or disabled/cancelled?</comment> 
-      <add>3.0</add> 
-  </field> 
+      <default>0</default>
+      <comment>Is this Auction enabled or disabled/cancelled?</comment>
+      <add>3.0</add>
+  </field>
 </table>
index dc69b65d1c02986f97d9c5a315c311953b1159bc..d1aaa7567d34e2e9feeccad1fe04920588574280 100644 (file)
        <add>3.0</add>
        <onDelete>CASCADE</onDelete>
   </foreignKey>
-  <field>     
-      <name>bid_value</name>  
+  <field>
+      <name>bid_value</name>
       <title>Price</title>
-      <type>decimal</type> 
-      <comment>Amount bid per item.</comment>  
-      <add>3.0</add>  
+      <type>decimal</type>
+      <comment>Amount bid per item.</comment>
+      <add>3.0</add>
   </field>
-  <field>     
-      <name>quantity</name>  
-      <type>int unsigned</type> 
-      <comment>Number of items bid on.</comment>  
-      <add>3.0</add>  
+  <field>
+      <name>quantity</name>
+      <type>int unsigned</type>
+      <comment>Number of items bid on.</comment>
+      <add>3.0</add>
   </field>
   <field>
        <name>bid_date</name>
        <comment>Date and time the bid was made.</comment>
        <add>3.0</add>
   </field>
-  <field> 
-      <name>is_active</name> 
+  <field>
+      <name>is_active</name>
       <type>boolean</type>
-      <default>0</default>                
-      <comment>Is this bid active or disabled/cancelled?</comment> 
-      <add>3.0</add> 
-  </field> 
-  <field> 
-      <name>is_winner</name> 
+      <default>0</default>
+      <comment>Is this bid active or disabled/cancelled?</comment>
+      <add>3.0</add>
+  </field>
+  <field>
+      <name>is_winner</name>
       <type>boolean</type>
-      <default>0</default>                
-      <comment>Is this bid the winning bid</comment> 
-      <add>3.0</add> 
-  </field> 
-  <field>     
-      <name>quantity_won</name>  
-      <type>int unsigned</type> 
-      <comment>Number of items this bid won.</comment>  
-      <add>3.0</add>  
+      <default>0</default>
+      <comment>Is this bid the winning bid</comment>
+      <add>3.0</add>
+  </field>
+  <field>
+      <name>quantity_won</name>
+      <type>int unsigned</type>
+      <comment>Number of items this bid won.</comment>
+      <add>3.0</add>
   </field>
-  <field> 
-      <name>contribution_id</name> 
-      <type>int unsigned</type> 
-      <comment>FK to contribution table.</comment> 
-      <add>3.0</add> 
+  <field>
+      <name>contribution_id</name>
+      <type>int unsigned</type>
+      <comment>FK to contribution table.</comment>
+      <add>3.0</add>
   </field>
-  <foreignKey> 
-       <name>contribution_id</name> 
-       <table>civicrm_contribution</table> 
-       <key>id</key> 
-       <add>3.0</add> 
+  <foreignKey>
+       <name>contribution_id</name>
+       <table>civicrm_contribution</table>
+       <key>id</key>
+       <add>3.0</add>
        <onDelete>SET NULL</onDelete>
   </foreignKey>
 </table>
index 4d7eba867912e110c961f97d69bad3e64e9e36b7..b6ec0c4cc4fb6053d70964307e6b88424699b7c3 100644 (file)
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="iso-8859-1" ?> 
-<table> 
-  <base>CRM/Auction</base> 
+<?xml version="1.0" encoding="iso-8859-1" ?>
+
+<table>
+  <base>CRM/Auction</base>
   <class>Item</class>
   <comment>stores item information for an auction</comment>
-  <name>civicrm_auction_item</name> 
-  <add>3.0</add> 
-  <field> 
-      <name>id</name> 
-      <type>int unsigned</type> 
-      <required>true</required> 
-      <add>3.0</add> 
-  </field> 
-  <primaryKey> 
-       <name>id</name> 
-       <autoincrement>true</autoincrement> 
+  <name>civicrm_auction_item</name>
+  <add>3.0</add>
+  <field>
+      <name>id</name>
+      <type>int unsigned</type>
+      <required>true</required>
+      <add>3.0</add>
+  </field>
+  <primaryKey>
+       <name>id</name>
+       <autoincrement>true</autoincrement>
   </primaryKey>
   <field>
       <name>auction_id</name>
        <add>3.0</add>
        <onDelete>CASCADE</onDelete>
   </foreignKey>
-  <field> 
-      <name>auction_item_type_id</name> 
-      <type>int unsigned</type> 
-      <title>Auction Item Type ID</title>  
-      <default>0</default>                
-      <comment>Auction Type ID.Implicit FK to civicrm_option_value where option_group = auction_item_type.</comment> 
-      <add>3.0</add> 
-  </field> 
+  <field>
+      <name>auction_item_type_id</name>
+      <type>int unsigned</type>
+      <title>Auction Item Type ID</title>
+      <default>0</default>
+      <comment>Auction Type ID.Implicit FK to civicrm_option_value where option_group = auction_item_type.</comment>
+      <add>3.0</add>
+  </field>
   <index>
     <name>index_auction_item_type_id</name>
     <fieldName>auction_item_type_id</fieldName>
     <add>3.0</add>
   </index>
-  <field> 
-      <name>auction_item_category_id</name> 
-      <type>int unsigned</type> 
-      <title>Auction Item Category ID</title>  
-      <default>0</default>                
-      <comment>Auction Category ID.Implicit FK to civicrm_option_value where option_group = auction_item_.</comment> 
-      <add>3.0</add> 
-  </field> 
+  <field>
+      <name>auction_item_category_id</name>
+      <type>int unsigned</type>
+      <title>Auction Item Category ID</title>
+      <default>0</default>
+      <comment>Auction Category ID.Implicit FK to civicrm_option_value where option_group = auction_item_.</comment>
+      <add>3.0</add>
+  </field>
   <index>
     <name>index_auction_item_category_id</name>
     <fieldName>auction_item_category_id</fieldName>
       <comment>Optional specific instructions / restrictions regarding this item.</comment>
       <add>3.0</add>
   </field>
-  <field> 
-      <name>lot_number</name> 
+  <field>
+      <name>lot_number</name>
       <title>Lot Number</title>
       <type>varchar</type>
       <length>50</length>
-      <export>true</export>  
+      <export>true</export>
       <comment>lot numbers associated with this item. could be a range. automatically computed.</comment>
-      <add>3.0</add> 
-  </field> 
+      <add>3.0</add>
+  </field>
   <field>
        <name>url</name>
        <type>varchar</type>
        <comment>optional URL of website to associate with item.</comment>
        <add>1.1</add>
   </field>
-  <field> 
-      <name>sku</name> 
+  <field>
+      <name>sku</name>
       <title>SKU</title>
       <type>varchar</type>
       <length>50</length>
-      <export>true</export> 
+      <export>true</export>
       <comment>Optional product sku or code.</comment>
-      <add>3.0</add> 
-  </field> 
-  <field>  
-      <name>options</name>  
+      <add>3.0</add>
+  </field>
+  <field>
+      <name>options</name>
       <title>Options</title>
       <type>text</type>
       <localizable>true</localizable>
-      <comment>Store comma-delimited list of color, size, etc. options for the product.</comment>  
-      <add>3.0</add>  
-  </field>    
-  <field>   
+      <comment>Store comma-delimited list of color, size, etc. options for the product.</comment>
+      <add>3.0</add>
+  </field>
+  <field>
       <name>image</name>
       <title>Image</title>
-      <type>varchar</type>   
+      <type>varchar</type>
       <length>255</length>
-      <comment>Full or relative URL to uploaded image - fullsize.</comment>   
-      <add>3.0</add>   
-  </field>     
-  <field>     
-      <name>quantity</name>  
+      <comment>Full or relative URL to uploaded image - fullsize.</comment>
+      <add>3.0</add>
+  </field>
+  <field>
+      <name>quantity</name>
       <title>Quantity</title>
-      <type>int unsigned</type> 
-      <comment>Number of Units availaible.</comment>  
-      <add>3.0</add>  
+      <type>int unsigned</type>
+      <comment>Number of Units availaible.</comment>
+      <add>3.0</add>
   </field>
-  <field>     
-      <name>retail_value</name>  
+  <field>
+      <name>retail_value</name>
       <title>Price</title>
-      <type>decimal</type> 
-      <comment>Retail value of item.</comment>  
-      <add>3.0</add>  
+      <type>decimal</type>
+      <comment>Retail value of item.</comment>
+      <add>3.0</add>
   </field>
-  <field>     
+  <field>
       <name>min_bid_value</name>
       <title>Minimum Bid</title>
       <type>decimal</type>
-      <comment>Minimum bid allowed for this item.</comment>  
-      <add>3.0</add>  
+      <comment>Minimum bid allowed for this item.</comment>
+      <add>3.0</add>
   </field>
-  <field>     
+  <field>
       <name>min_bid_increment</name>
       <title>Minimum Bid Increment</title>
       <type>decimal</type>
-      <comment>Minimum bid increment allowed for this item.</comment>  
-      <add>3.0</add>  
+      <comment>Minimum bid increment allowed for this item.</comment>
+      <add>3.0</add>
   </field>
-  <field>     
+  <field>
       <name>buy_now_value</name>
       <title>Buy Now Value</title>
-      <type>decimal</type> 
-      <comment>The amount that the item can be bought for immediately</comment>  
-      <add>3.0</add>  
-  </field> 
+      <type>decimal</type>
+      <comment>The amount that the item can be bought for immediately</comment>
+      <add>3.0</add>
+  </field>
   <field>
        <name>bid_start_date</name>
        <type>datetime</type>
        <comment>Date and time bidding ends.</comment>
        <add>3.0</add>
   </field>
-  <field>     
+  <field>
       <name>is_active</name>
-      <type>boolean</type> 
+      <type>boolean</type>
       <default>0</default>
-      <required>true</required> 
+      <required>true</required>
       <comment>Is this item active/approved and available</comment>
-      <add>3.0</add>  
+      <add>3.0</add>
   </field>
-  <field>     
+  <field>
       <name>is_group</name>
-      <type>boolean</type> 
+      <type>boolean</type>
       <default>0</default>
       <comment>Does this item group other items?</comment>
       <add>3.0</add>
index 6fc6205f9a332a7a71148ae030df8a306a52e37f..73d15a6f1bb6228ad9425fc6d571b806ec21bb50 100644 (file)
@@ -67,7 +67,7 @@ Click this link to go to a web page where you can confirm your registration onli
 {ts}Email{/ts}: {$eventEmail.email}{/if}{/foreach}
 {/if}
 
-{if $event.is_public} 
+{if $event.is_public}
 {capture assign=icalFeed}{crmURL p='civicrm/event/ical' q="reset=1&id=`$event.id`" h=0 a=1 fe=1}{/capture}
 {ts}Download iCalendar File:{/ts} {$icalFeed}
 {/if}