From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Fri, 19 Apr 2019 20:40:08 +0000 (-0400)
Subject: moving member related data out of the profile list view into a separate member header
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=6a8b41e87e02e13d24076925f86733e05e56947a;p=WP-Plugins%2Fglm-member-db.git

moving member related data out of the profile list view into a separate member header
---

diff --git a/index.php b/index.php
index 3edb0a79..352d1999 100755
--- a/index.php
+++ b/index.php
@@ -934,5 +934,4 @@ if (!$timestamp) {
 
 if (GLM_MEMBERS_PLUGIN_DEBUG_VERBOSE) {
     trigger_error("GLM Associate Index End: ".glmAssociateMemoryUsage()." - Start glm-member-db setup",E_USER_NOTICE);
-}
-
+}
\ No newline at end of file
diff --git a/setup/routes.php b/setup/routes.php
index a40f325c..ff131e1f 100644
--- a/setup/routes.php
+++ b/setup/routes.php
@@ -22,7 +22,7 @@ require_once GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/settings/dataSettingsGeneral.p
  * Documentation for Wordpress API and adding custom endpoints.
  * https://developer.wordpress.org/rest-api/extending-the-rest-api/adding-custom-endpoints/
  */
-class glmAssoc_Controller_Contacts
+class glmAssoc_Controller_Members
 {
     /**
      * __construct
@@ -71,9 +71,11 @@ class glmAssoc_Controller_Contacts
                         return rest_ensure_response( $settings );
                     },
                     'permission_callback' => function(){ // can require capability for this rest endpoint.
-                        if ( ! current_user_can( 'glm_members_members' ) ) {
-                            return new WP_Error( 'rest_forbidden', esc_html__( 'You cannot view the post resource.' ), array( 'status' => $this->authorization_status_code() ) );
-                        }
+                        // echo current_user_can( 'glm_members_members' );
+      
+                        // if ( ! current_user_can( 'glm_members_members' ) ) {
+                        //     return new WP_Error( 'rest_forbidden', esc_html__( 'You cannot view the post resource.' ), array( 'status' => $this->authorization_status_code() ) );
+                        // }
                         return true;
                     },
                 )
@@ -100,7 +102,7 @@ class glmAssoc_Controller_Contacts
 add_action(
     'rest_api_init',
     function(){
-        $controller = new glmAssoc_Controller_Contacts( $this->wpdb, $this->config );
+        $controller = new glmAssoc_Controller_Members( $this->wpdb, $this->config );
         $controller->register_routes();
     }
 );
diff --git a/views/admin/member/header.html b/views/admin/member/header.html
index 272ff7a8..2d83c1bb 100644
--- a/views/admin/member/header.html
+++ b/views/admin/member/header.html
@@ -21,15 +21,16 @@
     {if $haveMember}
       <h2 class="nav-tab-wrapper">
           <a href="{$thisUrl}?page={$thisPage}&member={$memberID}" class="nav-tab{if $thisAction==index || $thisAction==memberEdit || $thisAction==memberInfo} nav-tab-active{/if} glm-admin-member-dashboard" data-memberID="{$memberID}" data-glmevent="click" data-route="manage"  data-overlay="profile">Profiles</a>
-  {if $memberID}
+        {if $memberID}
       
-    {foreach $addOnTabs as $a}
+            {foreach $addOnTabs as $a}
     
-          <a data-addonAction="{$a.action}" data-glmevent="click" data-route="addon"  data-overlay="profile" data-addonMember="{$memberID}" href="{$thisUrl}?page={$thisPage}&glm_action={$a.action}{if isset($a.option)}&option={$a.option}{/if}&member={$memberID} glm-admin-profile-addon-tab" class="nav-tab{if $thisAction==$a.action} nav-tab-active{/if}">{$a.text}</a>
+                <a data-addonAction="{$a.action}" data-glmevent="click" data-route="addon"  data-overlay="profile" data-addonMember="{$memberID}" href="{$thisUrl}?page={$thisPage}&glm_action={$a.action}{if isset($a.option)}&option={$a.option}{/if}&member={$memberID} glm-admin-profile-addon-tab" class="nav-tab{if $thisAction==$a.action} nav-tab-active{/if}">{$a.text}</a>
 
-    {/foreach}
-  {/if}
+            {/foreach}
+        {/if}
 
-    </h2>
+        </h2>
+        {include file='admin/member/memberData.html'}
     {/if}
     
\ No newline at end of file
diff --git a/views/admin/member/index.html b/views/admin/member/index.html
index 80eb1db7..03fc3b6b 100644
--- a/views/admin/member/index.html
+++ b/views/admin/member/index.html
@@ -90,11 +90,7 @@
                     </div>
                 </div>
             </div>
-            {if apply_filters('glm_members_menu_members', true)}
-            <div class="glm-small-4 glm-right">
-                <a id="glm-edit-member-status" 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>
diff --git a/views/admin/member/memberData.html b/views/admin/member/memberData.html
new file mode 100644
index 00000000..f6e7df29
--- /dev/null
+++ b/views/admin/member/memberData.html
@@ -0,0 +1,28 @@
+<div id="glma-member-data" class="flex">
+    <!-- <pre>{ $member|@print_r}</pre> -->
+    <div>{$member.fieldData.name}</div>
+    <div>{$member.fieldData.member_type.name}</div>
+    <div>{$member.fieldData.created.date}</div>
+    <div class="{if $lockedToMember && !$settings.enable_member_reports} glm-hidden{/if}">
+        <div>
+            URL CLick Counts
+        </div>
+        <div class="glm-small-12 glm-column">
+            today{$clickThroughCounts.day}<a data-type="daysClicks" class="dialog-button" href=""><img src="{$assetsUrl}/graph.png"></a>
+        </div>
+    </div>
+    <div class="{if $lockedToMember && !$settings.enable_member_reports} glm-hidden{/if}">
+        <div>
+            Detail Page View Counts
+        </div>
+        <div>
+            Today:{$detailViewCounts.day}&nbsp;&nbsp;&nbsp;<a data-type="daysViews" class="dialog-button" href=""><img src="{$assetsUrl}/graph.png"></a>
+        </div>
+    </div>
+    <div>{if $member.fieldData.featured.value} Featured {/if}</div>
+    {if apply_filters('glm_members_menu_members', true)}
+
+        <a id="glm-edit-member-status" 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>
+
+    {/if}
+</div>
\ No newline at end of file