Merge pull request #1780 from DDMAL/develop

Merge `develop` into `staging`, 5 March 2025

django/cantusdb_project/main_app/templates/century_detail.html

@@ -1,6 +1,6 @@
 {% extends "single_column_with_search_bar.html" %}
 {% block title %}<title>{{ century.name }} | Cantus Database</title>{% endblock %}
-{% block header %}<h3>{{ century.name }}</h3>{% endblock %}
+{% block heading %}<h3>{{ century.name }}</h3>{% endblock %}
 {% block maincontent %}
     <ul>
         {% for source in sources %}

django/cantusdb_project/main_app/templates/chant_search.html

@@ -2,7 +2,7 @@
 {% load humanize %}
 {% block title %}<title>Search Chants | Cantus Database</title>{% endblock %}
 {% block scripts %}<script src="/static/js/chant_search.js"></script>{% endblock %}
-{% block header %}<h3>Search Chants</h3>{% endblock %}
+{% block heading %}<h3>Search Chants</h3>{% endblock %}
 {% block results_count %}
     {% if not query_empty %}{{ block.super }}{% endif %}
 {% endblock %}

django/cantusdb_project/main_app/templates/chant_seq_by_cantus_id.html

@@ -2,7 +2,7 @@
 {% block title %}
     <title>Chants by Cantus ID: {{ cantus_id }} | Cantus Database</title>
 {% endblock %}
-{% block header %}
+{% block heading %}
     <h3>
         Chants by Cantus ID: <a href="https://cantusindex.org/id/{{ cantus_id }}" target="_blank">
         {{ cantus_id }}

django/cantusdb_project/main_app/templates/contact.html

@@ -1,6 +1,6 @@
 {% extends "single_column_with_search_bar.html" %}
 {% block title %}<title>Contact | Cantus Database</title>{% endblock %}
-{% block header %}<h3>Contact</h3>{% endblock %}
+{% block heading %}<h3>Contact</h3>{% endblock %}
 {% block maincontent %}
     <p class="pt-4">
         Please direct questions or comments about Cantus Database to Debra Lacoste at <a href="mailto:[email protected]">[email protected]</a>.

django/cantusdb_project/main_app/templates/feast_detail.html

@@ -2,7 +2,7 @@
 {% load helper_tags %}
 {# for month_to_string #}
 {% block title %}<title>{{ feast.name }} | Cantus Database</title>{% endblock %}
-{% block header %}<h3>{{ feast.name }}</h3>{% endblock %}
+{% block heading %}<h3>{{ feast.name }}</h3>{% endblock %}
 {% block maincontent %}
     <div class="row px-3">
         <p>{{ feast.description }}</p>

django/cantusdb_project/main_app/templates/feast_list.html

@@ -3,7 +3,7 @@
 {# for month_to_string #}
 {% block title %}<title>List of Feasts | Cantus Database</title>{% endblock %}
 {% block scripts %}<script src="/static/js/feast_list.js"></script>{% endblock %}
-{% block header %}<h3>List of Feasts</h3>{% endblock %}
+{% block heading %}<h3>List of Feasts</h3>{% endblock %}
 {% block list_filter_form %}
     <form method="get">
         <div class="row align-items-end">

django/cantusdb_project/main_app/templates/genre_detail.html

@@ -1,4 +1,4 @@
 {% extends "single_column_with_search_bar.html" %}
 {% block title %}<title>{{ genre.name }} | Cantus Database</title>{% endblock %}
-{% block header %}<h3>{{ genre.name }}</h3>{% endblock %}
+{% block heading %}<h3>{{ genre.name }}</h3>{% endblock %}
 {% block maincontent %}<p>{{ genre.description }}</p>{% endblock %}

django/cantusdb_project/main_app/templates/genre_list.html

@@ -2,7 +2,7 @@
 {% load helper_tags %}
 {% block title %}<title>List of Genres | Cantus Database</title>{% endblock %}
 {% block scripts %}<script src="/static/js/genre_list.js"></script>{% endblock %}
-{% block header %}<h3>List of Genres</h3>{% endblock %}
+{% block heading %}<h3>List of Genres</h3>{% endblock %}
 {% block list_table %}
     <table class="table table-sm small table-bordered">
         <thead>

django/cantusdb_project/main_app/templates/indexer_list.html

@@ -1,6 +1,6 @@
 {% extends "filterable_table_with_search_bar.html" %}
 {% block title %}<title>List of Indexers | Cantus Database</title>{% endblock %}
-{% block header %}<h3>List of Indexers</h3>{% endblock %}
+{% block heading %}<h3>List of Indexers</h3>{% endblock %}
 {% block list_filter_form %}
     <div class="row">
         <form method="get" class="col col-lg-7 col-xxl-5">

django/cantusdb_project/main_app/templates/institution_detail.html

@@ -1,6 +1,6 @@
 {% extends "single_column_with_search_bar.html" %}
 {% block title %}{% endblock %}
-{% block header %}
+{% block heading %}
     <h3>
         {{ institution.name }}
         {% if institution.siglum %}({{ institution.siglum }}){% endif %}

django/cantusdb_project/main_app/templates/institution_list.html

@@ -1,6 +1,6 @@
 {% extends "filterable_table_with_search_bar.html" %}
 {% block title %}<title>Institutions | Cantus Database</title>{% endblock %}
-{% block header %}<h3>Institutions</h3>{% endblock %}
+{% block heading %}<h3>Institutions</h3>{% endblock %}
 {% block list_table %}
     <table class="table table-bordered table-sm small">
         <thead>

django/cantusdb_project/main_app/templates/items_count.html

@@ -1,7 +1,7 @@
 {% extends "single_column_with_search_bar.html" %}
 {% load humanize %}
 {% block title %}<title>Content Statistics | Cantus Database</title>{% endblock %}
-{% block header %}<h3>Content Statistics</h3>{% endblock %}
+{% block heading %}<h3>Content Statistics</h3>{% endblock %}
 {% block maincontent %}
     <table class="table table-sm table-bordered table-striped">
         <thead>

django/cantusdb_project/main_app/templates/notation_detail.html

@@ -1,6 +1,6 @@
 {% extends "single_column_with_search_bar.html" %}
 {% block title %}<title>{{ notation.name }} | Cantus Database</title>{% endblock %}
-{% block header %}<h3>{{ notation.name }}</h3>{% endblock %}
+{% block heading %}<h3>{{ notation.name }}</h3>{% endblock %}
 {% block maincontent %}
     <ul>
         {% for source in sources %}

django/cantusdb_project/main_app/templates/provenance_detail.html

@@ -1,6 +1,6 @@
 {% extends "single_column_with_search_bar.html" %}
 {% block title %}<title>{{ provenance.name }} | Cantus Database</title>{% endblock %}
-{% block header %}<h3>{{ provenance.name }}</h3>{% endblock %}
+{% block heading %}<h3>{{ provenance.name }}</h3>{% endblock %}
 {% block maincontent %}
     <ul>
         {% for source in sources %}

django/cantusdb_project/main_app/templates/sequence_detail.html

@@ -1,6 +1,6 @@
 {% extends "single_column_with_search_bar.html" %}
 {% block title %}<title>{{ sequence.title }} | Cantus Database</title>{% endblock %}
-{% block header %}
+{% block heading %}
     <h3>{{ sequence.title }}</h3>
     {% if user_can_edit_sequence %}
         <p>

django/cantusdb_project/main_app/templates/sequence_list.html

@@ -2,7 +2,7 @@
 {% block title %}
     <title>Clavis Sequentiarum (Calvin Bower) | Cantus Database</title>
 {% endblock %}
-{% block header %}<h3>Clavis Sequentiarum (Calvin Bower)</h3>{% endblock %}
+{% block heading %}<h3>Clavis Sequentiarum (Calvin Bower)</h3>{% endblock %}
 {% block list_filter_form %}
     <form method="get">
         <div class="row align-items-end mb-2">

django/cantusdb_project/main_app/templates/service_detail.html

@@ -1,4 +1,4 @@
 {% extends "single_column_with_search_bar.html" %}
 {% block title %}<title>{{ service.name }} | Cantus Database</title>{% endblock %}
-{% block header %}<h3>{{ service.name }}</h3>{% endblock %}
+{% block heading %}<h3>{{ service.name }}</h3>{% endblock %}
 {% block maincontent %}<p>{{ service.description }}</p>{% endblock %}

django/cantusdb_project/main_app/templates/service_list.html

@@ -1,6 +1,6 @@
 {% extends "filterable_table_with_search_bar.html" %}
 {% block title %}<title>Service Abbreviations | Cantus Database</title>{% endblock %}
-{% block header %}<h3>Service Abbreviations</h3>{% endblock %}
+{% block heading %}<h3>Service Abbreviations</h3>{% endblock %}
 {% block list_table %}
     <table class="table table-bordered table-sm small">
         <thead>

django/cantusdb_project/main_app/templates/single_column_with_search_bar.html

@@ -2,18 +2,18 @@
 {# A template that provides a single column layout with a search bar in the upper-right corner. On
     narrower screens, the search bar jumps above the main header. #}
 {# The template introduces the following blocks:
-    - header: a block for content that should appear in the upper-left corner of the content area
+    - heading: a block for content that should appear in the upper-left corner of the content area
     - maincontent: a block for the main content of the page (under the header and search bar)
 #}
 {% block content %}
-    <div class="container rounded bg-white pt-3">
+    <div class="container rounded bg-white pt-3 my-4">
         <div class="row">
             <div class="col-lg-4 search-bar order-lg-2">
                 {% include "global_search_bar.html" %}
             </div>
             <div class="col-lg-8 order-lg-1 pt-3 pt-lg-0">
-                {% block header %}
-                    {# Contents of header block show in the upper-left corner of content, in the same row as the search bar #}
+                {% block heading %}
+                    {# Contents of heading block show in the upper-left corner of content, in the same row as the search bar #}
                 {% endblock %}
             </div>
         </div>