diff --git a/.djlintrc b/.djlintrc index 2d4ed1f..1442d76 100644 --- a/.djlintrc +++ b/.djlintrc @@ -9,12 +9,5 @@ "blank_line_after_tag": "load,extends,include,endblock", "ignore": "H006,H016,H021,H025,H030,H031", "close_void_tags": true, - "format_css": true, - "css": { - "indent_size": 2 - }, - "format_js": true, - "js": { - "indent_size": 2 - } + "max_line_length": "80" } diff --git a/web-app/django/VIM/apps/instruments/templates/instruments/detail.html b/web-app/django/VIM/apps/instruments/templates/instruments/detail.html index 2f32226..2fe1dc7 100644 --- a/web-app/django/VIM/apps/instruments/templates/instruments/detail.html +++ b/web-app/django/VIM/apps/instruments/templates/instruments/detail.html @@ -1,155 +1,157 @@ -{% extends "base.html" %} - -{% load static %} - -{% block title %} - Instrument Detail -{% endblock title %} - -{% block css_files %} - - -{% endblock css_files %} - -{% block content %} -
-
-

- {% for instrumentname in instrument_names %} - {% if instrumentname.language.en_label == active_language.en_label %}{{ instrumentname.name|title }}{% endif %} - {% endfor %} -

-
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - -
Wikidata ID -
-
- {{ instrument.wikidata_id }} -
-
-
Hornbostel-Sachs Classification -
-
- {{ instrument.hornbostel_sachs_class }} -
-
-
MIMO Classification -
-
- {{ instrument.mimo_class }} -
-
-
Instrument Names in Different Languages - - - - - - - - - - {% for instrumentname in instrument_names %} - - - - - - {% endfor %} - -
- Language - - Name - - Source -
-
-
- {{ instrumentname.language.en_label }} - -
-
- - - -
-
- 		-
-
- {{ instrumentname.name }} - -
-
- - - -
-
- 		-
-
- {{ instrumentname.source_name }} - -
-
- - - -
-
-
-
Image -
-
- {{ instrument.default_image.url }} -
- View image in full size -
-
-
-
-
-
-
-{% endblock content %} - -{% block scripts %} - -{% endblock scripts %} +{% extends "base.html" %} + +{% load static %} + +{% block title %} + Instrument Detail +{% endblock title %} + +{% block css_files %} + + +{% endblock css_files %} + +{% block content %} +
+
+

+ {% for instrumentname in instrument_names %} + {% if instrumentname.language.en_label == active_language.en_label %} + {{ instrumentname.name|title }} + {% endif %} + {% endfor %} +

+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + +
Wikidata ID +
+
+ {{ instrument.wikidata_id }} +
+
+
Hornbostel-Sachs Classification +
+
+ {{ instrument.hornbostel_sachs_class }} +
+
+
MIMO Classification +
+
+ {{ instrument.mimo_class }} +
+
+
Instrument Names in Different Languages + + + + + + + + + + {% for instrumentname in instrument_names %} + + + + + + {% endfor %} + +
+ Language + + Name + + Source +
+
+
+ {{ instrumentname.language.en_label }} + +
+
+ + + +
+
+ 		+
+
+ {{ instrumentname.name }} + +
+
+ + + +
+
+ 		+
+
+ {{ instrumentname.source_name }} + +
+
+ + + +
+
+
+
Image +
+
+ {{ instrument.default_image.url }} +
+ View image in full size +
+
+
+
+
+
+
+{% endblock content %} + +{% block scripts %} + +{% endblock scripts %} diff --git a/web-app/django/VIM/apps/instruments/templates/instruments/includes/listView.html b/web-app/django/VIM/apps/instruments/templates/instruments/includes/listView.html index 66d3e7a..eaa4ca2 100644 --- a/web-app/django/VIM/apps/instruments/templates/instruments/includes/listView.html +++ b/web-app/django/VIM/apps/instruments/templates/instruments/includes/listView.html @@ -13,7 +13,9 @@
{% for instrumentname in instrument.instrumentname_set.all %} - {% if instrumentname.language.en_label == active_language.en_label %}{{ instrumentname.name|title }}{% endif %} + {% if instrumentname.language.en_label == active_language.en_label %} + {{ instrumentname.name|title }} + {% endif %} {% endfor %}
diff --git a/web-app/django/VIM/apps/instruments/templates/instruments/includes/masonryView.html b/web-app/django/VIM/apps/instruments/templates/instruments/includes/masonryView.html index 304d466..90f63fc 100644 --- a/web-app/django/VIM/apps/instruments/templates/instruments/includes/masonryView.html +++ b/web-app/django/VIM/apps/instruments/templates/instruments/includes/masonryView.html @@ -12,7 +12,9 @@

{% for instrumentname in instrument.instrumentname_set.all %} - {% if instrumentname.language.en_label == active_language.en_label %}{{ instrumentname.name|title }}{% endif %} + {% if instrumentname.language.en_label == active_language.en_label %} + {{ instrumentname.name|title }} + {% endif %} {% endfor %}

diff --git a/web-app/django/VIM/apps/instruments/templates/instruments/includes/stdView.html b/web-app/django/VIM/apps/instruments/templates/instruments/includes/stdView.html index 0c9c818..6a1d7ce 100644 --- a/web-app/django/VIM/apps/instruments/templates/instruments/includes/stdView.html +++ b/web-app/django/VIM/apps/instruments/templates/instruments/includes/stdView.html @@ -15,7 +15,9 @@

{% for instrumentname in instrument.instrumentname_set.all %} - {% if instrumentname.language.en_label == active_language.en_label %}{{ instrumentname.name|title }}{% endif %} + {% if instrumentname.language.en_label == active_language.en_label %} + {{ instrumentname.name|title }} + {% endif %} {% endfor %}

diff --git a/web-app/django/VIM/apps/instruments/templates/instruments/index.html b/web-app/django/VIM/apps/instruments/templates/instruments/index.html index 9cf8114..9523360 100644 --- a/web-app/django/VIM/apps/instruments/templates/instruments/index.html +++ b/web-app/django/VIM/apps/instruments/templates/instruments/index.html @@ -84,7 +84,9 @@

type="button" aria-expanded="false" data-bs-toggle="dropdown" - data-bs-title="Instrument name language">{{ active_language.autonym|title }} + data-bs-title="Instrument name language"> + {{ active_language.autonym|title }} +