diff --git a/match.go b/match.go index c963258..a0a23fe 100644 --- a/match.go +++ b/match.go @@ -93,6 +93,8 @@ func (database *Database) GetMatchesByType(matchType string) ([]Match, error) { func (match *Match) CapitalizedType() string { if match.Type == "" { return "" + } else if match.Type == "elimination" { + return "Playoff" } return strings.ToUpper(match.Type[0:1]) + match.Type[1:] } diff --git a/setup_alliance_selection.go b/setup_alliance_selection.go index 64cc0ef..42b4970 100644 --- a/setup_alliance_selection.go +++ b/setup_alliance_selection.go @@ -141,7 +141,7 @@ func AllianceSelectionFinalizeHandler(w http.ResponseWriter, r *http.Request) { location, _ := time.LoadLocation("Local") startTime, err := time.ParseInLocation("2006-01-02 03:04:05 PM", r.PostFormValue("startTime"), location) if err != nil { - renderAllianceSelection(w, r, "Must specify a valid start time for the elimination rounds.") + renderAllianceSelection(w, r, "Must specify a valid start time for the playoff rounds.") return } diff --git a/templates/audience_display.html b/templates/audience_display.html index cdea0ac..12ea776 100644 --- a/templates/audience_display.html +++ b/templates/audience_display.html @@ -51,7 +51,7 @@
- {{.EventSettings.Name}} 2014 + {{.EventSettings.Name}} 2015
@@ -101,7 +101,7 @@
- {{.EventSettings.Name}} 2014 + {{.EventSettings.Name}} 2015
diff --git a/templates/base.html b/templates/base.html index cb20ec6..be4eb75 100644 --- a/templates/base.html +++ b/templates/base.html @@ -53,14 +53,14 @@
  • Team List
  • Practice Schedule
  • Qualification Schedule
    • -
  • Elimination Schedule
    • +
  • Playoff Schedule
  • Standings
  • CSV Data Export
  • Team List
  • Practice Schedule
  • Qualification Schedule
    • -
  • Elimination Schedule
    • +
  • Playoff Schedule
  • Standings
    • {{if .EventSettings.NetworkSecurityEnabled}}
  • WPA Keys
    • diff --git a/templates/match_play.html b/templates/match_play.html index bc84b0e..af66961 100644 --- a/templates/match_play.html +++ b/templates/match_play.html @@ -17,7 +17,7 @@ Qualification - Elimination + Playoff
    diff --git a/templates/match_review.html b/templates/match_review.html index fea7bdb..e2dccfa 100644 --- a/templates/match_review.html +++ b/templates/match_review.html @@ -15,7 +15,7 @@ Qualification - Elimination + Playoff
    diff --git a/templates/setup_alliance_selection.html b/templates/setup_alliance_selection.html index 1cfc176..4c61e35 100644 --- a/templates/setup_alliance_selection.html +++ b/templates/setup_alliance_selection.html @@ -130,7 +130,7 @@

    Are you sure you want to finalize the alliance selection process?

    - +