CRM-13398 replace tabs with 2 spaces per standard
authorEileen <eileen@fuzion.co.nz>
Thu, 2 Jan 2014 04:31:01 +0000 (17:31 +1300)
committerEileen <eileen@fuzion.co.nz>
Thu, 2 Jan 2014 04:31:01 +0000 (17:31 +1300)
----------------------------------------
* CRM-13398: Profile pre and post field help markup in Block.tpl messes up page layout
  http://issues.civicrm.org/jira/browse/CRM-13398

templates/CRM/UF/Form/Block.tpl

index d7e7cb9d78ef224d4959f97a87edb9e4cb8cf674..d526339941f9d8832b5cf0fe44e8a0b274e76883 100644 (file)
         {if $action neq 4 && $action neq 1028}
           {$field.help_pre}
         {/if}
-           {elseif $n}
-               {* Show explanatory text for field if not in 'view' or 'preview' modes *}
-             {if $field.help_pre && $action neq 4 && $action neq 1028}
-               <div class="crm-section helprow-{$n}-section" id="helprow-{$n}">
-                 <div class="content description">{$field.help_pre}</div>
-               </div>
-             {/if}
-             {if $field.options_per_line != 0}
-               <div class="crm-section editrow_{$n}-section form-item" id="editrow-{$n}">
-                 <div class="label option-label">{$form.$n.label}</div>
-                 <div class="content 3">
-                   {assign var="count" value="1"}
-                   {strip}
-                     <table class="form-layout-compressed">
-                     <tr>
-                     {* sort by fails for option per line. Added a variable to iterate through the element array*}
-                       {assign var="index" value="1"}
-                       {foreach name=outer key=key item=item from=$form.$n}
-                         {if $index < 10}
-                           {assign var="index" value=`$index+1`}
-                         {else}
-                           <td class="labels font-light">{$form.$n.$key.html}</td>
-                           {if $count == $field.options_per_line}
-                           </tr>
-                           <tr>
-                             {assign var="count" value="1"}
-                           {else}
-                             {assign var="count" value=`$count+1`}
-                           {/if}
-                         {/if}
-                       {/foreach}
-                     </tr>
-                     </table>
-                   {/strip}
-                 </div>
-                 <div class="clear"></div>
-               </div>
-             {else}
-               <div class="crm-section editrow_{$n}-section form-item" id="editrow-{$n}">
-                 <div class="label">
-                   {$form.$n.label}
-                 </div>
-                 <div class="content">
-                   {if $n|substr:0:3 eq 'im-'}
-                     {assign var="provider" value=$n|cat:"-provider_id"}
-                     {$form.$provider.html}&nbsp;
-                   {elseif $n|substr:0:4 eq 'url-'}
-                     {assign var="websiteType" value=$n|cat:"-website_type_id"}
-                     {$form.$websiteType.html}&nbsp;
-                   {/if}
+      {elseif $n}
+        {* Show explanatory text for field if not in 'view' or 'preview' modes *}
+        {if $field.help_pre && $action neq 4 && $action neq 1028}
+          <div class="crm-section helprow-{$n}-section" id="helprow-{$n}">
+            <div class="content description">{$field.help_pre}</div>
+          </div>
+        {/if}
+        {if $field.options_per_line != 0}
+          <div class="crm-section editrow_{$n}-section form-item" id="editrow-{$n}">
+            <div class="label option-label">{$form.$n.label}</div>
+            <div class="content 3">
+              {assign var="count" value="1"}
+              {strip}
+                <table class="form-layout-compressed">
+                <tr>
+                {* sort by fails for option per line. Added a variable to iterate through the element array*}
+                  {assign var="index" value="1"}
+                  {foreach name=outer key=key item=item from=$form.$n}
+                    {if $index < 10}
+                      {assign var="index" value=`$index+1`}
+                    {else}
+                      <td class="labels font-light">{$form.$n.$key.html}</td>
+                      {if $count == $field.options_per_line}
+                      </tr>
+                      <tr>
+                        {assign var="count" value="1"}
+                      {else}
+                        {assign var="count" value=`$count+1`}
+                      {/if}
+                    {/if}
+                  {/foreach}
+                </tr>
+                </table>
+              {/strip}
+            </div>
+            <div class="clear"></div>
+          </div>
+        {else}
+          <div class="crm-section editrow_{$n}-section form-item" id="editrow-{$n}">
+            <div class="label">
+              {$form.$n.label}
+            </div>
+            <div class="content">
+              {if $n|substr:0:3 eq 'im-'}
+                {assign var="provider" value=$n|cat:"-provider_id"}
+                {$form.$provider.html}&nbsp;
+              {elseif $n|substr:0:4 eq 'url-'}
+                {assign var="websiteType" value=$n|cat:"-website_type_id"}
+                {$form.$websiteType.html}&nbsp;
+              {/if}
 
-                   {if $n eq 'email_greeting' or  $n eq 'postal_greeting' or $n eq 'addressee'}
-                     {include file="CRM/Profile/Form/GreetingType.tpl"}
-                   {elseif ($n eq 'group' && $form.group) || ($n eq 'tag' && $form.tag)}
-                     {include file="CRM/Contact/Form/Edit/TagsAndGroups.tpl" type=$n title=null context="profile"}
-                   {elseif ( ( $field.data_type eq 'Date' ) or
-                     ( $n|substr:-5:5 eq '_date' ) ) AND
-                   ( $form.formName neq 'Confirm' )  AND
-                   ( $form.formName neq 'ThankYou' ) }
-                     {include file="CRM/common/jcalendar.tpl" elementName=$n}
-                   {elseif $n|substr:0:5 eq 'phone'}
-                     {assign var="phone_ext_field" value=$n|replace:'phone':'phone_ext'}
-                     {$form.$n.html}
-                     {if $form.$phone_ext_field.html}
-                       &nbsp;{$form.$phone_ext_field.html}
-                     {/if}
-                   {else}
-                     {$form.$n.html}
-                     {if $n eq 'gender' && $form.$fieldName.frozen neq true}
-                       <span class="crm-clear-link">(<a href="#" title="unselect" onclick="unselectRadio('{$n}', '{$form.formName}');return false;">{ts}clear{/ts}</a>)</span>
-                     {/if}
-                   {/if}
+              {if $n eq 'email_greeting' or  $n eq 'postal_greeting' or $n eq 'addressee'}
+                {include file="CRM/Profile/Form/GreetingType.tpl"}
+              {elseif ($n eq 'group' && $form.group) || ($n eq 'tag' && $form.tag)}
+                {include file="CRM/Contact/Form/Edit/TagsAndGroups.tpl" type=$n title=null context="profile"}
+              {elseif ( ( $field.data_type eq 'Date' ) or
+                ( $n|substr:-5:5 eq '_date' ) ) AND
+              ( $form.formName neq 'Confirm' )  AND
+              ( $form.formName neq 'ThankYou' ) }
+                {include file="CRM/common/jcalendar.tpl" elementName=$n}
+              {elseif $n|substr:0:5 eq 'phone'}
+                {assign var="phone_ext_field" value=$n|replace:'phone':'phone_ext'}
+                {$form.$n.html}
+                {if $form.$phone_ext_field.html}
+                  &nbsp;{$form.$phone_ext_field.html}
+                {/if}
+              {else}
+                {$form.$n.html}
+                {if $n eq 'gender' && $form.$fieldName.frozen neq true}
+                  <span class="crm-clear-link">(<a href="#" title="unselect" onclick="unselectRadio('{$n}', '{$form.formName}');return false;">{ts}clear{/ts}</a>)</span>
+                {/if}
+              {/if}
 
-                 {*CRM-4564*}
-                   {if $field.html_type eq 'Radio' && $form.$fieldName.frozen neq true && $field.is_required neq 1}
-                     <span style="line-height: .75em; margin-top: 1px;">
-                         <span class="crm-clear-link">(<a href="#" title="unselect" onclick="unselectRadio('{$n}', '{$form.formName}');return false;">{ts}clear{/ts}</a>)</span>
-                        </span>
-                   {elseif $field.html_type eq 'Autocomplete-Select'}
-                     {if $field.data_type eq 'ContactReference'}
-                     {include file="CRM/Custom/Form/ContactReference.tpl" element_name = $n}
-                     {else}
-                     {include file="CRM/Custom/Form/AutoComplete.tpl" element_name = $n}
-                     {/if}
-                   {/if}
+            {*CRM-4564*}
+              {if $field.html_type eq 'Radio' && $form.$fieldName.frozen neq true && $field.is_required neq 1}
+                <span style="line-height: .75em; margin-top: 1px;">
+                    <span class="crm-clear-link">(<a href="#" title="unselect" onclick="unselectRadio('{$n}', '{$form.formName}');return false;">{ts}clear{/ts}</a>)</span>
+                   </span>
+              {elseif $field.html_type eq 'Autocomplete-Select'}
+                {if $field.data_type eq 'ContactReference'}
+                {include file="CRM/Custom/Form/ContactReference.tpl" element_name = $n}
+                {else}
+                {include file="CRM/Custom/Form/AutoComplete.tpl" element_name = $n}
+                {/if}
+              {/if}
           </div>
           <div class="clear"></div>
         </div>
-                               {/if}
-       {* Show explanatory text for field if not in 'view' or 'preview' modes *}
+        {/if}
+        {* Show explanatory text for field if not in 'view' or 'preview' modes *}
         {if $field.help_post && $action neq 4 && $action neq 1028}
-               <div class="crm-section helprow-{$n}-section" id="helprow-{$n}">
-                 <div class="content description">{$field.help_post}</div>
-               </div>
+          <div class="crm-section helprow-{$n}-section" id="helprow-{$n}">
+            <div class="content description">{$field.help_post}</div>
+          </div>
         {/if}
       {/if}
     {/foreach}