From 121d619a815f7e503a4f1c4474c8287285348777 Mon Sep 17 00:00:00 2001 From: Laury GvR Date: Wed, 12 Sep 2018 09:05:45 -0400 Subject: [PATCH] Member Detail Auto-expand option, featured class Management now has an option that when checked will auto-expand the sections on the member detail pages. Featured class is now also added to a member container on the member list if a member is featured --- classes/data/settings/dataSettingsGeneral.php | 8 ++++++++ glm-grid | 2 +- index.php | 2 +- models/front/members/detail.php | 4 ++-- ...atabase_V1.1.38.sql => create_database_V1.1.39.sql} | 3 ++- setup/databaseScripts/dbVersions.php | 3 ++- setup/databaseScripts/update_database_V1.1.39.sql | 10 ++++++++++ setup/shortcodes.php | 1 + views/admin/management/index.html | 1 + views/front/members/detail.html | 10 +++++++++- views/front/members/list.html | 2 +- 11 files changed, 38 insertions(+), 8 deletions(-) rename setup/databaseScripts/{create_database_V1.1.38.sql => create_database_V1.1.39.sql} (99%) create mode 100644 setup/databaseScripts/update_database_V1.1.39.sql diff --git a/classes/data/settings/dataSettingsGeneral.php b/classes/data/settings/dataSettingsGeneral.php index d36eef14..e7c9eed0 100644 --- a/classes/data/settings/dataSettingsGeneral.php +++ b/classes/data/settings/dataSettingsGeneral.php @@ -919,6 +919,14 @@ class GlmDataSettingsGeneral extends GlmDataAbstract 'use' => 'a' ), + // Front-end Member Detail - Auto Expand Sections + 'detail_auto_expand_sections' => array( + 'field' => 'detail_auto_expand_sections', + 'type' => 'checkbox', + 'default' => false, + 'use' => 'a' + ), + // Front-end Member Detail - Show Address 'detail_show_address' => array( 'field' => 'detail_show_address', diff --git a/glm-grid b/glm-grid index c5770e1f..efb374ff 160000 --- a/glm-grid +++ b/glm-grid @@ -1 +1 @@ -Subproject commit c5770e1f6248cf83be2845bb2b8420226451257e +Subproject commit efb374ff00ef46a991d94f3bdeb0ff69213275c6 diff --git a/index.php b/index.php index 8bf69702..fabb26c4 100755 --- a/index.php +++ b/index.php @@ -48,7 +48,7 @@ if (!defined('ABSPATH')) { */ define('GLM_MEMBERS_PLUGIN_VERSION', '2.10.43'); -define('GLM_MEMBERS_PLUGIN_DB_VERSION', '1.1.38'); +define('GLM_MEMBERS_PLUGIN_DB_VERSION', '1.1.39'); // 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/front/members/detail.php b/models/front/members/detail.php index 0a633336..0c1f8d0b 100644 --- a/models/front/members/detail.php +++ b/models/front/members/detail.php @@ -34,10 +34,10 @@ $GLOBALS['showOpts'] = array( 'map-amenities' => 'detail_map_show_amenities', 'logo' => 'detail_show_logo', 'address' => 'detail_show_address', - 'street' => 'detail_show_street', + 'street' => 'detail_show_street', 'city-state-zip' => 'detail_show_citystatezip', 'country' => 'detail_show_country', - 'region' => 'detail_show_region', + 'region' => 'detail_show_region', 'description' => 'detail_show_descr', 'short-description' => 'detail_show_short_descr', 'phone' => 'detail_show_phone', diff --git a/setup/databaseScripts/create_database_V1.1.38.sql b/setup/databaseScripts/create_database_V1.1.39.sql similarity index 99% rename from setup/databaseScripts/create_database_V1.1.38.sql rename to setup/databaseScripts/create_database_V1.1.39.sql index b65e4adb..e657b54a 100644 --- a/setup/databaseScripts/create_database_V1.1.38.sql +++ b/setup/databaseScripts/create_database_V1.1.39.sql @@ -1,6 +1,6 @@ -- Gaslight Media Members Database -- File Created: 12/29/16 12:06:00 --- Database Version: 1.1.38 +-- Database Version: 1.1.39 -- Database Creation Script -- -- To permit each query below to be executed separately, @@ -394,6 +394,7 @@ CREATE TABLE {prefix}settings_general ( list_show_packages BOOLEAN DEFAULT '0', list_show_packages_link BOOLEAN DEFAULT '0', list_header_text TINYTEXT DEFAULT NULL, + detail_auto_expand_sections BOOLEAN DEFAULT '0', detail_show_map BOOLEAN DEFAULT '1', detail_show_directions BOOLEAN DEFAULT '1', detail_show_logo BOOLEAN DEFAULT '1', diff --git a/setup/databaseScripts/dbVersions.php b/setup/databaseScripts/dbVersions.php index e6ac847f..4a783c50 100644 --- a/setup/databaseScripts/dbVersions.php +++ b/setup/databaseScripts/dbVersions.php @@ -69,7 +69,8 @@ $glmMembersDbVersions = array( '1.1.35' => array('version' => '1.1.35', 'tables' => 22, 'date' => '04/03/18'), '1.1.36' => array('version' => '1.1.36', 'tables' => 22, 'date' => '06/12/18'), '1.1.37' => array('version' => '1.1.37', 'tables' => 23, 'date' => '06/25/18'), - '1.1.38' => array('version' => '1.1.38', 'tables' => 23, 'date' => '08/13/18') + '1.1.38' => array('version' => '1.1.38', 'tables' => 23, 'date' => '08/13/18'), + '1.1.39' => array('version' => '1.1.39', 'tables' => 23, 'date' => '09/11/18') ); diff --git a/setup/databaseScripts/update_database_V1.1.39.sql b/setup/databaseScripts/update_database_V1.1.39.sql new file mode 100644 index 00000000..2613ec62 --- /dev/null +++ b/setup/databaseScripts/update_database_V1.1.39.sql @@ -0,0 +1,10 @@ +-- Gaslight Media Members Database +-- File Created: 2018-09-11 +-- Database Version: 1.1.39 +-- 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 dashses + +-- Auto expand Member Detail data sections +ALTER TABLE {prefix}settings_general ADD detail_auto_expand_sections BOOLEAN DEFAULT '0'; diff --git a/setup/shortcodes.php b/setup/shortcodes.php index 9aa42907..8b43e7a9 100644 --- a/setup/shortcodes.php +++ b/setup/shortcodes.php @@ -173,6 +173,7 @@ if ( isset( $config['settings'] ) && $config['settings']['enable_members'] ) { 'map-amenities' => 'detail_map_show_amenities', 'logo' => 'detail_show_logo', 'address' => 'detail_show_address', + 'auto-expand' => 'detail_auto_expand_sections', 'street' => 'detail_show_street', 'city-state-zip' => 'detail_show_citystatezip', 'country' => 'detail_show_country', diff --git a/views/admin/management/index.html b/views/admin/management/index.html index d28cf28a..4d794360 100755 --- a/views/admin/management/index.html +++ b/views/admin/management/index.html @@ -468,6 +468,7 @@ {if $genSettings.fieldFail.detail_logo_size}

{$genSettings.fieldFail.detail_logo_size}

{/if} + Auto-expand sections: Show Address: diff --git a/views/front/members/detail.html b/views/front/members/detail.html index 477c3763..2a3fc2e5 100755 --- a/views/front/members/detail.html +++ b/views/front/members/detail.html @@ -455,7 +455,15 @@ }, 500); }); - + // Auto-expand data sections in small view + {if $settings.detail_auto_expand_sections} + if ( $(window).width() >= 1024 ) { + // Expand all data sections by default + $("#glm-member-detail-data-container > .glm-member-detail-content-toggle").toggleClass("selected"); + $("#glm-member-detail-data-container > .glm-member-detail-content-data").slideToggle("fast", "swing", function() {}); + } + {/if} + // Open or close the appropriate section if a toggle is clicked $(".glm-member-detail-content-toggle").not("#glm-member-detail-fullprofile-toggle").click(function() { if($(this).parents('.glm-member-detail-sub-data-links').length) { diff --git a/views/front/members/list.html b/views/front/members/list.html index 3c58c2ba..8025541f 100755 --- a/views/front/members/list.html +++ b/views/front/members/list.html @@ -329,7 +329,7 @@ {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)} -- 2.17.1