From 59f38fda51f1a840743b47afea0eb42a81a384dc Mon Sep 17 00:00:00 2001 From: Steve Sutton Date: Fri, 14 Sep 2018 12:57:52 -0400 Subject: [PATCH] Hofix for new member message and fix width of leaflet map on edit page Fix the width to 100% for leaflet map (in two places). Adding new management fields for the display member message and message fields. --- classes/data/dataManagement.php | 15 +++ index.php | 8 +- ..._V0.1.6.sql => create_database_V0.1.7.sql} | 8 +- setup/databaseScripts/dbVersions.php | 1 + .../update_database_V0.1.7.sql | 25 +++++ views/admin/events/edit.html | 6 ++ views/admin/events/editLocation.html | 4 +- views/admin/management/events.html | 101 ++++++++++++------ 8 files changed, 127 insertions(+), 41 deletions(-) rename setup/databaseScripts/{create_database_V0.1.6.sql => create_database_V0.1.7.sql} (97%) create mode 100644 setup/databaseScripts/update_database_V0.1.7.sql diff --git a/classes/data/dataManagement.php b/classes/data/dataManagement.php index 374a424..bf2e23a 100644 --- a/classes/data/dataManagement.php +++ b/classes/data/dataManagement.php @@ -231,6 +231,21 @@ class GlmDataEventsManagement extends GlmDataAbstract 'use' => 'a' ), + // Display Member member + 'event_display_member_message' => array( + 'field' => 'event_display_member_message', + 'type' => 'checkbox', + 'default' => false, + 'use' => 'a' + ), + + // Member Message + 'event_member_message' => array( + 'field' => 'event_member_message', + 'type' => 'text', + 'required' => false, + 'use' => 'a', + ), ); diff --git a/index.php b/index.php index 8e2d037..41ac2fe 100644 --- a/index.php +++ b/index.php @@ -3,7 +3,7 @@ * Plugin Name: GLM Associate - Events Add-On * Plugin URI: http://www.gaslightmedia.com/ * Description: Gaslight Media Members Database. - * Version: 1.6.101 + * Version: 1.6.102 * Author: Chuck Scott * Author URI: http://www.gaslightmedia.com/ * License: GPL2 @@ -19,7 +19,7 @@ * @package glmMembersDatabaseEventsAddOn * @author Chuck Scott * @license http://www.gaslightmedia.com Gaslightmedia - * @version 1.6.101 + * @version 1.6.102 */ // Check that we're being called by WordPress. @@ -43,8 +43,8 @@ if (!defined('ABSPATH')) { * so that we're sure the other add-ons see an up to date * version from this plugin. */ -define('GLM_MEMBERS_EVENTS_PLUGIN_VERSION', '1.6.101'); -define('GLM_MEMBERS_EVENTS_PLUGIN_DB_VERSION', '0.1.6'); +define('GLM_MEMBERS_EVENTS_PLUGIN_VERSION', '1.6.102'); +define('GLM_MEMBERS_EVENTS_PLUGIN_DB_VERSION', '0.1.7'); // 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/setup/databaseScripts/create_database_V0.1.6.sql b/setup/databaseScripts/create_database_V0.1.7.sql similarity index 97% rename from setup/databaseScripts/create_database_V0.1.6.sql rename to setup/databaseScripts/create_database_V0.1.7.sql index 63697c4..4e25ecb 100644 --- a/setup/databaseScripts/create_database_V0.1.6.sql +++ b/setup/databaseScripts/create_database_V0.1.7.sql @@ -1,6 +1,6 @@ -- Gaslight Media Members Database - Events Add-On -- File Created: 08/18/17 --- Database Version: 0.1.6 +-- Database Version: 0.1.7 -- Database Creation Script -- -- This file is called to create a new set of tables for this @@ -230,6 +230,8 @@ CREATE TABLE {prefix}management ( member_events_allowed BOOLEAN NULL, -- If members are allowed to add events. member_events_moderated BOOLEAN DEFAULT '0', -- If member edits are moderated. 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 PRIMARY KEY (id) ); @@ -237,9 +239,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 ) + ( 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 ) VALUES - ( 1, 'event-detail', 'Amenity', 'Amenities', 1, 'large' ) + ( 1, 'event-detail', 'Amenity', 'Amenities', 1, 'large', 0, '') ; ---- diff --git a/setup/databaseScripts/dbVersions.php b/setup/databaseScripts/dbVersions.php index ad0dccf..5be8b57 100644 --- a/setup/databaseScripts/dbVersions.php +++ b/setup/databaseScripts/dbVersions.php @@ -42,5 +42,6 @@ $glmMembersEventsDbVersions = array( '0.1.4' => array('version' => '0.1.4', 'tables' => 13, 'date' => '08/18/2017'), '0.1.5' => array('version' => '0.1.5', 'tables' => 13, 'date' => '02/21/2018'), '0.1.6' => array('version' => '0.1.6', 'tables' => 13, 'date' => '08/06/2018'), + '0.1.7' => array('version' => '0.1.7', 'tables' => 13, 'date' => '09/14/2018'), ); diff --git a/setup/databaseScripts/update_database_V0.1.7.sql b/setup/databaseScripts/update_database_V0.1.7.sql new file mode 100644 index 0000000..52594c6 --- /dev/null +++ b/setup/databaseScripts/update_database_V0.1.7.sql @@ -0,0 +1,25 @@ +-- Gaslight Media Members Database - Events Add-On +-- File Created: 09/14/18 +-- Database Version: 0.1.7 +-- 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 display member message to management +ALTER TABLE {prefix}management ADD COLUMN event_display_member_message BOOLEAN DEFAULT '0'; -- Boolean to show member message or not + +---- + +-- Add member message to management +ALTER TABLE {prefix}management ADD COLUMN event_member_message TEXT NULL; -- Member Message + +---- + +-- Setup the new field for management +UPDATE {prefix}management SET event_display_member_message = 0; + +---- + +-- Setup the new field for management +UPDATE {prefix}management SET event_member_message = ''; diff --git a/views/admin/events/edit.html b/views/admin/events/edit.html index ed0a62d..cb70d7a 100755 --- a/views/admin/events/edit.html +++ b/views/admin/events/edit.html @@ -52,6 +52,12 @@ {else} {if $lockedToMember} + {if $settings.event_display_member_message} +
+
+

{$settings.event_member_message|wpautop}

+
+ {/if}
{else} diff --git a/views/admin/events/editLocation.html b/views/admin/events/editLocation.html index 55f5d94..7d9822b 100755 --- a/views/admin/events/editLocation.html +++ b/views/admin/events/editLocation.html @@ -193,7 +193,7 @@

{if $settings.selected_map_interface == 1} -

+
{/if} {if $settings.selected_map_interface == 2} @@ -338,7 +338,7 @@

{if $settings.selected_map_interface == 1} -

+
{/if} {if $settings.selected_map_interface == 2} diff --git a/views/admin/management/events.html b/views/admin/management/events.html index 0ac0523..a446ed8 100644 --- a/views/admin/management/events.html +++ b/views/admin/management/events.html @@ -37,6 +37,68 @@

+ + Default State for Events:
(will use plugin default '{$settings.default_state}' for events if unset) + + + + + + Front-End Calendar View + + + + + + + +
+ +
+ + + + +

{$terms.term_member_cap} Message

+

This will display a message to your members when they add or edit one of their events.

+ + + Display Member Message + + + {if $eventsSettings.fieldFail.event_display_member_message}

{$eventsSettings.fieldFail.event_display_member_message}

{/if}
+ + + + Member Message + + {php} + wp_editor('{if $eventsSettings} {$eventsSettings.fieldData.event_member_message|escape:quotes} {/if}', 'event_member_message', array( + 'media_buttons' => false, + 'textarea_name' => 'event_member_message', + 'editor_height' => 300, + )); + {/php} + + + + +

iCal Management Settings

+ iCal Feed Image Size: @@ -52,6 +114,10 @@ {/foreach} + + +

PDF Management Settings

+ Event Detail Page Permalink Name: @@ -79,40 +145,11 @@ {if $eventsSettings.fieldFail.footer_text}

{$eventsSettings.fieldFail.footer_text}

{/if} + - Default State for Events:
(will use plugin default '{$settings.default_state}' for events if unset) - - - - - - Front-End Calendar View - - - - - - - -
- -
- +

Special Management Settings

+ -- 2.17.1