Updated 'elimination' to 'playoff' in user-facing text.

This commit is contained in:
Patrick Fairbank
2015-08-20 22:26:57 -07:00
parent cd55cd070d
commit 51ff47f7dd
7 changed files with 10 additions and 8 deletions

View File

@@ -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:]
}

View File

@@ -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
}

View File

@@ -51,7 +51,7 @@
</span>
</div>
<div id="eventMatchInfo">
<span>{{.EventSettings.Name}} 2014</span>
<span>{{.EventSettings.Name}} 2015</span>
<span class="pull-right" id="matchName"></span>
</div>
</div>
@@ -101,7 +101,7 @@
</span>
</div>
<div id="finalEventMatchInfo">
<span>{{.EventSettings.Name}} 2014</span>
<span>{{.EventSettings.Name}} 2015</span>
<span class="pull-right" id="finalMatchName"></span>
</div>
</div>

View File

@@ -53,14 +53,14 @@
<li><a target="_blank" href="/reports/pdf/teams">Team List</a></li>
<li><a target="_blank" href="/reports/pdf/schedule/practice">Practice Schedule</a></li>
<li><a target="_blank" href="/reports/pdf/schedule/qualification">Qualification Schedule</a></li>
<li><a target="_blank" href="/reports/pdf/schedule/elimination">Elimination Schedule</a></li>
<li><a target="_blank" href="/reports/pdf/schedule/elimination">Playoff Schedule</a></li>
<li><a target="_blank" href="/reports/pdf/rankings">Standings</a></li>
<li class="divider"></li>
<li class="dropdown-header">CSV Data Export</li>
<li><a target="_blank" href="/reports/csv/teams">Team List</a></li>
<li><a target="_blank" href="/reports/csv/schedule/practice">Practice Schedule</a></li>
<li><a target="_blank" href="/reports/csv/schedule/qualification">Qualification Schedule</a></li>
<li><a target="_blank" href="/reports/csv/schedule/elimination">Elimination Schedule</a></li>
<li><a target="_blank" href="/reports/csv/schedule/elimination">Playoff Schedule</a></li>
<li><a target="_blank" href="/reports/csv/rankings">Standings</a></li>
{{if .EventSettings.NetworkSecurityEnabled}}
<li><a target="_blank" href="/reports/csv/wpa_keys">WPA Keys</a></li>

View File

@@ -17,7 +17,7 @@
<a href="#qualification" data-toggle="tab">Qualification</a>
</li>
<li{{if eq .CurrentMatchType "elimination" }} class="active"{{end}}>
<a href="#elimination" data-toggle="tab">Elimination</a>
<a href="#elimination" data-toggle="tab">Playoff</a>
</li>
</ul>
<div class="tab-content">

View File

@@ -15,7 +15,7 @@
<a href="#qualification" data-toggle="tab">Qualification</a>
</li>
<li{{if eq .CurrentMatchType "elimination" }} class="active"{{end}}>
<a href="#elimination" data-toggle="tab">Elimination</a>
<a href="#elimination" data-toggle="tab">Playoff</a>
</li>
</ul>
<div class="tab-content">

View File

@@ -130,7 +130,7 @@
<div class="modal-body">
<p>Are you sure you want to finalize the alliance selection process?</p>
<div class="form-group">
<label class="col-lg-6 control-label">Elimination Round Start Time</label>
<label class="col-lg-6 control-label">Playoff Round Start Time</label>
<div class="col-lg-6">
<div class="input-group date" id="startTimePicker" data-date-format="YYYY-MM-DD hh:mm:ss A">
<input type="text" class="form-control input-sm" name="startTime" />