From 1d0a63c0faa986884378bb7eb991d14dfe5c637f Mon Sep 17 00:00:00 2001 From: Chuck Scott Date: Thu, 7 Apr 2016 14:09:11 -0400 Subject: [PATCH] Restructure of event schedule pretty much done. --- classes/data/dataRecurrences.php | 6 +-- views/admin/events/edit.html | 45 +++++++--------- views/admin/events/editLocation.html | 21 +++++--- views/admin/events/editSchedule.html | 76 ++++++++++++++++------------ views/admin/events/editStatus.html | 6 ++- views/admin/events/list.html | 4 +- 6 files changed, 83 insertions(+), 75 deletions(-) diff --git a/classes/data/dataRecurrences.php b/classes/data/dataRecurrences.php index eef4ca9..6c3e3c5 100644 --- a/classes/data/dataRecurrences.php +++ b/classes/data/dataRecurrences.php @@ -141,7 +141,7 @@ class GlmDataEventsRecurrences extends GlmDataAbstract 'start_time' => array ( 'field' => 'start_time', 'type' => 'time', - 'format' => 'h:i a', + 'time_format' => 'h:i a', 'required' => true, 'use' => 'a' ), @@ -166,7 +166,7 @@ class GlmDataEventsRecurrences extends GlmDataAbstract 'end_time' => array ( 'field' => 'end_time', 'type' => 'time', - 'format' => 'h:i a', + 'time_format' => 'h:i a', 'use' => 'a' ), @@ -207,7 +207,7 @@ class GlmDataEventsRecurrences extends GlmDataAbstract 'field' => 'month_of_year', 'type' => 'bitmap', 'bitmap' => $this->config['month'], - 'default' => 0, // no months selected + 'default' => 4095, // All months selected 'use' => 'a' ), diff --git a/views/admin/events/edit.html b/views/admin/events/edit.html index e74fe28..9eb0c36 100644 --- a/views/admin/events/edit.html +++ b/views/admin/events/edit.html @@ -8,7 +8,7 @@ {if $haveMember} Return to Events List {else} - Return to Events List + Return to Events List {/if} {if $option == 'edit'} @@ -18,7 +18,6 @@

Add new Event

{/if} -
{if $haveMember} @@ -37,16 +36,19 @@ {/if}

- Status & Description + Event Description Location - Event Schedule + Dates Summary Calendar Administrative Contact Attach Files - {if $eventUpdated}Event Updated{/if} - {if $eventUpdateError}Event Update Error{/if} - {if $eventAdded}Event Added{/if} - {if $eventAddError}Event Add Error{/if} + +
+ {if $eventUpdated}Event Updated{/if} + {if $eventUpdateError}Event Update Error{/if} + {if $eventAdded}Event Added{/if} + {if $eventAddError}Event Add Error{/if} +

@@ -79,8 +81,6 @@ {include file='admin/events/editAdminContact.html'} - -
{else} @@ -289,8 +289,7 @@ // If we already have at least one location, we need to add a separator var locTemp = ''; if (numbLocations) { - locTemp = '
'; - +// locTemp = '
'; // Otherwise, we'll say we now have our first location } else { numbLocations++; @@ -359,7 +358,7 @@ // If we already have at least one recurrence, we need to add a separator var recurTemp = ''; if (numbRecurrences) { - recurTemp = '
'; +// recurTemp = '
'; // Otherwise, we'll say we now have our first recurrence } else { @@ -394,17 +393,7 @@ // Date / Time Pickers $('.glm-datetime-input').datetimepicker({ - format: 'm/d/Y h:i a', - lang: 'en', - step: 15, - closeOnWithoutClick: true, - pick12HourFormat: true, - formatTime:'h:i a' - }); - - // Date / Time Pickers - $('.glm-datetime-input').datetimepicker({ - format: 'm/d/Y h:i a', + format: 'm/d/Y h:m a', lang: 'en', step: 15, closeOnWithoutClick: true, @@ -423,12 +412,12 @@ // Time Only Pickers $('.glm-time-input').datetimepicker({ - format: 'h:i A', + format: 'h:i a', lang: 'en', step: 15, closeOnWithoutClick: true, pick12HourFormat: true, - formatTime:'h:i A', + formatTime:'h:i a', datepicker: false }); @@ -482,9 +471,9 @@ $('.all-dates-checkbox').click( function() { recurID = $(this).attr('data-id'); if ($("#allDatesEvent_" + recurID)[0].checked) { - $("#allDatesExclude_" + recurID).addClass('glm-hidden'); - } else { $("#allDatesExclude_" + recurID).removeClass('glm-hidden'); + } else { + $("#allDatesExclude_" + recurID).addClass('glm-hidden'); } }); diff --git a/views/admin/events/editLocation.html b/views/admin/events/editLocation.html index 74df300..efd3ef8 100644 --- a/views/admin/events/editLocation.html +++ b/views/admin/events/editLocation.html @@ -66,13 +66,13 @@ - - Hide Location Address: - - - Don't show location address to site visitors. - - + + Hide Location Address: + + + Don't show location address to site visitors. + + Address: @@ -204,6 +204,13 @@ + + Hide Location Address: + + + Don't show location address to site visitors. + + Address: diff --git a/views/admin/events/editSchedule.html b/views/admin/events/editSchedule.html index 38fe85a..efc3759 100644 --- a/views/admin/events/editSchedule.html +++ b/views/admin/events/editSchedule.html @@ -4,7 +4,7 @@ @@ -13,8 +13,8 @@ {if $recurrences} {foreach $recurrences as $r} - - + + - - + - + - + + + +
- Add an Event Schedule + Add an Event Schedule
@@ -45,20 +45,25 @@
 
Date range over which recurring event can take place

From Date:Start Date:
To Date:End Date:
Recurring Event: + + Setup a detailed schedule. +
@@ -67,18 +72,10 @@ - Delete this Event Schedule - When the event recurrs + Delete this Event Schedule - - Ongoing Event: - - - Check to have event recurr every day from the "From Date" through the "To Date". - - - + Months @@ -156,6 +153,7 @@

Click on Dates to select/remove those dates for this schedule.

+

Save

Use to add specific dates to the schedule. Does not show other scheduled dates. @@ -165,7 +163,7 @@ - + {/foreach} {else} @@ -179,7 +177,9 @@ - + + + - - + - + - + + + +
{if $haveEvent} @@ -216,20 +216,25 @@
 
Date range over which recurring event can take place
From Date:Start Date:
To Date:End Date:
Recurring Event: + + Setup a detailed schedule; +
@@ -238,18 +243,10 @@ - Delete this Event Schedule - When the event recurrs + Delete this Event Schedule - - Ongoing Event: - - - Check to have event recurr every day from the "From Date" through the "To Date". - - - + Months @@ -320,9 +317,22 @@ + + Select with Calendar + +
Show Calendar
+
+

Click on Dates to select/remove those dates for this schedule.

+
+
Done
+
+ Use to add specific dates to the schedule. Does not show other scheduled dates. + + + diff --git a/views/admin/events/editStatus.html b/views/admin/events/editStatus.html index cc52ed1..fbc99fb 100644 --- a/views/admin/events/editStatus.html +++ b/views/admin/events/editStatus.html @@ -58,7 +58,7 @@  Featured Event    Include in Slideshow   -  Major Event + @@ -143,7 +143,7 @@ {php} wp_editor('{$event.fieldData.descr|escape:quotes}', 'glm_descr', array( - // 'media_buttons' => true, + 'media_buttons' => false, // 'quicktags' => false, // 'wpautop' => false, NOTE: Dont's use. Problem when numerous spaces before text. 'textarea_name' => 'descr', @@ -177,6 +177,7 @@ {if $event.fieldFail.image}

{$event.fieldFail.image}

{/if} + Web Address (URL): diff --git a/views/admin/events/list.html b/views/admin/events/list.html index 341fbd0..4bbc513 100644 --- a/views/admin/events/list.html +++ b/views/admin/events/list.html @@ -8,9 +8,9 @@ {if apply_filters('glm_members_permit_admin_events_index_add_event', true)}

{if $haveMember} {* This is if we're processing events for a specific member *} - Add A New Event + Add A New Event {else} - Add A New Event + Add A New Event {/if} {if $eventDeleted}Event Deleted{/if} {if $eventDeleteError}Event Delete Error{/if} -- 2.17.1