From: Steve Sutton Date: Thu, 1 Sep 2016 13:46:54 +0000 (-0400) Subject: Update state list on add form / Update city state on detail page. X-Git-Tag: v1.3.3^2~3 X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=398f5c9e856078fb49932f8d9764f49ad6912051;p=WP-Plugins%2Fglm-member-db-events.git Update state list on add form / Update city state on detail page. For the add event form now using the config states array. For the detail page get rid of the space between the city and the comma --- diff --git a/models/front/events/frontAdd.php b/models/front/events/frontAdd.php index d995381..075dc1f 100644 --- a/models/front/events/frontAdd.php +++ b/models/front/events/frontAdd.php @@ -507,6 +507,7 @@ class GLmMembersFront_events_frontAdd extends GlmDataEvents : ( $this->config['settings']['event_default_state'] ) ? $this->config['settings']['event_default_state']: 'MI'; // Compile template data $templateData = array( + 'states' => $this->config['states'], 'state_def' => $default_state, 'siteBaseUrl' => GLM_MEMBERS_EVENTS_SITE_BASE_URL, 'currentUrl' => $_SERVER['HTTP_REFERER'], diff --git a/views/front/events/detail.html b/views/front/events/detail.html index 6f7db12..a13d92a 100644 --- a/views/front/events/detail.html +++ b/views/front/events/detail.html @@ -73,8 +73,7 @@
{if $event.locations.name}{$event.locations.name}
{/if} {if $event.locations.address} {$event.locations.address}
{/if} - {if $event.locations.city.name} {$event.locations.city.name} {/if} - {if $event.locations.state.value} , {$event.locations.state.value} {/if} + {if $event.locations.city.name}{$event.locations.city.name}{/if}{if $event.locations.state.value}, {$event.locations.state.value} {/if} {if $event.locations.zip} {$event.locations.zip} {/if} {if $event.locations.phone} {$event.locations.phone} {/if}
@@ -82,8 +81,7 @@
{if $event.member.member} {$event.member.member}
{/if} {if $event.member.addr1} {$event.member.addr1}
{/if} - {if $event.member.city} {$event.member.city} {/if} - {if $event.member.state.value}, {$event.member.state.value}{/if} + {if $event.member.city}{$event.member.city}{/if}{if $event.member.state.value}, {$event.member.state.value}{/if} {if $event.member.zip} {$event.member.zip} {/if} {if $event.member.phone} {$event.member.phone} {/if}
@@ -134,7 +132,7 @@ jQuery(document).ready( function ($){ var view_select = $("#glm-event-view-select"); view_select.hide(); - + // Replace the phone separation character with whatever is set in the management {if $settings.phone_infix} var processedPhone = $('.glm-event-detail-contact-phone .glm-field-value').text().trim().replace(/[^a-zA-Z0-9 ]/g, '{$settings.phone_infix}'); diff --git a/views/front/events/frontAdd.html b/views/front/events/frontAdd.html index 7f0086b..6303d52 100644 --- a/views/front/events/frontAdd.html +++ b/views/front/events/frontAdd.html @@ -283,204 +283,11 @@ State: