From 433e348c506f03241fe45b47aa44695a6237710d Mon Sep 17 00:00:00 2001 From: Steve Sutton Date: Thu, 4 May 2017 09:44:25 -0400 Subject: [PATCH] Adding new field for events Registration Url. registration_url for Event Registrations. --- classes/data/dataEvents.php | 7 +++++++ css/front.css | 4 ++++ index.php | 2 +- ..._database_V0.1.1.sql => create_database_V0.1.2.sql} | 3 ++- setup/databaseScripts/dbVersions.php | 1 + setup/databaseScripts/update_database_V0.1.2.sql | 10 ++++++++++ views/admin/events/editStatus.html | 7 +++++++ views/front/events/beerWeekDetail.html | 3 +++ views/front/events/detail.html | 3 +++ 9 files changed, 38 insertions(+), 2 deletions(-) rename setup/databaseScripts/{create_database_V0.1.1.sql => create_database_V0.1.2.sql} (99%) create mode 100644 setup/databaseScripts/update_database_V0.1.2.sql diff --git a/classes/data/dataEvents.php b/classes/data/dataEvents.php index 271b393..84b5191 100644 --- a/classes/data/dataEvents.php +++ b/classes/data/dataEvents.php @@ -378,6 +378,13 @@ class GlmDataEvents extends GlmDataAbstract 'use' => 'a' ), + // Registration URL + 'registration_url' => array ( + 'field' => 'registration_url', + 'type' => 'text', + 'use' => 'a' + ), + // Free 'free' => array( 'field' => 'free', diff --git a/css/front.css b/css/front.css index 3f87ec4..3e46db2 100755 --- a/css/front.css +++ b/css/front.css @@ -260,6 +260,10 @@ input[name='contact_fname'], input[name='contact_lname']{ top: 6px; left: -35px; } +#glm-event-detail-registrations { + margin: 0 0 12px 20px; + position: relative; +} #glm-event-detail-contact { margin: 0 0 10px 20px; position: relative; diff --git a/index.php b/index.php index 7c73c9a..64f561a 100644 --- a/index.php +++ b/index.php @@ -39,7 +39,7 @@ * version from this plugin. */ define('GLM_MEMBERS_EVENTS_PLUGIN_VERSION', '1.6.37'); -define('GLM_MEMBERS_EVENTS_PLUGIN_DB_VERSION', '0.1.1'); +define('GLM_MEMBERS_EVENTS_PLUGIN_DB_VERSION', '0.1.2'); // This is the minimum version of the GLM Members DB plugin require for this plugin. define('GLM_MEMBERS_EVENTS_PLUGIN_MIN_MEMBERS_REQUIRED_VERSION', '1.0.58'); diff --git a/setup/databaseScripts/create_database_V0.1.1.sql b/setup/databaseScripts/create_database_V0.1.2.sql similarity index 99% rename from setup/databaseScripts/create_database_V0.1.1.sql rename to setup/databaseScripts/create_database_V0.1.2.sql index 4592c21..3933da2 100644 --- a/setup/databaseScripts/create_database_V0.1.1.sql +++ b/setup/databaseScripts/create_database_V0.1.2.sql @@ -1,6 +1,6 @@ -- Gaslight Media Members Database - Events Add-On -- File Created: 12/02/15 15:27:15 --- Database Version: 0.1.0 +-- Database Version: 0.1.2 -- Database Creation Script -- -- This file is called to create a new set of tables for this @@ -183,6 +183,7 @@ CREATE TABLE {prefix}events ( file3_descr TINYTEXT NULL, -- Description for file uploaded in field "file" #3 url TINYTEXT NULL, -- Event URL ticket_url TINYTEXT NULL, -- Ticket URL + registration_url TINYTEXT NULL, -- Registration URL cost TINYTEXT NULL, -- Description of event cost admin_ref_type INT NULL, -- Type of admin contact if using a member contact admin_ref_dest INT NULL, -- Pointer to admin contact record if using a member contact diff --git a/setup/databaseScripts/dbVersions.php b/setup/databaseScripts/dbVersions.php index 9ee5c66..2113693 100644 --- a/setup/databaseScripts/dbVersions.php +++ b/setup/databaseScripts/dbVersions.php @@ -37,5 +37,6 @@ $glmMembersEventsDbVersions = array( '0.0.23' => array('version' => '0.0.23', 'tables' => 12, 'date' => '10/20/2016'), '0.1.0' => array('version' => '0.1.0', 'tables' => 12, 'date' => '10/20/2016'), '0.1.1' => array('version' => '0.1.1', 'tables' => 12, 'date' => '11/02/2016'), + '0.1.2' => array('version' => '0.1.2', 'tables' => 12, 'date' => '05/03/2017'), ); diff --git a/setup/databaseScripts/update_database_V0.1.2.sql b/setup/databaseScripts/update_database_V0.1.2.sql new file mode 100644 index 0000000..8f26da1 --- /dev/null +++ b/setup/databaseScripts/update_database_V0.1.2.sql @@ -0,0 +1,10 @@ +-- Gaslight Media Members Database - Events Add-On +-- File Created: 2017-05-03 +-- Database Version: 0.1.2 +-- 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 + +-- Registration URL +ALTER TABLE {prefix}events ADD COLUMN registration_url TINYTEXT NULL; -- Registration URL diff --git a/views/admin/events/editStatus.html b/views/admin/events/editStatus.html index 0cd158d..0eb9767 100644 --- a/views/admin/events/editStatus.html +++ b/views/admin/events/editStatus.html @@ -288,6 +288,13 @@ {if $event.fieldFail.ticket_url}

{$event.fieldFail.ticket_url}

{/if}
+ + Registration (URL): + + + {if $event.fieldFail.registration_url}

{$event.fieldFail.registration_url}

{/if}
+ + Contact Name: diff --git a/views/front/events/beerWeekDetail.html b/views/front/events/beerWeekDetail.html index 1955f2f..76e1825 100644 --- a/views/front/events/beerWeekDetail.html +++ b/views/front/events/beerWeekDetail.html @@ -96,6 +96,9 @@ {if $event.ticket_url}
Tickets
{/if} + {if $event.registration_url} +
Registration
+ {/if}
Contact & More Info
{if $event.url}{$event.url}
{/if} diff --git a/views/front/events/detail.html b/views/front/events/detail.html index 267f39b..5af2606 100644 --- a/views/front/events/detail.html +++ b/views/front/events/detail.html @@ -130,6 +130,9 @@ {if $event.ticket_url} {/if} + {if $event.registration_url} + + {/if}
Contact & More Info
{if $event.url}{$event.url}
{/if} -- 2.17.1