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

deleted search modal. reused roc modal for search modal. also added translations

Browse Source
This commit is contained in:
Thomas Hille
2017-03-08 14:34:24 +01:00
parent 325c44c1fb
commit bd0721da2e
6 changed files with 16 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/views/exercises/_editor.html.slim
View File

@ -23,5 +23,4 @@
= render('shared/modal', id: 'comment-modal', title: t('exercises.implement.comment.request'), template: 'exercises/_request_comment_dialogcontent')
= render('shared/modal', id: 'break-intervention-modal', title: 'Hinweis', template: 'interventions/_break_intervention_modal')
= render('shared/modal', id: 'search-intervention-modal', title: 'Hast du Probleme beim Lösen der Aufgabe?', template: 'interventions/_search_intervention_modal')
= render('shared/modal', id: 'break-intervention-modal', title: t('exercises.implement.break_intervention.title'), template: 'interventions/_break_intervention_modal')

3
app/views/exercises/_request_comment_dialogcontent.html.slim
View File

@ -1,4 +1,7 @@
h5#rfc_intervention_text style='display: none;' = t('exercises.implement.rfc_intervention.text')
h5 = t('exercises.implement.comment.question')
textarea.form-control#question(style='resize:none;')
p = ''
/ data-cause='requestComments' is not used here right now, we pass the button #requestComments (not askForCommentsButton) as initiator of the action.

12
app/views/interventions/_break_intervention_modal.html.slim
View File

@ -1,11 +1 @@
/h5 = t('exercises.implement.comment.question')
/textarea.form-control#question(style='resize:none;')
p = "Uns ist aufgefallen, dass du schon lange an dieser Aufgabe sitzt. Möchtest du vielleicht mal eine Pause machen um auf neue Gedanken zu kommen?"
/p = "AVG: #{@working_time_avg}"
/p = "ACCUMULATED: #{@working_time_accumulated}"
/ data-cause='requestComments' is not used here right now, we pass the button #requestComments (not askForCommentsButton) as initiator of the action.
/ But if we use this button, it will work since the correct cause is supplied
/button#askForCommentsButton.btn.btn-block.btn-primary(type='button' data-cause='requestComments' data-message-success=t('exercises.editor.request_for_comments_sent')) =t('exercises.implement.comment.request')
h5 = t('exercises.implement.break_intervention.text')

10
app/views/interventions/_search_intervention_modal.html.slim
View File

@ -1,10 +0,0 @@
p = "Benutz doch einfach die Forensuche! Du kannst auch jederzeit in der linken Spalte die Suche nutzen. Alternativ kannst du auch nach Kommentaren zu deinem Programm anfordern."
= form_for(@search, multipart: true, target: "_blank") do |f|
.input-group.enforce-top-margin
= f.hidden_field :exercise_id
.enforce-right-margin
= f.text_field(:search, class: 'form-control', id: 'search-modal', required: true, placeholder: t('search.search_in_forum'))
.input-group-btn
= button_tag(class: 'btn btn-block btn-primary', id: 'btn-search-modal', model: @search.class.model_name.human) do
i.fa.fa-search