diff --git a/app/assets/javascripts/editor/editor.js.erb b/app/assets/javascripts/editor/editor.js.erb index 0c37140e..44c9c989 100644 --- a/app/assets/javascripts/editor/editor.js.erb +++ b/app/assets/javascripts/editor/editor.js.erb @@ -631,8 +631,13 @@ configureEditors: function () { }, initializeSearchButton: function(){ - $('.btn-search').button().click(function(){ - var search = $('#search_search').val(); + $('#btn-search-col').button().click(function(){ + var search = $('#search-col').val(); + window.open(`https://open.hpi.de/courses/javaeinstieg2017/pinboard?query=${search}`, '_blank'); + }) + + $('#btn-search-modal').button().click(function(){ + var search = $('#search-modal').val(); window.open(`https://open.hpi.de/courses/javaeinstieg2017/pinboard?query=${search}`, '_blank'); }) }, diff --git a/app/views/exercises/_editor_file_tree.html.slim b/app/views/exercises/_editor_file_tree.html.slim index 16cc705b..c8450687 100644 --- a/app/views/exercises/_editor_file_tree.html.slim +++ b/app/views/exercises/_editor_file_tree.html.slim @@ -23,6 +23,15 @@ div id='sidebar-uncollapsed' class=(@exercise.hide_file_tree ? 'hidden' : '') = render('editor_button', classes: 'btn-block btn-primary btn-sm enforce-top-margin', icon: 'fa fa-download', id: 'download', label: t('exercises.editor.download')) = render('editor_button', classes: 'btn-block btn-primary btn-sm', 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')) + div.enforce-top-margin + = form_for(@search, multipart: true, target: "_blank") do |f| + .form-group + = f.hidden_field :exercise_id + = f.text_field(:search, class: 'form-control', id: "search-col", required: true, placeholder: "Probleme? Suche hier im Forum") + .actions + = button_tag(class: 'btn btn-block btn-primary btn-sm', id: 'btn-search-col', model: @search.class.model_name.human) do + i.fa.fa-search + = 'Suche im Forum' - if @exercise.allow_file_creation? = render('shared/modal', id: 'modal-file', template: 'code_ocean/files/_form', title: t('exercises.editor.create_file')) \ No newline at end of file diff --git a/app/views/interventions/_search_intervention_modal.html.slim b/app/views/interventions/_search_intervention_modal.html.slim index 06f69914..c27d5c7a 100644 --- a/app/views/interventions/_search_intervention_modal.html.slim +++ b/app/views/interventions/_search_intervention_modal.html.slim @@ -4,11 +4,13 @@ p = "Hast du Probleme beim Lösen der Aufgabe? Benutz doch einfach die Forensuche:" = form_for(@search, multipart: true, target: "_blank") do |f| .form-group - = f.text_field(:search, class: 'form-control', required: true) + = f.text_field(:search, class: 'form-control', id: 'search-modal', required: true) = f.hidden_field :exercise_id .actions - = f.submit(class: 'btn btn-default btn-search', value: 'Suche im Forum', model: @search.class.model_name.human) + = button_tag(class: 'btn btn-block btn-primary btn-sm', id: 'btn-search-modal', model: @search.class.model_name.human) do + i.fa.fa-search + = 'Suche im Forum' /p = "AVG: #{@working_time_avg}" /p = "ACCUMULATED: #{@working_time_accumulated}"