Skip to content

Commit d4327a6

Browse files
authored
Merge pull request #12 from NHSDigital/use-nhsuk-frontend-jinja
Split out GOV.UK frontend jinja templates into a separate repo
2 parents f8c78d1 + f7593da commit d4327a6

File tree

162 files changed

+35
-14252
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

162 files changed

+35
-14252
lines changed

manage_breast_screening/config/jinja2_env.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from django.templatetags.static import static
22
from django.urls import reverse
3-
from jinja2 import Environment
3+
from jinja2 import ChoiceLoader, Environment, PackageLoader
44
from markupsafe import Markup, escape
55

66

@@ -68,6 +68,9 @@ def format_time_range(value):
6868

6969
def environment(**options):
7070
env = Environment(**options)
71+
if env.loader:
72+
env.loader = ChoiceLoader([PackageLoader("nhsuk_frontend_jinja"), env.loader])
73+
7174
env.globals.update(
7275
{
7376
"static": static,
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{% macro appCount(number) -%}
2+
{%- include '_components/count/template.jinja' -%}
3+
{%- endmacro %}

manage_breast_screening/templates/_components/count/macro.njk

-3
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{% macro appSecondaryNavigation(params) %}
2+
{%- include "_components/secondary-navigation/template.jinja" -%}
3+
{% endmacro %}

manage_breast_screening/templates/_components/secondary-navigation/macro.njk

-3
This file was deleted.

manage_breast_screening/templates/clinics/index.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{% extends 'layout-app.html' %}
22

3-
{%- from 'components/tag/macro.njk' import tag %}
4-
{%- from '_components/count/macro.njk' import appCount %}
5-
{%- from '_components/secondary-navigation/macro.njk' import appSecondaryNavigation %}
3+
{%- from 'components/tag/macro.jinja' import tag %}
4+
{%- from '_components/count/macro.jinja' import appCount %}
5+
{%- from '_components/secondary-navigation/macro.jinja' import appSecondaryNavigation %}
66

77

88
{% set pageHeading %}

manage_breast_screening/templates/components/action-link/README.md

-48
This file was deleted.

manage_breast_screening/templates/components/action-link/_action-link.scss

-76
This file was deleted.

manage_breast_screening/templates/components/action-link/macro.njk

-3
This file was deleted.

manage_breast_screening/templates/components/action-link/template.njk

-15
This file was deleted.

manage_breast_screening/templates/components/back-link/README.md

-79
This file was deleted.

manage_breast_screening/templates/components/back-link/_back-link.scss

-63
This file was deleted.

manage_breast_screening/templates/components/back-link/macro.njk

-3
This file was deleted.

manage_breast_screening/templates/components/back-link/template.njk

-16
This file was deleted.

0 commit comments

Comments
 (0)