Changeset 3073918

Timestamp:

04/19/2024 03:31:37 PM (22 months ago)

Author:

mtreherne

Message:

Release of Version 3.15

Location:

eh-gms-feed

Files:

• tags/3.15/css/gms-default.css (modified) (3 diffs)
• tags/3.15/eh-gms-feed.php (modified) (1 diff)
• tags/3.15/includes/coreAPI.php (modified) (4 diffs)
• tags/3.15/includes/main-class.php (modified) (2 diffs)
• tags/3.15/readme.txt (modified) (2 diffs)
• trunk/css/gms-default.css (modified) (3 diffs)
• trunk/eh-gms-feed.php (modified) (1 diff)
• trunk/includes/coreAPI.php (modified) (4 diffs)
• trunk/includes/main-class.php (modified) (2 diffs)
• trunk/readme.txt (modified) (2 diffs)

eh-gms-feed/tags/3.15/css/gms-default.css

@@ -4 +4 @@
 .gms-table th, .gms-table td { border: 1px solid; padding: 3px 10px; border-color: silver }
 .gms-footnote, .gms-filter { margin: 0 0 2rem }
-.gms-clubteam:not(.gms-button) { font-weight: 700 }
+.gms-clubteam:not(.gms-button), .gms-boldteam { font-weight: 700 }
 .gms-filter > div { margin: 0 0 1rem }
 .gms-filter fieldset { width: fit-content }
@@ -23 +23 @@
 /* Helps makes GMS feed responsive depending on screen size and input device */
 @media screen and (max-width: 767px) { .gms-table { overflow-x: auto; display: block; white-space: nowrap } .gms-nomobile { display: none } }
+@media not screen and (max-width: 767px) { .gms-mobile { display: none } }
 @media (hover: hover) and (pointer: fine) { .gms-detaillink { cursor: pointer } .gms-detaillink:hover { background-color: yellow } }
 
@@ -44 +45 @@
 .gms-map-google, .gms-map-apple { background-color: white }
 .gms-map-waze { background-color: #05c8f7 }
-.gms-fixture .gms-card > * { margin-top: 0.5rem; margin-bottom: 0.5rem }
+.gms-fixture .gms-card > *, .gms-cardform { margin-top: 0.5rem; margin-bottom: 0.5rem }
 .gms-fixturedetails { display: flex; flex-wrap: wrap; gap: 1rem }
 .gms-fixturedetails > div { flex-grow: 1; padding: 0.5rem 0.5rem; border-radius: 0.5rem }

eh-gms-feed/tags/3.15/eh-gms-feed.php

@@ -4 +4 @@
  * Plugin URI: https://wordpress.org/plugins/eh-gms-feed/
  * Description: Show fixtures, results and tables from England Hockey GMS
- * Version: 3.14
+ * Version: 3.15
  * Author: Matthew Treherne
  * Author URI: https://profiles.wordpress.org/mtreherne

eh-gms-feed/tags/3.15/includes/coreAPI.php

@@ -222 +222 @@
     }
 
-    private function is_beforetoday($valid_date) {
+    protected function is_beforetoday($valid_date) {
         return $valid_date < (new \DateTime())->setTime(0,0);
     }
@@ -422 +422 @@
     private function process_table ($data, $custom=false) {
         $html = ''; $link = $this->comp_link;
-        $league_data = ['Team' => 'teamName', 'Played' => 'gamesPlayed', 'Won' => 'gamesWon', 'Drawn' => 'gamesDrawn', 'Lost' => 'gamesLost', 'For' => 'goalsFor', 'Against' => 'goalsAgainst', 'GD' => 'goalsDifference', 'Points' => 'totalPoints'];
+        $league_data = ['Team' => 'teamName', 'P<span class="gms-nomobile">layed</span>' => 'gamesPlayed', 'W<span class="gms-nomobile">on</span>' => 'gamesWon', 'D<span class="gms-nomobile">rawn</span>' => 'gamesDrawn', 'L<span class="gms-nomobile">ost</span>' => 'gamesLost', 'For' => 'goalsFor', 'Against' => 'goalsAgainst', 'GD' => 'goalsDifference', '<span class="gms-mobile">Pts</span><span class="gms-nomobile">Points</span>' => 'totalPoints'];
         if ($custom) { $league_data['PPG'] = 'PPG'; $league_data['Form'] = 'form'; }
-        $html .= '<table class="gms-table gms-table-'.$this->display_name.($custom ? ' gms-table-custom' : '').'"><thead><tr><th></th>';
-        foreach ($league_data as $column_title => $field_name) $html .= '<th>'.$column_title.'</th>';
-        $html .= '</tr></thead><tbody>';
+        if ($custom && $this->show_list) $html .= '<div class="gms-list">';
+        else {
+            $html .= '<table class="gms-table gms-table-'.$this->display_name.($custom ? ' gms-table-custom' : '').'"><thead><tr><th></th>';
+            foreach ($league_data as $column_title => $field_name) $html .= '<th'.($column_title == 'For' || $column_title == 'Against' ? ' class="gms-nomobile"' : '').'>'.$column_title.'</th>';
+            $html .= '</tr></thead><tbody>';
+        }
         foreach ($data as $position => $team) {
             $class = '';
@@ -433 +436 @@
                 if (!$link) $link = $this->get_link('team', $team->teamEntityUrlSlug);
             }
-            $html .= '<tr'.$class.'><td>'.($position+1).'</td>';
-            foreach ($league_data as $field_name) {
-                $suffix = '';
-                if ($custom && $field_name == 'teamName' && $this->show_gender && isset($team->gender)) $suffix = ' ('.$team->gender.')';
-                if ($field_name == 'form') {
-                    if (count($team->form) > 5) $team->form = array_slice($team->form, -5, 5);
-                    $team->form = implode(' ', $team->form);
-                    $html .= '<td>'.$team->form.'</td>';
-                }
-                else $html .= '<td>'.(isset($team->{$field_name}) ? esc_html($team->{$field_name}.$suffix) : '').'</td>';
-            }
-            $html .= '</tr>';
-        }
-        if (empty($data)) $html .= '<tr><td colspan="'.(count($league_data)+1).'">No data for teams found</td></tr>';
-        $html .= '</tbody></table>';
+            if ($custom) {
+                if (count($team->form) > 5) $team->form = array_slice($team->form, -5, 5);
+                $team->form = implode(' ', $team->form);
+                if ($this->show_gender && isset($team->gender)) $team->teamName .= ' ('.$team->gender.')';
+            }
+            if ($custom && $this->show_list) $html .= '<div class="gms-card" data-team="'.$team->teamId.'"><div class="gms-boldteam">'.($position+1).'. '.esc_html($team->teamName).'</div><div>Won: '.$team->gamesWon.' | For: '.$team->goalsFor.' | GD: '.$team->goalsDifference.'</div><div>Points: '.$team->totalPoints.' | PPG: '.$team->PPG.'</div><div class="gms-cardform">'.$team->form.'</div></div>';
+            else {
+                $html .= '<tr'.$class.' data-team="'.$team->teamId.'"><td>'.($position+1).'</td>';
+                foreach ($league_data as $field_name) {
+                    if ($field_name == 'form') $html .= '<td>'.$team->form.'</td>';
+                    else $html .= '<td'.($field_name == 'goalsFor' || $field_name == 'goalsAgainst' ? ' class="gms-nomobile"' : '').'>'.(isset($team->{$field_name}) ? esc_html($team->{$field_name}) : '').'</td>';
+                }
+                $html .= '</tr>';
+            }
+        }
+        if ($custom && $this->show_list) {
+            if (empty($data)) $html .= '<div>No data found for any teams</div>';
+            $html .= '</div>';
+        }
+        else {
+            if (empty($data)) $html .= '<tr><td colspan="'.(count($league_data)+1).'">No data found for any teams</td></tr>';
+            $html .= '</tbody></table>';
+        }
         $html .= '<div class="gms-footnote">'.($link ? sprintf(esc_html__( '[%5$s%3$s %1$s also found at%4$s %2$s]', 'eh-gms-feed' ), $this->comp_name ? 'for '.$this->comp_name : '', '<a href="'.$link.'" target="_blank">England Hockey Link</a>', '<span class="gms-nomobile">', '</span>', ($custom ? esc_html__('Data') : esc_html__('Table'))) : ($custom ? esc_html__('[League table for selected teams]') : '')).'</div>';
         return $html;
@@ -682 +693 @@
             });
             $html .= $this->process_table($league_data, true);
-            if ($no_data) $html .= $this->show_api_error(sprintf(esc_html__( 'Failed to retrieve data for %s of selected team(s)', 'eh-gms-feed' ), $no_data));
+            if ($no_data) $html .= $this->show_api_error(sprintf(esc_html__( 'No data found for %s of selected team(s)', 'eh-gms-feed' ), $no_data));
         }
         else $html .= $this->show_api_error(esc_html__( 'You have selected a custom league table without any teams', 'eh-gms-feed' ));

eh-gms-feed/tags/3.15/includes/main-class.php

@@ -119 +119 @@
         $team_count = count($this->multiple_teams);
         if ($team_count > 1 && ($this->atts_show['show'] != 'league' || $team_count > $this->teamlimit || $this->atts_show['method'] == 'api-dynamic')) {
-            $message = sprintf(esc_html__( 'You can only show a static league table with multiple teams (up to %s allowed).', 'eh-gms-feed' ), $this->teamlimit);
+            $message = sprintf(esc_html__( 'You can only show a custom league table without filter and up to %s teams.', 'eh-gms-feed' ), $this->teamlimit);
             $this->not_valid .= '<p>'.$message.'</p>';
             $valid = false;
@@ -146 +146 @@
         wp_register_script('EH_GMS_Feed', plugin_dir_url(__DIR__).'js/eh-gms-feed.js', ['jquery'], '3.14', true);
         wp_localize_script('EH_GMS_Feed', 'eh_gms_feed_ajax_obj', ['ajax_url' => admin_url( 'admin-ajax.php' ), 'nonce' => wp_create_nonce('get_gms_table')]);
-        wp_register_style('EH_GMS_Feed', plugin_dir_url(__DIR__).'css/gms-default.css',[],'3.14');
+        wp_register_style('EH_GMS_Feed', plugin_dir_url(__DIR__).'css/gms-default.css',[],'3.15');
         if ($this->settings->default_css == 'yes') wp_enqueue_style('EH_GMS_Feed');
     }

eh-gms-feed/tags/3.15/readme.txt

@@ -5 +5 @@
 Tested up to: 6.5
 Requires PHP: 5.3
-Stable tag: 3.14
+Stable tag: 3.15
 License: GPLv2
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -62 +62 @@
 
 == Changelog ==
+
+= 3.15 =
+* Show as list option added to custom league
+* League column titles responsive to screen size
+* Change to default CSS for custom league list view
 
 = 3.14 =

eh-gms-feed/trunk/css/gms-default.css

@@ -4 +4 @@
 .gms-table th, .gms-table td { border: 1px solid; padding: 3px 10px; border-color: silver }
 .gms-footnote, .gms-filter { margin: 0 0 2rem }
-.gms-clubteam:not(.gms-button) { font-weight: 700 }
+.gms-clubteam:not(.gms-button), .gms-boldteam { font-weight: 700 }
 .gms-filter > div { margin: 0 0 1rem }
 .gms-filter fieldset { width: fit-content }
@@ -23 +23 @@
 /* Helps makes GMS feed responsive depending on screen size and input device */
 @media screen and (max-width: 767px) { .gms-table { overflow-x: auto; display: block; white-space: nowrap } .gms-nomobile { display: none } }
+@media not screen and (max-width: 767px) { .gms-mobile { display: none } }
 @media (hover: hover) and (pointer: fine) { .gms-detaillink { cursor: pointer } .gms-detaillink:hover { background-color: yellow } }
 
@@ -44 +45 @@
 .gms-map-google, .gms-map-apple { background-color: white }
 .gms-map-waze { background-color: #05c8f7 }
-.gms-fixture .gms-card > * { margin-top: 0.5rem; margin-bottom: 0.5rem }
+.gms-fixture .gms-card > *, .gms-cardform { margin-top: 0.5rem; margin-bottom: 0.5rem }
 .gms-fixturedetails { display: flex; flex-wrap: wrap; gap: 1rem }
 .gms-fixturedetails > div { flex-grow: 1; padding: 0.5rem 0.5rem; border-radius: 0.5rem }

eh-gms-feed/trunk/eh-gms-feed.php

@@ -4 +4 @@
  * Plugin URI: https://wordpress.org/plugins/eh-gms-feed/
  * Description: Show fixtures, results and tables from England Hockey GMS
- * Version: 3.14
+ * Version: 3.15
  * Author: Matthew Treherne
  * Author URI: https://profiles.wordpress.org/mtreherne

eh-gms-feed/trunk/includes/coreAPI.php

@@ -222 +222 @@
     }
 
-    private function is_beforetoday($valid_date) {
+    protected function is_beforetoday($valid_date) {
         return $valid_date < (new \DateTime())->setTime(0,0);
     }
@@ -422 +422 @@
     private function process_table ($data, $custom=false) {
         $html = ''; $link = $this->comp_link;
-        $league_data = ['Team' => 'teamName', 'Played' => 'gamesPlayed', 'Won' => 'gamesWon', 'Drawn' => 'gamesDrawn', 'Lost' => 'gamesLost', 'For' => 'goalsFor', 'Against' => 'goalsAgainst', 'GD' => 'goalsDifference', 'Points' => 'totalPoints'];
+        $league_data = ['Team' => 'teamName', 'P<span class="gms-nomobile">layed</span>' => 'gamesPlayed', 'W<span class="gms-nomobile">on</span>' => 'gamesWon', 'D<span class="gms-nomobile">rawn</span>' => 'gamesDrawn', 'L<span class="gms-nomobile">ost</span>' => 'gamesLost', 'For' => 'goalsFor', 'Against' => 'goalsAgainst', 'GD' => 'goalsDifference', '<span class="gms-mobile">Pts</span><span class="gms-nomobile">Points</span>' => 'totalPoints'];
         if ($custom) { $league_data['PPG'] = 'PPG'; $league_data['Form'] = 'form'; }
-        $html .= '<table class="gms-table gms-table-'.$this->display_name.($custom ? ' gms-table-custom' : '').'"><thead><tr><th></th>';
-        foreach ($league_data as $column_title => $field_name) $html .= '<th>'.$column_title.'</th>';
-        $html .= '</tr></thead><tbody>';
+        if ($custom && $this->show_list) $html .= '<div class="gms-list">';
+        else {
+            $html .= '<table class="gms-table gms-table-'.$this->display_name.($custom ? ' gms-table-custom' : '').'"><thead><tr><th></th>';
+            foreach ($league_data as $column_title => $field_name) $html .= '<th'.($column_title == 'For' || $column_title == 'Against' ? ' class="gms-nomobile"' : '').'>'.$column_title.'</th>';
+            $html .= '</tr></thead><tbody>';
+        }
         foreach ($data as $position => $team) {
             $class = '';
@@ -433 +436 @@
                 if (!$link) $link = $this->get_link('team', $team->teamEntityUrlSlug);
             }
-            $html .= '<tr'.$class.'><td>'.($position+1).'</td>';
-            foreach ($league_data as $field_name) {
-                $suffix = '';
-                if ($custom && $field_name == 'teamName' && $this->show_gender && isset($team->gender)) $suffix = ' ('.$team->gender.')';
-                if ($field_name == 'form') {
-                    if (count($team->form) > 5) $team->form = array_slice($team->form, -5, 5);
-                    $team->form = implode(' ', $team->form);
-                    $html .= '<td>'.$team->form.'</td>';
-                }
-                else $html .= '<td>'.(isset($team->{$field_name}) ? esc_html($team->{$field_name}.$suffix) : '').'</td>';
-            }
-            $html .= '</tr>';
-        }
-        if (empty($data)) $html .= '<tr><td colspan="'.(count($league_data)+1).'">No data for teams found</td></tr>';
-        $html .= '</tbody></table>';
+            if ($custom) {
+                if (count($team->form) > 5) $team->form = array_slice($team->form, -5, 5);
+                $team->form = implode(' ', $team->form);
+                if ($this->show_gender && isset($team->gender)) $team->teamName .= ' ('.$team->gender.')';
+            }
+            if ($custom && $this->show_list) $html .= '<div class="gms-card" data-team="'.$team->teamId.'"><div class="gms-boldteam">'.($position+1).'. '.esc_html($team->teamName).'</div><div>Won: '.$team->gamesWon.' | For: '.$team->goalsFor.' | GD: '.$team->goalsDifference.'</div><div>Points: '.$team->totalPoints.' | PPG: '.$team->PPG.'</div><div class="gms-cardform">'.$team->form.'</div></div>';
+            else {
+                $html .= '<tr'.$class.' data-team="'.$team->teamId.'"><td>'.($position+1).'</td>';
+                foreach ($league_data as $field_name) {
+                    if ($field_name == 'form') $html .= '<td>'.$team->form.'</td>';
+                    else $html .= '<td'.($field_name == 'goalsFor' || $field_name == 'goalsAgainst' ? ' class="gms-nomobile"' : '').'>'.(isset($team->{$field_name}) ? esc_html($team->{$field_name}) : '').'</td>';
+                }
+                $html .= '</tr>';
+            }
+        }
+        if ($custom && $this->show_list) {
+            if (empty($data)) $html .= '<div>No data found for any teams</div>';
+            $html .= '</div>';
+        }
+        else {
+            if (empty($data)) $html .= '<tr><td colspan="'.(count($league_data)+1).'">No data found for any teams</td></tr>';
+            $html .= '</tbody></table>';
+        }
         $html .= '<div class="gms-footnote">'.($link ? sprintf(esc_html__( '[%5$s%3$s %1$s also found at%4$s %2$s]', 'eh-gms-feed' ), $this->comp_name ? 'for '.$this->comp_name : '', '<a href="'.$link.'" target="_blank">England Hockey Link</a>', '<span class="gms-nomobile">', '</span>', ($custom ? esc_html__('Data') : esc_html__('Table'))) : ($custom ? esc_html__('[League table for selected teams]') : '')).'</div>';
         return $html;
@@ -682 +693 @@
             });
             $html .= $this->process_table($league_data, true);
-            if ($no_data) $html .= $this->show_api_error(sprintf(esc_html__( 'Failed to retrieve data for %s of selected team(s)', 'eh-gms-feed' ), $no_data));
+            if ($no_data) $html .= $this->show_api_error(sprintf(esc_html__( 'No data found for %s of selected team(s)', 'eh-gms-feed' ), $no_data));
         }
         else $html .= $this->show_api_error(esc_html__( 'You have selected a custom league table without any teams', 'eh-gms-feed' ));

eh-gms-feed/trunk/includes/main-class.php

@@ -119 +119 @@
         $team_count = count($this->multiple_teams);
         if ($team_count > 1 && ($this->atts_show['show'] != 'league' || $team_count > $this->teamlimit || $this->atts_show['method'] == 'api-dynamic')) {
-            $message = sprintf(esc_html__( 'You can only show a static league table with multiple teams (up to %s allowed).', 'eh-gms-feed' ), $this->teamlimit);
+            $message = sprintf(esc_html__( 'You can only show a custom league table without filter and up to %s teams.', 'eh-gms-feed' ), $this->teamlimit);
             $this->not_valid .= '<p>'.$message.'</p>';
             $valid = false;
@@ -146 +146 @@
         wp_register_script('EH_GMS_Feed', plugin_dir_url(__DIR__).'js/eh-gms-feed.js', ['jquery'], '3.14', true);
         wp_localize_script('EH_GMS_Feed', 'eh_gms_feed_ajax_obj', ['ajax_url' => admin_url( 'admin-ajax.php' ), 'nonce' => wp_create_nonce('get_gms_table')]);
-        wp_register_style('EH_GMS_Feed', plugin_dir_url(__DIR__).'css/gms-default.css',[],'3.14');
+        wp_register_style('EH_GMS_Feed', plugin_dir_url(__DIR__).'css/gms-default.css',[],'3.15');
         if ($this->settings->default_css == 'yes') wp_enqueue_style('EH_GMS_Feed');
     }

eh-gms-feed/trunk/readme.txt

@@ -5 +5 @@
 Tested up to: 6.5
 Requires PHP: 5.3
-Stable tag: 3.14
+Stable tag: 3.15
 License: GPLv2
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -62 +62 @@
 
 == Changelog ==
+
+= 3.15 =
+* Show as list option added to custom league
+* League column titles responsive to screen size
+* Change to default CSS for custom league list view
 
 = 3.14 =