Merging develop back into this branch
authorLaury GvR <laury@gaslightmedia.com>
Mon, 17 Apr 2017 18:39:24 +0000 (14:39 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 17 Apr 2017 18:39:24 +0000 (14:39 -0400)
14 files changed:
1  2 
models/admin/member/memberInfo.php
models/admin/members/list.php
setup/frontHooks.php
views/admin/dashboardWidget/index.html
views/admin/management/header.html
views/admin/management/index.html
views/admin/member/header.html
views/admin/member/index.html
views/admin/member/memberInfo.html
views/admin/member/memberInfo/editMedia.html
views/admin/member/memberInfo/editProfile.html
views/admin/member/memberInfo/editProfileAddress.html
views/admin/members/index.html
views/admin/members/list.html

Simple merge
@@@ -222,31 -209,13 +222,37 @@@ class GlmMembersAdmin_members_list exte
              $filterFeatured = true;
              $haveFilter = true;
          }
 +        
 +        // If doing alpha list
 +        if (isset($_REQUEST['alpha'])) {
 +            $actionData['request']['alpha'] = $_REQUEST['alpha'];
 +        }
 +        
 +        $alphaList = false;
 +        $alphaWhere = '';
 +
 +        $alphaSelected = false;
 +
 +        // Check for alpha selected
 +        if ($actionData['request']['alpha'] && strlen($actionData['request']['alpha']) == 1) {
 +            $alphaSelected = strtoupper($actionData['request']['alpha']);
 +            $alphaWhere .= " AND T.name LIKE '$alphaSelected%'";
 +        }
 +
 +        // Get full list for all other filters, but not filtered by alpha (that would be silly)
 +        $alphaList = $this->getAlphaList(' AND '.$where, $alphaSelected);
 +        
 +        // If user clicked a page request then we need to check the savedAlpha value
 +        if (isset($_REQUEST['savedAlpha']) && isset($_REQUEST['pageSelect'])) {
 +            $actionData['request']['alpha'] = $_REQUEST['savedAlpha'];
 +        }
  
+         $whereParts = apply_filters('glm-member-db-admin-search-query', $where);
+         if ( is_array( $whereParts ) && count( $whereParts ) > 0 ) {
+             $where .= ' AND '.implode(" AND ", $whereParts);
+             $whereSep = ' AND ';
+         }
          // Get count of members listed
          $memberCount = $this->getStats($where);
  
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -7,72 -7,30 +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}
 -    <table class="glm-admin-table">
 -        <tr>
 -            <td>
 -                <table class="glm-admin-table">
 -                    <tr>
 -                        <th>URL CLick Counts</th>
 -                        <td><b>Today:</b> {$clickThroughCounts.day}&nbsp;&nbsp;&nbsp;<a data-type="daysClicks" class="dialog-button" href=""><img src="{$assetsUrl}/graph.png"></a></td>
 -                    </tr>
 -                </table>
 -            </td>
 -            <td>
 -                <table class="glm-admin-table">
 -                    <tr>
 -                        <th>&nbsp;&nbsp;Detail Page View Counts</th>
 -                        <td><b>Today:</b> {$detailViewCounts.day}&nbsp;&nbsp;&nbsp;<a data-type="daysViews" class="dialog-button" href=""><img src="{$assetsUrl}/graph.png"></a></td>
 -                    </tr>
 -                </table>
 -            </td>
 -        </tr>
 -    </table>
++
 +        <div class="glm-row">
 +            <div class="glm-small-4 glm-left">
 +                <div class="glm-admin-table">
 +                    <div class="glm-row">
 +                        <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">
 +                        <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>
 +            </div>
 +            <div class="glm-small-4 glm-left">
 +                <div class="glm-admin-table">
 +                    <div class="glm-row">
 +                        <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">
 +                        <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>
 +                    <div class="glm-row">
 +                        <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>
 +            </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>
    {else}
          <h3>No {$terms.term_member} information available.</h3>
    {/if}
              <p><img id="viewsYearGraph" src="{$ajaxUrl}?action=glm_members_admin_ajax&glm_action=memberGraphs&graphType=views&graphPeriod=twoYears&memberId={$member.fieldData.id}&memberSlug={$member.fieldData.member_slug}&kb={$time}"><br></p>
          </div>
      </div>
--    
++
    {apply_filters('glm_members_admin_member_index_bottomOfMemberSummary', '', {$member.fieldData.id})}
  
    {if $haveMember}
    {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>
 -      {if apply_filters('glm_members_permit_admin_member_index_add_member_info_version', true)}
 -        <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>
 -      {/if}
 -    </p>
 -    <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>
 +            </div>
 +        </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}
-                 <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 $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 $settings.memb_info_location} {if $m.bad_lat_lon}<span class="glm-error">Bad Map Location</span>{/if} {/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 -->
-                 <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}
+         {/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}
-     {/if}
+         </tbody>
+     </table>
+    {/if} <!-- apply_filters -->
+   {/if}
+ {/if}
 +    </div>
 +    <br>
  
  
 -  <p>&nbsp;</p>
 -
 - {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($) {
  
        {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', '')}
 -        {if $settings.memb_info_location} <a id="glm-member-info-address" data-show-table="glm-table-address" class="glm-member-info-tab nav-tab">Address & Location</a> {/if}
 -        {if $settings.memb_info_contact} <a id="glm-member-info-contact" data-show-table="glm-table-contact" class="glm-member-info-tab nav-tab">Contact Info</a> {/if}
 -        {if $settings.memb_info_categories} <a id="glm-member-info-cat" data-show-table="glm-table-cat" class="glm-member-info-tab nav-tab">Categories & Amenities</a> {/if}
 -        {if $settings.memb_info_images} <a id="glm-member-info-images" data-show-table="glm-table-images" class="glm-member-info-tab nav-tab">Images</a> {/if}
 -        {if $settings.memb_info_files} <a id="glm-member-info-files" data-show-table="glm-table-files" class="glm-member-info-tab nav-tab">Files</a> {/if}
 -        {if $settings.memb_info_video} <a id="glm-member-info-video" data-show-table="glm-table-video" class="glm-member-info-tab nav-tab">Video</a> {/if}
 -        {if $settings.memb_info_cam} <a id="glm-member-info-live-cam" data-show-table="glm-table-live-cam" class="glm-member-info-tab nav-tab">Live Cam</a> {/if}
 +<!-- 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-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>
++        {if $settings.memb_info_categories} <a id="glm-member-info-cat" data-show-table="glm-table-cat" class="glm-member-info-tab nav-tab">Categories & Amenities</a>{/if}
++        <a id="glm-member-info-media" data-show-table="glm-table-media" class="glm-member-info-tab nav-tab">{if $settings.memb_info_images}Images/{/if}Media</a>
++        {if $settings.memb_info_files}      <a id="glm-member-info-files" data-show-table="glm-table-files" class="glm-member-info-tab nav-tab">Files</a>{/if}
  
  <!-- 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-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 **** -->
 -
 -        {if $settings.memb_info_location} {include file='admin/member/memberInfo/editLocation.html'} {/if}
 -
 -        <!-- **** Contact Info **** -->
 -
 -        {if $settings.memb_info_contact} {include file='admin/member/memberInfo/editContact.html'} {/if}
 +        <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'}
-         
 -
+         {if $settings.memb_info_categories} {include file='admin/member/memberInfo/editCategory.html'} {/if}
 -        <!-- **** Images **** -->
 -
 -        {if $settings.memb_info_images} {include file='admin/member/memberInfo/editImages.html'} {/if}
 +        <!-- **** Media **** -->
 +        {include file='admin/member/memberInfo/editMedia.html'}
-         
          <!-- **** Files **** -->
-         {include file='admin/member/memberInfo/editFiles.html'}
 -
+         {if $settings.memb_info_files} {include file='admin/member/memberInfo/editFiles.html'} {/if}
  
 -        <!-- **** Video **** -->
 -
 -        {if $settings.memb_info_video} {include file='admin/member/memberInfo/editVideo.html'} {/if}
 -
 -        <!-- **** Live Cam **** -->
 -
 -        {if $settings.memb_info_cam} {include file='admin/member/memberInfo/editCamera.html'} {/if}
 -
        {if $memberInfoID && $memberInfo}
          {apply_filters('glm-member-db-member-info-custom-tab', '', $memberInfoID)}
        {else}
                  $('#' + table).removeClass('glm-hidden');
  
  
-                 if (table == 'glm-table-profile') {
 -                if (table == 'glm-table-address') {
--                    initMap();
--                }
++                if ({$settings.memb_info_location}) {
  
--                // Listen for changes in the lat/lon inputs
--                $('#latLonRecenter').on('click', function() {
++                    if (table == 'glm-table-profile') {
++                        initMap();
++                    }
  
--                    // Get lat and lon from the input fields
--                    var glmLat = $('#glmLat').val();
--                    var glmLng = $('#glmLng').val();
++                    // Listen for changes in the lat/lon inputs
++                    $('#latLonRecenter').on('click', function() {
  
--                    location = new google.maps.LatLng(glmLat, glmLng);
--                    initMap();
--                    return false;
++                        // Get lat and lon from the input fields
++                        var glmLat = $('#glmLat').val();
++                        var glmLng = $('#glmLng').val();
  
--                });
++                        location = new google.maps.LatLng(glmLat, glmLng);
++                        initMap();
++                        return false;
++
++                    });
++
++                }
  
                  // Listen for changes to video type
                  $('#glm-video-type').change( function() {
                  glmGeocode();
  
              });
-             
 +            /*
 +             * Map Display Toggle
 +             */
 +            $("#locationMapToggle").click(function() {
 +                var mapC = "#locationMapContainer";
 +                var map = "#locationMap";
 +                var mapNewH = 0;
 +                var mapOverflow = 'hidden';
 +                var mapBtnTxt = 'View Map';
 +                if ($(mapC).height() == 0) {
 +                    mapNewH = 400;
 +                    mapV = 'visible';
 +                    mapBtnTxt = 'Hide Map'
 +                }
 +                $(mapC).animate({
 +                    overflow: mapOverflow,
 +                    height: mapNewH
 +                }, 250, "swing", function() {
 +
 +                });
 +                $(this).html(mapBtnTxt);
 +            });
 +
              /*
               * Map operations
               */
index a3cf224,0000000..bca380d
mode 100644,000000..100644
--- /dev/null
@@@ -1,24 -1,0 +1,29 @@@
-         <div class="glm-small-12 glm-medium-6 glm-left">
-             {include file='admin/member/memberInfo/editMediaImages.html'}
-         </div>
 +<div id="glm-table-media" class="glm-admin-table glm-admin-table-outer glm-hidden glm-member-info-table">
 +    <!-- **** Images **** -->
 +    <div class="glm-row">
-             <div class="glm-row">
-                 <div class="glm-small-12 glm-left">
-                     {include file='admin/member/memberInfo/editMediaVideo.html'}
++        {if $settings.memb_info_images}
++            <div class="glm-small-12 glm-medium-6 glm-left">
++                {include file='admin/member/memberInfo/editMediaImages.html'}
++            </div>
++        {/if}
 +        <div class="glm-small-12 glm-medium-6 glm-left">
 +            <!-- **** Video **** -->
-             </div>
-             <div class="glm-row">
-                 <!-- **** Live Cam **** -->
-                 <div class="glm-small-12 glm-left">
-                     {include file='admin/member/memberInfo/editMediaCamera.html'}
++            {if $settings.memb_info_video}
++                <div class="glm-row">
++                    <div class="glm-small-12 glm-left">
++                        {include file='admin/member/memberInfo/editMediaVideo.html'}
++                    </div>
 +                </div>
-             </div>
++            {/if}
++            {if $settings.memb_info_cam}
++                <div class="glm-row">
++                    <!-- **** Live Cam **** -->
++                    <div class="glm-small-12 glm-left">
++                        {include file='admin/member/memberInfo/editMediaCamera.html'}
++                    </div>
 +                </div>
-         
++            {/if}
 +        </div>
++
 +    </div>
 +</div>
index e2c0215,0000000..8d68726
mode 100644,000000..100644
--- /dev/null
@@@ -1,50 -1,0 +1,52 @@@
-         
++
 +        <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'}
 +                </div>
 +            </div>
 +            <div class="glm-row">
 +                <div class="glm-small-12 glm-medium-6 glm-left">
 +                    <div class="glm-row">
 +                        <div class="glm-small-12">
 +                            {include file='admin/member/memberInfo/editProfileAddress.html'}
 +                        </div>
 +                        <br>
 +                        <div class="glm-small-12">
 +                            {include file='admin/member/memberInfo/editProfileMailing.html'}
 +                        </div>
 +                    </div>
 +                </div>
 +                <div class="glm-small-12 glm-medium-6 glm-left">
 +                    <div class="glm-row">
++                        {if $settings.memb_info_contact}
 +                        <div class="glm-small-12">
 +                            {include file='admin/member/memberInfo/editProfileContact.html'}
 +                        </div>
 +                        <br>
++                        {/if}
 +                        <div class="glm-small-12">
 +                            {include file='admin/member/memberInfo/editProfileDescription.html'}
 +                        </div>
 +                    </div>
 +                </div>
 +            </div>
 +<!--            <div class="glm-row">
 +                <div class="glm-small-12 glm-medium-6 glm-left">
 +                    profileAddress
 +                </div>
 +                <div class="glm-small-12 glm-medium-6 glm-left">
 +                    profileContact
 +                </div>
 +            </div>
 +            <br>
 +            <div class="glm-row">
 +                <div class="glm-small-12 glm-medium-6 glm-left">
 +                    profileMailing
 +                </div>
 +                <div class="glm-small-12 glm-medium-6 glm-left">
 +                    profileDescription
 +                </div>
 +            </div>-->
-            
++
 +        </div>
index a7696bd,0000000..b433d6b
mode 100644,000000..100644
--- /dev/null
@@@ -1,127 -1,0 +1,129 @@@
-                                     <b>Selected Position:</b> 
 +                <br>
 +                <h2>Address</h2>
 +                <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}>
 +                                <input type="text" id="addr1" name="addr1" value="{$memberInfo.fieldData.addr1}" class="glm-form-text-input-medium-short">
 +                                {if $memberInfo.fieldFail.addr1}<p>{$memberInfo.fieldFail.addr1}</p>{/if}
 +                            </div>
 +                        </div>
 +                        <div class="glm-row">
 +                            <h4 {if $memberInfo.fieldRequired.addr2}class="glm-required"{/if}>Address 2:</h4>
 +                            <div class="glm-small-12" {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-medium-short">
 +                                {if $memberInfo.fieldFail.addr2}<p>{$memberInfo.fieldFail.addr2}</p>{/if}
 +                            </div>
 +                        </div>
 +                        <div class="glm-row">
 +                            <h4>City</h4>
 +                            <div class="glm-small-12" class="glm-item-container">
 +                                <!--  Add new city dialog -->
 +                                <div id="newCityButton" class="button button-secondary">Add a new City</div>
 +                                <div id="newCityDialog" class="glm-dialog-box" title="Enter a New City">
 +                                    <div class="glm-admin-table">
 +                                        <div class="glm-row">
 +                                            <h4 class="glm-required">City Name:</h4>
 +                                            <div class="glm-small-12" id="newCityNameTD">
 +                                                <input id="newCityName" type="text" name="newCityName" class="glm-form-text-input">
 +                                                <div id="newCityNameRequired"></div>
 +                                            </div>
 +                                        </div>
 +                                    </div>
 +                                    <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" class="glm-left">
 +                                    <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>
 +                            </div>
 +                        </div>
 +                        <div class="glm-row">
 +                            <h4 {if $memberInfo.fieldRequired.county}class="glm-required"{/if}>County:</h4>
 +                            <div {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}
 +                            </div>
 +                        </div>
 +                        <div class="glm-row">
 +                            <h4 {if $memberInfo.fieldRequired.region}class="glm-required"{/if}>Region:</h4>
 +                            <div class="glm-small-12" {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}
 +                            </div>
 +                        </div>
 +                        <div class="glm-row">
 +                            <h4 {if $memberInfo.fieldRequired.state}class="glm-required"{/if}>State:</h4>
 +                            <div class="glm-small-12" {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}
 +                            </div>
 +                        </div>
 +                        <div class="glm-row">
 +                            <h4 {if $memberInfo.fieldRequired.zip}class="glm-required"{/if}>ZIP / Postal Code:</h4>
 +                            <div class="glm-small-12" {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}
 +                            </div>
 +                        </div>
 +                        <div class="glm-row">
 +                            <h4 {if $memberInfo.fieldRequired.country}class="glm-required"{/if}>Country:</h4>
 +                            <div class="glm-small-12" {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}
 +                            </div>
 +                        </div>
++                        {if $settings.memb_info_location}
 +                        <div class="glm-row">
 +                            {if $memberInfo.fieldRequired.lat}<h4 class="emRequiredInputField">{else}<h4>{/if}Location:</h4>
 +                            <div class="glm-small-12">
 +                                <div id="glm-estimate-location" class="button button-secondary glm-left">Map Location Using Above Address</div>
 +                                <div id="locationMapToggle" class="button button-secondary glm-right">View Map</div>
 +                                <div id="locationMapContainer" style="height: 0;">
 +                                    <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-small">(map loads here)</div>
 +                                </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>
 +                            </div>
 +                        </div>
++                        {/if}
 +                    </div>
 +                </div>
Simple merge
@@@ -5,30 -5,26 +5,32 @@@
          <input type="hidden" name="prevStart" value="{$prevStart}">
          <input type="hidden" name="nextStart" value="{$nextStart}">
          <input type="hidden" name="limit" value="{$limit}">
 -
 -        <p class="">
 +        
 +        <h2 class="glm-admin-table-header">List&nbsp;of&nbsp;{$terms.term_member_plur_cap}</h2>
 +        <div class="glm-row">
 +            <b>Text Search: </b><input  class="glmMembersSearch" type="text" name="text_search" id="autoTest">
 +            <input type="submit" value="Submit" style="margin-right: 2em;">
 +        </div>
  <!--                <th>{$terms.term_member_plur_cap} Found:</th><td><span style="margin-right: 2em;">{$memberCount}</span></td> -->
 -                <b>Categories: </b>
 -                <select id="filterCategories" name="filterCategories[]" multiple="multiple" size="1">
 +        <div class="glm-row">        
 +            <b>Categories: </b>
 +            <select id="filterCategories" name="filterCategories[]" multiple="multiple" size="1">
      {foreach from=$categories item=v}
 -                        <option value="{$v.id}" data-parent="{$v.parent}"{if $v.selected} selected{/if}>
 -                            {if $v.parent_id}&nbsp;&nbsp;&nbsp;&nbsp;{/if}{$v.name}
 -                        </option>
 +                <option value="{$v.id}" data-parent="{$v.parent}"{if $v.selected} selected{/if}>
 +                    {if $v.parent_id}&nbsp;&nbsp;&nbsp;&nbsp;{/if}{$v.name}
 +                </option>
      {/foreach}
 -                </select>
 -                <input type="submit" value="Submit" style="margin-right: 2em;">
 -                <b>Show Archived: </b><input type="checkbox" id="filterArchived" class="listFilter"{if $filterArchived} checked{/if} style="margin-right: 1em;">
 +            </select>
 +        </div>
 +
 +        <div class="glm-row">
 +            <b>Show Archived: </b><input type="checkbox" id="filterArchived" class="listFilter"{if $filterArchived} checked{/if} style="margin-right: 1em;">
                  <b>Featured Only: </b><input type="checkbox" id="filterFeatured" class="listFilter"{if $filterFeatured} checked{/if} style="margin-right: 1em;">
                  <b>Pending Only: </b><input type="checkbox" id="filterPending" class="listFilter"{if $filterPending} checked{/if} style="margin-right: 1em;">
 -                <b>Text Search: </b><input  class="glmMembersSearch" type="text" name="text_search" id="autoTest">
 -       </p>
 +        </div>
  
+        {apply_filters('glm-member-db-custom-filter-search', '')}
          <p><b>Total found:</b> {$memberCount}&nbsp;&nbsp;</p>
  
          <br clear="all">