From a7fa9b5b0499594a1949423c146fdf92642811f8 Mon Sep 17 00:00:00 2001 From: kiragrammel Date: Fri, 8 Sep 2023 15:39:29 +0200 Subject: [PATCH] Improve layout for programming groups --- app/views/exercises/implement.html.slim | 34 ++++++++++++-------- app/views/programming_groups/_form.html.slim | 4 ++- app/views/programming_groups/new.html.slim | 5 +-- config/locales/de.yml | 2 +- config/locales/en.yml | 2 +- 5 files changed, 26 insertions(+), 21 deletions(-) diff --git a/app/views/exercises/implement.html.slim b/app/views/exercises/implement.html.slim index 22c86743..2e041463 100644 --- a/app/views/exercises/implement.html.slim +++ b/app/views/exercises/implement.html.slim @@ -6,25 +6,31 @@ #editor-column - unless @embed_options[:hide_exercise_description] .exercise.clearfix - div.col-3.float-end - span.badge.rounded-pill.bg-primary.float-end.mt-2.score - - if current_contributor.programming_group? - button.btn.btn-sm.btn-primary.me-3.mt-1#start_chat data= {url: "https://jitsi.fem.tu-ilmenau.de/openHPI_ProgrammingGroup#{current_contributor.id}"} - i.fa-solid.fa-video + div.col-9div.d-lg-flex.flex-row.justify-content-between.align-items-baseline + div.col-lg-7 + h1 id="exercise-headline" + i id="description-symbol" class=(@embed_options[:collapse_exercise_description] ? 'fa-solid fa-chevron-right' : 'fa-solid fa-chevron-down') + = @exercise.title - span = t('exercises.editor.start_video') + div.col-lg-5.float-lg-end.ms-md-3.mb-md-3.d-flex.justify-content-end.pe-lg-3 + - if current_contributor.programming_group? + span.me-3.mt-1 + button.btn.btn-sm.btn-primary.text-nowrap.w-100#start_chat data= { url: "https://jitsi.fem.tu-ilmenau.de/openHPI_ProgrammingGroup#{current_contributor.id}" } + i.fa-solid.fa-video + = t('exercises.editor.start_video') - div.small.text-body-tertiary.mt-1 - == t('exercises.implement.external_privacy_policy', url:'https://www.tu-ilmenau.de/datenschutz') + div.small.text-body-tertiary.text-nowrap.mt-1 + == t('exercises.implement.external_privacy_policy', url: 'https://www.tu-ilmenau.de/datenschutz') - button.btn.btn-sm.btn-secondary.me-3.mt-1 data-bs-toggle= 'modal' data-bs-target= '#modal-info-pair-programming' - i.fa-solid.fa-circle-info - = t('programming_groups.new.pair_programming_info') + span.me-3.mt-1 + button.btn.btn-sm.btn-secondary.text-nowrap#info data-bs-toggle= 'modal' data-bs-target= '#modal-info-pair-programming' + i.fa-solid.fa-circle-info + = t('programming_groups.new.pair_programming_info') + span.badge.rounded-pill.bg-primary.float-end.mt-2.mb-5.score - h1 id="exercise-headline" - i id="description-symbol" class=(@embed_options[:collapse_exercise_description] ? 'fa-solid fa-chevron-right' : 'fa-solid fa-chevron-down') - = @exercise.title + - if !current_contributor.programming_group? + span.badge.rounded-pill.bg-primary.float-end.mt-2.mb-5.score #description-card.lead class=(@embed_options[:collapse_exercise_description] ? 'description-card-collapsed' : 'description-card') = render_markdown(@exercise.description) diff --git a/app/views/programming_groups/_form.html.slim b/app/views/programming_groups/_form.html.slim index cc9f2f64..a116521c 100644 --- a/app/views/programming_groups/_form.html.slim +++ b/app/views/programming_groups/_form.html.slim @@ -4,4 +4,6 @@ = f.label(:programming_partner_id, class: 'form-label') = f.text_field(:programming_partner_ids, class: 'form-control', required: true, value: (@programming_group.programming_partner_ids - [current_user.id_with_type]).join(', ')) /.help-block.form-text = t('.hints.programming_partner_ids') - .actions.mb-0 = render('shared/submit_button', f: f, object: @programming_group) + .actions.mb-0 + = render('shared/submit_button', f: f, object: @programming_group) + a.btn.btn-secondary.float-end href=new_exercise_programming_group_path(@exercise) == t('programming_groups.new.check_invitation') diff --git a/app/views/programming_groups/new.html.slim b/app/views/programming_groups/new.html.slim index 3704d5be..f7a0df59 100644 --- a/app/views/programming_groups/new.html.slim +++ b/app/views/programming_groups/new.html.slim @@ -15,10 +15,7 @@ h1 = t('programming_groups.new.create_programming_pair') = render('form') div.mt-4 - a.btn.btn-success href=new_exercise_programming_group_path(@exercise) == t('programming_groups.new.check_invitation') - - p.mt-4 - == t('programming_groups.new.work_alone', path: implement_exercise_path(@exercise)) + == t('programming_groups.new.work_alone', path: implement_exercise_path(@exercise)) .col-md-6 h5 = t('programming_groups.new.find_partner_title') diff --git a/config/locales/de.yml b/config/locales/de.yml index a00d98a0..0af899cd 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -474,7 +474,7 @@ de: default_linter_feedback: Sehr gut. Der Linter hat nichts mehr zu beanstanden. error_messages: Fehlermeldungen existing_programming_group: Sie arbeiten gerade an der Übung mit dem Titel '%{exercise}' als Teil einer Programmiergruppe. Bitte schließen Sie Ihre Arbeit dort ab, indem Sie Ihren Code bewerten und abgeben, bevor Sie mit der Bearbeitung dieser Übung beginnen. - external_privacy_policy: Durch Nutzung des Videochats stimmen Sie der externen Datenschutzerklärung zu. + external_privacy_policy: "Videochat: Datenschutzerklärung" messages: Meldungen feedback: Feedback test_file: 'Test-Datei %{number} (%{filename})' diff --git a/config/locales/en.yml b/config/locales/en.yml index ce384137..50ee74a8 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -474,7 +474,7 @@ en: default_linter_feedback: Well done. The linter is completly satisfied. error_messages: Error Messages existing_programming_group: You are currently working on the exercise entitled '%{exercise}' as part of a programming group. Please finish your work there by scoring and submitting your code before you start implementing this exercise. - external_privacy_policy: By using the video chat, you agree to the external privacy policy. + external_privacy_policy: "Video chat: privacy policy" messages: Messages feedback: Feedback test_file: 'Test File %{number} (%{filename})'