From: Chuck Scott <cscott@gaslightmedia.com>
Date: Wed, 4 May 2016 19:58:19 +0000 (-0400)
Subject: Better previous-next buttons
X-Git-Tag: v2.0.0^2~25
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=3ccf6d455fcbd206067b17f33f3ef820f99e7971;p=WP-Plugins%2Fglm-member-db.git

Better previous-next buttons
---

diff --git a/models/front/members/list.php b/models/front/members/list.php
index 38461efc..491b7252 100644
--- a/models/front/members/list.php
+++ b/models/front/members/list.php
@@ -444,7 +444,6 @@ class GlmMembersFront_members_list extends GlmDataMemberInfo
         /*
          *  Get a current list of members - unless this is a blank start
          */
-
         if (!$blankStart) {
 
                 // Get member list and sort
@@ -459,7 +458,7 @@ class GlmMembersFront_members_list extends GlmDataMemberInfo
         // If we have list entries - even if it's an empty list
         $success = true;
         $haveMembers = false;
-        if ($list !== false) {
+        if (!$blankStart && $list !== false) {
 
             $success = true;
 
@@ -469,6 +468,12 @@ class GlmMembersFront_members_list extends GlmDataMemberInfo
             }
         }
 
+        // If there's only one category for the search picklist
+        $singleCategory = false;
+        if (count($categoryData) == 1) {
+            $singleCategory = true;
+        }
+
         // Compile template data
         $templateData = array(
             'haveMembers' => $haveMembers,
@@ -479,6 +484,7 @@ class GlmMembersFront_members_list extends GlmDataMemberInfo
             'filterName' => stripslashes($filterName),
             'textSearch' => $textSearch,
             'categories' => $categoryData,
+            'singleCategory' => $singleCategory,
             'catSelected' => $catSelected,
             'amenities' => $amenityData,
             'amenSelected' => $amenSelected,
diff --git a/views/admin/members/list.html b/views/admin/members/list.html
index 755a18b3..5cafcf52 100644
--- a/views/admin/members/list.html
+++ b/views/admin/members/list.html
@@ -27,8 +27,8 @@
         <p><b>Total found:</b> {$memberCount}&nbsp;&nbsp;</p>
         
         {if $paging}
-            {if $prevStart}<input type="Submit" name="pageSelect" value="Previous {$limit} {$terms.term_member_plur_cap}" class="button button-secondary glm-button">{/if}
-            {if $nextStart}<input type="Submit" name="pageSelect" value="Next {$limit} {$terms.term_member_plur_cap}" class="button button-secondary glm-button">{/if}
+            <input type="Submit" name="pageSelect" value="Previous {$limit} {$terms.term_member_plur_cap}" class="button button-secondary glm-button"{if !$prevStart} disabled{/if}>
+            <input type="Submit" name="pageSelect" value="Next {$limit} {$terms.term_member_plur_cap}" class="button button-secondary glm-button"{if !$nextStart} disabled{/if}>
         {/if}    
         
         <table class="wp-list-table striped glm-admin-table">
@@ -71,8 +71,8 @@
         </table>
 
         {if $paging}
-            {if $prevStart}<input type="Submit" name="pageSelect" value="Previous {$limit} {$terms.term_member_plur_cap}" class="button button-secondary glm-button">{/if}
-            {if $nextStart}<input type="Submit" name="pageSelect" value="Next {$limit} {$terms.term_member_plur_cap}" class="button button-secondary glm-button">{/if}
+            <input type="Submit" name="pageSelect" value="Previous {$limit} {$terms.term_member_plur_cap}" class="button button-secondary glm-button"{if !$prevStart} disabled{/if}>
+            <input type="Submit" name="pageSelect" value="Next {$limit} {$terms.term_member_plur_cap}" class="button button-secondary glm-button"{if !$nextStart} disabled{/if}>
         {/if}    
 
     </form>
diff --git a/views/admin/settings/amenities.html b/views/admin/settings/amenities.html
index 6e96d013..8ba15e7d 100644
--- a/views/admin/settings/amenities.html
+++ b/views/admin/settings/amenities.html
@@ -6,6 +6,10 @@
         <form action="{$thisUrl}?page={$thisPage}" method="post" enctype="multipart/form-data">
             <input type="hidden" name="glm_action" value="amenities">
             <input type="hidden" name="option" value="addNew">
+
+<!-- This is only temporary until we reinstate the "Used With" selection below -->
+<input type="hidden" name="ref_type" value="20">
+
             <table class="glm-admin-table">
                 <tr>
                     <th class="glm-required">Amenity Name:</th>
@@ -13,6 +17,7 @@
                         <input type="text" name="name" class="glm-form-text-input">
                     </td>
                 </tr>
+<!--                 
                 <tr>
                     <th class="glm-required">Used With:</th>
                     <td>
@@ -24,10 +29,13 @@
                         </select>
                     </td>
                 </tr>
+-->                
+<!--
                 <tr>
                     <th>Uses a value:</th>
                     <td><input type="checkbox" name="uses_value"></td>
                 </tr>
+ -->                
                 <tr>
                     <th>Description:</th>
                     <td>
@@ -63,6 +71,10 @@
             <input type="hidden" name="glm_action" value="amenities">
             <input type="hidden" name="option" value="update">
             <input id="editAmenityID" type="hidden" name="id" value="">
+
+<!-- This is only temporary until we reinstate the "Used With" selection below -->
+<input type="hidden" name="ref_type" value="20">
+
             <table class="glm-admin-table">
                 <tr>
                     <th class="glm-required">Amenity Name:</th>
@@ -70,6 +82,7 @@
                         <input id="editAmenityName" type="text" name="name" class="glm-form-text-input">
                     </td>
                 </tr>
+<!--                 
                 <tr>
                     <th class="glm-required">Used With:</th>
                     <td>
@@ -81,10 +94,13 @@
                         </select>
                     </td>
                 </tr>
+-->                
+<!-- 
                 <tr>
                     <th>Uses a value:</th>
                     <td><input id="editAmenityUsesValue" type="checkbox" name="uses_value"></td>
                 </tr>
+-->
                 <tr>
                     <th>Description:</th>
                     <td>
diff --git a/views/front/members/list.html b/views/front/members/list.html
index b7f7dcd1..3f8dda1c 100644
--- a/views/front/members/list.html
+++ b/views/front/members/list.html
@@ -26,7 +26,9 @@
                     <div class="small-12 medium-5 columns">
                         {$terms.term_member_cap} Category:
                         <select name="categorySearch" id="categorySelect">
+                {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}