Skip to content

Commit fcff880

Browse files
committed
Moved Approve/ Reject Selected buttons to bottom left, changed checkboxes UI to toggles to match course settings and Approved Extended toggles
1 parent 912cfd5 commit fcff880

1 file changed

Lines changed: 28 additions & 23 deletions

File tree

app/views/requests/instructor_index.html.erb

Lines changed: 28 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -26,24 +26,6 @@
2626
</div>
2727

2828
<% if @requests.any? %>
29-
<div class="row mb-2">
30-
<div class="col-12 text-end">
31-
<button type="button"
32-
class="btn btn-sm btn-success me-2"
33-
disabled
34-
data-requests-target="massApproveButton"
35-
data-action="click->requests#massApprove">
36-
Approve Selected
37-
</button>
38-
<button type="button"
39-
class="btn btn-sm btn-danger"
40-
disabled
41-
data-requests-target="massRejectButton"
42-
data-action="click->requests#massReject">
43-
Reject Selected
44-
</button>
45-
</div>
46-
</div>
4729
<div class="table-responsive">
4830
<table class="table table-bordered table-striped datatable"
4931
id="requests-table">
@@ -72,11 +54,16 @@
7254
<tr>
7355
<td class="text-center align-content-center">
7456
<% if request.status == 'pending' %>
75-
<input type="checkbox"
76-
data-requests-target="rowCheckbox"
77-
data-request-id="<%= request.id %>"
78-
data-action="change->requests#toggleRowSelection"
79-
aria-label="Select request <%= request.id %> for <%= request.user.try(:name) || 'N/A' %>">
57+
<div class="form-check form-switch mx-auto" style="width: 45px;">
58+
<input class="form-check-input" type="checkbox"
59+
role="switch"
60+
id="select-request-<%= request.id %>"
61+
data-requests-target="rowCheckbox"
62+
data-request-id="<%= request.id %>"
63+
data-action="change->requests#toggleRowSelection"
64+
aria-label="Select request <%= request.id %> for <%= request.user.try(:name) || 'N/A' %>">
65+
<label class="visually-hidden" for="select-request-<%= request.id %>">Select request for <%= request.user.try(:name) || 'N/A' %></label>
66+
</div>
8067
<% end %>
8168
</td>
8269
<td class="text-center align-content-center">
@@ -154,6 +141,24 @@
154141
</tbody>
155142
</table>
156143
</div>
144+
<div class="row mt-2">
145+
<div class="col-12 text-start">
146+
<button type="button"
147+
class="btn btn-sm btn-success me-2"
148+
disabled
149+
data-requests-target="massApproveButton"
150+
data-action="click->requests#massApprove">
151+
Approve Selected
152+
</button>
153+
<button type="button"
154+
class="btn btn-sm btn-danger"
155+
disabled
156+
data-requests-target="massRejectButton"
157+
data-action="click->requests#massReject">
158+
Reject Selected
159+
</button>
160+
</div>
161+
</div>
157162
<% else %>
158163
<div class="alert alert-warning">There are no current requests.</div>
159164
<% end %>

0 commit comments

Comments
 (0)