diff --git a/app/views/exercises/_editor.html.slim b/app/views/exercises/_editor.html.slim index 31893ba9..8a43b613 100644 --- a/app/views/exercises/_editor.html.slim +++ b/app/views/exercises/_editor.html.slim @@ -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') \ No newline at end of file += render('shared/modal', id: 'break-intervention-modal', title: t('exercises.implement.break_intervention.title'), template: 'interventions/_break_intervention_modal') \ No newline at end of file diff --git a/app/views/exercises/_request_comment_dialogcontent.html.slim b/app/views/exercises/_request_comment_dialogcontent.html.slim index 677ccb12..0db575e5 100644 --- a/app/views/exercises/_request_comment_dialogcontent.html.slim +++ b/app/views/exercises/_request_comment_dialogcontent.html.slim @@ -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. diff --git a/app/views/interventions/_break_intervention_modal.html.slim b/app/views/interventions/_break_intervention_modal.html.slim index e9c222f3..12f0e314 100644 --- a/app/views/interventions/_break_intervention_modal.html.slim +++ b/app/views/interventions/_break_intervention_modal.html.slim @@ -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') \ No newline at end of file +h5 = t('exercises.implement.break_intervention.text') diff --git a/app/views/interventions/_search_intervention_modal.html.slim b/app/views/interventions/_search_intervention_modal.html.slim deleted file mode 100644 index 80c6fca8..00000000 --- a/app/views/interventions/_search_intervention_modal.html.slim +++ /dev/null @@ -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 - diff --git a/config/locales/de.yml b/config/locales/de.yml index 5f8a7bb8..3b5dd89a 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -275,7 +275,12 @@ de: removeAllOnLine: Meine Kommentare auf dieser Zeile löschen listing: Die neuesten Kommentaranfragen request: "Kommentaranfrage stellen" - question: "Bitte beschreiben Sie kurz ihre Problem oder nennen Sie den Programmteil, zu dem sie Feedback wünschen." + question: "Bitte beschreiben Sie kurz ihre Probleme oder nennen Sie den Programmteil, zu dem Sie Feedback wünschen." + rfc_intervention: + text: "Es scheint so als würden sie Probleme mit der Aufgabe haben. Wenn Sie möchten, können wir Ihnen helfen!" + break_intervention: + title: "Pause" + text: "Uns ist aufgefallen, dass du schon lange an dieser Aufgabe arbeitest. Möchtest du vielleicht eine Pause machen um auf neue Gedanken zu kommen?" index: clone: Duplizieren implement: Implementieren diff --git a/config/locales/en.yml b/config/locales/en.yml index ce9e2170..213624e8 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -297,6 +297,11 @@ en: listing: Listing the newest comment requests request: "Request Comments" question: "Please shortly describe your problem or the program part you would like to get feedback for." + rfc_intervention: + text: "It looks like you may struggle with this exercise. If you like we can help you out!" + break_intervention: + title: "Break" + text: "We recognized that you are already working quite a while on this exercise. We would like to encourage you to take a break and come back later." index: clone: Duplicate implement: Implement