From 412032449c75f6e7c24d8d15656bd4d4b54694ac Mon Sep 17 00:00:00 2001 From: Chuck Scott Date: Sat, 3 Oct 2015 11:58:40 -0400 Subject: [PATCH] Migrating settings from .ini file to admin Management pages --- classes/data/dataMemberInfo.php | 4 +- config.php | 38 +- config/plugin.ini | 158 -------- controllers/admin.php | 9 +- controllers/front.php | 15 +- misc/databaseScripts/create_database_V0.1.sql | 2 +- models/admin/management/index.php | 2 +- models/admin/management/terms.php | 2 +- models/front/members/list.php | 6 +- views/admin/management/index.html | 202 +++++----- views/admin/management/terms.html | 349 +++++++++--------- views/admin/member/memberInfo.html | 2 +- views/front/members/detail.html | 71 ++-- views/front/members/list.html | 108 +++--- 14 files changed, 396 insertions(+), 572 deletions(-) diff --git a/classes/data/dataMemberInfo.php b/classes/data/dataMemberInfo.php index 58953abb..a8a0c9b3 100644 --- a/classes/data/dataMemberInfo.php +++ b/classes/data/dataMemberInfo.php @@ -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' ), diff --git a/config.php b/config.php index 069ff2ed..b5f2e772 100644 --- a/config.php +++ b/config.php @@ -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 .= - '

Bad configuration file section name or section not found: '. $hostSection - .'
See plugin '.GLM_MEMBERS_PLUGIN_PATH.'config/plugin.ini file.' - .'
Also check that the server "GLM_HOST_ID" environment parameter exists and matches a section in the above ini file.

' - ; -} - -// 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 "
".print_r($config,1)."
"; -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(); diff --git a/config/plugin.ini b/config/plugin.ini index f975154d..0e089558 100644 --- a/config/plugin.ini +++ b/config/plugin.ini @@ -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 = '' - - diff --git a/controllers/admin.php b/controllers/admin.php index d75018ed..651a757f 100644 --- a/controllers/admin.php +++ b/controllers/admin.php @@ -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) { diff --git a/controllers/front.php b/controllers/front.php index 3fecfe0c..164a6e8d 100644 --- a/controllers/front.php +++ b/controllers/front.php @@ -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) { diff --git a/misc/databaseScripts/create_database_V0.1.sql b/misc/databaseScripts/create_database_V0.1.sql index e5289cd4..50c0381a 100644 --- a/misc/databaseScripts/create_database_V0.1.sql +++ b/misc/databaseScripts/create_database_V0.1.sql @@ -679,7 +679,7 @@ INSERT INTO {prefix}settings_terms 'Member', 'Add Member', 'Configure', - 'Settings', + 'Management', 'Shortcodes', 'Dashboard', 'Member List', diff --git a/models/admin/management/index.php b/models/admin/management/index.php index f96ce954..43299bec 100644 --- a/models/admin/management/index.php +++ b/models/admin/management/index.php @@ -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 ); diff --git a/models/admin/management/terms.php b/models/admin/management/terms.php index 392698a5..2f389613 100644 --- a/models/admin/management/terms.php +++ b/models/admin/management/terms.php @@ -164,7 +164,7 @@ class GlmMembersAdmin_management_terms extends GlmDataSettingsTerms // Compile template data $templateData = array( 'reason' => '', - 'settings' => $termsSettings, + 'termSettings' => $termsSettings, // 'canEdit' => $canEdit ); diff --git a/models/front/members/list.php b/models/front/members/list.php index 2db9b53d..88ad297b 100644 --- a/models/front/members/list.php +++ b/models/front/members/list.php @@ -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; diff --git a/views/admin/management/index.html b/views/admin/management/index.html index 1e8f1c89..9243f1b5 100644 --- a/views/admin/management/index.html +++ b/views/admin/management/index.html @@ -1,7 +1,5 @@ {include file='admin/management/header.html'} -

*** Not using these settings yet! ***

-
@@ -14,58 +12,58 @@ Admin Debug Information: - + Admin Debug Verbose: - + Front-End Debug Information: - + Front-End Debug Verbose: - +

Misc. Settings

- Google Maps API Key: - - - {if $settings.fieldFail.google_maps_api_key}

{$settings.fieldFail.google_maps_api_key}

{/if} + Google Maps API Key: + + + {if $genSettings.fieldFail.google_maps_api_key}

{$genSettings.fieldFail.google_maps_api_key}

{/if}
Optional: See Google Maps JAVAscript API V3 documentation for information. - Default Map Location: - + Default Map Location: + -
+
- +
Please enter values in decimal degrees. - {if $settings.fieldFail.maps_default_lat}

{$settings.fieldFail.maps_default_lat}

{/if} - {if $settings.fieldFail.maps_default_lon}

{$settings.fieldFail.maps_default_lon}

{/if} + {if $genSettings.fieldFail.maps_default_lat}

{$genSettings.fieldFail.maps_default_lat}

{/if} + {if $genSettings.fieldFail.maps_default_lon}

{$genSettings.fieldFail.maps_default_lon}

{/if} - Time Zone: - + Time Zone: + - {if $settings.fieldFail.time_zone}

{$settings.fieldFail.time_zone}

{/if} + {if $genSettings.fieldFail.time_zone}

{$genSettings.fieldFail.time_zone}

{/if} @@ -76,63 +74,63 @@ Show Map: - + Map Options: - - + + - - - - - - - - - + + + + + + + + + - - - + + +
Show Member Name as Link to Detail:
Show Logo:
Show Member Name as Link to Detail:
Show Logo:
Logo Size:
Show Description:
Show Short Description:
Show Address:
Show Street:
Show City, State, ZIP:
Show Country:
Show Region:
Show Phone:
Show Toll Free:
Show Description:
Show Short Description:
Show Address:
Show Street:
Show City, State, ZIP:
Show Country:
Show Region:
Show Phone:
Show Toll Free:
Show URL: - - Display URL as a link: + + Display URL as a link:
Show Categories:
Show Credit Cards:
Show Amenitiies:
Show Categories:
Show Credit Cards:
Show Amenitiies:
Show Search Form: - + Search Form Options: - - - - + + + +
Text Search:
Category Search:
Amenities Search:
Show Alpha Index:
Text Search:
Category Search:
Amenities Search:
Show Alpha Index:
@@ -140,53 +138,53 @@ Show Member List: - + Member List Options - - + + - - + - + - - - - - + + + + + - - - + + +
Show Member Name as Link to Detail:
Show Member Logo:
Show Member Name as Link to Detail:
Show Member Logo:
Logo Size: + Logo Size: - {if $settings.fieldFail.list_logo_size}

{$settings.fieldFail.list_logo_size}

{/if} + {if $genSettings.fieldFail.list_logo_size}

{$genSettings.fieldFail.list_logo_size}

{/if}
Show Address:
Show Address:
Address Options: - - - + + +
Show Street:
Show City, State, ZIP:
Show Country:
Show Street:
Show City, State, ZIP:
Show Country:
Show Region:
Show Description:
Show Short Description:
Show Phone Number:
Show Toll Free Phone Number:
Show Region:
Show Description:
Show Short Description:
Show Phone Number:
Show Toll Free Phone Number:
Show URL: - - Display URL as a link: + + Display URL as a link:
Show Categories:
Show Credit Cards Accepted:
Show Amenities:
Show Categories:
Show Credit Cards Accepted:
Show Amenities:
@@ -198,96 +196,96 @@ Show Map: - + Map Options: - + - - - - - - - - - + + + + + + + + + - - - + + +
Show Logo:
Show Logo:
Logo Size:
Show Description:
Show Short Description:
Show Address:
Show Street:
Show City, State, ZIP:
Show Country:
Show Region:
Show Phone:
Show Toll Free:
Show Description:
Show Short Description:
Show Address:
Show Street:
Show City, State, ZIP:
Show Country:
Show Region:
Show Phone:
Show Toll Free:
Show URL: - - Display URL as a link: + + Display URL as a link:
Show Categories:
Show Credit Cards:
Show Amenitiies:
Show Categories:
Show Credit Cards:
Show Amenitiies:
Show Directions: - + Member Detail Options: - + - - + - + - - - - - + + + + + - - - - + + + +
Show Member Logo:
Show Member Logo:
Logo Size: + Logo Size: - {if $settings.fieldFail.detail_logo_size}

{$settings.fieldFail.detail_logo_size}

{/if} + {if $genSettings.fieldFail.detail_logo_size}

{$genSettings.fieldFail.detail_logo_size}

{/if}
Show Address:
Show Address:
Address Options: - - - + + +
Show Street:
Show City, State, ZIP:
Show Country:
Show Street:
Show City, State, ZIP:
Show Country:
Show Region:
Show Description:
Show Short Description:
Show Phone Number:
Show Toll Free Phone Number:
Show Region:
Show Description:
Show Short Description:
Show Phone Number:
Show Toll Free Phone Number:
Show URL: - - Display URL as a link: + + Display URL as a link:
Show Categories:
Show Credit Cards Accepted:
Show Amenities:
Show Image Gallery:
Show Categories:
Show Credit Cards Accepted:
Show Amenities:
Show Image Gallery:
diff --git a/views/admin/management/terms.html b/views/admin/management/terms.html index 8508b65a..ffea0f85 100644 --- a/views/admin/management/terms.html +++ b/views/admin/management/terms.html @@ -1,7 +1,7 @@ {include file='admin/management/header.html'} - -

*** Not using these settings yet! ***

- + +

NOTE: Not all of these tems have been integrated into the site yet.

+ @@ -12,10 +12,10 @@

Admin Menu and Tab Names

- Members Menu: - - - {if $settings.fieldFail.term_admin_menu_members}

{$settings.fieldFail.term_admin_menu_members}

{/if} + Members Menu: + + + {if $termSettings.fieldFail.term_admin_menu_members}

{$termSettings.fieldFail.term_admin_menu_members}

{/if} @@ -23,34 +23,34 @@ - - + - - + - - +
Main Dashboard: - - {if $settings.fieldFail.term_admin_menu_members_dashboard}

{$settings.fieldFail.term_admin_menu_members_dashboard}

{/if} + 		Main Dashboard: + + {if $termSettings.fieldFail.term_admin_menu_members_dashboard}

{$termSettings.fieldFail.term_admin_menu_members_dashboard}

{/if}
Member List: - - {if $settings.fieldFail.term_admin_menu_members_list}

{$settings.fieldFail.term_admin_menu_members_list}

{/if} + 		Member List: + + {if $termSettings.fieldFail.term_admin_menu_members_list}

{$termSettings.fieldFail.term_admin_menu_members_list}

{/if}
Reports: - - {if $settings.fieldFail.term_admin_menu_members_reports}

{$settings.fieldFail.term_admin_menu_members_reports}

{/if} + 		Reports: + + {if $termSettings.fieldFail.term_admin_menu_members_reports}

{$termSettings.fieldFail.term_admin_menu_members_reports}

{/if}
- Member Menu: - - - {if $settings.fieldFail.term_admin_menu_member}

{$settings.fieldFail.term_admin_menu_member}

{/if} + Member Menu: + + + {if $termSettings.fieldFail.term_admin_menu_member}

{$termSettings.fieldFail.term_admin_menu_member}

{/if} @@ -58,55 +58,55 @@ - - + - - + - - + - - + - - + - - +
Member Dashboard: - - {if $settings.fieldFail.term_admin_menu_member_dashboard}

{$settings.fieldFail.term_admin_menu_member_dashboard}

{/if} + 		Member Dashboard: + + {if $termSettings.fieldFail.term_admin_menu_member_dashboard}

{$termSettings.fieldFail.term_admin_menu_member_dashboard}

{/if}
Member Info: - - {if $settings.fieldFail.term_admin_menu_member_info}

{$settings.fieldFail.term_admin_menu_member_info}

{/if} + 		Member Info: + + {if $termSettings.fieldFail.term_admin_menu_member_info}

{$termSettings.fieldFail.term_admin_menu_member_info}

{/if}
Locations: - - {if $settings.fieldFail.term_admin_menu_member_locations}

{$settings.fieldFail.term_admin_menu_member_locations}

{/if} + 		Locations: + + {if $termSettings.fieldFail.term_admin_menu_member_locations}

{$termSettings.fieldFail.term_admin_menu_member_locations}

{/if}
Facilities: - - {if $settings.fieldFail.term_admin_menu_member_facilities}

{$settings.fieldFail.term_admin_menu_member_facilities}

{/if} + 		Facilities: + + {if $termSettings.fieldFail.term_admin_menu_member_facilities}

{$termSettings.fieldFail.term_admin_menu_member_facilities}

{/if}
Attractions: - - {if $settings.fieldFail.term_admin_menu_member_attractions}

{$settings.fieldFail.term_admin_menu_member_attractions}

{/if} + 		Attractions: + + {if $termSettings.fieldFail.term_admin_menu_member_attractions}

{$termSettings.fieldFail.term_admin_menu_member_attractions}

{/if}
Contacts: - - {if $settings.fieldFail.term_admin_menu_member_contacts}

{$settings.fieldFail.term_admin_menu_member_contacts}

{/if} + 		Contacts: + + {if $termSettings.fieldFail.term_admin_menu_member_contacts}

{$termSettings.fieldFail.term_admin_menu_member_contacts}

{/if}
- Configure Menu: - - - {if $settings.fieldFail.term_admin_menu_configure}

{$settings.fieldFail.term_admin_menu_configure}

{/if} + Configure Menu: + + + {if $termSettings.fieldFail.term_admin_menu_configure}

{$termSettings.fieldFail.term_admin_menu_configure}

{/if} @@ -114,55 +114,55 @@ - - + - - + - - + - - + - - + - - +
Member Types: - - {if $settings.fieldFail.term_admin_menu_configure_member_types}

{$settings.fieldFail.term_admin_menu_configure_member_types}

{/if} + 		Member Types: + + {if $termSettings.fieldFail.term_admin_menu_configure_member_types}

{$termSettings.fieldFail.term_admin_menu_configure_member_types}

{/if}
Member Categories: - - {if $settings.fieldFail.term_admin_menu_configure_member_cats}

{$settings.fieldFail.term_admin_menu_configure_member_cats}

{/if} + 		Member Categories: + + {if $termSettings.fieldFail.term_admin_menu_configure_member_cats}

{$termSettings.fieldFail.term_admin_menu_configure_member_cats}

{/if}
Accommodation Types: - - {if $settings.fieldFail.term_admin_menu_configure_accom_types}

{$settings.fieldFail.term_admin_menu_configure_accom_types}

{/if} + 		Accommodation Types: + + {if $termSettings.fieldFail.term_admin_menu_configure_accom_types}

{$termSettings.fieldFail.term_admin_menu_configure_accom_types}

{/if}
Amenities: - - {if $settings.fieldFail.term_admin_menu_configure_amenities}

{$settings.fieldFail.term_admin_menu_configure_amenities}

{/if} + 		Amenities: + + {if $termSettings.fieldFail.term_admin_menu_configure_amenities}

{$termSettings.fieldFail.term_admin_menu_configure_amenities}

{/if}
Cities: - - {if $settings.fieldFail.term_admin_menu_configure_cities}

{$settings.fieldFail.term_admin_menu_configure_cities}

{/if} + 		Cities: + + {if $termSettings.fieldFail.term_admin_menu_configure_cities}

{$termSettings.fieldFail.term_admin_menu_configure_cities}

{/if}
Regions: - - {if $settings.fieldFail.term_admin_menu_configure_regions}

{$settings.fieldFail.term_admin_menu_configure_regions}

{/if} + 		Regions: + + {if $termSettings.fieldFail.term_admin_menu_configure_regions}

{$termSettings.fieldFail.term_admin_menu_configure_regions}

{/if}
- Settings Menu: - - - {if $settings.fieldFail.term_admin_menu_settings}

{$settings.fieldFail.term_admin_menu_settings}

{/if} + Settings Menu: + + + {if $termSettings.fieldFail.term_admin_menu_settings}

{$termSettings.fieldFail.term_admin_menu_settings}

{/if} @@ -170,29 +170,36 @@ - - + - - + - - +
General Settings: - - {if $settings.fieldFail.term_admin_menu_settings_general}

{$settings.fieldFail.term_admin_menu_settings_general}

{/if} + 		General Settings: + + {if $termSettings.fieldFail.term_admin_menu_settings_general}

{$termSettings.fieldFail.term_admin_menu_settings_general}

{/if}
Terms & Phrases: - - {if $settings.fieldFail.term_admin_menu_settings_terms}

{$settings.fieldFail.term_admin_menu_settings_terms}

{/if} + 		Terms & Phrases: + + {if $termSettings.fieldFail.term_admin_menu_settings_terms}

{$termSettings.fieldFail.term_admin_menu_settings_terms}

{/if}
Development: - - {if $settings.fieldFail.term_admin_menu_settings_development}

{$settings.fieldFail.term_admin_menu_settings_development}

{/if} + 		Development: + + {if $termSettings.fieldFail.term_admin_menu_settings_development}

{$termSettings.fieldFail.term_admin_menu_settings_development}

{/if}
+ + Shortcodes Menu: + + + {if $termSettings.fieldFail.term_admin_menu_shortcodes}

{$termSettings.fieldFail.term_admin_menu_shortcodes}

{/if} + +

Terms

@@ -200,31 +207,31 @@ - - + - - + - - + - - +
Normal: - - {if $settings.fieldFail.term_member}

{$settings.fieldFail.term_member}

{/if} + 		Normal: + + {if $termSettings.fieldFail.term_member}

{$termSettings.fieldFail.term_member}

{/if}
Capitalized: - - {if $settings.fieldFail.term_member_cap}

{$settings.fieldFail.term_member_cap}

{/if} + 		Capitalized: + + {if $termSettings.fieldFail.term_member_cap}

{$termSettings.fieldFail.term_member_cap}

{/if}
Plural: - - {if $settings.fieldFail.term_member_plur}

{$settings.fieldFail.term_member_plur}

{/if} + 		Plural: + + {if $termSettings.fieldFail.term_member_plur}

{$termSettings.fieldFail.term_member_plur}

{/if}
Plural Capitalized: - - {if $settings.fieldFail.term_member_plur_cap}

{$settings.fieldFail.term_member_plur_cap}

{/if} + 		Plural Capitalized: + + {if $termSettings.fieldFail.term_member_plur_cap}

{$termSettings.fieldFail.term_member_plur_cap}

{/if}
@@ -235,31 +242,31 @@ - - + - - + - - + - - +
Normal: - - {if $settings.fieldFail.term_location}

{$settings.fieldFail.term_location}

{/if} + 		Normal: + + {if $termSettings.fieldFail.term_location}

{$termSettings.fieldFail.term_location}

{/if}
Capitalized: - - {if $settings.fieldFail.term_location_cap}

{$settings.fieldFail.term_location_cap}

{/if} + 		Capitalized: + + {if $termSettings.fieldFail.term_location_cap}

{$termSettings.fieldFail.term_location_cap}

{/if}
Plural: - - {if $settings.fieldFail.term_location_plur}

{$settings.fieldFail.term_location_plur}

{/if} + 		Plural: + + {if $termSettings.fieldFail.term_location_plur}

{$termSettings.fieldFail.term_location_plur}

{/if}
Plural Capitalized: - - {if $settings.fieldFail.term_location_plur_cap}

{$settings.fieldFail.term_location_plur_cap}

{/if} + 		Plural Capitalized: + + {if $termSettings.fieldFail.term_location_plur_cap}

{$termSettings.fieldFail.term_location_plur_cap}

{/if}
@@ -270,31 +277,31 @@ - - + - - + - - + - - +
Normal: - - {if $settings.fieldFail.term_facility}

{$settings.fieldFail.term_facility}

{/if} + 		Normal: + + {if $termSettings.fieldFail.term_facility}

{$termSettings.fieldFail.term_facility}

{/if}
Capitalized: - - {if $settings.fieldFail.term_facility_cap}

{$settings.fieldFail.term_facility_cap}

{/if} + 		Capitalized: + + {if $termSettings.fieldFail.term_facility_cap}

{$termSettings.fieldFail.term_facility_cap}

{/if}
Plural: - - {if $settings.fieldFail.term_facility_plur}

{$settings.fieldFail.term_facility_plur}

{/if} + 		Plural: + + {if $termSettings.fieldFail.term_facility_plur}

{$termSettings.fieldFail.term_facility_plur}

{/if}
Plural Capitalized: - - {if $settings.fieldFail.term_facility_plur_cap}

{$settings.fieldFail.term_facility_plur_cap}

{/if} + 		Plural Capitalized: + + {if $termSettings.fieldFail.term_facility_plur_cap}

{$termSettings.fieldFail.term_facility_plur_cap}

{/if}
@@ -305,31 +312,31 @@ - - + - - + - - + - - +
Normal: - - {if $settings.fieldFail.term_attraction}

{$settings.fieldFail.term_attraction}

{/if} + 		Normal: + + {if $termSettings.fieldFail.term_attraction}

{$termSettings.fieldFail.term_attraction}

{/if}
Capitalized: - - {if $settings.fieldFail.term_attraction_cap}

{$settings.fieldFail.term_attraction_cap}

{/if} + 		Capitalized: + + {if $termSettings.fieldFail.term_attraction_cap}

{$termSettings.fieldFail.term_attraction_cap}

{/if}
Plural: - - {if $settings.fieldFail.term_attraction_plur}

{$settings.fieldFail.term_attraction_plur}

{/if} + 		Plural: + + {if $termSettings.fieldFail.term_attraction_plur}

{$termSettings.fieldFail.term_attraction_plur}

{/if}
Plural Capitalized: - - {if $settings.fieldFail.term_attraction_plur_cap}

{$settings.fieldFail.term_attraction_plur_cap}

{/if} + 		Plural Capitalized: + + {if $termSettings.fieldFail.term_attraction_plur_cap}

{$termSettings.fieldFail.term_attraction_plur_cap}

{/if}
@@ -340,31 +347,31 @@ - - + - - + - - + - - +
Normal: - - {if $settings.fieldFail.term_contact}

{$settings.fieldFail.term_contact}

{/if} + 		Normal: + + {if $termSettings.fieldFail.term_contact}

{$termSettings.fieldFail.term_contact}

{/if}
Capitalized: - - {if $settings.fieldFail.term_contact_cap}

{$settings.fieldFail.term_contact_cap}

{/if} + 		Capitalized: + + {if $termSettings.fieldFail.term_contact_cap}

{$termSettings.fieldFail.term_contact_cap}

{/if}
Plural: - - {if $settings.fieldFail.term_contact_plur}

{$settings.fieldFail.term_contact_plur}

{/if} + 		Plural: + + {if $termSettings.fieldFail.term_contact_plur}

{$termSettings.fieldFail.term_contact_plur}

{/if}
Plural Capitalized: - - {if $settings.fieldFail.term_contact_plur_cap}

{$settings.fieldFail.term_contact_plur_cap}

{/if} + 		Plural Capitalized: + + {if $termSettings.fieldFail.term_contact_plur_cap}

{$termSettings.fieldFail.term_contact_plur_cap}

{/if}
diff --git a/views/admin/member/memberInfo.html b/views/admin/member/memberInfo.html index da67855b..c4eba6eb 100644 --- a/views/admin/member/memberInfo.html +++ b/views/admin/member/memberInfo.html @@ -1,6 +1,6 @@ {include file='admin/member/header.html'} - + + @@ -47,37 +47,32 @@

- {if $list_show_detaillink} - {$member.member} - {else} - {$member.member} - {/if}

- {if $list_show_address} - {if $list_show_street} + {if $settings.detail_show_address} + {if $settings.detail_show_street} {if $member.addr1}
{$member.addr1}
{/if} {if $member.addr2}
{$member.addr2}
{/if} {/if} - {if $list_show_citystatezip} + {if $settings.detail_show_citystatezip} {if $member.city}{$member.city}{if $member.state.name}, {/if}{/if}{if $member.state.name}{$member.state.name}{/if}{if $member.zip} {$member.zip}{/if} {/if} - {if $member.country.name && $list_show_country}
{$member.country.name}
{/if} + {if $member.country.name && $settings.detail_show_country}
{$member.country.name}
{/if} {/if} - {if $member.phone && $list_show_phone}
Phone: {$member.phone}
{/if} - {if $member.toll_free && $list_show_tollfree}
Toll Free: {$member.toll_free}
{/if} - {if $member.region && $list_show_region}

Region: {$member.region}

{/if} + {if $member.phone && $settings.detail_show_phone}
Phone: {$member.phone}
{/if} + {if $member.toll_free && $settings.detail_show_tollfree}
Toll Free: {$member.toll_free}
{/if} + {if $member.region && $settings.detail_show_region}

Region: {$member.region}

{/if}

- {if $member.url && $list_show_url}Website{/if} - {if $member.email && $list_show_email}Email{/if} - {if $detail_show_imagegallery && $haveImageGallery}Photo Gallery{/if} - {if $detail_show_coupons && $coupons}Coupons{/if} - {if $detail_show_packages && $packages}Packages{/if} + {if $member.url && $settings.detail_show_url}Website{/if} + {if $member.email && $settings.detail_show_email}Email{/if} + {if $settings.detail_show_imagegallery && $haveImageGallery}Photo Gallery{/if} + {if $settings.detail_show_coupons && $coupons}Coupons{/if} + {if $settings.detail_show_packages && $packages}Packages{/if}
- {if $detail_show_map} - {if $member.logo && $detail_show_logo} + {if $settings.detail_show_map} + {if $member.logo && $settings.detail_show_logo}
{else}
@@ -85,19 +80,19 @@
(map loads here)
{/if} - {if $member.logo && $detail_show_logo} + {if $member.logo && $settings.detail_show_logo}
- +
{/if}
- {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)}
- {if $member.amenities && $detail_show_amenities} + {if $member.amenities && $settings.detail_show_amenities} {foreach $member.amenities as $a} @@ -110,7 +105,7 @@
Amenities & Services
{/if} - {if $member.cc_type && $detail_show_creditcards} + {if $member.cc_type && $settings.detail_show_creditcards}

Credit Cards Accepted:

    @@ -120,9 +115,9 @@

{/if} - {if $member.categories && $detail_show_categories} + {if $member.categories && $settings.detail_show_categories}

- {$term_member_cap} Categories + {$terms.term_member_cap} Categories

    {foreach $member.categories as $c}
  • @@ -139,15 +134,15 @@
    {/if}
    - {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}
- {if $detail_show_imagegallery && $haveImageGallery} + {if $settings.detail_show_imagegallery && $haveImageGallery}
@@ -163,12 +158,12 @@
{/if} - {if $detail_show_coupons && $coupons} + {if $settings.detail_show_coupons && $coupons}
{/if} - {if $detail_show_packages && $havePackages && $packages} + {if $settings.detail_show_packages && $havePackages && $packages}
@@ -180,7 +175,7 @@ {else} -

For some reason the specified {$term_member} was not found. Please try again.

+

For some reason the specified {$terms.term_member} was not found. Please try again.

{/if} diff --git a/views/front/members/list.html b/views/front/members/list.html index 3d864e10..45a0f325 100644 --- a/views/front/members/list.html +++ b/views/front/members/list.html @@ -1,28 +1,28 @@ {include file='front/members/header.html'} - + -{if $list_show_map} +{if $settings.list_show_map}
(map loads here)
{/if} -{if $list_show_search} +{if $settings.list_show_search}
-


Search for a {$term_member_cap}

+


Search for a {$terms.term_member_cap}

- {if $list_search_text} + {if $settings.list_show_search_text}
Text Search:
{/if} - {if $list_search_category} + {if $settings.list_show_search_category}
- {$term_member_cap} Category: + {$terms.term_member_cap} Category: {foreach from=$amenities item=v} @@ -57,11 +57,11 @@ {/if} {*list_show_search*} -{if $list_show_list} -

List of {$term_member_plur_cap}

+{if $settings.list_show_list} +

List of {$terms.term_member_plur_cap}

{if $haveMembers} - {if $list_search_alpha} + {if $settings.list_show_search_alpha}
All {foreach $alphaList as $a} @@ -78,10 +78,10 @@
- {if $m.logo && $list_show_logo} + {if $m.logo && $settings.list_show_logo}
- +
@@ -92,44 +92,44 @@ {/if}

- {if $list_show_detaillink} + {if $settings.list_show_detail_link} {$m.member} {else} {$m.member} {/if}

- {if $list_show_address} - {if $list_show_street} - {if $m.addr1 && $list_show_address}
{$m.addr1}
{/if} - {if $m.addr2 && $list_show_addr2}
{$m.addr2}
{/if} + {if $settings.list_show_address} + {if $settings.list_show_street} + {if $m.addr1 && $settings.list_show_address}
{$m.addr1}
{/if} + {if $m.addr2 && $settings.list_show_addr2}
{$m.addr2}
{/if} {/if} - {if $list_show_citystatezip} + {if $settings.list_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_show_country}
{$m.country.name}
{/if} + {if $m.country.name && $settings.list_show_country}
{$m.country.name}
{/if} {/if} - {if $m.phone && $list_show_phone}
Phone: {$m.phone}
{/if} - {if $m.toll_free && $list_show_tollfree}
Toll Free: {$m.toll_free}
{/if} - {if $m.region && $list_show_region}

Region: {$m.region}

{/if} + {if $m.phone && $settings.list_show_phone}
Phone: {$m.phone}
{/if} + {if $m.toll_free && $settings.list_show_tollfree}
Toll Free: {$m.toll_free}
{/if} + {if $m.region && $settings.list_show_region}

Region: {$m.region}

{/if}

- {if $m.url && $list_show_url}Website{/if} - {if $m.email && $list_show_email}Email{/if} + {if $m.url && $settings.list_show_url}Website{/if} + {if $m.email && $settings.list_show_email}Email{/if}
- {if $m.short_descr && $list_show_short_descr} + {if $m.short_descr && $settings.list_show_short_descr} {$m.short_descr} ... View Profile - {elseif $m.descr && $list_show_description} + {elseif $m.descr && $settings.list_show_description} {$m.descr|truncate:190:false:false} class="test">... View Profile {/if} - {if $m.categories && $list_show_categories} + {if $m.categories && $settings.list_show_categories}

- {$term_member_cap} Categories + {$terms.term_member_cap} Categories

    {foreach $m.categories as $c}
  • @@ -139,7 +139,7 @@

{/if} - {if $m.cc_type && $list_show_creditcards} + {if $m.cc_type && $settings.list_show_creditcards}

Credit Cards Accepted:

    @@ -149,9 +149,9 @@

{/if} - {if $m.amenities && $list_show_amenities} + {if $m.amenities && $settings.list_show_amenities}

- {$term_member_cap} Amenities + {$terms.term_member_cap} Amenities

    {foreach $m.amenities as $A}
  • @@ -171,39 +171,39 @@
    - {if $m.logo && $list_map_show_logo}
    {/if} + {if $m.logo && $settings.list_map_show_logo}
    {/if}
    - {if $list_map_show_detaillink} + {if $settings.list_map_show_detaillink} {$m.member} {else} {$m.member} {/if}
    - {if $list_map_show_address} + {if $settings.list_map_show_address}

    - {if $list_map_show_street} + {if $settings.list_map_show_street} {if $m.addr1}{$m.addr1}
    {/if} {if $m.addr2}{$m.addr2}
    {/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}
    {$m.country.name}{/if} + {if $m.country.name && $settings.list_map_show_country}
    {$m.country.name}{/if}

    {/if} {*list_map_show_address*}

    - {if $m.phone && $list_map_show_phone}Phone: {$m.phone}
    {/if} - {if $m.toll_free && $list_map_show_tollfree}Toll Free: {$m.toll_free}
    {/if} - {if $m.url && $list_map_show_url}Web site: {$m.url}
    {/if} - {if $m.email && $list_map_show_email}E-Mail Address: {$m.email}
    {/if} - {if $m.region && $list_map_show_region}Region: {$m.region}{/if} + {if $m.phone && $settings.list_map_show_phone}Phone: {$m.phone}
    {/if} + {if $m.toll_free && $settings.list_map_show_tollfree}Toll Free: {$m.toll_free}
    {/if} + {if $m.url && $settings.list_map_show_url}Web site: {$m.url}
    {/if} + {if $m.email && $settings.list_map_show_email}E-Mail Address: {$m.email}
    {/if} + {if $m.region && $settings.list_map_show_region}Region: {$m.region}{/if}

    - {if $m.descr && $list_map_show_description}{$m.descr}
    {/if} - {if $m.short_descr && $list_map_show_short_descr}{$m.short_descr}
    {/if} - {if $m.categories && $list_map_show_categories} + {if $m.descr && $settings.list_map_show_descr}{$m.descr}
    {/if} + {if $m.short_descr && $settings.list_map_show_short_descr}{$m.short_descr}
    {/if} + {if $m.categories && $settings.list_map_show_categories}
    - {$term_member_cap} Categories + {$terms.term_member_cap} Categories
      {foreach $m.categories as $c}
    • @@ -213,7 +213,7 @@
    {/if} - {if $m.cc_type && $list_map_show_creditcards} + {if $m.cc_type && $settings.list_map_show_creditcards}
    Credit Cards Accepted:
      @@ -223,7 +223,7 @@
    {/if} - {if $list_map_show_amenities} + {if $settings.list_map_show_amenities}
    Amenities:
      @@ -239,14 +239,14 @@ {/foreach} {*$members*} {else} -
      (no {$term_member_plur} listed)
      +
      (no {$terms.term_member_plur} listed)
      {/if} {/if} {*list_show_list*}