From 1697cf5f8a92366077bb06da5262afa7a723db81 Mon Sep 17 00:00:00 2001 From: Chuck Scott Date: Tue, 11 Aug 2015 15:42:51 -0400 Subject: [PATCH] Added stored settings (not functional yet) More image gallery changes. --- classes/data/settings/dataSettingsGeneral.php | 14 +++++++++----- config/plugin.ini | 1 + glm-member-db.php | 10 ++++++++++ misc/databaseScripts/create_database_V0.1.sql | 1 + models/front/members/detail.php | 9 +++++++++ views/admin/settings/index.html | 1 + views/front/members/detail.html | 17 ++++++++++++++++- 7 files changed, 47 insertions(+), 6 deletions(-) diff --git a/classes/data/settings/dataSettingsGeneral.php b/classes/data/settings/dataSettingsGeneral.php index ad6fc345..420693e3 100644 --- a/classes/data/settings/dataSettingsGeneral.php +++ b/classes/data/settings/dataSettingsGeneral.php @@ -671,6 +671,14 @@ class GlmDataSettingsGeneral extends GlmDataAbstract 'use' => 'a' ), + // Front-end Member Detail - Show Image Gallery + 'detail_show_imagegallery' => array( + 'field' => 'detail_show_imagegallery', + 'type' => 'checkbox', + 'default' => false, + 'use' => 'a' + ), + /* * Front-end Member Detail Map Options */ @@ -802,11 +810,7 @@ class GlmDataSettingsGeneral extends GlmDataAbstract 'type' => 'checkbox', 'default' => false, 'use' => 'a' - ), - - - - + ) ); diff --git a/config/plugin.ini b/config/plugin.ini index e3290a18..249f07f6 100644 --- a/config/plugin.ini +++ b/config/plugin.ini @@ -128,6 +128,7 @@ front-config['detail_show_url_newtarget'] = true front-config['detail_show_categories'] = true front-config['detail_show_creditcards'] = true front-config['detail_show_amenities'] = true +front-config['detail_show_imagegallery'] = true ; ; End of site configuration options diff --git a/glm-member-db.php b/glm-member-db.php index 3cae1b2d..b4d6a912 100644 --- a/glm-member-db.php +++ b/glm-member-db.php @@ -391,6 +391,16 @@ function glmMembersAdminNotices($windowed = true) } +/* + * If not doing debug, then just keep all of the debug messages cleared + */ +if (!GLM_MEMBERS_PLUGIN_ADMIN_DEBUG) { + delete_option('glmMembersAdminNoticeAlerts'); + delete_option('glmMembersAdminNotices'); + delete_option('glmMembersAdminNoticeProcess'); + delete_option('glmMembersAdminNoticeDataBlocks'); +} + /* * Check if there's any startup notices in this file. (stuff that happens before we get all setup) * diff --git a/misc/databaseScripts/create_database_V0.1.sql b/misc/databaseScripts/create_database_V0.1.sql index 89de3ff5..29ffa650 100644 --- a/misc/databaseScripts/create_database_V0.1.sql +++ b/misc/databaseScripts/create_database_V0.1.sql @@ -542,6 +542,7 @@ CREATE TABLE {prefix}settings_general ( detail_show_categories BOOLEAN DEFAULT true, detail_show_creditcards BOOLEAN DEFAULT true, detail_show_amenities BOOLEAN DEFAULT true, + detail_show_imagegallery BOOLEAN DEFAULT true, detail_map_show_logo BOOLEAN DEFAULT false, detail_map_logo_size TINYTEXT NULL, detail_map_show_descr BOOLEAN DEFAULT false, diff --git a/models/front/members/detail.php b/models/front/members/detail.php index 2a3b5615..3d865d14 100644 --- a/models/front/members/detail.php +++ b/models/front/members/detail.php @@ -101,6 +101,7 @@ class GlmMembersFront_members_detail extends GlmDataMemberInfo $where = ''; $haveMember = false; + $haveImageGallery = false; // If member ID submitted in the URL if (isset($_REQUEST['id']) && $_REQUEST['id'] > 0) { @@ -150,10 +151,18 @@ class GlmMembersFront_members_detail extends GlmDataMemberInfo } + // Also get any image gallery images + require_once(GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataImages.php'); + $Images = new GlmDataImages($this->wpdb, $this->config); + $imageGallery = $Images->getGallery($this->config['ref_type_numb']['MemberInfo'], $memberInfoID); + $haveImageGallery = ($imageGallery != false); + // Compile template data $templateData = array( 'haveMember' => $haveMember, 'member' => $memberData, + 'haveImageGallery' => $haveImageGallery, + 'imageGallery' => $imageGallery ); // Return status, suggested view, and data to controller diff --git a/views/admin/settings/index.html b/views/admin/settings/index.html index 5e55233a..f4826d23 100644 --- a/views/admin/settings/index.html +++ b/views/admin/settings/index.html @@ -287,6 +287,7 @@ Show Categories: Show Credit Cards Accepted: Show Amenities: + Show Image Gallery: diff --git a/views/front/members/detail.html b/views/front/members/detail.html index e3d90d45..51a5e00f 100644 --- a/views/front/members/detail.html +++ b/views/front/members/detail.html @@ -108,11 +108,26 @@ {/if} {if $detail_show_amenities}

-

Amenities go here

+ Amenities go here

{/if} + + + {if $detail_show_imagegallery} +
Image Gallery
+ +
+
+
    + {foreach $imageGallery as $i} +
    • + {/foreach} +
+
+
+ {/if} -- 2.17.1