diff --git a/django/cantusdb_project/articles/templates/article_detail.html b/django/cantusdb_project/articles/templates/article_detail.html index 6bf4813b7..27056af71 100644 --- a/django/cantusdb_project/articles/templates/article_detail.html +++ b/django/cantusdb_project/articles/templates/article_detail.html @@ -1,15 +1,14 @@ {% extends "base_page_with_side_cards.html" %} -{% load helper_tags %} {# for recent_articles #} +{% load helper_tags %} +{# for recent_articles #} {% block title %} -{{ article.title }} | Cantus Database + {{ article.title }} | Cantus Database {% endblock %} - {% block uppersidebar %} -
+
{% include "global_search_bar.html" %}
{% endblock %} - {% block maincontent %}

{{ article.title }} @@ -36,4 +35,4 @@

{% recent_articles %}

-{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/django/cantusdb_project/articles/templates/article_list.html b/django/cantusdb_project/articles/templates/article_list.html index 993286b2a..e6aee9082 100644 --- a/django/cantusdb_project/articles/templates/article_list.html +++ b/django/cantusdb_project/articles/templates/article_list.html @@ -1,29 +1,32 @@ {% extends "base_page_with_side_cards.html" %} -{% load helper_tags %} {# for recent_articles #}\ +{% load helper_tags %} +{# for recent_articles #}\ {% block title %} -What's New | Cantus Database + What's New | Cantus Database {% endblock %} {% block uppersidebar %} -
- {% include "global_search_bar.html" %} -
+
+ {% include "global_search_bar.html" %} +
{% endblock %} {% block maincontent %} -

What's New

+

+ What's New +

{% for article in articles %} -
-
- {{ article.date_created|date:"D, m/d/Y - H:i" }} -

- {{ article.title }} -

-
- - {{ article.body.html|safe|truncatechars_html:3000 }} - +
+
+ {{ article.date_created|date:"D, m/d/Y - H:i" }} +

+ {{ article.title }} +

+
+ + {{ article.body.html|safe|truncatechars_html:3000 }} + +
-
{% endfor %} {% include "pagination.html" %} {% endblock %} @@ -36,4 +39,4 @@

{% recent_articles %}

-{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/django/cantusdb_project/main_app/forms.py b/django/cantusdb_project/main_app/forms.py index 253ab3d02..d6dd0231a 100644 --- a/django/cantusdb_project/main_app/forms.py +++ b/django/cantusdb_project/main_app/forms.py @@ -295,6 +295,9 @@ class Meta: widgets = { # "title": TextInputWidget(), # "siglum": TextInputWidget(), + "holding_institution": autocomplete.ModelSelect2( + url="holding-autocomplete" + ), "shelfmark": TextInputWidget(), "provenance": autocomplete.ModelSelect2(url="provenance-autocomplete"), "name": TextInputWidget(), @@ -334,12 +337,6 @@ class Meta: "segment_m2m": CheckboxNameModelMultipleChoiceField, } - holding_institution = forms.ModelChoiceField( - queryset=Institution.objects.all(), - widget=autocomplete.ModelSelect2(url="holding-autocomplete"), - required=False, - ) - complete_inventory = StyledChoiceField( choices=COMPLETE_INVENTORY_FORM_CHOICES, required=False ) @@ -526,6 +523,9 @@ class Meta: "source_completeness", ] widgets = { + "holding_institution": autocomplete.ModelSelect2( + url="holding-autocomplete" + ), "shelfmark": TextInputWidget(), "segment_m2m": CheckboxSelectMultiple(), "name": TextInputWidget(), @@ -567,12 +567,6 @@ class Meta: "segment_m2m": CheckboxNameModelMultipleChoiceField, } - holding_institution = forms.ModelChoiceField( - queryset=Institution.objects.all(), - widget=autocomplete.ModelSelect2(url="holding-autocomplete"), - required=False, - ) - complete_inventory = StyledChoiceField( choices=COMPLETE_INVENTORY_FORM_CHOICES, required=False ) diff --git a/django/cantusdb_project/main_app/templates/400.html b/django/cantusdb_project/main_app/templates/400.html index 2d12bcd82..e4eff000e 100644 --- a/django/cantusdb_project/main_app/templates/400.html +++ b/django/cantusdb_project/main_app/templates/400.html @@ -1,39 +1,15 @@ +{% extends 'base.html' %} {% load static %} - - - - - - - - 400 Bad Request | Cantus Database - - - - - - -
- {% block content %} -
+{% block title %}400 Bad Request | Cantus Database{% endblock %} +{% block content %} +

400

Bad Request
-
+

Your request couldn't be understood by the server.

- {% endblock %} -
- - - \ No newline at end of file +{% endblock %} diff --git a/django/cantusdb_project/main_app/templates/403.html b/django/cantusdb_project/main_app/templates/403.html index 2a4426cca..02f3f3edf 100644 --- a/django/cantusdb_project/main_app/templates/403.html +++ b/django/cantusdb_project/main_app/templates/403.html @@ -1,22 +1,23 @@ {% extends "base.html" %} -{% block title %} - 403 Access Denied | Cantus Database -{% endblock %} - +{% block title %}403 Access Denied | Cantus Database{% endblock %} {% block content %} -
-
-
-

403

-
Access denied
-
-
-
You are not authorized to access this page.
- {% if not user.is_authenticated %} -
This could be because you are not currently logged in. If you are a contributor and believe you should be able to see this page, try logging in.
- {% endif %} -
+
+
+
+

403

+
Access denied
+
+
+
+ You are not authorized to access this page. +
+ {% if not user.is_authenticated %} +
+ This could be because you are not currently logged in. If you are a contributor and believe you should be able to see this page, try logging in. +
+ {% endif %} +
+
-
-{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/django/cantusdb_project/main_app/templates/404.html b/django/cantusdb_project/main_app/templates/404.html index 5f2ec4e51..d98485f39 100644 --- a/django/cantusdb_project/main_app/templates/404.html +++ b/django/cantusdb_project/main_app/templates/404.html @@ -1,19 +1,14 @@ {% extends "base.html" %} -{% block title %} - 404 Not Found | Cantus Database -{% endblock %} - +{% block title %}404 Not Found | Cantus Database{% endblock %} {% block content %} -
-
-
-

404

-
Page not found
-
-

- We couldn't find a page at this address. -

+
+
+
+

404

+
Page not found
+
+

We couldn't find a page at this address.

+
-
-{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/django/cantusdb_project/main_app/templates/browse_chants.html b/django/cantusdb_project/main_app/templates/browse_chants.html index 6de54bbab..0d930b395 100644 --- a/django/cantusdb_project/main_app/templates/browse_chants.html +++ b/django/cantusdb_project/main_app/templates/browse_chants.html @@ -1,39 +1,34 @@ {% extends "base_page_with_side_cards.html" %} -{% block title %} - Browse Chants | Cantus Database -{% endblock %} - -{% block scripts %} - -{% endblock %} - +{% block title %}Browse Chants | Cantus Database{% endblock %} +{% block scripts %}{% endblock %} {% block uppersidebar %} -
- {% include "global_search_bar.html" %} -
+
{% include "global_search_bar.html" %}
{% endblock %} - {% block maincontent %}

Browse Chants

- Displaying {{ page_obj.start_index }}-{{ page_obj.end_index }} of {{ page_obj.paginator.count }} chants - + Displaying {{ page_obj.start_index }}-{{ page_obj.end_index }} of {{ page_obj.paginator.count }} chants.
-
-
- - {% comment %} {% endcomment %} {% for source_obj in sources %} {% endfor %}
-
- -
-
- - {% for feast in feasts %} @@ -41,16 +36,24 @@

Browse Chants

- -
-
- - +
+
+ +
- -
- - {% for genre in genres %} @@ -59,21 +62,28 @@

Browse Chants

{% if user_can_proofread_source %} -
- {% for field in proofread_filter_form %} -
- - {% for radio in field %} - - {% endfor %} -
- {% endfor %} +
+
+ + Proofread Status + + {% for field in proofread_filter_form %} +
+ {{ field.label }} +
+ {% for radio in field %} + + {{ radio.tag }} + {% endfor %} +
+
+ {% endfor %} +
{% endif %} - {% with exists_on_cantus_ultimus=source.exists_on_cantus_ultimus %} {% if chants %} @@ -97,53 +107,60 @@

Browse Chants

{% for chant in chants %} - - {{ chant.folio|default:"" }} - {{ chant.c_sequence|default_if_none:"" }} {# default_if_none: sometimes, c_sequence is 0, and should still be displayed #} - - {{ chant.incipit|default:"" }} -

{{ chant.manuscript_full_text_std_spelling|default:"" }}
- - {% if chant.volpiano and chant.source.id != 680970 %} - {{ chant.volpiano|default:"" }} - {% endif %} -

- - - {% if chant.feast %} - {{ chant.feast.name|default:"" }} - {% endif %} - - - {% if chant.service %} - {{ chant.service.name|default:"" }} - {% endif %} - - - {% if chant.genre %} - {{ chant.genre.name|default:"" }} - {% endif %} - - {{ chant.position|default:"" }} - - {{ chant.cantus_id|default:"" }} - - {{ chant.mode|default:"" }} - - {% if exists_on_cantus_ultimus %} - - Image - - {% elif chant.image_link %} - Image - {% endif %} - - {% if user_can_edit_chant %} - - Edit + + + {{ chant.folio|default:"" }} - {% endif %} - + {{ chant.c_sequence|default_if_none:"" }} + {# default_if_none: sometimes, c_sequence is 0, and should still be displayed #} + + {{ chant.incipit|default:"" }} +

+ {{ chant.manuscript_full_text_std_spelling|default:"" }} +
+ + {% if chant.volpiano and chant.source.id != 680970 %} + {{ chant.volpiano|default:"" }} + {% endif %} +

+ + + {% if chant.feast %} + {{ chant.feast.name|default:"" }} + {% endif %} + + + {% if chant.service %} + {{ chant.service.name|default:"" }} + {% endif %} + + + {% if chant.genre %} + {{ chant.genre.name|default:"" }} + {% endif %} + + {{ chant.position|default:"" }} + + {{ chant.cantus_id|default:"" }} + + {{ chant.mode|default:"" }} + + {% if exists_on_cantus_ultimus %} + Image + {% elif chant.image_link %} + Image + {% endif %} + + {% if user_can_edit_chant %} + + Edit + + {% endif %} + {% endfor %} @@ -155,53 +172,63 @@

Browse Chants

{% endif %} {% endwith %} {% endblock %} - {% block lowersidebar %}
-
-

{{ source.short_heading }}

+

+ {{ source.short_heading }} +

-
- {% if previous_folio %} {{ previous_folio }} < {% endif %} {% if next_folio %}  > {{ next_folio }} - {% endif %} -
- - + {% for feast_id, feast_name, folio_range in feasts_with_folios %} {% endfor %} -
- View all chants - View full inventory +
+ View all chants + View full inventory {% if source.exists_on_cantus_ultimus %} - View inventory with images + View inventory with images {% endif %} {% if source.image_link %} View images on external site - {% endif %} - CSV export - Search chants in this source - Search melodies in this source - Analyse this source (Cantus Analysis Tool) + {% endif %} + CSV export + Search chants in this source + Search melodies in this source + Analyse this source (Cantus Analysis Tool) -
- +
{% endblock %} diff --git a/django/cantusdb_project/main_app/templates/century_detail.html b/django/cantusdb_project/main_app/templates/century_detail.html index 631c6afe3..ad268eb3e 100644 --- a/django/cantusdb_project/main_app/templates/century_detail.html +++ b/django/cantusdb_project/main_app/templates/century_detail.html @@ -1,24 +1,13 @@ {% extends "single_column_with_search_bar.html" %} - -{% block title %} - {{ century.name }} | Cantus Database -{% endblock %} - -{% block header %} -

{{ century.name }}

-{% endblock %} +{% block title %}{{ century.name }} | Cantus Database{% endblock %} +{% block header %}

{{ century.name }}

{% endblock %} {% block maincontent %} -
-
- -
-
+ {% endblock %} diff --git a/django/cantusdb_project/main_app/templates/chant_create.html b/django/cantusdb_project/main_app/templates/chant_create.html index 69f36bc25..d0aa4c693 100644 --- a/django/cantusdb_project/main_app/templates/chant_create.html +++ b/django/cantusdb_project/main_app/templates/chant_create.html @@ -1,357 +1,298 @@ {% extends "base_page_with_side_cards.html" %} {% load static %} - -{% block title %} - Create Chant | Cantus Database -{% endblock %} - +{% block title %}Create Chant | Cantus Database{% endblock %} {% block scripts %} - + {{ form.media }} {% endblock %} - {% block uppersidebar %} -
- {% include "global_search_bar.html" %} -
+
{% include "global_search_bar.html" %}
{% endblock %} - {% block maincontent %}

Create Chant

{% if messages %} -
- {% for message in messages %} - × - {{ message }} - {% endfor %} -
+
+ {% for message in messages %} + × + {{ message }} + {% endfor %} +
{% endif %} - {% if form.errors %} -
- × - {% for error in form.non_field_errors %} - × - {{ error }} - {% endfor %} - {% for field in form %} - {% if field.errors %} - × - {{ field.label }}: {{ field.errors|striptags }} - {% endif %} - {% endfor %} -
+
+ × + {% for error in form.non_field_errors %}{{ error }}{% endfor %} + {% for field in form %} + {% if field.errors %}{{ field.label }}: {{ field.errors|striptags }}{% endif %} + {% endfor %} +
{% endif %} - -
{% csrf_token %} -
- -
- {{ form.marginalia.label_tag }} + + {% csrf_token %} +
+
+ {{ form.marginalia.label_tag }} {{ form.marginalia }}
- -
- {{ form.folio.label_tag }}* +
+ {{ form.folio.label_tag }}* {{ form.folio }} -

{{ form.folio.help_text}}

+

{{ form.folio.help_text }}

- -
- +
+ {{ form.c_sequence }} -

{{ form.c_sequence.help_text}}

+

{{ form.c_sequence.help_text }}

-
- -
-
- -
{{ form.service }} - ? +
+
+ + {{ form.service }} + ?
- -
-
- {{ form.genre.label_tag }} -
{{ form.genre }} +
+
+ {{ form.genre.label_tag }} + {{ form.genre }}
- -
-
- {{ form.position.label_tag }} +
+
+ {{ form.position.label_tag }} {{ form.position }}
- -
- +
+ {{ form.cantus_id }}
- -
- {{ form.project.label_tag }} +
+ {{ form.project.label_tag }} {{ form.project }}
- -
- {{ form.liturgical_function.label_tag }} +
+ {{ form.liturgical_function.label_tag }} {{ form.liturgical_function }} -
+
- -
- -
- {{ form.feast.label_tag }} -
{{ form.feast }} +
+
+ {{ form.feast.label_tag }} +
+ {{ form.feast }}
-
- -

- - {% if previous_chant %} - Feasts that follow: - {% for feast, count in suggested_feasts.items %} - {{ feast.name }} ({{ count }}x) | - {% endfor %} - - - {% endif %} - - +

+ {% if previous_chant %} + Feasts that follow: + {% for feast, count in suggested_feasts.items %} + {{ feast.name }} ({{ count }}x) | + {% endfor %} + + {% endif %}

- -
- -
- {{ form.mode.label_tag }} +
+
+ {{ form.mode.label_tag }} {{ form.mode }}
- -
- {{ form.finalis.label_tag }} +
+ {{ form.finalis.label_tag }} {{ form.finalis }}
- -
- {{ form.differentia.label_tag }} +
+ {{ form.differentia.label_tag }} {{ form.differentia }}
- -
- {{ form.extra.label_tag }} +
+ {{ form.extra.label_tag }} {{ form.extra }}
- -
- {{ form.polyphony.label_tag }} +
+ {{ form.polyphony.label_tag }} {{ form.polyphony }}
- -
-
- -
{{ form.diff_db }} -
- - For a list of Differentia IDs, refer to - the Differentiae Database. - -
+
+
+ + {{ form.diff_db }} +

+ For a list of Differentia IDs, refer to + the Differentiae Database. +

- -
- -
- +
+
+ {{ form.chant_range }} -

{{ form.chant_range.help_text }}

+

{{ form.chant_range.help_text }}

- -
- +
+ {{ form.melody_id }}
- -
- {{ form.addendum.label_tag }} +
+ {{ form.addendum.label_tag }} {{ form.addendum }}
-
-