Merge branch 'develop' into feature/lauryAdminPolishing

diff --cc css/admin.css
index faf2ad8,6f06b8b..cd16c18
--- 1/css/admin.css
--- 2/css/admin.css
+++ b/css/admin.css
@@@ -143,10 -133,9 +143,9 @@@
  .glm-admin-table-narrow th {
      text-align: left;
      vertical-align: top;
 -    white-space: nowrap;
 +/*    white-space: nowrap;*/
      padding-right: 1em;
      padding-bottom: .4em;
- /*    width: 1%;       used to keep header fields on a line with td's to be as narrow as they can be without breaking the text -- commented because we want to break the text*/
  }
  .glm-admin-table td {
      text-align: left;

diff --cc views/admin/member/index.html
index a1941b5,963d8d0..f6496d1
--- 1/views/admin/member/index.html
--- 2/views/admin/member/index.html
+++ b/views/admin/member/index.html
@@@ -9,44 -9,28 +9,50 @@@
    {/if}
  
    {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 colspan="3"><span class="glm-admin-table-large-bold-text">{$member.fieldData.name}</span></td></tr>-->
-         
+         <tr>
+             <td>
+                 <table class="glm-admin-table">
 +                    <tr>
 +                        <th>{$terms.term_member_cap} Slug:</th>
 +                        <td>{$member.fieldData.member_slug}</td>
 +                    </tr>
 +                    <tr><th>Date created:</th><td>{$member.fieldData.created.date}</td></tr>
                      <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>
 +                        <th>{$terms.term_member_cap} Display & Access:</th>
 +                        <td>{$member.fieldData.access.name}</td>
 +                    </tr>
 +                    <tr>
 +                        <th>{$terms.term_member_cap} Type:</th>
 +                        <td>{$member.fieldData.member_type.name}</td>
 +                    </tr>            
 +                    <tr>
 +                        <th>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>
-                     
 +                    <tr>
 +                        
 +                        <td>
 +                        {if apply_filters('glm_members_menu_members', true)}            
 +                            <span>
 +                                <a href="{$thisUrl}?page={$thisPage}&glm_action=memberEdit&member={$memberID}" class="button button-primary glm-button">
 +                                    Edit {$terms.term_member_cap} Name and Status
 +                                </a>
 +                            </span>
 +                        {/if}
 +                        </td>
 +                    </tr>
 -        </tr>            
+                 </table>
+             </td>
++        </tr>
      </table>
    {else}
          <h3>No {$terms.term_member} information available.</h3>

diff --cc views/admin/members/index.html
index d8568cf,d6570c0..ec24540
--- 1/views/admin/members/index.html
--- 2/views/admin/members/index.html
+++ b/views/admin/members/index.html
@@@ -3,8 -3,6 +3,8 @@@
  {if apply_filters('glm_members_permit_admin_members_index_add_member', true)}
      <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>
++
      <table class="glm-admin-table">
          <tr>
              <td colspan="2" align="">

diff --cc views/admin/members/list.html
index a0d6d0e,ac29e7e..6175577
--- 1/views/admin/members/list.html
--- 2/views/admin/members/list.html
+++ b/views/admin/members/list.html
@@@ -5,11 -5,10 +5,11 @@@
          <input type="hidden" name="prevStart" value="{$prevStart}">
          <input type="hidden" name="nextStart" value="{$nextStart}">
          <input type="hidden" name="limit" value="{$limit}">
 -
 +        
 +        <h2 class="glm-admin-table-header">List&nbsp;of&nbsp;{$terms.term_member_plur_cap}</h2>
-         <p class="glm-right">
+         <p class="">
  <!--                <th>{$terms.term_member_plur_cap} Found:</th><td><span style="margin-right: 2em;">{$memberCount}</span></td> -->
 -                <b>Categories: </b>
 +        <div>        <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}>
@@@ -17,24 -16,18 +17,23 @@@
                          </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;">
 +                <input type="submit" value="Submit" style="margin-right: 2em;"></div>
 +        <div>
 +            <b>Text Search: </b><input  class="glmMembersSearch" type="text" name="text_search" id="autoTest">
 +        </div>
 +        <div>
 +            <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">
 +        </div>
 +                
         </p>
          
-         <br clear="all">
-         
          <p><b>Total found:</b> {$memberCount}&nbsp;&nbsp;</p>
-         
+ 
+         <br clear="all">        
          <!-- Add Member Type Button and Dialog Box -->
 -        <div id="exportMembersButton" class="button button-secondary glm-right">Export {$terms.term_member_plur_cap}</div>    
 +        <div id="exportMembersButton" class="button button-secondary glm-admin-export-button">Export {$terms.term_member_plur_cap}</div>    
                
          {if $paging}
              <input type="Submit" name="pageSelect" value="Previous {$limit} {$terms.term_member_plur_cap}" class="button button-secondary glm-button"{if !$prevStart} disabled{/if}>