Skip to content

Commit 1b61b00

Browse files
committed
rename templates path to nhsuk, and use full paths in imports
1 parent f22c300 commit 1b61b00

File tree

102 files changed

+196
-169
lines changed

Some content is hidden

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

102 files changed

+196
-169
lines changed

CHANGELOG.md

Lines changed: 24 additions & 0 deletions

README.md

Lines changed: 14 additions & 5 deletions
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{% macro actionLink(params) %}
2+
{%- include 'nhsuk/components/action-link/template.jinja' -%}
3+
{% endmacro %}

nhsuk_frontend_jinja/templates/components/action-link/template.jinja renamed to nhsuk_frontend_jinja/nhsuk/components/action-link/template.jinja

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
{% from "macros/attributes.jinja" import nhsukAttributes %}
2-
{% from "macros/icon.jinja" import nhsukIcon %}
1+
{% from "nhsuk/macros/attributes.jinja" import nhsukAttributes %}
2+
{% from "nhsuk/macros/icon.jinja" import nhsukIcon %}
33

44
<a {%- if params.id %} id="{{ params.id }}"{% endif %} class="nhsuk-action-link
55
{%- if params.classes %} {{ params.classes }}{% endif %}" href="
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{% macro backLink(params) %}
2+
{%- include "nhsuk/components/back-link/template.jinja" -%}
3+
{% endmacro %}

nhsuk_frontend_jinja/templates/components/back-link/template.jinja renamed to nhsuk_frontend_jinja/nhsuk/components/back-link/template.jinja

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{% from "macros/attributes.jinja" import nhsukAttributes %}
1+
{% from "nhsuk/macros/attributes.jinja" import nhsukAttributes %}
22

33
{% set element = "button" if params.element == "button" else "a" %}
44

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{% macro breadcrumb(params) %}
2+
{%- include 'nhsuk/components/breadcrumb/template.jinja' -%}
3+
{% endmacro %}

nhsuk_frontend_jinja/templates/components/breadcrumb/template.jinja renamed to nhsuk_frontend_jinja/nhsuk/components/breadcrumb/template.jinja

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
{% from "components/back-link/macro.jinja" import backLink %}
2-
{% from "macros/attributes.jinja" import nhsukAttributes %}
1+
{% from "nhsuk/components/back-link/macro.jinja" import backLink %}
2+
{% from "nhsuk/macros/attributes.jinja" import nhsukAttributes %}
33

44
{#- Jinja compatability - avoid referencing params.items directly
55
as it clashes with dict.items() -#}
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{% macro button(params) %}
2+
{%- include "nhsuk/components/button/template.jinja" -%}
3+
{% endmacro %}

nhsuk_frontend_jinja/templates/components/button/template.jinja renamed to nhsuk_frontend_jinja/nhsuk/components/button/template.jinja

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{% from "macros/attributes.jinja" import nhsukAttributes %}
1+
{% from "nhsuk/macros/attributes.jinja" import nhsukAttributes %}
22

33
{# Define type of element to use, if not explicitly set #}
44

0 commit comments

Comments
 (0)