Merge pull request #895 from kurund/CRM-12709

CRM-12709 fixed display of formatting field in profile

templates/CRM/Profile/Form/Dynamic.tpl

@@ -118,6 +118,17 @@ function proccessMultiRecordForm(formData, jqForm, options) {
       {/if}
       {assign var="profileID" value=$field.group_id}
       {assign var=n value=$field.name}
+      {if $field.groupTitle != $fieldset}
+        {if $mode neq 8 && $mode neq 4}
+          <div {if $context neq 'dialog'}id="profilewrap{$field.group_id}"{/if}>
+          <fieldset><legend>{$field.groupTitle}</legend>
+        {/if}
+        {assign var=fieldset  value=`$field.groupTitle`}
+        {assign var=groupHelpPost  value=`$field.groupHelpPost`}
+        {if $field.groupHelpPre}
+          <div class="messages help">{$field.groupHelpPre}</div>
+        {/if}
+      {/if}
       {if $field.field_type eq "Formatting"}
         {$field.help_pre}
       {elseif $n}
@@ -132,16 +143,6 @@ function proccessMultiRecordForm(formData, jqForm, options) {
             </div>
             {/if}
           {/if}
-
-          {if $mode neq 8 && $mode neq 4}
-          <div {if $context neq 'dialog'}id="profilewrap{$field.group_id}"{/if}>
-          <fieldset><legend>{$field.groupTitle}</legend>
-          {/if}
-          {assign var=fieldset  value=`$field.groupTitle`}
-          {assign var=groupHelpPost  value=`$field.groupHelpPost`}
-          {if $field.groupHelpPre}
-            <div class="messages help">{$field.groupHelpPre}</div>
-          {/if}
         <div class="form-layout-compressed">
         {/if}
         {if $field.help_pre && $action neq 4 && $form.$n.html}

templates/CRM/UF/Form/Preview.tpl

@@ -46,10 +46,6 @@
           {if $field.skipDisplay}
             {continue}
           {/if}
-          {if $field.field_type eq "Formatting"}
-            {$field.help_pre}
-            {continue}
-          {/if}
           {if $field.groupTitle != $fieldset}
             {if $fieldset != $zeroField}
               </table>
@@ -71,11 +67,13 @@
           <table class="form-layout-compressed" id="table-1">
           {/if}
           {* Show explanatory text for field if not in 'view' mode *}
-          {if $field.help_pre && $action neq 4}
+          {if $field.help_pre && $action neq 4 && $field.field_type neq "Formatting"}
             <tr><td>&nbsp;</td><td class="description">{$field.help_pre}</td></tr>
           {/if}
           {assign var=n value=$field.name}
-          {if $field.options_per_line }
+          {if $field.field_type eq "Formatting"}
+            <tr><td colspan="2">{$field.help_pre}</td></tr>
+          {elseif $field.options_per_line }
             <tr>
               <td class="option-label">{$form.$n.label}</td>
               <td>