Merge branch 'master' into statistics
This commit is contained in:
@ -100,12 +100,12 @@ $(function() {
|
||||
}
|
||||
};
|
||||
|
||||
var confirmSubmission = function(event) {
|
||||
event.preventDefault();
|
||||
if (confirm($(this).data('message-confirm'))) {
|
||||
submitCode();
|
||||
}
|
||||
};
|
||||
//var confirmSubmission = function(event) {
|
||||
// event.preventDefault();
|
||||
// if (confirm($(this).data('message-confirm'))) {
|
||||
// submitCode();
|
||||
// }
|
||||
//};
|
||||
|
||||
var createSubmission = function(initiator, filter, callback) {
|
||||
showSpinner(initiator);
|
||||
@ -637,7 +637,8 @@ $(function() {
|
||||
|
||||
var initializeWorkflowButtons = function() {
|
||||
$('#start').on('click', showWorkspaceTab);
|
||||
$('#submit').on('click', confirmSubmission);
|
||||
//$('#submit').on('click', confirmSubmission);
|
||||
$('#submit').on('click', submitCode);
|
||||
};
|
||||
|
||||
var initializeWorkspaceButtons = function() {
|
||||
|
@ -33,6 +33,7 @@ function Turtle(pipe, canvas) {
|
||||
'x': xpos - dx,
|
||||
'y': ypos - dy
|
||||
}));
|
||||
pipe.send('\n');
|
||||
});
|
||||
}
|
||||
|
||||
|
@ -1,9 +1,6 @@
|
||||
- unless local_assigns[:modal]
|
||||
h1 = t('shared.help.headline')
|
||||
|
||||
h2 = t('shared.help.general_help')
|
||||
== Forgery(:lorem_ipsum).paragraphs(10, html: true)
|
||||
|
||||
- if local_assigns.has_key?(:execution_environment)
|
||||
h2 = t('shared.help.execution_environment_specific_help', execution_environment: execution_environment)
|
||||
= render_markdown(execution_environment.help)
|
||||
|
@ -76,8 +76,7 @@
|
||||
|
||||
br
|
||||
- if session[:lti_parameters].try(:has_key?, 'lis_outcome_service_url')
|
||||
p.text-center = render('editor_button', classes: 'btn-lg btn-success', data: {:'data-message-confirm' => t('exercises.editor.confirm_submit'), :'data-url' => submit_exercise_path(@exercise)}, icon: 'fa fa-send', id: 'submit', label: t('exercises.editor.submit'))
|
||||
|
||||
p.text-center = render('editor_button', classes: 'btn-lg btn-success', data: {:'data-url' => submit_exercise_path(@exercise)}, icon: 'fa fa-send', id: 'submit', label: t('exercises.editor.submit'))
|
||||
- if qa_url
|
||||
#questions-column
|
||||
#questions-holder data-url="#{qa_url}/qa/index/#{@exercise.id}/#{@user_id}"
|
||||
|
Reference in New Issue
Block a user