Merge branch 'develop' into feature/lauryAdminPolishing

diff --cc js/imageUpload/imageUpload.css
Simple merge

diff --cc views/admin/member/memberInfo.html
index c32c2b4,85cad94..83b3926
--- 1/views/admin/member/memberInfo.html
--- 2/views/admin/member/memberInfo.html
+++ b/views/admin/member/memberInfo.html
@@@ -84,30 -85,32 +84,31 @@@
        {if !$settings.enable_counties}
          <input type="hidden" name="county" value="0">
        {/if}
 -        <table class="glm-admin-table">
 -            <tr>
 -                <th>{$terms.term_member_cap} Name:</th>
 -                <td>{$member.name}</td>
 -            </tr>
 +        <div class="glm-admin-table glm-small-6 left">
 +            <div class="glm-row">
 +                <div class="glm-small-4 glm-left">{$terms.term_member_cap} Name:</div>
 +                <div class="glm-small-8 glm-right">{$member.name}</div>
 +            </div>
        {if $memberInfoID && $memberInfo}
 -            <tr>
 -                <th>Access:</th>
 -                <td>{$member.access.name}</td>
 -            </tr>
 +            <div class="glm-row">
 +                <div class="glm-small-4 glm-left"><b>Access: </b></div>
 +                <div class="glm-small-8 glm-right"><span>{$member.access.name} </span></div>
 +            </div>
        {/if}
 -        </table>
 +        </div>
  
      <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>
 +<!-- Merged into Profile Data       <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 nav-tab-active">Profile Data</a>
          {apply_filters('glm-member-db-member-info-custom-nav', '')}
 -        <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>
 +<!-- 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-media" data-show-table="glm-table-media" class="glm-member-info-tab nav-tab">Images/Media</a>
- <!--        <a id="glm-member-info-files" data-show-table="glm-table-files" class="glm-member-info-tab nav-tab">Files</a>-->
+         <a id="glm-member-info-files" data-show-table="glm-table-files" class="glm-member-info-tab nav-tab">Files</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>
 -
+ 
  <!-- 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>  -->
 +        <a id="glm-member-info-files" data-show-table="glm-table-files" class="glm-member-info-tab nav-tab">Files</a>
 +<!-- Not using this yet       <a id="glm-member-info-additional" data-show-table="glm-table-media" class="glm-member-info-tab nav-tab">Additional Data Fields</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}
      </h2>