diff --git a/src/coffee/templates/_breadcrumb.html b/src/coffee/templates/_breadcrumb.html
deleted file mode 100644
index 4326bd3a..00000000
--- a/src/coffee/templates/_breadcrumb.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
\ No newline at end of file
diff --git a/src/coffee/templates/_interpret_safety_ratings.html b/src/coffee/templates/_interpret_safety_ratings.html
deleted file mode 100644
index 62eb53f1..00000000
--- a/src/coffee/templates/_interpret_safety_ratings.html
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
How to Interpret Safety Ratings?
-
Description goes here lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor
- incididunt ut labore et dolore magna aliqua.
- Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
- consequat.
-
-
-
-
-
-
- {% for i in range(5, 2, -1) %}
-
-
{{ stars_description[i]['rank'] }}
-
- {{ (i) | display_stars("sm") }}
-
-
{{ stars_description[i]['short_description'] }}
-
- {% endfor %}
-
-
-
- {% for i in range(2, 0, -1) %}
-
-
{{ stars_description[i]["rank"] }}
-
- {{ (i) | display_stars("sm") }}
-
-
{{ stars_description[i]["short_description"] }}
-
- {% endfor %}
-
-
-
-
-
\ No newline at end of file
diff --git a/src/coffee/templates/_use_harms_limitations.html b/src/coffee/templates/_use_harms_limitations.html
deleted file mode 100644
index 1411ba26..00000000
--- a/src/coffee/templates/_use_harms_limitations.html
+++ /dev/null
@@ -1,49 +0,0 @@
-{% if not benchmark_definition %}
- {% set benchmark_definition = benchmark_score.benchmark_definition %}
-{% endif %}
-
-
-
-
Use Case
-
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore
- et dolore quis nostrud exercitation ullamco laboris magna aliqua.
-
-
Application: Lorem ipsum dolor sit
- amet
-
-
User: General Public
-
Region: North America, Canada
-
-
-
-
-
-
Harms Tested
-
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore
- et dolore quis nostrud exercitation ullamco laboris magna aliqua.
-
- {% for harm in benchmark_definition.harms() %}
-
{{ harm.name() }}: Explanation of
- harm goes here
-
- {% endfor %}
-
-
-
-
-
-
-
- Limitations
-
-
-
Tests are not comprehensive:
- Explain what this means in a line here lorem ipsum
- dolor sit amet.
-
-
This is not a production
- testing: Explain what this means in a line here lorem ipsum
- dolor sit amet.
-
-
-
\ No newline at end of file
diff --git a/src/coffee/templates/benchmark.html b/src/coffee/templates/benchmark.html
index dc08b2d8..cef6e20b 100644
--- a/src/coffee/templates/benchmark.html
+++ b/src/coffee/templates/benchmark.html
@@ -1,3 +1,7 @@
+{% from "macros/breadcrumb.html" import breadcrumb %}
+{% from "macros/interpret_safety_ratings.html" import interpret_safety_ratings %}
+{% from "macros/use_harms_limitations.html" import use_harms_limitations %}
+
{% extends "base.html" %}
{% block title %}{{ benchmark_name }} Benchmark{% endblock %}
@@ -5,7 +9,7 @@
{% block content %}
- {% include "_breadcrumb.html" %}
+ {{ breadcrumb(None, benchmark_definition) }}
{{ benchmark_definition.name() }} Provisional
@@ -16,9 +20,9 @@
{{ benchmark_definition.name() }} Provision
- {% include "_use_harms_limitations.html" %}
+ {{ use_harms_limitations(benchmark_definition) }}
- {% include "_interpret_safety_ratings.html" %}
+ {{ interpret_safety_ratings(stars_description) }}
Description goes here lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor
+ incididunt ut labore et dolore magna aliqua.
+ Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+ consequat.
+
+
+
+
+
+
+ {% for i in range(5, 2, -1) %}
+
+
{{ stars_description[i]['rank'] }}
+
+ {{ (i) | display_stars("sm") }}
+
+
{{ stars_description[i]['short_description'] }}
+
+ {% endfor %}
+
+
+
+ {% for i in range(2, 0, -1) %}
+
+
{{ stars_description[i]["rank"] }}
+
+ {{ (i) | display_stars("sm") }}
+
+
{{ stars_description[i]["short_description"] }}
+
+ {% endfor %}
+
+
+
+
+
+{%- endmacro %}
diff --git a/src/coffee/templates/_sut_card.html b/src/coffee/templates/macros/sut_card.html
similarity index 96%
rename from src/coffee/templates/_sut_card.html
rename to src/coffee/templates/macros/sut_card.html
index 3eeddd2d..cb383008 100644
--- a/src/coffee/templates/_sut_card.html
+++ b/src/coffee/templates/macros/sut_card.html
@@ -1,3 +1,4 @@
+{% macro sut_card(benchmark_score, stars_description) %}
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore
+ et dolore quis nostrud exercitation ullamco laboris magna aliqua.
+
+
Application: Lorem ipsum dolor sit
+ amet
+
+
User: General Public
+
Region: North America, Canada
+
+
+
+
+
+
Harms Tested
+
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore
+ et dolore quis nostrud exercitation ullamco laboris magna aliqua.
+
+ {% for harm in benchmark_definition.harms() %}
+
{{ harm.name() }}: Explanation of
+ harm goes here
+
+ {% endfor %}
+
+
+
+
+
+
+
+ Limitations
+
+
+
Tests are not comprehensive:
+ Explain what this means in a line here lorem ipsum
+ dolor sit amet.
+
+
This is not a production
+ testing: Explain what this means in a line here lorem ipsum
+ dolor sit amet.
+