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

Added tooltips to sidebar buttons.

Browse Source
This commit is contained in:
Alexander Kastius
2016-09-01 14:35:08 +02:00
parent 9895490fa7
commit fc1266d0d1
4 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -586,6 +586,10 @@ var CodeOceanEditor = {
$('#output_sidebar').removeClass('output-col').addClass('output-col-collapsed'); $('#output_sidebar').removeClass('output-col').addClass('output-col-collapsed');
}, },
initializeSideBarTooltips: function() {
$('[data-toggle="tooltip"]').tooltip()
},
initializeEverything: function() { initializeEverything: function() {
this.initializeRegexes(); this.initializeRegexes();
this.initializeCodePilot(); this.initializeCodePilot();
@ -596,6 +600,7 @@ var CodeOceanEditor = {
this.initializeFileTree(); this.initializeFileTree();
this.initializeSideBarCollapse(); this.initializeSideBarCollapse();
this.initializeOutputBarToggle(); this.initializeOutputBarToggle();
this.initializeSideBarTooltips();
this.initializeTooltips(); this.initializeTooltips();
this.initPrompt(); this.initPrompt();
this.renderScore(); this.renderScore();

4
app/assets/stylesheets/editor.css.scss
View File

@ -146,3 +146,7 @@ button i.fa-spin {
padding-right: 15px; padding-right: 15px;
box-sizing: border-box box-sizing: border-box
} }
.enforce-top-margin {
margin-top: 5px !important;
}

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

@ -1,13 +1,13 @@
div id='sidebar-collapsed' div id='sidebar-collapsed'
= render('editor_button', classes: 'btn-block btn-primary btn-sm', icon: 'fa fa-plus-square', id: 'sidebar-collapse-collapsed', label:'') = render('editor_button', classes: 'btn-block btn-primary btn-sm', data: {:'data-toggle' => 'tooltip', :'data-placement' => 'right'}, icon: 'fa fa-plus-square', id: 'sidebar-collapse-collapsed', label:'', title:'Expand sidebar')
- if @exercise.allow_file_creation?
= render('editor_button', classes: 'btn-block btn-primary btn-sm', data: {:'data-cause' => 'file'}, icon: 'fa fa-plus', id: 'create-file-collapsed', label:'')
= render('editor_button', classes: 'btn-block btn-warning btn-sm', data: {:'data-cause' => 'file', :'data-message-confirm' => t('shared.confirm_destroy')}, label:'', icon: 'fa fa-times', id: 'destroy-file-collapsed')
= render('editor_button', classes: 'btn-block btn-primary btn-sm', icon: 'fa fa-download', id: 'download-collapsed', label:'') - if @exercise.allow_file_creation?
= render('editor_button', classes: 'btn-block btn-primary btn-sm enforce-top-margin', data: {:'data-cause' => 'file', :'data-toggle' => 'tooltip', :'data-placement' => 'right'}, icon: 'fa fa-plus', id: 'create-file-collapsed', label:'', title: t('exercises.editor.create_file'))
= render('editor_button', classes: 'btn-block btn-primary btn-sm enforce-top-margin', data: {:'data-toggle' => 'tooltip', :'data-placement' => 'right'}, icon: 'fa fa-download', id: 'download-collapsed', label:'', title: t('exercises.editor.download'))
div id='sidebar-uncollapsed' div id='sidebar-uncollapsed'
= render('editor_button', classes: 'btn-block btn-primary btn-sm', icon: 'fa fa-minus-square', id: 'sidebar-collapse', label: 'Collapse') = render('editor_button', classes: 'btn-block btn-primary btn-sm enforce-top-margin', icon: 'fa fa-minus-square', id: 'sidebar-collapse', label: 'Collapse')
hr hr

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

@ -1,5 +1,5 @@
div id='output_sidebar_collapsed' div id='output_sidebar_collapsed'
= render('editor_button', classes: 'btn-block btn-primary btn-sm', icon: 'fa fa-plus-square', id: 'toggle-sidebar-output-collapsed', label: '') = render('editor_button', classes: 'btn-block btn-primary btn-sm', data: {:'data-toggle' => 'tooltip', :'data-placement' => 'left'}, title: 'Expand sidebar', icon: 'fa fa-plus-square', id: 'toggle-sidebar-output-collapsed', label: '')
div id='output_sidebar_uncollapsed' class='hidden col-sm-12' data-message-no-output=t('exercises.implement.no_output') div id='output_sidebar_uncollapsed' class='hidden col-sm-12' data-message-no-output=t('exercises.implement.no_output')
.row .row
= render('editor_button', classes: 'btn-block btn-primary btn-sm', icon: 'fa fa-minus-square', id: 'toggle-sidebar-output', label: 'Collapse') = render('editor_button', classes: 'btn-block btn-primary btn-sm', icon: 'fa fa-minus-square', id: 'toggle-sidebar-output', label: 'Collapse')