Skip to content

Commit de551ba

Browse files
patfairpatfair
committed
Update teams page for Bootstrap 5.
1 parent f39e481 commit de551ba

10 files changed

+48
-273
lines changed

‎static/css/fonts/glyphicons-halflings-regular.eot

-19.9 KB
Binary file not shown.

‎static/css/fonts/glyphicons-halflings-regular.svg

Lines changed: 0 additions & 229 deletions
This file was deleted.

‎static/css/fonts/glyphicons-halflings-regular.ttf

-40.3 KB
Binary file not shown.

‎static/css/fonts/glyphicons-halflings-regular.woff

-22.8 KB
Binary file not shown.

‎static/css/lib/bootstrap-icons.min.css

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎static/css/lib/fonts/bootstrap-icons.woff

172 KB
Binary file not shown.

‎static/css/lib/fonts/bootstrap-icons.woff2

127 KB
Binary file not shown.

‎templates/base.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,7 @@ <h4 class="modal-title">About Cheesy Arena</h4>
164164
<link rel="shortcut icon" href="/static/img/favicon.ico">
165165
<link href="/static/css/lib/bootstrap.min.css" rel="stylesheet">
166166
<link href="/static/css/lib/bootstrap-datetimepicker.min.css" rel="stylesheet">
167+
<link href="/static/css/lib/bootstrap-icons.min.css" rel="stylesheet">
167168
<link href="/static/css/cheesy-arena.css" rel="stylesheet">
168169
<meta name="viewport" content="width=device-width, initial-scale=1">
169170
{{end}}

‎templates/edit_team.html

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,78 +6,78 @@
66
*/}}
77
{{define "title"}}Edit Team{{end}}
88
{{define "body"}}
9-
<div class="row">
10-
<div class="col-lg-6 col-lg-offset-3">
11-
<div class="well">
9+
<div class="row justify-content-center">
10+
<div class="col-lg-6">
11+
<div class="card card-body bg-body-tertiary">
1212
<form class="form-horizontal" action="/setup/teams/{{.Team.Id}}/edit" method="POST">
1313
<fieldset>
1414
<legend>Edit Team {{.Team.Id}}</legend>
15-
<div class="form-group">
15+
<div class="row mb-3">
1616
<label class="col-lg-3 control-label">Name</label>
1717
<div class="col-lg-9">
1818
<textarea class="form-control" rows="5" name="name">{{.Team.Name}}</textarea>
1919
</div>
2020
</div>
21-
<div class="form-group">
21+
<div class="row mb-3">
2222
<label class="col-lg-3 control-label">Nickname</label>
2323
<div class="col-lg-9">
2424
<input type="text" class="form-control" name="nickname" value="{{.Team.Nickname}}">
2525
</div>
2626
</div>
27-
<div class="form-group">
27+
<div class="row mb-3">
2828
<label class="col-lg-3 control-label">City</label>
2929
<div class="col-lg-9">
3030
<input type="text" class="form-control" name="city" value="{{.Team.City}}">
3131
</div>
3232
</div>
33-
<div class="form-group">
33+
<div class="row mb-3">
3434
<label class="col-lg-3 control-label">State/Province</label>
3535
<div class="col-lg-9">
3636
<input type="text" class="form-control" name="stateProv" value="{{.Team.StateProv}}">
3737
</div>
3838
</div>
39-
<div class="form-group">
39+
<div class="row mb-3">
4040
<label class="col-lg-3 control-label">Country</label>
4141
<div class="col-lg-9">
4242
<input type="text" class="form-control" name="country" value="{{.Team.Country}}">
4343
</div>
4444
</div>
45-
<div class="form-group">
45+
<div class="row mb-3">
4646
<label class="col-lg-3 control-label">Rookie Year</label>
4747
<div class="col-lg-9">
4848
<input type="text" class="form-control" name="rookieYear" value="{{.Team.RookieYear}}">
4949
</div>
5050
</div>
51-
<div class="form-group">
51+
<div class="row mb-3">
5252
<label class="col-lg-3 control-label">Robot Name</label>
5353
<div class="col-lg-9">
5454
<input type="text" class="form-control" name="robotName" value="{{.Team.RobotName}}">
5555
</div>
5656
</div>
57-
<div class="form-group">
57+
<div class="row mb-3">
5858
<label class="col-lg-3 control-label">Recent Accomplishments</label>
5959
<div class="col-lg-9">
6060
<textarea class="form-control" rows="5" name="accomplishments">{{.Team.Accomplishments}}</textarea>
6161
</div>
6262
</div>
63-
<div class="form-group">
64-
<label class="col-lg-5 control-label">Has Connected to Field?</label>
63+
<div class="row mb-3">
64+
<label class="col-lg-5 control-label" for="hasConnected">Has Connected to Field?</label>
6565
<div class="col-lg-1 checkbox">
66-
<input type="checkbox" name="hasConnected"{{if .Team.HasConnected}} checked{{end}} />
66+
<input type="checkbox" id="hasConnected" name="hasConnected"{{if .Team.HasConnected}} checked{{end}} />
6767
</div>
6868
</div>
6969
{{if .EventSettings.NetworkSecurityEnabled}}
70-
<div class="form-group">
70+
<div class="row mb-3">
7171
<label class="col-lg-3 control-label">WPA Key</label>
7272
<div class="col-lg-9">
7373
<input type="text" class="form-control" name="wpaKey" value="{{.Team.WpaKey}}">
7474
</div>
7575
</div>
7676
{{end}}
77-
<div class="form-group">
78-
<div class="col-lg-9 col-lg-offset-3">
79-
<a href="/setup/teams"><button type="button" class="btn btn-default">Cancel</button></a>
80-
<button type="submit" class="btn btn-info">Save</button>
77+
<div class="row justify-content-center">
78+
<div class="col-md-auto">
79+
<a href="/setup/teams"><button type="button" class="btn btn-secondary">Cancel</button></a>
80+
<button type="submit" class="btn btn-primary">Save</button>
8181
</div>
8282
</div>
8383
</fieldset>

‎templates/setup_teams.html

Lines changed: 23 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -14,38 +14,38 @@
1414
</div>
1515
{{end}}
1616
<div class="row">
17-
<div class="col-lg-2">
18-
<form class="form-horizontal" action="/setup/teams" method="POST">
17+
<div class="col-lg-3">
18+
<form action="/setup/teams" method="POST">
1919
<fieldset>
2020
<legend>Import Teams</legend>
2121
{{if not .EventSettings.TbaDownloadEnabled}}
2222
<p>To automatically download data about teams, enable TBA Team Info Download on the settings page</p>
2323
{{end}}
24-
<div class="form-group">
24+
<div class="row mb-3">
2525
<textarea class="form-control" rows="10" name="teamNumbers"
2626
placeholder="One team number per line"></textarea>
2727
</div>
28-
<div class="form-group">
29-
<button type="submit" class="btn btn-info" onclick="$('#loadingFromTba').modal('show');">Add Teams</button>
28+
<div class="row mb-3">
29+
<button type="submit" class="btn btn-primary" onclick="$('#loadingFromTba').modal('show');">Add Teams</button>
3030
</div>
3131
{{if .EventSettings.TbaDownloadEnabled}}
32-
<div class="form-group">
33-
<a href="/setup/teams/refresh" class="btn btn-info" onclick="$('#loadingFromTba').modal('show');">
32+
<div class="row mb-3">
33+
<a href="/setup/teams/refresh" class="btn btn-primary" onclick="$('#loadingFromTba').modal('show');">
3434
Refresh Team Data from TBA
3535
</a>
3636
</div>
3737
{{end}}
38-
<div class="form-group">
39-
<button type="button" class="btn btn-primary" onclick="$('#confirmClearTeams').modal('show');">
38+
<div class="row mb-3">
39+
<button type="button" class="btn btn-danger" onclick="$('#confirmClearTeams').modal('show');">
4040
Clear Team List
4141
</button>
4242
</div>
4343
{{if .EventSettings.NetworkSecurityEnabled}}
44-
<div class="form-group">
45-
<a href="/setup/teams/generate_wpa_keys?all=true" class="btn btn-primary">Generate All WPA Keys</a>
44+
<div class="row mb-3">
45+
<a href="/setup/teams/generate_wpa_keys?all=true" class="btn btn-danger">Generate All WPA Keys</a>
4646
</div>
47-
<div class="form-group">
48-
<a href="/setup/teams/generate_wpa_keys?all=false" class="btn btn-primary">Generate Missing WPA Keys</a>
47+
<div class="row mb-3">
48+
<a href="/setup/teams/generate_wpa_keys?all=false" class="btn btn-danger">Generate Missing WPA Keys</a>
4949
</div>
5050
{{end}}
5151
{{if .EventSettings.TbaPublishingEnabled}}
@@ -55,7 +55,7 @@
5555
</fieldset>
5656
</form>
5757
</div>
58-
<div class="col-lg-10">
58+
<div class="col-lg-9">
5959
<table class="table table-striped table-hover ">
6060
<thead>
6161
<tr>
@@ -79,13 +79,11 @@
7979
<td>{{$team.RobotName}}</td>
8080
<td class="text-center nowrap">
8181
<form action="/setup/teams/{{$team.Id}}/delete" method="POST">
82-
<a href="/setup/teams/{{$team.Id}}/edit">
83-
<button type="button" class="btn btn-info btn-xs">
84-
<i class="glyphicon glyphicon-edit"></i>
85-
</button>
86-
</a>
87-
<button type="submit" class="btn btn-primary btn-xs">
88-
<i class="glyphicon glyphicon-trash"></i>
82+
<a href="/setup/teams/{{$team.Id}}/edit"><button type="button" class="btn btn-primary btn-sm">
83+
<i class="bi-pencil-square"></i>
84+
</button></a>
85+
<button type="submit" class="btn btn-danger btn-sm">
86+
<i class="bi-trash"></i>
8987
</button>
9088
</form>
9189
</td>
@@ -100,16 +98,16 @@
10098
<div class="modal-dialog">
10199
<div class="modal-content">
102100
<div class="modal-header">
103-
<button type="button" class="close" data-bs-dismiss="modal" aria-hidden="true">×</button>
104101
<h4 class="modal-title">Confirm</h4>
102+
<button type="button" class="btn-close" data-bs-dismiss="modal"></button>
105103
</div>
106104
<div class="modal-body">
107105
<p>Are you sure you want to clear the team list?</p>
108106
</div>
109107
<div class="modal-footer">
110108
<form class="form-horizontal" action="/setup/teams/clear" method="POST">
111-
<button type="button" class="btn btn-default" data-bs-dismiss="modal">Cancel</button>
112-
<button type="submit" class="btn btn-primary">Clear Team List</button>
109+
<button type="button" class="btn btn-primary" data-bs-dismiss="modal">Cancel</button>
110+
<button type="submit" class="btn btn-danger">Clear Team List</button>
113111
</form>
114112
</div>
115113
</div>
@@ -119,8 +117,8 @@ <h4 class="modal-title">Confirm</h4>
119117
<div class="modal-dialog">
120118
<div class="modal-content">
121119
<div class="modal-header">
122-
<button type="button" class="close" data-bs-dismiss="modal" aria-hidden="true">×</button>
123120
<h4 class="modal-title">Confirm</h4>
121+
<button type="button" class="btn-close" data-bs-dismiss="modal"></button>
124122
</div>
125123
<div class="modal-body">
126124
<p>Are you sure you want to publish the team list to The Blue Alliance? This will overwrite any

0 commit comments

Comments
 (0)