From dd1a5a34eaba875746d48f47056ee2748cc452ee Mon Sep 17 00:00:00 2001 From: Danny van Kooten Date: Wed, 18 Mar 2020 20:58:05 +0100 Subject: add support for multi-level inheritance (depth > 1) --- tests/data/01/base.tmpl | 9 --------- tests/data/01/child.tmpl | 5 ----- tests/data/inheritance-depth-1/base.tmpl | 9 +++++++++ tests/data/inheritance-depth-1/one.tmpl | 5 +++++ tests/data/inheritance-depth-2/base.tmpl | 9 +++++++++ tests/data/inheritance-depth-2/one.tmpl | 9 +++++++++ tests/data/inheritance-depth-2/two.tmpl | 5 +++++ 7 files changed, 37 insertions(+), 14 deletions(-) delete mode 100644 tests/data/01/base.tmpl delete mode 100644 tests/data/01/child.tmpl create mode 100644 tests/data/inheritance-depth-1/base.tmpl create mode 100644 tests/data/inheritance-depth-1/one.tmpl create mode 100644 tests/data/inheritance-depth-2/base.tmpl create mode 100644 tests/data/inheritance-depth-2/one.tmpl create mode 100644 tests/data/inheritance-depth-2/two.tmpl (limited to 'tests/data') diff --git a/tests/data/01/base.tmpl b/tests/data/01/base.tmpl deleted file mode 100644 index 241c78c..0000000 --- a/tests/data/01/base.tmpl +++ /dev/null @@ -1,9 +0,0 @@ -Header - -{%- block content %} -Content -{%- endblock %} - -{%- block footer %} -Footer -{%- endblock -%} \ No newline at end of file diff --git a/tests/data/01/child.tmpl b/tests/data/01/child.tmpl deleted file mode 100644 index 05467a6..0000000 --- a/tests/data/01/child.tmpl +++ /dev/null @@ -1,5 +0,0 @@ -{% extends "base.tmpl" %} - -{% block content %} -Child content -{% endblock %} \ No newline at end of file diff --git a/tests/data/inheritance-depth-1/base.tmpl b/tests/data/inheritance-depth-1/base.tmpl new file mode 100644 index 0000000..241c78c --- /dev/null +++ b/tests/data/inheritance-depth-1/base.tmpl @@ -0,0 +1,9 @@ +Header + +{%- block content %} +Content +{%- endblock %} + +{%- block footer %} +Footer +{%- endblock -%} \ No newline at end of file diff --git a/tests/data/inheritance-depth-1/one.tmpl b/tests/data/inheritance-depth-1/one.tmpl new file mode 100644 index 0000000..05467a6 --- /dev/null +++ b/tests/data/inheritance-depth-1/one.tmpl @@ -0,0 +1,5 @@ +{% extends "base.tmpl" %} + +{% block content %} +Child content +{% endblock %} \ No newline at end of file diff --git a/tests/data/inheritance-depth-2/base.tmpl b/tests/data/inheritance-depth-2/base.tmpl new file mode 100644 index 0000000..2f5157c --- /dev/null +++ b/tests/data/inheritance-depth-2/base.tmpl @@ -0,0 +1,9 @@ +0 + +{%- block content %} +0 +{%- endblock %} + +{%- block footer %} +0 +{%- endblock -%} \ No newline at end of file diff --git a/tests/data/inheritance-depth-2/one.tmpl b/tests/data/inheritance-depth-2/one.tmpl new file mode 100644 index 0000000..1e93d11 --- /dev/null +++ b/tests/data/inheritance-depth-2/one.tmpl @@ -0,0 +1,9 @@ +{% extends "base.tmpl" %} + +{% block content %} +1 +{% endblock %} + +{% block footer %} +1 +{% endblock %} \ No newline at end of file diff --git a/tests/data/inheritance-depth-2/two.tmpl b/tests/data/inheritance-depth-2/two.tmpl new file mode 100644 index 0000000..cbdbe34 --- /dev/null +++ b/tests/data/inheritance-depth-2/two.tmpl @@ -0,0 +1,5 @@ +{% extends "one.tmpl" %} + +{% block footer %} +2 +{% endblock %} \ No newline at end of file -- cgit v1.2.3