From 18d20fdb29dc27441657d655663a18a33cb561a5 Mon Sep 17 00:00:00 2001 From: Alex Jordan Date: Sun, 3 Dec 2023 15:04:49 -0800 Subject: [PATCH] more footer position adjustments --- lib/WeBWorK/ContentGenerator.pm | 2 +- .../Instructor/Assigner.html.ep | 60 ++++++------ .../Instructor/FileManager/refresh.html.ep | 2 + .../ContentGenerator/Instructor/Index.html.ep | 2 +- .../Instructor/Scoring.html.ep | 91 ++++++++++--------- .../Instructor/Stats/index.html.ep | 2 +- templates/ContentGenerator/Options.html.ep | 2 + 7 files changed, 88 insertions(+), 73 deletions(-) diff --git a/lib/WeBWorK/ContentGenerator.pm b/lib/WeBWorK/ContentGenerator.pm index fa6e2fec75..a28627225c 100644 --- a/lib/WeBWorK/ContentGenerator.pm +++ b/lib/WeBWorK/ContentGenerator.pm @@ -122,7 +122,7 @@ async sub go ($c) { my $tx = $c->render_later->tx; - $c->stash->{footerWidthClass} = 'col-12'; + $c->stash->{footerWidthClass} = $c->can('info') ? 'col-md-8' : 'col-12'; if ($c->can('pre_header_initialize')) { my $pre_header_initialize = $c->pre_header_initialize; diff --git a/templates/ContentGenerator/Instructor/Assigner.html.ep b/templates/ContentGenerator/Instructor/Assigner.html.ep index 36ea175c0f..5538809a23 100644 --- a/templates/ContentGenerator/Instructor/Assigner.html.ep +++ b/templates/ContentGenerator/Instructor/Assigner.html.ep @@ -14,6 +14,9 @@ <%= maketext('Select one or more sets and one or more users below to assign/unassign ' . 'each selected set to/from all selected users.') =%>

+% +% $c->stash->{footerWidthClass} = 'col-xl-10 col-md-12'; +% <%= form_for current_route, method => 'post', begin =%> <%= $c->hidden_authen_fields =%> % @@ -50,32 +53,37 @@ ) =%> -
- <%= submit_button maketext('Assign selected sets to selected users'), - name => 'assign', class => 'btn btn-primary mb-2' =%> -
-
<%= maketext('Do not unassign students unless you know what you are doing.') =%>
-
<%= maketext('There is NO undo for unassigning students.') =%>
-
-
- <%= submit_button maketext('Unassign selected sets from selected users'), - name => 'unassign', class => 'btn btn-primary me-2' =%> - - -
-
- <%= maketext( - 'When you unassign a set from students, you destroy all of the data for the set for those ' - . 'students. If the set is re-assigned to these students, then they will receive new versions ' - . 'of problems in the set. Make sure this is what you want to do before unassigning sets ' - . 'from students.' - ) =%> +
+
+ <%= submit_button maketext('Assign selected sets to selected users'), + name => 'assign', class => 'btn btn-primary mb-2' =%> +
+
+ <%= maketext('Do not unassign students unless you know what you are doing.') =%> +
+
<%= maketext('There is NO undo for unassigning students.') =%>
+
+
+ <%= submit_button maketext('Unassign selected sets from selected users'), + name => 'unassign', class => 'btn btn-primary me-2' =%> + + +
+
+ <%= maketext( + 'When you unassign a set from students, you destroy all of the data for the set for those ' + . 'students. If the set is re-assigned to these students, then they will receive new ' + . 'versions of problems in the set. Make sure this is what you want to do before ' + . 'unassigning sets from students.' + ) =%> +
diff --git a/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep b/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep index 9b414d4933..a88b97afe9 100644 --- a/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep +++ b/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep @@ -6,6 +6,8 @@ % $files = []; % } % +% $c->stash->{footerWidthClass} = 'col-md-8'; +% % # Directory menu and date/size checkbox
diff --git a/templates/ContentGenerator/Instructor/Index.html.ep b/templates/ContentGenerator/Instructor/Index.html.ep index 7648fcda4f..086c0b113a 100644 --- a/templates/ContentGenerator/Instructor/Index.html.ep +++ b/templates/ContentGenerator/Instructor/Index.html.ep @@ -19,7 +19,7 @@ <%= maketext('Select user(s) and/or set(s) below and click the action button of your choice.') =%>

% -% stash->{footerWidthClass} = 'col-xl-10'; +% stash->{footerWidthClass} = 'col-xl-10 col-md-12'; % <%= form_for current_route, method => 'POST', id => 'instructor-tools-form', begin =%> <%= $c->hidden_authen_fields =%> diff --git a/templates/ContentGenerator/Instructor/Scoring.html.ep b/templates/ContentGenerator/Instructor/Scoring.html.ep index 60257a77e7..19dee45bd0 100644 --- a/templates/ContentGenerator/Instructor/Scoring.html.ep +++ b/templates/ContentGenerator/Instructor/Scoring.html.ep @@ -13,54 +13,57 @@ % } % % my $scoringDir = $ce->{courseDirs}{scoring}; +% $c->stash->{footerWidthClass} = 'col-md-10 col-lg-8'; % -
- <%= form_for current_route, name => 'scoring-form', id => 'scoring-form', method => 'POST', begin =%> - <%= $c->hidden_authen_fields =%> - <%= hidden_field returning => 1 =%> -
-
- <%= label_for selectedSet => maketext('Selected sets:'), class => 'form-label' =%> - <%= select_field selectedSet => - [ map { [ format_set_name_display($_) => $_ ] } @{ $c->{ra_set_ids} } ], - id => 'selectedSet', class => 'form-select', size => 10, multiple => undef, dir => 'ltr' =%> -
-
-
- -
-
- -
-
- +
+
+ <%= form_for current_route, name => 'scoring-form', id => 'scoring-form', method => 'POST', begin =%> + <%= $c->hidden_authen_fields =%> + <%= hidden_field returning => 1 =%> +
+
+ <%= label_for selectedSet => maketext('Selected sets:'), class => 'form-label' =%> + <%= select_field selectedSet => + [ map { [ format_set_name_display($_) => $_ ] } @{ $c->{ra_set_ids} } ], + id => 'selectedSet', class => 'form-select', size => 10, multiple => undef, dir => 'ltr' =%>
-
- +
+
+ +
+
+ +
+
+ +
+
+ +
-
-
- <%= submit_button maketext('Score selected set(s) and save to:'), name => 'score-sets', - id => 'score-sets', class => 'btn btn-primary btn-sm me-2 mb-sm-0 mb-2' =%> - <%= text_field scoringFileName => $c->{scoringFileName}, class => 'form-control form-control-sm', - size => '40', 'aria-labelledby' => 'score-sets' =%> -
- <% end =%> +
+ <%= submit_button maketext('Score selected set(s) and save to:'), name => 'score-sets', + id => 'score-sets', class => 'btn btn-primary btn-sm me-2 mb-sm-0 mb-2' =%> + <%= text_field scoringFileName => $c->{scoringFileName}, class => 'form-control form-control-sm', + size => '40', 'aria-labelledby' => 'score-sets' =%> +
+ <% end =%> +
% % my @selected = param('selectedSet'); diff --git a/templates/ContentGenerator/Instructor/Stats/index.html.ep b/templates/ContentGenerator/Instructor/Stats/index.html.ep index b995054e72..0de392fb6d 100644 --- a/templates/ContentGenerator/Instructor/Stats/index.html.ep +++ b/templates/ContentGenerator/Instructor/Stats/index.html.ep @@ -5,7 +5,7 @@ % % my $type = current_route =~ s/instructor_//r; % -% stash->{footerWidthClass} = 'col-lg-10'; +% stash->{footerWidthClass} = 'col-lg-10 col-sm-12'; %
diff --git a/templates/ContentGenerator/Options.html.ep b/templates/ContentGenerator/Options.html.ep index ea715d0c24..2e7f2730a0 100644 --- a/templates/ContentGenerator/Options.html.ep +++ b/templates/ContentGenerator/Options.html.ep @@ -11,6 +11,8 @@ % my $userID = $c->{user}->user_id; % my $eUserName = $c->{effectiveUser}->first_name . ' ' . $c->{effectiveUser}->last_name; % +% $c->stash->{footerWidthClass} = 'col-lg-8 col-md-10'; +% %= form_for current_route, method => 'POST', begin <%= $c->hidden_authen_fields =%> %