Merge branch 'develop' into feature/lauryAdminPolishing

diff --cc setup/adminHooks.php
index 4e8fb70,36b06a0..e3b4c76
--- 1/setup/adminHooks.php
--- 2/setup/adminHooks.php
+++ b/setup/adminHooks.php
@@@ -101,33 -101,12 +101,33 @@@ add_action( 'add_meta_boxes', function(
      );
  } );
  
 +// This function below needs to be defined in the theme's functions.php
 +//
 +//if ( ! function_exists( 'glm_members_only_menu' ) && class_exists('GLM_Members_Only_Walker')) {
 +//    function glm_members_only_menu() {
 +//        wp_nav_menu(array(
 +//            'container' => false,                           // remove nav container
 +//            'container_class' => 'members-only-menu',                        // class of container
 +//            'menu' => '',                                   // menu name
 +//            'menu_class' => 'members-only-menu',                             // adding custom nav class
 +//            'theme_location' => 'members-only-menu',             // where it's located in the theme
 +//            'before' => '',                                 // before each link <a>
 +//            'after' => '',                                  // after each link </a>
 +//            'link_before' => '',                            // before each link text
 +//            'link_after' => '',                             // after each link text
 +//            'depth' => 2,                                   // limit the depth of the nav
 +//            'fallback_cb' => false,                         // fallback function (see below)
 +//            'walker' => new GLM_Members_Only_Walker()
 +//        ));
 +//    }
 +//}
 +
  // If not administrator, don't show or permit access to the main dashboard
  function glmRemoveDashboard () {
-     global $current_user, $menu, $submenu;
+     global $current_user, $menu, $submenu, $config;
  
      // If user isn't an administrator
-     if (!in_array('administrator', $current_user->roles)) {
+     if (!in_array('administrator', $current_user->roles) && $config['settings']['enable_members']) {
  
          // Get rid of the main WordPress admin "Dashboard"
          reset( $menu );

diff --cc setup/adminMenus.php
index 4f3d8e8,94f84e9..cd49d61
--- 1/setup/adminMenus.php
--- 2/setup/adminMenus.php
+++ b/setup/adminMenus.php
@@@ -35,45 -35,71 +35,70 @@@ if (current_user_can('glm_members_membe
  
      $mainMenuSlug = 'glm-members-admin-menu-members';
  
-     add_menu_page(
-         $this->config['terms']['term_admin_menu_members'],
-         'GLM Associate',
-         'glm_members_main_menu',
-         'glm-members-admin-menu-members',
-         function() {},
-         GLM_MEMBERS_PLUGIN_ASSETS_URL.'/flame.png',
-         '3.100'
-     );
- 
-     // Add a sub-submenu for the "Member" "List" page
-     add_submenu_page(
-         'glm-members-admin-menu-members',
-         $this->config['terms']['term_admin_menu_member_list'],
-         $this->config['terms']['term_admin_menu_members'],
-         'glm_members_main_menu',
-         'glm-members-admin-menu-members',
-         function() {$this->controller('members', 'index');}
-     );
-     
+     $enable_members = $this->config['settings']['enable_members'];
 -    //echo '<pre>$enable_members: ' . print_r( $enable_members, true ) . '</pre>';
 -
 +    // Add a sub-submenu for the "Member" "List" page
-     add_submenu_page(
-         'glm-members-admin-menu-members',
-         $this->config['terms']['term_admin_menu_member_list'],
-         '&nbsp;&nbsp;&nbsp;&nbsp;List',
-         'glm_members_main_menu',
-         'glm-members-admin-menu-members-list',
-         function() {$this->controller('members', 'list');}
-     );
+     if ( $enable_members ) {
+         add_menu_page(
+             $this->config['terms']['term_admin_menu_members'],
+             'GLM Associate',
+             'glm_members_main_menu',
+             'glm-members-admin-menu-members',
+             function() {},
+             GLM_MEMBERS_PLUGIN_ASSETS_URL.'/flame.png',
+             '3.100'
+         );
  
-     // Add a submenu for the "Member" section
-     add_submenu_page(
-         $mainMenuSlug,
-         $this->config['terms']['term_admin_menu_member'].' Dashboard',
-         $this->config['terms']['term_admin_menu_member'],
-         'glm_members_member',
-         'glm-members-admin-menu-member',
-         function() {$this->controller('member');}
-     );
+         // Add a sub-submenu for the "Member" "List" page
+         add_submenu_page(
+             'glm-members-admin-menu-members',
+             $this->config['terms']['term_admin_menu_member_list'],
+             $this->config['terms']['term_admin_menu_members'],
+             'glm_members_main_menu',
+             'glm-members-admin-menu-members',
+             function() {$this->controller('members', 'index');}
+         );
+ 
+         // Add a sub-submenu for the "Member" "List" page
+         add_submenu_page(
+             'glm-members-admin-menu-members',
+             $this->config['terms']['term_admin_menu_member_list'],
+             '&nbsp;&nbsp;&nbsp;&nbsp;List',
+             'glm_members_main_menu',
+             'glm-members-admin-menu-members-list',
+             function() {$this->controller('members', 'list');}
+         );
+ 
+         // Add a submenu for the "Member" section
+         add_submenu_page(
+             $mainMenuSlug,
+             $this->config['terms']['term_admin_menu_member'].' Dashboard',
+             $this->config['terms']['term_admin_menu_member'],
+             'glm_members_member',
+             'glm-members-admin-menu-member',
+             function() {$this->controller('member');}
+         );
+     } else {
+         add_menu_page(
+             $this->config['terms']['term_admin_menu_members'],
+             'GLM Associate',
+             'glm_members_main_menu',
+             'glm-members-admin-menu-members',
+             function() {},
+             GLM_MEMBERS_PLUGIN_ASSETS_URL.'/flame.png',
+             '3.100'
+         );
+ 
+         // Add a sub-submenu for the "Member" "List" page
+         add_submenu_page(
+             'glm-members-admin-menu-members',
+             'Dashboard',
+             'Dashboard',
+             'glm_members_main_menu',
+             'glm-members-admin-menu-members',
+             function() {$this->controller('members', 'index');}
+         );
+ 
+     }
  
  // Otherwise just display menus for logged in member
  } else {

diff --cc setup/frontHooks.php
index 57e455c,b6aa98c..f967aff
--- 1/setup/frontHooks.php
--- 2/setup/frontHooks.php
+++ b/setup/frontHooks.php
@@@ -323,10 -328,16 +328,25 @@@ function is_member( $id = false ) 
      }
      return false;
  }
- // the available data. ~L
++
 +// Getting the current admin theme colors as set by Wordpress. 
 +// This will be useful for styling our menu when we figure out how best to use 
++// the available data.
 +// 
 +//$admin_colors;
 +//add_action('admin_head', function(){global $_wp_admin_css_colors; $admin_colors = $_wp_admin_css_colors;});
 +//$admin_colors[get_user_option('admin_color')]['colors'];
++    
+ function get_member_id_by_name( $name = null )
+ {
+     if ( $name ) {
+         global $wpdb;
+         $memberId = $wpdb->get_var(
+             $wpdb->prepare(
+                 "SELECT id FROM " . GLM_MEMBERS_PLUGIN_DB_PREFIX . "members WHERE name = %s",
+                 $name
+             )
+         );
+         return $memberId;
+     }
+ }

diff --cc views/admin/management/index.html
index 78e69dd,23b59d3..9a2c22e
--- 1/views/admin/management/index.html
--- 2/views/admin/management/index.html
+++ b/views/admin/management/index.html
@@@ -162,9 -167,19 +169,19 @@@
          <table id="glm-table-list" class="glm-admin-table glm-settings-table glm-hidden">
              <tr>
                  <td>
 -                    <table class="glm-admin-table">
 +                    <table class="glm-admin-table glm-admin-inner-table">
                          <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>
+                             <th>Member List Order</th>
+                             <td>
+                                 <select name="list_order_list">
+                     {foreach from=$genSettings.fieldData.list_order_list.list item=v}
+                                     <option value="{$v.value}"{if $v.default} selected="selected"{/if}>{$v.name}</option>
+                     {/foreach}
+                                 </select>
+                             </td>
+                         </tr>
                          <tr><th>Show Member Name as Link to Detail:</th><td><input type="checkbox" name="list_show_detail_link"{if $genSettings.fieldData.list_show_detail_link.value} checked="checked"{/if}></td></tr>
                          <tr><th>List Header Text:</th><td><input type="text" name="list_header_text" value="{$genSettings.fieldData.list_header_text}" class="glm-form-text-input-small" placeholder="Members List"></td></tr>
                          <tr><th>Show Member Logo:</th><td><input type="checkbox" name="list_show_logo"{if $genSettings.fieldData.list_show_logo.value} checked="checked"{/if}></td></tr>

diff --cc views/admin/members/header.html
index 6ace35a,7996b7d..31ca525
--- 1/views/admin/members/header.html
--- 2/views/admin/members/header.html
+++ b/views/admin/members/header.html
@@@ -1,11 -1,15 +1,15 @@@
 -<div class="wrap">
 +<div class="wrap glm-associate-admin-wrap glm-associate-admin-members-wrap">
+ {if $enable_members}
      <h2>All {$terms.term_member_plur_cap}</h2>
      <h2 class="nav-tab-wrapper">
-         <a href="{$thisUrl}?page={$thisPage}&glm_action=index" class="nav-tab{if $thisAction==index} nav-tab-active{/if}">Dashboard</a>
+         <a href="{$thisUrl}?page=glm-members-admin-menu-members" class="nav-tab{if $thisAction==index} nav-tab-active{/if}">Dashboard</a>
          <a href="{$thisUrl}?page={$thisPage}&glm_action=list" class="nav-tab{if $thisAction==list} nav-tab-active{/if}">{$terms.term_member_plur_cap} List</a>
- {foreach $addOnTabs as $a}
-         <a href="{$thisUrl}?page=glm-members-admin-menu-{$a.menu}&glm_action={$a.action}" class="nav-tab{if $thisAction==$a.action} nav-tab-active{/if}">{$a.text}</a>
- {/foreach}        
+     {foreach $addOnTabs as $a}
+             <a href="{$thisUrl}?page=glm-members-admin-menu-{$a.menu}&glm_action={$a.action}" class="nav-tab{if $thisAction==$a.action} nav-tab-active{/if}">{$a.text}</a>
+     {/foreach}
      </h2>
+ {else}
+     <h2>Dashboard</h2>
+ {/if}
      <div id="glm-admin-content-container">
-     
+ 

diff --cc views/admin/members/index.html
index 0aae751,83d22c0..622edaa
--- 1/views/admin/members/index.html
--- 2/views/admin/members/index.html
+++ b/views/admin/members/index.html
@@@ -1,10 -1,9 +1,10 @@@
  {include file='admin/members/header.html'}
  
- {if apply_filters('glm_members_permit_admin_members_index_add_member', true)}
+ {if apply_filters('glm_members_permit_admin_members_index_add_member', true) && $enable_members}
      <a href="{$thisUrl}?page=glm-members-admin-menu-member&glm_action=memberEdit&option=add" class="button button-primary glm-button glm-right">Add A New {$terms.term_member_cap}</a>
  {/if}
- 
 +    <h2 class="glm-left glm-admin-table-header">Main Dashboard</h2>
+ {if $enable_members}
      <table class="glm-admin-table">
          <tr>
              <td colspan="2" align="">

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

diff --cc views/admin/settings/header.html
index 66b27e6,cd6366c..a0bfe90
--- 1/views/admin/settings/header.html
--- 2/views/admin/settings/header.html
+++ b/views/admin/settings/header.html
@@@ -1,8 -1,9 +1,9 @@@
 -<div class="wrap">
 +<div class="wrap glm-associate-admin-wrap glm-associate-admin-settings-wrap">
  
      <h2>{$glmPluginName} Settings</h2>
-        
+ 
      <h2 class="nav-tab-wrapper">
+         {if $enable_members}
          <a href="{$thisUrl}?page={$thisPage}&glm_action=index" class="nav-tab{if $thisAction==index} nav-tab-active{/if}">{$terms.term_member_cap} Types</a>
          <a href="{$thisUrl}?page={$thisPage}&glm_action=categories" class="nav-tab{if $thisAction==categories} nav-tab-active{/if}">{$terms.term_member_cap} Categories</a>
          <a href="{$thisUrl}?page={$thisPage}&glm_action=amenities" class="nav-tab{if $thisAction==amenities} nav-tab-active{/if}">Amenities</a>