From: Chuck Scott Date: Wed, 2 Mar 2016 14:52:10 +0000 (-0500) Subject: Merge remote-tracking branch 'origin/feature/anthony' into feature/EventsIntegration X-Git-Tag: v1.0.0^2~170^2~4^2~2 X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=61a19972c35456946b2fc91799dd1e3e7ce09bff;p=WP-Plugins%2Fglm-member-db-events.git Merge remote-tracking branch 'origin/feature/anthony' into feature/EventsIntegration Conflicts: views/admin/events/header.html views/admin/events/index.html views/admin/member/events.html --- 61a19972c35456946b2fc91799dd1e3e7ce09bff diff --cc views/admin/events/header.html index 07b5af5,acff8b2..2ff3cdc --- a/views/admin/events/header.html +++ b/views/admin/events/header.html @@@ -1,11 -1,10 +1,9 @@@ -
-

All Members

+

- All Events - - {foreach $addOnTabs as $a} - {$a.text} - {/foreach} + All Events + Add Event + Event Categories -

+ diff --cc views/admin/member/events.html index 765af97,f23c370..b0d054a --- a/views/admin/member/events.html +++ b/views/admin/member/events.html @@@ -1,21 -1,30 +1,25 @@@ - - - - - TODO supply a title - - - - -
TODO write content
-
- - - -
Update
- - + {include file='admin/members/header.html'} + +

+ Add Event + Event Categories +

+
+
+ + +

Events

+ + + + + + + + + + + + + + - - - - -
Event TitleCategoryTimesDaysStart DateEnd Date