Added 'members' menu item back momentarily, removed members/index.php test code

diff --git a/models/admin/members/index.php b/models/admin/members/index.php
index dd59218..5e83c63 100644 (file)
--- a/models/admin/members/index.php
+++ b/models/admin/members/index.php
@@ -166,14 +166,6 @@ class GlmMembersAdmin_members_index extends GlmDataMembers
             $pendingList = $MemberInfo->getSimpleMemberInfoList('status = '.$this->config['status_numb']['Pending']);
         }
         
-        // In case we want to treat the widget data before sending it to the viewfile.
-        // May be able to avoid sending the (huge) Config array to the view
-        echo "IN THE WRONG FILE";
-        foreach ( $this->config[ 'addOns' ] as $a ) {
-                //$widgetData[] = apply_filters($a['slug'] . "-dashboard-widget");
-                $widgetData[] = $a['slug'];
-        }
-
         // Compile template data
         $templateData = array(
             'enable_members'  => $enable_members,
@@ -190,7 +182,6 @@ class GlmMembersAdmin_members_index extends GlmDataMembers
             'haveRegions'     => $haveRegions,
             'haveCities'      => $haveCities,
             'pendingList'     => $pendingList,
-            'widgetData'      => $widgetData,
         );
 
         // Return status, suggested view, and data to controller

diff --git a/models/admin/newDashboard/index.php b/models/admin/newDashboard/index.php
index 8c5b7b6..852b24c 100644 (file)
--- a/models/admin/newDashboard/index.php
+++ b/models/admin/newDashboard/index.php
@@ -180,7 +180,7 @@ class GlmMembersAdmin_newDashboard_index extends GlmDataMembers
         // May be able to avoid sending the (huge) Config array to the view
         foreach ( $this->config[ 'addOns' ] as $a ) {
             if ( has_filter( $a['slug'] . "-dashboard-widget") ) {
-                $widgetData[] = apply_filters($a['slug'] . "-dashboard-widget");
+                $widgetData[] = apply_filters($a['slug'] . "-dashboard-widget", "");
             } else {
                 echo "<br>" . $a['slug'] .  " has no filter called " . $a['slug'] . "-dashboard-widget";
                 //$widgetData[] = $a['slug'];

diff --git a/setup/adminMenus.php b/setup/adminMenus.php
index 1705956..171381c 100644 (file)
--- a/setup/adminMenus.php
+++ b/setup/adminMenus.php
@@ -53,20 +53,32 @@ if (current_user_can('glm_members_members')) {
         add_submenu_page(
             'glm-members-admin-menu-dashboard',
             $this->config['terms']['term_admin_menu_member_list'],
-            Dashboard,
+            'Dashboard',
             'glm_members_main_menu',
             'glm-members-admin-menu-dashboard',
             function() {$this->controller('newDashboard', 'index');}
         );
 
+        // Commented on 2018-9-19 by Laury on account of:
+        //   we are no longer using the list page and a link to it is no longer necessary
         // Add a sub-submenu for the "Member" "List" page
+        // add_submenu_page(
+        //     'glm-members-admin-menu-dashboard',
+        //     $this->config['terms']['term_admin_menu_member_list'],
+        //     '    List',
+        //     'glm_members_main_menu',
+        //     'glm-members-admin-menu-dashboard-list',
+        //     function() {$this->controller('members', 'list');}
+        // );
+
+        // Add a submenu for the "Members" section
         add_submenu_page(
-            'glm-members-admin-menu-dashboard',
-            $this->config['terms']['term_admin_menu_member_list'],
-            '    List',
-            'glm_members_main_menu',
-            'glm-members-admin-menu-dashboard-list',
-            function() {$this->controller('members', 'list');}
+            $mainMenuSlug,
+            $this->config['terms']['term_admin_menu_members'].' Members',
+            $this->config['terms']['term_admin_menu_members'],
+            'glm_members_member',
+            'glm-members-admin-menu-members',
+            function() {$this->controller('members', 'index');}
         );
 
         // Add a submenu for the "Member" section
@@ -80,7 +92,7 @@ if (current_user_can('glm_members_members')) {
         );
     } else {
         add_menu_page(
-            Dashboard,
+            'Dashboard',
             'GLM Associate',
             'glm_members_main_menu',
             'glm-members-admin-menu-dashboard',

diff --git a/views/admin/newDashboard/index.html b/views/admin/newDashboard/index.html
index 75723cd..1c7caca 100644 (file)
--- a/views/admin/newDashboard/index.html
+++ b/views/admin/newDashboard/index.html
@@ -1,4 +1,4 @@
-{include file='admin/members/header.html'}
+{include file='./header.html'}
 <div class="glm-summary-widgets-wrapper">
     <h2>GLM Associate Dashboard</h2>
     <div class="glm-summary-widgets-container">