From d49959d5030e2102524144f658ddc88184cf061a Mon Sep 17 00:00:00 2001 From: Steve Sutton Date: Wed, 10 Apr 2019 13:52:56 -0400 Subject: [PATCH] New options for events management. Text field for read more button. Flag for enable read more button. Minimum number of events settings for agenda view. --- classes/data/dataManagement.php | 24 ++++++ index.php | 2 +- models/front/events/list.php | 5 +- readme.txt | 5 ++ ...0.1.14.sql => create_database_V0.1.15.sql} | 79 ++++++++++--------- setup/databaseScripts/dbVersions.php | 1 + .../update_database_V0.1.15.sql | 21 +++++ views/admin/management/events.html | 39 +++++---- views/front/events/agenda.html | 10 ++- views/front/events/agenda_new.html | 10 ++- 10 files changed, 129 insertions(+), 67 deletions(-) rename setup/databaseScripts/{create_database_V0.1.14.sql => create_database_V0.1.15.sql} (79%) create mode 100644 setup/databaseScripts/update_database_V0.1.15.sql diff --git a/classes/data/dataManagement.php b/classes/data/dataManagement.php index 9ea1580..a2410e7 100644 --- a/classes/data/dataManagement.php +++ b/classes/data/dataManagement.php @@ -346,6 +346,14 @@ class GlmDataEventsManagement extends GlmDataAbstract 'use' => 'a', ), + // Minimum number of events to get in agenda views + 'agenda_view_min_events' => array( + 'field' => 'agenda_view_min_events', + 'type' => 'integer', + 'required' => false, + 'use' => 'a', + ), + // Color of the search button 'agenda_date_background_color' => array( 'field' => 'agenda_date_background_color', @@ -394,6 +402,22 @@ class GlmDataEventsManagement extends GlmDataAbstract 'use' => 'a', ), + // Enable Read More Button + 'agenda_view_more_enabled' => array( + 'field' => 'agenda_view_more_enabled', + 'type' => 'checkbox', + 'default' => false, + 'use' => 'a' + ), + + // Text for Read More Button + 'agenda_view_more_text' => array( + 'field' => 'agenda_view_more_text', + 'type' => 'text', + 'required' => false, + 'use' => 'a', + ), + ); } diff --git a/index.php b/index.php index b286ea2..09ef0ee 100755 --- a/index.php +++ b/index.php @@ -44,7 +44,7 @@ if (!defined('ABSPATH')) { * version from this plugin. */ define('GLM_MEMBERS_EVENTS_PLUGIN_VERSION', '1.7.23'); -define('GLM_MEMBERS_EVENTS_PLUGIN_DB_VERSION', '0.1.14'); +define('GLM_MEMBERS_EVENTS_PLUGIN_DB_VERSION', '0.1.15'); // This is the minimum version of the GLM Members DB plugin require for this plugin. define('GLM_MEMBERS_EVENTS_PLUGIN_MIN_MEMBERS_REQUIRED_VERSION', '2.9.15'); diff --git a/models/front/events/list.php b/models/front/events/list.php index f9b2d5e..6337b78 100644 --- a/models/front/events/list.php +++ b/models/front/events/list.php @@ -346,7 +346,10 @@ class GlmMembersFront_events_list extends GlmMembersFront_events_baseAction // This is the default date range for this agenda view. $total_current_events = $this->checkHaveAnyEvents( $memberId, $categoryId ); // Set default number of events wanted in default view. - $total_events_wanted = 5; + $total_events_wanted = 5; // default if empty + if ( $this->config['settings']['agenda_view_min_events'] ) { + $total_events_wanted = $this->config['settings']['agenda_view_min_events']; + } // Set default number of weeks to view. // Set this to one less than actual weeks to check. // It will be increased in the do while loop. diff --git a/readme.txt b/readme.txt index 210f1fd..1894c7f 100755 --- a/readme.txt +++ b/readme.txt @@ -25,6 +25,11 @@ e.g. 1. Activate the plugin through the 'Plugins' menu in WordPress == Changelog == += Pending = +New options +* Read more button options +* Minimum number of events option + = 1.7.23 = * Adding counties to event locations diff --git a/setup/databaseScripts/create_database_V0.1.14.sql b/setup/databaseScripts/create_database_V0.1.15.sql similarity index 79% rename from setup/databaseScripts/create_database_V0.1.14.sql rename to setup/databaseScripts/create_database_V0.1.15.sql index c941c61..17dde17 100644 --- a/setup/databaseScripts/create_database_V0.1.14.sql +++ b/setup/databaseScripts/create_database_V0.1.15.sql @@ -1,6 +1,6 @@ -- Gaslight Media Members Database - Events Add-On -- File Created: 08/18/17 --- Database Version: 0.1.13 +-- Database Version: 0.1.15 -- Database Creation Script -- -- This file is called to create a new set of tables for this @@ -220,41 +220,44 @@ CREATE TABLE {prefix}events ( -- Event Management Settings CREATE TABLE {prefix}management ( id INT NOT NULL AUTO_INCREMENT, - canonical_event_page TINYTEXT NULL, -- Canonical page slug for event detail - pdf_logo TINYTEXT NULL, -- Image for the Top of the PDF - footer_text TINYTEXT NULL, -- Image for the Top of the PDF - to_email TINYTEXT NULL, -- Email address of the recipient - from_email TINYTEXT NULL, -- Email address of the sender - email_notification TEXT NULL, -- Email notification message - calendar_view TINYTEXT NULL, -- Default calendar view - event_default_state TINYTEXT NULL, -- Default calendar view - term_event_amenities_singular TINYTEXT NULL, -- Singular term to use for event amenities - term_event_amenities_plural TINYTEXT NULL, -- Plural term to use for event amenities - use_event_amenities BOOLEAN NULL, -- Whether amenities are used at all for events - use_venue_locations BOOLEAN NULL, -- To use Other members as the location of event - member_events_allowed BOOLEAN NULL, -- If members are allowed to add events. - member_events_moderated BOOLEAN DEFAULT '0', -- If member edits are moderated. - non_moderated_status_default INTEGER DEFAULT 20, -- Non Moderated Member Default Event Status - ical_feed_image_size TINYTEXT NULL, -- Image size to use in iCal Feed - event_display_member_message BOOLEAN DEFAULT '0', -- Boolean to show member message or not - event_member_message TEXT NULL, -- Member Message - event_add_button_color TINYTEXT NULL, -- Color of the search button - event_add_button_hidden BOOLEAN NULL, -- Option to hide the add event button - event_back_to_search_color TINYTEXT NULL, -- Background Color of the search - default_agenda_view TINYTEXT NULL, -- Default view file for agenda views - agenda_date_background_color TINYTEXT NULL, -- Background Color of the date - agenda_date_text_color TINYTEXT NULL, -- Text Color of the date - agenda_title_color TINYTEXT NULL, -- Color of the Event Title - agenda_container_background_color TINYTEXT NULL, -- Event Container Background Color - agenda_container_border_color TINYTEXT NULL, -- Event Container Border Color - agenda_view_max_width TINYTEXT NULL, -- Max Width of agenda view - detail_ext_links_same_window BOOLEAN DEFAULT '0', -- Turn on to keep from adding target blank to detail page url's - michigan_org_requirements BOOLEAN DEFAULT '0', -- Turn on required fields for Michigan.org - sort_by_featured_in_agenda BOOLEAN DEFAULT '0', -- Sort by the featured events in agenda view - show_search_city BOOLEAN DEFAULT '0', -- Show city in search form - show_search_region BOOLEAN DEFAULT '0', -- Show region in search form - show_search_county BOOLEAN DEFAULT '0', -- Show county in search form - show_search_category BOOLEAN DEFAULT '1', -- Show category in search form + canonical_event_page TINYTEXT NULL, -- Canonical page slug for event detail + pdf_logo TINYTEXT NULL, -- Image for the Top of the PDF + footer_text TINYTEXT NULL, -- Image for the Top of the PDF + to_email TINYTEXT NULL, -- Email address of the recipient + from_email TINYTEXT NULL, -- Email address of the sender + email_notification TEXT NULL, -- Email notification message + calendar_view TINYTEXT NULL, -- Default calendar view + event_default_state TINYTEXT NULL, -- Default calendar view + term_event_amenities_singular TINYTEXT NULL, -- Singular term to use for event amenities + term_event_amenities_plural TINYTEXT NULL, -- Plural term to use for event amenities + use_event_amenities BOOLEAN NULL, -- Whether amenities are used at all for events + use_venue_locations BOOLEAN NULL, -- To use Other members as the location of event + member_events_allowed BOOLEAN NULL, -- If members are allowed to add events. + member_events_moderated BOOLEAN DEFAULT '0', -- If member edits are moderated. + non_moderated_status_default INTEGER DEFAULT 20, -- Non Moderated Member Default Event Status + ical_feed_image_size TINYTEXT NULL, -- Image size to use in iCal Feed + event_display_member_message BOOLEAN DEFAULT '0', -- Boolean to show member message or not + event_member_message TEXT NULL, -- Member Message + event_add_button_color TINYTEXT NULL, -- Color of the search button + event_add_button_hidden BOOLEAN NULL, -- Option to hide the add event button + event_back_to_search_color TINYTEXT NULL, -- Background Color of the search + default_agenda_view TINYTEXT NULL, -- Default view file for agenda views + agenda_date_background_color TINYTEXT NULL, -- Background Color of the date + agenda_date_text_color TINYTEXT NULL, -- Text Color of the date + agenda_title_color TINYTEXT NULL, -- Color of the Event Title + agenda_container_background_color TINYTEXT NULL, -- Event Container Background Color + agenda_container_border_color TINYTEXT NULL, -- Event Container Border Color + agenda_view_max_width TINYTEXT NULL, -- Max Width of agenda view + agenda_view_more_enabled BOOLEAN DEFAULT '1', -- Turn on Read More Button + agenda_view_more_text TINYTEXT NULL, -- Text for More button + agenda_view_min_events INT DEFAULT 5, -- Minimum number of events to get in agenda views + detail_ext_links_same_window BOOLEAN DEFAULT '0', -- Turn on to keep from adding target blank to detail page url's + michigan_org_requirements BOOLEAN DEFAULT '0', -- Turn on required fields for Michigan.org + sort_by_featured_in_agenda BOOLEAN DEFAULT '0', -- Sort by the featured events in agenda view + show_search_city BOOLEAN DEFAULT '0', -- Show city in search form + show_search_region BOOLEAN DEFAULT '0', -- Show region in search form + show_search_county BOOLEAN DEFAULT '0', -- Show county in search form + show_search_category BOOLEAN DEFAULT '1', -- Show category in search form PRIMARY KEY (id) ); @@ -262,9 +265,9 @@ CREATE TABLE {prefix}management ( -- Set default event management entry INSERT INTO {prefix}management - ( id, canonical_event_page, term_event_amenities_singular, term_event_amenities_plural, member_events_allowed, ical_feed_image_size, event_display_member_message, event_member_message, default_agenda_view ) + ( id, canonical_event_page, term_event_amenities_singular, term_event_amenities_plural, member_events_allowed, ical_feed_image_size, event_display_member_message, event_member_message, default_agenda_view, agenda_view_more_text ) VALUES - ( 1, 'event-detail', 'Amenity', 'Amenities', 1, 'large', 0, '', 'agenda') + ( 1, 'event-detail', 'Amenity', 'Amenities', 1, 'large', 0, '', 'agenda', 'Read More') ; ---- diff --git a/setup/databaseScripts/dbVersions.php b/setup/databaseScripts/dbVersions.php index 430fdd7..f0c1f03 100644 --- a/setup/databaseScripts/dbVersions.php +++ b/setup/databaseScripts/dbVersions.php @@ -50,5 +50,6 @@ $glmMembersEventsDbVersions = array( '0.1.12' => array('version' => '0.1.12', 'tables' => 13, 'date' => '01/30/2019'), '0.1.13' => array('version' => '0.1.13', 'tables' => 13, 'date' => '02/04/2019'), '0.1.14' => array('version' => '0.1.14', 'tables' => 13, 'date' => '02/13/2019'), + '0.1.15' => array('version' => '0.1.15', 'tables' => 13, 'date' => '04/09/2019'), ); diff --git a/setup/databaseScripts/update_database_V0.1.15.sql b/setup/databaseScripts/update_database_V0.1.15.sql new file mode 100644 index 0000000..cd79e11 --- /dev/null +++ b/setup/databaseScripts/update_database_V0.1.15.sql @@ -0,0 +1,21 @@ +-- Gaslight Media Members Database - Events Add-On +-- File Created: 04/09/19 +-- Database Version: 0.1.15 +-- 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 + +ALTER TABLE {prefix}management ADD COLUMN agenda_view_more_enabled BOOLEAN DEFAULT '1'; -- Turn on Read More Button + +---- + +ALTER TABLE {prefix}management ADD COLUMN agenda_view_more_text TINYTEXT NULL; -- Text for Read more button + +---- + +ALTER TABLE {prefix}management ADD COLUMN agenda_view_min_events INT DEFAULT 5; -- Minimum number of events to get in agenda views + +---- + +UPDATE {prefix}management SET agenda_view_more_text = 'Read More' WHERE id = 1; diff --git a/views/admin/management/events.html b/views/admin/management/events.html index 167d16f..6ad7290 100644 --- a/views/admin/management/events.html +++ b/views/admin/management/events.html @@ -127,6 +127,12 @@ Front-End View Styles + + + +
Minimum number of events for Agenda: + +
Max Width for Agenda View: @@ -173,6 +179,18 @@
+ + Front-End Event Agenda Read more + +

+ + + + Read More Button Text: + + + + Admin Options @@ -314,27 +332,6 @@ - diff --git a/views/front/events/agenda.html b/views/front/events/agenda.html index 971b1b8..ee82517 100644 --- a/views/front/events/agenda.html +++ b/views/front/events/agenda.html @@ -87,9 +87,13 @@
{if $event.image}{/if} {$event.intro} -
- Read More -
+ {if $settings.agenda_view_more_enabled} +
+ + {if $settings.agenda_view_more_text}{$settings.agenda_view_more_text}{else}Read More{/if} + +
+ {/if}
diff --git a/views/front/events/agenda_new.html b/views/front/events/agenda_new.html index 9799a79..95df8ed 100644 --- a/views/front/events/agenda_new.html +++ b/views/front/events/agenda_new.html @@ -149,9 +149,13 @@ a.glm-read-more:hover, a.event-read-more:hover { {/if} -
- Read More -
+ {if $settings.agenda_view_more_enabled} +
+ + {if $settings.agenda_view_more_text}{$settings.agenda_view_more_text}{else}Read More{/if} + +
+ {/if} {/foreach} -- 2.17.1