From b1b85fa27c2955246078ce5c72b490173d34be32 Mon Sep 17 00:00:00 2001 From: Steve Sutton Date: Tue, 26 Feb 2019 16:04:07 -0500 Subject: [PATCH] DB Updates - alternate view files for list,grid,detail pages. Setting up initial set of default view files for list grid and detail pages. These will be for the different themes we have. Trying to pull the theme view files over into the main plugin. --- classes/data/settings/dataSettingsGeneral.php | 27 + config/plugin.ini | 17 +- index.php | 2 +- models/admin/management/index.php | 2 + models/front/members/list.php | 4 +- ...1.1.50.sql => create_database_V1.1.51.sql} | 11 +- setup/databaseScripts/dbVersions.php | 1 + ..._V1.1.49.sql => drop_database_V1.1.51.sql} | 0 .../update_database_V1.1.51.sql | 25 + views/admin/management/index.html | 50 +- views/front/members/detailA.html | 777 ++++++++++++++++++ views/front/members/list.html | 24 +- views/front/members/listTypeGridA.html | 82 ++ views/front/members/listTypeListA.html | 167 ++++ 14 files changed, 1160 insertions(+), 29 deletions(-) rename setup/databaseScripts/{create_database_V1.1.50.sql => create_database_V1.1.51.sql} (98%) rename setup/databaseScripts/{drop_database_V1.1.49.sql => drop_database_V1.1.51.sql} (100%) create mode 100755 setup/databaseScripts/update_database_V1.1.51.sql create mode 100644 views/front/members/detailA.html create mode 100644 views/front/members/listTypeGridA.html create mode 100644 views/front/members/listTypeListA.html diff --git a/classes/data/settings/dataSettingsGeneral.php b/classes/data/settings/dataSettingsGeneral.php index e2aa0533..d6528558 100755 --- a/classes/data/settings/dataSettingsGeneral.php +++ b/classes/data/settings/dataSettingsGeneral.php @@ -409,6 +409,33 @@ class GlmDataSettingsGeneral extends GlmDataAbstract 'use' => 'a' ), + // List View File + 'list_view_file' => array( + 'field' => 'list_view_file', + 'type' => 'list', + 'list' => $this->config['member_view_list'], + 'force_list' => true, + 'use' => 'a', + ), + + // Grid View File + 'grid_view_file' => array( + 'field' => 'grid_view_file', + 'type' => 'list', + 'list' => $this->config['member_view_grid'], + 'force_list' => true, + 'use' => 'a', + ), + + // Detail View File + 'detail_view_file' => array( + 'field' => 'detail_view_file', + 'type' => 'list', + 'list' => $this->config['member_view_detail'], + 'force_list' => true, + 'use' => 'a', + ), + // Front-end Listings - Show Featured Members 'list_show_featured' => array( 'field' => 'list_show_featured', diff --git a/config/plugin.ini b/config/plugin.ini index cbecf5c0..504280bb 100755 --- a/config/plugin.ini +++ b/config/plugin.ini @@ -1,14 +1,14 @@ ; ; Main Configuration File -; Gaslight Media Members Database Plugin +; Gaslight Media Members Database Plugin ; ; Image sizes array is outsize of the sections below and is added to $config after the section is selected. ; Any sizes added to this section will used by the Data Abstract to generate that size when images are uploaded. -; Crop value: +; Crop value: ; 1. If false (default), images will not be cropped. -; 2. If true, images will be cropped to the specified width/height aspect ratio. - +; 2. If true, images will be cropped to the specified width/height aspect ratio. + [imageSizes] large['width'] = 800 @@ -361,3 +361,12 @@ map_interface[2] = 'Google Maps JAVAScript API' map_interface_numb['None'] = 0 map_interface_numb['Leaflet'] = 1 map_interface_numb['Google'] = 2 + +member_view_list['listTypeList'] = 'Default' +member_view_list['listTypeListA'] = 'Style 2' + +member_view_grid['listTypeGrid'] = 'Default' +member_view_grid['listTypeGridA'] = 'WMTA Style' + +member_view_detail['detail'] = 'Default' +member_view_detail['detailA'] = 'WMTA Style' diff --git a/index.php b/index.php index 7686ffb1..cc5c0dc8 100755 --- a/index.php +++ b/index.php @@ -48,7 +48,7 @@ if (!defined('ABSPATH')) { */ define('GLM_MEMBERS_PLUGIN_VERSION', '2.11.2'); -define('GLM_MEMBERS_PLUGIN_DB_VERSION', '1.1.50'); +define('GLM_MEMBERS_PLUGIN_DB_VERSION', '1.1.51'); // Check if plugin version is not current in WordPress option and if needed updated it if (GLM_MEMBERS_PLUGIN_VERSION != get_option('glmMembersDatabasePluginVersion')) { diff --git a/models/admin/management/index.php b/models/admin/management/index.php index 45b50d09..a7df4cfa 100755 --- a/models/admin/management/index.php +++ b/models/admin/management/index.php @@ -201,6 +201,7 @@ class GlmMembersAdmin_management_index extends GlmDataSettingsGeneral // Update all general setttings $generalSettings = $this->updateEntry( 1 ); + // echo '
$generalSettings: ' . print_r( $generalSettings, true ) . '
'; if ( $generalSettings[ 'status' ] ) { $settings_updated = true; } else { @@ -214,6 +215,7 @@ class GlmMembersAdmin_management_index extends GlmDataSettingsGeneral // Try to get the first (should be only) entry for general settings. $generalSettings = $this->editEntry( $id ); + // echo '
$generalSettings: ' . print_r( $generalSettings, true ) . '
'; break; } diff --git a/models/front/members/list.php b/models/front/members/list.php index 3d46aa73..bd6b8c41 100755 --- a/models/front/members/list.php +++ b/models/front/members/list.php @@ -1274,9 +1274,9 @@ class GlmMembersFront_members_list extends GlmDataMemberInfo if ( defined( 'GLM_MEMBER_LIST_AJAX_LOADER' ) && GLM_MEMBER_LIST_AJAX_LOADER ) { if ( $view == 'grid' ) { - $viewFile = 'front/members/listTypeGrid.html'; + $viewFile = 'front/members/' . $this->config['settings']['grid_view_file'] . '.html'; } else { - $viewFile = 'front/members/listTypeList.html'; + $viewFile = 'front/members/' . $this->config['settings']['list_view_file'] . '.html'; } } diff --git a/setup/databaseScripts/create_database_V1.1.50.sql b/setup/databaseScripts/create_database_V1.1.51.sql similarity index 98% rename from setup/databaseScripts/create_database_V1.1.50.sql rename to setup/databaseScripts/create_database_V1.1.51.sql index d5ac9a6f..3a2bcf31 100755 --- a/setup/databaseScripts/create_database_V1.1.50.sql +++ b/setup/databaseScripts/create_database_V1.1.51.sql @@ -1,6 +1,6 @@ -- Gaslight Media Members Database -- File Created: 12/29/16 12:06:00 --- Database Version: 1.1.50 +-- Database Version: 1.1.51 -- Database Creation Script -- -- To permit each query below to be executed separately, @@ -415,6 +415,9 @@ CREATE TABLE {prefix}settings_general ( list_show_packages BOOLEAN DEFAULT '0', list_show_packages_link BOOLEAN DEFAULT '0', list_header_text TINYTEXT DEFAULT NULL, + list_view_file TINYTEXT NULL, + grid_view_file TINYTEXT NULL, + detail_view_file TINYTEXT NULL, detail_auto_expand_sections BOOLEAN DEFAULT '0', detail_show_map BOOLEAN DEFAULT '1', detail_show_directions BOOLEAN DEFAULT '1', @@ -484,10 +487,12 @@ CREATE TABLE {prefix}settings_general ( -- Set default entry INSERT INTO {prefix}settings_general ( id, time_zone, canonical_member_page, list_logo_size, list_map_logo_size, detail_logo_size, detail_map_logo_size, - list_pagination, list_pagination_count, enable_counties, enable_multiple_profiles, enable_member_reports, enable_caching, updates_notification, enable_single_profile ) + list_pagination, list_pagination_count, enable_counties, enable_multiple_profiles, enable_member_reports, enable_caching, updates_notification, enable_single_profile, + list_view_file, grid_view_file, detail_view_file ) VALUES ( 1, 'America/Detroit', 'member-detail', 'large', 'thumb', 'large', 'thumb', '1', 20, 0, 0, 1, 1, - 'A member has updated their record and is now in a pending state.', 0) + 'A member has updated their record and is now in a pending state.', 0, + 'listTypeList', 'listTypeGrid', 'detail') ; ---- diff --git a/setup/databaseScripts/dbVersions.php b/setup/databaseScripts/dbVersions.php index 70913625..19411041 100755 --- a/setup/databaseScripts/dbVersions.php +++ b/setup/databaseScripts/dbVersions.php @@ -82,6 +82,7 @@ $glmMembersDbVersions = array( '1.1.48' => array('version' => '1.1.48', 'tables' => 23, 'date' => '02/14/19'), '1.1.49' => array('version' => '1.1.49', 'tables' => 23, 'date' => '02/15/19'), '1.1.50' => array('version' => '1.1.50', 'tables' => 23, 'date' => '02/20/19'), + '1.1.51' => array('version' => '1.1.51', 'tables' => 23, 'date' => '02/26/19'), ); diff --git a/setup/databaseScripts/drop_database_V1.1.49.sql b/setup/databaseScripts/drop_database_V1.1.51.sql similarity index 100% rename from setup/databaseScripts/drop_database_V1.1.49.sql rename to setup/databaseScripts/drop_database_V1.1.51.sql diff --git a/setup/databaseScripts/update_database_V1.1.51.sql b/setup/databaseScripts/update_database_V1.1.51.sql new file mode 100755 index 00000000..c99e3ab8 --- /dev/null +++ b/setup/databaseScripts/update_database_V1.1.51.sql @@ -0,0 +1,25 @@ +-- Gaslight Media Members Database +-- File Created: 2019-02-15 +-- Database Version: 1.1.49 +-- Database Update From Previous Version Script +-- +-- To permit each query below to be executed separately, +-- all queries must be separated by a line with four dashes + +-- Add setting +ALTER TABLE {prefix}settings_general ADD COLUMN list_view_file TINYTEXT NULL; + +---- + +-- Add setting +ALTER TABLE {prefix}settings_general ADD COLUMN grid_view_file TINYTEXT NULL; + +---- + +-- Add setting +ALTER TABLE {prefix}settings_general ADD COLUMN detail_view_file TINYTEXT NULL; + +---- + +-- Update current settings +UPDATE {prefix}settings_general set list_view_file = 'listTypeList', grid_view_file = 'listTypeGrid', detail_view_file = 'detail'; diff --git a/views/admin/management/index.html b/views/admin/management/index.html index ca625569..5830d941 100755 --- a/views/admin/management/index.html +++ b/views/admin/management/index.html @@ -300,22 +300,58 @@ - + {* Member List Page Options *}
+ + + + + + + + + + + + @@ -323,9 +359,9 @@ diff --git a/views/front/members/detailA.html b/views/front/members/detailA.html new file mode 100644 index 00000000..3b56d9d6 --- /dev/null +++ b/views/front/members/detailA.html @@ -0,0 +1,777 @@ +{include file='front/members/header.html'} + +{apply_filters('glm-member-db-front-members-detail-pageTop', '', $member.id)} + +{if $haveMember} + + {if $settings.detail_show_map} + + {/if} + {if $settings.detail_show_directions} + + {/if} + + + +
+ + Back to listing +
+
+ {if $member.logo && $settings.detail_show_logo} + + {/if} + {if $member.url && $settings.detail_show_url} + + {/if} + +
+

{$member.member}

+ + + {if $settings.detail_show_address} +
+ {apply_filters('glm-member-db-front-members-detail-addressTop', '', $member.id)} + {if $settings.detail_show_street} + {if $member.addr1}
{$member.addr1}
{/if} + {if $member.addr2}
{$member.addr2}
{/if} + {/if} + {if $settings.memb_info_location && $settings.detail_show_citystatezip} +
+ {if $member.city} + {$member.city}{if $member.state.value}, {/if} + {/if} + {if $member.state.value} + {$member.state.value} + {/if} + {if $member.zip} + {$member.zip} + {/if} +
+ {/if} + {if $member.country.name && $settings.detail_show_country} +
{$member.country.name}
+ {/if} + {apply_filters('glm-member-db-front-members-detail-addressBottom', '', $member.id)} +
+ {/if} + {apply_filters('glm-member-db-front-members-detail-otherDetailTop', '', $member.id)} + {if $settings.memb_info_location && $member.region && $settings.detail_show_region} +
+ {$terms.term_admin_menu_configure_regions}: {$member.region} +
+ {/if} + {if $settings.memb_info_location} +
+ {if $member.phone && $settings.detail_show_phone} +
+
Phone: {apply_filters('glm_associate_phone_filter', $member.phone)}
+
+ {/if} + {if $member.toll_free && $settings.detail_show_tollfree} +
+
Toll Free: {apply_filters('glm_associate_phone_filter', $member.toll_free)}
+
+ {/if} +
+ {/if} + {apply_filters('glm-member-db-front-members-detail-otherDetailBottom', '', $member.id)} + + +
+ {apply_filters('glm-member-db-front-members-list-memberDetailBottom', '', $member.id)} + {apply_filters('glm-member-db-front-members-social-list', '', $member.id)} +
+
+ + {if $settings.detail_show_map} +
+
+ {if $settings.selected_map_interface == 1} + + + + +
(map loads here)
+ {/if} + {if $settings.selected_map_interface == 2} + + +
(map loads here)
+ {/if} +
+
view map
+ +
+
+
+ + + + + + +
+ {/if} +
+ + + +
+ {apply_filters('glm-member-db-front-members-detail-attributesTop', '', $member.id)} + +
+ {if $member.short_descr && $settings.detail_show_short_descr}{$member.short_descr|nl2br}{/if} +
+
Expand All
+
+ {apply_filters('glm-member-db-front-members-detail-packages', '', $member.id)} +
Description
+
+
+ {if $member.descr && $settings.detail_show_descr} + {apply_filters('glm-member-db-front-members-detail-descriptionTop', '', $member.id)} + {$member.descr|nl2br} + {apply_filters('glm-member-db-front-members-detail-descriptionBottom', '', $member.id)} + {/if} +
+ +
+ + {apply_filters('glm-member-db-front-members-detail-events', '', $member.id)} + + {apply_filters('glm-member-db-front-members-detail-couponsBefore', '', $member.id)} + {if $settings.detail_show_coupons && $coupons} +
Coupons
+
+ + +
+ {/if} + {apply_filters('glm-member-db-front-members-detail-couponsAfter', '', $member.id)} + + {apply_filters('glm-member-db-front-members-detail-amenitiesBefore', '', $member.id)} + {if $member.amenities && $settings.detail_show_amenities} +
Amenities & Services
+
+

Member List Display Options

List View File + +
Grid View File + +
Detail View File + +
Show Featured Member List:
Max Featured Members to List:
Show Member List:
Member List Order
+ {foreach $member.amenities as $a} + + + + {/foreach} +
+ {$a.name} +
+ + + {/if} + {apply_filters('glm-member-db-front-members-detail-amenitiesAfter', '', $member.id)} + + {apply_filters('glm-member-db-front-members-detail-categoriesBefore', '', $member.id)} + {if $member.categories && $settings.detail_show_categories} +
Categories
+
+ + + {foreach $member.categories as $c} + + + + {/foreach} +
+ {if $c.parent_name}{$c.parent_name}: {/if}{$c.name} +
+ +
+ {/if} + {apply_filters('glm-member-db-front-members-detail-categoriesAfter', '', $member.id)} + {apply_filters('glm-member-db-front-members-detail-videoBefore', '', $member.id)} + {if $member.video_url && $settings.detail_show_video} +
Video
+
+ +

{$member.video_title}

+
{$member.video_embed}
+

{$member.video_descr}

+
+ +
+ {/if} + + {apply_filters('glm-member-db-front-members-detail-videoAfter', '', $member.id)} + + {apply_filters('glm-member-db-front-members-detail-liveCamBefore', '', $member.id)} + {if $member.live_cam_type.value!=1 && $member.live_cam_url && $settings.detail_show_live_cam} +
{$terms.term_webcam_cap}
+
+ +

{$member.live_cam_title}

+ {if $member.live_cam_type.value == 2} + + {/if} +

{$member.live_cam_descr}

+
+ +
+ {/if} + + {if $haveFiles} +
Files
+
+ {foreach $files as $file} + {if $file.caption}{$file.caption}{else}{$file.name}{/if} + {/foreach} + +
+ {/if} + + {apply_filters('glm-member-db-front-members-detail-liveCamAfter', '', $member.id)} + + {$customFields = apply_filters('get_glm_custom_fields','glm-member-db',$member.memberInfoId)} + {if !empty($customFields[0].field_data)} +
Hours
+
+
+ + {foreach $customFields as $field} + {if $field.field_data} +
+
+ {$field.field_name} + {$field.field_data} +
+ +
+ {/if} + {/foreach} +
+ + +
+ {/if} + + {apply_filters('glm-member-db-front-members-detail-imageGalleryBefore', '', $member.id)} + {if $settings.detail_show_imagegallery && $haveImageGallery} +
Photos
+
+ {apply_filters('glm-member-db-front-members-detail-galleryTop', '', $member.id)} + + +
    + {foreach $imageGallery as $i} +
  • + + {$i.caption} + +
  • + {/foreach} +
+ {apply_filters('glm-member-db-front-members-detail-galleryBottom', '', $member.id)} + +
+ {/if} + {apply_filters('glm-member-db-front-members-detail-imageGalleryAfter', '', $member.id)} + + {apply_filters('glm-member-db-front-members-detail-dataBottom','',$member.id)} + + + {apply_filters('glm-member-db-front-members-detail-attributesBottom', '', $member.id)} + + + + + {apply_filters('glm-member-db-front-members-detail-pageBottom', '', $member.id)} + +
+

+ We would like to lookup your present location so we can provide accurate directions. +

+ Your browser may ask for your permission to determine your location + (possibly at the top of this page). +

+ If you agree, we will use your current location as the starting point for + directions. If you don't agree, you may enter a starting location when the map is displayed. +

+
+ + + +{else} +

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

+{/if} + + +{include file='front/footer.html'} diff --git a/views/front/members/list.html b/views/front/members/list.html index 03401031..e6662d6f 100755 --- a/views/front/members/list.html +++ b/views/front/members/list.html @@ -65,7 +65,7 @@
Close
{/if}
- {if isset($smarty.request.s)}{/if} + {if isset($wpSearch)}{/if}
{apply_filters('glm-member-db-front-members-list-searchFormTop', '')}
@@ -328,9 +328,9 @@ {if $showSettings.list_show_search_alpha && !$isSearchPage} {/if} @@ -341,8 +341,8 @@ {if ( $prevStart || $nextStart ) && !$settings.list_ajax_pagination}

{/if} @@ -361,13 +361,13 @@ loading...
{else} - {if $view == list || $view == map} - {include file='front/members/listTypeList.html'} + {if $view == 'list' || $view == 'map'} + {include file="front/members/{$settings.list_view_file}.html"} {/if} - {if $view == grid} - {include file='front/members/listTypeGrid.html'} + {if $view == 'grid'} + {include file="front/members/{$settings.grid_view_file}.html"} {/if} - {if $view == uptravel} + {if $view == 'uptravel'} {include file='front/members/listTypeUptravel.html'} {/if} {/if} @@ -379,8 +379,8 @@ {if ( $prevStart || $nextStart ) && !$settings.list_ajax_pagination}

{/if} diff --git a/views/front/members/listTypeGridA.html b/views/front/members/listTypeGridA.html new file mode 100644 index 00000000..14188aa5 --- /dev/null +++ b/views/front/members/listTypeGridA.html @@ -0,0 +1,82 @@ +{* List Type Grid *} + diff --git a/views/front/members/listTypeListA.html b/views/front/members/listTypeListA.html new file mode 100644 index 00000000..bd1efe55 --- /dev/null +++ b/views/front/members/listTypeListA.html @@ -0,0 +1,167 @@ +{* List Type View *} + +{foreach $members as $member} + + {apply_filters('glm-member-db-front-members-list-memberAbove', '', $member.member_pointer)} +
+ + {apply_filters('glm-member-db-front-members-list-memberTop', '', $member.member_pointer)} + {if $member.featured} + + {/if} + + {* Member Logo - Medium and up *} + +
+ {if $member.logo && $showSettings.list_show_logo} +
+ {apply_filters('glm-member-db-front-members-list-memberImageTop', '', $member.member_pointer)} +
+ +
+
+ {elseif $showSettings.list_show_logo_filler} +
+ {apply_filters('glm-member-db-front-members-list-memberImageTop', '', $member.member_pointer)} +
+ {/if} +
+ + {apply_filters('glm-member-db-front-members-list-memberInfoTop', '', $member.member_pointer)} + +

+ {if $showSettings.list_show_detail_link && !$member.has_no_profile.value} + {$member.member} + {else} + {$member.member} + {/if} +

+ {if $showSettings.list_show_address} +
+ + {apply_filters('glm-member-db-front-members-list-memberAddressTop', '', $member.member_pointer)} + + {if $showSettings.list_show_street} + {if $member.addr1 && $showSettings.list_show_address}
{$member.addr1}
{/if} + {if $member.addr2 && $showSettings.list_show_address}
{$member.addr2}
{/if} + {/if} + {if $settings.memb_info_location && $showSettings.list_show_citystatezip} +
+ {if $member.city} + {$member.city}{if $member.state.value}, {/if} + {/if} + {if $member.state.value} + {$member.state.value} + {/if} + {if $member.zip} + {$member.zip} + {/if} +
+ {/if} + {if $member.country.name && $showSettings.list_show_country} +
{$member.country.name}
+ {/if} + + {apply_filters('glm-member-db-front-members-list-memberAddressBottom', '', $member.member_pointer)} + +
+ {/if} + + {apply_filters('glm-member-db-front-members-list-memberDetailTop', '', $member.member_pointer)} + + {if ($settings.memb_info_contact && $member.phone && $showSettings.list_show_phone) || ($settings.memb_info_contact && $member.toll_free && $showSettings.list_show_tollfree)} +
+ {if $member.phone && $showSettings.list_show_phone}Phone: {apply_filters('glm_associate_phone_filter', $member.phone)} {/if} + {if $member.toll_free && $showSettings.list_show_tollfree}{apply_filters('glm_associate_phone_filter', $member.toll_free)}{/if} +
+ {/if} + {if $settings.memb_info_location && $member.region && $showSettings.list_show_region}
Region: {$member.region}
{/if} + + +
+ + {apply_filters('glm-member-db-front-members-social-list', '', $member.member_pointer)} + +
+ +
+
+ + {apply_filters('glm-member-db-front-members-list-memberDescriptionTop', '', $member.member_pointer)} + + {if $member.short_descr && $showSettings.list_show_short_descr} + {$member.short_descr|nl2br} + {if $showSettings.list_show_detail_link && !$member.has_no_profile.value} + More + {/if} + {/if} + + {apply_filters('glm-member-db-front-members-list-memberDescriptionBottom', '', $member.member_pointer)} + +
+
+ {if isset($member.categories) && $member.categories && $showSettings.list_show_categories} + {$terms.term_member_cap} Categories +
    + {foreach $member.categories as $c} +
  • + {if $c.parent_name}{$c.parent_name}: {/if}{$c.name} +
  • + {/foreach} +
+ {/if} + {if $member.cc_type && $showSettings.list_show_creditcards} + Credit Cards Accepted: +
    + {foreach $member.cc_type.names as $c} +
  • {$c}
  • + {/foreach} +
+ {/if} + {if isset($member.categories) && $member.amenities && $showSettings.list_show_amenities} + {$terms.term_member_cap} Amenities +
    + {foreach $member.amenities as $A} +
  • + {$A.name} +
  • + {/foreach} +
+ {/if} +
+
+ + {apply_filters('glm-member-db-front-members-list-memberDetailBottom', '', $member.member_pointer)} + +
+ + {apply_filters('glm-member-db-front-members-list-memberDataBelow', '', $member.member_pointer)} + +
+ + {apply_filters('glm-member-db-front-members-list-memberBelow', '', $member.member_pointer)} + +
+ +{/foreach} {* members *} + +{apply_filters('glm-member-db-front-members-list-memberBottom', '', $member.member_pointer)} -- 2.17.1