htwkmooc/codeocean
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upgrade font-awesome and add option reset only active file

Browse Source
This commit is contained in:
Sebastian Serth
2020-01-29 10:55:15 +01:00
parent 286f0b9d3c
commit d0eceac440
9 changed files with 787 additions and 655 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/assets/javascripts/editor/editor.js.erb
View File

@ -57,6 +57,13 @@ configureEditors: function () {
}
},
confirmResetActiveFile: function (event) {
event.preventDefault();
if (confirm($('#start-over-active-file').data('message-confirm'))) {
this.resetCode(true); // delete only active file
}
},
fileActionsAvailable: function () {
return this.isActiveFileRenderable() || this.isActiveFileRunnable() || this.isActiveFileStoppable() || this.isActiveFileTestable();
},
@ -361,6 +368,9 @@ configureEditors: function () {
$('#save').on('click', this.saveCode.bind(this));
$('#start-over').on('click', this.confirmReset.bind(this));
$('#start-over-collapsed').on('click', this.confirmReset.bind(this));
$('#start-over-active-file').on('click', this.confirmResetActiveFile.bind(this));
$('#start-over-active-file-collapsed').on('click', this.confirmResetActiveFile.bind(this));
},
initializeRequestForComments: function () {

4
app/assets/javascripts/editor/submissions.js
View File

@ -102,7 +102,7 @@ CodeOceanEditorSubmissions = {
});
},
resetCode: function() {
resetCode: function(onlyActiveFile = false) {
this.showSpinner(this);
this.ajax({
method: 'GET',
@ -114,7 +114,7 @@ CodeOceanEditorSubmissions = {
var file = _.find(response.files, function(file) {
return file.id === file_id;
});
if(file){
if(file && !onlyActiveFile || file && file.id === CodeOceanEditor.active_file.id){
editor.setValue(file.content);
}
}.bind(this));

7
app/javascript/packs/stylesheets.scss
View File

@ -10,7 +10,10 @@
@import '~bootswatch/dist/yeti/variables';
@import '~bootstrap/scss/bootstrap';
@import '~bootswatch/dist/yeti/bootswatch';
$fa-font-path: '~font-awesome/fonts';
@import '~font-awesome/scss/font-awesome';
$fa-font-path: '~@fortawesome/fontawesome-free/webfonts/';
@import '~@fortawesome/fontawesome-free/scss/fontawesome';
@import '~@fortawesome/fontawesome-free/scss/solid';
@import '~@fortawesome/fontawesome-free/scss/regular';
@import '~@fortawesome/fontawesome-free/scss/v4-shims';
$opensans-path: '~opensans-webkit/fonts/';
@import '~opensans-webkit/src/sass/open-sans';

2
app/views/exercises/_editor_file_tree.html.slim
View File

@ -9,6 +9,7 @@ div id='sidebar-collapsed' class=(@exercise.hide_file_tree ? '' : 'd-none')
= render('editor_button', classes: 'btn-block btn-primary btn enforce-top-margin', data: {:'data-message-confirm' => t('exercises.editor.confirm_start_over'), :'data-url' => reload_exercise_path(@exercise), :'data-toggle' => 'tooltip', :'data-placement' => 'right'}, icon: 'fa fa-history', id: 'start-over-collapsed', label:'', title: t('exercises.editor.start_over'))
//- if !@course_token.blank?
= render('editor_button', classes: 'btn-block btn-primary btn enforce-top-margin', data: {:'data-toggle' => 'tooltip', :'data-placement' => 'right'}, icon: 'fa fa-search', id: 'sidebar-search-collapsed', label: '', title: t('search.search_in_forum'))
= render('editor_button', classes: 'btn-block btn-primary btn enforce-top-margin', data: {:'data-message-confirm' => t('exercises.editor.confirm_start_over_active_file'), :'data-url' => reload_exercise_path(@exercise), :'data-toggle' => 'tooltip', :'data-placement' => 'right'}, icon: 'fa fa-file-excel', id: 'start-over-active-file-collapsed', label: '', title: t('exercises.editor.start_over_active_file'))
div id='sidebar-uncollapsed' class=(@exercise.hide_file_tree ? 'd-none' : '')
= render('editor_button', classes: 'btn-block btn-primary btn', icon: 'fa fa-minus-square', id: 'sidebar-collapse', label: t('exercises.editor.collapse_action_sidebar'))
@ -27,6 +28,7 @@ div id='sidebar-uncollapsed' class=(@exercise.hide_file_tree ? 'd-none' : '')
- unless @embed_options[:disable_download]
= render('editor_button', classes: 'btn-block btn-primary btn enforce-top-margin', icon: 'fa fa-download', id: 'download', label: t('exercises.editor.download'))
= render('editor_button', classes: 'btn-block btn-primary btn', data: {:'data-message-confirm' => t('exercises.editor.confirm_start_over'), :'data-url' => reload_exercise_path(@exercise)}, icon: 'fa fa-history', id: 'start-over', label: t('exercises.editor.start_over'))
= render('editor_button', classes: 'btn-block btn-primary btn', data: {:'data-message-confirm' => t('exercises.editor.confirm_start_over_active_file'), :'data-url' => reload_exercise_path(@exercise)}, icon: 'fa fa-file-excel', id: 'start-over-active-file', label: t('exercises.editor.start_over_active_file'))
//- if !@course_token.blank?
.input-group.enforce-top-margin