diff --git a/templates/announcer_display_match_load.html b/templates/announcer_display_match_load.html index 002d0f48..87d94a9f 100644 --- a/templates/announcer_display_match_load.html +++ b/templates/announcer_display_match_load.html @@ -1,4 +1,15 @@ {{define "announcer_display_match_load"}} +
+ {{if eq .Match.Type playoffMatch}} +

Alliance {{.Match.PlayoffBlueAlliance}}

+ {{end}} + {{template "team" dict "alliance" "blue" "team" (index .Teams "B1") "rankings" .Rankings}} + {{template "team" dict "alliance" "blue" "team" (index .Teams "B2") "rankings" .Rankings}} + {{template "team" dict "alliance" "blue" "team" (index .Teams "B3") "rankings" .Rankings}} + {{range $team := .BlueOffFieldTeams}} + {{template "team" dict "alliance" "blue" "team" $team "rankings" $.Rankings "isOffField" true}} + {{end}} +
{{if eq .Match.Type playoffMatch}}

Alliance {{.Match.PlayoffRedAlliance}}

@@ -10,17 +21,6 @@

Alliance {{.Match.PlayoffRedAlliance}}

{{template "team" dict "alliance" "red" "team" $team "rankings" $.Rankings "isOffField" true}} {{end}}
-
- {{if eq .Match.Type playoffMatch}} -

Alliance {{.Match.PlayoffBlueAlliance}}

- {{end}} - {{template "team" dict "alliance" "blue" "team" (index .Teams "B1") "rankings" .Rankings}} - {{template "team" dict "alliance" "blue" "team" (index .Teams "B2") "rankings" .Rankings}} - {{template "team" dict "alliance" "blue" "team" (index .Teams "B3") "rankings" .Rankings}} - {{range $team := .BlueOffFieldTeams}} - {{template "team" dict "alliance" "blue" "team" $team "rankings" $.Rankings "isOffField" true}} - {{end}} -
{{end}} {{define "team"}}
diff --git a/templates/match_play.html b/templates/match_play.html index 8fc0200e..6cb1e501 100644 --- a/templates/match_play.html +++ b/templates/match_play.html @@ -18,31 +18,31 @@
 
-
+
-
Blue Teams
+
Red Teams
DS
Rad
Rbt
Byp
- {{template "matchPlayTeam" dict "color" "B" "position" 1}} - {{template "matchPlayTeam" dict "color" "B" "position" 2}} - {{template "matchPlayTeam" dict "color" "B" "position" 3}} -
+ {{template "matchPlayTeam" dict "color" "R" "position" 1}} + {{template "matchPlayTeam" dict "color" "R" "position" 2}} + {{template "matchPlayTeam" dict "color" "R" "position" 3}} +
-
+
-
Red Teams
+
Blue Teams
DS
Rad
Rbt
Byp
- {{template "matchPlayTeam" dict "color" "R" "position" 3}} - {{template "matchPlayTeam" dict "color" "R" "position" 2}} - {{template "matchPlayTeam" dict "color" "R" "position" 1}} -
+ {{template "matchPlayTeam" dict "color" "B" "position" 3}} + {{template "matchPlayTeam" dict "color" "B" "position" 2}} + {{template "matchPlayTeam" dict "color" "B" "position" 1}} +