Migrating settings from .ini file to admin Management pages
authorChuck Scott <cscott@gaslightmedia.com>
Sat, 3 Oct 2015 15:58:40 +0000 (11:58 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Sat, 3 Oct 2015 15:58:40 +0000 (11:58 -0400)
14 files changed:
classes/data/dataMemberInfo.php
config.php
config/plugin.ini
controllers/admin.php
controllers/front.php
misc/databaseScripts/create_database_V0.1.sql
models/admin/management/index.php
models/admin/management/terms.php
models/front/members/list.php
views/admin/management/index.html
views/admin/management/terms.html
views/admin/member/memberInfo.html
views/front/members/detail.html
views/front/members/list.html

index 58953ab..a8a0c9b 100644 (file)
@@ -240,7 +240,7 @@ class GlmDataMemberInfo extends GlmDataAbstract
                        'lat' => array(
                                'field'    => 'lat',
                                'type'     => 'float',
-                               'default'  => $this->config['map_default_lat'],
+                               'default'  => $this->config['settings']['maps_default_lat'],
                                'use'      => 'a'
                        ),
 
@@ -248,7 +248,7 @@ class GlmDataMemberInfo extends GlmDataAbstract
                        'lon' => array(
                                'field'    => 'lon',
                                'type'     => 'float',
-                               'default'  => $this->config['map_default_lon'],
+                               'default'  => $this->config['settings']['maps_default_lon'],
                                'use'      => 'a'
                        ),
 
index 069ff2e..b5f2e77 100644 (file)
@@ -9,24 +9,6 @@
 $configData = parse_ini_file(GLM_MEMBERS_PLUGIN_PATH.'/config/plugin.ini', true);
 $config = $configData['common'];
 
-// Override parameters according to GLM_HOST_ID
-$hostSection = strtolower(GLM_MEMBER_PLUGIN_HOST).':common';
-if (isset($configData[$hostSection])) {
-    $config = array_replace($config, $configData[strtolower(GLM_MEMBER_PLUGIN_HOST).':common']);
-} else {
-    $startupNotices .=
-        '<p><b>Bad configuration file section name or section not found:</b> '. $hostSection
-        .'<br>See plugin '.GLM_MEMBERS_PLUGIN_PATH.'config/plugin.ini file.'
-        .'<br>Also check that the server "GLM_HOST_ID" environment parameter exists and matches a section in the above ini file.</p>'
-    ;
-}
-
-// Add Debug defines - These can't go into the defines.php file - Guess why.
-define('GLM_MEMBERS_PLUGIN_ADMIN_DEBUG', $config['admin_debug']);
-define('GLM_MEMBERS_PLUGIN_ADMIN_DEBUG_VERBOSE', $config['admin_debug_verbose']);
-define('GLM_MEMBERS_PLUGIN_FRONT_DEBUG', $config['front_debug']);
-define('GLM_MEMBERS_PLUGIN_FRONT_DEBUG_VERBOSE', $config['front_debug_verbose']);
-
 // Also get image sizes array from the plugin.ini - uses separate ini section.
 $config['imageSizes'] = $configData['imageSizes'];
 
@@ -39,13 +21,25 @@ $config['countries'] = $countryData['countries'];
 // Read in Settings and Terms from database
 $settings = $wpdb->get_row("SELECT * FROM ".GLM_MEMBERS_PLUGIN_DB_PREFIX . "settings_general WHERE id = 1;", ARRAY_A);
 unset($settings['id']);
+
+// ************* NEED TO ADD TO MANAGEMENT SETTINGS - Might require database changes **************
+$settings['list_show_email'] = true;
+$settings['list_map_show_email'] = true;
+$settings['mapDefaultZoom'] = 10;
+$settings['detail_show_coupons'] = false;
+$settings['detail_show_packages'] = false;
+// ***************************************************************
+
+$config['settings'] = $settings;
 $terms = $wpdb->get_row("SELECT * FROM ".GLM_MEMBERS_PLUGIN_DB_PREFIX . "settings_terms WHERE id = 1;", ARRAY_A);
 unset($terms['id']);
-$config = array_merge($config, $settings, $terms);
-
-echo "<pre>".print_r($config,1)."</pre>";
-exit;
+$config['terms'] = $terms;
 
+// Add Debug defines - These can't go into the defines.php file - Guess why.
+define('GLM_MEMBERS_PLUGIN_ADMIN_DEBUG', $settings['admin_debug']);
+define('GLM_MEMBERS_PLUGIN_ADMIN_DEBUG_VERBOSE', $settings['admin_debug_verbose']);
+define('GLM_MEMBERS_PLUGIN_FRONT_DEBUG', $settings['front_debug']);
+define('GLM_MEMBERS_PLUGIN_FRONT_DEBUG_VERBOSE', $settings['front_debug_verbose']);
 
 // Check for config value replacements in the current theme
 $currentThemeDirectory = get_template_directory();
index f975154..0e08955 100644 (file)
@@ -39,108 +39,6 @@ image_sizes['medium'] = 'Medium'
 image_sizes['small'] = 'Small'
 image_sizes['thumb'] = 'Thumbnail'
 
-;
-; Site Configuration Options
-;
-
-; Debug Options
-admin_debug = false
-admin_debug_verbose = false
-front_debug = false
-front_debug_verbose = false
-
-; Google Maps Browser API Key
-; Account: cscott.glm@gmail.com
-; Need to create a new key for each "Project", referrer
-; for the project should be the customer's Web site.
-; https://accounts.google.com/ServiceLogin
-;
-googleMapsApiKey = ''
-
-;googleMapsApiKey = 'AIzaSyDWgyf8MeYdxZRHaN73O37vFbkhvPjjNhU'
-; Site Time Zone
-timezone = America/Detroit
-
-; Default map location is Gaslight Media office
-map_default_lat = 45.3749
-map_default_lon = -84.9592
-map_default_zoom = 10
-
-; Front-end Member Listing - [glm-members-list]
-front-config['list_show_map'] = true
-front-config['list_show_list'] = true
-front-config['list_show_search'] = true
-front-config['list_search_text'] = true
-front-config['list_search_category'] = true
-front-config['list_search_amenities'] = true
-front-config['list_search_alpha'] = true
-;    Front-end Member Listing Options
-front-config['list_show_detaillink'] = true
-front-config['list_show_logo'] = true
-front-config['list_logo_size'] = small
-front-config['list_show_address'] = true
-front-config['list_show_addr2'] = false
-front-config['list_show_street'] = true
-front-config['list_show_citystatezip'] = true
-front-config['list_show_country'] = false
-front-config['list_show_region'] = false
-front-config['list_show_description'] = false
-front-config['list_show_short_descr'] = true
-front-config['list_show_phone'] = true
-front-config['list_show_tollfree'] = false
-front-config['list_show_url'] = true
-front-config['list_show_url_newtarget'] = true
-front-config['list_show_email'] = true
-front-config['list_show_categories'] = false
-front-config['list_show_creditcards'] = false
-front-config['list_show_amenities'] = false
-;    Front-end Meber Listing Map Options
-front-config['list_map_show_detaillink'] = true
-front-config['list_map_show_logo'] = true
-front-config['list_map_logo_size'] = thumb
-front-config['list_map_show_description'] = true
-front-config['list_map_show_short_descr'] = false
-front-config['list_map_show_address'] = true
-front-config['list_map_show_street'] = true
-front-config['list_map_show_citystatezip'] = true
-front-config['list_map_show_country'] = true
-front-config['list_map_show_region'] = true
-front-config['list_map_show_phone'] = true
-front-config['list_map_show_tollfree'] = true
-front-config['list_map_show_url'] = true
-front-config['list_map_show_url_newtarget'] = true
-front-config['list_map_show_email'] = true
-front-config['list_map_show_categories'] = true
-front-config['list_map_show_creditcards'] = true
-front-config['list_map_show_amenities'] = true
-;    Front-end Member Detail Options
-front-config['detail_show_map'] = true
-front-config['detail_show_directions'] = false
-front-config['detail_show_logo'] = true
-front-config['detail_logo_size'] = large
-front-config['detail_show_description'] = true
-front-config['detail_show_short_descr'] = false
-front-config['detail_show_address'] = true
-front-config['detail_show_street'] = true
-front-config['detail_show_citystatezip'] = true
-front-config['detail_show_country'] = true
-front-config['detail_show_region'] = true
-front-config['detail_show_phone'] = true
-front-config['detail_show_tollfree'] = true
-front-config['detail_show_url'] = true
-front-config['detail_show_url_newtarget'] = true
-front-config['detail_show_email'] = true
-front-config['detail_show_categories'] = false
-front-config['detail_show_creditcards'] = false
-front-config['detail_show_amenities'] = true
-front-config['detail_show_imagegallery'] = true
-front-config['detail_show_coupons'] = false
-front-config['detail_show_packages'] = false
-
-;
-; End of site configuration options
-;
-
 ;
 ; Entry Status Types
 ;
@@ -295,59 +193,3 @@ days[4] = 'Thursday'
 days[5] = 'Friday'
 days[6] = 'Saturday'
 
-;
-; Common Terms/Phrases
-;
-
-; Admin Menus
-term['term_admin_menu_members'] = 'Members'
-term['term_admin_menu_member'] = 'Member'
-term['term_admin_menu_configure'] = 'Configure'
-
-; General Terms
-term['term_member'] = 'member'
-term['term_member_cap'] = 'Member'
-term['term_member_plur'] = 'members'
-term['term_member_plur_cap'] = 'Members'
-
-term['term_location'] = 'location'
-term['term_location_cap'] = 'Location'
-term['term_location_plur'] = 'locations'
-term['term_location_plur_cap'] = 'Locations'
-
-term['term_facility'] = 'facility'
-term['term_facility_cap'] = 'Facility'
-term['term_facility_plur'] = 'facilities'
-term['term_facility_plur_cap'] = 'Facilities'
-
-term['term_attraction'] = 'attraction'
-term['term_attraction_cap'] = 'Attraction'
-term['term_attraction_plur'] = 'attractions'
-term['term_attraction_plur_cap'] = 'Attractions'
-
-term['term_contact'] = 'contact'
-term['term_contact_cap'] = 'Contact'
-term['term_contact_plur'] = 'contacts'
-term['term_contact_plur_cap'] = 'Contacts'
-
-; Phrases
-phrase['phrase_test'] = 'test'
-
-;
-; Override sections for various servers by GLM_HOST_ID
-;
-
-[production:common]
-
-
-[development:common]
-
-
-[chuck:common]
-admin_debug = true
-admin_debug_verbose = false
-front_debug = false
-front_debug_verbose = false
-googleMapsApiKey = ''
-
-
index d75018e..651a757 100644 (file)
@@ -588,7 +588,7 @@ class glmMembersAdmin extends GlmPluginSupport
          * (see bottom of this script).
          */
         $defaultTimeZone = date_default_timezone_get();
-        date_default_timezone_set($this->config['timezone']);
+        date_default_timezone_set($this->config['settings']['time_zone']);
 
         if (GLM_MEMBERS_PLUGIN_ADMIN_DEBUG) {
 
@@ -805,11 +805,8 @@ class glmMembersAdmin extends GlmPluginSupport
         $smarty->templateAssign ( 'glmPluginMediaURL', GLM_MEMBERS_PLUGIN_MEDIA_URL );
         $smarty->templateAssign ( 'thisYear', date ( 'Y' ) );
         $smarty->templateAssign ( 'ref_type_numb', $this->config['ref_type_numb']);
-        $smarty->templateAssign ( $this->config['term']);
-        $smarty->templateAssign ( 'term', $this->config['term']);
-        $smarty->templateAssign ( $this->config['phrase']);
-        $smarty->templateAssign ( 'term', $this->config['phrase']);
-        $smarty->templateAssign ( 'googleMapsBrowserApiKey', $this->config['googleMapsApiKey']);
+        $smarty->templateAssign ( 'settings', $this->config['settings']);
+        $smarty->templateAssign ( 'terms', $this->config['terms']);
 
         // Add data from model to Smarty template
         if (is_array($results['data']) && count($results['data']) > 0) {
index 3fecfe0..164a6e8 100644 (file)
@@ -226,7 +226,7 @@ class glmMembersFront extends GlmPluginSupport
          * (see bottom of this script).
          */
         $defaultTimeZone = date_default_timezone_get();
-        date_default_timezone_set($this->config['timezone']);
+        date_default_timezone_set($this->config['settings']['time_zone']);
 
         $errorMsg = '';
 
@@ -406,17 +406,8 @@ class glmMembersFront extends GlmPluginSupport
         $smarty->templateAssign ( 'glmPluginName', GLM_MEMBERS_PLUGIN_NAME );
         $smarty->templateAssign ( 'glmPluginMediaURL', GLM_MEMBERS_PLUGIN_MEDIA_URL );
         $smarty->templateAssign ( 'thisYear', date ( 'Y' ) );
-        $smarty->templateAssign ( $this->config['front-config']);
-        $smarty->templateAssign ( $this->config['term']);
-        $smarty->templateAssign ( $this->config['phrase']);
-        $smarty->templateAssign ( 'googleMapsBrowserApiKey', $this->config['googleMapsApiKey']);
-        $smarty->templateAssign ( 'mapDefaultLat', $this->config['map_default_lat']);
-        $smarty->templateAssign ( 'mapDefaultLon', $this->config['map_default_lon']);
-        $smarty->templateAssign ( 'mapDefaultZoom', $this->config['map_default_zoom']);
-
-        // Add all terms and phrases from the config/plugin.ini file
-//        $smarty->templateAssign ( 'terms', $this->config->term);
-//        $smarty->templateAssign ( 'phrase', $this->config->phrase);
+        $smarty->templateAssign ( 'settings', $this->config['settings']);
+        $smarty->templateAssign ( 'terms', $this->config['terms']);
 
         // Add data from model to Smarty template
         if (is_array($results['data']) && count($results['data']) > 0) {
index e5289cd..50c0381 100644 (file)
@@ -679,7 +679,7 @@ INSERT INTO {prefix}settings_terms
     'Member',             
     'Add Member',         
     'Configure',          
-    'Settings',           
+    'Management',           
     'Shortcodes',         
     'Dashboard',          
     'Member List',        
index f96ce95..43299be 100644 (file)
@@ -164,7 +164,7 @@ class GlmMembersAdmin_management_index extends GlmDataSettingsGeneral
         // Compile template data
         $templateData = array(
             'reason' => '',
-            'settings' => $generalSettings,
+            'genSettings' => $generalSettings,
             'timezones' =>  DateTimeZone::listIdentifiers()
 //            'canEdit' => $canEdit
         );
index 392698a..2f38961 100644 (file)
@@ -164,7 +164,7 @@ class GlmMembersAdmin_management_terms extends GlmDataSettingsTerms
         // Compile template data
         $templateData = array(
             'reason' => '',
-            'settings' => $termsSettings,
+            'termSettings' => $termsSettings,
 //            'canEdit' => $canEdit
         );
 
index 2db9b53..88ad297 100644 (file)
@@ -128,7 +128,7 @@ class GlmMembersFront_members_list extends GlmDataMemberInfo
         // Get category filter data
         $categoryData = false;
         $catSelected = '';
-        if ($this->config['front-config']['list_search_category']) {
+        if ($this->config['settings']['list_show_search_category']) {
 
             // Get category data for search pick list
             require_once(GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataCategories.php');
@@ -169,7 +169,7 @@ class GlmMembersFront_members_list extends GlmDataMemberInfo
         // Get amenity filter data
         $amenityData = false;
         $amenSelected = '';
-        if ($this->config['front-config']['list_search_amenities']) {
+        if ($this->config['settings']['list_show_search_amenities']) {
 
             // Get amenity data for search pick list
             require_once(GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataAmenities.php');
@@ -210,7 +210,7 @@ class GlmMembersFront_members_list extends GlmDataMemberInfo
         // If doing alpha list
         $alphaList = false;
         $alphaWhere = '';
-        if ($this->config['front-config']['list_search_alpha']) {
+        if ($this->config['settings']['list_show_search_alpha']) {
 
             $alphaSelected = false;
 
index 1e8f1c8..9243f1b 100644 (file)
@@ -1,7 +1,5 @@
 {include file='admin/management/header.html'}
     
-    <h1>*** Not using these settings yet! ***</h1>
-    
     <form action="{$thisURL}?page={$thisPage}" method="post" enctype="multipart/form-data">
         <input type="hidden" name="glm_action" value="index">
         <input type="hidden" name="option" value="submit">
             <tr>
                 <th>Admin Debug Information:</th>
                 <td>
-                    <input type="checkbox" name="admin_debug"{if $settings.fieldData.admin_debug.value} checked="checked"{/if}>
+                    <input type="checkbox" name="admin_debug"{if $genSettings.fieldData.admin_debug.value} checked="checked"{/if}>
                 </td>
             </tr>
             <tr>
                 <th>Admin Debug Verbose:</th>
                 <td>
-                    <input type="checkbox" name="admin_debug_verbose"{if $settings.fieldData.admin_debug_verbose.value} checked="checked"{/if}>
+                    <input type="checkbox" name="admin_debug_verbose"{if $genSettings.fieldData.admin_debug_verbose.value} checked="checked"{/if}>
                 </td>
             </tr>
             <tr>
                 <th>Front-End Debug Information:</th>
                 <td>
-                    <input type="checkbox" name="front_debug"{if $settings.fieldData.front_debug.value} checked="checked"{/if}>
+                    <input type="checkbox" name="front_debug"{if $genSettings.fieldData.front_debug.value} checked="checked"{/if}>
                 </td>
             </tr>
             <tr>
                 <th>Front-End Debug Verbose:</th>
                 <td>
-                    <input type="checkbox" name="front_debug_verbose"{if $settings.fieldData.front_debug_verbose.value} checked="checked"{/if}>
+                    <input type="checkbox" name="front_debug_verbose"{if $genSettings.fieldData.front_debug_verbose.value} checked="checked"{/if}>
                 </td>
             </tr>
             <tr><td colspan="2"><hr></td></tr>
             <tr><td colspan="2"><h2>Misc. Settings</h2></td></tr>
             <tr>
-                <th {if $settings.fieldRequired.google_maps_api_key}class="glm-required"{/if}>Google Maps API Key:</th>
-                <td {if $settings.fieldFail.google_maps_api_key}class="glm-form-bad-input"{/if}>
-                    <input type="text" name="google_maps_api_key" value="{$settings.fieldData.google_maps_api_key}" class="glm-form-text-input-medium">
-                    {if $settings.fieldFail.google_maps_api_key}<p>{$settings.fieldFail.google_maps_api_key}</p>{/if}
+                <th {if $genSettings.fieldRequired.google_maps_api_key}class="glm-required"{/if}>Google Maps API Key:</th>
+                <td {if $genSettings.fieldFail.google_maps_api_key}class="glm-form-bad-input"{/if}>
+                    <input type="text" name="google_maps_api_key" value="{$genSettings.fieldData.google_maps_api_key}" class="glm-form-text-input-medium">
+                    {if $genSettings.fieldFail.google_maps_api_key}<p>{$genSettings.fieldFail.google_maps_api_key}</p>{/if}
                     <br>Optional: See Google Maps JAVAscript API V3 documentation for information.
                 </td>
             </tr>
             <tr>
-                <th {if $settings.fieldRequired.maps_default_lat}class="glm-required"{/if}>Default Map Location:</th>
-                <td {if $settings.fieldFail.maps_default_lat || $settings.fieldFail.maps_default_lon}class="glm-form-bad-input"{/if}>
+                <th {if $genSettings.fieldRequired.maps_default_lat}class="glm-required"{/if}>Default Map Location:</th>
+                <td {if $genSettings.fieldFail.maps_default_lat || $genSettings.fieldFail.maps_default_lon}class="glm-form-bad-input"{/if}>
                     <label for="maps_default_lat">Lat:</label>
-                    <input type="text" name="maps_default_lat" value="{$settings.fieldData.maps_default_lat}" class="glm-form-text-input-small"><br>
+                    <input type="text" name="maps_default_lat" value="{$genSettings.fieldData.maps_default_lat}" class="glm-form-text-input-small"><br>
                     <label for="maps_default_lon">Lon:</label>
-                    <input type="text" name="maps_default_lon" value="{$settings.fieldData.maps_default_lon}" class="glm-form-text-input-small">
+                    <input type="text" name="maps_default_lon" value="{$genSettings.fieldData.maps_default_lon}" class="glm-form-text-input-small">
                     <br>Please enter values in decimal degrees.
-                    {if $settings.fieldFail.maps_default_lat}<p>{$settings.fieldFail.maps_default_lat}</p>{/if}
-                    {if $settings.fieldFail.maps_default_lon}<p>{$settings.fieldFail.maps_default_lon}</p>{/if}
+                    {if $genSettings.fieldFail.maps_default_lat}<p>{$genSettings.fieldFail.maps_default_lat}</p>{/if}
+                    {if $genSettings.fieldFail.maps_default_lon}<p>{$genSettings.fieldFail.maps_default_lon}</p>{/if}
                 </td>
             </tr>
             <tr>
-                <th {if $settings.fieldRequired.time_zone}class="glm-required"{/if}>Time Zone:</th>
-                <td {if $settings.fieldFail.time_zone}class="glm-form-bad-input"{/if}>
+                <th {if $genSettings.fieldRequired.time_zone}class="glm-required"{/if}>Time Zone:</th>
+                <td {if $genSettings.fieldFail.time_zone}class="glm-form-bad-input"{/if}>
                     <select name="time_zone">
         {foreach $timezones as $tz}
-                        <option value="{$tz}"{if $tz == $settings.fieldData.time_zone} selected="selected"{/if}>{$tz}</option>
+                        <option value="{$tz}"{if $tz == $genSettings.fieldData.time_zone} selected="selected"{/if}>{$tz}</option>
         {/foreach}
                     </select>
-                    {if $settings.fieldFail.time_zone}<p>{$settings.fieldFail.time_zone}</p>{/if}
+                    {if $genSettings.fieldFail.time_zone}<p>{$genSettings.fieldFail.time_zone}</p>{/if}
                 </td>
             </tr>
             
             <tr>
                 <th>Show Map:</th>
                 <td>
-                    <input type="checkbox" name="list_show_map"{if $settings.fieldData.list_show_map.value} checked="checked"{/if}>
+                    <input type="checkbox" name="list_show_map"{if $genSettings.fieldData.list_show_map.value} checked="checked"{/if}>
                 </td>
             </tr>
             <tr>
                 <th>Map Options:</th>
                 <td>
                     <table class="glm-admin-table">
-                        <tr><th>Show Member Name as Link to Detail:</th><td><input type="checkbox" name="list_map_show_detaillink"{if $settings.fieldData.list_map_show_detaillink.value} checked="checked"{/if}></td></tr>
-                        <tr><th>Show Logo:</th><td><input type="checkbox" name="list_map_show_logo"{if $settings.fieldData.list_map_show_logo.value} checked="checked"{/if}></td></tr>
+                        <tr><th>Show Member Name as Link to Detail:</th><td><input type="checkbox" name="list_map_show_detaillink"{if $genSettings.fieldData.list_map_show_detaillink.value} checked="checked"{/if}></td></tr>
+                        <tr><th>Show Logo:</th><td><input type="checkbox" name="list_map_show_logo"{if $genSettings.fieldData.list_map_show_logo.value} checked="checked"{/if}></td></tr>
                         
                         <tr>
                             <th>Logo Size:</th>
                             <td>
                                 <select name="list_map_logo_size">
-                    {foreach from=$settings.fieldData.list_map_logo_size.list item=v}
+                    {foreach from=$genSettings.fieldData.list_map_logo_size.list item=v}
                                     <option value="{$v.value}"{if $v.default} selected="selected"{/if}>{$v.name}</option>
                     {/foreach}
                                 </select>
                             </td>
                         </tr>
                         
-                        <tr><th>Show Description:</th><td><input type="checkbox" name="list_map_show_descr"{if $settings.fieldData.list_map_show_descr.value} checked="checked"{/if}></td></tr>
-                        <tr><th>Show Short Description:</th><td><input type="checkbox" name="list_map_show_short_descr"{if $settings.fieldData.list_map_show_short_descr.value} checked="checked"{/if}></td></tr>
-                        <tr><th>Show Address:</th><td><input type="checkbox" name="list_map_show_address"{if $settings.fieldData.list_map_show_address.value} checked="checked"{/if}></td></tr>
-                        <tr><th>Show Street:</th><td><input type="checkbox" name="list_map_show_street"{if $settings.fieldData.list_map_show_street.value} checked="checked"{/if}></td></tr>
-                        <tr><th>Show City, State, ZIP:</th><td><input type="checkbox" name="list_map_show_citystatezip"{if $settings.fieldData.list_map_show_citystatezip.value} checked="checked"{/if}></td></tr>
-                        <tr><th>Show Country:</th><td><input type="checkbox" name="list_map_show_country"{if $settings.fieldData.list_map_show_country.value} checked="checked"{/if}></td></tr>
-                        <tr><th>Show Region:</th><td><input type="checkbox" name="list_map_show_region"{if $settings.fieldData.list_map_show_region.value} checked="checked"{/if}></td></tr>
-                        <tr><th>Show Phone:</th><td><input type="checkbox" name="list_map_show_phone"{if $settings.fieldData.list_map_show_phone.value} checked="checked"{/if}></td></tr>
-                        <tr><th>Show Toll Free:</th><td><input type="checkbox" name="list_map_show_tollfree"{if $settings.fieldData.list_map_show_tollfree.value} checked="checked"{/if}></td></tr>
+                        <tr><th>Show Description:</th><td><input type="checkbox" name="list_map_show_descr"{if $genSettings.fieldData.list_map_show_descr.value} checked="checked"{/if}></td></tr>
+                        <tr><th>Show Short Description:</th><td><input type="checkbox" name="list_map_show_short_descr"{if $genSettings.fieldData.list_map_show_short_descr.value} checked="checked"{/if}></td></tr>
+                        <tr><th>Show Address:</th><td><input type="checkbox" name="list_map_show_address"{if $genSettings.fieldData.list_map_show_address.value} checked="checked"{/if}></td></tr>
+                        <tr><th>Show Street:</th><td><input type="checkbox" name="list_map_show_street"{if $genSettings.fieldData.list_map_show_street.value} checked="checked"{/if}></td></tr>
+                        <tr><th>Show City, State, ZIP:</th><td><input type="checkbox" name="list_map_show_citystatezip"{if $genSettings.fieldData.list_map_show_citystatezip.value} checked="checked"{/if}></td></tr>
+                        <tr><th>Show Country:</th><td><input type="checkbox" name="list_map_show_country"{if $genSettings.fieldData.list_map_show_country.value} checked="checked"{/if}></td></tr>
+                        <tr><th>Show Region:</th><td><input type="checkbox" name="list_map_show_region"{if $genSettings.fieldData.list_map_show_region.value} checked="checked"{/if}></td></tr>
+                        <tr><th>Show Phone:</th><td><input type="checkbox" name="list_map_show_phone"{if $genSettings.fieldData.list_map_show_phone.value} checked="checked"{/if}></td></tr>
+                        <tr><th>Show Toll Free:</th><td><input type="checkbox" name="list_map_show_tollfree"{if $genSettings.fieldData.list_map_show_tollfree.value} checked="checked"{/if}></td></tr>
                         <tr>
                             <th>Show URL:</th>
                             <td>
-                                <input type="checkbox" name="list_map_show_url"{if $settings.fieldData.list_map_show_url.value} checked="checked"{/if}>
-                                Display URL as a link: <input type="checkbox" name="list_map_show_url_newtarget"{if $settings.fieldData.list_map_show_url_newtarget.value} checked="checked"{/if}>
+                                <input type="checkbox" name="list_map_show_url"{if $genSettings.fieldData.list_map_show_url.value} checked="checked"{/if}>
+                                Display URL as a link: <input type="checkbox" name="list_map_show_url_newtarget"{if $genSettings.fieldData.list_map_show_url_newtarget.value} checked="checked"{/if}>
                             </td>
                         </tr>
-                        <tr><th>Show Categories:</th><td><input type="checkbox" name="list_map_show_categories"{if $settings.fieldData.list_map_show_categories.value} checked="checked"{/if}></td></tr>
-                        <tr><th>Show Credit Cards:</th><td><input type="checkbox" name="list_map_show_creditcards"{if $settings.fieldData.list_map_show_creditcards.value} checked="checked"{/if}></td></tr>
-                        <tr><th>Show Amenitiies:</th><td><input type="checkbox" name="list_map_show_amenities"{if $settings.fieldData.list_map_show_amenities.value} checked="checked"{/if}></td></tr>
+                        <tr><th>Show Categories:</th><td><input type="checkbox" name="list_map_show_categories"{if $genSettings.fieldData.list_map_show_categories.value} checked="checked"{/if}></td></tr>
+                        <tr><th>Show Credit Cards:</th><td><input type="checkbox" name="list_map_show_creditcards"{if $genSettings.fieldData.list_map_show_creditcards.value} checked="checked"{/if}></td></tr>
+                        <tr><th>Show Amenitiies:</th><td><input type="checkbox" name="list_map_show_amenities"{if $genSettings.fieldData.list_map_show_amenities.value} checked="checked"{/if}></td></tr>
                     </table>
                 </td>
             </tr>
             <tr>
                 <th>Show Search Form:</th>
                 <td>
-                    <input type="checkbox" name="list_show_search"{if $settings.fieldData.list_show_search.value} checked="checked"{/if}>
+                    <input type="checkbox" name="list_show_search"{if $genSettings.fieldData.list_show_search.value} checked="checked"{/if}>
                 </td>
             </tr>
             <tr>
                 <th>Search Form Options:</th>
                 <td>
                     <table class="glm-admin-table">
-                        <tr><th>Text Search:</th><td><input type="checkbox" name="list_show_search_text"{if $settings.fieldData.list_show_search_text.value} checked="checked"{/if}></td></tr>
-                        <tr><th>Category Search:</th><td><input type="checkbox" name="list_show_search_category"{if $settings.fieldData.list_show_search_category.value} checked="checked"{/if}></td></tr>
-                        <tr><th>Amenities Search:</th><td><input type="checkbox" name="list_show_search_amenities"{if $settings.fieldData.list_show_search_amenities.value} checked="checked"{/if}></td></tr>
-                        <tr><th>Show Alpha Index:</th><td><input type="checkbox" name="list_show_search_alpha"{if $settings.fieldData.list_show_search_alpha.value} checked="checked"{/if}></td></tr>
+                        <tr><th>Text Search:</th><td><input type="checkbox" name="list_show_search_text"{if $genSettings.fieldData.list_show_search_text.value} checked="checked"{/if}></td></tr>
+                        <tr><th>Category Search:</th><td><input type="checkbox" name="list_show_search_category"{if $genSettings.fieldData.list_show_search_category.value} checked="checked"{/if}></td></tr>
+                        <tr><th>Amenities Search:</th><td><input type="checkbox" name="list_show_search_amenities"{if $genSettings.fieldData.list_show_search_amenities.value} checked="checked"{/if}></td></tr>
+                        <tr><th>Show Alpha Index:</th><td><input type="checkbox" name="list_show_search_alpha"{if $genSettings.fieldData.list_show_search_alpha.value} checked="checked"{/if}></td></tr>
                         
                     </table>
                 </td>
             <tr>
                 <th>Show Member List:</th>
                 <td>
-                    <input type="checkbox" name="list_show_list"{if $settings.fieldData.list_show_list.value} checked="checked"{/if}>
+                    <input type="checkbox" name="list_show_list"{if $genSettings.fieldData.list_show_list.value} checked="checked"{/if}>
                 </td>
             </tr>
             <tr>
                 <th>Member List Options</th>
                 <td>
                     <table class="glm-admin-table">
-                        <tr><th>Show Member Name as Link to Detail:</th><td><input type="checkbox" name="list_show_detail_link"{if $settings.fieldData.list_show_detail_link.value} checked="checked"{/if}></td></tr>
-                        <tr><th>Show Member Logo:</th><td><input type="checkbox" name="list_show_logo"{if $settings.fieldData.list_show_logo.value} checked="checked"{/if}></td></tr>
+                        <tr><th>Show Member Name as Link to Detail:</th><td><input type="checkbox" name="list_show_detail_link"{if $genSettings.fieldData.list_show_detail_link.value} checked="checked"{/if}></td></tr>
+                        <tr><th>Show Member Logo:</th><td><input type="checkbox" name="list_show_logo"{if $genSettings.fieldData.list_show_logo.value} checked="checked"{/if}></td></tr>
                         <tr>
-                            <th {if $settings.fieldRequired.list_logo_size}class="glm-required"{/if}>Logo Size:</th>
-                            <td {if $settings.fieldFail.list_logo_size}class="glm-form-bad-input"{/if}>
+                            <th {if $genSettings.fieldRequired.list_logo_size}class="glm-required"{/if}>Logo Size:</th>
+                            <td {if $genSettings.fieldFail.list_logo_size}class="glm-form-bad-input"{/if}>
                                 <select name="list_logo_size">
-                    {foreach from=$settings.fieldData.list_logo_size.list item=v}
+                    {foreach from=$genSettings.fieldData.list_logo_size.list item=v}
                                     <option value="{$v.value}"{if $v.default} selected="selected"{/if}>{$v.name}</option>
                     {/foreach}
                                 </select>
-                                {if $settings.fieldFail.list_logo_size}<p>{$settings.fieldFail.list_logo_size}</p>{/if}
+                                {if $genSettings.fieldFail.list_logo_size}<p>{$genSettings.fieldFail.list_logo_size}</p>{/if}
                             </td>
                         </tr>            
-                        <tr><th>Show Address:</th><td><input type="checkbox" name="list_show_address"{if $settings.fieldData.list_show_address.value} checked="checked"{/if}></td></tr>
+                        <tr><th>Show Address:</th><td><input type="checkbox" name="list_show_address"{if $genSettings.fieldData.list_show_address.value} checked="checked"{/if}></td></tr>
                         </tr>
                             <tr>
                             <th>Address Options:</th>
                             <td>  
                                 <table class="glm-admin-table">
-                                    <tr><th>Show Street:</th><td><input type="checkbox" name="list_show_street"{if $settings.fieldData.list_show_street.value} checked="checked"{/if}></td></tr>
-                                    <tr><th>Show City, State, ZIP:</th><td><input type="checkbox" name="list_show_citystatezip"{if $settings.fieldData.list_show_citystatezip.value} checked="checked"{/if}></td></tr>
-                                    <tr><th>Show Country:</th><td><input type="checkbox" name="list_show_country"{if $settings.fieldData.list_show_country.value} checked="checked"{/if}></td></tr>                      
+                                    <tr><th>Show Street:</th><td><input type="checkbox" name="list_show_street"{if $genSettings.fieldData.list_show_street.value} checked="checked"{/if}></td></tr>
+                                    <tr><th>Show City, State, ZIP:</th><td><input type="checkbox" name="list_show_citystatezip"{if $genSettings.fieldData.list_show_citystatezip.value} checked="checked"{/if}></td></tr>
+                                    <tr><th>Show Country:</th><td><input type="checkbox" name="list_show_country"{if $genSettings.fieldData.list_show_country.value} checked="checked"{/if}></td></tr>                      
                                 </table>
                             </td>
                         </tr>
-                        <tr><th>Show Region:</th><td><input type="checkbox" name="list_show_region"{if $settings.fieldData.list_show_region.value} checked="checked"{/if}></td></tr>
-                        <tr><th>Show Description:</th><td><input type="checkbox" name="list_show_descr"{if $settings.fieldData.list_show_descr.value} checked="checked"{/if}></td></tr>
-                        <tr><th>Show Short Description:</th><td><input type="checkbox" name="list_show_short_descr"{if $settings.fieldData.list_show_short_descr.value} checked="checked"{/if}></td></tr>
-                        <tr><th>Show Phone Number:</th><td><input type="checkbox" name="list_show_phone"{if $settings.fieldData.list_show_phone.value} checked="checked"{/if}></td></tr>
-                        <tr><th>Show Toll Free Phone Number:</th><td><input type="checkbox" name="list_show_tollfree"{if $settings.fieldData.list_show_tollfree.value} checked="checked"{/if}></td></tr>
+                        <tr><th>Show Region:</th><td><input type="checkbox" name="list_show_region"{if $genSettings.fieldData.list_show_region.value} checked="checked"{/if}></td></tr>
+                        <tr><th>Show Description:</th><td><input type="checkbox" name="list_show_descr"{if $genSettings.fieldData.list_show_descr.value} checked="checked"{/if}></td></tr>
+                        <tr><th>Show Short Description:</th><td><input type="checkbox" name="list_show_short_descr"{if $genSettings.fieldData.list_show_short_descr.value} checked="checked"{/if}></td></tr>
+                        <tr><th>Show Phone Number:</th><td><input type="checkbox" name="list_show_phone"{if $genSettings.fieldData.list_show_phone.value} checked="checked"{/if}></td></tr>
+                        <tr><th>Show Toll Free Phone Number:</th><td><input type="checkbox" name="list_show_tollfree"{if $genSettings.fieldData.list_show_tollfree.value} checked="checked"{/if}></td></tr>
                         <tr>
                             <th>Show URL:</th>
                             <td>
-                                <input type="checkbox" name="list_show_url"{if $settings.fieldData.list_show_url.value} checked="checked"{/if}>
-                                Display URL as a link: <input type="checkbox" name="list_show_url_newtarget"{if $settings.fieldData.list_show_url_newtarget.value} checked="checked"{/if}>
+                                <input type="checkbox" name="list_show_url"{if $genSettings.fieldData.list_show_url.value} checked="checked"{/if}>
+                                Display URL as a link: <input type="checkbox" name="list_show_url_newtarget"{if $genSettings.fieldData.list_show_url_newtarget.value} checked="checked"{/if}>
                             </td>
                         </tr>
-                        <tr><th>Show Categories:</th><td><input type="checkbox" name="list_show_categories"{if $settings.fieldData.list_show_categories.value} checked="checked"{/if}></td></tr>
-                        <tr><th>Show Credit Cards Accepted:</th><td><input type="checkbox" name="list_show_creditcards"{if $settings.fieldData.list_show_creditcards.value} checked="checked"{/if}></td></tr>
-                        <tr><th>Show Amenities:</th><td><input type="checkbox" name="list_show_amenities"{if $settings.fieldData.list_show_amenities.value} checked="checked"{/if}></td></tr>
+                        <tr><th>Show Categories:</th><td><input type="checkbox" name="list_show_categories"{if $genSettings.fieldData.list_show_categories.value} checked="checked"{/if}></td></tr>
+                        <tr><th>Show Credit Cards Accepted:</th><td><input type="checkbox" name="list_show_creditcards"{if $genSettings.fieldData.list_show_creditcards.value} checked="checked"{/if}></td></tr>
+                        <tr><th>Show Amenities:</th><td><input type="checkbox" name="list_show_amenities"{if $genSettings.fieldData.list_show_amenities.value} checked="checked"{/if}></td></tr>
                     </table>
                 </td>
             </tr>
             <tr>
                 <th>Show Map:</th>
                 <td>
-                    <input type="checkbox" name="detail_show_map"{if $settings.fieldData.detail_show_map.value} checked="checked"{/if}>
+                    <input type="checkbox" name="detail_show_map"{if $genSettings.fieldData.detail_show_map.value} checked="checked"{/if}>
                 </td>
             </tr>
             <tr>
                 <th>Map Options:</th>
                 <td>
                     <table class="glm-admin-table">
-                        <tr><th>Show Logo:</th><td><input type="checkbox" name="detail_map_show_logo"{if $settings.fieldData.detail_map_show_logo.value} checked="checked"{/if}></td></tr>
+                        <tr><th>Show Logo:</th><td><input type="checkbox" name="detail_map_show_logo"{if $genSettings.fieldData.detail_map_show_logo.value} checked="checked"{/if}></td></tr>
                         <tr>
                             <th>Logo Size:</th>
                             <td>
                                 <select name="detail_map_logo_size">
-                    {foreach from=$settings.fieldData.detail_map_logo_size.list item=v}
+                    {foreach from=$genSettings.fieldData.detail_map_logo_size.list item=v}
                                     <option value="{$v.value}"{if $v.default} selected="selected"{/if}>{$v.name}</option>
                     {/foreach}
                                 </select>
                             </td>
                         </tr>
-                        <tr><th>Show Description:</th><td><input type="checkbox" name="detail_map_show_descr"{if $settings.fieldData.detail_map_show_descr.value} checked="checked"{/if}></td></tr>
-                        <tr><th>Show Short Description:</th><td><input type="checkbox" name="detail_map_show_short_descr"{if $settings.fieldData.detail_map_show_short_descr.value} checked="checked"{/if}></td></tr>
-                        <tr><th>Show Address:</th><td><input type="checkbox" name="detail_map_show_address"{if $settings.fieldData.detail_map_show_address.value} checked="checked"{/if}></td></tr>
-                        <tr><th>Show Street:</th><td><input type="checkbox" name="detail_map_show_street"{if $settings.fieldData.detail_map_show_street.value} checked="checked"{/if}></td></tr>
-                        <tr><th>Show City, State, ZIP:</th><td><input type="checkbox" name="detail_map_show_citystatezip"{if $settings.fieldData.detail_map_show_citystatezip.value} checked="checked"{/if}></td></tr>
-                        <tr><th>Show Country:</th><td><input type="checkbox" name="detail_map_show_country"{if $settings.fieldData.detail_map_show_country.value} checked="checked"{/if}></td></tr>
-                        <tr><th>Show Region:</th><td><input type="checkbox" name="detail_map_show_region"{if $settings.fieldData.detail_map_show_region.value} checked="checked"{/if}></td></tr>
-                        <tr><th>Show Phone:</th><td><input type="checkbox" name="detail_map_show_phone"{if $settings.fieldData.detail_map_show_phone.value} checked="checked"{/if}></td></tr>
-                        <tr><th>Show Toll Free:</th><td><input type="checkbox" name="detail_map_show_tollfree"{if $settings.fieldData.detail_map_show_tollfree.value} checked="checked"{/if}></td></tr>
+                        <tr><th>Show Description:</th><td><input type="checkbox" name="detail_map_show_descr"{if $genSettings.fieldData.detail_map_show_descr.value} checked="checked"{/if}></td></tr>
+                        <tr><th>Show Short Description:</th><td><input type="checkbox" name="detail_map_show_short_descr"{if $genSettings.fieldData.detail_map_show_short_descr.value} checked="checked"{/if}></td></tr>
+                        <tr><th>Show Address:</th><td><input type="checkbox" name="detail_map_show_address"{if $genSettings.fieldData.detail_map_show_address.value} checked="checked"{/if}></td></tr>
+                        <tr><th>Show Street:</th><td><input type="checkbox" name="detail_map_show_street"{if $genSettings.fieldData.detail_map_show_street.value} checked="checked"{/if}></td></tr>
+                        <tr><th>Show City, State, ZIP:</th><td><input type="checkbox" name="detail_map_show_citystatezip"{if $genSettings.fieldData.detail_map_show_citystatezip.value} checked="checked"{/if}></td></tr>
+                        <tr><th>Show Country:</th><td><input type="checkbox" name="detail_map_show_country"{if $genSettings.fieldData.detail_map_show_country.value} checked="checked"{/if}></td></tr>
+                        <tr><th>Show Region:</th><td><input type="checkbox" name="detail_map_show_region"{if $genSettings.fieldData.detail_map_show_region.value} checked="checked"{/if}></td></tr>
+                        <tr><th>Show Phone:</th><td><input type="checkbox" name="detail_map_show_phone"{if $genSettings.fieldData.detail_map_show_phone.value} checked="checked"{/if}></td></tr>
+                        <tr><th>Show Toll Free:</th><td><input type="checkbox" name="detail_map_show_tollfree"{if $genSettings.fieldData.detail_map_show_tollfree.value} checked="checked"{/if}></td></tr>
                         <tr>
                             <th>Show URL:</th>
                             <td>
-                                <input type="checkbox" name="detail_map_show_url"{if $settings.fieldData.detail_map_show_url.value} checked="checked"{/if}>
-                                Display URL as a link: <input type="checkbox" name="detail_map_show_url_newtarget"{if $settings.fieldData.detail_map_show_url_newtarget.value} checked="checked"{/if}>
+                                <input type="checkbox" name="detail_map_show_url"{if $genSettings.fieldData.detail_map_show_url.value} checked="checked"{/if}>
+                                Display URL as a link: <input type="checkbox" name="detail_map_show_url_newtarget"{if $genSettings.fieldData.detail_map_show_url_newtarget.value} checked="checked"{/if}>
                             </td>
                         </tr>
-                        <tr><th>Show Categories:</th><td><input type="checkbox" name="detail_map_show_categories"{if $settings.fieldData.detail_map_show_categories.value} checked="checked"{/if}></td></tr>
-                        <tr><th>Show Credit Cards:</th><td><input type="checkbox" name="detail_map_show_creditcards"{if $settings.fieldData.detail_map_show_creditcards.value} checked="checked"{/if}></td></tr>
-                        <tr><th>Show Amenitiies:</th><td><input type="checkbox" name="detail_map_show_amenities"{if $settings.fieldData.detail_map_show_amenities.value} checked="checked"{/if}></td></tr>
+                        <tr><th>Show Categories:</th><td><input type="checkbox" name="detail_map_show_categories"{if $genSettings.fieldData.detail_map_show_categories.value} checked="checked"{/if}></td></tr>
+                        <tr><th>Show Credit Cards:</th><td><input type="checkbox" name="detail_map_show_creditcards"{if $genSettings.fieldData.detail_map_show_creditcards.value} checked="checked"{/if}></td></tr>
+                        <tr><th>Show Amenitiies:</th><td><input type="checkbox" name="detail_map_show_amenities"{if $genSettings.fieldData.detail_map_show_amenities.value} checked="checked"{/if}></td></tr>
                     </table>
                 </td>
             </tr>
             <tr>
                 <th>Show Directions:</th>
                 <td>
-                    <input type="checkbox" name="detail_show_directions"{if $settings.fieldData.detail_show_directions.value} checked="checked"{/if}>
+                    <input type="checkbox" name="detail_show_directions"{if $genSettings.fieldData.detail_show_directions.value} checked="checked"{/if}>
                 </td>
             </tr>
             <tr>
                 <th>Member Detail Options:</th>
                 <td>
                     <table class="glm-admin-table">
-                        <tr><th>Show Member Logo:</th><td><input type="checkbox" name="detail_show_logo"{if $settings.fieldData.detail_show_logo.value} checked="checked"{/if}></td></tr>
+                        <tr><th>Show Member Logo:</th><td><input type="checkbox" name="detail_show_logo"{if $genSettings.fieldData.detail_show_logo.value} checked="checked"{/if}></td></tr>
                        <tr>
-                            <th {if $settings.fieldRequired.detail_logo_size}class="glm-required"{/if}>Logo Size:</th>
-                            <td {if $settings.fieldFail.detail_logo_size}class="glm-form-bad-input"{/if}>
+                            <th {if $genSettings.fieldRequired.detail_logo_size}class="glm-required"{/if}>Logo Size:</th>
+                            <td {if $genSettings.fieldFail.detail_logo_size}class="glm-form-bad-input"{/if}>
                                 <select name="detail_logo_size">
-                    {foreach from=$settings.fieldData.detail_logo_size.list item=v}
+                    {foreach from=$genSettings.fieldData.detail_logo_size.list item=v}
                                     <option value="{$v.value}"{if $v.default} selected="selected"{/if}>{$v.name}</option>
                     {/foreach}
                                 </select>
-                                {if $settings.fieldFail.detail_logo_size}<p>{$settings.fieldFail.detail_logo_size}</p>{/if}
+                                {if $genSettings.fieldFail.detail_logo_size}<p>{$genSettings.fieldFail.detail_logo_size}</p>{/if}
                             </td>
                         </tr>            
-                        <tr><th>Show Address:</th><td><input type="checkbox" name="detail_show_address"{if $settings.fieldData.detail_show_address.value} checked="checked"{/if}></td></tr>
+                        <tr><th>Show Address:</th><td><input type="checkbox" name="detail_show_address"{if $genSettings.fieldData.detail_show_address.value} checked="checked"{/if}></td></tr>
                         </tr>
                             <tr>
                             <th>Address Options:</th>
                             <td>  
                                 <table class="glm-admin-table">
-                                    <tr><th>Show Street:</th><td><input type="checkbox" name="detail_show_street"{if $settings.fieldData.detail_show_street.value} checked="checked"{/if}></td></tr>
-                                    <tr><th>Show City, State, ZIP:</th><td><input type="checkbox" name="detail_show_citystatezip"{if $settings.fieldData.detail_show_citystatezip.value} checked="checked"{/if}></td></tr>
-                                    <tr><th>Show Country:</th><td><input type="checkbox" name="detail_show_country"{if $settings.fieldData.detail_show_country.value} checked="checked"{/if}></td></tr>                      
+                                    <tr><th>Show Street:</th><td><input type="checkbox" name="detail_show_street"{if $genSettings.fieldData.detail_show_street.value} checked="checked"{/if}></td></tr>
+                                    <tr><th>Show City, State, ZIP:</th><td><input type="checkbox" name="detail_show_citystatezip"{if $genSettings.fieldData.detail_show_citystatezip.value} checked="checked"{/if}></td></tr>
+                                    <tr><th>Show Country:</th><td><input type="checkbox" name="detail_show_country"{if $genSettings.fieldData.detail_show_country.value} checked="checked"{/if}></td></tr>                      
                                 </table>
                             </td>
                         </tr>
-                        <tr><th>Show Region:</th><td><input type="checkbox" name="detail_show_region"{if $settings.fieldData.detail_show_region.value} checked="checked"{/if}></td></tr>
-                        <tr><th>Show Description:</th><td><input type="checkbox" name="detail_show_descr"{if $settings.fieldData.detail_show_descr.value} checked="checked"{/if}></td></tr>
-                        <tr><th>Show Short Description:</th><td><input type="checkbox" name="detail_show_short_descr"{if $settings.fieldData.detail_show_short_descr.value} checked="checked"{/if}></td></tr>
-                        <tr><th>Show Phone Number:</th><td><input type="checkbox" name="detail_show_phone"{if $settings.fieldData.detail_show_phone.value} checked="checked"{/if}></td></tr>
-                        <tr><th>Show Toll Free Phone Number:</th><td><input type="checkbox" name="detail_show_tollfree"{if $settings.fieldData.detail_show_tollfree.value} checked="checked"{/if}></td></tr>
+                        <tr><th>Show Region:</th><td><input type="checkbox" name="detail_show_region"{if $genSettings.fieldData.detail_show_region.value} checked="checked"{/if}></td></tr>
+                        <tr><th>Show Description:</th><td><input type="checkbox" name="detail_show_descr"{if $genSettings.fieldData.detail_show_descr.value} checked="checked"{/if}></td></tr>
+                        <tr><th>Show Short Description:</th><td><input type="checkbox" name="detail_show_short_descr"{if $genSettings.fieldData.detail_show_short_descr.value} checked="checked"{/if}></td></tr>
+                        <tr><th>Show Phone Number:</th><td><input type="checkbox" name="detail_show_phone"{if $genSettings.fieldData.detail_show_phone.value} checked="checked"{/if}></td></tr>
+                        <tr><th>Show Toll Free Phone Number:</th><td><input type="checkbox" name="detail_show_tollfree"{if $genSettings.fieldData.detail_show_tollfree.value} checked="checked"{/if}></td></tr>
                         <tr>
                             <th>Show URL:</th>
                             <td>
-                                <input type="checkbox" name="detail_show_url"{if $settings.fieldData.detail_show_url.value} checked="checked"{/if}>
-                                Display URL as a link: <input type="checkbox" name="detail_show_url_newtarget"{if $settings.fieldData.detail_show_url_newtarget.value} checked="checked"{/if}>
+                                <input type="checkbox" name="detail_show_url"{if $genSettings.fieldData.detail_show_url.value} checked="checked"{/if}>
+                                Display URL as a link: <input type="checkbox" name="detail_show_url_newtarget"{if $genSettings.fieldData.detail_show_url_newtarget.value} checked="checked"{/if}>
                             </td>
                         </tr>
-                        <tr><th>Show Categories:</th><td><input type="checkbox" name="detail_show_categories"{if $settings.fieldData.detail_show_categories.value} checked="checked"{/if}></td></tr>
-                        <tr><th>Show Credit Cards Accepted:</th><td><input type="checkbox" name="detail_show_creditcards"{if $settings.fieldData.detail_show_creditcards.value} checked="checked"{/if}></td></tr>
-                        <tr><th>Show Amenities:</th><td><input type="checkbox" name="detail_show_amenities"{if $settings.fieldData.detail_show_amenities.value} checked="checked"{/if}></td></tr>
-                        <tr><th>Show Image Gallery:</th><td><input type="checkbox" name="detail_show_imagegallery"{if $settings.fieldData.detail_show_imagegallery.value} checked="checked"{/if}></td></tr>
+                        <tr><th>Show Categories:</th><td><input type="checkbox" name="detail_show_categories"{if $genSettings.fieldData.detail_show_categories.value} checked="checked"{/if}></td></tr>
+                        <tr><th>Show Credit Cards Accepted:</th><td><input type="checkbox" name="detail_show_creditcards"{if $genSettings.fieldData.detail_show_creditcards.value} checked="checked"{/if}></td></tr>
+                        <tr><th>Show Amenities:</th><td><input type="checkbox" name="detail_show_amenities"{if $genSettings.fieldData.detail_show_amenities.value} checked="checked"{/if}></td></tr>
+                        <tr><th>Show Image Gallery:</th><td><input type="checkbox" name="detail_show_imagegallery"{if $genSettings.fieldData.detail_show_imagegallery.value} checked="checked"{/if}></td></tr>
                     </table>
                 </td>
             </tr>
index 8508b65..ffea0f8 100644 (file)
@@ -1,7 +1,7 @@
 {include file='admin/management/header.html'}
-    
-    <h1>*** Not using these settings yet! ***</h1>
-    
+        
+    <h2 style="color: blue;">NOTE: Not all of these tems have been integrated into the site yet.</h2>    
+        
     <form action="{$thisURL}?page={$thisPage}" method="post" enctype="multipart/form-data">
         <input type="hidden" name="glm_action" value="terms">
         <input type="hidden" name="option" value="submit">
         
             <tr><td colspan="2"><h2>Admin Menu and Tab Names</h2></td></tr>
             <tr>
-                <th {if $settings.fieldRequired.term_admin_menu_members}class="glm-required"{/if}>Members Menu:</th>
-                <td {if $settings.fieldFail.term_admin_menu_members}class="glm-form-bad-input"{/if}>
-                    <input type="text" name="term_admin_menu_members" value="{$settings.fieldData.term_admin_menu_members}" class="glm-form-text-input-medium">
-                    {if $settings.fieldFail.term_admin_menu_members}<p>{$settings.fieldFail.term_admin_menu_members}</p>{/if}
+                <th {if $termSettings.fieldRequired.term_admin_menu_members}class="glm-required"{/if}>Members Menu:</th>
+                <td {if $termSettings.fieldFail.term_admin_menu_members}class="glm-form-bad-input"{/if}>
+                    <input type="text" name="term_admin_menu_members" value="{$termSettings.fieldData.term_admin_menu_members}" class="glm-form-text-input-medium">
+                    {if $termSettings.fieldFail.term_admin_menu_members}<p>{$termSettings.fieldFail.term_admin_menu_members}</p>{/if}
                 </td>
             </tr>
             <tr>
                 <td>
                     <table class="glm-admin-table">
                         <tr>
-                            <th {if $settings.fieldRequired.term_admin_menu_members_dashboard}class="glm-required"{/if}>Main Dashboard:</th>
-                            <td {if $settings.fieldFail.term_admin_menu_members_dashboard}class="glm-form-bad-input"{/if}>
-                                <input type="text" name="term_admin_menu_members_dashboard" value="{$settings.fieldData.term_admin_menu_members_dashboard}" class="glm-form-text-input-medium">
-                                {if $settings.fieldFail.term_admin_menu_members_dashboard}<p>{$settings.fieldFail.term_admin_menu_members_dashboard}</p>{/if}
+                            <th {if $termSettings.fieldRequired.term_admin_menu_members_dashboard}class="glm-required"{/if}>Main Dashboard:</th>
+                            <td {if $termSettings.fieldFail.term_admin_menu_members_dashboard}class="glm-form-bad-input"{/if}>
+                                <input type="text" name="term_admin_menu_members_dashboard" value="{$termSettings.fieldData.term_admin_menu_members_dashboard}" class="glm-form-text-input-medium">
+                                {if $termSettings.fieldFail.term_admin_menu_members_dashboard}<p>{$termSettings.fieldFail.term_admin_menu_members_dashboard}</p>{/if}
                             </td>
                         </tr>
                         <tr>
-                            <th {if $settings.fieldRequired.term_admin_menu_members_list}class="glm-required"{/if}>Member List:</th>
-                            <td {if $settings.fieldFail.term_admin_menu_members_list}class="glm-form-bad-input"{/if}>
-                                <input type="text" name="term_admin_menu_members_list" value="{$settings.fieldData.term_admin_menu_members_list}" class="glm-form-text-input-medium">
-                                {if $settings.fieldFail.term_admin_menu_members_list}<p>{$settings.fieldFail.term_admin_menu_members_list}</p>{/if}
+                            <th {if $termSettings.fieldRequired.term_admin_menu_members_list}class="glm-required"{/if}>Member List:</th>
+                            <td {if $termSettings.fieldFail.term_admin_menu_members_list}class="glm-form-bad-input"{/if}>
+                                <input type="text" name="term_admin_menu_members_list" value="{$termSettings.fieldData.term_admin_menu_members_list}" class="glm-form-text-input-medium">
+                                {if $termSettings.fieldFail.term_admin_menu_members_list}<p>{$termSettings.fieldFail.term_admin_menu_members_list}</p>{/if}
                             </td>
                         </tr>
                         <tr>
-                            <th {if $settings.fieldRequired.term_admin_menu_members_reports}class="glm-required"{/if}>Reports:</th>
-                            <td {if $settings.fieldFail.term_admin_menu_members_reports}class="glm-form-bad-input"{/if}>
-                                <input type="text" name="term_admin_menu_members_reports" value="{$settings.fieldData.term_admin_menu_members_reports}" class="glm-form-text-input-medium">
-                                {if $settings.fieldFail.term_admin_menu_members_reports}<p>{$settings.fieldFail.term_admin_menu_members_reports}</p>{/if}
+                            <th {if $termSettings.fieldRequired.term_admin_menu_members_reports}class="glm-required"{/if}>Reports:</th>
+                            <td {if $termSettings.fieldFail.term_admin_menu_members_reports}class="glm-form-bad-input"{/if}>
+                                <input type="text" name="term_admin_menu_members_reports" value="{$termSettings.fieldData.term_admin_menu_members_reports}" class="glm-form-text-input-medium">
+                                {if $termSettings.fieldFail.term_admin_menu_members_reports}<p>{$termSettings.fieldFail.term_admin_menu_members_reports}</p>{/if}
                             </td>
                         </tr>
                     </table>
                 </td>
             </tr>
             <tr>
-                <th {if $settings.fieldRequired.term_admin_menu_member}class="glm-required"{/if}>Member Menu:</th>
-                <td {if $settings.fieldFail.term_admin_menu_member}class="glm-form-bad-input"{/if}>
-                    <input type="text" name="term_admin_menu_member" value="{$settings.fieldData.term_admin_menu_member}" class="glm-form-text-input-medium">
-                    {if $settings.fieldFail.term_admin_menu_member}<p>{$settings.fieldFail.term_admin_menu_member}</p>{/if}
+                <th {if $termSettings.fieldRequired.term_admin_menu_member}class="glm-required"{/if}>Member Menu:</th>
+                <td {if $termSettings.fieldFail.term_admin_menu_member}class="glm-form-bad-input"{/if}>
+                    <input type="text" name="term_admin_menu_member" value="{$termSettings.fieldData.term_admin_menu_member}" class="glm-form-text-input-medium">
+                    {if $termSettings.fieldFail.term_admin_menu_member}<p>{$termSettings.fieldFail.term_admin_menu_member}</p>{/if}
                 </td>
             </tr>
             <tr>
                 <td>
                     <table class="glm-admin-table">
                         <tr>
-                            <th {if $settings.fieldRequired.term_admin_menu_member_dashboard}class="glm-required"{/if}>Member Dashboard:</th>
-                            <td {if $settings.fieldFail.term_admin_menu_member_dashboard}class="glm-form-bad-input"{/if}>
-                                <input type="text" name="term_admin_menu_member_dashboard" value="{$settings.fieldData.term_admin_menu_member_dashboard}" class="glm-form-text-input-medium">
-                                {if $settings.fieldFail.term_admin_menu_member_dashboard}<p>{$settings.fieldFail.term_admin_menu_member_dashboard}</p>{/if}
+                            <th {if $termSettings.fieldRequired.term_admin_menu_member_dashboard}class="glm-required"{/if}>Member Dashboard:</th>
+                            <td {if $termSettings.fieldFail.term_admin_menu_member_dashboard}class="glm-form-bad-input"{/if}>
+                                <input type="text" name="term_admin_menu_member_dashboard" value="{$termSettings.fieldData.term_admin_menu_member_dashboard}" class="glm-form-text-input-medium">
+                                {if $termSettings.fieldFail.term_admin_menu_member_dashboard}<p>{$termSettings.fieldFail.term_admin_menu_member_dashboard}</p>{/if}
                             </td>
                         </tr>
                         <tr>
-                            <th {if $settings.fieldRequired.term_admin_menu_member_info}class="glm-required"{/if}>Member Info:</th>
-                            <td {if $settings.fieldFail.term_admin_menu_member_info}class="glm-form-bad-input"{/if}>
-                                <input type="text" name="term_admin_menu_member_info" value="{$settings.fieldData.term_admin_menu_member_info}" class="glm-form-text-input-medium">
-                                {if $settings.fieldFail.term_admin_menu_member_info}<p>{$settings.fieldFail.term_admin_menu_member_info}</p>{/if}
+                            <th {if $termSettings.fieldRequired.term_admin_menu_member_info}class="glm-required"{/if}>Member Info:</th>
+                            <td {if $termSettings.fieldFail.term_admin_menu_member_info}class="glm-form-bad-input"{/if}>
+                                <input type="text" name="term_admin_menu_member_info" value="{$termSettings.fieldData.term_admin_menu_member_info}" class="glm-form-text-input-medium">
+                                {if $termSettings.fieldFail.term_admin_menu_member_info}<p>{$termSettings.fieldFail.term_admin_menu_member_info}</p>{/if}
                             </td>
                         </tr>
                         <tr>
-                            <th {if $settings.fieldRequired.term_admin_menu_member_locations}class="glm-required"{/if}>Locations:</th>
-                            <td {if $settings.fieldFail.term_admin_menu_member_locations}class="glm-form-bad-input"{/if}>
-                                <input type="text" name="term_admin_menu_member_locations" value="{$settings.fieldData.term_admin_menu_member_locations}" class="glm-form-text-input-medium">
-                                {if $settings.fieldFail.term_admin_menu_member_locations}<p>{$settings.fieldFail.term_admin_menu_member_locations}</p>{/if}
+                            <th {if $termSettings.fieldRequired.term_admin_menu_member_locations}class="glm-required"{/if}>Locations:</th>
+                            <td {if $termSettings.fieldFail.term_admin_menu_member_locations}class="glm-form-bad-input"{/if}>
+                                <input type="text" name="term_admin_menu_member_locations" value="{$termSettings.fieldData.term_admin_menu_member_locations}" class="glm-form-text-input-medium">
+                                {if $termSettings.fieldFail.term_admin_menu_member_locations}<p>{$termSettings.fieldFail.term_admin_menu_member_locations}</p>{/if}
                             </td>
                         </tr>
                         <tr>
-                            <th {if $settings.fieldRequired.term_admin_menu_member_facilities}class="glm-required"{/if}>Facilities:</th>
-                            <td {if $settings.fieldFail.term_admin_menu_member_facilities}class="glm-form-bad-input"{/if}>
-                                <input type="text" name="term_admin_menu_member_facilities" value="{$settings.fieldData.term_admin_menu_member_facilities}" class="glm-form-text-input-medium">
-                                {if $settings.fieldFail.term_admin_menu_member_facilities}<p>{$settings.fieldFail.term_admin_menu_member_facilities}</p>{/if}
+                            <th {if $termSettings.fieldRequired.term_admin_menu_member_facilities}class="glm-required"{/if}>Facilities:</th>
+                            <td {if $termSettings.fieldFail.term_admin_menu_member_facilities}class="glm-form-bad-input"{/if}>
+                                <input type="text" name="term_admin_menu_member_facilities" value="{$termSettings.fieldData.term_admin_menu_member_facilities}" class="glm-form-text-input-medium">
+                                {if $termSettings.fieldFail.term_admin_menu_member_facilities}<p>{$termSettings.fieldFail.term_admin_menu_member_facilities}</p>{/if}
                             </td>
                         </tr>
                         <tr>
-                            <th {if $settings.fieldRequired.term_admin_menu_member_attractions}class="glm-required"{/if}>Attractions:</th>
-                            <td {if $settings.fieldFail.term_admin_menu_member_attractions}class="glm-form-bad-input"{/if}>
-                                <input type="text" name="term_admin_menu_member_attractions" value="{$settings.fieldData.term_admin_menu_member_attractions}" class="glm-form-text-input-medium">
-                                {if $settings.fieldFail.term_admin_menu_member_attractions}<p>{$settings.fieldFail.term_admin_menu_member_attractions}</p>{/if}
+                            <th {if $termSettings.fieldRequired.term_admin_menu_member_attractions}class="glm-required"{/if}>Attractions:</th>
+                            <td {if $termSettings.fieldFail.term_admin_menu_member_attractions}class="glm-form-bad-input"{/if}>
+                                <input type="text" name="term_admin_menu_member_attractions" value="{$termSettings.fieldData.term_admin_menu_member_attractions}" class="glm-form-text-input-medium">
+                                {if $termSettings.fieldFail.term_admin_menu_member_attractions}<p>{$termSettings.fieldFail.term_admin_menu_member_attractions}</p>{/if}
                             </td>
                         </tr>
                         <tr>
-                            <th {if $settings.fieldRequired.term_admin_menu_member_contacts}class="glm-required"{/if}>Contacts:</th>
-                            <td {if $settings.fieldFail.term_admin_menu_member_contacts}class="glm-form-bad-input"{/if}>
-                                <input type="text" name="term_admin_menu_member_contacts" value="{$settings.fieldData.term_admin_menu_member_contacts}" class="glm-form-text-input-medium">
-                                {if $settings.fieldFail.term_admin_menu_member_contacts}<p>{$settings.fieldFail.term_admin_menu_member_contacts}</p>{/if}
+                            <th {if $termSettings.fieldRequired.term_admin_menu_member_contacts}class="glm-required"{/if}>Contacts:</th>
+                            <td {if $termSettings.fieldFail.term_admin_menu_member_contacts}class="glm-form-bad-input"{/if}>
+                                <input type="text" name="term_admin_menu_member_contacts" value="{$termSettings.fieldData.term_admin_menu_member_contacts}" class="glm-form-text-input-medium">
+                                {if $termSettings.fieldFail.term_admin_menu_member_contacts}<p>{$termSettings.fieldFail.term_admin_menu_member_contacts}</p>{/if}
                             </td>
                         </tr>
                     </table>
                 </td>
             </tr>
             <tr>
-                <th {if $settings.fieldRequired.term_admin_menu_configure}class="glm-required"{/if}>Configure Menu:</th>
-                <td {if $settings.fieldFail.term_admin_menu_configure}class="glm-form-bad-input"{/if}>
-                    <input type="text" name="term_admin_menu_configure" value="{$settings.fieldData.term_admin_menu_configure}" class="glm-form-text-input-medium">
-                    {if $settings.fieldFail.term_admin_menu_configure}<p>{$settings.fieldFail.term_admin_menu_configure}</p>{/if}
+                <th {if $termSettings.fieldRequired.term_admin_menu_configure}class="glm-required"{/if}>Configure Menu:</th>
+                <td {if $termSettings.fieldFail.term_admin_menu_configure}class="glm-form-bad-input"{/if}>
+                    <input type="text" name="term_admin_menu_configure" value="{$termSettings.fieldData.term_admin_menu_configure}" class="glm-form-text-input-medium">
+                    {if $termSettings.fieldFail.term_admin_menu_configure}<p>{$termSettings.fieldFail.term_admin_menu_configure}</p>{/if}
                 </td>
             </tr>
             <tr>
                 <td>
                     <table class="glm-admin-table">
                         <tr>
-                            <th {if $settings.fieldRequired.term_admin_menu_configure_member_types}class="glm-required"{/if}>Member Types:</th>
-                            <td {if $settings.fieldFail.term_admin_menu_configure_member_types}class="glm-form-bad-input"{/if}>
-                                <input type="text" name="term_admin_menu_configure_member_types" value="{$settings.fieldData.term_admin_menu_configure_member_types}" class="glm-form-text-input-medium">
-                                {if $settings.fieldFail.term_admin_menu_configure_member_types}<p>{$settings.fieldFail.term_admin_menu_configure_member_types}</p>{/if}
+                            <th {if $termSettings.fieldRequired.term_admin_menu_configure_member_types}class="glm-required"{/if}>Member Types:</th>
+                            <td {if $termSettings.fieldFail.term_admin_menu_configure_member_types}class="glm-form-bad-input"{/if}>
+                                <input type="text" name="term_admin_menu_configure_member_types" value="{$termSettings.fieldData.term_admin_menu_configure_member_types}" class="glm-form-text-input-medium">
+                                {if $termSettings.fieldFail.term_admin_menu_configure_member_types}<p>{$termSettings.fieldFail.term_admin_menu_configure_member_types}</p>{/if}
                             </td>
                         </tr>
                         <tr>
-                            <th {if $settings.fieldRequired.term_admin_menu_configure_member_cats}class="glm-required"{/if}>Member Categories:</th>
-                            <td {if $settings.fieldFail.term_admin_menu_configure_member_cats}class="glm-form-bad-input"{/if}>
-                                <input type="text" name="term_admin_menu_configure_member_cats" value="{$settings.fieldData.term_admin_menu_configure_member_cats}" class="glm-form-text-input-medium">
-                                {if $settings.fieldFail.term_admin_menu_configure_member_cats}<p>{$settings.fieldFail.term_admin_menu_configure_member_cats}</p>{/if}
+                            <th {if $termSettings.fieldRequired.term_admin_menu_configure_member_cats}class="glm-required"{/if}>Member Categories:</th>
+                            <td {if $termSettings.fieldFail.term_admin_menu_configure_member_cats}class="glm-form-bad-input"{/if}>
+                                <input type="text" name="term_admin_menu_configure_member_cats" value="{$termSettings.fieldData.term_admin_menu_configure_member_cats}" class="glm-form-text-input-medium">
+                                {if $termSettings.fieldFail.term_admin_menu_configure_member_cats}<p>{$termSettings.fieldFail.term_admin_menu_configure_member_cats}</p>{/if}
                             </td>
                         </tr>
                         <tr>
-                            <th {if $settings.fieldRequired.term_admin_menu_configure_accom_types}class="glm-required"{/if}>Accommodation Types:</th>
-                            <td {if $settings.fieldFail.term_admin_menu_configure_accom_types}class="glm-form-bad-input"{/if}>
-                                <input type="text" name="term_admin_menu_configure_accom_types" value="{$settings.fieldData.term_admin_menu_configure_accom_types}" class="glm-form-text-input-medium">
-                                {if $settings.fieldFail.term_admin_menu_configure_accom_types}<p>{$settings.fieldFail.term_admin_menu_configure_accom_types}</p>{/if}
+                            <th {if $termSettings.fieldRequired.term_admin_menu_configure_accom_types}class="glm-required"{/if}>Accommodation Types:</th>
+                            <td {if $termSettings.fieldFail.term_admin_menu_configure_accom_types}class="glm-form-bad-input"{/if}>
+                                <input type="text" name="term_admin_menu_configure_accom_types" value="{$termSettings.fieldData.term_admin_menu_configure_accom_types}" class="glm-form-text-input-medium">
+                                {if $termSettings.fieldFail.term_admin_menu_configure_accom_types}<p>{$termSettings.fieldFail.term_admin_menu_configure_accom_types}</p>{/if}
                             </td>
                         </tr>
                         <tr>
-                            <th {if $settings.fieldRequired.term_admin_menu_configure_amenities}class="glm-required"{/if}>Amenities:</th>
-                            <td {if $settings.fieldFail.term_admin_menu_configure_amenities}class="glm-form-bad-input"{/if}>
-                                <input type="text" name="term_admin_menu_configure_amenities" value="{$settings.fieldData.term_admin_menu_configure_amenities}" class="glm-form-text-input-medium">
-                                {if $settings.fieldFail.term_admin_menu_configure_amenities}<p>{$settings.fieldFail.term_admin_menu_configure_amenities}</p>{/if}
+                            <th {if $termSettings.fieldRequired.term_admin_menu_configure_amenities}class="glm-required"{/if}>Amenities:</th>
+                            <td {if $termSettings.fieldFail.term_admin_menu_configure_amenities}class="glm-form-bad-input"{/if}>
+                                <input type="text" name="term_admin_menu_configure_amenities" value="{$termSettings.fieldData.term_admin_menu_configure_amenities}" class="glm-form-text-input-medium">
+                                {if $termSettings.fieldFail.term_admin_menu_configure_amenities}<p>{$termSettings.fieldFail.term_admin_menu_configure_amenities}</p>{/if}
                             </td>
                         </tr>
                         <tr>
-                            <th {if $settings.fieldRequired.term_admin_menu_configure_cities}class="glm-required"{/if}>Cities:</th>
-                            <td {if $settings.fieldFail.term_admin_menu_configure_cities}class="glm-form-bad-input"{/if}>
-                                <input type="text" name="term_admin_menu_configure_cities" value="{$settings.fieldData.term_admin_menu_configure_cities}" class="glm-form-text-input-medium">
-                                {if $settings.fieldFail.term_admin_menu_configure_cities}<p>{$settings.fieldFail.term_admin_menu_configure_cities}</p>{/if}
+                            <th {if $termSettings.fieldRequired.term_admin_menu_configure_cities}class="glm-required"{/if}>Cities:</th>
+                            <td {if $termSettings.fieldFail.term_admin_menu_configure_cities}class="glm-form-bad-input"{/if}>
+                                <input type="text" name="term_admin_menu_configure_cities" value="{$termSettings.fieldData.term_admin_menu_configure_cities}" class="glm-form-text-input-medium">
+                                {if $termSettings.fieldFail.term_admin_menu_configure_cities}<p>{$termSettings.fieldFail.term_admin_menu_configure_cities}</p>{/if}
                             </td>
                         </tr>
                         <tr>
-                            <th {if $settings.fieldRequired.term_admin_menu_configure_regions}class="glm-required"{/if}>Regions:</th>
-                            <td {if $settings.fieldFail.term_admin_menu_configure_regions}class="glm-form-bad-input"{/if}>
-                                <input type="text" name="term_admin_menu_configure_regions" value="{$settings.fieldData.term_admin_menu_configure_regions}" class="glm-form-text-input-medium">
-                                {if $settings.fieldFail.term_admin_menu_configure_regions}<p>{$settings.fieldFail.term_admin_menu_configure_regions}</p>{/if}
+                            <th {if $termSettings.fieldRequired.term_admin_menu_configure_regions}class="glm-required"{/if}>Regions:</th>
+                            <td {if $termSettings.fieldFail.term_admin_menu_configure_regions}class="glm-form-bad-input"{/if}>
+                                <input type="text" name="term_admin_menu_configure_regions" value="{$termSettings.fieldData.term_admin_menu_configure_regions}" class="glm-form-text-input-medium">
+                                {if $termSettings.fieldFail.term_admin_menu_configure_regions}<p>{$termSettings.fieldFail.term_admin_menu_configure_regions}</p>{/if}
                             </td>
                         </tr>
                     </table>
                 </td>
             </tr>
             <tr>
-                <th {if $settings.fieldRequired.term_admin_menu_settings}class="glm-required"{/if}>Settings Menu:</th>
-                <td {if $settings.fieldFail.term_admin_menu_settings}class="glm-form-bad-input"{/if}>
-                    <input type="text" name="term_admin_menu_settings" value="{$settings.fieldData.term_admin_menu_settings}" class="glm-form-text-input-medium">
-                    {if $settings.fieldFail.term_admin_menu_settings}<p>{$settings.fieldFail.term_admin_menu_settings}</p>{/if}
+                <th {if $termSettings.fieldRequired.term_admin_menu_settings}class="glm-required"{/if}>Settings Menu:</th>
+                <td {if $termSettings.fieldFail.term_admin_menu_settings}class="glm-form-bad-input"{/if}>
+                    <input type="text" name="term_admin_menu_settings" value="{$termSettings.fieldData.term_admin_menu_settings}" class="glm-form-text-input-medium">
+                    {if $termSettings.fieldFail.term_admin_menu_settings}<p>{$termSettings.fieldFail.term_admin_menu_settings}</p>{/if}
                 </td>
             </tr>
             <tr>
                 <td>
                     <table class="glm-admin-table">
                         <tr>
-                            <th {if $settings.fieldRequired.term_admin_menu_settings_general}class="glm-required"{/if}>General Settings:</th>
-                            <td {if $settings.fieldFail.term_admin_menu_settings_general}class="glm-form-bad-input"{/if}>
-                                <input type="text" name="term_admin_menu_settings_general" value="{$settings.fieldData.term_admin_menu_settings_general}" class="glm-form-text-input-medium">
-                                {if $settings.fieldFail.term_admin_menu_settings_general}<p>{$settings.fieldFail.term_admin_menu_settings_general}</p>{/if}
+                            <th {if $termSettings.fieldRequired.term_admin_menu_settings_general}class="glm-required"{/if}>General Settings:</th>
+                            <td {if $termSettings.fieldFail.term_admin_menu_settings_general}class="glm-form-bad-input"{/if}>
+                                <input type="text" name="term_admin_menu_settings_general" value="{$termSettings.fieldData.term_admin_menu_settings_general}" class="glm-form-text-input-medium">
+                                {if $termSettings.fieldFail.term_admin_menu_settings_general}<p>{$termSettings.fieldFail.term_admin_menu_settings_general}</p>{/if}
                             </td>
                         </tr>
                         <tr>
-                            <th {if $settings.fieldRequired.term_admin_menu_settings_terms}class="glm-required"{/if}>Terms & Phrases:</th>
-                            <td {if $settings.fieldFail.term_admin_menu_settings_terms}class="glm-form-bad-input"{/if}>
-                                <input type="text" name="term_admin_menu_settings_terms" value="{$settings.fieldData.term_admin_menu_settings_terms}" class="glm-form-text-input-medium">
-                                {if $settings.fieldFail.term_admin_menu_settings_terms}<p>{$settings.fieldFail.term_admin_menu_settings_terms}</p>{/if}
+                            <th {if $termSettings.fieldRequired.term_admin_menu_settings_terms}class="glm-required"{/if}>Terms & Phrases:</th>
+                            <td {if $termSettings.fieldFail.term_admin_menu_settings_terms}class="glm-form-bad-input"{/if}>
+                                <input type="text" name="term_admin_menu_settings_terms" value="{$termSettings.fieldData.term_admin_menu_settings_terms}" class="glm-form-text-input-medium">
+                                {if $termSettings.fieldFail.term_admin_menu_settings_terms}<p>{$termSettings.fieldFail.term_admin_menu_settings_terms}</p>{/if}
                             </td>
                         </tr>
                         <tr>
-                            <th {if $settings.fieldRequired.term_admin_menu_settings_development}class="glm-required"{/if}>Development:</th>
-                            <td {if $settings.fieldFail.term_admin_menu_settings_development}class="glm-form-bad-input"{/if}>
-                                <input type="text" name="term_admin_menu_settings_development" value="{$settings.fieldData.term_admin_menu_settings_development}" class="glm-form-text-input-medium">
-                                {if $settings.fieldFail.term_admin_menu_settings_development}<p>{$settings.fieldFail.term_admin_menu_settings_development}</p>{/if}
+                            <th {if $termSettings.fieldRequired.term_admin_menu_settings_development}class="glm-required"{/if}>Development:</th>
+                            <td {if $termSettings.fieldFail.term_admin_menu_settings_development}class="glm-form-bad-input"{/if}>
+                                <input type="text" name="term_admin_menu_settings_development" value="{$termSettings.fieldData.term_admin_menu_settings_development}" class="glm-form-text-input-medium">
+                                {if $termSettings.fieldFail.term_admin_menu_settings_development}<p>{$termSettings.fieldFail.term_admin_menu_settings_development}</p>{/if}
                             </td>
                         </tr>
                     </table>
                 </td>
             </tr>
+            <tr>
+                <th {if $termSettings.fieldRequired.term_admin_menu_shortcodes}class="glm-required"{/if}>Shortcodes Menu:</th>
+                <td {if $termSettings.fieldFail.term_admin_menu_shortcodes}class="glm-form-bad-input"{/if}>
+                    <input type="text" name="term_admin_menu_shortcodes" value="{$termSettings.fieldData.term_admin_menu_shortcodes}" class="glm-form-text-input-medium">
+                    {if $termSettings.fieldFail.term_admin_menu_shortcodes}<p>{$termSettings.fieldFail.term_admin_menu_shortcodes}</p>{/if}
+                </td>
+            </tr>
             <tr><td colspan="2"><hr></td></tr>
             <tr><td colspan="2"><h2>Terms</h2></td></tr>
             <tr>
                 <td>
                     <table class="glm-admin-table">
                         <tr>
-                            <th {if $settings.fieldRequired.term_member}class="glm-required"{/if}>Normal:</th>
-                            <td {if $settings.fieldFail.term_member}class="glm-form-bad-input"{/if}>
-                                <input type="text" name="term_member" value="{$settings.fieldData.term_member}" class="glm-form-text-input-medium">
-                                {if $settings.fieldFail.term_member}<p>{$settings.fieldFail.term_member}</p>{/if}
+                            <th {if $termSettings.fieldRequired.term_member}class="glm-required"{/if}>Normal:</th>
+                            <td {if $termSettings.fieldFail.term_member}class="glm-form-bad-input"{/if}>
+                                <input type="text" name="term_member" value="{$termSettings.fieldData.term_member}" class="glm-form-text-input-medium">
+                                {if $termSettings.fieldFail.term_member}<p>{$termSettings.fieldFail.term_member}</p>{/if}
                             </td>
                         </tr>
                         <tr>
-                            <th {if $settings.fieldRequired.term_member_cap}class="glm-required"{/if}>Capitalized:</th>
-                            <td {if $settings.fieldFail.term_member_cap}class="glm-form-bad-input"{/if}>
-                                <input type="text" name="term_member_cap" value="{$settings.fieldData.term_member_cap}" class="glm-form-text-input-medium">
-                                {if $settings.fieldFail.term_member_cap}<p>{$settings.fieldFail.term_member_cap}</p>{/if}
+                            <th {if $termSettings.fieldRequired.term_member_cap}class="glm-required"{/if}>Capitalized:</th>
+                            <td {if $termSettings.fieldFail.term_member_cap}class="glm-form-bad-input"{/if}>
+                                <input type="text" name="term_member_cap" value="{$termSettings.fieldData.term_member_cap}" class="glm-form-text-input-medium">
+                                {if $termSettings.fieldFail.term_member_cap}<p>{$termSettings.fieldFail.term_member_cap}</p>{/if}
                             </td>
                         </tr>
                         <tr>
-                            <th {if $settings.fieldRequired.term_member_plur}class="glm-required"{/if}>Plural:</th>
-                            <td {if $settings.fieldFail.term_member_plur}class="glm-form-bad-input"{/if}>
-                                <input type="text" name="term_member_plur" value="{$settings.fieldData.term_member_plur}" class="glm-form-text-input-medium">
-                                {if $settings.fieldFail.term_member_plur}<p>{$settings.fieldFail.term_member_plur}</p>{/if}
+                            <th {if $termSettings.fieldRequired.term_member_plur}class="glm-required"{/if}>Plural:</th>
+                            <td {if $termSettings.fieldFail.term_member_plur}class="glm-form-bad-input"{/if}>
+                                <input type="text" name="term_member_plur" value="{$termSettings.fieldData.term_member_plur}" class="glm-form-text-input-medium">
+                                {if $termSettings.fieldFail.term_member_plur}<p>{$termSettings.fieldFail.term_member_plur}</p>{/if}
                             </td>
                         </tr>
                         <tr>
-                            <th {if $settings.fieldRequired.term_member_plur_cap}class="glm-required"{/if}>Plural Capitalized:</th>
-                            <td {if $settings.fieldFail.term_member_plur_cap}class="glm-form-bad-input"{/if}>
-                                <input type="text" name="term_member_plur_cap" value="{$settings.fieldData.term_member_plur_cap}" class="glm-form-text-input-medium">
-                                {if $settings.fieldFail.term_member_plur_cap}<p>{$settings.fieldFail.term_member_plur_cap}</p>{/if}
+                            <th {if $termSettings.fieldRequired.term_member_plur_cap}class="glm-required"{/if}>Plural Capitalized:</th>
+                            <td {if $termSettings.fieldFail.term_member_plur_cap}class="glm-form-bad-input"{/if}>
+                                <input type="text" name="term_member_plur_cap" value="{$termSettings.fieldData.term_member_plur_cap}" class="glm-form-text-input-medium">
+                                {if $termSettings.fieldFail.term_member_plur_cap}<p>{$termSettings.fieldFail.term_member_plur_cap}</p>{/if}
                             </td>
                         </tr>
                     </table>
                 <td>
                     <table class="glm-admin-table">
                         <tr>
-                            <th {if $settings.fieldRequired.term_location}class="glm-required"{/if}>Normal:</th>
-                            <td {if $settings.fieldFail.term_location}class="glm-form-bad-input"{/if}>
-                                <input type="text" name="term_location" value="{$settings.fieldData.term_location}" class="glm-form-text-input-medium">
-                                {if $settings.fieldFail.term_location}<p>{$settings.fieldFail.term_location}</p>{/if}
+                            <th {if $termSettings.fieldRequired.term_location}class="glm-required"{/if}>Normal:</th>
+                            <td {if $termSettings.fieldFail.term_location}class="glm-form-bad-input"{/if}>
+                                <input type="text" name="term_location" value="{$termSettings.fieldData.term_location}" class="glm-form-text-input-medium">
+                                {if $termSettings.fieldFail.term_location}<p>{$termSettings.fieldFail.term_location}</p>{/if}
                             </td>
                         </tr>
                         <tr>
-                            <th {if $settings.fieldRequired.term_location_cap}class="glm-required"{/if}>Capitalized:</th>
-                            <td {if $settings.fieldFail.term_location_cap}class="glm-form-bad-input"{/if}>
-                                <input type="text" name="term_location_cap" value="{$settings.fieldData.term_location_cap}" class="glm-form-text-input-medium">
-                                {if $settings.fieldFail.term_location_cap}<p>{$settings.fieldFail.term_location_cap}</p>{/if}
+                            <th {if $termSettings.fieldRequired.term_location_cap}class="glm-required"{/if}>Capitalized:</th>
+                            <td {if $termSettings.fieldFail.term_location_cap}class="glm-form-bad-input"{/if}>
+                                <input type="text" name="term_location_cap" value="{$termSettings.fieldData.term_location_cap}" class="glm-form-text-input-medium">
+                                {if $termSettings.fieldFail.term_location_cap}<p>{$termSettings.fieldFail.term_location_cap}</p>{/if}
                             </td>
                         </tr>
                         <tr>
-                            <th {if $settings.fieldRequired.term_location_plur}class="glm-required"{/if}>Plural:</th>
-                            <td {if $settings.fieldFail.term_location_plur}class="glm-form-bad-input"{/if}>
-                                <input type="text" name="term_location_plur" value="{$settings.fieldData.term_location_plur}" class="glm-form-text-input-medium">
-                                {if $settings.fieldFail.term_location_plur}<p>{$settings.fieldFail.term_location_plur}</p>{/if}
+                            <th {if $termSettings.fieldRequired.term_location_plur}class="glm-required"{/if}>Plural:</th>
+                            <td {if $termSettings.fieldFail.term_location_plur}class="glm-form-bad-input"{/if}>
+                                <input type="text" name="term_location_plur" value="{$termSettings.fieldData.term_location_plur}" class="glm-form-text-input-medium">
+                                {if $termSettings.fieldFail.term_location_plur}<p>{$termSettings.fieldFail.term_location_plur}</p>{/if}
                             </td>
                         </tr>
                         <tr>
-                            <th {if $settings.fieldRequired.term_location_plur_cap}class="glm-required"{/if}>Plural Capitalized:</th>
-                            <td {if $settings.fieldFail.term_location_plur_cap}class="glm-form-bad-input"{/if}>
-                                <input type="text" name="term_location_plur_cap" value="{$settings.fieldData.term_location_plur_cap}" class="glm-form-text-input-medium">
-                                {if $settings.fieldFail.term_location_plur_cap}<p>{$settings.fieldFail.term_location_plur_cap}</p>{/if}
+                            <th {if $termSettings.fieldRequired.term_location_plur_cap}class="glm-required"{/if}>Plural Capitalized:</th>
+                            <td {if $termSettings.fieldFail.term_location_plur_cap}class="glm-form-bad-input"{/if}>
+                                <input type="text" name="term_location_plur_cap" value="{$termSettings.fieldData.term_location_plur_cap}" class="glm-form-text-input-medium">
+                                {if $termSettings.fieldFail.term_location_plur_cap}<p>{$termSettings.fieldFail.term_location_plur_cap}</p>{/if}
                             </td>
                         </tr>
                     </table>
                 <td>
                     <table class="glm-admin-table">
                         <tr>
-                            <th {if $settings.fieldRequired.term_facility}class="glm-required"{/if}>Normal:</th>
-                            <td {if $settings.fieldFail.term_facility}class="glm-form-bad-input"{/if}>
-                                <input type="text" name="term_facility" value="{$settings.fieldData.term_facility}" class="glm-form-text-input-medium">
-                                {if $settings.fieldFail.term_facility}<p>{$settings.fieldFail.term_facility}</p>{/if}
+                            <th {if $termSettings.fieldRequired.term_facility}class="glm-required"{/if}>Normal:</th>
+                            <td {if $termSettings.fieldFail.term_facility}class="glm-form-bad-input"{/if}>
+                                <input type="text" name="term_facility" value="{$termSettings.fieldData.term_facility}" class="glm-form-text-input-medium">
+                                {if $termSettings.fieldFail.term_facility}<p>{$termSettings.fieldFail.term_facility}</p>{/if}
                             </td>
                         </tr>
                         <tr>
-                            <th {if $settings.fieldRequired.term_facility_cap}class="glm-required"{/if}>Capitalized:</th>
-                            <td {if $settings.fieldFail.term_facility_cap}class="glm-form-bad-input"{/if}>
-                                <input type="text" name="term_facility_cap" value="{$settings.fieldData.term_facility_cap}" class="glm-form-text-input-medium">
-                                {if $settings.fieldFail.term_facility_cap}<p>{$settings.fieldFail.term_facility_cap}</p>{/if}
+                            <th {if $termSettings.fieldRequired.term_facility_cap}class="glm-required"{/if}>Capitalized:</th>
+                            <td {if $termSettings.fieldFail.term_facility_cap}class="glm-form-bad-input"{/if}>
+                                <input type="text" name="term_facility_cap" value="{$termSettings.fieldData.term_facility_cap}" class="glm-form-text-input-medium">
+                                {if $termSettings.fieldFail.term_facility_cap}<p>{$termSettings.fieldFail.term_facility_cap}</p>{/if}
                             </td>
                         </tr>
                         <tr>
-                            <th {if $settings.fieldRequired.term_facility_plur}class="glm-required"{/if}>Plural:</th>
-                            <td {if $settings.fieldFail.term_facility_plur}class="glm-form-bad-input"{/if}>
-                                <input type="text" name="term_facility_plur" value="{$settings.fieldData.term_facility_plur}" class="glm-form-text-input-medium">
-                                {if $settings.fieldFail.term_facility_plur}<p>{$settings.fieldFail.term_facility_plur}</p>{/if}
+                            <th {if $termSettings.fieldRequired.term_facility_plur}class="glm-required"{/if}>Plural:</th>
+                            <td {if $termSettings.fieldFail.term_facility_plur}class="glm-form-bad-input"{/if}>
+                                <input type="text" name="term_facility_plur" value="{$termSettings.fieldData.term_facility_plur}" class="glm-form-text-input-medium">
+                                {if $termSettings.fieldFail.term_facility_plur}<p>{$termSettings.fieldFail.term_facility_plur}</p>{/if}
                             </td>
                         </tr>
                         <tr>
-                            <th {if $settings.fieldRequired.term_facility_plur_cap}class="glm-required"{/if}>Plural Capitalized:</th>
-                            <td {if $settings.fieldFail.term_facility_plur_cap}class="glm-form-bad-input"{/if}>
-                                <input type="text" name="term_facility_plur_cap" value="{$settings.fieldData.term_facility_plur_cap}" class="glm-form-text-input-medium">
-                                {if $settings.fieldFail.term_facility_plur_cap}<p>{$settings.fieldFail.term_facility_plur_cap}</p>{/if}
+                            <th {if $termSettings.fieldRequired.term_facility_plur_cap}class="glm-required"{/if}>Plural Capitalized:</th>
+                            <td {if $termSettings.fieldFail.term_facility_plur_cap}class="glm-form-bad-input"{/if}>
+                                <input type="text" name="term_facility_plur_cap" value="{$termSettings.fieldData.term_facility_plur_cap}" class="glm-form-text-input-medium">
+                                {if $termSettings.fieldFail.term_facility_plur_cap}<p>{$termSettings.fieldFail.term_facility_plur_cap}</p>{/if}
                             </td>
                         </tr>
                     </table>
                 <td>
                     <table class="glm-admin-table">
                         <tr>
-                            <th {if $settings.fieldRequired.term_attraction}class="glm-required"{/if}>Normal:</th>
-                            <td {if $settings.fieldFail.term_attraction}class="glm-form-bad-input"{/if}>
-                                <input type="text" name="term_attraction" value="{$settings.fieldData.term_attraction}" class="glm-form-text-input-medium">
-                                {if $settings.fieldFail.term_attraction}<p>{$settings.fieldFail.term_attraction}</p>{/if}
+                            <th {if $termSettings.fieldRequired.term_attraction}class="glm-required"{/if}>Normal:</th>
+                            <td {if $termSettings.fieldFail.term_attraction}class="glm-form-bad-input"{/if}>
+                                <input type="text" name="term_attraction" value="{$termSettings.fieldData.term_attraction}" class="glm-form-text-input-medium">
+                                {if $termSettings.fieldFail.term_attraction}<p>{$termSettings.fieldFail.term_attraction}</p>{/if}
                             </td>
                         </tr>
                         <tr>
-                            <th {if $settings.fieldRequired.term_attraction_cap}class="glm-required"{/if}>Capitalized:</th>
-                            <td {if $settings.fieldFail.term_attraction_cap}class="glm-form-bad-input"{/if}>
-                                <input type="text" name="term_attraction_cap" value="{$settings.fieldData.term_attraction_cap}" class="glm-form-text-input-medium">
-                                {if $settings.fieldFail.term_attraction_cap}<p>{$settings.fieldFail.term_attraction_cap}</p>{/if}
+                            <th {if $termSettings.fieldRequired.term_attraction_cap}class="glm-required"{/if}>Capitalized:</th>
+                            <td {if $termSettings.fieldFail.term_attraction_cap}class="glm-form-bad-input"{/if}>
+                                <input type="text" name="term_attraction_cap" value="{$termSettings.fieldData.term_attraction_cap}" class="glm-form-text-input-medium">
+                                {if $termSettings.fieldFail.term_attraction_cap}<p>{$termSettings.fieldFail.term_attraction_cap}</p>{/if}
                             </td>
                         </tr>
                         <tr>
-                            <th {if $settings.fieldRequired.term_attraction_plur}class="glm-required"{/if}>Plural:</th>
-                            <td {if $settings.fieldFail.term_attraction_plur}class="glm-form-bad-input"{/if}>
-                                <input type="text" name="term_attraction_plur" value="{$settings.fieldData.term_attraction_plur}" class="glm-form-text-input-medium">
-                                {if $settings.fieldFail.term_attraction_plur}<p>{$settings.fieldFail.term_attraction_plur}</p>{/if}
+                            <th {if $termSettings.fieldRequired.term_attraction_plur}class="glm-required"{/if}>Plural:</th>
+                            <td {if $termSettings.fieldFail.term_attraction_plur}class="glm-form-bad-input"{/if}>
+                                <input type="text" name="term_attraction_plur" value="{$termSettings.fieldData.term_attraction_plur}" class="glm-form-text-input-medium">
+                                {if $termSettings.fieldFail.term_attraction_plur}<p>{$termSettings.fieldFail.term_attraction_plur}</p>{/if}
                             </td>
                         </tr>
                         <tr>
-                            <th {if $settings.fieldRequired.term_attraction_plur_cap}class="glm-required"{/if}>Plural Capitalized:</th>
-                            <td {if $settings.fieldFail.term_attraction_plur_cap}class="glm-form-bad-input"{/if}>
-                                <input type="text" name="term_attraction_plur_cap" value="{$settings.fieldData.term_attraction_plur_cap}" class="glm-form-text-input-medium">
-                                {if $settings.fieldFail.term_attraction_plur_cap}<p>{$settings.fieldFail.term_attraction_plur_cap}</p>{/if}
+                            <th {if $termSettings.fieldRequired.term_attraction_plur_cap}class="glm-required"{/if}>Plural Capitalized:</th>
+                            <td {if $termSettings.fieldFail.term_attraction_plur_cap}class="glm-form-bad-input"{/if}>
+                                <input type="text" name="term_attraction_plur_cap" value="{$termSettings.fieldData.term_attraction_plur_cap}" class="glm-form-text-input-medium">
+                                {if $termSettings.fieldFail.term_attraction_plur_cap}<p>{$termSettings.fieldFail.term_attraction_plur_cap}</p>{/if}
                             </td>
                         </tr>
                     </table>
                 <td>
                     <table class="glm-admin-table">
                         <tr>
-                            <th {if $settings.fieldRequired.term_contact}class="glm-required"{/if}>Normal:</th>
-                            <td {if $settings.fieldFail.term_contact}class="glm-form-bad-input"{/if}>
-                                <input type="text" name="term_contact" value="{$settings.fieldData.term_contact}" class="glm-form-text-input-medium">
-                                {if $settings.fieldFail.term_contact}<p>{$settings.fieldFail.term_contact}</p>{/if}
+                            <th {if $termSettings.fieldRequired.term_contact}class="glm-required"{/if}>Normal:</th>
+                            <td {if $termSettings.fieldFail.term_contact}class="glm-form-bad-input"{/if}>
+                                <input type="text" name="term_contact" value="{$termSettings.fieldData.term_contact}" class="glm-form-text-input-medium">
+                                {if $termSettings.fieldFail.term_contact}<p>{$termSettings.fieldFail.term_contact}</p>{/if}
                             </td>
                         </tr>
                         <tr>
-                            <th {if $settings.fieldRequired.term_contact_cap}class="glm-required"{/if}>Capitalized:</th>
-                            <td {if $settings.fieldFail.term_contact_cap}class="glm-form-bad-input"{/if}>
-                                <input type="text" name="term_contact_cap" value="{$settings.fieldData.term_contact_cap}" class="glm-form-text-input-medium">
-                                {if $settings.fieldFail.term_contact_cap}<p>{$settings.fieldFail.term_contact_cap}</p>{/if}
+                            <th {if $termSettings.fieldRequired.term_contact_cap}class="glm-required"{/if}>Capitalized:</th>
+                            <td {if $termSettings.fieldFail.term_contact_cap}class="glm-form-bad-input"{/if}>
+                                <input type="text" name="term_contact_cap" value="{$termSettings.fieldData.term_contact_cap}" class="glm-form-text-input-medium">
+                                {if $termSettings.fieldFail.term_contact_cap}<p>{$termSettings.fieldFail.term_contact_cap}</p>{/if}
                             </td>
                         </tr>
                         <tr>
-                            <th {if $settings.fieldRequired.term_contact_plur}class="glm-required"{/if}>Plural:</th>
-                            <td {if $settings.fieldFail.term_contact_plur}class="glm-form-bad-input"{/if}>
-                                <input type="text" name="term_contact_plur" value="{$settings.fieldData.term_contact_plur}" class="glm-form-text-input-medium">
-                                {if $settings.fieldFail.term_contact_plur}<p>{$settings.fieldFail.term_contact_plur}</p>{/if}
+                            <th {if $termSettings.fieldRequired.term_contact_plur}class="glm-required"{/if}>Plural:</th>
+                            <td {if $termSettings.fieldFail.term_contact_plur}class="glm-form-bad-input"{/if}>
+                                <input type="text" name="term_contact_plur" value="{$termSettings.fieldData.term_contact_plur}" class="glm-form-text-input-medium">
+                                {if $termSettings.fieldFail.term_contact_plur}<p>{$termSettings.fieldFail.term_contact_plur}</p>{/if}
                             </td>
                         </tr>
                         <tr>
-                            <th {if $settings.fieldRequired.term_contact_plur_cap}class="glm-required"{/if}>Plural Capitalized:</th>
-                            <td {if $settings.fieldFail.term_contact_plur_cap}class="glm-form-bad-input"{/if}>
-                                <input type="text" name="term_contact_plur_cap" value="{$settings.fieldData.term_contact_plur_cap}" class="glm-form-text-input-medium">
-                                {if $settings.fieldFail.term_contact_plur_cap}<p>{$settings.fieldFail.term_contact_plur_cap}</p>{/if}
+                            <th {if $termSettings.fieldRequired.term_contact_plur_cap}class="glm-required"{/if}>Plural Capitalized:</th>
+                            <td {if $termSettings.fieldFail.term_contact_plur_cap}class="glm-form-bad-input"{/if}>
+                                <input type="text" name="term_contact_plur_cap" value="{$termSettings.fieldData.term_contact_plur_cap}" class="glm-form-text-input-medium">
+                                {if $termSettings.fieldFail.term_contact_plur_cap}<p>{$termSettings.fieldFail.term_contact_plur_cap}</p>{/if}
                             </td>
                         </tr>
                     </table>
index da67855..c4eba6e 100644 (file)
@@ -1,6 +1,6 @@
 {include file='admin/member/header.html'}
 
-    <script src="http://maps.googleapis.com/maps/api/js?sensor=true&key={$googleMapsBrowserApiKey}"></script>
+    <script src="http://maps.googleapis.com/maps/api/js?sensor=true&key={$settings.google_maps_api_key}"></script>
     
     <!--[if lt IE 9]>
       <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
index b980441..a918f87 100644 (file)
@@ -2,9 +2,9 @@
 
 {if $haveMember}
 
-        <script src="http://maps.googleapis.com/maps/api/js?sensor=true&key={$googleMapsBrowserApiKey}"></script>
+        <script src="http://maps.googleapis.com/maps/api/js?sensor=true&key={$settings.google_maps_api_key}"></script>
 
-    {if $detail_show_directions}
+    {if $settings.detail_show_directions}
         <div id="glm-directionsMap-container" class="glm-hidden">
             <div id="glm-directionsMap" class="glm-map">(directions load here)</div>
             <div id="directions-panel"></div>
                 <div class="row">
                     <div>
                         <input type="submit" id="glm-showDirectionsButton" class="button button-secondary glm-button" value="Show Directions">
-                        <input type="submit" id="glm-showLocationButton" class="button button-secondary glm-button glm-hidden" value="Show {$term_member_cap} Location">
+                        <input type="submit" id="glm-showLocationButton" class="button button-secondary glm-button glm-hidden" value="Show {$terms.term_member_cap} Location">
                     </div>
                 </div>
             </div>
         </div>
     {/if}
     
-<!--    <h3>{$term_member_cap} Detail</h3>-->
+<!--    <h3>{$terms.term_member_cap} Detail</h3>-->
     <script>
     document.write('<a class="button right glm-member-detail-button" href="' + document.referrer + '">Take me back</a>');
 </script>
                 <div class="small-12 medium-4 glm-member-detail-info columns">
         <!-- Member name, address, and basic information -->                    
                         <h2>
-                      {if $list_show_detaillink}
-<!--                            <a href="{$thisURL}?glm_action=detail&id={$member.member_pointer}">{$member.member}</a>-->
                         {$member.member}
-                      {else}
-                            {$member.member}
-                      {/if}
                         </h2>
-                      {if $list_show_address}
-                          {if $list_show_street}
+                      {if $settings.detail_show_address}
+                          {if $settings.detail_show_street}
                           {if $member.addr1}<div>{$member.addr1}</div>{/if}
                           {if $member.addr2}<div>{$member.addr2}</div>{/if}
                           {/if}
-                          {if $list_show_citystatezip}
+                          {if $settings.detail_show_citystatezip}
                           {if $member.city}<span>{$member.city}</span>{if $member.state.name}, {/if}{/if}<span>{if $member.state.name}{$member.state.name}</span>{/if}{if $member.zip} {$member.zip}{/if}
                           {/if} 
-                                {if $member.country.name && $list_show_country}<div>{$member.country.name}</div>{/if}
+                                {if $member.country.name && $settings.detail_show_country}<div>{$member.country.name}</div>{/if}
                       {/if}        
-                        {if $member.phone && $list_show_phone}<div>Phone: {$member.phone}</div>{/if}
-                        {if $member.toll_free && $list_show_tollfree}<div><b>Toll Free:</b> {$member.toll_free}</div>{/if}
-                        {if $member.region && $list_show_region}<div><p><b>Region:</b> {$member.region}</div>{/if}
+                        {if $member.phone && $settings.detail_show_phone}<div>Phone: {$member.phone}</div>{/if}
+                        {if $member.toll_free && $settings.detail_show_tollfree}<div><b>Toll Free:</b> {$member.toll_free}</div>{/if}
+                        {if $member.region && $settings.detail_show_region}<div><p><b>Region:</b> {$member.region}</div>{/if}
                    
                         <div class="glm-member-list-links"><br>
-                                {if $member.url && $list_show_url}<a href="{$member.url}"{if $list_show_url_newtarget} target="_blank"{/if}>Website</a>{/if}
-                                {if $member.email && $list_show_email}<a href="mailto:{$member.email}">Email</a>{/if}
-                                {if $detail_show_imagegallery && $haveImageGallery}<a href="#glm-member-detail-photo-gallery">Photo Gallery</a>{/if}
-                                {if $detail_show_coupons && $coupons}<a href="#glm-member-detail-coupons">Coupons</a>{/if}
-                                {if $detail_show_packages && $packages}<a href="#glm-member-detail-packages">Packages</a>{/if}
+                                {if $member.url && $settings.detail_show_url}<a href="{$member.url}"{if $settings.detail_show_url_newtarget} target="_blank"{/if}>Website</a>{/if}
+                                {if $member.email && $settings.detail_show_email}<a href="mailto:{$member.email}">Email</a>{/if}
+                                {if $settings.detail_show_imagegallery && $haveImageGallery}<a href="#glm-member-detail-photo-gallery">Photo Gallery</a>{/if}
+                                {if $settings.detail_show_coupons && $coupons}<a href="#glm-member-detail-coupons">Coupons</a>{/if}
+                                {if $settings.detail_show_packages && $packages}<a href="#glm-member-detail-packages">Packages</a>{/if}
                         </div>
                     </div>      
-                    {if $detail_show_map}
-                        {if $member.logo && $detail_show_logo}
+                    {if $settings.detail_show_map}
+                        {if $member.logo && $settings.detail_show_logo}
                         <div id="glm-locationMap-container" class="small-12 medium-4 columns">
                         {else}
                         <div id="glm-locationMap-container" class="small-12 medium-8 columns">
                             <div id="glm-locationMap" class="glm-map">(map loads here)</div>
                         </div>
                     {/if}
-                    {if $member.logo && $detail_show_logo}
+                    {if $member.logo && $settings.detail_show_logo}
                     <div class="glm-member-detail-image-wrapper small-4 medium-4 columns">
 <!--                            <img class="glm-member-list-image-left" src="http://placehold.it/500x300">-->
-                            <img CLASS="glm-member-list-image-left" src="{$glmPluginMediaURL}/images/{$detail_logo_size}/{$member.logo}">
+                            <img CLASS="glm-member-list-image-left" src="{$glmPluginMediaURL}/images/{$settings.detail_logo_size}/{$member.logo}">
                     </div>
                     {/if}
             </div>
 <!-- Member Description -->                
             <div id="glm-member-detail-descr-row" class="row" data-equalizer>
-                {if ($member.amenities && $detail_show_amenities) || ($member.cc_type && $detail_show_creditcards) || ($member.categories && $detail_show_categories)}
+                {if ($member.amenities && $settings.detail_show_amenities) || ($member.cc_type && $settings.detail_show_creditcards) || ($member.categories && $settings.detail_show_categories)}
                 <div id="glm-member-detail-amenities-container" class="small-12 medium-4 columns" >
                     <div data-equalizer-watch>
-                    {if $member.amenities && $detail_show_amenities}
+                    {if $member.amenities && $settings.detail_show_amenities}
                     <table>
                         <th><b>Amenities & Services</b></th>
                         {foreach $member.amenities as $a}
                     </table>
 
                     {/if}
-                    {if $member.cc_type && $detail_show_creditcards}
+                    {if $member.cc_type && $settings.detail_show_creditcards}
                             <p>           
                                 <b>Credit Cards Accepted:</b>
                                 <ul>
                                 </ul>        
                             </p>
                     {/if}
-                    {if $member.categories && $detail_show_categories}
+                    {if $member.categories && $settings.detail_show_categories}
                             <p>           
-                                <b>{$term_member_cap} Categories</b>
+                                <b>{$terms.term_member_cap} Categories</b>
                                 <ul>
                         {foreach $member.categories as $c}
                                     <li>
                 <div id="glm-member-detail-description-container" class="small-12 medium-9 medium-centered columns" >
                 {/if}
                     <div data-equalizer-watch>
-                    {if $member.descr && $detail_show_description}{$member.descr}{/if}
-                    {if $member.short_descr && $detail_show_short_descr}{$member.short_descr}{/if}
+                    {if $member.descr && $settings.detail_show_descr}{$member.descr}{/if}
+                    {if $member.short_descr && $settings.detail_show_short_descr}{$member.short_descr}{/if}
                     </div>
                 </div>
             </div>
             
 <!-- Image Gallery -->
 
-    {if $detail_show_imagegallery && $haveImageGallery}
+    {if $settings.detail_show_imagegallery && $haveImageGallery}
     <div id="glm-member-detail-photos" class="row">
         <a name="glm-member-detail-photo-gallery"></a>
         <div class="small-12 columns">
         </div>
     </div>    
     {/if}
-    {if $detail_show_coupons && $coupons}
+    {if $settings.detail_show_coupons && $coupons}
     <div id="glm-member-detail-photos" class="row">
         <a name="glm-member-detail-coupons"></a>
     </div>
     {/if}
-    {if $detail_show_packages && $havePackages && $packages}
+    {if $settings.detail_show_packages && $havePackages && $packages}
     <div id="glm-member-detail-photos" class="row">
         <a name="glm-member-detail-packages"></a>
     </div>
     <script type="text/javascript">
         jQuery(document).ready(function($) {
 
-    {if $detail_show_map}
+    {if $settings.detail_show_map}
             /*
              * Google Maps
              *  API reference: https://developers.google.com/maps/documentation/javascript/reference
             
     {/if} {*detail_show_map*}
     
-    {if $detail_show_directions}
+    {if $settings.detail_show_directions}
     
             var directionsDisplay;
             var directionsService = new google.maps.DirectionsService();
     </script>
   
 {else}
-        <p>For some reason the specified {$term_member} was not found. Please try again.</p>
+        <p>For some reason the specified {$terms.term_member} was not found. Please try again.</p>
 {/if}
 
 
index 3d864e1..45a0f32 100644 (file)
@@ -1,28 +1,28 @@
 {include file='front/members/header.html'}
 
 
-        <script src="http://maps.googleapis.com/maps/api/js?sensor=true&key={$googleMapsBrowserApiKey}"></script>
+        <script src="http://maps.googleapis.com/maps/api/js?sensor=true&key={$settings.google_maps_api_key}"></script>
 
-{if $list_show_map}
+{if $settings.list_show_map}
         <div id="glm-locationMap" class="glm-map">(map loads here)</div>
 {/if}
 
-{if $list_show_search}
+{if $settings.list_show_search}
         <form action="{$thisURL}?glm_action=list" method="post" enctype="multipart/form-data">
             <div class="row">           
                 <div class="small-12 columns glm-member-entry-container">
                     <div class="row">
                         <div class="small-12 columns">
-                            <h3><br>Search for a {$term_member_cap}</h3>
+                            <h3><br>Search for a {$terms.term_member_cap}</h3>
                         </div>
                     </div>
                     <div class="row">
-            {if $list_search_text}
+            {if $settings.list_show_search_text}
                         <div class="small-12 medium-7 columns">Text Search: <input type="text" name="textSearch" value="{$textSearch}" class="glm-form-text-input"></div>
             {/if}
-            {if $list_search_category}
+            {if $settings.list_show_search_category}
                         <div class="small-12 medium-5 columns">
-                            {$term_member_cap} Category: 
+                            {$terms.term_member_cap} Category: 
                             <select name="categorySearch" id="categorySelect">
                                 <option value=""></option>
                     {foreach from=$categories item=v}
                         </div>
                     </div>
             {/if}
-            {if $list_search_amenities}
+            {if $settings.list_show_search_amenities}
 
                     <div class="row">
                         <div class="small-12 medium-5 columns">
-                            {$term_member_cap} Amenity: 
+                            {$terms.term_member_cap} Amenity: 
                             <select name="amenitySearch" id="amenitySelect">
                                 <option value=""></option>
                     {foreach from=$amenities item=v}
         </form>
 {/if} {*list_show_search*}
 
-{if $list_show_list}    
-        <h3>List of {$term_member_plur_cap}</h3>
+{if $settings.list_show_list}    
+        <h3>List of {$terms.term_member_plur_cap}</h3>
   {if $haveMembers}
             
-    {if $list_search_alpha}
+    {if $settings.list_show_search_alpha}
         <div class="glm-alpha-links">
             <a href="{$thisURL}?glm_action=list&textSearch={$textSearch}&categorySearch={$catSelected}" class="glm-alpha-link{if !$alphaSelected} glm-alpha-link-selected{/if}">All</a>
       {foreach $alphaList as $a}
             <div class="small-12 columns glm-member-list-container">
                 <div class="row">
                 <!-- Member Logo - Medium and up-->  
-                {if $m.logo && $list_show_logo}
+                {if $m.logo && $settings.list_show_logo}
                     <div class="glm-member-list-image-wrapper small-12 medium-4 columns">
                         <div class="glm-member-list-image-border">
-                           <img class="glm-member-list-image left" src="{$glmPluginMediaURL}/images/{$list_logo_size}/{$m.logo}"> 
+                           <img class="glm-member-list-image left" src="{$glmPluginMediaURL}/images/{$settings.list_logo_size}/{$m.logo}"> 
 <!--                            <img class="glm-member-list-image left" src="http://placehold.it/500x300">-->
                         </div>
                     </div>
                 {/if}
 <!-- Member name, address, and basic information -->                    
                         <h2>
-              {if $list_show_detaillink}
+              {if $settings.list_show_detail_link}
                             <a href="{$thisURL}?glm_action=detail&id={$m.member_pointer}">{$m.member}</a>
               {else}
                             {$m.member}
               {/if}
                         </h2>
-              {if $list_show_address}
-                  {if $list_show_street}
-                  {if $m.addr1 && $list_show_address}<div>{$m.addr1}</div>{/if}
-                  {if $m.addr2 && $list_show_addr2}<div>{$m.addr2}</div>{/if}
+              {if $settings.list_show_address}
+                  {if $settings.list_show_street}
+                  {if $m.addr1 && $settings.list_show_address}<div>{$m.addr1}</div>{/if}
+                  {if $m.addr2 && $settings.list_show_addr2}<div>{$m.addr2}</div>{/if}
                   {/if}
-                  {if $list_show_citystatezip}
+                  {if $settings.list_show_citystatezip}
                   {if $m.city}<span>{$m.city}</span>{if $m.state.name}, {/if}{/if}<span>{if $m.state.name}{$m.state.name}</span>{/if}{if $m.zip} {$m.zip}{/if}
                   {/if} 
-                        {if $m.country.name && $list_show_country}<div>{$m.country.name}</div>{/if}
+                        {if $m.country.name && $settings.list_show_country}<div>{$m.country.name}</div>{/if}
               {/if}        
-                        {if $m.phone && $list_show_phone}<div>Phone: {$m.phone}</div>{/if}
-                        {if $m.toll_free && $list_show_tollfree}<div><b>Toll Free:</b> {$m.toll_free}</div>{/if}
-                        {if $m.region && $list_show_region}<div><p><b>Region:</b> {$m.region}</div>{/if}
+                        {if $m.phone && $settings.list_show_phone}<div>Phone: {$m.phone}</div>{/if}
+                        {if $m.toll_free && $settings.list_show_tollfree}<div><b>Toll Free:</b> {$m.toll_free}</div>{/if}
+                        {if $m.region && $settings.list_show_region}<div><p><b>Region:</b> {$m.region}</div>{/if}
                     
                     <div class="glm-member-list-links"><br>
-                                {if $m.url && $list_show_url}<a href="{$m.url}"{if $list_show_url_newtarget} target="_blank"{/if}>Website</a>{/if}
-                                {if $m.email && $list_show_email}<a href="mailto:{$m.email}">Email</a>{/if}
+                                {if $m.url && $settings.list_show_url}<a href="{$m.url}"{if $settings.list_show_url_newtarget} target="_blank"{/if}>Website</a>{/if}
+                                {if $m.email && $settings.list_show_email}<a href="mailto:{$m.email}">Email</a>{/if}
 <!--                                <a href="{$thisURL}?glm_action=detail&id={$m.member_pointer}">View Profile</a>-->
                         </div>
                          </div>
                 <div class="glm-member-list-description small-12 medium-4 left columns">
                         
-                {if $m.short_descr && $list_show_short_descr}
+                {if $m.short_descr && $settings.list_show_short_descr}
                 {$m.short_descr} <a href="{$thisURL}?glm_action=detail&id={$m.member_pointer}">... View Profile</a>
 
-                {elseif $m.descr && $list_show_description}
+                {elseif $m.descr && $settings.list_show_description}
                 {$m.descr|truncate:190:false:false} class="test"><span>... View Profile</span>
                 {/if}
                         
-                {if $m.categories && $list_show_categories}
+                {if $m.categories && $settings.list_show_categories}
                         <p>
-                            <b>{$term_member_cap} Categories</b>
+                            <b>{$terms.term_member_cap} Categories</b>
                             <ul>
                     {foreach $m.categories as $c}
                                 <li>
                             </ul>
                         </p>
                 {/if}
-                {if $m.cc_type && $list_show_creditcards}
+                {if $m.cc_type && $settings.list_show_creditcards}
                         <p>           
                             <b>Credit Cards Accepted:</b>
                             <ul>
                             </ul>        
                         </p>
                 {/if}
-                {if $m.amenities && $list_show_amenities}
+                {if $m.amenities && $settings.list_show_amenities}
                         <p>
-                            <b>{$term_member_cap} Amenities</b>
+                            <b>{$terms.term_member_cap} Amenities</b>
                             <ul>
                     {foreach $m.amenities as $A}
                                 <li>
         
         <!-- Member information displayed in map bubbles -->
         <div id="map_info_{$m.id}" class="glm-hidden">
-            {if $m.logo && $list_map_show_logo}<div class="glm-member-list-image"><img src="{$glmPluginMediaURL}/images/{$list_map_logo_size}/{$m.logo}"></div>{/if}
+            {if $m.logo && $settings.list_map_show_logo}<div class="glm-member-list-image"><img src="{$glmPluginMediaURL}/images/{$settings.list_map_logo_size}/{$m.logo}"></div>{/if}
             <div class="glm-map-member-name">
-              {if $list_map_show_detaillink}
+              {if $settings.list_map_show_detaillink}
                 <a href="{$thisURL}?glm_action=detail&id={$m.member_pointer}">{$m.member}</a>
               {else}
                 {$m.member}
               {/if}
             </div>
-          {if $list_map_show_address}
+          {if $settings.list_map_show_address}
             <p>
-              {if $list_map_show_street}
+              {if $settings.list_map_show_street}
                 {if $m.addr1}{$m.addr1}<br>{/if}
                 {if $m.addr2}{$m.addr2}<br>{/if}
               {/if}
-              {if $list_map_show_citystatezip}
+              {if $settings.list_map_show_citystatezip}
                 {if $m.city}{$m.city}{if $m.state.name}, {/if}{/if}{if $m.state.name}{$m.state.name}{/if}{if $m.zip} {$m.zip}{/if}
               {/if} 
-                {if $m.country.name && $list_map_show_country}<br>{$m.country.name}{/if}
+                {if $m.country.name && $settings.list_map_show_country}<br>{$m.country.name}{/if}
             </p>        
           {/if} {*list_map_show_address*}        
             <div class="glm-member-list-info">
                 <p>
-                    {if $m.phone && $list_map_show_phone}<b>Phone:</b> {$m.phone}<br>{/if}
-                    {if $m.toll_free && $list_map_show_tollfree}<b>Toll Free:</b> {$m.toll_free}<br>{/if}
-                    {if $m.url && $list_map_show_url}<b>Web site:</b> <a href="{$m.url}"{if $list_map_show_url_newtarget} target="_blank"{/if}>{$m.url}</a><br>{/if}
-                    {if $m.email && $list_map_show_email}<b>E-Mail Address:</b> <a href="mailto:{$m.email}">{$m.email}</a><br>{/if}
-                    {if $m.region && $list_map_show_region}<b>Region:</b> {$m.region}{/if}
+                    {if $m.phone && $settings.list_map_show_phone}<b>Phone:</b> {$m.phone}<br>{/if}
+                    {if $m.toll_free && $settings.list_map_show_tollfree}<b>Toll Free:</b> {$m.toll_free}<br>{/if}
+                    {if $m.url && $settings.list_map_show_url}<b>Web site:</b> <a href="{$m.url}"{if $settings.list_map_show_url_newtarget} target="_blank"{/if}>{$m.url}</a><br>{/if}
+                    {if $m.email && $settings.list_map_show_email}<b>E-Mail Address:</b> <a href="mailto:{$m.email}">{$m.email}</a><br>{/if}
+                    {if $m.region && $settings.list_map_show_region}<b>Region:</b> {$m.region}{/if}
                 </p>
-                {if $m.descr && $list_map_show_description}{$m.descr}<br>{/if}
-                {if $m.short_descr && $list_map_show_short_descr}{$m.short_descr}<br>{/if}
-        {if $m.categories && $list_map_show_categories}
+                {if $m.descr && $settings.list_map_show_descr}{$m.descr}<br>{/if}
+                {if $m.short_descr && $settings.list_map_show_short_descr}{$m.short_descr}<br>{/if}
+        {if $m.categories && $settings.list_map_show_categories}
                 <div class="glm-member-list-items">           
-                    <b>{$term_member_cap} Categories</b>
+                    <b>{$terms.term_member_cap} Categories</b>
                     <ul>
             {foreach $m.categories as $c}
                         <li>
                     </ul>
                 </div>
         {/if}
-        {if $m.cc_type && $list_map_show_creditcards}
+        {if $m.cc_type && $settings.list_map_show_creditcards}
                 <div class="glm-member-list-items">           
                     <b>Credit Cards Accepted:</b>
                     <ul>
                     </ul>        
                 </div>
         {/if}
-        {if $list_map_show_amenities}
+        {if $settings.list_map_show_amenities}
                 <div class="glm-member-list-items">
                     <b>Amenities:</b>
                     <ul>
     {/foreach} {*$members*}
 
 {else}
-        <div>(no {$term_member_plur} listed)</div>
+        <div>(no {$terms.term_member_plur} listed)</div>
 {/if}
 
 {/if} {*list_show_list*}
         <script type="text/javascript">
             jQuery(document).ready(function($) {
                 
-    {if $list_show_map}                        
+    {if $settings.list_show_map}                       
                 /*
                  * Google Maps
                  *  API reference: https://developers.google.com/maps/documentation/javascript/reference
                 
                 // Create a Google Map object
                 var map = new google.maps.Map(document.getElementById('glm-locationMap'), {
-                       center: new google.maps.LatLng({$mapDefaultLat}, {$mapDefaultLon}),
-                       zoom: {$mapDefaultZoom},
+                       center: new google.maps.LatLng({$settings.maps_default_lat}, {$settings.maps_default_lon}),
+                       zoom: {$settings.mapDefaultZoom},
                     disableDefaultUI: false,   
                     mapTypeId: google.maps.MapTypeId.MAP,  
                 });