Merge branch 'develop' into feature/memberDashboard

diff --cc css/admin.css
Simple merge

diff --cc models/admin/dashboardWidget/index.php
Simple merge

diff --cc models/admin/member/index.php
Simple merge

diff --cc views/admin/member/index.html
index 2bb4ea1,963d8d0..7589afc
--- 1/views/admin/member/index.html
--- 2/views/admin/member/index.html
+++ b/views/admin/member/index.html
@@@ -8,51 -9,29 +8,29 @@@
    {/if}
  
    {if $haveMember}
-         {if $lockedToMember}
-         <table class="glm-admin-table">
-             <tr><td><span class="glm-admin-table-large-bold-text">{$member.fieldData.name}</span></td></tr>
-         </table>
-         {else}
-         <table class="glm-admin-table">
-             <tr><td><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 class="glm-nowrap">{$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>{$terms.term_member_cap} Display & Access:</th>
-                             <td class="glm-nowrap">{$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>
-                     </table>
-                 </td>
-                 <td class="glm-right">
 -    {if apply_filters('glm_members_menu_members', true)}            
 +    {if apply_filters('glm_members_menu_members', true)}
-                     <span class="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></span>
+         <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}
-                 </td>
-             </tr>
-         </table>
-         {/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>      
++            <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>            
++        </tr>
+     </table>
    {else}
          <h3>No {$terms.term_member} information available.</h3>
    {/if}
@@@ -102,8 -80,7 +79,7 @@@
  
    {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}   
 +    {/if}
-     <br clear="all">
      <p>
          <h3 class="glm-left">{$terms.term_member_cap} Profile Versions</h3>
          <span class="glm-right">
@@@ -112,8 -89,8 +88,8 @@@
                  <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>
 -    </p> 
 +    </p>
- 
+     <br clear="all">
      <table class="wp-list-table striped glm-admin-table">
          <thead>
              <tr>