From 7a019389ae9355a386b4ad3fc30c429874287244 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Sun, 15 Mar 2015 22:23:17 -0400
Subject: [PATCH] CRM-16103 - Improve mailing search form layout

---
 templates/CRM/Mailing/Form/Search.tpl | 14 +++++++-------
 templates/CRM/Mailing/Page/Browse.hlp |  7 +++++++
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/templates/CRM/Mailing/Form/Search.tpl b/templates/CRM/Mailing/Form/Search.tpl
index 20987422e6..4a1a008283 100644
--- a/templates/CRM/Mailing/Form/Search.tpl
+++ b/templates/CRM/Mailing/Form/Search.tpl
@@ -26,8 +26,8 @@
 <div class="crm-block crm-form-block crm-search-form-block">
 <table class="form-layout">
     <tr>
-        <td>{$form.mailing_name.label}<br />
-            {$form.mailing_name.html|crmAddClass:big} {help id="id-mailing_name"}
+        <td>{$form.mailing_name.label} {help id="id-mailing_name"}<br />
+            {$form.mailing_name.html|crmAddClass:big}
         </td>
     </tr>
     <tr>
@@ -39,23 +39,23 @@
   {include file="CRM/Core/DateRange.tpl" fieldName="mailing" from='_from' to='_to'}
     </tr>
     <tr>
-        <td colspan="1">{$form.sort_name.label}<br />
-            {$form.sort_name.html|crmAddClass:big} {help id="id-create_sort_name"}
+        <td colspan="1">{$form.sort_name.label} {help id="id-create_sort_name"}<br />
+            {$form.sort_name.html|crmAddClass:big}
             <br/><br/>
             <div class="crm-search-form-block-is_archive">
-            {$form.is_archived.label}<br/>
+            {$form.is_archived.label} {help id="is_archived"}<br/>
             {$form.is_archived.html}
             </div>
         </td>
         {if $form.mailing_status}
            <td width="100%"><label>{if $sms eq 1}{ts}SMS Status{/ts}{else}{ts}Mailing Status{/ts}{/if}</label><br />
-           <div class="listing-box" style="width: auto; height: 100px">
+           <div class="listing-box" style="height: auto">
              {foreach from=$form.mailing_status item="mailing_status_val"}
              <div class="{cycle values="odd-row,even-row"}">
                {$mailing_status_val.html}
              </div>
             {/foreach}
-            <div class='odd-row'>
+            <div class="{cycle values="odd-row,even-row"}">
               {$form.status_unscheduled.html}
             </div>
            </div><br />
diff --git a/templates/CRM/Mailing/Page/Browse.hlp b/templates/CRM/Mailing/Page/Browse.hlp
index 62b82d336c..2c59903265 100644
--- a/templates/CRM/Mailing/Page/Browse.hlp
+++ b/templates/CRM/Mailing/Page/Browse.hlp
@@ -36,3 +36,10 @@
 {htxt id="id-create_sort_name"}
 {ts}Find mailings by the name of the person who created or sent them. You can enter a complete OR partial name (last name, first name format).{/ts}
 {/htxt}
+
+{htxt id="is_archived-title"}
+  {ts}Archived{/ts}
+{/htxt}
+{htxt id="is_archived"}
+  {ts}This field is disabled when searching for Draft/Unscheduled mailings.{/ts}
+{/htxt}
-- 
2.25.1