From 465c5a7c1361a666c5e1983dbc8e416135b9229c Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Tue, 19 Jul 2016 18:04:06 -0400
Subject: [PATCH] CRM-17608 - Merge document form tweaks

---
 .../CRM/Contact/Form/Task/PDFLetterCommon.hlp  | 10 ++++++++++
 .../CRM/Contact/Form/Task/PDFLetterCommon.tpl  | 18 +++++++++---------
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/templates/CRM/Contact/Form/Task/PDFLetterCommon.hlp b/templates/CRM/Contact/Form/Task/PDFLetterCommon.hlp
index 2ea3762507..8ccf0e5543 100644
--- a/templates/CRM/Contact/Form/Task/PDFLetterCommon.hlp
+++ b/templates/CRM/Contact/Form/Task/PDFLetterCommon.hlp
@@ -24,6 +24,16 @@
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
 *}
+{php}$this->assign('uploadFormatsSupported', '.' . implode(', .', array_keys(CRM_Utils_PDF_Document::$ooxmlMap)));{/php}
+{htxt id="template"}
+  <p>
+    {ts}Select a pre-existing template, or upload a document for mail merge.{/ts}
+  </p>
+  <p>
+    {ts 1=$uploadFormatsSupported}Supported file formats: %1{/ts}
+  </p>
+{/htxt}
+
 {htxt id="id-pdf-format-title"}
   {ts}Page Format{/ts}
 {/htxt}
diff --git a/templates/CRM/Contact/Form/Task/PDFLetterCommon.tpl b/templates/CRM/Contact/Form/Task/PDFLetterCommon.tpl
index c8866fcb62..eb3e4cd729 100644
--- a/templates/CRM/Contact/Form/Task/PDFLetterCommon.tpl
+++ b/templates/CRM/Contact/Form/Task/PDFLetterCommon.tpl
@@ -27,24 +27,24 @@
 {if $form.template.html}
 <table class="form-layout-compressed">
     <tr>
-      <td class="label-left">{$form.template.label}</td>
-      <td>{$form.template.html}</td>
-    </tr>
-    <tr>
-      <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<sub>OR</sub></td>
-    </tr>
-    <tr>
-      <td class="label-left">{$form.document_file.label}</td>
-      <td>{$form.document_file.html}<br/><br/></td>
+      <td class="label-left">
+        {$form.template.label}
+        {help id="template" title=$form.template.label file="CRM/Contact/Form/Task/PDFLetterCommon.hlp"}
+      </td>
+      <td>
+        {$form.template.html} {ts}OR{/ts} {$form.document_file.html}
+      </td>
     </tr>
     <tr>
       <td class="label-left">{$form.subject.label}</td>
       <td>{$form.subject.html}</td>
     </tr>
+    {if $form.campaign_id}
     <tr>
       <td class="label-left">{$form.campaign_id.label}</td>
       <td>{$form.campaign_id.html}</td>
     </tr>
+    {/if}
 </table>
 {/if}
 
-- 
2.25.1