Removed test data array that was conflicting with real data.

diff --git a/models/admin/events/list.php b/models/admin/events/list.php
index 535c2e3..083a813 100644 (file)
--- a/models/admin/events/list.php
+++ b/models/admin/events/list.php
@@ -141,36 +141,6 @@ class GlmMembersAdmin_events_list extends GlmDataEvents
 
         }
 
-        /*
-         * PLACE TEMPORARY TEST DATA FOR CALENDARS HERE
-         */
-        $haveTimes = true;
-        $times = array(
-            /*
-             * Place temp data here. It doesn't matter how you structure it.
-             * We can change the actual parameters in the calendar.html file
-             * later to match the actual data from the database.
-             */
-            '1' => array(
-                'id' => 1,
-                'event' => 1,
-                'custom_event' => false,
-                'recur_id' => 1,
-                'active' => true,
-                'start_time' => array(
-                    'timestamp' => 123123123,
-                    'datetime' => '4/1/2015 17:00'
-                ),
-                'end_time' => array(
-                    'timestamp' => 123123234,
-                    'datetime' => '4/1/2015 122:00'
-                ),
-                'all_day' => false
-            )
-        );
-
-
-
         // Do selected option
         switch ($option) {
 

diff --git a/views/admin/events/calendar.html b/views/admin/events/calendar.html
deleted file mode 100644 (file)
index 929bae8..0000000
--- a/views/admin/events/calendar.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<!-- 
-
-    Calendar view for Edit Event
-    
-    This file is included from inside a table <td> in the views/admin/events/edit.html file.
-     
--->
-
-<div id="eventCalendar">calendar goes here</div>
-
-<script type="text/javascript">
-
-    $(document).ready(function() {
-    
-        /*
-         * Edit area tabs
-         */
-        $('.glm-event-tab').click( function() {
-
-            // Show selected table
-            var table = $(this).attr('data-show-table');
-
-            if (table == 'glm-table-calendar') {
-                alert(1);
-            }
-            
-        });
-
-        $('#eventCalendar').fullCalendar({
-            // put your options and callbacks here
-        })
-
-    });
-    
-</script>
\ No newline at end of file

diff --git a/views/admin/events/edit.html b/views/admin/events/edit.html
index 22c78c6..21642d1 100644 (file)
--- a/views/admin/events/edit.html
+++ b/views/admin/events/edit.html
@@ -629,7 +629,7 @@
             {/foreach}
         {/if}
                         ],
-                        defaultDate : '{$lastTime.start_time.datetime}'
+                        defaultDate : '{$firstTime.start_time.datetime}'
                     });
                     fullCalendarLoaded = true;
                 }