From: Chuck Scott <cscott@gaslightmedia.com>
Date: Tue, 11 Aug 2015 19:42:51 +0000 (-0400)
Subject: Added stored settings (not functional yet) More image gallery changes.
X-Git-Tag: v1.0.1^2~1
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=1697cf5f8a92366077bb06da5262afa7a723db81;p=WP-Plugins%2Fglm-member-db.git

Added stored settings (not functional yet) More image gallery changes.
---

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 @@
                         <tr><th>Show Categories:</th><td><input type="checkbox" name="detail_show_categories"{if $settings.fieldData.detail_show_categories.value} checked="checked"{/if}></td></tr>
                         <tr><th>Show Credit Cards Accepted:</th><td><input type="checkbox" name="detail_show_creditcards"{if $settings.fieldData.detail_show_creditcards.value} checked="checked"{/if}></td></tr>
                         <tr><th>Show Amenities:</th><td><input type="checkbox" name="detail_show_amenities"{if $settings.fieldData.detail_show_amenities.value} checked="checked"{/if}></td></tr>
+                        <tr><th>Show Image Gallery:</th><td><input type="checkbox" name="detail_show_imagegallery"{if $settings.fieldData.detail_show_imagegallery.value} checked="checked"{/if}></td></tr>
                     </table>
                 </td>
             </tr>
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}
                     <p>
-                        <p>Amenities go here</p>
+                        Amenities go here
                     </p>
             {/if}
                 </div>
             </div>
+            
+<!-- Image Gallery -->
+    {if $detail_show_imagegallery}
+            <div class="row"><div class="small-12 columns"><b>Image Gallery</b></div></div>
+
+            <div class="row">
+                <div class="small-12 columns">
+                    <ul class="clearing-thumbs small-block-grid-2 medium-block-grid-3 large-block-grid-4" data-clearing>
+        {foreach $imageGallery as $i}
+                        <li><a href="{$glmPluginMediaURL}/images/large/{$i.file_name}"><img data-caption="{$i.caption}" src="{$glmPluginMediaURL}/images/small/{$i.file_name}"></a></li>
+        {/foreach}
+                    </ul>
+                </div>
+            </div>    
+    {/if}
         </div>
     </div>