Fixing a previous commit that had old code stuffed in

My previous commit somehow got submitted with old search filter
markup. This has been corrected.

diff --git a/glm-member-db/views/front/members/detail.html b/glm-member-db/views/front/members/detail.html
index 55e16de..dd36c67 100644 (file)
--- a/glm-member-db/views/front/members/detail.html
+++ b/glm-member-db/views/front/members/detail.html
@@ -433,7 +433,11 @@
                 $("#"+target+"-toggle").toggleClass("selected");
                 fullProfileCheck(target);
             });
+<<<<<<< Updated upstream
 
+=======
+
+>>>>>>> Stashed changes
             // Open all tabs by default on page load, but only in large-view
             if ($(window).width() >= 1024) {
                 $('.glm-member-detail-sub-data-links').each(function() {

diff --git a/glm-member-db/views/front/members/list.html b/glm-member-db/views/front/members/list.html
index 3a91af4..af51f09 100644 (file)
--- a/glm-member-db/views/front/members/list.html
+++ b/glm-member-db/views/front/members/list.html
@@ -15,132 +15,139 @@
             </div>
             <div id="glm-member-list-filters-box">
                 <div id="glm-member-list-filters-close" class="button glm-button glm-member-list-filters-toggle">Close</div>
-                <form action="{$thisUrl}?glm_action=list" method="post" enctype="multipart/form-data">
-                    <div class="small-12 columns glm-member-search glm-member-entry-container glm-member-container">
-                        {apply_filters('glm-member-db-front-members-list-searchFormTop', '')}
+                <div class="small-12 columns glm-member-search glm-member-entry-container glm-member-container">
+                    <form action="{$thisUrl}?glm_action=list" method="post" enctype="multipart/form-data">
                         <div>
-                            <span>Searching Inventory</span>
-                            {$memberTypes = apply_filters('glm_custom_fields_member_types', '')}
-                            <select name="memberType" id="memberTypes" title="Click to select types">
-                                <option value="all" selected="selected">All</option>
-                                {foreach $memberTypes as $memberType}
-                                    <option value="{$memberType.name}">{$memberType.name}</option>
-                                {/foreach}
-                            </select>
-                        </div>
-                        {if $settings.list_show_search_category}
-                            {$rvTypes = array()}
-                            {$rvManufacturers = array()}
-                            {$brands = array()}
-                            {foreach from=$categories item=v}
-                                {if $v.parent == 'RV Classes'}
-                                    {$rvTypes[$v.id] = $v}
-                                {elseif $v.parent == 'RV Manufacturers'}
-                                    {$rvManufacturers[$v.id] = $v}
-                                {elseif $v.parent == 'Brands'}
-                                    {$brands[$v.id] = $v}
-                                {/if}
-                            {/foreach}
-                            <div>
-                                Types:
-                                <select name="categorySearchMultiple[]" id="rvTypes" title="Click to Select Types" multiple="multiple">
-                                    {foreach $rvTypes as $item => $v}
-                                    <option value="{$v.id}"{if $v.default} selected="selected"{/if}>{$v.name}</option>
-                                    {/foreach}
-                                </select>
-                            </div>
-                        {/if}
-                            <div>
-                                <div><input type="checkbox" name="miscFilters" id="justArrived" value="just_arrived" /><label for="just_arrived">Just Arrived</label></div>
-                                <div><input type="checkbox" name="miscFilters" id="red_hot_deal" value="red_hot_deal" /><label for="red_hot_deal">Red Hot Deal</label></div>
-                                <div><input type="checkbox" name="miscFilters" id="featured" value="featured" /><label for="featured">Featured</label></div>
-                            </div>
-                            <div><input class="button glm-member-button centered" type="submit" value="Search"></div>
-                            <hr>
-                        {if $settings.list_show_search_category}
-                            <div>
-                                Manufacturers:
-                                <select name="categorySearchMultiple[]" id="rvManufacturers" title="Click to Select Types" multiple="multiple">
-                                    {foreach $rvManufacturers as $item => $v}
-                                    <option value="{$v.id}"{if $v.default} selected="selected"{/if}>{$v.name}</option>
-                                    {/foreach}
-                                </select>
-                            </div>
-                            <div>
-                                Brands:
-                                <select name="categorySearchMultiple[]" id="brands" title="Click to Select Types" multiple="multiple">
-                                    {foreach $brands as $item => $v}
-                                    <option value="{$v.id}"{if $v.default} selected="selected"{/if}>{$v.name}</option>
-                                    {/foreach}
-                                </select>
-                            </div>
-                            <!--
+                            {apply_filters('glm-member-db-front-members-list-searchFormTop', '')}
                             <div>
-                                By Category:
-                                <select name="categorySearch[]" id="categorySelect" multiple>
-                                {if !$singleCategory}
-                                    <option value="">(all)</option>
+                                <span>Searching Inventory</span>
+
+                                {if $settings === -1}
+                                    {$memberTypes = apply_filters('glm_custom_fields_member_types', '')}
+                                    <select name="memberType" id="memberTypes" title="Click to select types">
+                                        <option value="all" selected="selected">All</option>
+                                        {foreach $memberTypes as $memberType}
+                                            <option value="{$memberType.name}">{$memberType.name}</option>
+                                        {/foreach}
+                                    </select>
                                 {/if}
+                            </div>
+                            {if $settings.list_show_search_category}
+                                {$rvTypes = array()}
+                                {$rvManufacturers = array()}
+                                {$brands = array()}
                                 {foreach from=$categories item=v}
-                                    <option value="{$v.id}"{if $v.default} selected="selected"{/if}>
-                                        {if $v.parent}&nbsp;&nbsp;&nbsp;&nbsp;{/if}{$v.name}
-                                    </option>
+                                    {if $v.parent == 'RV Classes'}
+                                        {$rvTypes[$v.id] = $v}
+                                    {elseif $v.parent == 'RV Manufacturers'}
+                                        {$rvManufacturers[$v.id] = $v}
+                                    {elseif $v.parent == 'Brands'}
+                                        {$brands[$v.id] = $v}
+                                    {/if}
                                 {/foreach}
-                                </select>
+                                <div>
+                                    <select name="categorySearchMultiple[]" id="rvTypes" title="Click to Select Types" multiple="multiple">
+                                        {foreach $rvTypes as $item => $v}
+                                        <option value="{$v.id}"{if $v.default} selected="selected"{/if}>{$v.name}</option>
+                                        {/foreach}
+                                    </select>
+                                </div>
+                            {/if}
+                                <div>
+                                    <div><input type="checkbox" name="pre_owned"    id="pre_owned"    value="1" {if isset($smarty.post.pre_owned)}checked{/if}/><label for="pre_owned">Pre-Owned</label></div>
+                                    <div><input type="checkbox" name="just_arrived" id="just_arrived" value="1" {if isset($smarty.post.just_arrived)}checked{/if}/><label for="just_arrived">Just Arrived</label></div>
+                                    <div><input type="checkbox" name="red_hot_deal" id="red_hot_deal" value="1" {if isset($smarty.post.red_hot_deal)}checked{/if} /><label for="red_hot_deal">Red Hot Deal</label></div>
+                                    <div><input type="checkbox" name="coming_soon"  id="coming_soon"  value="1" {if isset($smarty.post.coming_soon)}checked{/if}/><label for="coming_soon" >Coming Soon</label></div>
+                                </div>
+                                <div><input class="button glm-member-button centered" type="submit" value="Search"></div>
+                                <hr>
                             </div>
-                            -->
-                        {/if}
-                        {if $settings.list_show_search_amenities}
-                            {if $amenities|@count gt 0}
-                            <div>
-                                By Features:
-                                <select name="amenitySearch[]" id="amenitySelect" title="Click to Select Amenities" multiple="multiple">
-                                    {foreach from=$amenities item=v}
-                                        <option value="{$v.id}" {if $v.default} selected="selected"{/if}>
-                                            {$v.name}
+                        </form>
+                        <form action="{$thisUrl}?glm_action=list" method="post" enctype="multipart/form-data">
+                            {if $settings.list_show_search_category}
+                                <div>
+                                    Manufacturers:
+                                    <select name="categorySearchMultiple[]" id="rvManufacturers" title="Click to Select Types" multiple="multiple">
+                                        {foreach $rvManufacturers as $item => $v}
+                                        <option value="{$v.id}"{if $v.default} selected="selected"{/if}>{$v.name}</option>
+                                        {/foreach}
+                                    </select>
+                                </div>
+                                <div>
+                                    Brands:
+                                    <select name="categorySearchMultiple[]" id="brands" title="Click to Select Types" multiple="multiple">
+                                        {foreach $brands as $item => $v}
+                                        <option value="{$v.id}"{if $v.default} selected="selected"{/if}>{$v.name}</option>
+                                        {/foreach}
+                                    </select>
+                                </div>
+                                <!--
+                                <div>
+                                    By Category:
+                                    <select name="categorySearch[]" id="categorySelect" multiple>
+                                    {if !$singleCategory}
+                                        <option value="">(all)</option>
+                                    {/if}
+                                    {foreach from=$categories item=v}
+                                        <option value="{$v.id}"{if $v.default} selected="selected"{/if}>
+                                            {if $v.parent}&nbsp;&nbsp;&nbsp;&nbsp;{/if}{$v.name}
                                         </option>
                                     {/foreach}
-                                </select>
-                            </div>
+                                    </select>
+                                </div>
+                                -->
+                            {/if}
+                            {if $settings.list_show_search_amenities}
+                                {if $amenities|@count gt 0}
+                                <div>
+                                    By Features:
+                                    <select name="amenitySearch[]" id="amenitySelect" title="Click to Select Amenities" multiple="multiple">
+                                        {foreach from=$amenities item=v}
+                                            <option value="{$v.id}" {if $v.default} selected="selected"{/if}>
+                                                {$v.name}
+                                            </option>
+                                        {/foreach}
+                                    </select>
+                                </div>
+                                {/if}
                             {/if}
-                        {/if}
 
-                            <div>
-                                Length
-                                <input type="text" name="length" value="">
-                            </div>
-                            <div>
-                                UVW (weight)
-                                <input type="text" name="uvw_lbs" value="">
-                            </div>
+                                <div>
+                                    Length
+                                    <input type="text" name="length" value="">
+                                </div>
+                                <div>
+                                    UVW (weight)
+                                    <input type="text" name="uvw_lbs" value="">
+                                </div>
 
-                        {if $settings.list_show_search_region}
-                            {if $regions|@count gt 0}
-                            <div>
-                                By UVW (weight):
-                                <select name="regionUserSearch[]">
-                                    {if $regions|@count gt 1}
-                                        <option value"">(all)</option>
-                                    {/if}
-                                    {foreach from=$regions item=v}
-                                        <option value="{$v.id}" {if $v.default} selected="selected"{/if}>
-                                            {$v.name}
-                                        </option>
-                                    {/foreach}
-                                </select>
-                            </div>
+                            {if $settings.list_show_search_region}
+                                {if $regions|@count gt 0}
+                                <div>
+                                    By UVW (weight):
+                                    <select name="regionUserSearch[]">
+                                        {if $regions|@count gt 1}
+                                            <option value"">(all)</option>
+                                        {/if}
+                                        {foreach from=$regions item=v}
+                                            <option value="{$v.id}" {if $v.default} selected="selected"{/if}>
+                                                {$v.name}
+                                            </option>
+                                        {/foreach}
+                                    </select>
+                                </div>
+                                {/if}
                             {/if}
-                        {/if}
 
-                        {if $settings.list_show_search_text}
-                            <div>
-                                By Name: <input type="text" name="textSearch" value="{$textSearch}" class="glm-form-text-input">
-                            </div>
-                        {/if}
-                        <div><input class="button glm-member-button centered" type="submit" value="Search"></div>
-                        {apply_filters('glm-member-db-front-members-list-searchFormBottom', '')}
-                    </div>
-                </form>
+                            {if $settings.list_show_search_text}
+                                <div>
+                                    By Name: <input type="text" name="textSearch" value="{$textSearch}" class="glm-form-text-input">
+                                </div>
+                            {/if}
+                            <div><input class="button glm-member-button centered" type="submit" value="Search"></div>
+                            {apply_filters('glm-member-db-front-members-list-searchFormBottom', '')}
+                    </form>
+                </div>
             </div> <!-- glm-member-list-filters-box -->
         </div> <!-- glm-member-list-wrapper -->
         {/if} {*list_show_search*}
@@ -222,10 +229,10 @@
                     <a class="glm-member-list-image-wrapper" href="{$siteBaseUrl}{$settings.canonical_member_page}/{$member.member_slug}/">
                     {/if}
 
-                    {if $member.featured}
-                    <div class="glm-member-list-featured-tag">
-                        featured
-                    </div>
+                    {if (apply_filters('glm_custom_fields', 'featured', $member.id) == 'Yes')}
+                        <div class="glm-member-list-featured-tag">
+                            Coming Soon
+                        </div>
                     {/if}
 
                     {if $member.logo && $settings.list_show_logo}
@@ -308,10 +315,10 @@
                         <div class="glm-member-list-image-wrapper left small-12 medium-4 large-4 columns {if !$settings.list_logo_for_mobile}mobile-hide{/if}">
                             <div class="glm-member-list-image-border">
 
-                                {if $member.featured}
-                                <div class="glm-member-list-featured-tag">
-                                    featured
-                                </div>
+                                {if (apply_filters('glm_custom_fields', 'featured', $member.id) == 'Yes')}
+                                    <div class="glm-member-list-featured-tag">
+                                        Coming Soon
+                                    </div>
                                 {/if}
                                 <img src="{$glmPluginMediaUrl}/images/{$settings.list_logo_size}/{$member.logo}">
                             </div>