+
-
+
Lint & Format HTML Templates
-
find your favorite template language! +
Once upon a time all the other programming languages had a formatter and linter. Css, javascript, python, the c suite, typescript, ruby, php, go, swift, and you know the others. The cool kids on the block.
+HTML templates were left out there on their own, in the cold, unformatted and unlinted :( The dirty corner in your repository. Something had to change.
+Welcome djLint, the free cleaning service for html templates!
find your favorite template language!
-
+
@@ -27,7 +31,7 @@ date: Last Modified
-
+
@@ -40,7 +44,7 @@ date: Last Modified
-
+
@@ -54,7 +58,7 @@ date: Last Modified
-
+
@@ -67,7 +71,7 @@ date: Last Modified
-
+
@@ -124,7 +128,7 @@ date: Last Modified
+
@@ -147,9 +151,9 @@ Add a badge to your 
Watch it run!
-
readme.rst:
:target: https://github.com/Riverside-Healthcare/djlint
{% endhighlight %}
-Looks like this:
+Looks like this:
-
diff --git a/docs/src/static/css/site.scss b/docs/src/static/css/site.scss
index 5d8e6fa..c70f05e 100644
--- a/docs/src/static/css/site.scss
+++ b/docs/src/static/css/site.scss
@@ -93,6 +93,18 @@ $fontDir: "/static/font/rasa/";
$fontDir: "/static/font/rasa/files/"
);
+$fontDir: "/static/font/crimson-pro/";
+@import "../../../node_modules/@fontsource/crimson-pro/scss/mixins";
+
+@include fontFace(
+ $fontName: 'Crimson Pro',
+ $weight: 400,
+ $display: swap,
+ $unicodeMap: latin,
+ $fontDir: "/static/font/crimson-pro/files/"
+);
+
+
html {
height: 100%;
}
@@ -284,6 +296,16 @@ pre .number {
color: $info;
}
+.story {
+ font-family: Crimson Pro,Georgia,serif;
+ font-size: 24px;
+ font-weight: 400;
+ line-height: 1.6666666667;
+ max-width: 800px;
+ margin-left: auto;
+ margin-right: auto;
+}
+
// tabs
.tab-container {
@@ -465,6 +487,37 @@ pre {
border-radius: $radius
}
+.is-framed {
+ max-width: 800px;
+ border: 8px solid $grey-lightest;
+ border-radius: 4px;
+ border-top: 24px solid $grey-lightest;
+ box-shadow: 0 .5em 1em -.125em #0a0a0a1a,0 0 0 1px #0a0a0a05;
+ position: relative;
+}
+
+.is-framed::before {
+border-radius: 10px;
+content: "";
+height: 15px;
+left: 0px;
+position: absolute;
+top: -19px;
+width: 15px;
+background: $grey-light;
+}
+
+.is-framed::after {
+border-radius: 10px;
+content: "";
+height: 15px;
+left: 20px;
+position: absolute;
+top: -19px;
+width: 15px;
+background: $grey-light;
+}
+
.hero.is-white .hero-body {
background-color: $white;
}
diff --git a/docs/src/static/img/demo.gif b/docs/src/static/img/demo.gif
index 7c0b7fb..5b25b55 100644
Binary files a/docs/src/static/img/demo.gif and b/docs/src/static/img/demo.gif differ
diff --git a/docs/src/static/img/old_demo.gif b/docs/src/static/img/old_demo.gif
new file mode 100644
index 0000000..7c0b7fb
Binary files /dev/null and b/docs/src/static/img/old_demo.gif differ
diff --git a/src/djlint/settings.py b/src/djlint/settings.py
index 132c02f..52e7251 100644
--- a/src/djlint/settings.py
+++ b/src/djlint/settings.py
@@ -459,7 +459,8 @@ class Config:
self.indent_template_tags: str = (
r""" if
| for
- | block
+ | block(?!trans|translate)
+ # | blocktrans(?:late)?[ ]+?trimmed
| spaceless
| compress
| addto
@@ -471,6 +472,7 @@ class Config:
| filter
| each
| macro
+ | raw
"""
+ self.custom_blocks
)
@@ -601,7 +603,7 @@ class Config:
r"""
if
| for
- | block
+ | block(?!trans)
| spaceless
| compress
| load
@@ -615,6 +617,7 @@ class Config:
| verbatim
| each
| macro
+ | raw
"""
+ self.custom_blocks
+ r"""
@@ -624,27 +627,37 @@ class Config:
self.break_template_tags: str = (
r"""
if
- | end
+ | endif
| for
- | block
- | endblock
+ | endfor
+ | block(?!trans)
+ | endblock(?!trans)
| else
| spaceless
+ | endspaceless
| compress
+ | endcompress
| load
| include
| assets
+ | endassets
| addto
| language
| with
- | assets
+ | endwith
| autoescape
+ | endautoescape
| filter
+ | endfilter
| elif
| resetcycle
| verbatim
+ | endverbatim
| each
| macro
+ | endmacro
+ | raw
+ | endraw
"""
+ self.custom_blocks
+ r"""
diff --git a/tests/test_django.py b/tests/test_django.py
index c275506..b2f4a10 100644
--- a/tests/test_django.py
+++ b/tests/test_django.py
@@ -7,7 +7,7 @@ run::
for a single test, run::
- pytest tests/test_django.py::test_attribute_include --cov=src/djlint \
+ pytest tests/test_django.py::test_blocktranslate --cov=src/djlint \
--cov-branch --cov-report xml:coverage.xml --cov-report term-missing
"""
@@ -278,6 +278,16 @@ def test_blocktranslate(runner: CliRunner, tmp_file: TextIO) -> None:
"""
)
+ output = reformat(
+ tmp_file,
+ runner,
+ b"""
+ {% blocktrans %}If you have not created an account yet, then please + sign up first.{% endblocktrans %} +
\n""", + ) + assert output.exit_code == 0 + def test_trans(runner: CliRunner, tmp_file: TextIO) -> None: output = reformat(