From 76e9816d75a7ba24aa0071b6c253fdd4a191d3f8 Mon Sep 17 00:00:00 2001
From: Laury GvR <laury@gaslightmedia.com>
Date: Tue, 28 Mar 2017 13:39:00 -0400
Subject: [PATCH] Changing member edit & member info

Part of revmping the member db admin side. Switch from table structure
to glm grid.
---
 css/admin.css                                 |  53 ++++-
 views/admin/member/index.html                 | 217 ++++++++++--------
 views/admin/member/memberEdit.html            | 175 +++++++-------
 views/admin/member/memberInfo.html            |   2 +-
 .../member/memberInfo/editMediaCamera.html    |   2 +-
 .../member/memberInfo/editMediaImages.html    |   3 +-
 .../member/memberInfo/editMediaVideo.html     |   2 +-
 .../member/memberInfo/editProfileStatus.html  |  29 +--
 views/admin/members/list.html                 |   2 +-
 9 files changed, 272 insertions(+), 213 deletions(-)

diff --git a/css/admin.css b/css/admin.css
index e5f534bd..1e0b06c1 100644
--- a/css/admin.css
+++ b/css/admin.css
@@ -80,7 +80,16 @@ input, select, .button {
     padding: .4em;
     background: #fff;
 }
-
+#glm-admin-member-dashboard .glm-admin-table h4 {
+    margin-bottom: 0;
+    margin-top: 0;
+}
+#glm-admin-member-dashboard .glm-admin-table .glm-row {
+    margin-bottom: 10px;
+}
+#glm-admin-member-dashboard td {
+    padding: 0 0.6em 0.2em;
+}
 /* Admin Tabs */
 .disabled {
     pointer-events: none;
@@ -90,7 +99,7 @@ input, select, .button {
 
 /* Admin Forms */
 .glm-associate-admin-wrap {
-    max-width: 1000px;
+    max-width: 1024px;
 }
 .glm-bad-input-area {
     background: #FFaBa9 !important;
@@ -133,10 +142,29 @@ input, select, .button {
 }
 
 /* Member List */
-.wp-list-table a.button.button-secondary {
+#glm-admin-content-container .glm-admin-edit-active-profile {
     background-color: #0568B3;
     color: white;
 }
+.glm-admin-show-archived-container {
+    clear: both;
+    display: inline;
+    float: left;
+    margin-bottom: 10px;
+    margin-top: -5px;
+}
+
+#glm-admin-member-edit .glm-admin-table .glm-row {
+    margin-bottom: 10px;
+}
+#glm-admin-member-edit .glm-admin-table h4 {
+    margin: 0;
+}
+.glm-checkbox-label {
+    float: left;
+    margin-right: 5px;
+    padding-right: 10px;
+}
 
 /* Settings Table Additions */
 .glm-settings-table .glm-small-12,
@@ -166,6 +194,7 @@ input, select, .button {
     padding: 10px;
     background-color: #f8ffff;
 }
+#glm-admin-content-container .glm-row,
 .glm-admin-table.glm-admin-inner-table .glm-row {
     margin-bottom: 15px;
 }
@@ -173,8 +202,9 @@ input, select, .button {
     font-weight: normal;
 }
 #glm-admin-content-container h1,
-#glm-admin-content-container h2 {
-    margin: 5px 0;
+#glm-admin-content-container h2,
+#glm-admin-content-container h3 {
+    margin: 0;
 }
 .glm-admin-inner-table h3,
 .glm-admin-inner-table h4 {
@@ -217,6 +247,7 @@ input, select, .button {
 }
 .glm-admin-image-edit-table {
     border: 2px #ddd solid;
+    background: white;
 }
 .glm-admin-image-edit-table td {
     padding: 5px;
@@ -225,6 +256,12 @@ input, select, .button {
     clear: both;
     float: right;
 }
+#glm-admin-content-container .button-primary#deleteMemberInfoButton {
+    background: #e14d43;
+}
+#glm-admin-content-container .button-primary#deleteMemberInfoButton:hover {
+    background: #e14d43;
+}
 #video-url-msg {
   display: block;
   font-size: 12px;
@@ -364,10 +401,12 @@ td.glm-nowrap {
 {
     width: 95%;
 }
-.glm-imageGalleryContainer
+#glm-table-media .glm-imageGalleryContainer
 {
-    border: 1px #ddd solid !important;
+    border: 1px #ddd solid;
     overflow: hidden;
+    margin: 0;
+    max-width: 98.5%;
 }
 .glm-galleryImages .glm-statusTable h4 {
     margin: 2px 0;
diff --git a/views/admin/member/index.html b/views/admin/member/index.html
index 28b625c7..c02c9197 100644
--- a/views/admin/member/index.html
+++ b/views/admin/member/index.html
@@ -7,55 +7,72 @@
     <h2 class="glm-notice glm-flash-updated">{$terms.term_member_cap} Updated</h2>
   {/if}
 
+<div id="glm-admin-member-dashboard" class="glm-admin-table">
   {if $haveMember}
-    {if apply_filters('glm_members_menu_members', true)}
-        <p><a href="{$thisUrl}?page={$thisPage}&glm_action=memberEdit&member={$memberID}" class="button button-primary glm-button glm-right">Edit {$terms.term_member_cap} Name and Status</a></p>
-    {/if}
-    <div class="glm-admin-table">
+    
         <div class="glm-row">
-            <td>
+            <div class="glm-small-4 glm-left">
                 <div class="glm-admin-table">
                     <div class="glm-row">
-                        <h4>{$terms.term_member_cap} Slug:</h4>
-                        <td>{$member.fieldData.member_slug}</td>
+                        <div class="glm-small-12 glm-column">
+                            <h4>{$terms.term_member_cap} Slug:</h4>
+                        </div>
+                        <div class="glm-small-12 glm-column">
+                            {$member.fieldData.member_slug}
+                        </div>
+                    </div>
+                    <div class="glm-row">
+                        <div class="glm-small-12 glm-column">
+                            <h4>Date created:</h4>
+                        </div>
+                        <div class="glm-small-12 glm-column">
+                            {$member.fieldData.created.date}
+                        </div>
                     </div>
-                    <div class="glm-row"><h4>Date created:</h4><td>{$member.fieldData.created.date}</td></div>
                     <div class="glm-row">
-                        <h4>URL CLick Counts</h4>
-                        <td><b>Today:</b> {$clickThroughCounts.day}&nbsp;&nbsp;&nbsp;<a data-type="daysClicks" class="dialog-button" href=""><img src="{$assetsUrl}/graph.png"></a></td>
+                        <div class="glm-small-12 glm-column">
+                            <h4>URL CLick Counts</h4>
+                        </div>
+                        <div class="glm-small-12 glm-column">
+                            <b>Today:</b> {$clickThroughCounts.day}&nbsp;&nbsp;&nbsp;<a data-type="daysClicks" class="dialog-button" href=""><img src="{$assetsUrl}/graph.png"></a>
+                        </div>
                     </div>
                 </div>
-            </td>
-            <td>
+            </div>
+            <div class="glm-small-4 glm-left">
                 <div class="glm-admin-table">
                     <div class="glm-row">
-                        <h4>{$terms.term_member_cap} Display & Access:</h4>
-                        <td>{$member.fieldData.access.name}</td>
+                        <div class="glm-small-12 glm-column">
+                            <h4>{$terms.term_member_cap} Display & Access:</h4>
+                        </div>
+                        <div class="glm-small-12 glm-column">
+                            {$member.fieldData.access.name}
+                        </div>
                     </div>
                     <div class="glm-row">
-                        <h4>{$terms.term_member_cap} Type:</h4>
-                        <td>{$member.fieldData.member_type.name}</td>
+                        <div class="glm-small-12 glm-column">
+                            <h4>{$terms.term_member_cap} Type:</h4>
+                        </div>
+                        <div class="glm-small-12 glm-column">
+                            {$member.fieldData.member_type.name}
+                        </div>
                     </div>            
                     <div class="glm-row">
-                        <h4>Detail Page View Counts</h4>
-                        <td><b>Today:</b> {$detailViewCounts.day}&nbsp;&nbsp;&nbsp;<a data-type="daysViews" class="dialog-button" href=""><img src="{$assetsUrl}/graph.png"></a></td>
-                    </div>
-                    <div class="glm-row">
-                        
-                        <td>
-                        {if apply_filters('glm_members_menu_members', true)}            
-                            <span>
-                                <a href="{$thisUrl}?page={$thisPage}&glm_action=memberEdit&member={$memberID}" class="button button-primary glm-button">
-                                    Edit {$terms.term_member_cap} Name and Status
-                                </a>
-                            </span>
-                        {/if}
-                        </td>
+                        <div class="glm-small-12 glm-column">
+                            <h4>Detail Page View Counts</h4>
+                        </div>
+                        <div class="glm-small-12 glm-column">
+                            <b>Today:</b> {$detailViewCounts.day}&nbsp;&nbsp;&nbsp;<a data-type="daysViews" class="dialog-button" href=""><img src="{$assetsUrl}/graph.png"></a>
+                        </div>
                     </div>
                 </div>
-            </td>
+            </div>
+            {if apply_filters('glm_members_menu_members', true)}
+            <div class="glm-small-4 glm-right">
+                <a href="{$thisUrl}?page={$thisPage}&glm_action=memberEdit&member={$memberID}" class="button button-primary glm-button glm-right">Edit {$terms.term_member_cap} Name and Status</a>
+            </div>
+            {/if}
         </div>
-    </div>
   {else}
         <h3>No {$terms.term_member} information available.</h3>
   {/if}
@@ -122,84 +139,86 @@
   {if apply_filters('glm_members_permit_admin_member_index_view_member_info_version', true)}
     {if apply_filters('glm_members_permit_admin_member_index_add_member_info_version', true)}
     {/if}
-    <p>
-        <h3 class="glm-left">{$terms.term_member_cap} Profile Versions</h3>
-        <span class="glm-right">
-            <p>
+    <div class="glm-row">
+        <div>
+            <h3 class="glm-left">{$terms.term_member_cap} Profile Versions</h3>
+            <span class="glm-right">
+                <a href="{$thisUrl}?page={$thisPage}&glm_action=memberInfo&member={$memberID}" class="button button-primary glm-button glm-right">Add New {$terms.term_member_cap} Profile Version</a>
+            </span>
+            
+            <div class="glm-admin-show-archived-container">
                 <input type="checkbox" id="showArchived"{if $showArchived} checked="checked"{/if}> Show archived information&nbsp;&nbsp;
-                <a href="{$thisUrl}?page={$thisPage}&glm_action=memberInfo&member={$memberID}" class="button button-primary glm-button glm-right">Add New {$terms.term_member_cap} Information Version</a>
-            </p>
-        </span>
-    </p>
-    <br clear="all">
-    <div class="wp-list-table striped glm-admin-table">
-        <h4ead>
-            <div class="glm-row">
-                <h4>Status</h4>
-                <h4>Reference Name</h4>
-                <h4>Created</h4>
-                <h4>Last Update</h4>
-                <h4> </h4>
             </div>
-        </h4ead>
-        <tbody>
+        </div>
+        <br clear="all">
+        <table class="wp-list-table striped glm-admin-table">
+            <thead>
+                <tr>
+                    <th>Status</th>
+                    <th>Reference Name</th>
+                    <th>Created</th>
+                    <th>Last Update</th>
+                    <th> </th>
+                </tr>
+            </thead>
+            <tbody>
 
-      {if $haveInfoRecords}
-        {assign var="i" value="0"}
-        {foreach $memberInfoRecords as $m}
+          {if $haveInfoRecords}
+            {assign var="i" value="0"}
+            {foreach $memberInfoRecords as $m}
 
-         {if $m.status.value == $statusTypeNumbers.Active || apply_filters('glm_members_permit_admin_member_index_list_inactive_info', true)}
-          {if $i++ is odd by 1}
-            <div class="glm-row">
-          {else}
-            <div class="glm-row" class="alternate{if $m.status.name == 'Active'} glm-admin-table-active{/if}">
-          {/if}
-                <td>
-                    <a href="{$thisUrl}?page={$thisPage}&glm_action=memberInfo&member={$memberID}&memberInfo={$m.id}"{if $m.status.value == $statusPending} class="glm-notice"{/if}>{$m.status.name}</a>
-                </td>
-                <td>{$m.reference_name}</td>
-                <td>{$m.create_time.datetime}</td>
-                <td>{$m.modify_time.datetime}</td>
-                <td>
-                    {if $m.bad_lat_lon}<span class="glm-error">Bad Map Location</span>{/if}
-          {if apply_filters('glm_members_permit_admin_member_index_clone_activate_info_version', true)}
-                    <a href="{$thisUrl}?page={$thisPage}&glm_action=memberInfo&member={$memberID}&memberInfo={$m.id}&option=clone" class="button button-secondary glm-button-small glm-right">Clone</a>&nbsp;
-                    {if $m.status.name != 'Active'}<a href="{$thisUrl}?page={$thisPage}&glm_action=index&member={$memberID}&activateID={$m.id}" class="button button-secondary glm-button-small glm-right">Activate</a>{/if}
-          {/if}
-                </td>
-            </div>
+             {if $m.status.value == $statusTypeNumbers.Active || apply_filters('glm_members_permit_admin_member_index_list_inactive_info', true)}
+              {if $i++ is odd by 1}
+                <tr>
+              {else}
+                <tr class="alternate{if $m.status.name == 'Active'} glm-admin-table-active{/if}">
+              {/if}
+                    <td>
+                        <a href="{$thisUrl}?page={$thisPage}&glm_action=memberInfo&member={$memberID}&memberInfo={$m.id}"{if $m.status.value == $statusPending} class="glm-notice"{/if}>{$m.status.name}</a>
+                    </td>
+                    <td>{$m.reference_name}</td>
+                    <td>{$m.create_time.datetime}</td>
+                    <td>{$m.modify_time.datetime}</td>
+                    <td>
+                        {if $m.bad_lat_lon}<span class="glm-error">Bad Map Location</span>{/if}
+              {if apply_filters('glm_members_permit_admin_member_index_clone_activate_info_version', true)}
+                        <a href="{$thisUrl}?page={$thisPage}&glm_action=memberInfo&member={$memberID}&memberInfo={$m.id}&option=clone" class="button button-secondary glm-button-small glm-right">Clone</a>&nbsp;
+                        {if $m.status.name != 'Active'}<a href="{$thisUrl}?page={$thisPage}&glm_action=index&member={$memberID}&activateID={$m.id}" class="button button-secondary glm-button-small glm-right">Activate</a>{/if}
+              {/if}
+                    </td>
+                </tr>
 
 
-         {/if}
-        {/foreach}
-      {else} <!-- haveInfoRecords -->
-            <div class="glm-row"><td colspan="5"><a href="{$thisUrl}?page={$thisPage}&glm_action=memberInfo&member={$memberID}">Click here to start entering information for this {$terms.term_member}.</a></td></div>
+             {/if}
+            {/foreach}
+          {else} <!-- haveInfoRecords -->
+                <tr><td colspan="5"><a href="{$thisUrl}?page={$thisPage}&glm_action=memberInfo&member={$memberID}">Click here to start entering information for this {$terms.term_member}.</a></td></tr>
+          {/if}
+            </tbody>
+        </table>
+       {/if} <!-- apply_filters -->
       {/if}
-        </tbody>
+    {/if}
     </div>
-   {/if} <!-- apply_filters -->
-  {/if}
-{/if}
-
-
-  <p>&nbsp;</p>
+    <br>
 
- {else}
-    <h3 class="glm-error">You do not have any {$terms.term_member_cap} Types setup.</h3>
-    <p>You must have at least one {$terms.term_member_cap} Type to add a new {$terms.term_member}.</p>
-    <td><a href="{$thisUrl}?page=glm-members-admin-menu-configure&glm_action=memberTypes">Click here to add {$terms.term_member_cap} Types.</a></td>
- {/if}
-{else}
-    <h3 class="glm-error">No {$terms.term_member} currently selected.</h3>
-{/if}
-
-{if $lockedToMember}
-    <div id="glm-dashboard-widgets-wrap">
-        {apply_filters('glm-member-db-dashboard-member-widgets', $member)}
-    </div>
-{/if}
 
+     {else}
+        <h3 class="glm-error">You do not have any {$terms.term_member_cap} Types setup.</h3>
+        <p>You must have at least one {$terms.term_member_cap} Type to add a new {$terms.term_member}.</p>
+        <td><a href="{$thisUrl}?page=glm-members-admin-menu-configure&glm_action=memberTypes">Click here to add {$terms.term_member_cap} Types.</a></td>
+     {/if}
+    {else}
+        <h3 class="glm-error">No {$terms.term_member} currently selected.</h3>
+    {/if}
 
+    {if $lockedToMember}
+        <div id="glm-dashboard-widgets-wrap">
+            {apply_filters('glm-member-db-dashboard-member-widgets', $member)}
+        </div>
+    {/if}
+    
+</div>
     <script type="text/javascript">
         jQuery(document).ready(function($) {
 
diff --git a/views/admin/member/memberEdit.html b/views/admin/member/memberEdit.html
index 3b6168ae..97351b98 100644
--- a/views/admin/member/memberEdit.html
+++ b/views/admin/member/memberEdit.html
@@ -3,7 +3,7 @@
 {if $haveMember || $addingMember}
  {if $haveMemberTypes}
 
-
+<div id="glm-admin-member-edit">
     <h2>
   {if $addingMember}
         Add New {$terms.term_member_cap}
@@ -13,98 +13,99 @@
         {if $memberUpdated}<span class="glm-notice glm-flash-updated glm-right">{$terms.term_member_cap} Updated</span>{/if}
         {if $memberUpdateError}<span class="glm-error glm-flash-updated glm-right">{$terms.term_member_cap} Update Error</span>{/if}
     </h2>
+    <div class="glm-admin-table glm-admin-inner-table">
+    {if apply_filters('glm_members_permit_admin_member_index_edit_member', true)}
+      <form id="member-edit-form" action="{$thisUrl}?page={$thisPage}" method="post" enctype="multipart/form-data">
+          <input type="hidden" name="glm_action" value="memberEdit">
+        {if $addingMember}
+          <input type="hidden" name="option" value="addNew">
+          <input type="hidden" name="created" value="today">
+        {else}
+          <input type="hidden" name="option" value="submit">
+          <input type="hidden" name="member" value="{$member.fieldData.id}">
+          <input type="hidden" name="created" value="{$member.fieldData.created.date}">
+        {/if}
 
-  {if apply_filters('glm_members_permit_admin_member_index_edit_member', true)}
-    <form id="member-edit-form" action="{$thisUrl}?page={$thisPage}" method="post" enctype="multipart/form-data">
-        <input type="hidden" name="glm_action" value="memberEdit">
-      {if $addingMember}
-        <input type="hidden" name="option" value="addNew">
-        <input type="hidden" name="created" value="today">
-      {else}
-        <input type="hidden" name="option" value="submit">
-        <input type="hidden" name="member" value="{$member.fieldData.id}">
-        <input type="hidden" name="created" value="{$member.fieldData.created.date}">
-      {/if}
-        
-        <!-- **** General Settings **** -->
-                
-        <div id="glm-table-general" class="glm-admin-table glm-member-table">
-            <div class="glm-row">
-                <h4 {if $member.fieldRequired.name}class="glm-required"{/if}>{$terms.term_member_cap} Name:</h4>
-                <td {if $member.fieldFail.name}class="glm-form-bad-input glm-form-bad-input-general"{/if}>
-                    <input type="text" name="name" value="{$member.fieldData.name}" class="glm-form-text-input">
-                    {if $member.fieldFail.name}<p>{$member.fieldFail.name}</p>{/if}
-                </td>
-            </div>
+          <!-- **** General Settings **** -->
+
+          <div id="glm-table-general" class="glm-admin-table glm-member-table">
+              <div class="glm-row">
+                  <h4 {if $member.fieldRequired.name}class="glm-required"{/if}>{$terms.term_member_cap} Name:</h4>
+                  <td {if $member.fieldFail.name}class="glm-form-bad-input glm-form-bad-input-general"{/if}>
+                      <input type="text" name="name" value="{$member.fieldData.name}" class="glm-form-text-input-medium">
+                      {if $member.fieldFail.name}<p>{$member.fieldFail.name}</p>{/if}
+                  </td>
+              </div>
 
-      {if !$addingMember}
-            <div class="glm-row">
-                <h4>Name for URLs:</h4>
-                <td>
-                    {$member.fieldData.member_slug}
-                </td>
-            </div>
-      {/if}
-            
-            <div class="glm-row">
-                <h4 {if $member.fieldRequired.access}class="glm-required"{/if}>{$terms.term_member_cap} Display & Access:</h4>
-                <td {if $member.fieldFail.access}class="glm-form-bad-input glm-form-bad-input-general"{/if}>
-                    <select name="access">
-        {foreach from=$member.fieldData.access.list item=v}
-                        <option value="{$v.value}"{if $v.default} selected="selected"{/if}>{$v.name}</option>
-        {/foreach}
-                    </select>
-                    {if $member.fieldFail.access}<p>{$member.fieldFail.access}</p>{/if}
-                </td>
-            </div>
-            <div class="glm-row">
-                <h4 {if $member.fieldRequired.member_type}class="glm-required"{/if}>{$terms.term_member_cap} Type:</h4>
-                <td {if $member.fieldFail.member_type}class="glm-form-bad-input glm-form-bad-input-general"{/if}>
-                    <select name="member_type">
-        {foreach from=$member.fieldData.member_type.list item=v}
-                        <option value="{$v.value}"{if $v.default} selected="selected"{/if}>{$v.name}</option>
-        {/foreach}
-                    </select>
-                    {if $member.fieldFail.member_type}<p>{$member.fieldFail.member_type}</p>{/if}
-                </td>
-            </div>
-            <div class="glm-row">
-                <h4>Featured:</h4>
-                <td>
-                    <input type="checkbox" name="featured" {if $member.fieldData.featured.value} checked{/if}><br>
-                </td>
-            </div>
         {if !$addingMember}
-            <div class="glm-row"><h4>Date created:</h4><td>{$member.fieldData.created.date}</td></div>
+              <div class="glm-row">
+                  <h4>Name for URLs:</h4>
+                  <td>
+                      {$member.fieldData.member_slug}
+                  </td>
+              </div>
         {/if}
-            <div class="glm-row">
-                <h4 {if $member.fieldRequired.notes}class="glm-required"{/if}>Notes:</h4>
-                <td {if $member.fieldFail.notes}class="glm-form-bad-input glm-form-bad-input-general"{/if}>
-                    <textarea name="notes" class="glm-form-textarea">{$member.fieldData.notes}</textarea>
-                    {if $member.fieldFail.notes}<p>{$member.fieldFail.notes}</p>{/if}<br>
-                    This "Notes" field is not displayed anywhere else. It is strictly for making and keeping
-                    notes related to this {$terms.term_member} profile. 
-                </td>
-            </div>
-        </div>
-        <p><span class="glm-required">*</span> Required</p>
-    {if $addingMember}
-        <input id="updateMember" type="submit" value="Add new {$terms.term_member}">
-    {else}
-        <input id="updateMember" type="submit" value="{if $memberID && $member}Update {$terms.term_member}{else}Add new {$terms.term_member}{/if}">
-    {/if}
-    </form>
-  {/if}
 
- {else}        
-    <h3 class="glm-error">You do not have any {$terms.term_member_cap} Types setup.</h3>
-    <p>You must have at least one {$terms.term_member_cap} Type to add a new {$terms.term_member}.</p>
-    <td><a href="{$thisUrl}?page=glm-members-admin-menu-configure&glm_action=memberTypes">Click here to add {$terms.term_member_cap} Types.</a></td>
- {/if}
-{else}
-    <h3 class="glm-error">No {$terms.term_member} currently selected.</h3>
-{/if}
+              <div class="glm-row">
+                  <h4 {if $member.fieldRequired.access}class="glm-required"{/if}>{$terms.term_member_cap} Display & Access:</h4>
+                  <td {if $member.fieldFail.access}class="glm-form-bad-input glm-form-bad-input-general"{/if}>
+                      <select name="access">
+          {foreach from=$member.fieldData.access.list item=v}
+                          <option value="{$v.value}"{if $v.default} selected="selected"{/if}>{$v.name}</option>
+          {/foreach}
+                      </select>
+                      {if $member.fieldFail.access}<p>{$member.fieldFail.access}</p>{/if}
+                  </td>
+              </div>
+              <div class="glm-row">
+                  <h4 {if $member.fieldRequired.member_type}class="glm-required"{/if}>{$terms.term_member_cap} Type:</h4>
+                  <td {if $member.fieldFail.member_type}class="glm-form-bad-input glm-form-bad-input-general"{/if}>
+                      <select name="member_type">
+          {foreach from=$member.fieldData.member_type.list item=v}
+                          <option value="{$v.value}"{if $v.default} selected="selected"{/if}>{$v.name}</option>
+          {/foreach}
+                      </select>
+                      {if $member.fieldFail.member_type}<p>{$member.fieldFail.member_type}</p>{/if}
+                  </td>
+              </div>
+              <div class="glm-row">
+                  <h4 class="glm-admin-checkbox-label">Featured:</h4>
+                  <td>
+                      <input type="checkbox" name="featured" {if $member.fieldData.featured.value} checked{/if}><br>
+                  </td>
+              </div>
+          {if !$addingMember}
+              <div class="glm-row"><h4>Date created:</h4><td>{$member.fieldData.created.date}</td></div>
+          {/if}
+              <div class="glm-row">
+                  <h4 {if $member.fieldRequired.notes}class="glm-required"{/if}>Notes:</h4>
+                  <td {if $member.fieldFail.notes}class="glm-form-bad-input glm-form-bad-input-general"{/if}>
+                      <textarea name="notes" class="glm-form-textarea">{$member.fieldData.notes}</textarea>
+                      {if $member.fieldFail.notes}<p>{$member.fieldFail.notes}</p>{/if}<br>
+                      This "Notes" field is not displayed anywhere else. It is strictly for making and keeping
+                      notes related to this {$terms.term_member} profile. 
+                  </td>
+              </div>
+          </div>
+          <p><span class="glm-required">*</span> Required</p>
+      {if $addingMember}
+          <input id="updateMember" type="submit" value="Add new {$terms.term_member}">
+      {else}
+          <input id="updateMember" type="submit" value="{if $memberID && $member}Update {$terms.term_member}{else}Add new {$terms.term_member}{/if}">
+      {/if}
+      </form>
+    {/if}
 
+   {else}        
+      <h3 class="glm-error">You do not have any {$terms.term_member_cap} Types setup.</h3>
+      <p>You must have at least one {$terms.term_member_cap} Type to add a new {$terms.term_member}.</p>
+      <td><a href="{$thisUrl}?page=glm-members-admin-menu-configure&glm_action=memberTypes">Click here to add {$terms.term_member_cap} Types.</a></td>
+   {/if}
+  {else}
+      <h3 class="glm-error">No {$terms.term_member} currently selected.</h3>
+  {/if}
+    </div>
+</div>
 
     <script type="text/javascript">
         jQuery(document).ready(function($) {            
diff --git a/views/admin/member/memberInfo.html b/views/admin/member/memberInfo.html
index 820ed116..6c077f2b 100644
--- a/views/admin/member/memberInfo.html
+++ b/views/admin/member/memberInfo.html
@@ -60,7 +60,7 @@
 
       {/if} <!-- status == 10 -->
         </div>
-
+        <input id="updateMemberProfile" class="button-primary glm-right" type="submit" value="{if $memberInfoID && $memberInfo}Update {$terms.term_member} profile{else}Add new {$terms.term_member} profile{/if}">
         <h2>Edit {$terms.term_member_cap} Profile</h2>
     {else}
         <h2>Add New {$terms.term_member_cap} Profile</h2>
diff --git a/views/admin/member/memberInfo/editMediaCamera.html b/views/admin/member/memberInfo/editMediaCamera.html
index eb8f1370..69a223a0 100644
--- a/views/admin/member/memberInfo/editMediaCamera.html
+++ b/views/admin/member/memberInfo/editMediaCamera.html
@@ -1,6 +1,6 @@
         
         <h2>Live Camera</h2>
-        <div id="glm-table-live-cam" class="glm-admin-table">
+        <div id="glm-table-live-cam" class="glm-admin-table glm-admin-inner-table">
             <div class="glm-row">
                 <h4 {if $memberInfo.fieldRequired.live_cam_type}class="glm-required"{/if}>Type:</h4>
                 <div class="glm-small-12" {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/editMediaImages.html b/views/admin/member/memberInfo/editMediaImages.html
index 014dbdb3..b2b09172 100644
--- a/views/admin/member/memberInfo/editMediaImages.html
+++ b/views/admin/member/memberInfo/editMediaImages.html
@@ -1,8 +1,7 @@
 
         <h2>Images</h2>
-        <div id="glm-table-images" class="glm-admin-table">
+        <div id="glm-table-images" class="glm-admin-table glm-admin-inner-table">
             <div class="glm-row">
-                <div>&nbsp;</div>
                 <div class="glm-small-12">
                     <p>
                         Best image size to provide is between 800 and 1000 pixels wide and stored as a JPG or JPEG file. 
diff --git a/views/admin/member/memberInfo/editMediaVideo.html b/views/admin/member/memberInfo/editMediaVideo.html
index b3d76c2b..fbe98214 100644
--- a/views/admin/member/memberInfo/editMediaVideo.html
+++ b/views/admin/member/memberInfo/editMediaVideo.html
@@ -1,6 +1,6 @@
 
         <h2>Video</h2>
-        <div id="glm-table-video" class="glm-admin-table">
+        <div id="glm-table-video" class="glm-admin-table glm-admin-inner-table">
             <div class="glm-row" style="display:none">
                 <h4 {if $memberInfo.fieldRequired.video_type}class="glm-required"{/if}>Video Type:</h4>
                 <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/editProfileStatus.html b/views/admin/member/memberInfo/editProfileStatus.html
index b94c6dd0..d8366b7c 100644
--- a/views/admin/member/memberInfo/editProfileStatus.html
+++ b/views/admin/member/memberInfo/editProfileStatus.html
@@ -1,11 +1,23 @@
         <div class="glm-admin-table glm-admin-inner-table">
-            <div class="row">
+            <div class="glm-row">
+                <h2>Profile Status:</h2>
+                <div class="glm-small-12">
+                    <select name="status">
+        {foreach from=$memberInfo.fieldData.status.list item=v}
+                        <option value="{$v.value}"{if $v.default} selected{/if}>{$v.name}</option>
+        {/foreach}
+                    </select>
+                    {if $memberInfo.fieldFail.status}<p>{$memberInfo.fieldFail.status}</p>{/if}
+                </div>
+            </div>
+            <div class="glm-row">
                 <h2 {if $memberInfo.fieldRequired.reference_name}class="glm-required"{/if}>Profile Name:</h2>
                 <div class="glm-small-12" {if $memberInfo.fieldFail.reference_name}class="glm-form-bad-input" data-tabid="glm-member-info-descr"{/if}>
-                    <input type="text" name="reference_name" value="{$memberInfo.fieldData.reference_name}" class="glm-form-text-input-short" placeholder="Name of this {$terms.term_member} profile record for reference only. Not displayed to user.">
+                    <input type="text" name="reference_name" value="{$memberInfo.fieldData.reference_name}" class="glm-form-text-input-short" placeholder="">
                     {if $memberInfo.fieldFail.reference_name}<p>{$memberInfo.fieldFail.reference_name}</p>{/if}<br>
                     <span class="glm-form-input-subtext">
-                        The "Profile Name" field is used to help identify this particular member
+                        This is used for reference only, and not displayed to the user.
+                        The "Profile Name" field is used to help identify this particular {$terms.term_member} 
                         profile. {$terms.term_member_plur_cap} may have multiple profiles, only one of which can be
                         active at a time. Multiple profiles make it easy to manage separate sets
                         of information that may be used at different times, for example seasons
@@ -13,17 +25,6 @@
                     </span>
                 </div>
             </div>
-            <div class="row">
-                <h2>Profile Status:</h2>
-                <div class="glm-small-12">
-                    <select name="status">
-        {foreach from=$memberInfo.fieldData.status.list item=v}
-                        <option value="{$v.value}"{if $v.default} selected{/if}>{$v.name}</option>
-        {/foreach}
-                    </select>
-                    {if $memberInfo.fieldFail.status}<p>{$memberInfo.fieldFail.status}</p>{/if}
-                </div>
-            </div>
 <!--            <div class="glm-row">
                 <h4 {if $memberInfo.fieldRequired.notes}class="glm-required"{/if}>Notes:</h4>
                 <td
diff --git a/views/admin/members/list.html b/views/admin/members/list.html
index 10d90594..7dbb7c46 100644
--- a/views/admin/members/list.html
+++ b/views/admin/members/list.html
@@ -61,7 +61,7 @@
             {/if}
                     <td>
                         {$m.id}
-                        <a href="{$thisUrl}?page=glm-members-admin-menu-member&glm_action=memberInfo&member={$m.id}&memberInfo={$m.active_id}" class="button button-secondary glm-button-small" style="margin: 0 .2em 0 .2em;">Edit Active Profile</a>
+                        <a href="{$thisUrl}?page=glm-members-admin-menu-member&glm_action=memberInfo&member={$m.id}&memberInfo={$m.active_id}" class="button button-secondary glm-button-small glm-admin-edit-active-profile" style="margin: 0 .2em 0 .2em;">Edit Active Profile</a>
                     </td>
                     <td>
                         <a href="{$thisUrl}?page=glm-members-admin-menu-member&glm_action=index&member={$m.id}">{$m.name}</a>
-- 
2.17.1