From: Laury GvR <laury@gaslightmedia.com>
Date: Tue, 26 Jan 2016 17:18:25 +0000 (-0500)
Subject: Hide Cats and Credit Cards by default
X-Git-Tag: v1.1.0^2~6^2
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=befa4e55a7d06d85226bb8c15af65a185542fcdf;p=WP-Plugins%2Fglm-member-db.git

Hide Cats and Credit Cards by default
---

diff --git a/classes/data/settings/dataSettingsGeneral.php b/classes/data/settings/dataSettingsGeneral.php
index a7f8866b..c8032953 100644
--- a/classes/data/settings/dataSettingsGeneral.php
+++ b/classes/data/settings/dataSettingsGeneral.php
@@ -380,7 +380,7 @@ class GlmDataSettingsGeneral extends GlmDataAbstract
                 'list_show_categories' => array(
                         'field' => 'list_show_categories',
                         'type' => 'checkbox',
-                        'default' => true,
+                        'default' => false,
                         'use' => 'a'
                 ),
 
@@ -388,7 +388,7 @@ class GlmDataSettingsGeneral extends GlmDataAbstract
                 'list_show_creditcards' => array(
                         'field' => 'list_show_creditcards',
                         'type' => 'checkbox',
-                        'default' => true,
+                        'default' => false,
                         'use' => 'a'
                 ),
 
diff --git a/setup/databaseScripts/create_database_V1.0.43.sql b/setup/databaseScripts/create_database_V1.0.43.sql
index 23e3da2e..f243f0f7 100644
--- a/setup/databaseScripts/create_database_V1.0.43.sql
+++ b/setup/databaseScripts/create_database_V1.0.43.sql
@@ -542,8 +542,8 @@ CREATE TABLE {prefix}settings_general (
   list_show_url BOOLEAN DEFAULT '1',
   list_show_url_newtarget BOOLEAN DEFAULT '1',
   list_show_email BOOLEAN DEFAULT '1',
-  list_show_categories BOOLEAN DEFAULT '1',
-  list_show_creditcards BOOLEAN DEFAULT '1',
+  list_show_categories BOOLEAN DEFAULT '0',
+  list_show_creditcards BOOLEAN DEFAULT '0',
   list_show_amenities BOOLEAN DEFAULT '0',
   list_map_show_detaillink BOOLEAN DEFAULT '1',
   list_map_show_logo BOOLEAN DEFAULT '0',
@@ -579,8 +579,8 @@ CREATE TABLE {prefix}settings_general (
   detail_show_url BOOLEAN DEFAULT '1',
   detail_show_url_newtarget BOOLEAN DEFAULT '1',
   detail_show_email BOOLEAN DEFAULT '1',
-  detail_show_categories BOOLEAN DEFAULT '1',
-  detail_show_creditcards BOOLEAN DEFAULT '1',
+  detail_show_categories BOOLEAN DEFAULT '0',
+  detail_show_creditcards BOOLEAN DEFAULT '0',
   detail_show_amenities BOOLEAN DEFAULT '1',
   detail_show_imagegallery BOOLEAN DEFAULT '1',
   detail_show_coupons BOOLEAN DEFAULT '0',
diff --git a/views/front/members/list.html b/views/front/members/list.html
index 87e79da9..35e57c80 100644
--- a/views/front/members/list.html
+++ b/views/front/members/list.html
@@ -134,15 +134,16 @@
                     {apply_filters('glm-member-db-front-members-list-memberDetailBottom', '', $m.id)}
                 </div>
                 <div class="glm-member-list-description small-12 medium-4 left columns">
-                {apply_filters('glm-member-db-front-members-list-memberDescriptionTop', '', $m.id)}                        
-            {if $m.short_descr && $settings.list_show_short_descr}
-                {$m.short_descr|nl2br}
-            {elseif $m.descr && $settings.list_show_description}
-                {$m.descr|nl2br}
-            {/if}
-                {apply_filters('glm-member-db-front-members-list-memberDescriptionBottom', '', $m.id)}
+                    <div>
+                    {apply_filters('glm-member-db-front-members-list-memberDescriptionTop', '', $m.id)}                        
+                    {if $m.short_descr && $settings.list_show_short_descr}
+                        {$m.short_descr|nl2br}
+                    {elseif $m.descr && $settings.list_show_description}
+                        {$m.descr|nl2br}
+                    {/if}
+                    {apply_filters('glm-member-db-front-members-list-memberDescriptionBottom', '', $m.id)}
+                    </div>
                 {if $m.categories && $settings.list_show_categories}
-                        <p>
                             <b>{$terms.term_member_cap} Categories</b>
                             <ul>
                     {foreach $m.categories as $c}
@@ -151,20 +152,16 @@
                                 </li>
                     {/foreach}
                             </ul>
-                        </p>
                 {/if}
-                {if $m.cc_type && $settings.list_show_creditcards}
-                        <p>           
+                {if $m.cc_type && $settings.list_show_creditcards}       
                             <b>Credit Cards Accepted:</b>
                             <ul>
                     {foreach $m.cc_type.names as $c}
                                 <li>{$c}</li>
                     {/foreach}
-                            </ul>        
-                        </p>
+                            </ul>
                 {/if}
                 {if $m.amenities && $settings.list_show_amenities}
-                        <p>
                             <b>{$terms.term_member_cap} Amenities</b>
                             <ul>
                     {foreach $m.amenities as $A}
@@ -173,7 +170,6 @@
                                 </li>
                     {/foreach}
                             </ul>
-                        </p>
                 {/if}
                     </div>
                     </div>