💚 Fix djlint

okfde · Dec 18, 2023 · fcd4374 · fcd4374
1 parent 3da8bb6
commit fcd4374
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 22 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -17,8 +17,6 @@ jobs:
           cache: 'yarn'
 
       - uses: pre-commit/action@v3.0.0
-      - uses: pre-commit-ci/lite-action@v1.0.1
-
   test:
     runs-on: ubuntu-latest
     strategy:

diff --git a/fragdenstaat_de/fds_cms/templates/fds_cms/card/card_image.html b/fragdenstaat_de/fds_cms/templates/fds_cms/card/card_image.html
@@ -19,6 +19,7 @@
                 </picture>
             {% endwith %}
             {% if instance.link %}
-            </a>{% else %}
+            </a>
+        {% else %}
         </div>
     {% endif %}
diff --git a/fragdenstaat_de/templates/djangocms_picture/default/picture.html b/fragdenstaat_de/templates/djangocms_picture/default/picture.html
@@ -35,24 +35,24 @@
                     />
                     {% if not instance.external_picture and not instance.use_no_cropping %}</picture>{% endif %}
                 {% if picture_link %}</a>{% endif %}
-            {# start render figure/figcaption #}
-            {% if instance.caption_text or instance.picture.author or instance.picture.description %}
-                <figcaption class="text-end">
-                    {% if instance.caption_text or instance.picture.description %}
-                        <div class="picture-description">
-                            {% if instance.caption_text %}
-                                {{ instance.caption_text }}
-                            {% elif instance.picture.description %}
-                                {{ instance.picture.description }}{% endif %}
-                                {% if instance.picture.author %}–{% endif %}
-                                </div>
-                            {% endif %}
-                            {% if instance.picture.author %}<div class="picture-credits">{{ instance.picture.author|markdown }}</div>{% endif %}
-                        </figcaption>
-                    </figure>
-                {% endif %}
-                {# end render figure/figcaption #}
-                {% comment %}
+                {# start render figure/figcaption #}
+                {% if instance.caption_text or instance.picture.author or instance.picture.description %}
+                    <figcaption class="text-end">
+                        {% if instance.caption_text or instance.picture.description %}
+                            <div class="picture-description">
+                                {% if instance.caption_text %}
+                                    {{ instance.caption_text }}
+                                {% elif instance.picture.description %}
+                                    {{ instance.picture.description }}{% endif %}
+                                    {% if instance.picture.author %}–{% endif %}
+                                    </div>
+                                {% endif %}
+                                {% if instance.picture.author %}<div class="picture-credits">{{ instance.picture.author|markdown }}</div>{% endif %}
+                            </figcaption>
+                        </figure>
+                    {% endif %}
+                    {# end render figure/figcaption #}
+                    {% comment %}
     # https://developer.mozilla.org/en-US/docs/Web/HTML/Element/img
     # https://developer.mozilla.org/en-US/docs/Web/HTML/Element/figure
     # https://github.com/divio/django-filer/blob/master/filer/models/imagemodels.py
@@ -83,4 +83,4 @@
     {% for plugin in instance.child_plugin_instances %}
         {% render_plugin plugin %}
     {% endfor %}
-                {% endcomment %}
+                    {% endcomment %}