- </tr>
-{if $user->isPluginEnabled('wu')}
- <tr>
- <td></td>
- <td></td>
- <td width="25%"><label>{$forms.reportForm.chunits.control} {$i18n.label.work_units}</label></td>
- <td></td>
- </tr>
+{if $show_cf_1_checkbox}
+ <tr><td><label>{$forms.reportForm.chcf_1.control} {$custom_fields->fields[0]['label']|escape}</label></td></tr>
+{/if}
+ </table>
+ </td>
+ <td width="25%" valign="top">
+ <table border="0" cellpadding="3">
+{if $show_start}
+ <tr><td><label>{$forms.reportForm.chstart.control} {$i18n.label.start}</label></td></tr>
+{/if}
+{if $show_task}
+ <tr><td><label>{$forms.reportForm.chtask.control} {$i18n.label.task}</label></td></tr>
+{/if}
+{if $show_ip}
+ <tr><td><label>{$forms.reportForm.chip.control} {$i18n.label.ip}</label></td></tr>
+{/if}
+{if $show_work_units}
+ <tr><td><label>{$forms.reportForm.chunits.control} {$i18n.label.work_units}</label></td></tr>
+{/if}
+ </table>
+ </td>
+ <td width="25%" valign="top">
+ <table border="0" cellpadding="3">
+{if $show_finish}
+ <tr><td><label>{$forms.reportForm.chfinish.control} {$i18n.label.finish}</label></td></tr>
+{/if}
+ <tr><td><label>{$forms.reportForm.chnote.control} {$i18n.label.note}</label></td></tr>
+{if $show_approved}
+ <tr><td><label>{$forms.reportForm.chapproved.control} {$i18n.label.approved}</label></td></tr>