Fix styling and link to exercise

This commit is contained in:
Maximilian Grundke
2017-11-22 13:22:10 +01:00
parent 4d8cee6fcb
commit 34b2bf9eb1
2 changed files with 54 additions and 32 deletions

View File

@ -95,25 +95,43 @@ a.file-heading {
left: 0;
}
.feedback-header {
display: flex;
.username {
flex-grow: 1;
.feedback-page {
.header {
font-weight: bold;
}
.date {}
}
.feedback {
.text {
margin-bottom: 10px;
}
.difficulty {
font-weight: bold;
.value {
border: 1px solid grey;
padding: 10px;
margin-bottom: 10px;
}
.worktime {
.no-feedback {
font-weight: bold;
margin-top: 50px;
}
.feedback-header {
display: flex;
.username {
flex-grow: 1;
font-weight: bold;
}
.date {}
}
.feedback {
.text {
margin-bottom: 10px;
}
.difficulty {
font-weight: bold;
}
.worktime {
font-weight: bold;
}
}
}

View File

@ -1,20 +1,24 @@
h1 = link_to(@exercise)
= row(label: 'exercise.description', value: render_markdown(@exercise.description))
h1 = link_to(@exercise, exercise_path(@exercise))
- if @feedbacks.nil? or @feedbacks.size == 0
.no-feedback = t('user_exercise_feedback.no_feedback')
.feedback-page
.header = t('activerecord.attributes.exercise.description')
.value = render_markdown(@exercise.description)
ul.list-unstyled.panel-group
- @feedbacks.each do |feedback|
li.panel.panel-default
.panel-heading role="tab" id="heading"
div.clearfix.feedback-header
span.username = link_to(feedback.user.name, statistics_external_user_exercise_path(id: @exercise.id, external_user_id: feedback.user.id))
span.date = feedback.created_at
.panel-collapse role="tabpanel"
.panel-body.feedback
.text = feedback.feedback_text
.difficulty = "#{t('user_exercise_feedback.difficulty')} #{feedback.difficulty}" if feedback.difficulty
.worktime = "#{t('user_exercise_feedback.working_time')} #{feedback.user_estimated_worktime}" if feedback.user_estimated_worktime
.header = t('activerecord.models.user_exercise_feedback.other')
- if @feedbacks.nil? or @feedbacks.size == 0
.no-feedback = t('user_exercise_feedback.no_feedback')
= render('shared/pagination', collection: @feedbacks)
ul.list-unstyled.panel-group
- @feedbacks.each do |feedback|
li.panel.panel-default
.panel-heading role="tab" id="heading"
div.clearfix.feedback-header
span.username = link_to(feedback.user.name, statistics_external_user_exercise_path(id: @exercise.id, external_user_id: feedback.user.id))
span.date = feedback.created_at
.panel-collapse role="tabpanel"
.panel-body.feedback
.text = feedback.feedback_text
.difficulty = "#{t('user_exercise_feedback.difficulty')} #{feedback.difficulty}" if feedback.difficulty
.worktime = "#{t('user_exercise_feedback.working_time')} #{feedback.user_estimated_worktime}" if feedback.user_estimated_worktime
= render('shared/pagination', collection: @feedbacks)