Improve layout for programming groups

This commit is contained in:
kiragrammel
2023-09-08 15:39:29 +02:00
committed by Sebastian Serth
parent 5da871a0e9
commit a7fa9b5b04
5 changed files with 26 additions and 21 deletions

View File

@ -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)

View File

@ -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')

View File

@ -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')

View File

@ -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 <a href=%{url}>externen Datenschutzerklärung</a> zu.
external_privacy_policy: "Videochat: <a href=%{url}>Datenschutzerklärung</a>"
messages: Meldungen
feedback: Feedback
test_file: 'Test-Datei <span class="number">%{number}</span> (<span class="filename">%{filename}</span>)'

View File

@ -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 <a href=%{url}> external privacy policy</a>.
external_privacy_policy: "Video chat: <a href=%{url}>privacy policy</a>"
messages: Messages
feedback: Feedback
test_file: 'Test File <span class="number">%{number}</span> (<span class="filename">%{filename}</span>)'