From 052f9912004daae44a95f46f211c6c796e82d639 Mon Sep 17 00:00:00 2001 From: Laury GvR Date: Tue, 18 Oct 2016 10:11:48 -0400 Subject: [PATCH] Option for webcam on list, markup conditional fix List view and Grid view both were not checking entirely correctly for whether the webcam had a good URL. Also added a live_cam display option to the admin settings that is now checked against. --- classes/data/settings/dataSettingsGeneral.php | 8 +++++++ index.php | 2 +- ...1.1.19.sql => create_database_V1.1.20.sql} | 3 ++- setup/databaseScripts/dbVersions.php | 3 ++- ..._V1.1.19.sql => drop_database_V1.1.20.sql} | 0 .../update_database_V1.1.20.sql | 10 +++++++++ views/admin/management/index.html | 1 + views/front/members/detail.html | 11 +++++++--- views/front/members/list.html | 22 ++++++++++++------- 9 files changed, 46 insertions(+), 14 deletions(-) rename setup/databaseScripts/{create_database_V1.1.19.sql => create_database_V1.1.20.sql} (99%) rename setup/databaseScripts/{drop_database_V1.1.19.sql => drop_database_V1.1.20.sql} (100%) create mode 100644 setup/databaseScripts/update_database_V1.1.20.sql diff --git a/classes/data/settings/dataSettingsGeneral.php b/classes/data/settings/dataSettingsGeneral.php index 4f875602..b2abfcda 100644 --- a/classes/data/settings/dataSettingsGeneral.php +++ b/classes/data/settings/dataSettingsGeneral.php @@ -472,6 +472,14 @@ class GlmDataSettingsGeneral extends GlmDataAbstract 'default' => false, 'use' => 'a' ), + + // Front-end Member List - Show Live Cam + 'list_show_live_cam' => array( + 'field' => 'list_show_live_cam', + 'type' => 'checkbox', + 'default' => false, + 'use' => 'a' + ), /* * Front-end Member Listing Map Options diff --git a/index.php b/index.php index 8d6ce64b..f8afad17 100644 --- a/index.php +++ b/index.php @@ -39,7 +39,7 @@ */ define('GLM_MEMBERS_PLUGIN_VERSION', '2.6.6'); -define('GLM_MEMBERS_PLUGIN_DB_VERSION', '1.1.19'); +define('GLM_MEMBERS_PLUGIN_DB_VERSION', '1.1.20'); // 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/setup/databaseScripts/create_database_V1.1.19.sql b/setup/databaseScripts/create_database_V1.1.20.sql similarity index 99% rename from setup/databaseScripts/create_database_V1.1.19.sql rename to setup/databaseScripts/create_database_V1.1.20.sql index 86e7d14f..920896ae 100644 --- a/setup/databaseScripts/create_database_V1.1.19.sql +++ b/setup/databaseScripts/create_database_V1.1.20.sql @@ -1,6 +1,6 @@ -- Gaslight Media Members Database -- File Created: 12/09/14 15:27:15 --- Database Version: 1.1.18 +-- Database Version: 1.1.20 -- Database Creation Script -- -- To permit each query below to be executed separately, @@ -298,6 +298,7 @@ CREATE TABLE {prefix}settings_general ( list_show_creditcards BOOLEAN DEFAULT '0', list_show_amenities BOOLEAN DEFAULT '0', list_show_logo_filler BOOLEAN DEFAULT '1', + list_show_live_cam BOOLEAN DEFAULT '1', list_map_show_opened BOOLEAN DEFAULT '0', list_map_show_detaillink BOOLEAN DEFAULT '1', list_map_show_logo BOOLEAN DEFAULT '0', diff --git a/setup/databaseScripts/dbVersions.php b/setup/databaseScripts/dbVersions.php index d31121a8..9b5b1bed 100644 --- a/setup/databaseScripts/dbVersions.php +++ b/setup/databaseScripts/dbVersions.php @@ -50,7 +50,8 @@ $glmMembersDbVersions = array( '1.1.16' => array('version' => '1.1.16', 'tables' => 18, 'date' => '8/22/16'), '1.1.17' => array('version' => '1.1.17', 'tables' => 18, 'date' => '8/29/16'), '1.1.18' => array('version' => '1.1.18', 'tables' => 18, 'date' => '9/16/16'), - '1.1.19' => array('version' => '1.1.19', 'tables' => 18, 'date' => '9/20/16') + '1.1.19' => array('version' => '1.1.19', 'tables' => 18, 'date' => '9/20/16'), + '1.1.20' => array('version' => '1.1.20', 'tables' => 18, 'date' => '10/18/16') ); diff --git a/setup/databaseScripts/drop_database_V1.1.19.sql b/setup/databaseScripts/drop_database_V1.1.20.sql similarity index 100% rename from setup/databaseScripts/drop_database_V1.1.19.sql rename to setup/databaseScripts/drop_database_V1.1.20.sql diff --git a/setup/databaseScripts/update_database_V1.1.20.sql b/setup/databaseScripts/update_database_V1.1.20.sql new file mode 100644 index 00000000..2d190e59 --- /dev/null +++ b/setup/databaseScripts/update_database_V1.1.20.sql @@ -0,0 +1,10 @@ +-- Gaslight Media Members Database +-- File Created: 8/15/16 14:59:42 +-- Database Version: 1.1.20 +-- 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 +-- Sets which character to use to separate phone numbers + +ALTER TABLE {prefix}settings_general ADD COLUMN list_show_live_cam TINYTEXT NULL; \ No newline at end of file diff --git a/views/admin/management/index.html b/views/admin/management/index.html index 9ebdb464..8e243d86 100644 --- a/views/admin/management/index.html +++ b/views/admin/management/index.html @@ -208,6 +208,7 @@ Show Amenities: Show Packages: Show Packages Link: + Show Live Cam Link: diff --git a/views/front/members/detail.html b/views/front/members/detail.html index fed56b54..73a65393 100644 --- a/views/front/members/detail.html +++ b/views/front/members/detail.html @@ -70,8 +70,8 @@ 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 $member.addr1}
{$member.addr1}
{/if} + {if $member.addr2}
{$member.addr2}
{/if} {/if} {if $settings.detail_show_citystatezip}
@@ -117,7 +117,12 @@ {apply_filters('glm-member-db-front-members-detail-linksTop', '', $member.id)} {if $member.email && $settings.detail_show_email}Email{/if} {if $settings.detail_show_coupons && $coupons}Coupons{/if} - {if $member.live_cam_type.value==1 && $member.live_cam_url && $settings.detail_show_live_cam}{$terms.term_webcam_cap}{/if} + {if $member.live_cam_type.value==1 && $member.live_cam_url != "" && $settings.detail_show_live_cam} + URL{$member.live_cam_url}SHOW?{$settings.detail_show_live_cam} + + {$terms.term_webcam_cap} + + {/if} {apply_filters('glm-member-db-front-members-detail-linksBottom', '', $member.id)}
diff --git a/views/front/members/list.html b/views/front/members/list.html index 99bf4c49..d6614b19 100644 --- a/views/front/members/list.html +++ b/views/front/members/list.html @@ -147,11 +147,13 @@ {$packageLink = apply_filters('glm-member-db-front-members-list-linksBottom', '', $member.member_pointer)} {if $packageLink}
  • {$packageLink}
    • {/if} - - {if $member.live_cam_type.name == "Web Page" && $member.live_cam_url} -
  • {$terms.term_webcam_cap}
    • - {else if $member.live_cam_type.name == "Camera Image"} -
  • {$terms.term_webcam_cap}
    • + + {if $settings.list_show_live_cam} + {if $member.live_cam_type.name == "Web Page" && $member.live_cam_url && $settings.list_show_live_cam} +
  • {$terms.term_webcam_cap}
    • + {else if $member.live_cam_type.name == "Camera Image"} +
  • {$terms.term_webcam_cap}
    • + {/if} {/if}
  • View More
    • @@ -307,9 +309,13 @@
    {apply_filters('glm-member-db-front-members-list-memberLinksTop', '', $member.member_pointer)} {if $member.url && $settings.list_show_url}Visit Website{/if} - {if $member.email && $settings.list_show_email}Email{/if} - {if $member.live_cam_type.value == 1} - {$terms.term_webcam_cap} + {if $member.email && $settings.list_show_email}Email{/if} + {if $settings.list_show_live_cam} + {if $member.live_cam_type.name == "Web Page" && $member.live_cam_url && $settings.list_show_live_cam} + {$terms.term_webcam_cap} + {else if $member.live_cam_type.name == "Camera Image"} + {$terms.term_webcam_cap} + {/if} {/if} {apply_filters('glm-member-db-front-members-list-linksBottom', '', $member.member_pointer)}
    -- 2.17.1