From b923d74720937ac28b9c1bfc8877cec1c6675f04 Mon Sep 17 00:00:00 2001
From: Laury GvR <laury@gaslightmedia.com>
Date: Wed, 8 Mar 2017 15:52:14 -0500
Subject: [PATCH] Made the member profile page more streamlined and prettier

---
 css/admin.css                                 |   3 +
 views/admin/member/memberInfo.html            |  32 ++---
 .../admin/member/memberInfo/editLocation.html | 110 --------------
 views/admin/member/memberInfo/editMedia.html  |  10 ++
 .../{editCamera.html => editMediaCamera.html} |   3 +-
 .../{editImages.html => editMediaImages.html} |   3 +-
 .../{editVideo.html => editMediaVideo.html}   |   3 +-
 .../admin/member/memberInfo/editProfile.html  |  27 ++++
 .../member/memberInfo/editProfileAddress.html | 134 ++++++++++++++++++
 .../memberInfo/editProfileDescription.html    |  26 ++++
 .../memberInfo/editProfileLocation.html       |  20 +++
 .../member/memberInfo/editProfileMailing.html |  72 ++++++++++
 views/admin/member/memberInfo/editStatus.html |  26 +---
 13 files changed, 308 insertions(+), 161 deletions(-)
 delete mode 100644 views/admin/member/memberInfo/editLocation.html
 create mode 100644 views/admin/member/memberInfo/editMedia.html
 rename views/admin/member/memberInfo/{editCamera.html => editMediaCamera.html} (97%)
 rename views/admin/member/memberInfo/{editImages.html => editMediaImages.html} (99%)
 rename views/admin/member/memberInfo/{editVideo.html => editMediaVideo.html} (97%)
 create mode 100644 views/admin/member/memberInfo/editProfile.html
 create mode 100644 views/admin/member/memberInfo/editProfileAddress.html
 create mode 100644 views/admin/member/memberInfo/editProfileDescription.html
 create mode 100644 views/admin/member/memberInfo/editProfileLocation.html
 create mode 100644 views/admin/member/memberInfo/editProfileMailing.html

diff --git a/css/admin.css b/css/admin.css
index 610b6719..e8d03ff7 100644
--- a/css/admin.css
+++ b/css/admin.css
@@ -114,6 +114,9 @@
 .glm-form-text-input-short {
     width: 15em;
 }
+.glm-form-text-input-medium-short {
+    width: 22em;
+}
 .glm-form-text-input-medium {
     width: 30em;
 }
diff --git a/views/admin/member/memberInfo.html b/views/admin/member/memberInfo.html
index 7a9884d6..2b96dce1 100644
--- a/views/admin/member/memberInfo.html
+++ b/views/admin/member/memberInfo.html
@@ -97,13 +97,11 @@
         </table>
 
     <h2 class="nav-tab-wrapper" style="margin-bottom: 1em;">
-        <a id="glm-member-info-descr" data-show-table="glm-table-descr" class="glm-member-info-tab nav-tab nav-tab-active">Status & Description</a>
-        <a id="glm-member-info-address" data-show-table="glm-table-address" class="glm-member-info-tab nav-tab">Address & Location</a>
-        <a id="glm-member-info-contact" data-show-table="glm-table-contact" class="glm-member-info-tab nav-tab">Contact Info</a>
+        <a id="glm-member-info-status" data-show-table="glm-table-status" class="glm-member-info-tab nav-tab nav-tab-active">Status</a>
+        <a id="glm-member-info-profile" data-show-table="glm-table-profile" class="glm-member-info-tab nav-tab">Profile Data</a>
+<!-- Merged into Address & Contact       <a id="glm-member-info-contact" data-show-table="glm-table-contact" class="glm-member-info-tab nav-tab">Contact Info</a>-->
         <a id="glm-member-info-cat" data-show-table="glm-table-cat" class="glm-member-info-tab nav-tab">Categories & Amenities</a>
-        <a id="glm-member-info-images" data-show-table="glm-table-images" class="glm-member-info-tab nav-tab">Images</a>
-        <a id="glm-member-info-video" data-show-table="glm-table-video" class="glm-member-info-tab nav-tab">Video</a>
-        <a id="glm-member-info-live-cam" data-show-table="glm-table-live-cam" class="glm-member-info-tab nav-tab">Live Cam</a>
+        <a id="glm-member-info-media" data-show-table="glm-table-media" class="glm-member-info-tab nav-tab">Media</a>
 <!-- Not using credit cards currently        <a id="glm-member-info-ccards" data-show-table="glm-table-ccards" class="glm-member-info-tab nav-tab">Credit Cards</a>  -->
         {if $memberUpdated}<span class="glm-notice glm-flash-updated glm-right">{$terms.term_member_cap} Profile Updated</span>{/if}
         {if $memberUpdateError}<span class="glm-error glm-flash-updated glm-right">{$terms.term_member_cap} Profile Update Error</span>{/if}
@@ -115,27 +113,15 @@
 
         <!-- **** Address and Location **** -->
 
-        {include file='admin/member/memberInfo/editLocation.html'}
-
-        <!-- **** Contact Info **** -->
-
-        {include file='admin/member/memberInfo/editContact.html'}
+        {include file='admin/member/memberInfo/editProfile.html'}
 
         <!-- **** Category & Amenities **** -->
 
         {include file='admin/member/memberInfo/editCategory.html'}
 
-        <!-- **** Images **** -->
-
-        {include file='admin/member/memberInfo/editImages.html'}
-
-        <!-- **** Video **** -->
-
-        {include file='admin/member/memberInfo/editVideo.html'}
-
-        <!-- **** Live Cam **** -->
+        <!-- **** Media **** -->
 
-        {include file='admin/member/memberInfo/editCamera.html'}
+        {include file='admin/member/memberInfo/editMedia.html'}
 
         <!-- **** Credit Cards **** -->
 
@@ -229,7 +215,7 @@
             });
 
             // Do inital setup on load for first tab
-            glmSetupAreaTab($('#glm-member-info-descr'));
+            glmSetupAreaTab($('#glm-member-info-status'));
 
             // Setup edit area selected
             function glmSetupAreaTab(t) {
@@ -246,7 +232,7 @@
                 $('#' + table).removeClass('glm-hidden');
 
 
-                if (table == 'glm-table-address') {
+                if (table == 'glm-table-profile') {
                     initMap();
                 }
 
diff --git a/views/admin/member/memberInfo/editLocation.html b/views/admin/member/memberInfo/editLocation.html
deleted file mode 100644
index d2938fc0..00000000
--- a/views/admin/member/memberInfo/editLocation.html
+++ /dev/null
@@ -1,110 +0,0 @@
-        
-        <table id="glm-table-address" class="glm-admin-table glm-hidden glm-member-info-table">
-            <tr>
-                <th {if $memberInfo.fieldRequired.addr1}class="glm-required"{/if}>Address Line 1:</th>
-                <td {if $memberInfo.fieldFail.addr1}class="glm-form-bad-input" data-tabid="glm-member-info-address"{/if}>
-                    <input type="text" id="addr1" name="addr1" value="{$memberInfo.fieldData.addr1}" class="glm-form-text-input">
-                    {if $memberInfo.fieldFail.addr1}<p>{$memberInfo.fieldFail.addr1}</p>{/if}
-                </td>
-            </tr>
-            <tr>
-                <th {if $memberInfo.fieldRequired.addr2}class="glm-required"{/if}>Address Line 2:</th>
-                <td {if $memberInfo.fieldFail.addr2}class="glm-form-bad-input" data-tabid="glm-member-info-address"{/if}>
-                    <input id="addr2" type="text" name="addr2" value="{$memberInfo.fieldData.addr2}" class="glm-form-text-input">
-                    {if $memberInfo.fieldFail.addr2}<p>{$memberInfo.fieldFail.addr2}</p>{/if}
-                </td>
-            </tr>
-            <tr>
-                <th>City</th>
-                <td class="glm-item-container">
-                    <!--  Add new city dialog -->
-                    <div id="newCityButton" class="button button-secondary glm-right">Add a new City</div>
-                    <div id="newCityDialog" class="glm-dialog-box" title="Enter a New City">
-                        <table class="glm-admin-table">
-                            <tr>
-                                <th class="glm-required">City Name:</th>
-                                <td id="newCityNameTD">
-                                    <input id="newCityName" type="text" name="newCityName" class="glm-form-text-input">
-                                    <div id="newCityNameRequired"></div>
-                                </td>
-                            </tr>
-                        </table>
-                        <p><span class="glm-required">*</span> Required</p>
-                        <a id="newCityCancel" class="button button-primary glm-right">Cancel</a>
-                        <input id="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">
-                        <option value="0"></option>
-        {foreach from=$memberInfo.fieldData.city.list item=v}
-                        <option value="{$v.value}"{if $v.default} selected="selected"{/if}>
-                            {$v.name}
-                        </option>
-        {/foreach}
-                    </select>
-                </td>
-            </tr>
-            <tr>
-                <th {if $memberInfo.fieldRequired.state}class="glm-required"{/if}>State:</th>
-                <td {if $memberInfo.fieldFail.state}class="glm-form-bad-input" data-tabid="glm-member-info-address"{/if}>
-                    <select id="state" name="state">
-        {foreach from=$memberInfo.fieldData.state.list item=v}
-                        <option value="{$v.value}"{if $memberInfo.fieldData.state.value == $v.value} selected="selected"{/if}>
-                            {$v.name}
-                        </option>
-        {/foreach}
-                    </select>
-                    {if $memberInfo.fieldFail.state}<p>{$memberInfo.fieldFail.state}</p>{/if}
-                </td>
-            </tr>
-            <tr>
-                <th {if $memberInfo.fieldRequired.zip}class="glm-required"{/if}>ZIP / Postal Code:</th>
-                <td {if $memberInfo.fieldFail.zip}class="glm-form-bad-input" data-tabid="glm-member-info-address"{/if}>
-                    <input id="zip" type="text" name="zip" value="{$memberInfo.fieldData.zip}" class="glm-form-text-input-short">
-                    {if $memberInfo.fieldFail.zip}<p>{$memberInfo.fieldFail.zip}</p>{/if}
-                </td>
-            </tr>
-            <tr>
-                <th {if $memberInfo.fieldRequired.country}class="glm-required"{/if}>Country:</th>
-                <td {if $memberInfo.fieldFail.country}class="glm-form-bad-input" data-tabid="glm-member-info-address"{/if}>
-                    <select id="country" name="country">
-        {foreach from=$memberInfo.fieldData.country.list item=v}
-                        <option value="{$v.value}"{if $v.default} selected="selected"{/if}>
-                            {$v.name} {$v.value}
-                        </option>
-        {/foreach}
-                    </select>
-                    {if $memberInfo.fieldFail.country}<p>{$memberInfo.fieldFail.country}</p>{/if}
-                </td>
-            </tr>
-            <tr>
-                <th {if $memberInfo.fieldRequired.region}class="glm-required"{/if}>Region:</th>
-                <td {if $memberInfo.fieldFail.region}class="glm-form-bad-input" data-tabid="glm-member-info-address"{/if}>
-                    <select name="region">
-        {foreach from=$memberInfo.fieldData.region.list item=v}
-                        <option value="{$v.value}"{if $v.default} selected="selected"{/if}>{$v.name}</option>
-        {/foreach}
-                    </select>
-                    {if $memberInfo.fieldFail.region}<p>{$memberInfo.fieldFail.region}</p>{/if}
-                </td>
-            </tr>
-            <tr>
-                {if $memberInfo.fieldRequired.lat}<th class="emRequiredInputField">{else}<th>{/if}Location:</th>
-                <td>
-                    <div id="glm-estimate-location" class="button button-secondary">Map Location Using Above Address</div>
-                    <p>
-                        MAP USE: Drag the pointer to the desired location for this {$terms.term_member}.
-                        Use + and - buttons or the mouse wheel to zoom in or out.
-                        Click and drag anywhere else on the map to move to another area.
-                    </p>
-                    <div id="locationMap" class="glm-map-edit">(map loads here)</div>
-                    <p>
-                        <b>Selected Position:</b> 
-                        &nbsp;&nbsp;Latitude <input id="glmLat" name="lat" type="text" value="{$memberInfo.fieldData.lat}" class="glm-form-text-input-veryshort">
-                        &nbsp;&nbsp;Longitude <input id="glmLng" name="lon" type="text" value="{$memberInfo.fieldData.lon}" class="glm-form-text-input-veryshort">
-                        &nbsp;&nbsp;<span id="latLonRecenter" class="button button-secondary">Update pointer with new lat/lon postion.</span>
-                    </p>
-                </td>
-            </tr>
-        </table>
diff --git a/views/admin/member/memberInfo/editMedia.html b/views/admin/member/memberInfo/editMedia.html
new file mode 100644
index 00000000..16a13fa3
--- /dev/null
+++ b/views/admin/member/memberInfo/editMedia.html
@@ -0,0 +1,10 @@
+<div id="glm-table-media" class="glm-admin-table glm-hidden glm-member-info-table">
+    <!-- **** Images **** -->
+    {include file='admin/member/memberInfo/editMediaImages.html'}
+    <br><br>
+    <!-- **** Video **** -->
+    {include file='admin/member/memberInfo/editMediaVideo.html'}
+    <br><br>
+    <!-- **** Live Cam **** -->
+    {include file='admin/member/memberInfo/editMediaCamera.html'}
+</div>
\ No newline at end of file
diff --git a/views/admin/member/memberInfo/editCamera.html b/views/admin/member/memberInfo/editMediaCamera.html
similarity index 97%
rename from views/admin/member/memberInfo/editCamera.html
rename to views/admin/member/memberInfo/editMediaCamera.html
index 02c50e35..3bd4718d 100644
--- a/views/admin/member/memberInfo/editCamera.html
+++ b/views/admin/member/memberInfo/editMediaCamera.html
@@ -1,5 +1,6 @@
         
-        <table id="glm-table-live-cam" class="glm-admin-table glm-hidden glm-member-info-table">
+        <h2>Live Camera</h2>
+        <table id="glm-table-live-cam" class="glm-admin-table">
             <tr>
                 <th {if $memberInfo.fieldRequired.live_cam_type}class="glm-required"{/if}>Type:</th>
                 <td {if $memberInfo.fieldFail.live_cam_type}class="glm-form-bad-input" data-tabid="glm-member-info-live-cam"{/if}>
diff --git a/views/admin/member/memberInfo/editImages.html b/views/admin/member/memberInfo/editMediaImages.html
similarity index 99%
rename from views/admin/member/memberInfo/editImages.html
rename to views/admin/member/memberInfo/editMediaImages.html
index a75c16f7..7939f0a9 100644
--- a/views/admin/member/memberInfo/editImages.html
+++ b/views/admin/member/memberInfo/editMediaImages.html
@@ -1,5 +1,6 @@
 
-        <table id="glm-table-images" class="glm-admin-table glm-hidden glm-member-info-table">
+        <h2>Images</h2>
+        <table id="glm-table-images" class="glm-admin-table">
             <tr>
                 <td>&nbsp;</td>
                 <td>
diff --git a/views/admin/member/memberInfo/editVideo.html b/views/admin/member/memberInfo/editMediaVideo.html
similarity index 97%
rename from views/admin/member/memberInfo/editVideo.html
rename to views/admin/member/memberInfo/editMediaVideo.html
index 301171a6..5e28ab97 100644
--- a/views/admin/member/memberInfo/editVideo.html
+++ b/views/admin/member/memberInfo/editMediaVideo.html
@@ -1,5 +1,6 @@
 
-        <table id="glm-table-video" class="glm-admin-table glm-hidden glm-member-info-table">
+        <h2>Video</h2>
+        <table id="glm-table-video" class="glm-admin-table">
             <tr style="display:none">
                 <th {if $memberInfo.fieldRequired.video_type}class="glm-required"{/if}>Video Type:</th>
                 <td {if $memberInfo.fieldFail.video_type}class="glm-form-bad-input" data-tabid="glm-member-info-video"{/if}>
diff --git a/views/admin/member/memberInfo/editProfile.html b/views/admin/member/memberInfo/editProfile.html
new file mode 100644
index 00000000..d98e4a1b
--- /dev/null
+++ b/views/admin/member/memberInfo/editProfile.html
@@ -0,0 +1,27 @@
+        
+        <table id="glm-table-profile" class="glm-admin-table glm-hidden glm-member-info-table">
+            <tr>
+                <td>
+                    {include file='admin/member/memberInfo/editProfileDescription.html'}
+                    
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    {include file='admin/member/memberInfo/editProfileAddress.html'}
+                </td>
+            </tr>
+
+            <tr>
+                <td>
+                    {include file='admin/member/memberInfo/editProfileLocation.html'}
+                </td>
+            </tr>
+            
+            <tr>
+                <td>
+                    {include file='admin/member/memberInfo/editProfileMailing.html'}
+                </td>
+                
+            </tr>
+        </table>
diff --git a/views/admin/member/memberInfo/editProfileAddress.html b/views/admin/member/memberInfo/editProfileAddress.html
new file mode 100644
index 00000000..26038522
--- /dev/null
+++ b/views/admin/member/memberInfo/editProfileAddress.html
@@ -0,0 +1,134 @@
+<br>
+                    <h2>Address</h2>
+                    <table>
+                        <tr>
+                            <th {if $memberInfo.fieldRequired.addr1}class="glm-required"{/if}>Address 1:</th>
+                            <td {if $memberInfo.fieldFail.addr1}class="glm-form-bad-input" data-tabid="glm-member-info-address"{/if}>
+                                <input type="text" id="addr1" name="addr1" value="{$memberInfo.fieldData.addr1}" class="glm-form-text-input">
+                                {if $memberInfo.fieldFail.addr1}<p>{$memberInfo.fieldFail.addr1}</p>{/if}
+                            </td>
+                        </tr>
+                        <tr>
+                            <th {if $memberInfo.fieldRequired.addr2}class="glm-required"{/if}>Address 2:</th>
+                            <td {if $memberInfo.fieldFail.addr2}class="glm-form-bad-input" data-tabid="glm-member-info-address"{/if}>
+                                <input id="addr2" type="text" name="addr2" value="{$memberInfo.fieldData.addr2}" class="glm-form-text-input">
+                                {if $memberInfo.fieldFail.addr2}<p>{$memberInfo.fieldFail.addr2}</p>{/if}
+                            </td>
+                        </tr>
+                        <tr>
+                            <th>City</th>
+                            <td class="glm-item-container">
+                                <!--  Add new city dialog -->
+                                <div id="newCityButton" class="button button-secondary glm-right">Add a new City</div>
+                                <div id="newCityDialog" class="glm-dialog-box" title="Enter a New City">
+                                    <table class="glm-admin-table">
+                                        <tr>
+                                            <th class="glm-required">City Name:</th>
+                                            <td id="newCityNameTD">
+                                                <input id="newCityName" type="text" name="newCityName" class="glm-form-text-input">
+                                                <div id="newCityNameRequired"></div>
+                                            </td>
+                                        </tr>
+                                    </table>
+                                    <p><span class="glm-required">*</span> Required</p>
+                                    <a id="newCityCancel" class="button button-primary glm-right">Cancel</a>
+                                    <input id="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">
+                                    <option value="0"></option>
+                    {foreach from=$memberInfo.fieldData.city.list item=v}
+                                    <option value="{$v.value}"{if $v.default} selected="selected"{/if}>
+                                        {$v.name}
+                                    </option>
+                    {/foreach}
+                                </select>
+                            </td>
+                        </tr>
+                        <tr>
+                            <th {if $memberInfo.fieldRequired.state}class="glm-required"{/if}>State:</th>
+                            <td {if $memberInfo.fieldFail.state}class="glm-form-bad-input" data-tabid="glm-member-info-address"{/if}>
+                                <select id="state" name="state">
+                    {foreach from=$memberInfo.fieldData.state.list item=v}
+                                    <option value="{$v.value}"{if $memberInfo.fieldData.state.value == $v.value} selected="selected"{/if}>
+                                        {$v.name}
+                                    </option>
+                    {/foreach}
+                                </select>
+                                {if $memberInfo.fieldFail.state}<p>{$memberInfo.fieldFail.state}</p>{/if}
+                            </td>
+                        </tr>
+                        <tr>
+                            <th {if $memberInfo.fieldRequired.zip}class="glm-required"{/if}>ZIP / Postal Code:</th>
+                            <td {if $memberInfo.fieldFail.zip}class="glm-form-bad-input" data-tabid="glm-member-info-address"{/if}>
+                                <input id="zip" type="text" name="zip" value="{$memberInfo.fieldData.zip}" class="glm-form-text-input-short">
+                                {if $memberInfo.fieldFail.zip}<p>{$memberInfo.fieldFail.zip}</p>{/if}
+                            </td>
+                        </tr>
+                        <tr>
+                            <th {if $memberInfo.fieldRequired.country}class="glm-required"{/if}>Country:</th>
+                            <td {if $memberInfo.fieldFail.country}class="glm-form-bad-input" data-tabid="glm-member-info-address"{/if}>
+                                <select id="country" name="country">
+                    {foreach from=$memberInfo.fieldData.country.list item=v}
+                                    <option value="{$v.value}"{if $v.default} selected="selected"{/if}>
+                                        {$v.name} {$v.value}
+                                    </option>
+                    {/foreach}
+                                </select>
+                                {if $memberInfo.fieldFail.country}<p>{$memberInfo.fieldFail.country}</p>{/if}
+                            </td>
+                        </tr>
+                                                <tr>
+                            <th {if $memberInfo.fieldRequired.phone}class="glm-required"{/if}>Phone #:</th>
+                            <td {if $memberInfo.fieldFail.phone}class="glm-form-bad-input" data-tabid="glm-member-info-contact"{/if}>
+                                <input type="text" name="phone" value="{$memberInfo.fieldData.phone}" class="glm-form-text-input-short glm-phone-input" >
+                                {if $memberInfo.fieldFail.phone}<p>{$memberInfo.fieldFail.phone}</p>{/if}
+                            </td>
+                        </tr>
+                        <tr>
+                            <th {if $memberInfo.fieldRequired.toll_free}class="glm-required"{/if}>Toll Free #:</th>
+                            <td {if $memberInfo.fieldFail.toll_free}class="glm-form-bad-input" data-tabid="glm-member-info-contact"{/if}>
+                                <input type="text" name="toll_free" value="{$memberInfo.fieldData.toll_free}" class="glm-form-text-input-short glm-phone-input" placeholder="ex: 800.123.4567 [ext 123]">
+                                {if $memberInfo.fieldFail.toll_free}<p>{$memberInfo.fieldFail.toll_free}</p>{/if}
+                            </td>
+                        </tr>
+                        <tr>
+                            <th {if $memberInfo.fieldRequired.email}class="glm-required"{/if}>E-Mail Address:</th>
+                            <td {if $memberInfo.fieldFail.email}class="glm-form-bad-input" data-tabid="glm-member-info-contact"{/if}>
+                                <input type="text" name="email" value="{$memberInfo.fieldData.email}" class="glm-form-text-input-short" placeholder="ex: info@gaslightmedia.com">
+                                {if $memberInfo.fieldFail.email}<p>{$memberInfo.fieldFail.email}</p>{/if}
+                            </td>
+                        </tr>
+                        <tr>
+                            <th {if $memberInfo.fieldRequired.url}class="glm-required"{/if}>Web Address (URL):</th>
+                            <td {if $memberInfo.fieldFail.url}class="glm-form-bad-input" data-tabid="glm-member-info-contact"{/if}>
+                            {if $memberInfo.fieldData.url}
+                                <a class="button button-secondary glm-right" href="{$memberInfo.fieldData.url}" target="urlTarget">Test Link</a>
+                            {/if}
+                                <input type="text" name="url" value="{$memberInfo.fieldData.url}" class="glm-form-text-input-medium" placeholder="ex: http://www.gaslightmedia.com">
+                                {if $memberInfo.fieldFail.url}<p>{$memberInfo.fieldFail.url}</p>{/if}
+                            </td>
+                        </tr>
+                        <tr>
+                            <th {if $memberInfo.fieldRequired.reservation_url}class="glm-required"{/if}>Reservation URL:</th>
+                            <td {if $memberInfo.fieldFail.reservation_url}class="glm-form-bad-input" data-tabid="glm-member-reservation-url"{/if}>
+                            {if $memberInfo.fieldData.reservation_url}
+                                <a class="button button-secondary glm-right" href="{$memberInfo.fieldData.reservation_url}" target="urlTarget">Test Link</a>
+                            {/if}
+                                <input type="text" name="reservation_url" value="{$memberInfo.fieldData.reservation_url}" class="glm-form-text-input-medium" placeholder="ex: http://www.gaslightmedia.com">
+                                {if $memberInfo.fieldFail.reservation_url}<p>{$memberInfo.fieldFail.reservation_url}</p>{/if}
+                            </td>
+                        </tr>
+                        <tr>
+                            <th {if $memberInfo.fieldRequired.region}class="glm-required"{/if}>Region:</th>
+                            <td {if $memberInfo.fieldFail.region}class="glm-form-bad-input" data-tabid="glm-member-info-address"{/if}>
+                                <select name="region">
+                    {foreach from=$memberInfo.fieldData.region.list item=v}
+                                    <option value="{$v.value}"{if $v.default} selected="selected"{/if}>{$v.name}</option>
+                    {/foreach}
+                                </select>
+                                {if $memberInfo.fieldFail.region}<p>{$memberInfo.fieldFail.region}</p>{/if}
+                            </td>
+                        </tr>
+                    </table>
\ No newline at end of file
diff --git a/views/admin/member/memberInfo/editProfileDescription.html b/views/admin/member/memberInfo/editProfileDescription.html
new file mode 100644
index 00000000..a52d95ec
--- /dev/null
+++ b/views/admin/member/memberInfo/editProfileDescription.html
@@ -0,0 +1,26 @@
+                    <table>
+                        <tr>
+                            <th {if $memberInfo.fieldRequired.descr}class="glm-required"{/if}><h2>Description:</h2></th>
+                            <td {if $memberInfo.fieldFail.descr}class="glm-form-bad-input" data-tabid="glm-member-info-descr"{/if}>
+                                {php} 
+                                    wp_editor('{$memberInfo.fieldData.descr|escape:quotes}', 'glm_descr', array(
+                                        'media_buttons' => false,
+                                        // 'quicktags' => false,
+                                        // 'wpautop' => false,  NOTE: Dont's use. Problem when numerous spaces before text.
+                                        'textarea_name' => 'descr',
+                                        'editor_height' => 200,     // Height in px, overrides editor_rows
+                                            // 'textarea_rows' => 8
+                                    ));
+                                {/php}
+                                {if $memberInfo.fieldFail.descr}<p>{$memberInfo.fieldFail.descr}</p>{/if}
+                            </td>
+                        </tr>
+                        <tr>
+                            <th {if $memberInfo.fieldRequired.short_descr}class="glm-required"{/if}>Short Description:</th>
+                            <td {if $memberInfo.fieldFail.short_descr}class="glm-form-bad-input" data-tabid="glm-member-info-descr"{/if}>
+                                <input type="text" name="short_descr" value="{$memberInfo.fieldData.short_descr}" class="glm-form-text-input glm-char-count" data-msgArea="short-descr-msg" maxlength="120" placeholder="A short, one line, description of the {$terms.term_member}.">
+                                <br><span id="short-descr-msg"></span>
+                                {if $memberInfo.fieldFail.short_descr}<p>{$memberInfo.fieldFail.short_descr}</p>{/if}
+                            </td>
+                        </tr>
+                    </table>
\ No newline at end of file
diff --git a/views/admin/member/memberInfo/editProfileLocation.html b/views/admin/member/memberInfo/editProfileLocation.html
new file mode 100644
index 00000000..0dc49a0f
--- /dev/null
+++ b/views/admin/member/memberInfo/editProfileLocation.html
@@ -0,0 +1,20 @@
+                    <table>
+                        <tr>
+                            {if $memberInfo.fieldRequired.lat}<th class="emRequiredInputField">{else}<th>{/if}Location:</th>
+                            <td>
+                                <div id="glm-estimate-location" class="button button-secondary">Map Location Using Above Address</div>
+                                <p>
+                                    AP USE: Drag the pointer to the desired location for this {$terms.term_member}.
+                                    Use + and - buttons or the mouse wheel to zoom in or out.
+                                    Click and drag anywhere else on the map to move to another area.
+                                </p>
+                                <div id="locationMap" class="glm-map-edit">(map loads here)</div>
+                                <p>
+                                    <b>Selected Position:</b> 
+                                    &nbsp;&nbsp;Latitude <input id="glmLat" name="lat" type="text" value="{$memberInfo.fieldData.lat}" class="glm-form-text-input-veryshort">
+                                    &nbsp;&nbsp;Longitude <input id="glmLng" name="lon" type="text" value="{$memberInfo.fieldData.lon}" class="glm-form-text-input-veryshort">
+                                    &nbsp;&nbsp;<span id="latLonRecenter" class="button button-secondary">Update pointer with new lat/lon postion.</span>
+                                </p>
+                            </td>
+                        </tr>
+                    </table>
\ No newline at end of file
diff --git a/views/admin/member/memberInfo/editProfileMailing.html b/views/admin/member/memberInfo/editProfileMailing.html
new file mode 100644
index 00000000..3d1769a9
--- /dev/null
+++ b/views/admin/member/memberInfo/editProfileMailing.html
@@ -0,0 +1,72 @@
+                    <br>
+                    <h2>Mailing</h2>
+                    <table>
+
+                        <tr>
+                            <th {if $memberInfo.fieldRequired.mailing_addr1}class="glm-required"{/if}>Mailing Address 1:</th>
+                            <td {if $memberInfo.fieldFail.mailing_addr1}class="glm-form-bad-input" data-tabid="glm-member-info-contact"{/if}>
+                                <input type="text" name="mailing_addr1" value="{$memberInfo.fieldData.mailing_addr1}" class="glm-form-text-input-short">
+                                {if $memberInfo.fieldFail.mailing_addr1}<p>{$memberInfo.fieldFail.mailing_addr1}</p>{/if}
+                            </td>
+                        </tr>
+                        <tr>
+                            <th {if $memberInfo.fieldRequired.mailing_addr2}class="glm-required"{/if}>Mailing Address 2:</th>
+                            <td {if $memberInfo.fieldFail.mailing_addr2}class="glm-form-bad-input" data-tabid="glm-member-info-contact"{/if}>
+                                <input type="text" name="mailing_addr2" value="{$memberInfo.fieldData.mailing_addr2}" class="glm-form-text-input-short">
+                                {if $memberInfo.fieldFail.mailing_addr2}<p>{$memberInfo.fieldFail.mailing_addr2}</p>{/if}
+                            </td>
+                        </tr>
+                        <tr>
+                            <th {if $memberInfo.fieldRequired.mailing_city}class="glm-required"{/if}>Mailing City:</th>
+                            <td {if $memberInfo.fieldFail.mailing_city}class="glm-item-container glm-form-bad-input" data-tabid="glm-member-info-contact"{else}class="glm-item-container"{/if}>
+                                <!--  Add new city dialog -->
+                                <div id="newMailingCityButton" class="button button-secondary glm-right">Add a new City</div>
+                                <div id="newMailingCityDialog" class="glm-dialog-box" title="Enter a New City">
+                                    <table class="glm-admin-table">
+                                        <tr>
+                                            <th class="glm-required">City Name:</th>
+                                            <td id="newMailingCityNameTD">
+                                                <input id="newMailingCityName" type="text" name="newMailingCityName" class="glm-form-text-input">
+                                                <div id="newMailingCityNameRequired"></div>
+                                            </td>
+                                        </tr>
+                                    </table>
+                                    <p><span class="glm-required">*</span> Required</p>
+                                    <a id="newMailingCityCancel" class="button button-primary glm-right">Cancel</a>
+                                    <input id="newMailingCitySubmit" type="submit" value="Add new City">
+                                </div>
+                                <input id="mailingCityName" type="hidden" name="newMailingCityName" value=""><!-- this field is only used if adding a new mailing city to pass the new name -->
+                                <select name="mailing_city" id="mailing_city">
+                                    <option value="0"></option>
+                                    {foreach from=$memberInfo.fieldData.mailing_city.list item=v}
+                                        <option value="{$v.value}"{if $v.default} selected="selected"{/if}>
+                                            {$v.name}
+                                        </option>
+                                    {/foreach}
+                                </select>
+                                {if $memberInfo.fieldFail.mailing_city}<p>{$memberInfo.fieldFail.mailing_city}</p>{/if}
+                            </td>
+                        </tr>
+                        <tr>
+                            <th {if $memberInfo.fieldRequired.mailing_state}class="glm-required"{/if}>Mailing State:</th>
+                            <td {if $memberInfo.fieldFail.mailing_state}class="glm-form-bad-input" data-tabid="glm-member-info-contact"{/if}>
+                                <select id="mailing_state" name="mailing_state">
+                                    <option value=""></option>
+                                    {foreach from=$memberInfo.fieldData.mailing_state.list item=v}
+                                        <option value="{$v.value}"{if $memberInfo.fieldData.mailing_state.value == $v.value} selected="selected"{/if}>
+                                            {$v.name}
+                                        </option>
+                                    {/foreach}
+                                </select>
+                                {if $memberInfo.fieldFail.mailing_state}<p>{$memberInfo.fieldFail.mailing_state}</p>{/if}
+                            </td>
+                        </tr>
+                        <tr>
+                            <th {if $memberInfo.fieldRequired.mailing_zip}class="glm-required"{/if}>Mailing Zip:</th>
+                            <td {if $memberInfo.fieldFail.mailing_zip}class="glm-form-bad-input" data-tabid="glm-member-info-contact"{/if}>
+                                <input type="text" name="mailing_zip" value="{$memberInfo.fieldData.mailing_zip}" class="glm-form-text-input-short">
+                                {if $memberInfo.fieldFail.mailing_zip}<p>{$memberInfo.fieldFail.mailing_zip}</p>{/if}
+                            </td>
+                        </tr>
+                </table>
+                    
\ No newline at end of file
diff --git a/views/admin/member/memberInfo/editStatus.html b/views/admin/member/memberInfo/editStatus.html
index d72bd460..c9d8e805 100644
--- a/views/admin/member/memberInfo/editStatus.html
+++ b/views/admin/member/memberInfo/editStatus.html
@@ -1,5 +1,5 @@
         
-        <table id="glm-table-descr" class="glm-admin-table glm-member-info-table">
+        <table id="glm-table-status" class="glm-admin-table glm-member-info-table">
             <tr>
                 <th {if $memberInfo.fieldRequired.reference_name}class="glm-required"{/if}>Profile Name:</th>
                 <td {if $memberInfo.fieldFail.reference_name}class="glm-form-bad-input" data-tabid="glm-member-info-descr"{/if}>
@@ -21,30 +21,6 @@
                     {if $memberInfo.fieldFail.status}<p>{$memberInfo.fieldFail.status}</p>{/if}
                 </td>
             </tr>
-            <tr>
-                <th {if $memberInfo.fieldRequired.descr}class="glm-required"{/if}>Description:</th>
-                <td {if $memberInfo.fieldFail.descr}class="glm-form-bad-input" data-tabid="glm-member-info-descr"{/if}>
-                    {php} 
-                        wp_editor('{$memberInfo.fieldData.descr|escape:quotes}', 'glm_descr', array(
-                            'media_buttons' => false,
-                            // 'quicktags' => false,
-                            // 'wpautop' => false,  NOTE: Dont's use. Problem when numerous spaces before text.
-                            'textarea_name' => 'descr',
-                            'editor_height' => 200,     // Height in px, overrides editor_rows
-                                // 'textarea_rows' => 8
-                        ));
-                    {/php}
-                    {if $memberInfo.fieldFail.descr}<p>{$memberInfo.fieldFail.descr}</p>{/if}
-                </td>
-            </tr>
-            <tr>
-                <th {if $memberInfo.fieldRequired.short_descr}class="glm-required"{/if}>Short Description:</th>
-                <td {if $memberInfo.fieldFail.short_descr}class="glm-form-bad-input" data-tabid="glm-member-info-descr"{/if}>
-                    <input type="text" name="short_descr" value="{$memberInfo.fieldData.short_descr}" class="glm-form-text-input glm-char-count" data-msgArea="short-descr-msg" maxlength="120" placeholder="A short, one line, description of the {$terms.term_member}.">
-                    <br><span id="short-descr-msg"></span>
-                    {if $memberInfo.fieldFail.short_descr}<p>{$memberInfo.fieldFail.short_descr}</p>{/if}
-                </td>
-            </tr>
             <tr>
                 <th {if $memberInfo.fieldRequired.notes}class="glm-required"{/if}>Notes:</th>
             <td
-- 
2.17.1