From 1f159ce0bdd340294d37b552ed6ac7f1e602681f Mon Sep 17 00:00:00 2001 From: Ralf Teusner Date: Thu, 1 Sep 2016 16:48:55 +0200 Subject: [PATCH] some cleanup, reducing size of questions sidebar --- app/assets/javascripts/editor/editor.js.erb | 5 ----- app/assets/javascripts/editor/flowr.js.erb | 4 ++-- app/assets/stylesheets/editor.css.scss | 1 - app/views/exercises/_editor.html.slim | 2 +- 4 files changed, 3 insertions(+), 9 deletions(-) diff --git a/app/assets/javascripts/editor/editor.js.erb b/app/assets/javascripts/editor/editor.js.erb index 336def3b..297ea1a9 100644 --- a/app/assets/javascripts/editor/editor.js.erb +++ b/app/assets/javascripts/editor/editor.js.erb @@ -429,12 +429,7 @@ var CodeOceanEditor = { toggleButtonStates: function () { $('#destroy-file').prop('disabled', this.active_frame.data('role') !== 'user_defined_file'); - $('#dropdown-render').toggleClass('disabled', !this.isActiveFileRenderable()); - $('#dropdown-run').toggleClass('disabled', !this.isActiveFileRunnable() || this.running); - $('#dropdown-stop').toggleClass('disabled', !this.isActiveFileStoppable()); - $('#dropdown-test').toggleClass('disabled', !this.isActiveFileTestable()); $('#dummy').toggle(!this.fileActionsAvailable()); - $('#editor-buttons .dropdown-toggle').toggle(this.fileActionsAvailable()); $('#render').toggle(this.isActiveFileRenderable()); $('#run').toggle(this.isActiveFileRunnable() && !this.running); $('#stop').toggle(this.isActiveFileStoppable()); diff --git a/app/assets/javascripts/editor/flowr.js.erb b/app/assets/javascripts/editor/flowr.js.erb index d8d19e91..931b4043 100644 --- a/app/assets/javascripts/editor/flowr.js.erb +++ b/app/assets/javascripts/editor/flowr.js.erb @@ -66,8 +66,8 @@ CodeOceanEditorFlowr = { //tODO move codepilot out of here. initializeCodePilot: function () { if ($('#questions-column').isPresent() && (typeof QaApi != 'undefined') && QaApi.isBrowserSupported()) { - $('#editor-column').addClass('col-md-8').removeClass('col-md-10'); - $('#questions-column').addClass('col-md-3'); + $('#editor-column').addClass('col-md-10').removeClass('col-md-12'); + $('#questions-column').addClass('col-md-2'); var node = document.getElementById('questions-holder'); var url = $('#questions-holder').data('url'); diff --git a/app/assets/stylesheets/editor.css.scss b/app/assets/stylesheets/editor.css.scss index 79a1797b..9f31fcbc 100644 --- a/app/assets/stylesheets/editor.css.scss +++ b/app/assets/stylesheets/editor.css.scss @@ -27,7 +27,6 @@ button i.fa-spin { #dummy { display: none; - width: 100% !important; } #editor-buttons { diff --git a/app/views/exercises/_editor.html.slim b/app/views/exercises/_editor.html.slim index 488ebe17..77418945 100644 --- a/app/views/exercises/_editor.html.slim +++ b/app/views/exercises/_editor.html.slim @@ -7,9 +7,9 @@ #autosave-label = t('exercises.editor.lastsaved') span + button style="display:none" id="autosave" #editor-buttons.btn-group // = render('editor_button', data: {:'data-message-success' => t('submissions.create.success'), :'data-placement' => 'top', :'data-tooltip' => true}, icon: 'fa fa-save', id: 'save', label: t('exercises.editor.save'), title: t('.tooltips.save')) - button style="display:none" id="autosave" // .btn-group = render('editor_button', disabled: true, icon: 'fa fa-ban', id: 'dummy', label: t('exercises.editor.dummy')) = render('editor_button', icon: 'fa fa-desktop', id: 'render', label: t('exercises.editor.render'))