projects / WP-Plugins / glm-member-db-events.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 01fa16c c63d55b)
Merge remote-tracking branch 'origin/feature/anthony' into feature/EventsIntegration
authorChuck Scott <cscott@gaslightmedia.com>
Wed, 2 Mar 2016 14:52:10 +0000 (09:52 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Wed, 2 Mar 2016 14:52:10 +0000 (09:52 -0500)
Conflicts:
views/admin/events/header.html
views/admin/events/index.html
views/admin/member/events.html

1  2 
setup/validActions.php patch | diff1 | diff2 | blob | history
views/admin/events/header.html patch | diff1 | diff2 | blob | history
views/admin/member/events.html patch | diff1 | diff2 | blob | history

diff --cc setup/validActions.php
Simple merge
diff --cc views/admin/events/header.html
index 07b5af5,acff8b2..2ff3cdc
--- 1/views/admin/events/header.html
--- 2/views/admin/events/header.html
+++ b/views/admin/events/header.html
@@@ -1,11 -1,10 +1,9 @@@
- <div class="wrap">
-     <h2>All Members</h2>
+ 
      <h2 class="nav-tab-wrapper">
-         <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==list} nav-tab-active{/if}">Add Event</a>-->
- {foreach $addOnTabs as $a}
-         <a href="{$thisUrl}?page=glm-members-admin-menu-members-{$a.menu}&glm_action={$a.action}" class="nav-tab{if $thisAction==$a.action} nav-tab-active{/if}">{$a.text}</a>
- {/foreach}        
+         <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 --cc views/admin/member/events.html
index 765af97,f23c370..b0d054a
--- 1/views/admin/member/events.html
--- 2/views/admin/member/events.html
+++ b/views/admin/member/events.html
@@@ -1,21 -1,30 +1,25 @@@
- <!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>
-            <form action="{$thisUrl}?page={$thisPage}" method="post" enctype="multipart/form-data">
-                <input type='text' name='title'>
-             <input type="submit" class="button glm-button submit" value="submit">
-             <input type="hidden" name="option" value="submit">
-             <div class="button glm-button right">Update</div> </form>
-     </body>
- </html>
+ {include file='admin/members/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">
+       <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>
+                 <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>
 -
 -
 -          
 - 
 -