From 96f7d25a6e1694cdd668979619e7875905391a1a Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Thu, 30 Nov 2023 20:13:54 -0600 Subject: [PATCH] Style tweaks for the new tabbed layout of the instructor tools input groups. At different window widths there is now a lot of wrapping of the input groups since we have switched back to using the bootstrap grid layout. Particularly with the latest wording changes that make some of the input group texts even longer. So this adjusts the `col` sizes at narrower window widths to prevent that, and allow ample room for translations that might be longer. Make the pill buttons match the width of the scrolling record list above at all layouts, and add a small margin to give them some separation. Add a missing `row` div to contain the `instructor-tools-nav`. In bootstrap's grid layout a `col` must be a direct descendent of a `row` div. Remove the `col-2` on the submit buttons. Those are not direct descendents of a `row` div, and so should not have that class. Furthermore, the `min-width` set in math4.scss overrides that anyway. Make the margin below the scrolling record list match the margin after the pill buttons for even spacing. Fix some overly long lines. --- .../ContentGenerator/Instructor/Index.html.ep | 459 +++++++++--------- 1 file changed, 232 insertions(+), 227 deletions(-) diff --git a/templates/ContentGenerator/Instructor/Index.html.ep b/templates/ContentGenerator/Instructor/Index.html.ep index 4bef799425..8912945996 100644 --- a/templates/ContentGenerator/Instructor/Index.html.ep +++ b/templates/ContentGenerator/Instructor/Index.html.ep @@ -37,7 +37,7 @@ @$users ) =%> -
+
<%= label_for selected_sets => maketext('Sets') %>
<%= scrollingRecordList( { @@ -56,235 +56,240 @@ ) =%>
+ % +
+
+ -
- - -
-
-
- <%= submit_button maketext('Edit'), - name => 'sets_assigned_to_user', - class => 'btn btn-sm btn-secondary col-2', - data => { users_needed => 'exactly one', error_users => maketext($E_ONE_USER) } =%> - \ - <%== maketext('assignments and dates for one user') =%>\ - -
-
- <%= submit_button maketext('Edit'), - name => 'edit_users', - class => 'btn btn-sm btn-secondary col-2', - formaction => $c->systemLink(url_for 'instructor_user_list'), - data => { users_needed => 'at least one', error_users => maketext($E_MIN_ONE_USER) } =%> - \ - <%== maketext('account data for selected users') =%>\ - -
-
- <%= submit_button maketext('Edit'), - name => 'user_options', - class => 'btn btn-sm btn-secondary col-2', - data => { users_needed => 'exactly one', error_users => maketext($E_ONE_USER) } =%> - \ - <%== maketext('account settings for one user') =%>\ - -
-
- <%= submit_button maketext('View'), - name => 'user_progress', - class => 'btn btn-sm btn-secondary col-2', - data => { users_needed => 'exactly one', error_users => maketext($E_ONE_USER) } =%> - \ - <%== maketext('progress for one user') =%>\ - -
-
- <%= submit_button maketext('Email'), - name => 'email_users', - class => 'btn btn-sm btn-secondary col-2', - formaction => $c->systemLink(url_for 'instructor_mail_merge') =%> - \ - <%== maketext('selected users') =%>\ - -
-
- <%= submit_button maketext('Add'), name => 'add_users', class => 'btn btn-sm btn-secondary col-2' =%> - <%= number_field number_of_students => 1, min => 1, max => 100, - class => 'form-control form-control-sm text-center' =%> - \ - <%== maketext('new user accounts') =%>\ - -
-
-
-
- <%= submit_button maketext('Assign'), - # This name is the same as the name of the submit button in Assigner.pm and the form is - # directly submitted to that module without modification. - name => 'assign', - class => 'btn btn-sm btn-secondary col-2', - formaction => $c->systemLink(url_for 'instructor_set_assigner'), - data => { - users_needed => 'at least one', - error_users => maketext($E_MIN_ONE_USER), - sets_needed => 'at least one', - error_sets => maketext($E_MIN_ONE_SET) - } =%> - \ - <%== maketext('selected users to selected sets') =%>\ - -
-
- <%= submit_button maketext('Act'), - name => 'act_as_user', - class => 'btn btn-sm btn-secondary col-2', - data => { - users_needed => 'exactly one', - error_users => maketext($E_ONE_USER), - sets_needed => 'at most one', - error_sets => maketext($E_MAX_ONE_SET) - } =%> - \ - <%== maketext('as one user on up to one set') =%>\ - -
-
- <%= submit_button maketext('Edit'), - name => 'edit_set_for_users', - class => 'btn btn-sm btn-secondary col-2', - data => { - sets_needed => 'exactly one', - error_sets => maketext($E_ONE_SET) - } =%> - \ - <%== maketext(q{one set's details for some or all users}) =%>\ - -
-
- <%= submit_button maketext('View'), - name => 'show_answers', - class => 'btn btn-sm btn-secondary col-2' =%> - \ - <%== maketext('answer log for selected users, for selected sets') =%>\ - -
-
- <%= submit_button maketext('Generate'), - name => 'hardcopy', - class => 'btn btn-sm btn-secondary col-2', - formaction => $c->systemLink(url_for 'hardcopy') =%> - \ - <%== maketext('PDF hardcopy for selected users, for selected sets') =%>\ - -
-
-
-
- <%= submit_button maketext('Edit'), - name => 'users_assigned_to_set', - class => 'btn btn-sm btn-secondary col-2', - data => { sets_needed => 'exactly one', error_sets => maketext($E_ONE_SET) } =%> - \ - <%== maketext('assigned users for one set') =%>\ - -
-
- <%= submit_button maketext('Add'), - name => 'prob_lib', - class => 'btn btn-sm btn-secondary col-2', - data => { sets_needed => 'exactly one', error_sets => maketext($E_ONE_SET) } =%> - \ - <%== maketext('problems to one set') =%>\ - -
-
- <%= submit_button maketext('View'), - name => 'set_stats', - class => 'btn btn-sm btn-secondary col-2', - data => { sets_needed => 'exactly one', error_sets => maketext($E_ONE_SET) } =%> - \ - <%== maketext('statistics for one set') =%>\ - -
-
- <%= submit_button maketext('View'), - name => 'set_progress', - class => 'btn btn-sm btn-secondary col-2', - data => { sets_needed => 'exactly one', error_sets => maketext($E_ONE_SET) } =%> - \ - <%== maketext('progress for one set') =%>\ - +
+
+
+ <%= submit_button maketext('Edit'), + name => 'sets_assigned_to_user', + class => 'btn btn-sm btn-secondary', + data => { users_needed => 'exactly one', error_users => maketext($E_ONE_USER) } =%> + \ + <%== maketext('assignments and dates for one user') =%>\ + +
+
+ <%= submit_button maketext('Edit'), + name => 'edit_users', + class => 'btn btn-sm btn-secondary', + formaction => $c->systemLink(url_for 'instructor_user_list'), + data => { users_needed => 'at least one', error_users => maketext($E_MIN_ONE_USER) } =%> + \ + <%== maketext('account data for selected users') =%>\ + +
+
+ <%= submit_button maketext('Edit'), + name => 'user_options', + class => 'btn btn-sm btn-secondary', + data => { users_needed => 'exactly one', error_users => maketext($E_ONE_USER) } =%> + \ + <%== maketext('account settings for one user') =%>\ + +
+
+ <%= submit_button maketext('View'), + name => 'user_progress', + class => 'btn btn-sm btn-secondary', + data => { users_needed => 'exactly one', error_users => maketext($E_ONE_USER) } =%> + \ + <%== maketext('progress for one user') =%>\ + +
+
+ <%= submit_button maketext('Email'), + name => 'email_users', + class => 'btn btn-sm btn-secondary', + formaction => $c->systemLink(url_for 'instructor_mail_merge') =%> + \ + <%== maketext('selected users') =%>\ + +
+
+ <%= submit_button maketext('Add'), name => 'add_users', + class => 'btn btn-sm btn-secondary' =%> + <%= number_field number_of_students => 1, min => 1, max => 100, + class => 'form-control form-control-sm text-center' =%> + \ + <%== maketext('new user accounts') =%>\ + +
-
- <%= submit_button maketext('Score'), - name => 'score_sets', - class => 'btn btn-sm btn-secondary col-2', - formaction => $c->systemLink(url_for 'instructor_scoring'), - data => { sets_needed => 'at least one', error_sets => maketext($E_MIN_ONE_SET) } =%> - \ - <%== maketext('selected sets') =%>\ - +
+
+ <%= submit_button maketext('Assign'), + # This name is the same as the name of the submit button in Assigner.pm and the form is + # directly submitted to that module without modification. + name => 'assign', + class => 'btn btn-sm btn-secondary', + formaction => $c->systemLink(url_for 'instructor_set_assigner'), + data => { + users_needed => 'at least one', + error_users => maketext($E_MIN_ONE_USER), + sets_needed => 'at least one', + error_sets => maketext($E_MIN_ONE_SET) + } =%> + \ + <%== maketext('selected users to selected sets') =%>\ + +
+
+ <%= submit_button maketext('Act'), + name => 'act_as_user', + class => 'btn btn-sm btn-secondary', + data => { + users_needed => 'exactly one', + error_users => maketext($E_ONE_USER), + sets_needed => 'at most one', + error_sets => maketext($E_MAX_ONE_SET) + } =%> + <%== + maketext('as one user on up to one set') + =%> +
+
+ <%= submit_button maketext('Edit'), + name => 'edit_set_for_users', + class => 'btn btn-sm btn-secondary', + data => { + sets_needed => 'exactly one', + error_sets => maketext($E_ONE_SET) + } =%> + <%== + maketext(q{one set's details for some or all users}) + =%> +
+
+ <%= submit_button maketext('View'), + name => 'show_answers', + class => 'btn btn-sm btn-secondary' =%> + <%== + maketext('answer log for selected users, ' + . 'for selected sets') + =%> +
+
+ <%= submit_button maketext('Generate'), + name => 'hardcopy', + class => 'btn btn-sm btn-secondary', + formaction => $c->systemLink(url_for 'hardcopy') =%> + <%== + maketext('PDF hardcopy for selected users, ' + . 'for selected sets') + =%> +
-
- <%= submit_button maketext('Create'), - name => 'create_set', - class => 'btn btn-sm btn-secondary col-2', - data => { - set_name_needed => 'true', - error_set_name => maketext($E_SET_NAME), - error_invalid_set_name => maketext($E_BAD_NAME) - } =%> - <%= label_for new_set_name => maketext('new set:'), class => 'input-group-text' =%> - <%= text_field new_set_name => '', - id => 'new_set_name', - placeholder => maketext('New set name'), - size => 20, - class => 'form-control form-control-sm', - dir => 'ltr' =%> +
+
+ <%= submit_button maketext('Edit'), + name => 'users_assigned_to_set', + class => 'btn btn-sm btn-secondary', + data => { sets_needed => 'exactly one', error_sets => maketext($E_ONE_SET) } =%> + \ + <%== maketext('assigned users for one set') =%>\ + +
+
+ <%= submit_button maketext('Add'), + name => 'prob_lib', + class => 'btn btn-sm btn-secondary', + data => { sets_needed => 'exactly one', error_sets => maketext($E_ONE_SET) } =%> + \ + <%== maketext('problems to one set') =%>\ + +
+
+ <%= submit_button maketext('View'), + name => 'set_stats', + class => 'btn btn-sm btn-secondary', + data => { sets_needed => 'exactly one', error_sets => maketext($E_ONE_SET) } =%> + \ + <%== maketext('statistics for one set') =%>\ + +
+
+ <%= submit_button maketext('View'), + name => 'set_progress', + class => 'btn btn-sm btn-secondary', + data => { sets_needed => 'exactly one', error_sets => maketext($E_ONE_SET) } =%> + \ + <%== maketext('progress for one set') =%>\ + +
+
+ <%= submit_button maketext('Score'), + name => 'score_sets', + class => 'btn btn-sm btn-secondary', + formaction => $c->systemLink(url_for 'instructor_scoring'), + data => { sets_needed => 'at least one', error_sets => maketext($E_MIN_ONE_SET) } =%> + \ + <%== maketext('selected sets') =%>\ + +
+
+ <%= submit_button maketext('Create'), + name => 'create_set', + class => 'btn btn-sm btn-secondary', + data => { + set_name_needed => 'true', + error_set_name => maketext($E_SET_NAME), + error_invalid_set_name => maketext($E_BAD_NAME) + } =%> + <%= label_for new_set_name => maketext('new set:'), class => 'input-group-text' =%> + <%= text_field new_set_name => '', + id => 'new_set_name', + placeholder => maketext('New set name'), + size => 20, + class => 'form-control form-control-sm', + dir => 'ltr' =%> +