Merge branch 'develop' into feature/lauryAdminPolishing

diff --cc css/admin.css
index 7f86277,94a3eca..81658ca
--- 1/css/admin.css
--- 2/css/admin.css
+++ b/css/admin.css
@@@ -193,32 -129,12 +193,38 @@@ input, select, .button 
      width: 10%;
      margin-bottom: 5px;
  }
 +.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-table-inner .glm-row {
 +    margin-bottom: 15px;
 +}
 +.glm-admin-table.glm-admin-table-inner th {
 +    font-weight: normal;
 +}
 +#glm-admin-content-container h1,
 +#glm-admin-content-container h2,
 +#glm-admin-content-container h3 {
 +    margin: 0;
 +}
 +.glm-admin-table-inner h3,
 +.glm-admin-table-inner h4 {
 +    margin: 0;
 +}
+ .glm-admin-table-border {
+     border: 2px #ddd solid;
+ }
+ .glm-admin-table-close-spaced {
+     line-height: .6em; 
+ }
  .glm-admin-table th,
  .glm-admin-table-narrow th {
      text-align: left;
@@@ -232,8 -147,11 +238,12 @@@
      text-align: left;
      vertical-align: top;
      padding-bottom: .2em;
 +    max-width: 50%;
  }
+ .glm-admin-table-bordered tr td {
+     border: 2px #ddd solid;
+     border-collapse: collapse;
+ }
  .glm-admin-table thead th{
      font-size: 15px;
      font-weight: bold;

diff --cc views/admin/dashboardWidget/index.html
Simple merge

diff --cc views/admin/management/index.html
Simple merge

diff --cc views/admin/member/memberInfo.html
index 6030e52,ef202e6..0b867d6
--- 1/views/admin/member/memberInfo.html
--- 2/views/admin/member/memberInfo.html
+++ b/views/admin/member/memberInfo.html
@@@ -81,54 -82,73 +81,52 @@@
          <input type="hidden" name="option" value="addNew">
          <input type="hidden" name="create_time" value="now">
        {/if}
- 
+       {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"><b>{$terms.term_member_cap} Name: </b></div>
-                 <div class="glm-small-8 glm-right"><span>{$member.name} </span></div>
++                <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-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>
 -
 -
 +        <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>-->
  <!-- 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>  -->
 +<!-- Not using this yet       <a id="glm-member-info-files" data-show-table="glm-table-media" 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>
 -
 -        <!-- Profile Status & Description -->
 -
 -        {include file='admin/member/memberInfo/editStatus.html'}
 -
 -        <!-- **** Address and Location **** -->
 -
 -        {include file='admin/member/memberInfo/editLocation.html'}
 -
 -        <!-- **** Contact Info **** -->
 -
 -        {include file='admin/member/memberInfo/editContact.html'}
 +      
 +        <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}">
 +        <br>
 +        <br>
 +        <!-- **** Status, Address and Location **** -->
- 
 +        {include file='admin/member/memberInfo/editProfile.html'}
  
          <!-- **** Category & Amenities **** -->
--
          {include file='admin/member/memberInfo/editCategory.html'}
 -
 -        <!-- **** Images **** -->
 -
 -        {include file='admin/member/memberInfo/editImages.html'}
 -
 +        
 +        <!-- **** Media **** -->
- 
 +        {include file='admin/member/memberInfo/editMedia.html'}
 +        
          <!-- **** Files **** -->
--
          {include file='admin/member/memberInfo/editFiles.html'}
  
 -        <!-- **** Video **** -->
 -
 -        {include file='admin/member/memberInfo/editVideo.html'}
 -
 -        <!-- **** Live Cam **** -->
 -
 -        {include file='admin/member/memberInfo/editCamera.html'}
 -
        {if $memberInfoID && $memberInfo}
          {apply_filters('glm-member-db-member-info-custom-tab', '', $memberInfoID)}
        {else}

diff --cc views/admin/member/memberInfo/editLocation.html
index 65c6eef,291b7e4..a3b2f75
--- 1/views/admin/member/memberInfo/editLocation.html
--- 2/views/admin/member/memberInfo/editLocation.html
+++ b/views/admin/member/memberInfo/editLocation.html
@@@ -58,20 -58,22 +58,44 @@@
                      {if $memberInfo.fieldFail.state}<p>{$memberInfo.fieldFail.state}</p>{/if}
                  </td>
              </tr>
+             {if $settings.enable_counties}
+             <tr>
+                 <th {if $memberInfo.fieldRequired.county}class="glm-required"{/if}>{$terms.term_county_cap}:</th>
+                 <td {if $memberInfo.fieldFail.county}class="glm-form-bad-input" data-tabid="glm-member-info-address"{/if}>
+                     <select name="county">
+                         {foreach from=$memberInfo.fieldData.county.list item=v}
+                             <option value="{$v.value}"{if $v.default} selected="selected"{/if}>{$v.name}</option>
+                         {/foreach}
+                     </select>
+                     {if $memberInfo.fieldFail.county}<p>{$memberInfo.fieldFail.county}</p>{/if}
+                 </td>
+             </tr>
+             {/if}
+             <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>
 +                <th {if $memberInfo.fieldRequired.county}class="glm-required"{/if}>County:</th>
 +                <td {if $memberInfo.fieldFail.county}class="glm-form-bad-input" data-tabid="glm-member-info-address"{/if}>
 +                    <select name="county">
 +                        {foreach from=$memberInfo.fieldData.county.list item=v}
 +                            <option value="{$v.value}"{if $v.default} selected="selected"{/if}>{$v.name}</option>
 +                        {/foreach}
 +                    </select>
 +                    {if $memberInfo.fieldFail.county}<p>{$memberInfo.fieldFail.county}</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>

diff --cc views/admin/members/index.html
Simple merge

diff --cc views/admin/settings/header.html
index 95ccbe8,ce5b432..8e509ee
--- 1/views/admin/settings/header.html
--- 2/views/admin/settings/header.html
+++ b/views/admin/settings/header.html
@@@ -11,7 -11,10 +11,9 @@@
          <a href="{$thisUrl}?page={$thisPage}&glm_action=cities" class="nav-tab{if $thisAction==cities} nav-tab-active{/if}">Cities</a>
          {if $enable_members}
          <a href="{$thisUrl}?page={$thisPage}&glm_action=regions" class="nav-tab{if $thisAction==regions} nav-tab-active{/if}">Regions</a>
-         <a href="{$thisUrl}?page={$thisPage}&glm_action=counties" class="nav-tab{if $thisAction==counties} nav-tab-active{/if}">Counties</a>
 -
+             {if $settings.enable_counties}
+             <a href="{$thisUrl}?page={$thisPage}&glm_action=counties" class="nav-tab{if $thisAction==counties} nav-tab-active{/if}">{$terms.term_admin_menu_configure_counties}</a>
+             {/if}
          {/if}
  {foreach $addOnTabs as $a}
          <a href="{$thisUrl}?page={$thisPage}&glm_action={$a.action}" class="nav-tab{if $thisAction==$a.action} nav-tab-active{/if}">{$a.text}</a>