From 948f7b851100a3f2b9eef586ffd97dcfd7cf4d5f Mon Sep 17 00:00:00 2001 From: Julian Date: Sat, 23 Jun 2018 16:08:29 +0200 Subject: [PATCH] Updated desktop menu to show ranks_total if bet_type is 1 Updated mobile menu to behave like desktop menu --- controller/main.php | 15 ++++++++++----- styles/prosilver/template/football_body.html | 7 +++++++ .../prosilver/template/mobile_football_body.html | 12 +++++++++--- 3 files changed, 26 insertions(+), 8 deletions(-) diff --git a/controller/main.php b/controller/main.php index 2d71747..95ab3f7 100644 --- a/controller/main.php +++ b/controller/main.php @@ -799,7 +799,11 @@ class main $selected = ($league && $row['league'] == $league) ? ' selected="selected"' : ''; if ($side == 'table' && $league_info['bet_type']) { - + $side = 'ranks_total'; + } + elseif ($side == 'ranks_total' && !$league_info['bet_type']) + { + $side = 'table'; } elseif ($side == 'table' OR $side == 'results_tl') { @@ -821,8 +825,8 @@ class main } $template->assign_block_vars('form_league', array( 'S_LEAGUE' => $row['league'], - 'S_LEAGUENAME' => $row['league_name'], - 'S_SELECTED' => $selected + 'S_LEAGUENAME' => $row['league_name'], + 'S_SELECTED' => $selected ) ); } @@ -1000,8 +1004,9 @@ class main 'S_NEXT_CLASS' => $next_class, 'S_NEXT_DEADLINE' => $next_deadline, 'S_DBMSG' => $dbmsg, - 'FOOTBALL_LEFT_COLUMN' => $config['football_left_column_width'], - 'FOOTBALL_RIGHT_COLUMN' => $config['football_right_column_width'], + 'FOOTBALL_LEFT_COLUMN' => $config['football_left_column_width'], + 'FOOTBALL_RIGHT_COLUMN' => $config['football_right_column_width'], + 'S_BET_TYPE' => $league_info['bet_type'], )); // End assign vars diff --git a/styles/prosilver/template/football_body.html b/styles/prosilver/template/football_body.html index 23bfc4e..a3b65e2 100644 --- a/styles/prosilver/template/football_body.html +++ b/styles/prosilver/template/football_body.html @@ -19,8 +19,15 @@
  • {L_BET}
  • {L_ALL_BETS}
  • {L_RESULTS}
    • +
  • {L_RESULTS_TL}
    • + +
  • {L_MATCHDAY_SHORT}
    • + +
  • {L_TABLE}
    • +
  • {L_TABLE}
    • +
  • {L_RULES}
  • {L_ODDS}
  • {L_MY_BETS}
    • diff --git a/styles/prosilver/template/mobile_football_body.html b/styles/prosilver/template/mobile_football_body.html index d347ac4..c84b09a 100644 --- a/styles/prosilver/template/mobile_football_body.html +++ b/styles/prosilver/template/mobile_football_body.html @@ -10,10 +10,16 @@