Now using member terms

diff --git a/classes/data/dataRecurrences.php b/classes/data/dataRecurrences.php
index b190c6f..0ea6051 100644 (file)
--- a/classes/data/dataRecurrences.php
+++ b/classes/data/dataRecurrences.php
@@ -142,7 +142,7 @@ class GlmDataEventsRecurrences extends GlmDataAbstract
                 'field' => 'start_time',
                 'type' => 'time',
                 'time_format' => 'h:i a',
-                'default' => '09:00',
+                'default' => '09:00 AM',
                 'required' => true,
                 'use' => 'a'
             ),
@@ -168,7 +168,7 @@ class GlmDataEventsRecurrences extends GlmDataAbstract
                 'field' => 'end_time',
                 'type' => 'time',
                 'time_format' => 'h:i a',
-                'default' => '17:00',
+                'default' => '05:00 PM',
                 'use' => 'a'
             ),
 
@@ -218,7 +218,7 @@ class GlmDataEventsRecurrences extends GlmDataAbstract
                     'field'    => 'week_of_month',
                     'type'     => 'bitmap',
                     'bitmap'    => $this->config['week'],
-                    'default'  => 4095, // no weeks selected
+                    'default'  => 63, // no weeks selected
                     'use'      => 'a'
             ),
 
@@ -227,7 +227,7 @@ class GlmDataEventsRecurrences extends GlmDataAbstract
                     'field'    => 'day_of_week',
                     'type'     => 'bitmap',
                     'bitmap'    => $this->config['day'],
-                    'default'  => 4095, // no days selected
+                    'default'  => 127, // no days selected
                     'use'      => 'a'
             ),
 
@@ -384,11 +384,11 @@ class GlmDataEventsRecurrences extends GlmDataAbstract
         $to->modify('+1 day');
 
         // Calculate interval for single event - If start time only, then start and end are the same
-        $start = new DateTime($recurData['from_date']['date'].$recurData['start_time']['time']);
+        $start = new DateTime($recurData['from_date']['date']." ".$recurData['start_time']['time']);
         if ($recurData['start_time_only']['value']) {
-            $end = new DateTime($recurData['from_date']['date'].$recurData['start_time']['time']);
+            $end = new DateTime($recurData['from_date']['date']." ".$recurData['start_time']['time']);
         } else {
-            $end = new DateTime($recurData['from_date']['date'].$recurData['end_time']['time']);
+            $end = new DateTime($recurData['from_date']['date']." ".$recurData['end_time']['time']);
         }
         $length = $start->diff($end);
 

diff --git a/defines.php b/defines.php
index 6a4874c..49556a5 100644 (file)
--- a/defines.php
+++ b/defines.php
@@ -52,6 +52,6 @@ define('GLM_MEMBERS_EVENTS_PLUGIN_CONFIG_PATH', GLM_MEMBERS_EVENTS_PLUGIN_PATH.'
 
 // Parameters related to the Main GLM Member DB plugin - Depending on what's going on these may already defined by the main plugin
 $pluginsPath = str_replace(GLM_MEMBERS_EVENTS_PLUGIN_SLUG, '', GLM_MEMBERS_EVENTS_PLUGIN_PATH);
-define('GLM_MEMBERS_EVENTS_MAIN_PLUGIN_PATH', $pluginsPath.'/glm-member-db');
+define('GLM_MEMBERS_EVENTS_MAIN_PLUGIN_PATH', $pluginsPath.'glm-member-db');
 define('GLM_MEMBERS_EVENTS_PLUGIN_LIB_PATH', GLM_MEMBERS_EVENTS_MAIN_PLUGIN_PATH.'/lib');
 

diff --git a/views/admin/events/editLocation.html b/views/admin/events/editLocation.html
index d7d97b0..3ce1110 100644 (file)
--- a/views/admin/events/editLocation.html
+++ b/views/admin/events/editLocation.html
@@ -36,11 +36,11 @@
         <td>
             <table>
                 <tr>
-                    <th>Use Member location:</th>
+                    <th>Use {$terms.term_member_cap} location:</th>
                     <td>
                         <input id="useMemberLocationCheckbox" type="checkbox" name="use_member_location" {if $event.fieldData.use_member_location.value} checked{/if}>
-                        <span id="useMemberMessage">Uses location data from the selected member rather than location data from here.</span>
-                        <span id="notUseMemberMessage" class="glm-hidden">(To use member information instead of this location data, select a member for the event in the "Event Desription" tab.)</span>
+                        <span id="useMemberMessage">Uses location data from the selected {$terms.term_member} rather than location data from here.</span>
+                        <span id="notUseMemberMessage" class="glm-hidden">(To use {$terms.term_member} information instead of this location data, select a {$terms.term_member} for the event in the "Event Desription" tab.)</span>
                     </td>
                 </tr>
             </table>

diff --git a/views/admin/events/editStatus.html b/views/admin/events/editStatus.html
index a7ca88d..b5e19ce 100644 (file)
--- a/views/admin/events/editStatus.html
+++ b/views/admin/events/editStatus.html
@@ -10,7 +10,7 @@
             </td>
         </tr>
         <tr>
-            <th>Member:</th>
+            <th>{$terms.term_member_cap}:</th>
             <td>
         {if $haveMember}
                 {$memberData.member_name}

diff --git a/views/admin/events/list.html b/views/admin/events/list.html
index 0f6abab..96ced71 100644 (file)
--- a/views/admin/events/list.html
+++ b/views/admin/events/list.html
@@ -61,7 +61,7 @@
                 <tr>
                     <th>ID</th>
                     <th>Event Name</th>
-                    <th>Member</th>
+                    <th>{$terms.term_member_cap}</th>
                     <th>Status</th>
                     <th>First Date</th>
                     <th>Last Date</th>