From e19df198ed1daaefe6d5773db261264c91822291 Mon Sep 17 00:00:00 2001
From: Laury GvR <laury@gaslightmedia.com>
Date: Tue, 28 Mar 2017 14:52:19 -0400
Subject: [PATCH] Changing the Images/Media layout markup as part of the revamp

---
 css/admin.css                                 | 22 +++++--
 views/admin/management/index.html             | 14 ++--
 views/admin/member/memberEdit.html            |  2 +-
 .../admin/member/memberInfo/editCategory.html |  2 +-
 views/admin/member/memberInfo/editMedia.html  | 30 ++++++---
 .../member/memberInfo/editMediaCamera.html    |  6 +-
 .../member/memberInfo/editMediaImages.html    | 64 ++++++++++++-------
 .../member/memberInfo/editMediaVideo.html     | 28 ++++----
 .../admin/member/memberInfo/editProfile.html  |  2 +-
 .../member/memberInfo/editProfileAddress.html |  4 +-
 .../member/memberInfo/editProfileContact.html |  4 +-
 .../memberInfo/editProfileDescription.html    |  2 +-
 .../memberInfo/editProfileLocation.html       |  2 +-
 .../member/memberInfo/editProfileMailing.html |  4 +-
 .../member/memberInfo/editProfileStatus.html  |  2 +-
 views/admin/members/list.html                 |  2 +-
 16 files changed, 119 insertions(+), 71 deletions(-)

diff --git a/css/admin.css b/css/admin.css
index 720c0223..83cf9afd 100644
--- a/css/admin.css
+++ b/css/admin.css
@@ -174,6 +174,10 @@ input, select, .button {
     float: left;
 }
 
+#glm-table-cat {
+    padding: 0 10px 0 0;
+}
+
 /* Admin table additions */
 .glm-admin-table {
     max-width: 95%;
@@ -189,18 +193,21 @@ input, select, .button {
     width: 10%;
     margin-bottom: 5px;
 }
-.glm-admin-table.glm-admin-inner-table {
+.glm-admin-table.glm-admin-table-inner {
     border: 1px solid lightgrey;
     border-radius: 3px;
     width: 100%;
     padding: 10px;
     background-color: #f8ffff;
 }
+.glm-admin-table.glm-admin-table-outer {
+    max-width: 100%;
+}
 #glm-admin-content-container .glm-row,
-.glm-admin-table.glm-admin-inner-table .glm-row {
+.glm-admin-table.glm-admin-table-inner .glm-row {
     margin-bottom: 15px;
 }
-.glm-admin-table.glm-admin-inner-table th {
+.glm-admin-table.glm-admin-table-inner th {
     font-weight: normal;
 }
 #glm-admin-content-container h1,
@@ -208,8 +215,8 @@ input, select, .button {
 #glm-admin-content-container h3 {
     margin: 0;
 }
-.glm-admin-inner-table h3,
-.glm-admin-inner-table h4 {
+.glm-admin-table-inner h3,
+.glm-admin-table-inner h4 {
     margin: 0;
 }
 .glm-admin-table th,
@@ -455,10 +462,13 @@ td.glm-nowrap {
     text-align: left;
     white-space: nowrap;
 }
+.glm-galleryImageData .glm-statusTable > div > * {
+    padding: 0 10px;
+}
 .glm-galleryImageData textarea
 {
     height: 4em;
-    width: 70%;
+    width: 100%;
     resize: none;
 }
 .glm-ol-selected
diff --git a/views/admin/management/index.html b/views/admin/management/index.html
index 8772b01c..80ef1434 100644
--- a/views/admin/management/index.html
+++ b/views/admin/management/index.html
@@ -173,7 +173,7 @@
         <table id="glm-table-list" class="glm-admin-table glm-settings-table glm-hidden">
             <tr>
                 <td>
-                    <table class="glm-admin-table glm-admin-inner-table">
+                    <table class="glm-admin-table glm-admin-table-inner">
                         <tr><td colspan="2"><h2>Member List Display Options</h2></td></tr>
                         <tr><th>Show Member List:</th><td><input type="checkbox" name="list_show_list"{if $genSettings.fieldData.list_show_list.value} checked="checked"{/if}></td></tr>
                         <tr>
@@ -218,7 +218,7 @@
                             <tr>
                             <th>Address Options:</th>
                             <td>  
-                                <table class="glm-admin-table glm-admin-inner-table">
+                                <table class="glm-admin-table glm-admin-table-inner">
                                     <tr><th>Show Street:</th><td><input type="checkbox" name="list_show_street"{if $genSettings.fieldData.list_show_street.value} checked="checked"{/if}></td></tr>
                                     <tr><th>Show City, State, ZIP:</th><td><input type="checkbox" name="list_show_citystatezip"{if $genSettings.fieldData.list_show_citystatezip.value} checked="checked"{/if}></td></tr>
                                     <tr><th>Show Country:</th><td><input type="checkbox" name="list_show_country"{if $genSettings.fieldData.list_show_country.value} checked="checked"{/if}></td></tr>
@@ -247,7 +247,7 @@
                     </table>
                 </td>
                 <td>
-                    <table class="glm-admin-table glm-admin-inner-table">
+                    <table class="glm-admin-table glm-admin-table-inner">
                         <tr><td colspan="2"><h2>Member List Map Options</h2></td></tr>
                         <tr><th>Show Map:</th><td><input type="checkbox" name="list_show_map"{if $genSettings.fieldData.list_show_map.value} checked="checked"{/if}></td></tr>
                         <tr><th>Show Member Name as Link to Detail:</th><td><input type="checkbox" name="list_map_show_detaillink"{if $genSettings.fieldData.list_map_show_detaillink.value} checked="checked"{/if}></td></tr>
@@ -291,7 +291,7 @@
             </tr>
             <tr>
                 <td>
-                    <table class="glm-admin-table glm-admin-inner-table">
+                    <table class="glm-admin-table glm-admin-table-inner">
                         <tr><td colspan="2"><h2>Member List Search Form Options</h2></td></tr>
                         <th>Show Search Form:</th><td><input type="checkbox" name="list_show_search"{if $genSettings.fieldData.list_show_search.value} checked="checked"{/if}></td><tr><th>Text Search:</th><td><input type="checkbox" name="list_show_search_text"{if $genSettings.fieldData.list_show_search_text.value} checked="checked"{/if}></td></tr>
                         <tr><th>Category Search:</th><td><input type="checkbox" name="list_show_search_category"{if $genSettings.fieldData.list_show_search_category.value} checked="checked"{/if}></td></tr>
@@ -317,7 +317,7 @@
         <table id="glm-table-detail" class="glm-admin-table glm-settings-table glm-hidden">
             <tr>
                 <td>
-                    <table class="glm-admin-table glm-admin-inner-table">
+                    <table class="glm-admin-table glm-admin-table-inner">
                         <tr><td colspan="2"><h2>Member Detail Display Options</h2></td></tr>
                         <tr><th>Show Member Logo:</th><td><input type="checkbox" name="detail_show_logo"{if $genSettings.fieldData.detail_show_logo.value} checked="checked"{/if}></td></tr>
                        <tr>
@@ -336,7 +336,7 @@
                             <tr>
                             <th>Address Options:</th>
                             <td>  
-                                <table class="glm-admin-table glm-admin-inner-table">
+                                <table class="glm-admin-table glm-admin-table-inner">
                                     <tr><th>Show Street:</th><td><input type="checkbox" name="detail_show_street"{if $genSettings.fieldData.detail_show_street.value} checked="checked"{/if}></td></tr>
                                     <tr><th>Show City, State, ZIP:</th><td><input type="checkbox" name="detail_show_citystatezip"{if $genSettings.fieldData.detail_show_citystatezip.value} checked="checked"{/if}></td></tr>
                                     <tr><th>Show Country:</th><td><input type="checkbox" name="detail_show_country"{if $genSettings.fieldData.detail_show_country.value} checked="checked"{/if}></td></tr>
@@ -369,7 +369,7 @@
                     </table>
                 </td>
                 <td>
-                    <table class="glm-admin-table glm-admin-inner-table">
+                    <table class="glm-admin-table glm-admin-table-inner">
                         <tr><td colspan="2"><h2>Member Detail Map Options</h2></td></tr>
                         <tr><th>Show Map:</th><td><input type="checkbox" name="detail_show_map"{if $genSettings.fieldData.detail_show_map.value} checked="checked"{/if}></td></tr>
                         <tr><th>Show Logo:</th><td><input type="checkbox" name="detail_map_show_logo"{if $genSettings.fieldData.detail_map_show_logo.value} checked="checked"{/if}></td></tr>
diff --git a/views/admin/member/memberEdit.html b/views/admin/member/memberEdit.html
index 97351b98..15d30c30 100644
--- a/views/admin/member/memberEdit.html
+++ b/views/admin/member/memberEdit.html
@@ -13,7 +13,7 @@
         {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">
+    <div class="glm-admin-table glm-admin-table-inner">
     {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">
diff --git a/views/admin/member/memberInfo/editCategory.html b/views/admin/member/memberInfo/editCategory.html
index f3ed178e..181b00af 100644
--- a/views/admin/member/memberInfo/editCategory.html
+++ b/views/admin/member/memberInfo/editCategory.html
@@ -1,5 +1,5 @@
 
-        <div id="glm-table-cat" class="glm-admin-table glm-hidden glm-member-info-table">
+        <div id="glm-table-cat" class="glm-admin-table glm-admin-table-outer glm-hidden glm-member-info-table">
             <div class="glm-row glm-admin-categories-container">
                 <h2>Categories</h2>
                 <div class="glm-item-container glm-small-12">
diff --git a/views/admin/member/memberInfo/editMedia.html b/views/admin/member/memberInfo/editMedia.html
index 16a13fa3..a3cf2248 100644
--- a/views/admin/member/memberInfo/editMedia.html
+++ b/views/admin/member/memberInfo/editMedia.html
@@ -1,10 +1,24 @@
-<div id="glm-table-media" class="glm-admin-table glm-hidden glm-member-info-table">
+<div id="glm-table-media" class="glm-admin-table glm-admin-table-outer 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 class="glm-row">
+        <div class="glm-small-12 glm-medium-6 glm-left">
+            {include file='admin/member/memberInfo/editMediaImages.html'}
+        </div>
+        <div class="glm-small-12 glm-medium-6 glm-left">
+            <!-- **** Video **** -->
+            <div class="glm-row">
+                <div class="glm-small-12 glm-left">
+                    {include file='admin/member/memberInfo/editMediaVideo.html'}
+                </div>
+            </div>
+
+            <div class="glm-row">
+                <!-- **** Live Cam **** -->
+                <div class="glm-small-12 glm-left">
+                    {include file='admin/member/memberInfo/editMediaCamera.html'}
+                </div>
+            </div>
+        </div>
+        
+    </div>
 </div>
\ No newline at end of file
diff --git a/views/admin/member/memberInfo/editMediaCamera.html b/views/admin/member/memberInfo/editMediaCamera.html
index 69a223a0..697dc89a 100644
--- a/views/admin/member/memberInfo/editMediaCamera.html
+++ b/views/admin/member/memberInfo/editMediaCamera.html
@@ -1,6 +1,7 @@
         
-        <h2>Live Camera</h2>
-        <div id="glm-table-live-cam" class="glm-admin-table glm-admin-inner-table">
+    <h2>Live Camera</h2>
+    <div class="glm-admin-table glm-admin-table-inner-wrapper">
+        <div id="glm-table-live-cam" class="glm-admin-table glm-admin-table-inner">
             <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}>
@@ -45,3 +46,4 @@
                 </div>
             </div>
         </div>
+    </div>
diff --git a/views/admin/member/memberInfo/editMediaImages.html b/views/admin/member/memberInfo/editMediaImages.html
index b2b09172..2af8310d 100644
--- a/views/admin/member/memberInfo/editMediaImages.html
+++ b/views/admin/member/memberInfo/editMediaImages.html
@@ -1,6 +1,7 @@
 
-        <h2>Images</h2>
-        <div id="glm-table-images" class="glm-admin-table glm-admin-inner-table">
+    <h2>Images</h2>
+    <div class="glm-admin-table glm-admin-table-inner-wrapper">
+        <div id="glm-table-images" class="glm-admin-table glm-admin-table-inner">
             <div class="glm-row">
                 <div class="glm-small-12">
                     <p>
@@ -13,7 +14,7 @@
             </div>
             <div class="glm-row">
                 <h4 {if $memberInfo.fieldRequired.logo}class="glm-required"{/if}>Profile Image:</h4>
-                <div class="glm-small-6" {if $memberInfo.fieldFail.logo}class="glm-form-bad-input" data-tabid="glm-member-info-images"{/if}>
+                <div class="glm-small-12" {if $memberInfo.fieldFail.logo}class="glm-form-bad-input" data-tabid="glm-member-info-images"{/if}>
                     <div class="glm-admin-image-edit-table">
         {if $memberInfo.fieldData.logo}
                         <div class="glm-row">
@@ -83,32 +84,50 @@
                                     code enables the fields when it replicates the template for a new image. 
                                 -->
                                 
-                                <li id="{ id }" class="glm-galleryContainer">
+                                <div id="{ id }" class="glm-galleryContainer">
                                     
                                     <div class="glm-galleryImage" data-id="{ id }">
                                         <bust-stupid-ngg-image-selection src="{$glmPluginMediaUrl}/images/small/{ filename }"></bust-stupid-ngg-image-selection>
                                     </div>
                                     
-                                    <div class="glm-galleryImageData">
-                                        <div class="glm-statusTable">
-                                            <div class="glm-row">
+                                    <div class="glm-galleryImageData glm-small-9">
+                                        <div class="glm-statusTable glm-row">
+                                            <div class="glm-small-8 glm-left">
                                                 <h4>Caption:</h4>
-                                                <div class="glm-small-12"><input id="galleryImage_caption_{ id }" type="text" name="galleryImage_caption[{ id }]" value="" class="glm-form-text-input-medium" disabled></div>
-                                                <div class="glm-small-12" rowspan="2">
-                                                    <div>
-                                                        <div class="glm-row"><h4>Delete:</h4><div class="glm-small-12"><input type="checkbox" name="galleryImage_delete[{ id }]" disabled></div></div>
-                                                        <div class="glm-row"><h4>featured Image:</h4><div class="glm-small-12"><input type="radio" name="galleryImage_featured" value="{ id }"></div></div>
-                                                        <div class="glm-row"><h4 colspan="2" class="glm-notice" style="font-size: 1.2em;">New Upload</h4></div>
+                                                <div class="glm-small-11">
+                                                    <input id="galleryImage_caption_{ id }" type="text" name="galleryImage_caption[{ id }]" value="" class="glm-form-text-input-medium" disabled>
+                                                </div>
+                                                
+                                                <div class="glm-small-11">
+                                                    <h4>Description:</h4>
+                                                    <div class="glm-small-11"><textarea name="galleryImage_descr[{ id }]" disabled></textarea></div>
+                                                </div>
+                                    
+                                                <div class="glm-small-4 glm-left">
+                                                    <div class="glm-small-12">
+                                                        <div>
+                                                            <div class="glm-row">
+                                                                <h4>Delete:</h4>
+                                                                <div class="glm-small-11">
+                                                                    <input type="checkbox" name="galleryImage_delete[{ id }]" disabled>
+                                                                </div>
+                                                            </div>
+                                                            <div class="glm-row">
+                                                                <h4>Featured:</h4>
+                                                                <div class="glm-small-11">
+                                                                    <input type="radio" name="galleryImage_featured" value="{ id }">
+                                                                </div>
+                                                            </div>
+                                                            <div class="glm-row">
+                                                                <h4 colspan="2" class="glm-notice" style="font-size: 1.2em;">New Upload</h4>
+                                                            </div>
+                                                        </div>
                                                     </div>                             
                                                 </div>
                                             </div>
-                                            <div class="glm-row">
-                                                <h4>Description:</h4>
-                                                <div class="glm-small-12"><textarea name="galleryImage_descr[{ id }]" disabled></textarea></div>
-                                            </div>
                                         </div>
                                     </div>
-                                </li>
+                                </div>
                                 <div id="glm-galleryImageLarger2_{ id }" class="glm-imageDialog">
                                     <bust-stupid-ngg-image-selection src="{$glmPluginMediaUrl}/images/large/{ filename }"></bust-stupid-ngg-image-selection>
                                 </div>
@@ -135,14 +154,14 @@
                             <div class="glm-galleryImageData glm-small-9">
                                 <div class="glm-statusTable glm-row">
                                     
-                                    <div class="glm-small-8 glm-left">
+                                    <div class="glm-small-7 glm-left">
                                         <h4>Caption:</h4>
-                                        <div class="glm-small-12">
+                                        <div class="glm-small-11">
                                             <input id="galleryImage_caption_{$i.id}" type="text" name="galleryImage_caption[{$i.id}]" value="{$i.caption}" class="glm-form-text-input-medium">
                                         </div>
                                         
                                         <h4>Description:</h4>
-                                        <div class="glm-small-12">
+                                        <div class="glm-small-11">
                                             <textarea name="galleryImage_descr[{$i.id}]">{$i.descr}</textarea>
                                         </div>
                                         
@@ -158,7 +177,7 @@
                                                     </div>
                                                 </div>
                                                 <div class="glm-row glm-galleryImageFeatured">
-                                                    <h4>Featured Image:</h4>
+                                                    <h4>Featured:</h4>
                                                     <div>
                                                         <input type="radio" name="galleryImage_featured" value="{$i.id}" {if $i.featured.value}checked="checked"{/if}>
                                                     </div>
@@ -184,3 +203,4 @@
                 </div>
             </div>
         </div>
+    </div>
diff --git a/views/admin/member/memberInfo/editMediaVideo.html b/views/admin/member/memberInfo/editMediaVideo.html
index fbe98214..49d46e76 100644
--- a/views/admin/member/memberInfo/editMediaVideo.html
+++ b/views/admin/member/memberInfo/editMediaVideo.html
@@ -1,28 +1,29 @@
-
-        <h2>Video</h2>
-        <div id="glm-table-video" class="glm-admin-table glm-admin-inner-table">
+                        
+    <h2>Video</h2>
+    <div class="glm-admin-table glm-admin-table-inner-wrapper">
+        <div id="glm-table-video" class="glm-admin-table glm-admin-table-inner">
             <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}>
+                <div {if $memberInfo.fieldFail.video_type}class="glm-form-bad-input" data-tabid="glm-member-info-video"{/if}>
                     <select id="glm-video-type" name="video_type">
         {foreach from=$memberInfo.fieldData.video_type.list item=v}
                         <option value="{$v.value}"{if $v.default} selected{/if}>{$v.name}</option>
         {/foreach}
                     </select>
                     {if $memberInfo.fieldFail.video_type}<p>{$memberInfo.fieldFail.video_type}</p>{/if}
-                </td>
+                </div>
             </div>
             <div class="glm-row" id="glm-video-url" class="glm-hidden">
                 <h4 {if $memberInfo.fieldRequired.video_url}class="glm-required"{/if}>Video URL:</h4>
-                <td {if $memberInfo.fieldFail.video_url}class="glm-form-bad-input" data-tabid="glm-member-info-video"{/if}>
+                <div {if $memberInfo.fieldFail.video_url}class="glm-form-bad-input" data-tabid="glm-member-info-video"{/if}>
                     <input type="text" name="video_url" value="{$memberInfo.fieldData.video_url}" class="glm-form-text-input-medium" placeholder="ex: https://www.youtube.com/watch?v=C0DPdy98e4c">
                     {if $memberInfo.fieldFail.video_url}<p>{$memberInfo.fieldFail.video_url}</p>{/if}
                      <span id="video-url-msg">Only YouTube and Vimeo links are supported</span>
-                </td>
+                </div>
             </div>
             <div class="glm-row" id="glm-video-file" class="glm-hidden">
                 <h4 {if $memberInfo.fieldRequired.video_file}class="glm-required"{/if}>Video File:</h4>
-                <td {if $memberInfo.fieldFail.video_file}class="glm-form-bad-input"{/if}>
+                <div {if $memberInfo.fieldFail.video_file}class="glm-form-bad-input"{/if}>
         {if $memberInfo.fieldData.video_file}
                     <b>File Name:</b> {$memberInfo.fieldData.video_file}<br>
                     Replace this video file:</b> <input type="file" name="video_file">
@@ -30,19 +31,19 @@
         {else}
                     <b>New file:</b> <input type="file" name="video_file_new">
         {/if}
-                </td>
+                </div>
             </div>
             <div class="glm-row">
                 <h4 {if $memberInfo.fieldRequired.video_title}class="glm-required"{/if}>Video Title:</h4>
-                <td {if $memberInfo.fieldFail.video_title}class="glm-form-bad-input" data-tabid="glm-member-info-video"{/if}>
+                <div {if $memberInfo.fieldFail.video_title}class="glm-form-bad-input" data-tabid="glm-member-info-video"{/if}>
                     <input type="text" name="video_title" value="{$memberInfo.fieldData.video_title}" class="glm-form-text-input-medium glm-char-count" data-msgArea="video-title-msg" maxlength="80">
                     {if $memberInfo.fieldFail.video_title}<p>{$memberInfo.fieldFail.video_title}</p>{/if}<br>
                     <span id="video-title-msg"></span>
-                </td>
+                </div>
             </div>
             <div class="glm-row">
                 <h4 {if $memberInfo.fieldRequired.video_descr}class="glm-required"{/if}>Video Description:</h4>
-                <td {if $memberInfo.fieldFail.video_descr}class="glm-form-bad-input" data-tabid="glm-member-info-video"{/if}>
+                <div {if $memberInfo.fieldFail.video_descr}class="glm-form-bad-input" data-tabid="glm-member-info-video"{/if}>
                     {php} 
                         wp_editor('{$memberInfo.fieldData.video_descr|escape:quotes}', 'glm_video_descr', array(
                             'media_buttons' => false,
@@ -54,6 +55,7 @@
                         ));
                     {/php}
                     {if $memberInfo.fieldFail.video_descr}<p>{$memberInfo.fieldFail.video_descr}</p>{/if}
-                </td>
+                </div>
             </div>
         </div>
+    </div>
diff --git a/views/admin/member/memberInfo/editProfile.html b/views/admin/member/memberInfo/editProfile.html
index a6c260f6..e2c02158 100644
--- a/views/admin/member/memberInfo/editProfile.html
+++ b/views/admin/member/memberInfo/editProfile.html
@@ -1,5 +1,5 @@
         
-        <div id="glm-table-profile" class="glm-admin-table glm-hidden glm-member-info-table">
+        <div id="glm-table-profile" class="glm-admin-table glm-admin-table-outer glm-hidden glm-member-info-table">
             <div class="glm-row">
                 <div>
                     {include file='admin/member/memberInfo/editProfileStatus.html'}
diff --git a/views/admin/member/memberInfo/editProfileAddress.html b/views/admin/member/memberInfo/editProfileAddress.html
index 416edf4e..42f6e102 100644
--- a/views/admin/member/memberInfo/editProfileAddress.html
+++ b/views/admin/member/memberInfo/editProfileAddress.html
@@ -1,7 +1,7 @@
 <br>
                 <h2>Address</h2>
-                <div class="glm-admin-table glm-admin-inner-table-wrapper">
-                    <div class="glm-admin-table glm-admin-inner-table">
+                <div class="glm-admin-table glm-admin-table-inner-wrapper">
+                    <div class="glm-admin-table glm-admin-table-inner">
                         <div class="glm-row">
                             <h4 {if $memberInfo.fieldRequired.addr1}class="glm-required"{/if}>Address 1:</h4>
                             <div class="glm-small-12" {if $memberInfo.fieldFail.addr1}class="glm-form-bad-input" data-tabid="glm-member-info-address"{/if}>
diff --git a/views/admin/member/memberInfo/editProfileContact.html b/views/admin/member/memberInfo/editProfileContact.html
index 65dbaf82..65abaa58 100644
--- a/views/admin/member/memberInfo/editProfileContact.html
+++ b/views/admin/member/memberInfo/editProfileContact.html
@@ -1,7 +1,7 @@
                 <br>
                 <h2>Contact Info for Website</h2>
-                <div class="glm-admin-table glm-admin-inner-table-wrapper">
-                    <div class="glm-admin-table glm-admin-inner-table">
+                <div class="glm-admin-table glm-admin-table-inner-wrapper">
+                    <div class="glm-admin-table glm-admin-table-inner">
                         
                         <div class="glm-row">
                             <h4 {if $memberInfo.fieldRequired.phone}class="glm-required"{/if}>Phone #:</h4>
diff --git a/views/admin/member/memberInfo/editProfileDescription.html b/views/admin/member/memberInfo/editProfileDescription.html
index 89a78b9f..023891e1 100644
--- a/views/admin/member/memberInfo/editProfileDescription.html
+++ b/views/admin/member/memberInfo/editProfileDescription.html
@@ -1,5 +1,5 @@
                     <h2>Description</h2>               
-                    <div class="glm-admin-table glm-admin-inner-table">
+                    <div class="glm-admin-table glm-admin-table-inner">
                         <div class="glm-row">
                             <h4 {if $memberInfo.fieldRequired.short_descr}class="glm-required"{/if}>Short Description:</h4>
                             <div class="glm-small-12" {if $memberInfo.fieldFail.short_descr}class="glm-form-bad-input" data-tabid="glm-member-info-descr"{/if}>
diff --git a/views/admin/member/memberInfo/editProfileLocation.html b/views/admin/member/memberInfo/editProfileLocation.html
index 312e7361..cf60a7fa 100644
--- a/views/admin/member/memberInfo/editProfileLocation.html
+++ b/views/admin/member/memberInfo/editProfileLocation.html
@@ -1,4 +1,4 @@
                     {if $memberInfo.fieldRequired.lat}<h2 class="emRequiredInputField">{else}<h2>{/if}Location:</h2>
-                    <div class="glm-admin-table glm-admin-inner-table">
+                    <div class="glm-admin-table glm-admin-table-inner">
 
                     </div>
\ No newline at end of file
diff --git a/views/admin/member/memberInfo/editProfileMailing.html b/views/admin/member/memberInfo/editProfileMailing.html
index 5606c6f8..1758f29e 100644
--- a/views/admin/member/memberInfo/editProfileMailing.html
+++ b/views/admin/member/memberInfo/editProfileMailing.html
@@ -1,6 +1,6 @@
                 <h2>Mailing Address</h2>
-                <div class="glm-admin-table glm-admin-inner-table-wrapper">
-                    <div class="glm-admin-table glm-admin-inner-table">
+                <div class="glm-admin-table glm-admin-table-inner-wrapper">
+                    <div class="glm-admin-table glm-admin-table-inner">
 
                         <div class="glm-row">
                             <h4 {if $memberInfo.fieldRequired.mailing_addr1}class="glm-required"{/if}>Mailing Address 1:</h4>
diff --git a/views/admin/member/memberInfo/editProfileStatus.html b/views/admin/member/memberInfo/editProfileStatus.html
index d8366b7c..4626f976 100644
--- a/views/admin/member/memberInfo/editProfileStatus.html
+++ b/views/admin/member/memberInfo/editProfileStatus.html
@@ -1,4 +1,4 @@
-        <div class="glm-admin-table glm-admin-inner-table">
+        <div class="glm-admin-table glm-admin-table-inner">
             <div class="glm-row">
                 <h2>Profile Status:</h2>
                 <div class="glm-small-12">
diff --git a/views/admin/members/list.html b/views/admin/members/list.html
index cdf0a9fe..ab0180e6 100644
--- a/views/admin/members/list.html
+++ b/views/admin/members/list.html
@@ -1,5 +1,5 @@
 {include file='admin/members/header.html'}
-<div class="glm-admin-inner-table glm-admin-table">
+<div class="glm-admin-table-inner glm-admin-table">
     <form action="{$thisUrl}?page={$thisPage}" method="post" id="searchForm">
         <input type="hidden" name="glm_action" value="list">
         <input type="hidden" name="prevStart" value="{$prevStart}">
-- 
2.17.1