Skip to content

Commit

Permalink
Fix remaining Bootstrap 5 migration issues.
Browse files Browse the repository at this point in the history
  • Loading branch information
patfair committed May 11, 2024
1 parent 74c4308 commit cc83db8
Show file tree
Hide file tree
Showing 14 changed files with 113 additions and 148 deletions.
5 changes: 1 addition & 4 deletions static/css/queueing_display.css
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,14 @@ body {
background: -webkit-linear-gradient(top, #003375 1%, #3C679D 100%); /* Chrome10+,Safari5.1+ */
background-repeat: no-repeat;
}
h1 {
font-size: 40px;
}
#header {
padding: 10px 0px;
font-size: 40px;
font-family: "FuturaLTBold";
color: #fff;
text-transform: uppercase;
}
.well {
.card {
background-color: #ccc;
border: 1px solid #333;
padding: 10px;
Expand Down
2 changes: 1 addition & 1 deletion templates/alliance_selection.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
{{define "body"}}
<div class="row">
{{if .ErrorMessage}}
<div class="alert alert-dismissable alert-danger">
<div class="alert alert-dismissible alert-danger">
<button type="button" class="btn-close" data-bs-dismiss="alert"></button>
{{.ErrorMessage}}
</div>
Expand Down
2 changes: 1 addition & 1 deletion templates/audience_display.html
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ <h1>{{"{{Subtitle}}"}}</h1>
<script src="/static/js/lib/jquery.websocket-0.0.1.js"></script>
<script src="/static/js/lib/jquery.transit.min.js"></script>
<script src="/static/js/lib/handlebars-1.3.0.js"></script>
<script src="/static/js/lib/bootstrap.min.js"></script>
<script src="/static/js/lib/bootstrap.bundle.min.js"></script>
<script src="/static/js/cheesy-websocket.js"></script>
<script src="/static/js/match_timing.js"></script>
<script src="/static/js/audience_display.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion templates/edit_match_result.html
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
{{end}}
</div>
<div class="row mb-3">
<div class="col-lg-4 col-lg-offset-1">
<div class="col-lg-4">
<label class="control-label">Charge Station Is Level?</label>
<input type="checkbox" class="ms-3" name="{{"{{alliance}}"}}AutoChargeStationLevel">
</div>
Expand Down
7 changes: 4 additions & 3 deletions templates/field_monitor_display.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<meta name="viewport" content="width=device-width, maximum-scale=1.0, user-scalable=no" />
<link rel="shortcut icon" href="/static/img/favicon.ico">
<link rel="stylesheet" href="/static/css/lib/bootstrap.min.css" />
<link rel="stylesheet" href="/static/css/lib/bootstrap-icons.min.css" />
<link rel="stylesheet" href="/static/css/cheesy-arena.css" />
<link rel="stylesheet" href="/static/css/field_monitor_display.css" />
</head>
Expand All @@ -37,7 +38,7 @@
<script src="/static/js/lib/jquery.websocket-0.0.1.js"></script>
<script src="/static/js/cheesy-websocket.js"></script>
<script src="/static/js/lib/jquery.transit.min.js"></script>
<script src="/static/js/lib/bootstrap.min.js"></script>
<script src="/static/js/lib/bootstrap.bundle.min.js"></script>
<script src="/static/js/match_timing.js"></script>
<script src="/static/js/field_monitor_display.js"></script>
</html>
Expand All @@ -55,7 +56,7 @@
<div id="{{.side}}Team{{.position}}" class="team team-{{.side}} ds-dependent">
<div id="{{.side}}Team{{.position}}Id" class="team-id center fta-dependent"></div>
<div id="{{.side}}Team{{.position}}Notes" class="team-notes fta-dependent" title="FTA Notes">
<i class="glyphicon glyphicon-comment"></i>
<i class="bi-chat-left-fill"></i>
<div onclick="editFtaNotes(this);"></div>
</div>
<div class="team-box-row">
Expand All @@ -64,7 +65,7 @@
<div id="{{.side}}Team{{.position}}Ds" class="team-box center"
title="Driver Station Software Running&#10;Missed Packets">DS</div>
<div id="{{.side}}Team{{.position}}Radio" class="team-box center" title="Field Access Point Configured Team">
<i class="glyphicon glyphicon-signal"></i>
<i class="bi-reception-4"></i>
<span></span>
</div>
<div id="{{.side}}Team{{.position}}Robot" class="team-box center"
Expand Down
22 changes: 11 additions & 11 deletions templates/login.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,32 +6,32 @@
*/}}
{{define "title"}}Log In{{end}}
{{define "body"}}
<div class="row">
<div class="col-lg-4 col-lg-offset-4">
<div class="row justify-content-center">
<div class="col-lg-4">
{{if .ErrorMessage}}
<div class="alert alert-dismissable alert-danger">
<button type="button" class="close" data-dismiss="alert">×</button>
<div class="alert alert-dismissible alert-danger">
<button type="button" class="btn-close" data-bs-dismiss="alert"></button>
{{.ErrorMessage}}
</div>
{{end}}
<div class="well">
<form class="form-horizontal" method="POST">
<div class="card card-body bg-body-tertiary">
<form method="POST">
<legend>Log In</legend>
<div class="form-group">
<div class="row mb-3">
<label class="col-lg-4 control-label">Username</label>
<div class="col-lg-8">
<input type="text" class="form-control" name="username" autofocus />
</div>
</div>
<div class="form-group">
<div class="row mb-3">
<label class="col-lg-4 control-label">Password</label>
<div class="col-lg-8">
<input type="password" class="form-control" name="password" />
</div>
</div>
<div class="form-group">
<div class="col-lg-7 col-lg-offset-5">
<button type="submit" class="btn btn-info">Log In</button>
<div class="row justify-content-center">
<div class="col-lg-3">
<button type="submit" class="btn btn-primary">Log In</button>
</div>
</div>
</form>
Expand Down
2 changes: 1 addition & 1 deletion templates/match_play.html
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ <h6>Audience Display</h6>
</div>
<div class="col-lg-3">
<h6>Alliance Station Display</h6>
<div class="form-group">
<div>
<div>
<label>
<input type="radio" name="allianceStationDisplay" value="blank"
Expand Down
12 changes: 7 additions & 5 deletions templates/queueing_display.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,20 @@
<link rel="stylesheet" href="/static/css/queueing_display.css" />
</head>
<body>
<div id="header" class="col-lg-10 col-lg-offset-1">
<div class="pull-left">Match Queue</div>
<div class="pull-right">{{.EventSettings.Name}}</div>
<div id="header" class="row justify-content-center">
<div class="col-lg-5">Match Queue</div>
<div class="col-lg-5 text-end">{{.EventSettings.Name}}</div>
</div>
<div id="matches"></div>
<div id="earlyLateMessage" class="col-lg-10 col-lg-offset-1"></div>
<div class="row justify-content-center">
<div id="earlyLateMessage" class="col-lg-10"></div>
</div>
</body>
<script src="/static/js/lib/jquery.min.js"></script>
<script src="/static/js/lib/jquery.json-2.4.min.js"></script>
<script src="/static/js/lib/jquery.websocket-0.0.1.js"></script>
<script src="/static/js/lib/jquery.transit.min.js"></script>
<script src="/static/js/lib/bootstrap.min.js"></script>
<script src="/static/js/lib/bootstrap.bundle.min.js"></script>
<script src="/static/js/cheesy-websocket.js"></script>
<script src="/static/js/match_timing.js"></script>
<script src="/static/js/queueing_display.js"></script>
Expand Down
155 changes: 80 additions & 75 deletions templates/queueing_display_match_load.html
Original file line number Diff line number Diff line change
@@ -1,85 +1,90 @@
{{range $i, $match := .Matches}}
<div class="col-lg-10 col-lg-offset-1 well">
<div class="col-lg-6">
<div class="row">
<div class="col-lg-4">
<h1>
<div class="row justify-content-center">
<div class="col-lg-10">
<div class="card card-body">
<div class="row">
<div class="col-lg-6">
<div class="row">
<div class="col-lg-4 ps-4">
<h1 class="mt-2">
{{if eq $i 0}}
On Field
{{else if eq $i 1}}
On Deck
{{else if eq $i 2}}
Up In 2
{{else if eq $i 3}}
Up In 3
{{else if eq $i 4}}
Up In 4
{{end}}
</h1>
</div>
<div class="col-lg-3">
<h1 class="mt-2">{{$match.ShortName}}</h1>
</div>
<div class="col-lg-5">
<h1 class="mt-2">{{$match.Time.Local.Format "3:04 PM"}}</h1>
</div>
</div>
{{if eq $i 0}}
On Field
{{else if eq $i 1}}
On Deck
{{else if eq $i 2}}
Up In 2
{{else if eq $i 3}}
Up In 3
{{else if eq $i 4}}
Up In 4
<div class="row mt-3">
<div id="matchState" class="col-lg-4 ps-4"></div>
<div id="matchTime" class="col-lg-3"></div>
</div>
{{end}}
</h1>
<br />
</div>
<div class="col-lg-3">
<h1>{{$match.ShortName}}</h1>
</div>
<div class="col-lg-5">
<h1>{{$match.Time.Local.Format "3:04 PM"}}</h1>
</div>
</div>
{{if eq $i 0}}
<div class="row">
<div id="matchState" class="col-lg-4"></div>
<div id="matchTime" class="col-lg-3"></div>
</div>
{{end}}
</div>
<div class="col-lg-1 avatars text-right">
<img class="avatar" src="/api/teams/{{$match.Red1}}/avatar" /><br />
<img class="avatar" src="/api/teams/{{$match.Red2}}/avatar" /><br />
<img class="avatar" src="/api/teams/{{$match.Red3}}/avatar" />
</div>
<div class="col-lg-2 red-teams">
{{if $match.Red1}}
<div class="row">
<div class="col-lg-7">
{{$match.Red1}}<br />{{$match.Red2}}<br />{{$match.Red3}}
{{range $team := (index $.RedOffFieldTeams $i) }}
<br />{{$team}}
{{end}}
</div>
<div class="col-lg-5">
{{if $match.PlayoffRedAlliance}}
<div class="alliance-container">
<div class="alliance-number">{{$match.PlayoffRedAlliance}}</div>
</div>
{{end}}
</div>
</div>
{{end}}
</div>
<div class="col-lg-2 blue-teams text-right">
{{if $match.Blue1}}
<div class="row">
<div class="col-lg-5">
{{if $match.PlayoffBlueAlliance}}
<div class="alliance-container">
<div></div>
<div class="alliance-number">{{$match.PlayoffBlueAlliance}}</div>
<div class="col-lg-1 avatars text-end">
<img class="avatar" src="/api/teams/{{$match.Red1}}/avatar" /><br />
<img class="avatar" src="/api/teams/{{$match.Red2}}/avatar" /><br />
<img class="avatar" src="/api/teams/{{$match.Red3}}/avatar" />
</div>
<div class="col-lg-2 red-teams">
{{if $match.Red1}}
<div class="row">
<div class="col-lg-7">
{{$match.Red1}}<br />{{$match.Red2}}<br />{{$match.Red3}}
{{range $team := (index $.RedOffFieldTeams $i) }}
<br />{{$team}}
{{end}}
</div>
<div class="col-lg-5">
{{if $match.PlayoffRedAlliance}}
<div class="alliance-container">
<div class="alliance-number">{{$match.PlayoffRedAlliance}}</div>
</div>
{{end}}
</div>
</div>
{{end}}
</div>
<div class="col-lg-2 blue-teams text-end">
{{if $match.Blue1}}
<div class="row">
<div class="col-lg-5">
{{if $match.PlayoffBlueAlliance}}
<div class="alliance-container">
<div></div>
<div class="alliance-number">{{$match.PlayoffBlueAlliance}}</div>
</div>
{{end}}
</div>
<div class="col-lg-7">
{{$match.Blue1}}<br />{{$match.Blue2}}<br />{{$match.Blue3}}
{{range $team := (index $.BlueOffFieldTeams $i) }}
<br />{{$team}}
{{end}}
</div>
</div>
{{end}}
</div>
<div class="col-lg-1 avatars">
<img class="avatar" src="/api/teams/{{$match.Blue1}}/avatar" /><br />
<img class="avatar" src="/api/teams/{{$match.Blue2}}/avatar" /><br />
<img class="avatar" src="/api/teams/{{$match.Blue3}}/avatar" />
</div>
{{end}}
</div>
<div class="col-lg-7">
{{$match.Blue1}}<br />{{$match.Blue2}}<br />{{$match.Blue3}}
{{range $team := (index $.BlueOffFieldTeams $i) }}
<br />{{$team}}
{{end}}
</div>
</div>
{{end}}
</div>
<div class="col-lg-1 avatars">
<img class="avatar" src="/api/teams/{{$match.Blue1}}/avatar" /><br />
<img class="avatar" src="/api/teams/{{$match.Blue2}}/avatar" /><br />
<img class="avatar" src="/api/teams/{{$match.Blue3}}/avatar" />
</div>
</div>
{{end}}
2 changes: 1 addition & 1 deletion templates/scoring_panel.html
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
</div>
</div>
<div id="commitMatchScore">
<button type="button" class="btn btn-info" onclick="commitMatchScore();">
<button type="button" class="btn btn-primary" onclick="commitMatchScore();">
Commit Final Match Score
</button>
</div>
Expand Down
22 changes: 1 addition & 21 deletions templates/setup_schedule.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
{{define "body"}}
<div class="row">
{{if .ErrorMessage}}
<div class="alert alert-dismissable alert-danger">
<div class="alert alert-dismissible alert-danger">
<button type="button" class="close" data-dismiss="alert">×</button>
{{.ErrorMessage}}
</div>
Expand Down Expand Up @@ -141,26 +141,6 @@
</div>
</div>
</div>
<div id="confirmPublishSchedule" class="modal" style="top: 20%;">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
<h4 class="modal-title">Confirm</h4>
</div>
<div class="modal-body">
<p>Are you sure you want to publish the schedule to The Blue Alliance? This will overwrite any
existing matches and their data.</p>
</div>
<div class="modal-footer">
<form class="form-horizontal" action="/setup/schedule/republish?matchType={{.MatchType}}" method="POST">
<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
<button type="submit" class="btn btn-primary">Publish Schedule</button>
</form>
</div>
</div>
</div>
</div>

{{end}}
{{define "script"}}
Expand Down
2 changes: 1 addition & 1 deletion templates/setup_settings.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
{{define "body"}}
<div class="row justify-content-center">
{{if .ErrorMessage}}
<div class="alert alert-danger alert-dismissible" role="alert">
<div class="alert alert-danger alert-dismissible">
<button type="button" class="btn-close" data-bs-dismiss="alert"></button>
{{.ErrorMessage}}
</div>
Expand Down
Loading

0 comments on commit cc83db8

Please sign in to comment.