style: reformat templates with djlint #568
Conversation
| {% if item.url %} | ||
| </a> | ||
| {% endif %} | ||
| <div class="navigation-content {% if not item.url %}inactive{% endif %} {% if main_counter == active %}active{% endif %} "> |
There was a problem hiding this comment.
The original may have been weird but this definitely isn't better
| {% trans "FETC-GW" %} |
There was a problem hiding this comment.
Yay! Newlines at end of file
There was a problem hiding this comment.
Poe's law is at full effect here....
| @@ -1,8 +1,6 @@ | |||
| {% extends "base/base.html" %} | |||
|
|
|||
There was a problem hiding this comment.
I think we should set max-blank-lines=3 or something reasonable. I still want to be able to add empty lines for readability
There was a problem hiding this comment.
Done; I've also added some config to require a blank line after the extend and load 'blocks'
| $(function() { | ||
| { | ||
| # We use a counter so that in | ||
| case we need more than 2 extra forms, this piece of code just works without changes # | ||
| } { | ||
| % counter extra_form_counter create 1 % | ||
| } | ||
|
|
||
| { | ||
| % | ||
| for form in formset % | ||
| } | ||
| add_title('{{ form.prefix }}-informed_consent', 'Informed consent participant'); | ||
| add_title('{{ form.prefix }}-director_consent_declaration', '{% trans ' | ||
| Toestemmingsverklaring van de schoolleider / hoofd van het departement ' %}'); | ||
|
|
||
| { | ||
| % | ||
| if not form.instance.study % | ||
| } | ||
| if ($("#extra-{% counter extra_form_counter value %}").attr('data-used') == 0) | ||
| $("#extra-{% counter extra_form_counter value %}").hide() { | ||
| % counter extra_form_counter increment 1 % | ||
| } { | ||
| % | ||
| else % | ||
| } | ||
|
|
||
| { | ||
| % | ||
| if not form.instance.study.needs_additional_external_forms % | ||
| } | ||
| hide_school_forms("{{form.prefix}}"); | ||
| { | ||
| % endif % | ||
| } { | ||
| % endif % | ||
| } { | ||
| % endfor % | ||
| } |
There was a problem hiding this comment.
I think we all saw this coming to a certain degree. Doesn't make the end result any more bearable.
There was a problem hiding this comment.
Ehhhhh yeah that's not great...
Simple fix would be to not format JS... But honestly, maaaybe we should just not do this horrible JS generation. It's kinda an anti-pattern better solved with some data attribute parsing
There was a problem hiding this comment.
Let's keep looking for other places that are borked. Once the new attachments system comes in this code will be gone anyway.
|
Superseded by the actual attempt in #600 |
So, basically a competitor for #567 using DJLint instead. Run without any special config, except excluding docs. (This means also untracked files btw...)
To run:
$ pip install djlint $ djlint . --reformatI haven't looked at it before making the PR, making a very pure format. As with #567, non-trimmed blocktrans are broken