From a9008d2a268ec174fdcc2032f34a20a2e38650f2 Mon Sep 17 00:00:00 2001 From: Sebastian Serth Date: Sun, 25 Oct 2020 17:24:25 +0100 Subject: [PATCH] Improve numbering format for tips --- app/views/exercises/_tips_content.html.slim | 2 +- app/views/tips/_collapsed_card.html.slim | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/views/exercises/_tips_content.html.slim b/app/views/exercises/_tips_content.html.slim index 6f8a2ce4..a9ad9b66 100644 --- a/app/views/exercises/_tips_content.html.slim +++ b/app/views/exercises/_tips_content.html.slim @@ -10,4 +10,4 @@ i.fa.fa-lightbulb = t('exercises.implement.tips.heading') .card-body.text-dark.bg-white.p-2 - = render(partial: 'tips/collapsed_card', collection: @tips, as: :exercise_tip) + = render(partial: 'tips/collapsed_card', collection: @tips, as: :exercise_tip, locals: { tip_prefix: '' }) diff --git a/app/views/tips/_collapsed_card.html.slim b/app/views/tips/_collapsed_card.html.slim index c20fd17a..789a021d 100644 --- a/app/views/tips/_collapsed_card.html.slim +++ b/app/views/tips/_collapsed_card.html.slim @@ -1,4 +1,5 @@ - tip = exercise_tip.tip +- index = exercise_tip_counter + 1 .card class="#{exercise_tip.parent_exercise_tip_id? || exercise_tip.rank != 1 ? 'mt-2' : ''}" .card-header.p-2 id="tip-heading-#{exercise_tip.id}" role="tab" .card-title.mb-0 @@ -7,7 +8,7 @@ i.fa aria-hidden="true" span = t('activerecord.models.tip.one') - =< exercise_tip.rank + =< tip_prefix + index.to_s = ": #{tip.title}" if tip.title? .card.card-collapse.collapse id="tip-collapse-#{exercise_tip.id}" aria-labelledby="tip-heading-#{exercise_tip.id}" role="tabpanel" data-exercise-tip-id=exercise_tip.id .card-body.p-3 @@ -21,4 +22,6 @@ pre code.mh-100 class="language-#{tip.file_type.programming_language}" = tip.example - = render(partial: 'tips/collapsed_card', collection: exercise_tip.children, as: :exercise_tip) + = render(partial: 'tips/collapsed_card', + collection: exercise_tip.children, as: :exercise_tip, + locals: { tip_prefix: "#{index}." })