Better previous-next buttons

diff --git a/models/front/events/list.php b/models/front/events/list.php
index 3ea7632..9d49125 100644 (file)
--- a/models/front/events/list.php
+++ b/models/front/events/list.php
@@ -115,7 +115,7 @@ class GlmMembersFront_events_list extends GlmMembersFront_events_baseAction
                 $toDate = date('m/d/Y', strtotime( '+ 2 weeks' ));
             }
         }
-        if ( $fromDate && $toDate && !$_REQUEST['event_name']) {
+        if ( $fromDate && $toDate && !(isset($_REQUEST['event_name']) && $_REQUEST['event_name'])) {
             $from = date('Y-m-d', strtotime($fromDate));
             $to   = date('Y-m-d', strtotime($toDate));
             $this->dateRange = "start_time BETWEEN CAST('{$from}' AS DATE) AND CAST('{$to}' as DATE)";
@@ -202,7 +202,7 @@ class GlmMembersFront_events_list extends GlmMembersFront_events_baseAction
             usort( $events, function($event1, $event2){
                 if ( $event1['starting_timestamp'] == $event2['starting_timestamp']) {
                     return 0;
-                } 
+                }
                 return ($event1['starting_timestamp'] < $event2['starting_timestamp'] ) ? -1 : 1;
             });
 
@@ -214,11 +214,11 @@ class GlmMembersFront_events_list extends GlmMembersFront_events_baseAction
                 $document = new SetaPDF_Core_Document($writer);
                 // logo for PDF
                 if ( $this->config['settings']['pdf_logo'] ) {
-                    $img = SetaPDF_Core_Image::getByPath( 
+                    $img = SetaPDF_Core_Image::getByPath(
                         GLM_MEMBERS_PLUGIN_MEDIA_PATH . '/images/large/' . $this->config['settings']['pdf_logo']
                     );
                     $xObject = $img->toXObject($document);
-                } 
+                }
 
                 $font     = SetaPDF_Core_Font_Standard_Helvetica::create($document);
                 $boldFont = SetaPDF_Core_Font_Standard_HelveticaBold::create($document);
@@ -237,7 +237,7 @@ class GlmMembersFront_events_list extends GlmMembersFront_events_baseAction
                         $xObject->getWidth() / self::PDF_LOGO_SCALE,
                         $xObject->getHeight() / self::PDF_LOGO_SCALE
                     );
-                } 
+                }
 
                 $totalEvents = count($events);
                 $index = 0;
@@ -337,7 +337,7 @@ class GlmMembersFront_events_list extends GlmMembersFront_events_baseAction
                         $location->draw($page->getCanvas(), self::PDF_LFT_COL_X, $pdfY);
                         $pdfY -= self::LINE_HEIGHT;
                     }
-                        
+
                     // check for phone, url or email to output
                     $contactInfo = array();
                     if ( $event['contact_phone'] ) {
@@ -446,8 +446,8 @@ class GlmMembersFront_events_list extends GlmMembersFront_events_baseAction
             foreach ( $events as $event ) {
                 foreach ( $event['times'] as $eventTime ) {
                     $eventDateTime = mktime(
-                        0, 
-                        0, 
+                        0,
+                        0,
                         0,
                         date('n', $eventTime['start_time']['timestamp']),
                         date('j', $eventTime['start_time']['timestamp']),
@@ -479,7 +479,7 @@ class GlmMembersFront_events_list extends GlmMembersFront_events_baseAction
                         $mainEvents[$eventDate][$i][$time] = $times;
                         ksort($mainEvents[$eventDate][$i]);
                     }
-                } 
+                }
             }
             $eventsByDate = $mainEvents;
         }

diff --git a/views/admin/events/list.html b/views/admin/events/list.html
index 5c879e1..591c411 100644 (file)
--- a/views/admin/events/list.html
+++ b/views/admin/events/list.html
@@ -55,8 +55,8 @@
 
         
     {if $paging}
-        {if $prevStart}<input type="Submit" name="pageSelect" value="Previous {$limit} Events" class="button button-secondary glm-button">{/if}
-        {if $nextStart}<input type="Submit" name="pageSelect" value="Next {$limit} Events" class="button button-secondary glm-button">{/if}
+        <input type="Submit" name="pageSelect" value="Previous {$limit} Events" class="button button-secondary glm-button"{if !$prevStart} disabled{/if}>
+        <input type="Submit" name="pageSelect" value="Next {$limit} Events" class="button button-secondary glm-button"{if !$nextStart} disabled{/if}>
     {/if}    
         
         <table class="wp-list-table striped glm-admin-table">
@@ -110,8 +110,8 @@
         </table>
 
     {if $paging}
-        {if $prevStart}<input type="Submit" name="pageSelect" value="Previous {$limit} Events" class="button button-secondary glm-button">{/if}
-        {if $nextStart}<input type="Submit" name="pageSelect" value="Next {$limit} Events" class="button button-secondary glm-button">{/if}
+        <input type="Submit" name="pageSelect" value="Previous {$limit} Events" class="button button-secondary glm-button"{if !$prevStart} disabled{/if}>
+        <input type="Submit" name="pageSelect" value="Next {$limit} Events" class="button button-secondary glm-button"{if !$nextStart} disabled{/if}>
     {/if}
 
     </form>