diff --git a/block/results.php b/block/results.php index 8088e95..7779a71 100644 --- a/block/results.php +++ b/block/results.php @@ -389,7 +389,6 @@ while ($row = $db->sql_fetchrow($result)) } $db->sql_freeresult($result); -$sidename = sprintf($user->lang['RESULTS']); switch ($league_info['bet_ko_type']) { case BET_KO_90: @@ -410,8 +409,21 @@ switch ($league_info['bet_ko_type']) break; } +// set correct display for usage in menu template +if($side == 'results') +{ + $display_results = true; + $sidename = sprintf($user->lang['RESULTS']); +} +if($side == 'results_tl') +{ + $display_results_tl = true; + $sidename = sprintf($user->lang['RESULTS']); +} + $template->assign_vars(array( - 'S_DISPLAY_RESULTS' => true, + 'S_DISPLAY_RESULTS' => $display_results, + 'S_DISPLAY_RESULTS_TL' => $display_results_tl, 'S_EXTRA_RESULTS' => $extra_results, 'S_SIDENAME' => $sidename, 'RESULT_EXPLAIN' => $result_explain, diff --git a/controller/main.php b/controller/main.php index 054427d..e0670d9 100644 --- a/controller/main.php +++ b/controller/main.php @@ -932,6 +932,7 @@ class main { include($this->football_root_path . 'block/table.' . $this->php_ext); } + elseif ($league > 50) {/* do nothing */} else { include($this->football_root_path . 'block/rank_matchday.' . $this->php_ext); @@ -941,7 +942,9 @@ class main //***************************************************************************** // Start total list - include($this->football_root_path . 'block/rank_total.' . $this->php_ext); + if($league < 50) { + include($this->football_root_path . 'block/rank_total.' . $this->php_ext); + } // End total list //***************************************************************************** diff --git a/event/main_listener.php b/event/main_listener.php index 1c856b9..9574217 100644 --- a/event/main_listener.php +++ b/event/main_listener.php @@ -219,8 +219,9 @@ class main_listener implements EventSubscriberInterface 'S_FOOTBALL_HEADER_ENABLED' => $this->config['football_header_enable'] ? $in_football_ext : false, 'U_FOOTBALL' => $this->controller_helper->route('football_main_controller', array('side' => 'bet')), 'U_BET' => $this->controller_helper->route('football_main_controller', array('side' => 'bet', 's' => $season, 'l' => $league, 'm' => $matchday)), - 'U_ALL_BETS' => $this->controller_helper->route('football_main_controller', array('side' => 'all_bets', 's' => $season, 'l' => $league, 'm' => $matchday)), - 'U_RESULTS' => $this->controller_helper->route('football_main_controller', array('side' => 'results', 's' => $season, 'l' => $league, 'm' => $matchday)), + 'U_ALL_BETS' => $this->controller_helper->route('football_main_controller', array('side' => 'all_bets', 's' => $season, 'l' => $league, 'm' => $matchday)), + 'U_RESULTS' => $this->controller_helper->route('football_main_controller', array('side' => 'results', 's' => $season, 'l' => $league, 'm' => $matchday)), + 'U_RESULTS_TL' => $this->controller_helper->route('football_main_controller', array('side' => 'results_tl', 's' => $season, 'l' => $league, 'm' => $matchday)), 'U_TABLE' => $this->controller_helper->route('football_main_controller', array('side' => 'table', 's' => $season, 'l' => $league, 'm' => $matchday)), 'U_RANKS_TOTAL' => $this->controller_helper->route('football_main_controller', array('side' => 'ranks_total', 's' => $season, 'l' => $league, 'm' => $matchday)), 'U_RANKS_MATCHDAY' => $this->controller_helper->route('football_main_controller', array('side' => 'ranks_matchday', 's' => $season, 'l' => $league, 'm' => $matchday)), diff --git a/styles/prosilver/template/football_body.html b/styles/prosilver/template/football_body.html index 4c22104..2ee442a 100644 --- a/styles/prosilver/template/football_body.html +++ b/styles/prosilver/template/football_body.html @@ -19,6 +19,7 @@