added buttons and tabs for events menu not associated with a member

diff --git a/models/admin/events/index.php b/models/admin/events/index.php
index e33a297..ebe7266 100644 (file)
--- a/models/admin/events/index.php
+++ b/models/admin/events/index.php
@@ -111,45 +111,57 @@ class GlmMembersAdmin_events_index // extends GlmDataContacts
             'displayData' => $displayData
         );
 
-        // Return status, any suggested view, and any data to controller
-        return array(
-                'status' => true,
-                'modelRedirect' => false,
-                'view' => 'admin/events/index.html',
-                'data' => $templateData
-        );
-        
+//        // Return status, any suggested view, and any data to controller
+//        return array(
+//                'status' => true,
+//                'modelRedirect' => false,
+//                'view' => 'admin/events/index.html',
+//                'data' => $templateData
+//        );
+//        
           // Check for required Categories
-        require_once(GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataCategories.php');
-        $Categories = new GlmDataCategories($this->wpdb, $this->config);
+        require_once(GLM_MEMBERS_EVENTS_PLUGIN_CLASS_PATH.'/data/dataCategories.php');
+        $Categories = new GlmDataEventsCategories($this->wpdb, $this->config);
         $categoriesStats = $Categories->getStats();
         $haveCategories = ($categoriesStats > 0);
-        
-          // Check for required Event Categories
-        require_once(GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataEventCategories.php');
+//        
+//          // Check for required Event Categories
+        require_once(GLM_MEMBERS_EVENTS_PLUGIN_CLASS_PATH.'/data/dataEventCategories.php');
         $eventCategories = new GlmDataEventsEventCategories($this->wpdb, $this->config);
         $eventCategoriesStats = $eventCategories->getStats();
         $eventHaveCategories = ($eventCategoriesStats > 0);
-        
-        require_once(GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataEvents.php');
+//        
+        require_once(GLM_MEMBERS_EVENTS_PLUGIN_CLASS_PATH.'/data/dataEvents.php');
         $Events = new GlmDataEvents($this->wpdb, $this->config);
         $eventsStats = $Events->getStats();
         $haveEvents = ($eventsStats > 0);
         
-        require_once(GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataLocations.php');
+        require_once(GLM_MEMBERS_EVENTS_PLUGIN_CLASS_PATH.'/data/dataLocations.php');
         $Locations = new GlmDataEventsLocations($this->wpdb, $this->config);
         $locationsStats = $Locations->getStats();
         $haveLocations = ($locationsStats > 0);
         
-        require_once(GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/Recurrences.php');
+        require_once(GLM_MEMBERS_EVENTS_PLUGIN_CLASS_PATH.'/data/dataRecurrences.php');
         $Recurrences = new GlmDataEventsRecurrences($this->wpdb, $this->config);
         $recurrencesStats = $Recurrences->getStats();
         $haveRecurrences = ($recurrencesStats > 0);
         
-        require_once(GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/Times.php');
+        require_once(GLM_MEMBERS_EVENTS_PLUGIN_CLASS_PATH.'/data/dataTimes.php');
         $Times = new GlmDataEventsTimes($this->wpdb, $this->config);
         $timesStats = $Times->getStats();
         $haveTimes = ($timesStats > 0);
+        
+          // Compile template data
+        $templateData = array(
+            'displayData' => $displayData
+        );
+             // Return status, any suggested view, and any data to controller
+        return array(
+                'status' => true,
+                'modelRedirect' => false,
+                'view' => 'admin/events/index.html',
+                'data' => $templateData
+        );
 
     }
 

diff --git a/setup/validActions.php b/setup/validActions.php
index 2419db7..be5cd48 100644 (file)
--- a/setup/validActions.php
+++ b/setup/validActions.php
@@ -41,7 +41,6 @@ $glmMembersEventsAddOnValidActions = array(
         ),
         'events' => array(
             'index' => GLM_MEMBERS_EVENTS_PLUGIN_SLUG,
-            'more' => GLM_MEMBERS_EVENTS_PLUGIN_SLUG,
             'add' => GLM_MEMBERS_EVENTS_PLUGIN_SLUG,
             'categories' => GLM_MEMBERS_EVENTS_PLUGIN_SLUG
         ),

diff --git a/views/admin/events/add.html b/views/admin/events/add.html
index f8ac4d3..c96c91b 100644 (file)
--- a/views/admin/events/add.html
+++ b/views/admin/events/add.html
@@ -1,5 +1,4 @@
 {include file='admin/events/header.html'}
-<div> {$memberID} </div>
                <a id="dateTimeLink" href="#"> Event Details </a>
                     <div id="dateTime">
                        <form action="{$thisURL}?page={$thisPage}&glm_action=add" method="post" enctype="multipart/form-data">

diff --git a/views/admin/events/categories.html b/views/admin/events/categories.html
index c627c24..81113cf 100644 (file)
--- a/views/admin/events/categories.html
+++ b/views/admin/events/categories.html
@@ -1,16 +1,16 @@
-<!DOCTYPE html>
-<!--
-To change this license header, choose License Headers in Project Properties.
-To change this template file, choose Tools | Templates
-and open the template in the editor.
--->
-<html>
-    <head>
-        <title>TODO supply a title</title>
-        <meta charset="UTF-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    </head>
-    <body>
-        <div>TODO write content</div>
-    </body>
-</html>
+{include file='admin/events/header.html'}
+<div class="wrap">
+    <div id="glm-admin-content-container">
+        <div class="topic-row">
+       <form action="" method="post">
+       <table>
+               <tbody><tr>
+                       <td>Add New Category:</td>
+                       <td><input name="topic" value=""></td>
+                       <td><input name="Action" value="Add Topic" type="hidden"><input value="Create Category" type="submit"></td>
+               </tr>
+       </tbody></table>
+       </form>
+       </div>
+    </div>
+</div>
\ No newline at end of file

diff --git a/views/admin/events/header.html b/views/admin/events/header.html
index b400e92..acff8b2 100644 (file)
--- a/views/admin/events/header.html
+++ b/views/admin/events/header.html
@@ -1,6 +1,8 @@
 
     <h2 class="nav-tab-wrapper">
-        <a href="{$thisURL}?page={$thisPage}&glm_action=events&member={$memberID}" class="nav-tab{if $thisAction==events} nav-tab-active{/if}">Events</a>
+        <a href="{$thisURL}?page={$thisPage}&glm_action=index" class="nav-tab{if $thisAction==index} nav-tab-active{/if}">All Events</a>
+        <a href="{$thisURL}?page={$thisPage}&glm_action=add" class="nav-tab{if $thisAction==add} nav-tab-active{/if}">Add Event</a>
+        <a href="{$thisURL}?page={$thisPage}&glm_action=categories" class="nav-tab{if $thisAction==categories} nav-tab-active{/if}">Event Categories</a>
 
     </h2>
     <div id="glm-admin-content-container">

diff --git a/views/admin/events/index.html b/views/admin/events/index.html
index e18433a..10aa376 100644 (file)
--- a/views/admin/events/index.html
+++ b/views/admin/events/index.html
@@ -1,8 +1,20 @@
 {include file='admin/events/header.html'}
 <div class="wrap">
     <div id="glm-admin-content-container">
-        <h3>Events Model</h3>
-        <p>{$displayData}</p>
-        <a href="{$thisURL}?page={$thisPage}&glm_action=more">Click me to see more!</a>
+       <input class="button button-primary glm-button glm-right" type="button" value="Pending Events">
+        <input class="button button-primary glm-button glm-right" type="button" value="Archived Events">
+        
+  <table class="wp-list-table striped glm-admin-table">
+        <thead>
+            <tr>
+                <th>Event Title</th>
+                <th>Category</th>
+                <th>Times</th>
+                <th>Days</th>
+                <th>Start Date</th>
+                <th>End Date</th>
+                <th>&nbsp;</th>
+            </tr>
+        </thead>
     </div>
 </div>

diff --git a/views/admin/member/add.html b/views/admin/member/add.html
index a7167b8..59c147a 100644 (file)
--- a/views/admin/member/add.html
+++ b/views/admin/member/add.html
@@ -1,6 +1,6 @@
 
 
-{include file='admin/events/header.html'}
+{include file='admin/member/header.html'}
    
                <a id="dateTimeLink" href="#"> Event Details </a>
                     <div id="dateTime">

diff --git a/views/admin/member/categories.html b/views/admin/member/categories.html
index 3a404ff..82d9067 100644 (file)
--- a/views/admin/member/categories.html
+++ b/views/admin/member/categories.html
@@ -1,8 +1,18 @@
 {include file='admin/events/header.html'}
+<div class="wrap">
+    <div id="glm-admin-content-container">
+        <div class="topic-row">
+       <form action="" method="post">
+       <table>
+               <tbody><tr>
+                       <td>Add New Category:</td>
+                       <td><input name="topic" value=""></td>
+                       <td><input name="Action" value="Add Topic" type="hidden"><input value="Create Category" type="submit"></td>
+               </tr>
+       </tbody></table>
+       </form>
+       </div>
+    </div>
+</div>
 
-
-
-
- 
-        <div>TODO write content</div>
    

diff --git a/views/admin/member/events.html b/views/admin/member/events.html
index 9939a4e..f23c370 100644 (file)
--- a/views/admin/member/events.html
+++ b/views/admin/member/events.html
@@ -3,9 +3,12 @@
     <h2 class="nav-tab-wrapper">
         <a href="{$thisURL}?page={$thisPage}&glm_action=add&member={$memberID}" class="nav-tab{if $thisAction==add} nav-tab-active{/if}">Add Event</a>
         <a href="{$thisURL}?page={$thisPage}&glm_action=categories&member={$memberID}" class="nav-tab{if $thisAction==categories} nav-tab-active{/if}">Event Categories</a>
-        
     </h2>
-<h2> Events </h2>
+<div class="wrap">
+    <div id="glm-admin-content-container">
+      <input class="button button-primary glm-button glm-right" type="button" value="Pending Events">
+      <input class="button button-primary glm-button glm-right" type="button" value="Archived Events">
+      <h2> Events </h2>
   <table class="wp-list-table striped glm-admin-table">
         <thead>
             <tr>
@@ -18,7 +21,10 @@
                 <th>&nbsp;</th>
             </tr>
         </thead>
-    
+    </div>
+</div>
+
+
           
  
 

diff --git a/views/admin/member/header.html b/views/admin/member/header.html
new file mode 100644 (file)
index 0000000..b400e92
--- /dev/null
+++ b/views/admin/member/header.html
@@ -0,0 +1,8 @@
+
+    <h2 class="nav-tab-wrapper">
+        <a href="{$thisURL}?page={$thisPage}&glm_action=events&member={$memberID}" class="nav-tab{if $thisAction==events} nav-tab-active{/if}">Events</a>
+
+    </h2>
+    <div id="glm-admin-content-container">
+    
+    
\ No newline at end of file