adjusting tabs for member add events and categories

diff --git a/models/admin/events/add.php b/models/admin/events/add.php
index 8100855..eccb64d 100644 (file)
--- a/models/admin/events/add.php
+++ b/models/admin/events/add.php
@@ -105,9 +105,20 @@ class GlmMembersAdmin_events_add extends GlmDataEvents
     {
 
         $displayData = 'Welcome to more information!<br>This is the Events Add-On "events" model with action "more" talking to you from inside WordPress.';
+        $eventsArray = array_filter($_REQUEST, function($k) {
+            return preg_match('/^events_/',$k);
+        }, ARRAY_FILTER_USE_KEY);
+        echo "<hr />EventsArray:<table>";
+        echo "<pre>";print_r($eventsArray,true);echo "</pre>";
+        foreach($eventsArray as $key=>$value) {
+            echo("<tr><td>$key</td><td>$value</td></tr>");
+            
+        }
+        echo "</table><hr />";
+        
          $option = $_REQUEST['option'];
          if($option == 'submit'){
-            if (isset($_REQUEST['events_name'])) {
+            if (isset($_REQUEST['events_name']) && $_REQUEST['events_name'] != '') {
             $title = trim(filter_var($_REQUEST['events_name'],FILTER_SANITIZE_STRING));
             
             // sql query
@@ -119,8 +130,6 @@ class GlmMembersAdmin_events_add extends GlmDataEvents
                $this->wpdb->query($sql);
             }
         }
-        echo $title;
-        echo $option;
         // Compile template data
         $templateData = array(
             'displayData' => $displayData

diff --git a/models/admin/events/index.php b/models/admin/events/index.php
index 073ceea..5205998 100644 (file)
--- a/models/admin/events/index.php
+++ b/models/admin/events/index.php
@@ -106,11 +106,6 @@ class GlmMembersAdmin_events_index extends GlmDataEvents
 
         $displayData = 'Hello, World! This is the Events Add-On "events" model talking to you from inside WordPress.';
 
-        // Compile template data
-        $templateData = array(
-            'displayData' => $displayData
-        );
-
 //        // Return status, any suggested view, and any data to controller
 //        return array(
 //                'status' => true,
@@ -142,7 +137,7 @@ class GlmMembersAdmin_events_index extends GlmDataEvents
         $Times = new GlmDataEventsTimes($this->wpdb, $this->config);
         $timesStats = $Times->getStats();
         $haveTimes = ($timesStats > 0);
-        
+       
         
         
         $eventEntries = new GlmDataEvents($this->wpdb, $this->config);

diff --git a/models/admin/member/events.php b/models/admin/member/events.php
index 9f82e35..f140a14 100644 (file)
--- a/models/admin/member/events.php
+++ b/models/admin/member/events.php
@@ -129,12 +129,12 @@ class GlmMembersAdmin_member_events extends GlmDataEvents
             echo("<tr><td>$key</td><td>$value</td></tr>");
         }
         echo "</table>";
-        $socialarray = array_filter($_REQUEST, function($k) {
+        $eventsArray = array_filter($_REQUEST, function($k) {
             return preg_match('/^events_/',$k);
         }, ARRAY_FILTER_USE_KEY);
         echo "<hr />EventsArray:<table>";
-        echo "<pre>";print_r($socialarray,true);echo "</pre>";
-        foreach($socialarray as $key=>$value) {
+        echo "<pre>";print_r($eventsArray,true);echo "</pre>";
+        foreach($eventsArray as $key=>$value) {
             echo("<tr><td>$key</td><td>$value</td></tr>");
         }
         echo "</table><hr />";

diff --git a/views/admin/events/add.html b/views/admin/events/add.html
index c96c91b..15a0478 100644 (file)
--- a/views/admin/events/add.html
+++ b/views/admin/events/add.html
@@ -10,7 +10,7 @@
                             <input name="events_allDay" type="checkbox"> 
                             <p> Active?</p>
                             <input name="events_active" type="checkbox"> 
-                            <select name="events_category" id="category"> 
+                            <select name="events_partner" id="partner"> 
                                 <option> Partner </option></select>
                             <p> Start Date</p>
                             <input name="events_startDate" id="startDate" type="text">

diff --git a/views/admin/events/categories.html b/views/admin/events/categories.html
index 41ae139..4fb15a7 100644 (file)
--- a/views/admin/events/categories.html
+++ b/views/admin/events/categories.html
@@ -10,12 +10,13 @@
                        <td><input name="topic" value=""></td>
                        <td><input name="Action" value="Add Topic" type="hidden"><input value="Create Category" type="submit"></td>
                     </tr>
-                    <tr>
+                   
                         {foreach from=$categoryNames key=k item=category}
+                        <tr>
                         <td><input class="catField" type="text" value="{$category}"></td>
-                          
+                        </tr>
                         {/foreach}
-                    </tr>
+                 
                 </tbody>
             </table>
        </form>

diff --git a/views/admin/member/add.html b/views/admin/member/add.html
index 59c147a..f755ca9 100644 (file)
--- a/views/admin/member/add.html
+++ b/views/admin/member/add.html
@@ -1,7 +1,8 @@
-
-
 {include file='admin/member/header.html'}
-   
+   <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>
                <a id="dateTimeLink" href="#"> Event Details </a>
                     <div id="dateTime">
                        <form action="{$thisURL}?page={$thisPage}&glm_action=add&member={$memberID}" method="post" enctype="multipart/form-data">

diff --git a/views/admin/member/categories.html b/views/admin/member/categories.html
index aaab5e5..e5cdb9c 100644 (file)
--- a/views/admin/member/categories.html
+++ b/views/admin/member/categories.html
@@ -1,4 +1,8 @@
-{include file='admin/events/header.html'}
+{include file='admin/member/header.html'}
+<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>
 <div class="wrap">
     <div id="glm-admin-content-container">
         <div class="topic-row">

diff --git a/views/admin/member/header.html b/views/admin/member/header.html
index b400e92..ced3853 100644 (file)
--- a/views/admin/member/header.html
+++ b/views/admin/member/header.html
@@ -1,7 +1,6 @@
 
     <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">