Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix circuit select UI #22

Merged
merged 2 commits into from
Jul 23, 2024
Merged

Fix circuit select UI #22

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1297fa3
Fix tournament creation UI for users who do not administer any circuits.
D0ugins Nov 21, 2022
7b08950
Fix inconsistencies in circuit selection next buttons
D0ugins Nov 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
134 changes: 69 additions & 65 deletions web/user/tourn/circuit.mhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,84 +110,88 @@

% if (@circuits) {
<h4>Circuits you administer</h4>
% }

<div class="full nospace">
% foreach my $circuit (sort {$a->name cmp $b->name} @circuits) {
<div class="full nospace">
% foreach my $circuit (sort {$a->name cmp $b->name} @circuits) {

% next if $done_already{$circuit->id}++;

<label for="<% $circuit->id %>">
<span class="pagehalf hover odd ltborderbottom marno middle">
<span class="tenth centeralign">
<input
type = "checkbox"
name = "<% $circuit->id %>"
id = "<% $circuit->id %>"
<% $request->{"circuits"}{$circuit->id} ? "checked" : "" %>
>
</span>
<span class="fourfifths padno">
<% $circuit->name %>
</span>

<span class="tenth centeralign">
<% $circuit->state ? $circuit->state : $circuit->country %>
<label for="<% $circuit->id %>">
<span class="pagehalf hover odd ltborderbottom marno middle">
<span class="tenth centeralign">
<input
type = "checkbox"
name = "<% $circuit->id %>"
id = "<% $circuit->id %>"
<% $request->{"circuits"}{$circuit->id} ? "checked" : "" %>
>
</span>
<span class="fourfifths padno">
<% $circuit->name %>
</span>

<span class="tenth centeralign">
<% $circuit->state ? $circuit->state : $circuit->country %>
</span>
</span>
</label>
% }
</div>

<div class="libl pagefull rightalign padleft">
<span class="third centeralign">
<input
type = "submit"
value = "Next: Tournament Location"
>
</span>
</label>
</div>
% }
</div>

<div class="libl pagefull rightalign padleft">
<span class="third centeralign">
<input
type = "submit"
value = "Next: Tournament Location"
>
</span>
</div>

% if (@tourn_circuits) {
<h4>Circuits you've managed tournaments in</h4>
% }

<div class="full nospace">
% foreach my $circuit (sort {$a->name cmp $b->name} @tourn_circuits) {
% next if $done_already{$circuit->id}++;

<label for="<% $circuit->id %>">
<span class="pagehalf hover odd ltborderbottom marno middle">
<span class="tenth centeralign">
<input
type = "checkbox"
name = "<% $circuit->id %>"
id = "<% $circuit->id %>"
<% $request->{"circuits"}{$circuit->id} ? "checked" : "" %>
>
</span>
<span class="fourfifths padno">
<% $circuit->name %>
</span>

<span class="tenth centeralign">
<% $circuit->state ? $circuit->state : $circuit->country %>
<div class="full nospace">
% foreach my $circuit (sort {$a->name cmp $b->name} @tourn_circuits) {
% next if $done_already{$circuit->id}++;

<label for="<% $circuit->id %>">
<span class="pagehalf hover odd ltborderbottom marno middle">
<span class="tenth centeralign">
<input
type = "checkbox"
name = "<% $circuit->id %>"
id = "<% $circuit->id %>"
<% $request->{"circuits"}{$circuit->id} ? "checked" : "" %>
>
</span>
<span class="fourfifths padno">
<% $circuit->name %>
</span>

<span class="tenth centeralign">
<% $circuit->state ? $circuit->state : $circuit->country %>
</span>
</span>
</label>
% }
</div>

<div class="libl pagefull rightalign padleft">
<span class="third centeralign">
<input
type = "submit"
value = "Next: Tournament Location"
>
</span>
</label>
</div>
% }
</div>

<div class="liblrow rightalign">
<span class="third centeralign">
<input
type = "submit"
value = "Next: Tournament Location"
>
</span>
</div>

<h4>Other circuits</h4>

% if (@circuits || @tourn_circuits) {
<h4>Other circuits</h4>
% } else {
<h4>Circuits</h4>
% }

<div class="full nospace">
% foreach my $circuit (sort {$a->name cmp $b->name} @all_circuits) {
Expand Down Expand Up @@ -219,7 +223,7 @@
<span class="third centeralign">
<input
type = "submit"
value = "Next: Tournament Host Site"
value = "Next: Tournament Location"
>
</span>
</div>
Expand Down