From 127cef7da5a6cece71455be786f4e304c6c1d358 Mon Sep 17 00:00:00 2001 From: eileen Date: Wed, 8 Feb 2017 19:56:47 +1300 Subject: [PATCH] CRM-19490 Extract fields iteration to re-use it from preview.tpl --- templates/CRM/UF/Form/Block.tpl | 143 +------------------------------ templates/CRM/UF/Form/Fields.tpl | 142 ++++++++++++++++++++++++++++++ 2 files changed, 143 insertions(+), 142 deletions(-) create mode 100644 templates/CRM/UF/Form/Fields.tpl diff --git a/templates/CRM/UF/Form/Block.tpl b/templates/CRM/UF/Form/Block.tpl index ffdd708d35..da77dda5d1 100644 --- a/templates/CRM/UF/Form/Block.tpl +++ b/templates/CRM/UF/Form/Block.tpl @@ -29,148 +29,7 @@ {if $help_pre && $action neq 4}
{$help_pre}
{/if} {assign var=zeroField value="Initial Non Existent Fieldset"} {assign var=fieldset value=$zeroField} - {foreach from=$fields item=field key=fieldName} - {if $field.skipDisplay} - {continue} - {/if} - {if $field.groupTitle != $fieldset} - {if $fieldset != $zeroField} - {if $groupHelpPost && $action neq 4} -
{$groupHelpPost}
- {/if} - {if $mode ne 8} - - {/if} - {/if} - - {if $mode ne 8 && $action ne 1028 && $action ne 4 && !$hideFieldset} -
{$field.groupTitle} - {/if} - - {if ($form.formName eq 'Confirm' OR $form.formName eq 'ThankYou') AND $prefix neq 'honor'} -
{$field.groupTitle}
- {/if} - {assign var=fieldset value=`$field.groupTitle`} - {assign var=groupHelpPost value=`$field.groupHelpPost`} - {if $field.groupHelpPre && $action neq 4 && $action neq 1028} -
{$field.groupHelpPre}
- {/if} - {/if} - - {assign var=n value=$field.name} - - {if $field.field_type eq "Formatting"} - {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} -
-
{$field.help_pre}
-
- {/if} - {if $field.options_per_line != 0} -
-
{if $prefix}{$form.$prefix.$n.label}{else}{$form.$n.label}{/if}
-
- {assign var="count" value="1"} - {strip} - - - {* sort by fails for option per line. Added a variable to iterate through the element array*} - {assign var="index" value="1"} - {if $prefix} - {assign var="formElement" value=$form.$prefix.$n} - {else} - {assign var="formElement" value=$form.$n} - {/if} - {foreach name=outer key=key item=item from=$formElement} - {if $index < 10} - {assign var="index" value=`$index+1`} - {else} - - {if $count == $field.options_per_line} - - - {assign var="count" value="1"} - {else} - {assign var="count" value=`$count+1`} - {/if} - {/if} - {/foreach} - -
{$formElement.$key.html}
- {/strip} -
-
-
- {else} -
-
- {if $prefix}{$form.$prefix.$n.label}{else}{$form.$n.label}{/if} -
-
- {if $n|substr:0:3 eq 'im-'} - {assign var="provider" value=$n|cat:"-provider_id"} - {$form.$provider.html}  - {/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 ( $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:-5:5 eq '_date' ) } - {assign var="date_value" value=$form.$n.value} - - {$date_value|date_format:"%Y-%m-%d"|crmDate:$config->dateformatshortdate} - - - {elseif $n|substr:0:5 eq 'phone'} - {assign var="phone_ext_field" value=$n|replace:'phone':'phone_ext'} - {if $prefix}{$form.$prefix.$n.html}{else}{$form.$n.html}{/if} - {if $form.$phone_ext_field.html} -  {$form.$phone_ext_field.html} - {/if} - {else} - {if $prefix} - {if $n eq 'organization_name' && !empty($form.onbehalfof_id)} - {$form.onbehalfof_id.html} - {/if} - {if $field.html_type eq 'File' && $viewOnlyPrefixFileValues} - {$viewOnlyPrefixFileValues.$prefix.$n} - {else} - {$form.$prefix.$n.html} - {/if} - {elseif $field.html_type eq 'File' && $viewOnlyFileValues} - {$viewOnlyFileValues.$n} - {else} - {$form.$n.html} - {/if} - {/if} - - {*CRM-4564*} - {if $field.html_type eq 'Autocomplete-Select'} - {if $field.data_type eq 'ContactReference'} - {include file="CRM/Custom/Form/ContactReference.tpl" element_name = $n} - {/if} - {/if} -
-
-
- {/if} - {* Show explanatory text for field if not in 'view' or 'preview' modes *} - {if $field.help_post && $action neq 4 && $action neq 1028} -
-
{$field.help_post}
-
- {/if} - {/if} - {/foreach} + {include file="CRM/UF/Form/Fields.tpl"} {if $field.groupHelpPost && $action neq 4 && $action neq 1028}
{$field.groupHelpPost}
diff --git a/templates/CRM/UF/Form/Fields.tpl b/templates/CRM/UF/Form/Fields.tpl new file mode 100644 index 0000000000..d8cf185b24 --- /dev/null +++ b/templates/CRM/UF/Form/Fields.tpl @@ -0,0 +1,142 @@ +{foreach from=$fields item=field key=fieldName} + {if $field.skipDisplay} + {continue} + {/if} + {if $field.groupTitle != $fieldset} + {if $fieldset != $zeroField} + {if $groupHelpPost && $action neq 4} +
{$groupHelpPost}
+ {/if} + {if $mode ne 8} +
+ {/if} + {/if} + + {if $mode ne 8 && $action ne 1028 && $action ne 4 && !$hideFieldset} +
{$field.groupTitle} + {/if} + + {if ($form.formName eq 'Confirm' OR $form.formName eq 'ThankYou') AND $prefix neq 'honor'} +
{$field.groupTitle}
+ {/if} + {assign var=fieldset value=`$field.groupTitle`} + {assign var=groupHelpPost value=`$field.groupHelpPost`} + {if $field.groupHelpPre && $action neq 4 && $action neq 1028} +
{$field.groupHelpPre}
+ {/if} + {/if} + + {assign var=n value=$field.name} + + {if $field.field_type eq "Formatting"} + {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} +
+
{$field.help_pre}
+
+ {/if} + {if $field.options_per_line != 0} +
+
{if $prefix}{$form.$prefix.$n.label}{else}{$form.$n.label}{/if}
+
+ {assign var="count" value="1"} + {strip} + + + {* sort by fails for option per line. Added a variable to iterate through the element array*} + {assign var="index" value="1"} + {if $prefix} + {assign var="formElement" value=$form.$prefix.$n} + {else} + {assign var="formElement" value=$form.$n} + {/if} + {foreach name=outer key=key item=item from=$formElement} + {if $index < 10} + {assign var="index" value=`$index+1`} + {else} + + {if $count == $field.options_per_line} + + + {assign var="count" value="1"} + {else} + {assign var="count" value=`$count+1`} + {/if} + {/if} + {/foreach} + +
{$formElement.$key.html}
+ {/strip} +
+
+
+ {else} +
+
+ {if $prefix}{$form.$prefix.$n.label}{else}{$form.$n.label}{/if} +
+
+ {if $n|substr:0:3 eq 'im-'} + {assign var="provider" value=$n|cat:"-provider_id"} + {$form.$provider.html}  + {/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 ( $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:-5:5 eq '_date' ) } + {assign var="date_value" value=$form.$n.value} + + {$date_value|date_format:"%Y-%m-%d"|crmDate:$config->dateformatshortdate} + + + {elseif $n|substr:0:5 eq 'phone'} + {assign var="phone_ext_field" value=$n|replace:'phone':'phone_ext'} + {if $prefix}{$form.$prefix.$n.html}{else}{$form.$n.html}{/if} + {if $form.$phone_ext_field.html} +  {$form.$phone_ext_field.html} + {/if} + {else} + {if $prefix} + {if $n eq 'organization_name' && !empty($form.onbehalfof_id)} + {$form.onbehalfof_id.html} + {/if} + {if $field.html_type eq 'File' && $viewOnlyPrefixFileValues} + {$viewOnlyPrefixFileValues.$prefix.$n} + {else} + {$form.$prefix.$n.html} + {/if} + {elseif $field.html_type eq 'File' && $viewOnlyFileValues} + {$viewOnlyFileValues.$n} + {else} + {$form.$n.html} + {/if} + {/if} + + {*CRM-4564*} + {if $field.html_type eq 'Autocomplete-Select'} + {if $field.data_type eq 'ContactReference'} + {include file="CRM/Custom/Form/ContactReference.tpl" element_name = $n} + {/if} + {/if} +
+
+
+ {/if} + {* Show explanatory text for field if not in 'view' or 'preview' modes *} + {if $field.help_post && $action neq 4 && $action neq 1028} +
+
{$field.help_post}
+
+ {/if} + {/if} +{/foreach} -- 2.25.1