From c24d51cf3aa851383d32e1831e98e41d53ac9a40 Mon Sep 17 00:00:00 2001
From: Steve Sutton <steve@gaslightmedia.com>
Date: Mon, 2 Jul 2018 15:04:00 -0400
Subject: [PATCH] Update the checkboxes

Rearrange them, placing member type in front.
---
 views/admin/ajax/contactsListExport.html    | 6 +++---
 views/admin/ajax/contactsListExportCsv.html | 6 +++---
 views/admin/contacts/index.html             | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/views/admin/ajax/contactsListExport.html b/views/admin/ajax/contactsListExport.html
index 3daedae..1548949 100644
--- a/views/admin/ajax/contactsListExport.html
+++ b/views/admin/ajax/contactsListExport.html
@@ -12,6 +12,7 @@
             <thead>
                 <tr>
                     {if $select.exportId}<th align="left">ID</th>{/if}
+                    {if $select.exportMemberType}<th align="left">Member Type</th>{/if}
                     {if $select.exportFname}<th align="left">First Name</th>{/if}
                     {if $select.exportLname}<th align="left">Last Name</th>{/if}
                     {if $select.exportAddr1}<th align="left">Address 1</th>{/if}
@@ -30,7 +31,6 @@
                     {if $select.exportFax}<th align="left">Fax</th>{/if}
                     {if $select.exportEmail}<th align="left">E-Mail</th>{/if}
                     {if $select.exportAltEmail}<th align="left">Alt E-Mail</th>{/if}
-                    {if $select.exportMemberType}<th align="left">Member Type</th>{/if}
                     {if $CFHeaders}{foreach $CFHeaders as $cHead}<th align="left">{$cHead}</th>{/foreach}{/if}
                 </tr>
             </thead>
@@ -39,6 +39,7 @@
         {foreach $contacts as $m}
                 <tr>
                     {if $select.exportId}<td>{$m.id}</td>{/if}
+                    {if $select.exportMemberType}<td>{$m.member_type}</td>{/if}
                     {if $select.exportFname}<td>{$m.fname}</td>{/if}
                     {if $select.exportLname}<td>{$m.lname}</td>{/if}
                     {if $select.exportAddr1}<td>{$m.addr1}</td>{/if}
@@ -47,7 +48,7 @@
                     {if $select.exportCounty}<td>{$m.county}</td>{/if}
                     {if $select.exportState}<td>{if $m.state}{$m.state.value}{/if}</td>{/if}
                     {if $select.exportZip}<td>{$m.zip}</td>{/if}
-                    {if $select.exportCountry}<td>{$m.country}</td>{/if}
+                    {if $select.exportCountry}<td>{if $m.country.value}{$m.country.value}{/if}</td>{/if}
                     {if $select.exportOrg}<td>{$m.org}</td>{/if}
                     {if $select.exportTitle}<td>{$m.title}</td>{/if}
                     {if $select.exportOfficePhone}<td>{$m.office_phone}</td>{/if}
@@ -57,7 +58,6 @@
                     {if $select.exportFax}<td>{$m.fax}</td>{/if}
                     {if $select.exportEmail}<td>{$m.email}</td>{/if}
                     {if $select.exportAltEmail}<td>{$m.alt_email}</td>{/if}
-                    {if $select.exportMemberType}<td>{$m.member_type}</td>{/if}
                     {if $CFHeaders}{foreach $CFHeaders as $cHead}<td>{$m[$cHead]}</td>{/foreach}{/if}
 
                 </tr>
diff --git a/views/admin/ajax/contactsListExportCsv.html b/views/admin/ajax/contactsListExportCsv.html
index 2973c3d..198f22d 100644
--- a/views/admin/ajax/contactsListExportCsv.html
+++ b/views/admin/ajax/contactsListExportCsv.html
@@ -1,6 +1,7 @@
 {if $haveMembers}
 
 {if $select.exportId}"ID",{/if}
+{if $select.exportMemberType}"Member Type",{/if}
 {if $select.exportFname}"First Name",{/if}
 {if $select.exportLname}"Last Name",{/if}
 {if $select.exportAddr1}"Address 1",{/if}
@@ -19,11 +20,11 @@
 {if $select.exportFax}"Fax",{/if}
 {if $select.exportEmail}"E-Mail",{/if}
 {if $select.exportAltEmail}"Alt E-Mail",{/if}
-{if $select.exportMemberType}"Member Type",{/if}
 {if $CFHeaders}{foreach $CFHeaders as $cHead}"{$cHead}",{/foreach}{/if}
 
 {foreach $contacts as $m}
 {if $select.exportId}"{$m.id}",{/if}
+{if $select.exportMemberType}"{$m.member_type}",{/if}
 {if $select.exportFname}"{$m.fname}",{/if}
 {if $select.exportLname}"{$m.lname}",{/if}
 {if $select.exportAddr1}"{$m.addr1}",{/if}
@@ -32,7 +33,7 @@
 {if $select.exportCounty}"{$m.county}",{/if}
 {if $select.exportState}"{if $m.state}{$m.state.value}{/if}",{/if}
 {if $select.exportZip}"{$m.zip}",{/if}
-{if $select.exportCountry}"{$m.country}",{/if}
+{if $select.exportCountry}"{if $m.country.value}{$m.country.value}{/if}",{/if}
 {if $select.exportOrg}"{$m.org}",{/if}
 {if $select.exportTitle}"{$m.title}",{/if}
 {if $select.exportOfficePhone}"{$m.office_phone}",{/if}
@@ -42,7 +43,6 @@
 {if $select.exportFax}"{$m.fax}",{/if}
 {if $select.exportEmail}"{$m.email}",{/if}
 {if $select.exportAltEmail}"{$m.alt_email}",{/if}
-{if $select.exportMemberType}"{$m.member_type}",{/if}
 {if $CFHeaders}{foreach $CFHeaders as $cHead}"{$m[$cHead]}",{/foreach}{/if}
 
 {/foreach}
diff --git a/views/admin/contacts/index.html b/views/admin/contacts/index.html
index c15741d..7eb1c0d 100644
--- a/views/admin/contacts/index.html
+++ b/views/admin/contacts/index.html
@@ -120,6 +120,7 @@
                             <tr>
                             <td class="exportFieldsTd">
                                 <input type="checkbox" name="exportId"> Contact ID<br>
+                                <input type="checkbox" name="exportMemberType" checked> Member Type<br>
                                 <input type="checkbox" name="exportFname" checked> First Name<br>
                                 <input type="checkbox" name="exportLname" checked> Last Name<br>
                                 <input type="checkbox" name="exportAddr1" checked> Address 1<br>
@@ -128,9 +129,9 @@
                                 <input type="checkbox" name="exportCounty" checked> County<br>
                                 <input type="checkbox" name="exportState" checked> State<br>
                                 <input type="checkbox" name="exportZip" checked> ZIP<br>
-                                <input type="checkbox" name="exportCountry" checked> Country<br>
                             </td>
                             <td class="exportFieldsTd">
+                                <input type="checkbox" name="exportCountry" checked> Country<br>
                                 <input type="checkbox" name="exportOrg" checked> Organization<br>
                                 <input type="checkbox" name="exportTitle" checked> Title/Position<br>
                                 <input type="checkbox" name="exportOfficePhone" checked> Office Phone<br>
@@ -140,7 +141,6 @@
                                 <input type="checkbox" name="exportFax" checked> Fax Phone<br>
                                 <input type="checkbox" name="exportEmail" checked> Email<br>
                                 <input type="checkbox" name="exportAltEmail" checked> Alt Email<br>
-                                <input type="checkbox" name="exportMemberType"> Member Type<br>
                             </td>
                             </tr>
                         </table>
-- 
2.17.1