diff --git a/htdocs/js/PGProblemEditor/pgproblemeditor.js b/htdocs/js/PGProblemEditor/pgproblemeditor.js
index 1d600746d0..55645e1513 100644
--- a/htdocs/js/PGProblemEditor/pgproblemeditor.js
+++ b/htdocs/js/PGProblemEditor/pgproblemeditor.js
@@ -1,5 +1,43 @@
(() => {
+ const renderURL = `${webworkConfig?.webwork_url ?? '/webwork2'}/render_rpc`;
+
+ for (const pgmlLabButton of document.querySelectorAll('.pgml-lab')) {
+ pgmlLabButton.addEventListener('click', (e) => {
+ e.preventDefault();
+ const form = document.createElement('form');
+ form.style.display = 'none';
+ form.target = 'PGML';
+ form.action = renderURL;
+ form.method = 'post';
+
+ const inputs = [
+ ['courseID', document.getElementsByName('courseID')[0]?.value],
+ ['displayMode', document.getElementById('action_view_displayMode_id')?.value ?? 'MathJax'],
+ ['fileName', 'PGMLLab/PGML-lab.pg'],
+ ['uriEncodedProblemSource', pgmlLabButton.dataset.source]
+ ];
+
+ const user = document.getElementsByName('user')[0];
+ if (user) inputs.push(['user', user.value]);
+ const sessionKey = document.getElementsByName('key')[0];
+ if (sessionKey) inputs.push(['key', sessionKey.value]);
+
+ for (const [name, value] of inputs) {
+ const input = document.createElement('input');
+ input.name = name;
+ input.value = value;
+ input.type = 'hidden';
+ form.append(input);
+ }
+
+ document.body.append(form);
+ form.submit();
+ form.remove();
+ });
+ }
+
const fileChooserForm = document.forms['pg-editor-file-chooser'];
+
if (fileChooserForm) {
const newProblemRadio = document.getElementById('new_problem');
@@ -342,7 +380,6 @@
}
});
- const renderURL = `${webworkConfig?.webwork_url ?? '/webwork2'}/render_rpc`;
const fileType = document.getElementsByName('file_type')[0]?.value;
// This is either the div containing the CodeMirror editor or the problemContents textarea in the case that
@@ -650,37 +687,4 @@
rendering = false;
}
};
-
- const pgmlLabButton = document.getElementById('pgml-lab');
- pgmlLabButton?.addEventListener('click', () => {
- const form = document.createElement('form');
- form.style.display = 'none';
- form.target = 'PGML';
- form.action = renderURL;
- form.method = 'post';
-
- const inputs = [
- ['courseID', document.getElementsByName('courseID')[0]?.value],
- ['displayMode', document.getElementById('action_view_displayMode_id')?.value ?? 'MathJax'],
- ['fileName', 'PGMLLab/PGML-lab.pg'],
- ['uriEncodedProblemSource', pgmlLabButton.dataset.source]
- ];
-
- const user = document.getElementsByName('user')[0];
- if (user) inputs.push(['user', user.value]);
- const sessionKey = document.getElementsByName('key')[0];
- if (sessionKey) inputs.push(['key', sessionKey.value]);
-
- for (const [name, value] of inputs) {
- const input = document.createElement('input');
- input.name = name;
- input.value = value;
- input.type = 'hidden';
- form.append(input);
- }
-
- document.body.append(form);
- form.submit();
- form.remove();
- });
})();
diff --git a/lib/WeBWorK/ConfigValues.pm b/lib/WeBWorK/ConfigValues.pm
index 209cde6df8..175cf8c14c 100644
--- a/lib/WeBWorK/ConfigValues.pm
+++ b/lib/WeBWorK/ConfigValues.pm
@@ -545,8 +545,8 @@ sub getConfigValues ($ce) {
var => 'permissionLevels{report_bugs}',
doc => x('Can report bugs'),
doc2 => x(
- 'Users with at least this permission level get a link in the left panel for reporting bugs to the '
- . 'bug tracking system at bugs.webwork.maa.org.'
+ 'Users with at least this permission level get a link in the left panel for reporting issues at '
+ . 'github.com/openwebwork/webwork2.'
),
type => 'permission'
},
diff --git a/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep b/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep
index e666e53937..b813220b8a 100644
--- a/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep
+++ b/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep
@@ -103,20 +103,19 @@
<%= link_to maketext('Sample Problems') => url_for('sample_problem_index'),
target => 'techniques_window',
- title => maketext('POD for macros and sample problem code and snippets'),
- class => 'reference-link btn btn-sm btn-info',
+ title => maketext('Sample problem code with documentation.'),
+ class => 'btn btn-sm btn-info',
data => { bs_toggle => 'tooltip', bs_placement => 'top' } =%>
- % # http://webwork.maa.org/wiki/Category:MathObjects
<%= link_to maketext('Math Objects') => $ce->{webworkURLs}{MathObjectsHelpURL},
target => 'math_objects',
title => maketext('Wiki summary page for MathObjects'),
- class => 'reference-link btn btn-sm btn-info',
+ class => 'btn btn-sm btn-info',
data => { bs_toggle => 'tooltip', bs_placement => 'top' } =%>
% # PG POD served locally
<%= link_to maketext('POD') => url_for('pod_index'),
target => 'pod_docs',
title => maketext('Documentation from source code for PG modules and macro files.'),
- class => 'reference-link btn btn-sm btn-info',
+ class => 'btn btn-sm btn-info',
data => { bs_toggle => 'tooltip', bs_placement => 'top' } =%>
% # PGML lab problem rendered as an unattached problem in a new window.
% my $pgml_lab_source = readFile("$ce->{webworkDirs}{assets}/pg/PGMLLab/PGML-lab.pg");
@@ -125,15 +124,13 @@
'PG markdown syntax used to format WeBWorK questions. '
. 'This interactive lab can help you to learn the techniques.'
),
- id => 'pgml-lab',
- class => 'reference-link btn btn-sm btn-info',
- data => { source => url_escape($pgml_lab_source), bs_toggle => 'tooltip', bs_placement => 'top' },
+ class => 'pgml-lab btn btn-sm btn-info',
+ data => { source => url_escape($pgml_lab_source), bs_toggle => 'tooltip', bs_placement => 'top' },
'PGML' =%>
- % # http://webwork.maa.org/wiki/Category:Authors
<%= link_to maketext('Author Info') => $ce->{webworkURLs}{AuthorHelpURL},
target => 'author_info',
title => maketext('Top level of author information on the wiki.'),
- class => 'reference-link btn btn-sm btn-info',
+ class => 'btn btn-sm btn-info',
data => { bs_toggle => 'tooltip', bs_placement => 'top' } =%>
% # Only show the report bugs in problem button if editing an OPL or Contrib problem.
% if ($ce->{webworkURLs}{OPLBugReporter}
@@ -152,7 +149,7 @@
. 'The very first time you do this you will need to register with an email address so that '
. 'information on the bug fix can be reported back to you.'
),
- class => 'reference-link btn btn-sm btn-info',
+ class => 'btn btn-sm btn-info',
data => { bs_toggle => 'tooltip', bs_placement => 'top' } =%>
% }
diff --git a/templates/ContentGenerator/Instructor/PGProblemEditor/file_chooser.html.ep b/templates/ContentGenerator/Instructor/PGProblemEditor/file_chooser.html.ep
index 10e361a65f..1ba942eb24 100644
--- a/templates/ContentGenerator/Instructor/PGProblemEditor/file_chooser.html.ep
+++ b/templates/ContentGenerator/Instructor/PGProblemEditor/file_chooser.html.ep
@@ -2,6 +2,7 @@
%
<%= form_for current_route, method => 'POST', name => 'pg-editor-file-chooser',
class => 'needs-validation', novalidate => undef, begin =%>
+ <%= hidden_field courseID => $c->{courseID} =%>