From a121bb30f1ab0cab9165b4e827d2f7f64bfa476f Mon Sep 17 00:00:00 2001 From: Laury GvR Date: Thu, 14 Feb 2019 19:55:48 -0500 Subject: [PATCH] Add option to show header text on member lists. Rename sidebar area column --- classes/data/settings/dataSettingsGeneral.php | 12 +++++++++-- index.php | 2 +- models/front/members/list.php | 3 ++- ...1.1.47.sql => create_database_V1.1.48.sql} | 3 ++- setup/databaseScripts/dbVersions.php | 1 + ..._V1.1.47.sql => drop_database_V1.1.48.sql} | 0 .../update_database_V1.1.47.sql | 4 ++-- .../update_database_V1.1.48.sql | 15 ++++++++++++++ setup/shortcodes.php | 5 ++++- views/admin/management/index.html | 8 +++++++- views/front/members/list.html | 20 ++++++++++--------- 11 files changed, 55 insertions(+), 18 deletions(-) rename setup/databaseScripts/{create_database_V1.1.47.sql => create_database_V1.1.48.sql} (99%) rename setup/databaseScripts/{drop_database_V1.1.47.sql => drop_database_V1.1.48.sql} (100%) create mode 100755 setup/databaseScripts/update_database_V1.1.48.sql diff --git a/classes/data/settings/dataSettingsGeneral.php b/classes/data/settings/dataSettingsGeneral.php index c27f1a29..750fe3ab 100755 --- a/classes/data/settings/dataSettingsGeneral.php +++ b/classes/data/settings/dataSettingsGeneral.php @@ -469,8 +469,16 @@ class GlmDataSettingsGeneral extends GlmDataAbstract ), // Front-end Listings - List-adjacent sidebar spacing - 'list_sidebar_area' => array( - 'field' => 'list_sidebar_area', + 'list_show_sidebar_area' => array( + 'field' => 'list_show_sidebar_area', + 'type' => 'checkbox', + 'default' => false, + 'use' => 'a' + ), + + // Front-end Listings - List-adjacent sidebar spacing + 'list_show_header_text' => array( + 'field' => 'list_show_header_text', 'type' => 'checkbox', 'default' => false, 'use' => 'a' diff --git a/index.php b/index.php index 55a5ed99..9a4a6e2d 100755 --- a/index.php +++ b/index.php @@ -48,7 +48,7 @@ if (!defined('ABSPATH')) { */ define('GLM_MEMBERS_PLUGIN_VERSION', '2.11.0'); -define('GLM_MEMBERS_PLUGIN_DB_VERSION', '1.1.47'); +define('GLM_MEMBERS_PLUGIN_DB_VERSION', '1.1.48'); // 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/list.php b/models/front/members/list.php index 6dbf1dc1..f20e6f03 100755 --- a/models/front/members/list.php +++ b/models/front/members/list.php @@ -38,7 +38,8 @@ $GLOBALS['showOpts'] = array( 'marker-clusters' => 'use_cluster_markers', 'search' => 'list_show_search', 'search-filters-opened' => 'list_show_search_filters_opened', - 'sidebar-area' => 'list_sidebar_area', + 'sidebar-area' => 'list_show_sidebar_area', + 'header-text' => 'list_show_header_text', 'search-text' => 'list_show_search_text', 'search-categories' => 'list_show_search_category', 'search-amenities' => 'list_show_search_amenities', diff --git a/setup/databaseScripts/create_database_V1.1.47.sql b/setup/databaseScripts/create_database_V1.1.48.sql similarity index 99% rename from setup/databaseScripts/create_database_V1.1.47.sql rename to setup/databaseScripts/create_database_V1.1.48.sql index c3103ce1..d89db171 100755 --- a/setup/databaseScripts/create_database_V1.1.47.sql +++ b/setup/databaseScripts/create_database_V1.1.48.sql @@ -356,7 +356,8 @@ CREATE TABLE {prefix}settings_general ( list_pagination BOOLEAN DEFAULT '1', list_ajax_pagination BOOLEAN DEFAULT '0', list_pagination_count SMALLINT DEFAULT '20', - list_sidebar_area BOOLEAN DEFAULT '0', + list_show_sidebar_area BOOLEAN DEFAULT '0', + list_show_header_text BOOLEAN DEFAULT '1', list_show_search_filters_opened BOOLEAN DEFAULT '0', list_show_search BOOLEAN DEFAULT '1', list_show_search_text BOOLEAN DEFAULT '1', diff --git a/setup/databaseScripts/dbVersions.php b/setup/databaseScripts/dbVersions.php index 9d8e7b71..965d8bf2 100755 --- a/setup/databaseScripts/dbVersions.php +++ b/setup/databaseScripts/dbVersions.php @@ -79,6 +79,7 @@ $glmMembersDbVersions = array( '1.1.45' => array('version' => '1.1.45', 'tables' => 23, 'date' => '01/02/19'), '1.1.46' => array('version' => '1.1.46', 'tables' => 23, 'date' => '01/07/19'), '1.1.47' => array('version' => '1.1.47', 'tables' => 23, 'date' => '02/14/19'), + '1.1.48' => array('version' => '1.1.48', 'tables' => 23, 'date' => '02/14/19'), ); diff --git a/setup/databaseScripts/drop_database_V1.1.47.sql b/setup/databaseScripts/drop_database_V1.1.48.sql similarity index 100% rename from setup/databaseScripts/drop_database_V1.1.47.sql rename to setup/databaseScripts/drop_database_V1.1.48.sql diff --git a/setup/databaseScripts/update_database_V1.1.47.sql b/setup/databaseScripts/update_database_V1.1.47.sql index 3b4c6899..594a903a 100755 --- a/setup/databaseScripts/update_database_V1.1.47.sql +++ b/setup/databaseScripts/update_database_V1.1.47.sql @@ -6,5 +6,5 @@ -- To permit each query below to be executed separately, -- all queries must be separated by a line with four dashes --- Add list_ajax_pagination to settings_general table -ALTER TABLE {prefix}settings_general ADD COLUMN list_sidebar_area BOOLEAN DEFAULT '0'; -- Show sidebar area on list \ No newline at end of file +-- Show sidebar area on list +ALTER TABLE {prefix}settings_general ADD COLUMN list_sidebar_area BOOLEAN DEFAULT '0'; \ No newline at end of file diff --git a/setup/databaseScripts/update_database_V1.1.48.sql b/setup/databaseScripts/update_database_V1.1.48.sql new file mode 100755 index 00000000..99e0f078 --- /dev/null +++ b/setup/databaseScripts/update_database_V1.1.48.sql @@ -0,0 +1,15 @@ +-- Gaslight Media Members Database +-- File Created: 2019-02-14 +-- Database Version: 1.1.48 +-- 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 to show header text on lists +ALTER TABLE {prefix}settings_general ADD COLUMN list_show_header_text BOOLEAN DEFAULT '1'; -- Show header text on lists + +-- + +-- Update sidebar area column name to maintain consistency +ALTER TABLE {prefix}settings_general CHANGE list_sidebar_area list_show_sidebar_area BOOLEAN DEFAULT '0'; diff --git a/setup/shortcodes.php b/setup/shortcodes.php index ba9f3044..b88dc63a 100644 --- a/setup/shortcodes.php +++ b/setup/shortcodes.php @@ -116,7 +116,8 @@ if ( isset( $config['settings'] ) && $config['settings']['enable_members'] ) { 'marker-clusters' => 'use_cluster_markers', 'search' => 'list_show_search', 'search-filters-opened' => 'list_show_search_filters_opened', - 'sidebar-area' => 'list_sidebar_area', + 'sidebar-area' => 'list_show_sidebar_area', + 'header-text' => 'list_show_header_text', 'search-text' => 'list_show_search_text', 'search-categories' => 'list_show_search_category', 'search-amenities' => 'list_show_search_amenities', @@ -463,6 +464,7 @@ if ( isset( $config['settings'] ) && $config['settings']['enable_members'] ) {

Member List Options
list + header-text name-link logo logo-for-mobile @@ -485,6 +487,7 @@ if ( isset( $config['settings'] ) && $config['settings']['enable_members'] ) { live-cam packages packages-link + sidebar-area

diff --git a/views/admin/management/index.html b/views/admin/management/index.html index aa924093..fe09d569 100755 --- a/views/admin/management/index.html +++ b/views/admin/management/index.html @@ -350,10 +350,16 @@ Enable sidebar area: - + Show Member Name as Link to Detail: + + Show Header Text: + + + + List Header Text: Show Member Logo: diff --git a/views/front/members/list.html b/views/front/members/list.html index 393c749d..4f1c4513 100755 --- a/views/front/members/list.html +++ b/views/front/members/list.html @@ -300,18 +300,20 @@ {/if} {* haveFeaturedMembers *} - + {if $showSettings.list_show_list && !$blankStart} - {if $showSettings.list_sidebar_area} + {if $showSettings.list_show_sidebar_area}
{/if} - {if $settings.list_header_text} -

{$settings.list_header_text}

- {elseif apply_filters('is_page', 'search')} -

List of {$terms.term_member_plur_cap}

- {else} -

List of {$terms.term_member_plur_cap}

+ {if $showSettings.list_show_header_text} + {if $settings.list_header_text} +

{$settings.list_header_text}

+ {elseif apply_filters('is_page', 'search')} +

List of {$terms.term_member_plur_cap}

+ {else} +

List of {$terms.term_member_plur_cap}

+ {/if} {/if} {if $haveMembers} @@ -394,7 +396,7 @@ {else}
(no {$terms.term_member_plur} listed)
{/if} - {if $showSettings.list_sidebar_area} + {if $showSettings.list_show_sidebar_area}
{get_sidebar()} -- 2.17.1