From 398f5c9e856078fb49932f8d9764f49ad6912051 Mon Sep 17 00:00:00 2001
From: Steve Sutton <steve@gaslightmedia.com>
Date: Thu, 1 Sep 2016 09:46:54 -0400
Subject: [PATCH] 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
---
 models/front/events/frontAdd.php |   1 +
 views/front/events/detail.html   |   8 +-
 views/front/events/frontAdd.html | 201 +------------------------------
 3 files changed, 8 insertions(+), 202 deletions(-)

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 @@
                                     <div id="glm-event-detail-location">
                                     {if $event.locations.name}{$event.locations.name}<br>{/if}
                                     {if $event.locations.address} {$event.locations.address}<br> {/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}
                                     </div>
@@ -82,8 +81,7 @@
                                     <div id="glm-event-detail-location">
                                     {if $event.member.member} {$event.member.member}<br> {/if}
                                     {if $event.member.addr1} {$event.member.addr1}<br> {/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}
                                     </div>
@@ -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 @@
     <th style='color:red;'>State:</th>
     <td>
         <select id="state_30" name="state" required>
-            <option value="AL"{if $state_def == 'AL'} selected{/if}>
-                Alabama
-            </option>
-            <option value="AK"{if $state_def == 'AK'} selected{/if}>
-                Alaska
-            </option>
-            <option value="AB"{if $state_def == 'Ab'} selected{/if}>
-                Alberta
-            </option>
-            <option value="AZ"{if $state_def == 'AZ'} selected{/if}>
-                Arizona
-            </option>
-            <option value="AR"{if $state_def == 'AR'} selected{/if}>
-                Arkansas
-            </option>
-            <option value="BC"{if $state_def == 'BC'} selected{/if}>
-                British Columbia
-            </option>
-            <option value="CA"{if $state_def == 'CA'} selected{/if}>
-                California
-            </option>
-            <option value="CO"{if $state_def == 'CO'} selected{/if}>
-                Colorado
-            </option>
-            <option value="CT"{if $state_def == 'CT'} selected{/if}>
-                Connecticut
-            </option>
-            <option value="DE"{if $state_def == 'DE'} selected{/if}>
-                Delaware
-            </option>
-            <option value="DC"{if $state_def == 'DC'} selected{/if}>
-                District of Columbia
-            </option>
-            <option value="FL"{if $state_def == 'FL'} selected{/if}>
-                Florida
-            </option>
-            <option value="GA"{if $state_def == 'GA'} selected{/if}>
-                Georgia
-            </option>
-            <option value="GU"{if $state_def == 'GU'} selected{/if}>
-                Guam
-            </option>
-            <option value="HI"{if $state_def == 'HI'} selected{/if}>
-                Hawaii
-            </option>
-            <option value="ID"{if $state_def == 'ID'} selected{/if}>
-                Idaho
-            </option>
-            <option value="IL"{if $state_def == 'IL'} selected{/if}>
-                Illinois
-            </option>
-            <option value="IN"{if $state_def == 'IN'} selected{/if}>
-                Indiana
-            </option>
-            <option value="IA"{if $state_def == 'IA'} selected{/if}>
-                Iowa
-            </option>
-            <option value="KS"{if $state_def == 'KS'} selected{/if}>
-                Kansas
-            </option>
-            <option value="KY"{if $state_def == 'KY'} selected{/if}>
-                Kentucky
-            </option>
-            <option value="LA"{if $state_def == 'LA'} selected{/if}>
-                Louisiana
-            </option>
-            <option value="ME"{if $state_def == 'ME'} selected{/if}>
-                Maine
-            </option>
-            <option value="MB"{if $state_def == 'MB'} selected{/if}>
-                Manitoba
-            </option>
-            <option value="MD"{if $state_def == 'MD'} selected{/if}>
-                Maryland
-            </option>
-            <option value="MA"{if $state_def == 'MA'} selected{/if}>
-                Massachusetts
-            </option>
-            <option value="MI"{if $state_def == 'MI'} selected{/if}>
-                Michigan
-            </option>
-            <option value="MN"{if $state_def == 'MN'} selected{/if}>
-                Minnesota
-            </option>
-            <option value="MS"{if $state_def == 'MS'} selected{/if}>
-                Mississippi
-            </option>
-            <option value="MO"{if $state_def == 'MO'} selected{/if}>
-                Missouri
-            </option>
-            <option value="MT"{if $state_def == 'MT'} selected{/if}>
-                Montana
-            </option>
-            <option value="NE"{if $state_def == 'NE'} selected{/if}>
-                Nebraska
-            </option>
-            <option value="NV"{if $state_def == 'NV'} selected{/if}>
-                Nevada
-            </option>
-            <option value="NB"{if $state_def == 'NB'} selected{/if}>
-                New Brunswick
-            </option>
-            <option value="NF"{if $state_def == 'NF'} selected{/if}>
-                Newfoundland
-            </option>
-            <option value="NH"{if $state_def == 'NH'} selected{/if}>
-                New Hampshire
-            </option>
-            <option value="NJ"{if $state_def == 'NJ'} selected{/if}>
-                New Jersey
-            </option>
-            <option value="NM"{if $state_def == 'NM'} selected{/if}>
-                New Mexico
-            </option>
-            <option value="NY"{if $state_def == 'NY'} selected{/if}>
-                New York
-            </option>
-            <option value="NC"{if $state_def == 'NC'} selected{/if}>
-                North Carolina
-            </option>
-            <option value="ND"{if $state_def == 'ND'} selected{/if}>
-                North Dakota
-            </option>
-            <option value="NT"{if $state_def == 'NT'} selected{/if}>
-                Northwest Territories
-            </option>
-            <option value="NS"{if $state_def == 'NS'} selected{/if}>
-                Nova Scotia
-            </option>
-            <option value="OH"{if $state_def == 'OH'} selected{/if}>
-                Ohio
-            </option>
-            <option value="OK"{if $state_def == 'OK'} selected{/if}>
-                Oklahoma
-            </option>
-            <option value="ON"{if $state_def == 'ON'} selected{/if}>
-                Ontario
-            </option>
-            <option value="OR"{if $state_def == 'OR'} selected{/if}>
-                Oregon
-            </option>
-            <option value="PA"{if $state_def == 'PA'} selected{/if}>
-                Pennsylvania
-            </option>
-            <option value="PE"{if $state_def == 'PE'} selected{/if}>
-                Prince Edward Island
-            </option>
-            <option value="PR"{if $state_def == 'PR'} selected{/if}>
-                Puerto Rico
-            </option>
-            <option value="QC"{if $state_def == 'QC'} selected{/if}>
-                Quebec
-            </option>
-            <option value="RI"{if $state_def == 'RI'} selected{/if}>
-                Rhode Island
-            </option>
-            <option value="SK"{if $state_def == 'SK'} selected{/if}>
-                Saskatchewan
-            </option>
-            <option value="SC"{if $state_def == 'SC'} selected{/if}>
-                South Carolina
-            </option>
-            <option value="SD"{if $state_def == 'SD'} selected{/if}>
-                South Dakota
-            </option>
-            <option value="TN"{if $state_def == 'TN'} selected{/if}>
-                Tennessee
-            </option>
-            <option value="TX"{if $state_def == 'TX'} selected{/if}>
-                Texas
-            </option>
-            <option value="UT"{if $state_def == 'UT'} selected{/if}>
-                Utah
-            </option>
-            <option value="VT"{if $state_def == 'VT'} selected{/if}>
-                Vermont
-            </option>
-            <option value="VI"{if $state_def == 'VI'} selected{/if}>
-                Virgin Islands
-            </option>
-            <option value="VA"{if $state_def == 'VA'} selected{/if}>
-                Virginia
-            </option>
-            <option value="WA"{if $state_def == 'WA'} selected{/if}>
-                Washington
-            </option>
-            <option value="WV"{if $state_def == 'WV'} selected{/if}>
-                West Virginia
-            </option>
-            <option value="WI"{if $state_def == 'WI'} selected{/if}>
-                Wisconsin
-            </option>
-            <option value="WY"{if $state_def == 'WY'} selected{/if}>
-                Wyoming
-            </option>
-            <option value="YT"{if $state_def == 'YT'} selected{/if}>
-                Yukon
+            {foreach $states as $stateAbbr => $stateName}
+            <option value="{$stateAbbr}"{if $state_def == $stateAbbr} selected{/if}>
+            {$stateName}
             </option>
+            {/foreach}
         </select>
     </td>
 </tr>
-- 
2.17.1