From 7caef08d10f84773de4bdbf9bc8b6bf93a6747d2 Mon Sep 17 00:00:00 2001
From: Steve Sutton <steve@gaslightmedia.com>
Date: Thu, 9 Aug 2018 13:36:51 -0400
Subject: [PATCH] Rearrange sections on the contact edit page.

Order for contact edit sections.
Account Settings
Account Profile
Custom Fields
Organization / Company Information
Billing Info
Account Contact Info
Notes
---
 views/admin/contacts/edit.html | 319 +++++++++++++++++----------------
 1 file changed, 164 insertions(+), 155 deletions(-)

diff --git a/views/admin/contacts/edit.html b/views/admin/contacts/edit.html
index 5b5b471..3833903 100644
--- a/views/admin/contacts/edit.html
+++ b/views/admin/contacts/edit.html
@@ -147,6 +147,7 @@
 
 
             <div id="glm-table-profile" class="glm-admin-table-outer glm-contact-info-table glm-admin-table">
+
                 <div id="glm-contact-account-settings-toggle" class="glm-contact-content-toggle {if $contactEditOwnRecord}glm-hidden{/if}">
                     <h3 class="section-title">Account Settings</h3>
                 </div>
@@ -443,151 +444,35 @@
                         </div>
                     </div>
                 </div>
-                <div id="glm-contact-account-contact-toggle" class="glm-contact-content-toggle">
-                    <h3 class="section-title">Account Contact Info</h3>
+
+
+                <div id="glm-contact-custom-fields-toggle" class="glm-contact-content-toggle">
+                    <h3 class="section-title">
+                    {if apply_filters( 'glm-members-billing-contact-tab-name', '' )}
+                        {apply_filters( 'glm-members-billing-contact-tab-name', '' )}
+                    {else}
+                        Custom Fields
+                    {/if}
+                    </h3>
                 </div>
-                <div id="glm-contact-account-contact-container" class="glm-admin-form-section glm-contact-content-data">
-                    <div id="glm-contact-account-contact">
+                <div id="glm-contact-custom-fields-container" class="glm-admin-form-section glm-contact-content-data">
+                    <div id="glm-table-custom-fields" class="glm-admin-table glm-table glm-contact-info-table">
+                        {if $option == 'create'}
+                            {apply_filters('glm-members-custom-fields-form', '', $slug,'','')}
+                        {else}
+                            {$prefix = $slug|cat:'_'}
+                            {$uid = $prefix|cat:$contactInfo.fieldData.id}
+                            {apply_filters('glm-members-custom-fields-form', '', $slug,$contactInfo.fieldData.id,'')}
+                            {*apply_filters('glm-members-custom-fields-form', '', $uid,$contactInfo.fieldData.id,'')*}
+                        {/if}
 
-                        <table class="glm-admin-table glm-admin-table-inner">
-                            <tr>
-                                <td>
-                                    <span class="glm-label">Publish on Front End</span>
-                                    <input type="checkbox" class="glm-contacts-checkbox" name="contact_publish" {if $contactInfo.fieldData.contact_publish.value} checked{/if}>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td>
-                                    <span class="glm-label">Use for Billing Information</span>
-                                    <input type="checkbox" class="glm-contacts-checkbox" name="contact_use_billing">
-                                </td>
-                            </tr>
-                            <tr>
-                                <td colspan="2" class="glm-table-spacer">
-                                    <div><hr></div>
-                                </td>
-                            </tr>
-                            <tr>
-                                <th {if $contactInfo.fieldRequired.mailing_address_type}class="glm-required"{/if}>Mailing Address Type</th>
-                                <td {if $contactInfo.fieldFail.mailing_address_type}class="glm-form-bad-input"{/if}>
-                                    <input type="text" id="mailing_address_type" name="mailing_address_type" placeholder="(e.g. Winter/Summer Address)" value="{$contactInfo.fieldData.mailing_address_type}" class="glm-form-text-input-short">
-                                    {if $contactInfo.fieldFail.mailing_address_type}<p>{$contactInfo.fieldFail.mailing_address_type}</p>{/if}
-                                </td>
-                            </tr>
-                            <tr>
-                                <th {if $contactInfo.fieldRequired.mailto_label}class="glm-required"{/if}>Addressee Name</th>
-                                <td {if $contactInfo.fieldFail.mailto_label}class="glm-form-bad-input"{/if}>
-                                    <input type="text" id="mailto_label" name="mailto_label" value="{$contactInfo.fieldData.mailto_label}" placeholder="(e.g. Mr. John Doe)" class="glm-form-text-input-short">
-                                    {if $contactInfo.fieldFail.mailto_label}<p>{$contactInfo.fieldFail.mailto_label}</p>{/if}
-                                </td>
-                            </tr>
-                            <tr>
-                                <th {if $contactInfo.fieldRequired.addr1}class="glm-required"{/if}>Address Line 1</th>
-                                <td {if $contactInfo.fieldFail.addr1}class="glm-form-bad-input"{/if}>
-                                    <input type="text" id="addr1" name="addr1" value="{$contactInfo.fieldData.addr1}" class="glm-form-text-input-medium glm-geocodeAction">
-                                    {if $contactInfo.fieldFail.addr1}<p>{$contactInfo.fieldFail.addr1}</p>{/if}
-                                </td>
-                            </tr>
-                            <tr>
-                                <th {if $contactInfo.fieldRequired.addr2}class="glm-required"{/if}>Address Line 2</th>
-                                <td {if $contactInfo.fieldFail.addr2}class="glm-form-bad-input"{/if}>
-                                    <input id="addr2" type="text" name="addr2" value="{$contactInfo.fieldData.addr2}" class="glm-form-text-input-medium glm-geocodeAction">
-                                    {if $contactInfo.fieldFail.addr2}<p>{$contactInfo.fieldFail.addr2}</p>{/if}
-                                </td>
-                            </tr>
-                            <tr>
-                                <th>City</th>
-                                <td class="glm-contact-citybox">
-                                    <!--  Add new city dialog -->
-                                    <div id="newCityDialog" class="newCityDialog glm-dialog-box" title="Enter a New City">
-                                        <table class="glm-admin-table">
-                                            <tr>
-                                                <th class="glm-required">City Name</th>
-                                            </tr>
-                                            <tr>
-                                                <td id="newCityNameTD" class="newCityNameTD">
-                                                    <input id="newCityName" type="text" name="newCityName" class="newCityName glm-form-text-input">
-                                                    <div id="newCityNameRequired" class="newCitynameRequired"></div>
-                                                </td>
-                                            </tr>
-                                        </table>
-                                        <p><span class="glm-required">*</span> Required</p>
-                                        <a id="newCityCancel" class="newCityCancel button button-primary glm-right">Cancel</a>
-                                        <input id="newCitySubmit" class="newCitySubmit" type="submit" value="Add new City">
-                                    </div>
-                                    <!-- City Selection -->
-                                    <input id="cityName" type="hidden" name="newCityName" value=""><!-- this field is only used if adding a new city to pass the new name -->
-                                    <select name="city" id="city" class="glm-geocodeAction">
-                        {foreach from=$contactInfo.fieldData.city.list item=v}
-                                        <option value="{$v.value}"{if $v.default} selected="selected"{/if}>
-                                            {$v.name}
-                                        </option>
-                        {/foreach}
-                                    </select>
-                                    <div id="newCityButton" class="newCityButton button button-secondary">Add a new City</div>
-                                </td>
-                            </tr>
-                            <tr>
-                                <th {if $contactInfo.fieldRequired.state}class="glm-required"{/if}>State</th>
-                                <td {if $contactInfo.fieldFail.state}class="glm-form-bad-input"{/if}>
-                                    <select id="state" name="state" class="glm-geocodeAction">
-                        {foreach from=$contactInfo.fieldData.state.list item=v}
-                                        <option value="{$v.value}"{if $v.default} selected="selected"{/if}>
-                                            {$v.name}
-                                        </option>
-                        {/foreach}
-                                    </select>
-                                    {if $contactInfo.fieldFail.state}<p>{$contactInfo.fieldFail.state}</p>{/if}
-                                </td>
-                            </tr>
-                            <tr>
-                                <th {if $contactInfo.fieldRequired.zip}class="glm-required"{/if}>ZIP / Postal Code</th>
-                                <td {if $contactInfo.fieldFail.zip}class="glm-form-bad-input"{/if}>
-                                    <input id="zip" type="text" name="zip" value="{$contactInfo.fieldData.zip}" class="glm-form-text-input-short glm-geocodeAction">
-                                    {if $contactInfo.fieldFail.zip}<p>{$contactInfo.fieldFail.zip}</p>{/if}
-                                </td>
-                            </tr>
-                            <tr>
-                                <th {if $contactInfo.fieldRequired.country}class="glm-required"{/if}>Country</th>
-                                <td {if $contactInfo.fieldFail.country}class="glm-form-bad-input"{/if}>
-                                    <select id="country" name="country" class="glm-geocodeAction">
-                        {foreach from=$contactInfo.fieldData.country.list item=v}
-                                        <option value="{$v.value}"{if $v.default} selected="selected"{/if}>
-                                            {$v.name} {$v.value}
-                                        </option>
-                        {/foreach}
-                                    </select>
-                                    {if $contactInfo.fieldFail.country}<p>{$contactInfo.fieldFail.country}</p>{/if}
-                                </td>
-                            </tr>
-                            <tr>
-                                <th {if $contactInfo.fieldRequired.home_phone}class="glm-required"{/if}>Home Phone #</th>
-                                <td {if $contactInfo.fieldFail.home_phone}class="glm-form-bad-input"{/if}>
-                                    <input type="text" name="home_phone" value="{$contactInfo.fieldData.home_phone}" class="glm-form-text-input-short glm-phone-input" placeholder="ex: 123-456-7890 ext 123">
-                                    {if $contactInfo.fieldFail.home_phone}<p>{$contactInfo.fieldFail.home_phone}</p>{/if}
-                                </td>
-                            </tr>
-                            <tr>
-                                <th {if $contactInfo.fieldRequired.mobile_phone}class="glm-required"{/if}>Mobile Phone #</th>
-                                <td {if $contactInfo.fieldFail.mobile_phone}class="glm-form-bad-input"{/if}>
-                                    <input type="text" name="mobile_phone" value="{$contactInfo.fieldData.mobile_phone}" class="glm-form-text-input-short glm-phone-input" placeholder="ex: 123-456-7890 ext 123">
-                                    {if $contactInfo.fieldFail.mobile_phone}<p>{$contactInfo.fieldFail.mobile_phone}</p>{/if}
-                                </td>
-                            </tr>
-                            <tr>
-                                <th {if $contactInfo.fieldRequired.alt_email}class="glm-required"{/if}>Email Address:</th>
-                                <td {if $contactInfo.fieldFail.alt_email}class="glm-form-bad-input"{/if}>
-                                    <input type="text" name="alt_email" value="{$contactInfo.fieldData.alt_email}" class="glm-form-text-input-short" placeholder="ex: name@domain.com">
-                                    {if $contactInfo.fieldFail.alt_email}<p>{$contactInfo.fieldFail.alt_email}</p>{/if}
-                                </td>
-                            </tr>
-                        </table>
                         <div class="glm-contact-sub-data-links glmgrid-row">
                             <a class="glm-contact-content-toggle glmgrid-columns glmgrid-small-6">Collapse</a>
                             <a class="glm-contact-link-to-top glmgrid-columns glmgrid-small-6">Back to top</a>
                         </div>
                     </div>
                 </div>
+
                 <div id="glm-contact-company-info-toggle" class="glm-contact-content-toggle">
                     <h3 class="section-title">Organization / Company Information</h3>
                 </div>
@@ -793,32 +678,156 @@
                 </div>
             {/if}
 
-                <div id="glm-contact-custom-fields-toggle" class="glm-contact-content-toggle">
-                    <h3 class="section-title">
-                    {if apply_filters( 'glm-members-billing-contact-tab-name', '' )}
-                        {apply_filters( 'glm-members-billing-contact-tab-name', '' )}
-                    {else}
-                        Custom Fields
-                    {/if}
-                    </h3>
+
+                <div id="glm-contact-account-contact-toggle" class="glm-contact-content-toggle">
+                    <h3 class="section-title">Account Contact Info</h3>
                 </div>
-                <div id="glm-contact-custom-fields-container" class="glm-admin-form-section glm-contact-content-data">
-                    <div id="glm-table-custom-fields" class="glm-admin-table glm-table glm-contact-info-table">
-                        {if $option == 'create'}
-                            {apply_filters('glm-members-custom-fields-form', '', $slug,'','')}
-                        {else}
-                            {$prefix = $slug|cat:'_'}
-                            {$uid = $prefix|cat:$contactInfo.fieldData.id}
-                            {apply_filters('glm-members-custom-fields-form', '', $slug,$contactInfo.fieldData.id,'')}
-                            {*apply_filters('glm-members-custom-fields-form', '', $uid,$contactInfo.fieldData.id,'')*}
-                        {/if}
+                <div id="glm-contact-account-contact-container" class="glm-admin-form-section glm-contact-content-data">
+                    <div id="glm-contact-account-contact">
 
+                        <table class="glm-admin-table glm-admin-table-inner">
+                            <tr>
+                                <td>
+                                    <span class="glm-label">Publish on Front End</span>
+                                    <input type="checkbox" class="glm-contacts-checkbox" name="contact_publish" {if $contactInfo.fieldData.contact_publish.value} checked{/if}>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <span class="glm-label">Use for Billing Information</span>
+                                    <input type="checkbox" class="glm-contacts-checkbox" name="contact_use_billing">
+                                </td>
+                            </tr>
+                            <tr>
+                                <td colspan="2" class="glm-table-spacer">
+                                    <div><hr></div>
+                                </td>
+                            </tr>
+                            <tr>
+                                <th {if $contactInfo.fieldRequired.mailing_address_type}class="glm-required"{/if}>Mailing Address Type</th>
+                                <td {if $contactInfo.fieldFail.mailing_address_type}class="glm-form-bad-input"{/if}>
+                                    <input type="text" id="mailing_address_type" name="mailing_address_type" placeholder="(e.g. Winter/Summer Address)" value="{$contactInfo.fieldData.mailing_address_type}" class="glm-form-text-input-short">
+                                    {if $contactInfo.fieldFail.mailing_address_type}<p>{$contactInfo.fieldFail.mailing_address_type}</p>{/if}
+                                </td>
+                            </tr>
+                            <tr>
+                                <th {if $contactInfo.fieldRequired.mailto_label}class="glm-required"{/if}>Addressee Name</th>
+                                <td {if $contactInfo.fieldFail.mailto_label}class="glm-form-bad-input"{/if}>
+                                    <input type="text" id="mailto_label" name="mailto_label" value="{$contactInfo.fieldData.mailto_label}" placeholder="(e.g. Mr. John Doe)" class="glm-form-text-input-short">
+                                    {if $contactInfo.fieldFail.mailto_label}<p>{$contactInfo.fieldFail.mailto_label}</p>{/if}
+                                </td>
+                            </tr>
+                            <tr>
+                                <th {if $contactInfo.fieldRequired.addr1}class="glm-required"{/if}>Address Line 1</th>
+                                <td {if $contactInfo.fieldFail.addr1}class="glm-form-bad-input"{/if}>
+                                    <input type="text" id="addr1" name="addr1" value="{$contactInfo.fieldData.addr1}" class="glm-form-text-input-medium glm-geocodeAction">
+                                    {if $contactInfo.fieldFail.addr1}<p>{$contactInfo.fieldFail.addr1}</p>{/if}
+                                </td>
+                            </tr>
+                            <tr>
+                                <th {if $contactInfo.fieldRequired.addr2}class="glm-required"{/if}>Address Line 2</th>
+                                <td {if $contactInfo.fieldFail.addr2}class="glm-form-bad-input"{/if}>
+                                    <input id="addr2" type="text" name="addr2" value="{$contactInfo.fieldData.addr2}" class="glm-form-text-input-medium glm-geocodeAction">
+                                    {if $contactInfo.fieldFail.addr2}<p>{$contactInfo.fieldFail.addr2}</p>{/if}
+                                </td>
+                            </tr>
+                            <tr>
+                                <th>City</th>
+                                <td class="glm-contact-citybox">
+                                    <!--  Add new city dialog -->
+                                    <div id="newCityDialog" class="newCityDialog glm-dialog-box" title="Enter a New City">
+                                        <table class="glm-admin-table">
+                                            <tr>
+                                                <th class="glm-required">City Name</th>
+                                            </tr>
+                                            <tr>
+                                                <td id="newCityNameTD" class="newCityNameTD">
+                                                    <input id="newCityName" type="text" name="newCityName" class="newCityName glm-form-text-input">
+                                                    <div id="newCityNameRequired" class="newCitynameRequired"></div>
+                                                </td>
+                                            </tr>
+                                        </table>
+                                        <p><span class="glm-required">*</span> Required</p>
+                                        <a id="newCityCancel" class="newCityCancel button button-primary glm-right">Cancel</a>
+                                        <input id="newCitySubmit" class="newCitySubmit" type="submit" value="Add new City">
+                                    </div>
+                                    <!-- City Selection -->
+                                    <input id="cityName" type="hidden" name="newCityName" value=""><!-- this field is only used if adding a new city to pass the new name -->
+                                    <select name="city" id="city" class="glm-geocodeAction">
+                        {foreach from=$contactInfo.fieldData.city.list item=v}
+                                        <option value="{$v.value}"{if $v.default} selected="selected"{/if}>
+                                            {$v.name}
+                                        </option>
+                        {/foreach}
+                                    </select>
+                                    <div id="newCityButton" class="newCityButton button button-secondary">Add a new City</div>
+                                </td>
+                            </tr>
+                            <tr>
+                                <th {if $contactInfo.fieldRequired.state}class="glm-required"{/if}>State</th>
+                                <td {if $contactInfo.fieldFail.state}class="glm-form-bad-input"{/if}>
+                                    <select id="state" name="state" class="glm-geocodeAction">
+                                        <option value=""></option>
+                        {foreach from=$contactInfo.fieldData.state.list item=v}
+                                        <option value="{$v.value}"{if $v.default} selected="selected"{/if}>
+                                            {$v.name}
+                                        </option>
+                        {/foreach}
+                                    </select>
+                                    {if $contactInfo.fieldFail.state}<p>{$contactInfo.fieldFail.state}</p>{/if}
+                                </td>
+                            </tr>
+                            <tr>
+                                <th {if $contactInfo.fieldRequired.zip}class="glm-required"{/if}>ZIP / Postal Code</th>
+                                <td {if $contactInfo.fieldFail.zip}class="glm-form-bad-input"{/if}>
+                                    <input id="zip" type="text" name="zip" value="{$contactInfo.fieldData.zip}" class="glm-form-text-input-short glm-geocodeAction">
+                                    {if $contactInfo.fieldFail.zip}<p>{$contactInfo.fieldFail.zip}</p>{/if}
+                                </td>
+                            </tr>
+                            <tr>
+                                <th {if $contactInfo.fieldRequired.country}class="glm-required"{/if}>Country</th>
+                                <td {if $contactInfo.fieldFail.country}class="glm-form-bad-input"{/if}>
+                                    <select id="country" name="country" class="glm-geocodeAction">
+                                        <option value=""></option>
+                        {foreach from=$contactInfo.fieldData.country.list item=v}
+                                        <option value="{$v.value}"{if $v.default} selected="selected"{/if}>
+                                            {$v.name} {$v.value}
+                                        </option>
+                        {/foreach}
+                                    </select>
+                                    {if $contactInfo.fieldFail.country}<p>{$contactInfo.fieldFail.country}</p>{/if}
+                                </td>
+                            </tr>
+                            <tr>
+                                <th {if $contactInfo.fieldRequired.home_phone}class="glm-required"{/if}>Home Phone #</th>
+                                <td {if $contactInfo.fieldFail.home_phone}class="glm-form-bad-input"{/if}>
+                                    <input type="text" name="home_phone" value="{$contactInfo.fieldData.home_phone}" class="glm-form-text-input-short glm-phone-input" placeholder="ex: 123-456-7890 ext 123">
+                                    {if $contactInfo.fieldFail.home_phone}<p>{$contactInfo.fieldFail.home_phone}</p>{/if}
+                                </td>
+                            </tr>
+                            <tr>
+                                <th {if $contactInfo.fieldRequired.mobile_phone}class="glm-required"{/if}>Mobile Phone #</th>
+                                <td {if $contactInfo.fieldFail.mobile_phone}class="glm-form-bad-input"{/if}>
+                                    <input type="text" name="mobile_phone" value="{$contactInfo.fieldData.mobile_phone}" class="glm-form-text-input-short glm-phone-input" placeholder="ex: 123-456-7890 ext 123">
+                                    {if $contactInfo.fieldFail.mobile_phone}<p>{$contactInfo.fieldFail.mobile_phone}</p>{/if}
+                                </td>
+                            </tr>
+                            <tr>
+                                <th {if $contactInfo.fieldRequired.alt_email}class="glm-required"{/if}>Email Address:</th>
+                                <td {if $contactInfo.fieldFail.alt_email}class="glm-form-bad-input"{/if}>
+                                    <input type="text" name="alt_email" value="{$contactInfo.fieldData.alt_email}" class="glm-form-text-input-short" placeholder="ex: name@domain.com">
+                                    {if $contactInfo.fieldFail.alt_email}<p>{$contactInfo.fieldFail.alt_email}</p>{/if}
+                                </td>
+                            </tr>
+                        </table>
                         <div class="glm-contact-sub-data-links glmgrid-row">
                             <a class="glm-contact-content-toggle glmgrid-columns glmgrid-small-6">Collapse</a>
                             <a class="glm-contact-link-to-top glmgrid-columns glmgrid-small-6">Back to top</a>
                         </div>
                     </div>
                 </div>
+
+
                 <div id="glm-contact-notes-toggle" class="glm-contact-content-toggle {if $contactEditOwnRecord}glm-hidden{/if}">
                     <h3 class="section-title">Notes</h3>
                 </div>
-- 
2.17.1