From b4d3aaaa65cfbb75f40d158b834b17c2091ee419 Mon Sep 17 00:00:00 2001
From: Laury GvR <laury@gaslightmedia.com>
Date: Fri, 17 Jun 2016 17:01:22 -0400
Subject: [PATCH] Events option available for member detail

---
 classes/data/settings/dataSettingsGeneral.php        | 10 +++++++++-
 css/front.css                                        |  2 ++
 index.php                                            |  2 +-
 ...tabase_V1.1.9.sql => create_database_V1.1.10.sql} |  1 +
 setup/databaseScripts/dbVersions.php                 |  1 +
 setup/databaseScripts/update_database_V1.1.10.sql    | 12 ++++++++++++
 views/admin/management/index.html                    |  5 +++--
 7 files changed, 29 insertions(+), 4 deletions(-)
 rename setup/databaseScripts/{create_database_V1.1.9.sql => create_database_V1.1.10.sql} (99%)
 create mode 100644 setup/databaseScripts/update_database_V1.1.10.sql

diff --git a/classes/data/settings/dataSettingsGeneral.php b/classes/data/settings/dataSettingsGeneral.php
index 508846b3..24d2a215 100644
--- a/classes/data/settings/dataSettingsGeneral.php
+++ b/classes/data/settings/dataSettingsGeneral.php
@@ -772,7 +772,7 @@ class GlmDataSettingsGeneral extends GlmDataAbstract
                         'use' => 'a'
                 ),
 
-                // Front-end Member Detail - Show Coupons
+                // Front-end Member Detail - Show Packages
                 'detail_show_packages' => array(
                         'field' => 'detail_show_packages',
                         'type' => 'checkbox',
@@ -780,6 +780,14 @@ class GlmDataSettingsGeneral extends GlmDataAbstract
                         'use' => 'a'
                 ),
 
+                // Front-end Member Detail - Show Events
+                'detail_show_events' => array(
+                        'field' => 'detail_show_events',
+                        'type' => 'checkbox',
+                        'default' => false,
+                        'use' => 'a'
+                ),
+
                 /*
                  * Front-end Member Detail Map Options
                  */
diff --git a/css/front.css b/css/front.css
index aca4bc3d..c8f8a654 100644
--- a/css/front.css
+++ b/css/front.css
@@ -70,7 +70,9 @@
 }
 .glm-member-db-list {
     position: relative;
+    clear: both;
 }
+
 .glm-member-list-inner-wrapper {
     position: relative;
 }
diff --git a/index.php b/index.php
index 1d859916..46c08447 100644
--- a/index.php
+++ b/index.php
@@ -39,7 +39,7 @@
  */
 
 define('GLM_MEMBERS_PLUGIN_VERSION', '2.1.4');
-define('GLM_MEMBERS_PLUGIN_DB_VERSION', '1.1.9');
+define('GLM_MEMBERS_PLUGIN_DB_VERSION', '1.1.10');
 
 // 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/setup/databaseScripts/create_database_V1.1.9.sql b/setup/databaseScripts/create_database_V1.1.10.sql
similarity index 99%
rename from setup/databaseScripts/create_database_V1.1.9.sql
rename to setup/databaseScripts/create_database_V1.1.10.sql
index cfc7c726..f2c122c3 100644
--- a/setup/databaseScripts/create_database_V1.1.9.sql
+++ b/setup/databaseScripts/create_database_V1.1.10.sql
@@ -305,6 +305,7 @@ CREATE TABLE {prefix}settings_general (
   detail_show_imagegallery BOOLEAN DEFAULT '1',
   detail_show_coupons BOOLEAN DEFAULT '0',
   detail_show_packages BOOLEAN DEFAULT '0',
+  detail_show_events BOOLEAN DEFAULT '0',
   detail_map_show_logo BOOLEAN DEFAULT '0',
   detail_map_logo_size TINYTEXT NULL,
   detail_map_show_descr BOOLEAN DEFAULT '0',
diff --git a/setup/databaseScripts/dbVersions.php b/setup/databaseScripts/dbVersions.php
index 53c8b56d..ce770d67 100644
--- a/setup/databaseScripts/dbVersions.php
+++ b/setup/databaseScripts/dbVersions.php
@@ -41,6 +41,7 @@ $glmMembersDbVersions = array(
     '1.1.7' => array('version' => '1.1.7', 'tables' => 14, 'date' => '5/24/16'),
     '1.1.8' => array('version' => '1.1.8', 'tables' => 14, 'date' => '6/01/16'),
     '1.1.9' => array('version' => '1.1.9', 'tables' => 16, 'date' => '6/13/16'),
+    '1.1.10' => array('version' => '1.1.10', 'tables' => 16, 'date' => '6/16/16'),
 );
 
 
diff --git a/setup/databaseScripts/update_database_V1.1.10.sql b/setup/databaseScripts/update_database_V1.1.10.sql
new file mode 100644
index 00000000..f72407fd
--- /dev/null
+++ b/setup/databaseScripts/update_database_V1.1.10.sql
@@ -0,0 +1,12 @@
+-- Gaslight Media Members Database 
+-- File Created: 6/16/16 15:27:15
+-- Database Version: 1.1.10
+-- 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
+
+-- Add new setting for showing events on member detail pages
+
+
+ALTER TABLE {prefix}settings_general ADD COLUMN detail_show_events BOOLEAN DEFAULT true;
\ No newline at end of file
diff --git a/views/admin/management/index.html b/views/admin/management/index.html
index cd6ef0ae..46c23aef 100644
--- a/views/admin/management/index.html
+++ b/views/admin/management/index.html
@@ -276,7 +276,7 @@
                 </td>
             </tr>
             <tr>
-                <th>Map Options:</th>
+                <h2>Map Options:</h2>
                 <td>
                     <table class="glm-admin-table">
                         <tr><th>Show Logo:</th><td><input type="checkbox" name="detail_map_show_logo"{if $genSettings.fieldData.detail_map_show_logo.value} checked="checked"{/if}></td></tr>
@@ -320,7 +320,7 @@
                 </td>
             </tr>
             <tr>
-                <th>Member Detail Options:</th>
+                <h2>Member Detail Options:</h2>
                 <td>
                     <table class="glm-admin-table">
                         <tr><th>Show Member Logo:</th><td><input type="checkbox" name="detail_show_logo"{if $genSettings.fieldData.detail_show_logo.value} checked="checked"{/if}></td></tr>
@@ -366,6 +366,7 @@
                         <tr><th>Show Image Gallery:</th><td><input type="checkbox" name="detail_show_imagegallery"{if $genSettings.fieldData.detail_show_imagegallery.value} checked="checked"{/if}></td></tr>
                         <tr><th>Show Coupons:</th><td><input type="checkbox" name="detail_show_coupons"{if $genSettings.fieldData.detail_show_coupons.value} checked="checked"{/if}></td></tr>
                         <tr><th>Show Packages:</th><td><input type="checkbox" name="detail_show_packages"{if $genSettings.fieldData.detail_show_packages.value} checked="checked"{/if}></td></tr>
+                        <tr><th>Show Events:</th><td><input type="checkbox" name="detail_show_events"{if $genSettings.fieldData.detail_show_events.value} checked="checked"{/if}></td></tr>
                     </table>
                 </td>
             </tr>
-- 
2.17.1