From 5cee181cfa757833b748745fd819fa52461353e6 Mon Sep 17 00:00:00 2001 From: Dylan Hillerbrand Date: Fri, 14 Jun 2024 16:01:43 -0400 Subject: [PATCH 1/2] fix(search bar): show search bar dynamic results on all pages - removes styling from the listBox element - changes styling on its parent, the chantsDiv element --- .../cantusdb_project/main_app/templates/global_search_bar.html | 2 +- django/cantusdb_project/static/js/search_bar.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/django/cantusdb_project/main_app/templates/global_search_bar.html b/django/cantusdb_project/main_app/templates/global_search_bar.html index 0f82edbba..0ccd4e125 100644 --- a/django/cantusdb_project/main_app/templates/global_search_bar.html +++ b/django/cantusdb_project/main_app/templates/global_search_bar.html @@ -11,4 +11,4 @@ -
\ No newline at end of file +
\ No newline at end of file diff --git a/django/cantusdb_project/static/js/search_bar.js b/django/cantusdb_project/static/js/search_bar.js index 58bc5385f..fe1fad889 100644 --- a/django/cantusdb_project/static/js/search_bar.js +++ b/django/cantusdb_project/static/js/search_bar.js @@ -31,7 +31,7 @@ function globalSearch() { xhttp.onload = function () { const data = JSON.parse(this.response); // the results are to be displayed in a list-group - chantsDiv.innerHTML = `
`; + chantsDiv.innerHTML = `
`; const listBox = document.getElementById("listBox"); // for every chant returned in the JSONResponse data.chants.map(chant => { From 58f656344069268b3b94b9ee32c98beb731281f8 Mon Sep 17 00:00:00 2001 From: Dylan Hillerbrand Date: Mon, 17 Jun 2024 12:13:40 -0400 Subject: [PATCH 2/2] feat(frontend): sandwich main content with sidebar on narrow screens - create a new template "base_page_with_side_cards.html" from which other templates can inherit with styling to send some sidebar cards above main page content and some below main page content on narrow windows - adjust flatpages, article pages and main_app templates to use this template - get rid of independent, media-aware main-content margins (these are now accounted for in the template) --- .../articles/templates/article_detail.html | 61 +- .../articles/templates/article_list.html | 70 +- .../main_app/templates/browse_chants.html | 348 +++---- .../main_app/templates/chant_create.html | 552 ++++++----- .../main_app/templates/chant_detail.html | 906 +++++++++--------- .../main_app/templates/chant_edit.html | 890 +++++++++-------- .../main_app/templates/melody_search.html | 219 ++--- .../main_app/templates/source_detail.html | 620 ++++++------ .../main_app/templates/source_edit.html | 539 +++++------ .../main_app/templates/user_source_list.html | 178 ++-- django/cantusdb_project/templates/base.html | 7 - .../templates/base_page_with_side_cards.html | 27 + .../templates/flatpages/default.html | 280 +++--- 13 files changed, 2356 insertions(+), 2341 deletions(-) create mode 100644 django/cantusdb_project/templates/base_page_with_side_cards.html diff --git a/django/cantusdb_project/articles/templates/article_detail.html b/django/cantusdb_project/articles/templates/article_detail.html index 304d71427..6bf4813b7 100644 --- a/django/cantusdb_project/articles/templates/article_detail.html +++ b/django/cantusdb_project/articles/templates/article_detail.html @@ -1,40 +1,39 @@ -{% extends "base.html" %} +{% extends "base_page_with_side_cards.html" %} {% load helper_tags %} {# for recent_articles #} -{% block content %} -
- {{ article.title }} | Cantus Database +{% block title %} +{{ article.title }} | Cantus Database +{% endblock %} + +{% block uppersidebar %} +
+ {% include "global_search_bar.html" %} +
+{% endblock %} + +{% block maincontent %} +

+ {{ article.title }} +

-
-

- {{ article.title }} -

-
-
-
-
- Submitted by {{ article.author }} on {{ article.date_created|date:"D, m/d/Y - H:i" }} -
- {{ article.body.html|safe }} -
-
+
+
+
+ Submitted by {{ article.author }} on {{ article.date_created|date:"D, m/d/Y - H:i" }} +
+ {{ article.body.html|safe }}
-
-
- {% include "global_search_bar.html" %} -
-
-
- What's New -
-
- {% recent_articles %} -
-
+
+{% endblock %} +{% block lowersidebar %} +
+
+ What's New +
+
+ {% recent_articles %}
- -
{% endblock %} \ No newline at end of file diff --git a/django/cantusdb_project/articles/templates/article_list.html b/django/cantusdb_project/articles/templates/article_list.html index 29233a8d3..993286b2a 100644 --- a/django/cantusdb_project/articles/templates/article_list.html +++ b/django/cantusdb_project/articles/templates/article_list.html @@ -1,43 +1,39 @@ -{% extends "base.html" %} -{% load helper_tags %} {# for recent_articles #} -{% block content %} -
- What's New | Cantus Database +{% extends "base_page_with_side_cards.html" %} +{% load helper_tags %} {# for recent_articles #}\ +{% block title %} +What's New | Cantus Database +{% endblock %} +{% block uppersidebar %} +
+ {% include "global_search_bar.html" %} +
+{% endblock %} +{% block maincontent %} +

What's New

+ {% for article in articles %}
-
-

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" %} -
-
-
- {% include "global_search_bar.html" %} -
- -
-
- What's New -
-
- {% recent_articles %} -
-
+
+ {% endfor %} + {% include "pagination.html" %} +{% endblock %} +{% block lowersidebar %} +
+
+ What's New +
+
+ {% recent_articles %}
-
{% endblock %} \ No newline at end of file diff --git a/django/cantusdb_project/main_app/templates/browse_chants.html b/django/cantusdb_project/main_app/templates/browse_chants.html index a768f9a78..eccafbb7e 100644 --- a/django/cantusdb_project/main_app/templates/browse_chants.html +++ b/django/cantusdb_project/main_app/templates/browse_chants.html @@ -1,191 +1,191 @@ -{% extends "base.html" %} -{% block content %} +{% extends "base_page_with_side_cards.html" %} +{% block title %} Browse Chants | Cantus Database - - -
-
-
-

Browse Chants

- Displaying {{ page_obj.start_index }}-{{ page_obj.end_index }} of {{ page_obj.paginator.count }} chants - -
-
-
- - -
-
- -
-
- - -
-
+{% endblock %} -
-
- - -
+{% block script %} + +{% endblock %} -
- - -
-
+{% block uppersidebar %} +
+ {% include "global_search_bar.html" %} +
+{% endblock %} -
- {% with exists_on_cantus_ultimus=source.exists_on_cantus_ultimus %} - {% if chants %} - - - - - - - - - - - - - - - {% if user_can_edit_chant %} - - {% endif %} - - - - {% for chant in chants %} - - - - {# default_if_none: sometimes, c_sequence is 0, and should still be displayed #} - - - - - - - - - {% if user_can_edit_chant %} - - {% endif %} - - {% endfor %} - -
SiglumFolioIncipit / Full textFeastCantusIDMode
{{ source.siglum|default:"" }}{{ chant.folio|default:"" }}{{ chant.c_sequence|default_if_none:"" }} - {{ chant.incipit|default:"" }} -

{{ chant.manuscript_full_text_std_spelling|default:"" }}
- {% if chant.volpiano %} - {{ chant.volpiano|default:"" }} - {% endif %} -

- 		- {% if chant.feast %} - {{ chant.feast.name|default:"" }} - {% endif %} - - {% if chant.office %} - {{ chant.office.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 %} - - Edit -
- {% include "pagination.html" %} - {% else %} - No chants found. - {% endif %} - {% endwith %} -
+{% block maincontent %} +

Browse Chants

+ Displaying {{ page_obj.start_index }}-{{ page_obj.end_index }} of {{ page_obj.paginator.count }} chants -
-
- {% include "global_search_bar.html" %} +
+
+
+ +
+
-
+
+
+ + +
+
-
-

{{ source.siglum }}

-
+
+
+ + +
-
- - - +
+ + +
+
- {% if previous_folio %} - {{ previous_folio }} < + + {% with exists_on_cantus_ultimus=source.exists_on_cantus_ultimus %} + {% if chants %} + + + + + + + + + + + + + + + {% if user_can_edit_chant %} + {% endif %} - {% if next_folio %} -  > {{ next_folio }} - {% endif %} -
- - -
- View all chants - View full inventory - {% if source.exists_on_cantus_ultimus %} - View inventory with images + + + + {% for chant in chants %} + + + + {# default_if_none: sometimes, c_sequence is 0, and should still be displayed #} + + + + + + + + + {% if user_can_edit_chant %} + {% 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) - - + + {% endfor %} + +
SiglumFolioIncipit / Full textFeastCantusIDMode
{{ source.siglum|default:"" }}{{ chant.folio|default:"" }}{{ chant.c_sequence|default_if_none:"" }} + {{ chant.incipit|default:"" }} +

{{ chant.manuscript_full_text_std_spelling|default:"" }}
+ {% if chant.volpiano %} + {{ chant.volpiano|default:"" }} + {% endif %} +

+ 		+ {% if chant.feast %} + {{ chant.feast.name|default:"" }} + {% endif %} + + {% if chant.office %} + {{ chant.office.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 %} + + Edit +
+ {% include "pagination.html" %} + {% else %} + No chants found. + {% endif %} + {% endwith %} +{% endblock %} -
+{% block lowersidebar %} +
+
+

{{ source.siglum }}

+ +
+ + + + + {% if previous_folio %} + {{ previous_folio }} < + {% endif %} + {% if next_folio %} +  > {{ next_folio }} + {% endif %} +
+ + +
+ View all chants + View full inventory + {% if source.exists_on_cantus_ultimus %} + 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) + +
+
-
{% endblock %} diff --git a/django/cantusdb_project/main_app/templates/chant_create.html b/django/cantusdb_project/main_app/templates/chant_create.html index 3e60159bc..7a42880ad 100644 --- a/django/cantusdb_project/main_app/templates/chant_create.html +++ b/django/cantusdb_project/main_app/templates/chant_create.html @@ -1,334 +1,332 @@ -{% extends "base.html" %} +{% extends "base_page_with_side_cards.html" %} {% load static %} -{% block content %} +{% block title %} Create Chant | Cantus Database +{% endblock %} +{% block script %} {{ form.media }} -
-
-
-

Create Chant

- - - {% if messages %} -
- {% for message in messages %} +{% endblock %} +{% block uppersidebar %} +
+ {% include "global_search_bar.html" %} +
+{% endblock %} +{% block maincontent %} +

Create Chant

+ + + {% if messages %} +
+ {% 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 %} × - {{ message }} - {% endfor %} -
+ {{ field.label }}: {{ field.errors|striptags }} {% endif %} + {% 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 %} -
- {% endif %} +
{% csrf_token %} +
- {% csrf_token %} -
+
+ {{ form.marginalia.label_tag }} + {{ form.marginalia }} +
-
- {{ form.marginalia.label_tag }} - {{ form.marginalia }} -
+
+ {{ form.folio.label_tag }}* + {{ form.folio }} +

{{ form.folio.help_text}}

+
-
- {{ form.folio.label_tag }}* - {{ form.folio }} -

{{ form.folio.help_text}}

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

{{ form.c_sequence.help_text}}

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

{{ form.c_sequence.help_text}}

-
+
-
+
+
+ +
{{ form.office }} + ? +
+
-
-
- -
{{ form.office }} - ? -
-
+
+
+ {{ form.genre.label_tag }} +
{{ form.genre }} +
+
-
-
- {{ form.genre.label_tag }} -
{{ form.genre }} -
-
+
+
+ {{ form.position.label_tag }} + {{ form.position }} +
-
-
- {{ form.position.label_tag }} - {{ form.position }} -
+
+ + {{ form.cantus_id }} +
+ + - +
-
- {{ 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 %} -

- -

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

- -
+ + {% endif %} -
- {{ form.mode.label_tag }} - {{ form.mode }} -
- -
- {{ form.finalis.label_tag }} - {{ form.finalis }} -
- -
- {{ form.differentia.label_tag }} - {{ form.differentia }} -
+ +

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

{{ form.chant_range.help_text }}

-
+
+ {{ form.extra.label_tag }} + {{ form.extra }} +
-
- - {{ form.melody_id }} -
+ + +
-
- {{ form.addendum.label_tag }} - {{ form.addendum }} -
- +
+
+ +
{{ form.diff_db }} +
+ + For a list of Differentia IDs, refer to + the Differentiae Database. +
+
+
- - - + + - -
-
- - {{ form.manuscript_full_text_std_spelling }} -

- {{ form.manuscript_full_text_std_spelling.help_text }} - For more information, consult Fields and Content Descriptions. - -

-
+
+ {{ form.cm_melody_id.label_tag }} + {{ form.cm_melody_id }}
-
-
- -
+
+ {{ form.incipit_of_refrain.label_tag }} + {{ form.incipit_of_refrain }}
-
-
- - {{ form.manuscript_full_text }} -

- {{ form.manuscript_full_text.help_text }} - For more information, contact Cantus Database staff. - -

-
-
-
-
- {{ form.volpiano.label_tag }} - {{ form.volpiano }} -
-
+
-
-
- {{ form.image_link.label_tag }} - {{ form.image_link }} -
+
+
+ {{ form.later_addition.label_tag }} + {{ form.later_addition }}
+
-
-
- {{ form.content_structure.label_tag }} - {{ form.content_structure }} -

- {{ form.content_structure.help_text }} -

-
+
+
+ {{ form.rubrics.label_tag }} + {{ form.rubrics }}
+
+
--> + +
+
+ + {{ form.manuscript_full_text_std_spelling }} +

+ {{ form.manuscript_full_text_std_spelling.help_text }} + For more information, consult Fields and Content Descriptions. + +

+
+
-
-
- {{ form.indexing_notes.label_tag }} - {{ form.indexing_notes }} -
-
+
+
+ +
+
-
- -
- +
+
+ + {{ form.manuscript_full_text }} +

+ {{ form.manuscript_full_text.help_text }} + For more information, contact Cantus Database staff. + +

+
-
-
- {% include "global_search_bar.html" %} +
+
+ {{ form.volpiano.label_tag }} + {{ form.volpiano }}
+
-
-
-
{{ source.siglum }}
-
+
+
+ {{ form.image_link.label_tag }} + {{ form.image_link }} +
+
+ +
+
+ {{ form.content_structure.label_tag }} + {{ form.content_structure }} +

+ {{ form.content_structure.help_text }} +

+
+
+ +
+
+ {{ form.indexing_notes.label_tag }} + {{ form.indexing_notes }}
+
- {% if previous_chant %} -
-
- - Suggestions based on previous chant:
-
- {{ previous_chant.folio }} {{ previous_chant.c_sequence}} {{ previous_chant.incipit }}
- {% if previous_chant.cantus_id %} - (Cantus ID: {{ previous_chant.cantus_id }}) - {% endif %} -
- {% if suggested_chants %} - {% for suggestion in suggested_chants %} - - {{ suggestion.genre_name }} - {{ suggestion.incipit }} ({{ suggestion.occurrences }}x)
- {% endfor %} - {% else %} - Sorry! No suggestions found.
+
+ +
+ +{% endblock %} +{% block lowersidebar %} +
+
+
{{ source.siglum }}
+
+
+ + {% if previous_chant %} +
+
+ + Suggestions based on previous chant:
+
+ {{ previous_chant.folio }} {{ previous_chant.c_sequence}} {{ previous_chant.incipit }}
+ {% if previous_chant.cantus_id %} + (Cantus ID: {{ previous_chant.cantus_id }}) {% endif %} -
-
- {% endif %} + {% if suggested_chants %} + {% for suggestion in suggested_chants %} + + {{ suggestion.genre_name }} - {{ suggestion.incipit }} ({{ suggestion.occurrences }}x)
+ {% endfor %} + {% else %} + Sorry! No suggestions found.
+ {% endif %} + +
-
-
+ {% endif %} {% endblock %} diff --git a/django/cantusdb_project/main_app/templates/chant_detail.html b/django/cantusdb_project/main_app/templates/chant_detail.html index 0e5928b81..a88edde9b 100644 --- a/django/cantusdb_project/main_app/templates/chant_detail.html +++ b/django/cantusdb_project/main_app/templates/chant_detail.html @@ -1,493 +1,493 @@ -{% extends "base.html" %} -{% block content %} +{% extends "base_page_with_side_cards.html" %} + +{% block title %} {{ chant.incipit }} | Cantus Database - +{% endblock %} -
-
-
+{% block script %} + +{% endblock %} - - {% if messages %} -
- {% for message in messages %} - {{ message }} - {% endfor %} +{% block uppersidebar %} +
+ {% include "global_search_bar.html" %} +
+{% endblock %} + +{% block maincontent %} + + {% if messages %} +
+ {% for message in messages %} + {{ message }} + {% endfor %} +
+ {% endif %} + + {% if user_can_edit_chant %} +

+ View | Edit +

+ {% endif %} + +

{{ chant.incipit }}

+ +
+
+ {% if chant.source %} +
+
Source
+
+ {{ chant.source.title }} +
{% endif %} - - {% if user_can_edit_chant %} -

- View | Edit -

- {% endif %} - -

{{ chant.incipit }}

- -
-
- {% if chant.source %} -
-
Source
-
- {{ chant.source.title }} -
-
- {% endif %} - {% if chant.marginalia %} -
-
Marginalia
-
{{ chant.marginalia }}
-
- {% endif %} + {% if chant.marginalia %} +
+
Marginalia
+
{{ chant.marginalia }}
+ {% endif %} +
-
- {% if chant.folio %} -
-
Folio
-
{{ chant.folio }}
-
- {% endif %} +
+ {% if chant.folio %} +
+
Folio
+
{{ chant.folio }}
+
+ {% endif %} - {% if chant.c_sequence is not None %} {# check that it isn't None, since sometimes c_sequence is 0 #} -
-
Sequence
-
{{ chant.c_sequence }}
-
- {% endif %} + {% if chant.c_sequence is not None %} {# check that it isn't None, since sometimes c_sequence is 0 #} +
+
Sequence
+
{{ chant.c_sequence }}
- -
- {% if chant.feast %} -
-
Feast
-
- {{ chant.feast.name }} -
-
- {% endif %} - - {% if chant.office %} -
-
Service
-
- {{ chant.office.name }} -
-
- {% endif %} - - {% if chant.genre %} -
-
Genre
-
- {{ chant.genre.name }} -
-
- {% endif %} - - {% if chant.position %} -
-
Position
-
{{ chant.position }}
-
- {% endif %} - - {% if chant.cantus_id %} -
-
Cantus ID
-
- - {{ chant.cantus_id }} - -
-
- {% endif %} - - {% if chant.mode %} -
-
Mode
-
{{ chant.mode }}
-
- {% endif %} + {% endif %} +
+ +
+ {% if chant.feast %} +
+
Feast
+
+ {{ chant.feast.name }} +
- - -
- {% if chant.finalis %} -
-
Finalis
-
{{ chant.finalis }}
-
- {% endif %} - - {% if chant.differentia %} -
-
Differentia
-
{{ chant.differentia }}
-
- {% endif %} - - {% if chant.diff_db %} -
-
Differentia Database
-
- {% if chant.diff_db.melodic_transcription %} -

{{ chant.diff_db.melodic_transcription }}

- {% endif %} - - {{ chant.diff_db }} - -
-
- {% endif %} - - {% if chant.chant_range %} -
-
Range
-
-

{{ chant.chant_range }}

-
-
- {% endif %} - - {% if chant.addendum %} -
-
Addendum
-
{{ chant.addendum }}
-
- {% endif %} - - {% if chant.extra %} -
-
Extra
-
{{ chant.extra }}
-
- {% endif %} + {% endif %} + + {% if chant.office %} +
+
Service
+
+ {{ chant.office.name }} +
- - {% if chant.manuscript_full_text_std_spelling %} -
Full text as in Source (standardized spelling)
-
{{ chant.manuscript_full_text_std_spelling }}
- {% endif %} - - {% if chant.manuscript_full_text %} -
Full text as in Source (source spelling)
-
{{ chant.manuscript_full_text }}
- {% endif %} - - {% if chant.volpiano %} -
Volpiano
+ {% endif %} + + {% if chant.genre %} +
+
Genre
-

{{ chant.volpiano }}

+ {{ chant.genre.name }}
- {% endif %} - - {% if chant.indexing_notes %} -
Indexing Notes
-
{{ chant.indexing_notes }}
- {% endif %} - - {% if chant.volpiano %} -
-
-
Melody with text
- {% if chant.manuscript_syllabized_full_text %} -

Syllabification is based on saved syllabized text.

- {% endif %} -
- {% for syl_text, syl_mel in syllabized_text_with_melody %} - -
{{ syl_mel }}
- - 
{{ syl_text }}
- - {% endfor %} -
-
-
- {% endif %} - - {% if chant.image_link %} -
Image link
+
+ {% endif %} + + {% if chant.position %} +
+
Position
+
{{ chant.position }}
+
+ {% endif %} + + {% if chant.cantus_id %} +
+
Cantus ID
- {{ chant.image_link }} + + {{ chant.cantus_id }} +
- {% endif %} - {% if exists_on_cantus_ultimus %} -
Image link (Cantus Ultimus)
+
+ {% endif %} + + {% if chant.mode %} +
+
Mode
+
{{ chant.mode }}
+
+ {% endif %} +
+ + +
+ {% if chant.finalis %} +
+
Finalis
+
{{ chant.finalis }}
+
+ {% endif %} + + {% if chant.differentia %} +
+
Differentia
+
{{ chant.differentia }}
+
+ {% endif %} + + {% if chant.diff_db %} +
+
Differentia Database
- - https://cantus.simssa.ca/manuscript/{{ chant.source.id }}/?folio={{ chant.folio }}&chant={{ chant.c_sequence }} + {% if chant.diff_db.melodic_transcription %} +

{{ chant.diff_db.melodic_transcription }}

+ {% endif %} + + {{ chant.diff_db }} +
+
+ {% endif %} + + {% if chant.chant_range %} +
+
Range
+
+

{{ chant.chant_range }}

- {% endif %} -
- {% if chant.cantus_id %} -

List of concordances

-

- For concordances, please consult the - Cantus Index entry for Cantus ID - {{ chant.cantus_id }}. -

- -

List of melodies

- - Display the melodies connected with this chant -
+
+ {% endif %} + + {% if chant.addendum %} +
+
Addendum
+
{{ chant.addendum }}
+
{% endif %} + {% if chant.extra %} +
+
Extra
+
{{ chant.extra }}
+
+ {% endif %}
-
-
- {% include "global_search_bar.html" %} + {% if chant.manuscript_full_text_std_spelling %} +
Full text as in Source (standardized spelling)
+
{{ chant.manuscript_full_text_std_spelling }}
+ {% endif %} + + {% if chant.manuscript_full_text %} +
Full text as in Source (source spelling)
+
{{ chant.manuscript_full_text }}
+ {% endif %} + + {% if chant.volpiano %} +
Volpiano
+
+

{{ chant.volpiano }}

+
+ {% endif %} + + {% if chant.indexing_notes %} +
Indexing Notes
+
{{ chant.indexing_notes }}
+ {% endif %} + + {% if chant.volpiano %} +
+
+
Melody with text
+ {% if chant.manuscript_syllabized_full_text %} +

Syllabification is based on saved syllabized text.

+ {% endif %} +
+ {% for syl_text, syl_mel in syllabized_text_with_melody %} + +
{{ syl_mel }}
+ + 
{{ syl_text }}
+ + {% endfor %} +
+
+
+ {% endif %} + + {% if chant.image_link %} +
Image link
+
+ {{ chant.image_link }} +
+ {% endif %} + {% if exists_on_cantus_ultimus %} +
Image link (Cantus Ultimus)
+
+ + https://cantus.simssa.ca/manuscript/{{ chant.source.id }}/?folio={{ chant.folio }}&chant={{ chant.c_sequence }} + +
+ {% endif %} + + {% if chant.cantus_id %} +

List of concordances

+

+ For concordances, please consult the + Cantus Index entry for Cantus ID + {{ chant.cantus_id }}. +

+ +

List of melodies

+ + Display the melodies connected with this chant +
+ {% endif %} +{% endblock %} + +{% block lowersidebar %} + {% with source=chant.source %} +
+
+ Source navigation +
+ {% if source %} + {{ source.siglum }} + {% else %} + This chant is not associated with any source. + {% endif %}
- {% with source=chant.source %} -
-
- Source navigation -
- {% if source %} - {{ source.siglum }} - {% else %} - This chant is not associated with any source. - {% endif %} -
- - {% if source %} -
- - - - - {% if previous_folio %} - {{ previous_folio }} < - {% endif %} - {% if next_folio %} -  > {{ next_folio }} - {% endif %} - - {% if exists_on_cantus_ultimus %} - - Display facsimile ({{ chant.folio }}) - - {% elif chant.image_link %} - Display facsimile ({{ chant.folio }}) + {% if source %} +
+ + + + + {% if previous_folio %} + {{ previous_folio }} < + {% endif %} + {% if next_folio %} +  > {{ next_folio }} + {% endif %} + + {% if exists_on_cantus_ultimus %} + + Display facsimile ({{ chant.folio }}) + + {% elif chant.image_link %} + Display facsimile ({{ chant.folio }}) + {% endif %} + + {% if previous_folio %} +
+ + Display previous chants ▾ + {% endif %} +
+ {% with chant.c_sequence as current_seq %} + {% for feast, chants in feasts_current_folio %} + Folio: {{ chant.folio }} - Feast: {{ feast.name }} + + {% for chant in chants %} + + + + + + {% endfor %} - {% endwith %} +
+ {{ chant.c_sequence }} + + + {{ chant.office.name|default_if_none:"" }} + + {{ chant.genre.name|default_if_none:"" }} + {{ chant.position|default_if_none:"" }} + + + {% if chant.c_sequence == current_seq %} + {{ chant.incipit|default_if_none:"" }} + {% else %} + {{ chant.incipit|default_if_none:"" }} + {% endif %} + + + + {{ chant.cantus_id|default_if_none:"" }} + +
+ {% endfor %} + {% endwith %} - {% if next_folio %} - Display next chants ▾ -
- + {% endif %} +
- {% if source %} -
-
- {{ source.segment.name }} + {% if source %} +
+
+ {{ source.segment.name }} +
+ {{ source.siglum }} +
+
+ + {% if source.provenance.name %} + Provenance: {{source.provenance.name}}
- {{ source.siglum }} -
-
- - {% if source.provenance.name %} - Provenance: {{source.provenance.name}} -
- {% endif %} + {% endif %} + + {% if source.date %} + Date: + {% for century in source.century.all %} + + {{ century.name }} + + {% endfor %} + | + {{ source.date|default_if_none:"" }} +
+ {% endif %} - {% if source.date %} - Date: - {% for century in source.century.all %} - - {{ century.name }} - - {% endfor %} - | - {{ source.date|default_if_none:"" }} -
- {% endif %} + {% if source.cursus %} + Cursus: {{ source.cursus|default_if_none:"" }} +
+ {% endif %} - {% if source.cursus %} - Cursus: {{ source.cursus|default_if_none:"" }} -
- {% endif %} + {% if source.notation.exists %} + + {{ source.notation.all.first.name }} + +
+ {% endif %} + + {% if source.inventoried_by.exists %} + Inventoried by: +
    + {% for editor in source.inventoried_by.all %} +
  • + {% if editor.full_name %} + {{ editor.full_name }} + {% else %} + User {{ editor.id }} + {% endif %} +
    + {{ editor.institution|default_if_none:"" }} +
    • + {% endfor %} +
+ {% endif %} - {% if source.notation.exists %} - - {{ source.notation.all.first.name }} - + {% if source.proofreaders.exists %} + Proofreader{{ source.proofreaders.all|pluralize }}: +
+
    + {% for editor in source.proofreaders.all %} +
  • + {% if editor.full_name %} + {{ editor.full_name }} + {% else %} + User {{ editor.id }} + {% endif %} +

    • - {% endif %} - - {% if source.inventoried_by.exists %} - Inventoried by: -
      - {% for editor in source.inventoried_by.all %} -
    • - {% if editor.full_name %} - {{ editor.full_name }} - {% else %} - User {{ editor.id }} - {% endif %} -
      - {{ editor.institution|default_if_none:"" }} -
      • - {% endfor %} -
    - {% endif %} + {% endfor %} +
+ {% endif %} - {% if source.proofreaders.exists %} - Proofreader{{ source.proofreaders.all|pluralize }}: -
- + {{ source.indexing_notes|default_if_none:""|safe }} +
+ {% with creator=source.created_by %} + {% if creator %} + {% if creator.full_name %} + Contributor: {{ creator.full_name }} + {% else %} + Contributor: User {{creator.id}} {% endif %} - - {{ source.indexing_notes|default_if_none:""|safe }} -
- {% with creator=source.created_by %} - {% if creator %} - {% if creator.full_name %} - Contributor: {{ creator.full_name }} - {% else %} - Contributor: User {{creator.id}} - {% endif %} - {% endif %} - {% endwith %} - -
-
- {% endif %} - {% endwith %} -
-
-
+ {% endif %} + {% endwith %} + +
+
+ {% endif %} + {% endwith %} {% endblock %} \ No newline at end of file diff --git a/django/cantusdb_project/main_app/templates/chant_edit.html b/django/cantusdb_project/main_app/templates/chant_edit.html index 43d930dd5..8196d0d4b 100644 --- a/django/cantusdb_project/main_app/templates/chant_edit.html +++ b/django/cantusdb_project/main_app/templates/chant_edit.html @@ -1,499 +1,497 @@ -{% extends "base.html" %} -{% block content %} +{% extends "base_page_with_side_cards.html" %} {% load static %} +{% block title %} {{ source.title }} | Cantus Database +{% endblock %} +{% block script %} {{ form.media }} -
-
-
+{% endblock %} +{% block uppersidebar %} +
+ {% include "global_search_bar.html" %} +
+{% endblock %} +{% block maincontent %} + + {% for message in messages %} + + {% endfor %} - - {% for message in messages %} - + + {% if form.errors %} +
+ × + {% for error in form.non_field_errors %} + × + {{ error }} {% endfor %} - - - {% if form.errors %} -
+ {% for field in form %} + {% if field.errors %} × - {% for error in form.non_field_errors %} - × - {{ error }} - {% endfor %} - {% for field in form %} - {% if field.errors %} - × - {{ field.label }}: {{ field.errors|striptags }} - {% endif %} - {% endfor %} + {{ field.label }}: {{ field.errors|striptags }} + {% endif %} + {% endfor %} +
+ {% endif %} + + {% if pk_specified %} + {% if user.is_authenticated %} +

+ View | Edit +

+ {% endif %} +
{% csrf_token %} + + +
+
+ {{ form.marginalia.label_tag }} + {{ form.marginalia }}
- {% endif %} +
+ {{ form.folio.label_tag }}* + {{ form.folio }} +
+
+ + {{ form.c_sequence }} +
+
- {% if pk_specified %} - {% if user.is_authenticated %} -

- View | Edit -

- {% endif %} - {% csrf_token %} - - -
-
- {{ form.marginalia.label_tag }} - {{ form.marginalia }} -
-
- {{ form.folio.label_tag }}* - {{ form.folio }} -
-
- - {{ form.c_sequence }} -
-
+
+
+ {{ form.feast.label_tag }} +
{{ form.feast }} +
+
-
-
- {{ form.feast.label_tag }} -
{{ form.feast }} -
-
+
+
+ +
{{ form.office }} +
+
-
-
- -
{{ form.office }} -
-
+
+
+ {{ form.genre.label_tag }} +
{{ form.genre }} +
+
-
-
- {{ form.genre.label_tag }} -
{{ form.genre }} -
-
+
+
+ {{ form.position.label_tag }} + {{ form.position }} +
+
+ + {{ form.cantus_id }} +
+
+ + {{ form.melody_id }} +
+ + - -
+
+ {{ form.liturgical_function.label_tag }} + {{ form.liturgical_function }} +
--> +
-
-
- {{ form.mode.label_tag }} - {{ form.mode }} -
-
- {{ form.finalis.label_tag }} - {{ form.finalis }} -
-
- {{ form.differentia.label_tag }} - {{ form.differentia }} -
-
- {{ form.extra.label_tag }} - {{ form.extra }} -
- - -
-
-
- -
{{ form.diff_db }} -
- - For a list of Differentia IDs, refer to - the Differentiae Database. - -
-
+
+
+ {{ form.mode.label_tag }} + {{ form.mode }} +
+
+ {{ form.finalis.label_tag }} + {{ form.finalis }} +
+
+ {{ form.differentia.label_tag }} + {{ form.differentia }} +
+
+ {{ form.extra.label_tag }} + {{ form.extra }} +
+ + +
+
+
+ +
{{ form.diff_db }} +
+ + For a list of Differentia IDs, refer to + the Differentiae Database. +
-
-
- {{ form.addendum.label_tag }} - {{ form.addendum }} -
- {% if user_can_proofread_chant %} -
- {{ form.chant_range.label_tag }} - {{ form.chant_range }} -
- {% endif %} +
+
+
+
+ {{ form.addendum.label_tag }} + {{ form.addendum }} +
+ {% if user_can_proofread_chant %} +
+ {{ form.chant_range.label_tag }} + {{ form.chant_range }}
+ {% endif %} +
- - - + + +
- {% if suggested_fulltext %} -
-
- -
+
+
+ {{ form.later_addition.label_tag }} + {{ form.later_addition }}
- {% endif %} - -
-
- - {{ form.manuscript_full_text_std_spelling }} -
-
- - {% if user_can_proofread_chant %} -
-
- - {{ form.manuscript_full_text_std_proofread }} -
-
- {% endif %} +
-
-
- -
+
+
+ {{ form.rubrics.label_tag }} + {{ form.rubrics }}
+
+
--> -
-
- - {{ form.manuscript_full_text }} -
-
+ {% if suggested_fulltext %} +
+
+ +
+
+ {% endif %} + +
+
+ + {{ form.manuscript_full_text_std_spelling }} +
+
- {% if user_can_proofread_chant %} -
-
- - {{ form.manuscript_full_text_proofread }} -
-
- {% endif %} - -
-
- - {{ form.volpiano }} -
+ {% if user_can_proofread_chant %} +
+
+ + {{ form.manuscript_full_text_std_proofread }}
+
+ {% endif %} - {% if user_can_proofread_chant %} -
-
- - {{ form.volpiano_proofread }} -
-
- {% endif %} +
+
+ +
+
- {% if chant.volpiano %} -
-
- Preview of melody with text: - {% if chant.manuscript_syllabized_full_text %} -

Syllabification is based on saved syllabized text.

- {% endif %} -
- {% for syl_text, syl_mel in syllabized_text_with_melody %} - -
{{ syl_mel }}
- - 
{{ syl_text }}
- - {% endfor %} -
-
-
- {% endif %} +
+
+ + {{ form.manuscript_full_text }} +
+
-
-
- - Edit syllabification (new window) - -
+ {% if user_can_proofread_chant %} +
+
+ + {{ form.manuscript_full_text_proofread }}
+
+ {% endif %} -
-
- {{ form.image_link.label_tag }} - {{ form.image_link }} -
-
- {% if user_can_proofread_chant %} -
-
- {{ form.proofread_by.label_tag }} -
{{ form.proofread_by }} -
-
- {% endif %} +
+
+ + {{ form.volpiano }} +
+
-
-
- {{ form.indexing_notes.label_tag }} - {{ form.indexing_notes }} -
+ {% if user_can_proofread_chant %} +
+
+ + {{ form.volpiano_proofread }}
+
+ {% endif %} -
-
- -
-
- Delete -
+ {% if chant.volpiano %} +
+
+ Preview of melody with text: + {% if chant.manuscript_syllabized_full_text %} +

Syllabification is based on saved syllabized text.

+ {% endif %} +
+ {% for syl_text, syl_mel in syllabized_text_with_melody %} + +
{{ syl_mel }}
+ + 
{{ syl_text }}
+ + {% endfor %} +
+
+ {% endif %} -
-
- - Open chant page (new window) - -
-
- - {% else %} -

Full text & Volpiano edit form

-
-
-
1) Select a folio or a feast (in the right block)
-
2) Click "EDIT" next to any chant
-
3) The fulltext and Volpiano fields should appear in this area
-
4) Edit the fields according to the manuscript, following the fulltext guidelines created by Cantus
-
5) Click "SAVE"
-
-
- - {{ source.siglum }} +
+
+ + Edit syllabification (new window)
- + +
+
+ {{ form.image_link.label_tag }} + {{ form.image_link }}
- + {% if user_can_proofread_chant %} +
+
+ {{ form.proofread_by.label_tag }} +
{{ form.proofread_by }} +
{% endif %} -
-
-
- {% include "global_search_bar.html" %} +
+
+ {{ form.indexing_notes.label_tag }} + {{ form.indexing_notes }} +
-
-
-

{{ source.siglum }}

-
-
- {% if source.chant_set.exists %} - - - - - {% if previous_folio %} - {{ previous_folio }} < - {% endif %} - {% if next_folio %} -  > {{ next_folio }} - {% endif %} +
+
+ +
+
+ Delete +
+
-
+
+
+ + Open chant page (new window) + +
+
+ + {% else %} +

Full text & Volpiano edit form

+
+
+
1) Select a folio or a feast (in the right block)
+
2) Click "EDIT" next to any chant
+
3) The fulltext and Volpiano fields should appear in this area
+
4) Edit the fields according to the manuscript, following the fulltext guidelines created by Cantus
+
5) Click "SAVE"
+
+ + + + {% endif %} +{% endblock %} - -
- - {% else %} - Source contains no chants – Add new chant +{% block lowersidebar %} +
+
+

{{ source.siglum }}

+
+
+ {% if source.chant_set.exists %} + + + + + {% if previous_folio %} + {{ previous_folio }} < {% endif %} - {% comment %} render if the user has selected a specific folio {% endcomment %} - {% if feasts_current_folio %} - {% for feast, chants in feasts_current_folio %} - Folio: {{ chant.folio }} - Feast: {{ feast.name }} - - {% for chant in chants %} - - - - - - - - - {% endfor %} -
- {{ chant.c_sequence }} - - - {{ chant.office.name|default_if_none:"" }} - - - {{ chant.genre.name|default_if_none:"" }} - - {{ chant.position|default_if_none:"" }} - - - {{ chant.incipit|default_if_none:"" }} - - - - {{ chant.cantus_id|default_if_none:"" }} - - - {{ chant.mode|default:"" }} - - - EDIT - -
+ {% if next_folio %} +  > {{ next_folio }} + {% endif %} + +
+ + +
+ + {% else %} + Source contains no chants – Add new chant + {% endif %} + {% comment %} render if the user has selected a specific folio {% endcomment %} + {% if feasts_current_folio %} + {% for feast, chants in feasts_current_folio %} + Folio: {{ chant.folio }} - Feast: {{ feast.name }} + + {% for chant in chants %} + + + + + + + + {% endfor %} - {% endif %} - - - - - +
+ {{ chant.c_sequence }} + + + {{ chant.office.name|default_if_none:"" }} + + + {{ chant.genre.name|default_if_none:"" }} + + {{ chant.position|default_if_none:"" }} + + + {{ chant.incipit|default_if_none:"" }} + + + + {{ chant.cantus_id|default_if_none:"" }} + + + {{ chant.mode|default:"" }} + + + EDIT + +
+ {% endfor %} + {% comment %} render if the user has selected a specific feast {% endcomment %} + {% elif folios_current_feast %} + {% for folio, chants in folios_current_feast %} + Folio: {{ folio }} - Feast: {{ chant.feast }} + + {% for chant in chants %} + + + + + + + + + {% endfor %} +
+ {{ chant.c_sequence }} + + + {{ chant.office.name|default_if_none:"" }} + + + {{ chant.genre.name|default_if_none:"" }} + + {{ chant.position|default_if_none:"" }} + + + {{ chant.incipit|default_if_none:"" }} + + + + {{ chant.cantus_id|default_if_none:"" }} + + + {{ chant.mode|default:"" }} + + + EDIT + +
+ {% endfor %} + {% endif %} +
+
{% endblock %} diff --git a/django/cantusdb_project/main_app/templates/melody_search.html b/django/cantusdb_project/main_app/templates/melody_search.html index a53983c9e..3295488ab 100644 --- a/django/cantusdb_project/main_app/templates/melody_search.html +++ b/django/cantusdb_project/main_app/templates/melody_search.html @@ -1,124 +1,125 @@ -{% extends "base.html" %} -{% block content %} -Search by melody | Cantus Database - -
-
-
-

Search by melody

-

- This melody search provides results based on the Cantus Database chants. -
- For searching in chant melody catalogues - go here: Cantus Index Melody Search. -

+{% extends "base_page_with_side_cards.html" %} -
- vopiano_clef - dash - dash - dash - dash - dash - dash - dash - dash - dash - dash - dash - dash - dash - dash -
-
- - - +{% block title %} +Search by melody | Cantus Database +{% endblock %} -
-
-
- - {% if source %} - - {% else %} - - {% endif %} -
-
- - -
-
- - -
-
- - -
-
- - -
-
+{% block script %} + +{% endblock %} -
-
- - -
- - -
-
- - -
- - -
-
-
+{% block maincontent %} +

Search by melody

+

+ This melody search provides results based on the Cantus Database chants. +
+ For searching in chant melody catalogues + go here: Cantus Index Melody Search. +

- {% if source %} - Searching in source: {{ source.title }} - {% endif %} +
+ vopiano_clef + dash + dash + dash + dash + dash + dash + dash + dash + dash + dash + dash + dash + dash + dash +
+
+ + + -
+
+
+
+ + {% if source %} + + {% else %} + + {% endif %} +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
-
-
- {% include "global_search_bar.html" %} +
+
+ + +
+ +
+
+ + +
+ + +
+
+ -
+ {% if source %} + Searching in source: {{ source.title }} + {% endif %} -
- Melody Search Tool -
+
+{% endblock %} -
- -
    -
  • Enter the melody shape by mouse clicks on the staff.
    • -
  • Ignore the repeating notes - the system will not allow you to enter the same pitch twice.
    • -
-

- CANTUS Melody Search tool was developed by Jan Koláček and first used in the - Global Chant Database -

-

- Volpiano font - Version 4.02 (© fawe, September 2011) Courtesy of David Hiley and his research team at the - Universität Regensburg. For more details, including information on the newest versions of this font, - please refer to http://www.fawe.de/volpiano/. -

- -
+{% block lowersidebar %} +
+ {% include "global_search_bar.html" %} +
-
+
+ +
+ Melody Search Tool
+ +
+ +
    +
  • Enter the melody shape by mouse clicks on the staff.
    • +
  • Ignore the repeating notes - the system will not allow you to enter the same pitch twice.
    • +
+

+ CANTUS Melody Search tool was developed by Jan Koláček and first used in the + Global Chant Database +

+

+ Volpiano font - Version 4.02 (© fawe, September 2011) Courtesy of David Hiley and his research team at the + Universität Regensburg. For more details, including information on the newest versions of this font, + please refer to http://www.fawe.de/volpiano/. +

+ +
+
-
{% endblock %} diff --git a/django/cantusdb_project/main_app/templates/source_detail.html b/django/cantusdb_project/main_app/templates/source_detail.html index f197dd6f6..1e6abff2c 100644 --- a/django/cantusdb_project/main_app/templates/source_detail.html +++ b/django/cantusdb_project/main_app/templates/source_detail.html @@ -1,344 +1,346 @@ -{% extends "base.html" %} -{% block content %} +{% extends "base_page_with_side_cards.html" %} +{% block title %} {% load helper_tags %} {{ source.title }} | Cantus Database +{% endblock %} + +{% block script %} +{% endblock %} -
-
-
- - {% if messages %} -
- {% for message in messages %} - {{ message }} - {% endfor %} -
- {% endif %} -

{{ source.title }}

+{% block uppersidebar %} +
+ {% include "global_search_bar.html" %} +
+{% endblock %} - {% if user_can_edit_source %} -

- View | Edit -

- {% endif %} +{% block maincontent %} -
- {% if source.siglum %} -
Siglum
-
{{ source.siglum }}
- {% endif %} + +{% if messages %} +
+ {% for message in messages %} + {{ message }} + {% endfor %} +
+{% endif %} +

{{ source.title }}

- {% if source.summary %} -
Summary
-
{{ source.summary }}
- {% endif %} +{% if user_can_edit_source %} +

+ View | Edit +

+{% endif %} - {% if source.liturgical_occasions %} -
Liturgical Occasions
-
{{ source.liturgical_occasions|linebreaks }}
- {% endif %} +
+ {% if source.siglum %} +
Siglum
+
{{ source.siglum }}
+ {% endif %} - {% if source.description %} -
Description
-
{{ source.description|safe|linebreaks }}
- {% endif %} + {% if source.summary %} +
Summary
+
{{ source.summary }}
+ {% endif %} - {% if source.selected_bibliography %} -
Selected Bibliography
-
{{ source.selected_bibliography|safe|linebreaks }}
- {% endif %} + {% if source.liturgical_occasions %} +
Liturgical Occasions
+
{{ source.liturgical_occasions|linebreaks }}
+ {% endif %} - {% if source.indexing_notes %} -
Notes on the Inventory
-
{{ source.indexing_notes|safe }}
- {% endif %} + {% if source.description %} +
Description
+
{{ source.description|safe|linebreaks }}
+ {% endif %} - {% if source.other_editors.exists %} -
Other Editors
-
- {% for editor in source.other_editors.all %} - {% if editor.full_name %} - {{ editor.full_name }}
- {% else %} - User {{ editor.id }}
- {% endif %} - {% endfor %} -
- {% endif %} + {% if source.selected_bibliography %} +
Selected Bibliography
+
{{ source.selected_bibliography|safe|linebreaks }}
+ {% endif %} - {% if source.full_text_entered_by.exists %} -
Full Texts Entered by
-
- {% for editor in source.full_text_entered_by.all %} - {% if editor.full_name %} - {{ editor.full_name }}
- {% else %} - User {{ editor.id }}
- {% endif %} - {% endfor %} -
- {% endif %} + {% if source.indexing_notes %} +
Notes on the Inventory
+
{{ source.indexing_notes|safe }}
+ {% endif %} - {% if source.melodies_entered_by.exists %} -
Melodies Entered by
-
- {% for editor in source.melodies_entered_by.all %} - {% if editor.full_name %} - {{ editor.full_name }}
- {% else %} - User {{ editor.id }}
- {% endif %} - {% endfor %} -
+ {% if source.other_editors.exists %} +
Other Editors
+
+ {% for editor in source.other_editors.all %} + {% if editor.full_name %} + {{ editor.full_name }}
+ {% else %} + User {{ editor.id }}
{% endif %} + {% endfor %} +
+ {% endif %} - {% if source.complete_inventory is not None %} -
Complete/Partial Inventory
-
{{ source.complete_inventory|yesno:"Complete Inventory,Partial Inventory" }}
+ {% if source.full_text_entered_by.exists %} +
Full Texts Entered by
+
+ {% for editor in source.full_text_entered_by.all %} + {% if editor.full_name %} + {{ editor.full_name }}
+ {% else %} + User {{ editor.id }}
{% endif %} + {% endfor %} +
+ {% endif %} - {% if source.full_source is not None %} -
Full Source/Fragment
-
{{ source.full_source|yesno:"Full Source,Fragment or Fragmented" }}
+ {% if source.melodies_entered_by.exists %} +
Melodies Entered by
+
+ {% for editor in source.melodies_entered_by.all %} + {% if editor.full_name %} + {{ editor.full_name }}
+ {% else %} + User {{ editor.id }}
{% endif %} + {% endfor %} +
+ {% endif %} - {% if user.is_authenticated %} -
Source Status
-
{{ source.published|yesno:"Published,Unpublished" }}
- {% endif %} - - {% if source.fragmentarium_id is not None %} -
Fragment ID
-
{{ source.fragmentarium_id }}
- {% endif %} + {% if source.complete_inventory is not None %} +
Complete/Partial Inventory
+
{{ source.complete_inventory|yesno:"Complete Inventory,Partial Inventory" }}
+ {% endif %} - {% if source.dact_id is not None %} -
DACT ID
-
{{ source.dact_id }}
- {% endif %} -
+ {% if source.full_source is not None %} +
Full Source/Fragment
+
{{ source.full_source|yesno:"Full Source,Fragment or Fragmented" }}
+ {% endif %} - {% if sequences %} -

Sequences in this source

- Displaying 1 - {{ sequences.count }} of {{ sequences.count }} - - - - - - - - - - - - - - - - {% for sequence in sequences %} - - - - - - - - - - - {% endfor %} - -
SiglumText IncipitRubricsAHCantus IDNotes 1Notes 2Notes 3
- {{ source.siglum }} -
- {{ sequence.folio }} {{ sequence.s_sequence }} - 		- {{ sequence.incipit|default:"" }} - - {{ sequence.rubrics|default:"" }} - - {{ sequence.analecta_hymnica|default:"" }} - - {% comment %} use `urlencode` filter because 1 chant and 2 sequences have forward slash in their cantus_id (data error) {% endcomment %} - {{ sequence.cantus_id|default:"" }} - - {{ sequence.col1|default:"" }} - - {{ sequence.col2|default:"" }} - - {{ sequence.col3|default:"" }} -
- - {% endif %} -
+ {% if user.is_authenticated %} +
Source Status
+
{{ source.published|yesno:"Published,Unpublished" }}
+ {% endif %} + + {% if source.fragmentarium_id is not None %} +
Fragment ID
+
{{ source.fragmentarium_id }}
+ {% endif %} -
-
- {% include "global_search_bar.html" %} -
+ {% if source.dact_id is not None %} +
DACT ID
+
{{ source.dact_id }}
+ {% endif %} + -
-
-

{{ source.siglum }}

-
-
- - {% if source.segment.id == 4063 %} - {# all of the following are different ways to link to the Chant List page #} - {# Since sources in the Bower segment contain no chants, the Chant List page #} - {# is currently set up to raise a 404 if you try to access it for a source in #} - {# the Bower segment. So, we need to display this section only for sources in #} - {# the CANTUS segment #} - - +{% if sequences %} +

Sequences in this source

+ Displaying 1 - {{ sequences.count }} of {{ sequences.count }} + + + + + + + + + + + + + + + + {% for sequence in sequences %} + + + + + + + + + + + {% endfor %} + +
SiglumText IncipitRubricsAHCantus IDNotes 1Notes 2Notes 3
+ {{ source.siglum }} +
+ {{ sequence.folio }} {{ sequence.s_sequence }} + 		+ {{ sequence.incipit|default:"" }} + + {{ sequence.rubrics|default:"" }} + + {{ sequence.analecta_hymnica|default:"" }} + + {% comment %} use `urlencode` filter because 1 chant and 2 sequences have forward slash in their cantus_id (data error) {% endcomment %} + {{ sequence.cantus_id|default:"" }} + + {{ sequence.col1|default:"" }} + + {{ sequence.col2|default:"" }} + + {{ sequence.col3|default:"" }} +
+ +{% endif %} +{% endblock %} - +{% block lowersidebar %} +
+
+

{{ source.siglum }}

+
+
+ + {% if source.segment.id == 4063 %} + {# all of the following are different ways to link to the Chant List page #} + {# Since sources in the Bower segment contain no chants, the Chant List page #} + {# is currently set up to raise a 404 if you try to access it for a source in #} + {# the Bower segment. So, we need to display this section only for sources in #} + {# the CANTUS segment #} + + -
- View all chants - {% endif %} - View full inventory - {% if source.exists_on_cantus_ultimus %} - 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) - -
-
+ -
-
- - {{ source.segment.name }} -
- {{ source.siglum }} -
-
- - {% if source.provenance.name %} - Provenance: {{source.provenance.name}} -
- {% endif %} - {% if source.date %} - Date: - {% for century in source.century.all %} - - {{ century.name }} - - {% endfor %} - | - {{ source.date|default_if_none:"" }} -
- {% endif %} - {% if source.cursus %} - Cursus: {{ source.cursus|default_if_none:"" }} -
+ View all chants + {% endif %} + View full inventory + {% if source.exists_on_cantus_ultimus %} + 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) + +
+
+ +
+
+ + {{ source.segment.name }} + +
+ {{ source.siglum }} +
+
+ + {% if source.provenance.name %} + Provenance: {{source.provenance.name}} +
+ {% endif %} + {% if source.date %} + Date: + {% for century in source.century.all %} + + {{ century.name }} + + {% endfor %} + | + {{ source.date|default_if_none:"" }} +
+ {% endif %} + {% if source.cursus %} + Cursus: {{ source.cursus|default_if_none:"" }} +
+ {% endif %} + {% if source.notation.exists %} + Notation: + {{ source.notation.all.first.name }} + +
+ {% endif %} + {% if source.inventoried_by.exists %} + Inventoried by: +
    + {% for editor in source.inventoried_by.all %} +
  • + {% if editor.full_name %} + {{ editor.full_name }}
    + {% else %} + User {{ editor.id }}
    + {% endif %} + {{ editor.institution|default_if_none:"" }} +
    • + {% endfor %} +
+ {% endif %} + {% if source.proofreaders.exists %} + Proofreader{{ source.proofreaders.all|pluralize }}: +
+ + {% endif %} + {{ source.indexing_notes|default_if_none:""|safe }} +
+ {% with creator=source.created_by %} + {% if creator %} + {% if creator.full_name %} + Contributor: {{ creator.full_name }} + {% else %} + Contributor: User {{ creator.id }} {% endif %} - {% if source.notation.exists %} - Notation: - {{ source.notation.all.first.name }} - -
+ {% endif %} + {% endwith %} + +
+
+ {% if user_can_edit_chants %} +
+
+ Source edit options +
+ {{ source.siglum }} +
+
+ +
+ +
- {% if user_can_edit_chants %} -
-
- Source edit options -
- {{ source.siglum }} -
-
- - - -
-
- {% endif %}
-
-
+ {% endif %} {% endblock %} diff --git a/django/cantusdb_project/main_app/templates/source_edit.html b/django/cantusdb_project/main_app/templates/source_edit.html index e7dcaa476..ba300874b 100644 --- a/django/cantusdb_project/main_app/templates/source_edit.html +++ b/django/cantusdb_project/main_app/templates/source_edit.html @@ -1,302 +1,305 @@ -{% extends "base.html" %} +{% extends "base_page_with_side_cards.html" %} {% load static %} -{% block content %} + +{% block title %} {{ source.title }} | Cantus Database +{% endblock %} + +{% block script %} {{ form.media }} +{% endblock %} -
-
-
- - {% 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 %} -
- {% endif %} -

Edit Source {{ source.title }}

+{% block uppersidebar %} +
+ {% include "global_search_bar.html" %} +
+{% endblock %} -

- View | Edit -

+{% block maincontent %} + + {% 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 %} +
+ {% endif %} -
{% csrf_token %} -
+

Edit Source {{ source.title }}

-
- - {{ form.title }} -
-
+

+ View | Edit +

-
-
- - {{ form.siglum }} - RISM-style siglum + Shelf-mark (e.g. GB-Ob 202). -
-
+ {% csrf_token %} +
-
-
- - {{ form.provenance }} -
If the origin is unknown, select a location where the source was used later in its lifetime and provide details in the "Provenance notes" field. -
-
+
+ + {{ form.title }} +
+
-
-
- {{ form.provenance_notes.label_tag }} - {{ form.provenance_notes }} - More exact indication of the provenance (if necessary) -
-
- - {{ form.full_source }} -
-
+
+
+ + {{ form.siglum }} + RISM-style siglum + Shelf-mark (e.g. GB-Ob 202). +
+
-
-
- {{ form.century.label_tag }} - {{ form.century }} -
-
+
+
+ + {{ form.provenance }} +
If the origin is unknown, select a location where the source was used later in its lifetime and provide details in the "Provenance notes" field. +
+
-
-
- {{ form.date.label_tag }} - {{ form.date }} - Date of the source (e.g. "1200s", "1300-1350", etc.) -
-
+
+
+ {{ form.provenance_notes.label_tag }} + {{ form.provenance_notes }} + More exact indication of the provenance (if necessary) +
+
+ + {{ form.full_source }} +
+
-
-
- {{ form.cursus.label_tag }} - {{ form.cursus }} -
-
+
+
+ {{ form.century.label_tag }} + {{ form.century }} +
+
-
-
- {{ form.current_editors.label_tag }} - {{ form.current_editors }} -
-
-
-
- {{ form.melodies_entered_by.label_tag }} - {{ form.melodies_entered_by }} -
-
-
-
- {{ form.inventoried_by.label_tag }} - {{ form.inventoried_by }} -
-
-
-
- {{ form.full_text_entered_by.label_tag }} - {{ form.full_text_entered_by }} -
-
-
-
- {{ form.proofreaders.label_tag }} - {{ form.proofreaders }} -
-
-
-
- {{ form.other_editors.label_tag }} - {{ form.other_editors }} -
-
+
+
+ {{ form.date.label_tag }} + {{ form.date }} + Date of the source (e.g. "1200s", "1300-1350", etc.) +
+
-
-
- - {{ form.complete_inventory }} -
-
+
+
+ {{ form.cursus.label_tag }} + {{ form.cursus }} +
+
+ +
+
+ {{ form.current_editors.label_tag }} + {{ form.current_editors }} +
+
+
+
+ {{ form.melodies_entered_by.label_tag }} + {{ form.melodies_entered_by }} +
+
+
+
+ {{ form.inventoried_by.label_tag }} + {{ form.inventoried_by }} +
+
+
+
+ {{ form.full_text_entered_by.label_tag }} + {{ form.full_text_entered_by }} +
+
+
+
+ {{ form.proofreaders.label_tag }} + {{ form.proofreaders }} +
+
+
+
+ {{ form.other_editors.label_tag }} + {{ form.other_editors }} +
+
-
-
- {{ form.summary.label_tag }} - {{ form.summary }} -
-
+
+
+ + {{ form.complete_inventory }} +
+
-
-
- {{ form.liturgical_occasions.label_tag }} - {{ form.liturgical_occasions }} -
-
+
+
+ {{ form.summary.label_tag }} + {{ form.summary }} +
+
-
-
- {{ form.description.label_tag }} - {{ form.description }} -
-
+
+
+ {{ form.liturgical_occasions.label_tag }} + {{ form.liturgical_occasions }} +
+
-
-
- {{ form.selected_bibliography.label_tag }} - {{ form.selected_bibliography }} -
-
+
+
+ {{ form.description.label_tag }} + {{ form.description }} +
+
-
-
- {{ form.image_link.label_tag }} - {{ form.image_link }} - HTTP link to the image gallery of the source. -
-
+
+
+ {{ form.selected_bibliography.label_tag }} + {{ form.selected_bibliography }} +
+
-
-
- - {{ form.fragmentarium_id }} -
-
- - {{ form.dact_id }} -
-
+
+
+ {{ form.image_link.label_tag }} + {{ form.image_link }} + HTTP link to the image gallery of the source. +
+
-
-
- - {{ form.indexing_notes }} -
-
+
+
+ + {{ form.fragmentarium_id }} +
+
+ + {{ form.dact_id }} +
+
-
-
- -
-
- Delete -
-
-
+
+
+ + {{ form.indexing_notes }} +
-
-
- {% include "global_search_bar.html" %} +
+
+ +
+
+ Delete
+
+ +{% endblock %} -
-
-

{{ source.siglum }}

-
-
- - - +{% block lowersidebar %} +
+
+

{{ source.siglum }}

+
+
+ + + - + -
- {% if source.segment.id == 4063 %} - {# only display this link for sources in the CANTUS segment #} - View all chants - {% endif %} - View full inventory - {% if source.exists_on_cantus_ultimus %} - 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) +
+ {% if source.segment.id == 4063 %} + {# only display this link for sources in the CANTUS segment #} + View all chants + {% endif %} + View full inventory + {% if source.exists_on_cantus_ultimus %} + 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) - - {% if chants.exists %} - - - {% for chant in chants %} - - - - - - - - - {% endfor %} - -
- {{ chant.c_sequence }} - - - {{ chant.office.name|default:"" }} -
- {{ chant.genre.name|default:"" }} -
- {{ chant.position|default:"" }} - - 		- {{ chant.incipit|default:"" }} - - {{ chant.cantus_id|default:"" }} - - {{ chant.mode|default:"" }} - - -
- {% endif %} -
-
-
-
-
+ + {% if chants.exists %} + + + {% for chant in chants %} + + + + + + + + + {% endfor %} + +
+ {{ chant.c_sequence }} + + + {{ chant.office.name|default:"" }} +
+ {{ chant.genre.name|default:"" }} +
+ {{ chant.position|default:"" }} + + 		+ {{ chant.incipit|default:"" }} + + {{ chant.cantus_id|default:"" }} + + {{ chant.mode|default:"" }} + + +
+ {% endif %} +
+
{% endblock %} diff --git a/django/cantusdb_project/main_app/templates/user_source_list.html b/django/cantusdb_project/main_app/templates/user_source_list.html index 358472278..ff6f928ae 100644 --- a/django/cantusdb_project/main_app/templates/user_source_list.html +++ b/django/cantusdb_project/main_app/templates/user_source_list.html @@ -1,95 +1,97 @@ -{% extends "base.html" %} +{% extends "base_page_with_side_cards.html" %} {% load helper_tags %} {# for url_add_get_params #} -{% block content %} + +{% block title %} My Sources | Cantus Database -
-
-
-

My Sources

- + Add new source - - - {% for source in page_obj %} - - - {% if source.chant_set.exists %} - - {% else %} - - {% endif %} - - {% endfor %} - -
- - {{ source.siglum }} - - - - Full text & volpiano editor - - - Source contains no chants – - Add new chant -
- {% include "pagination.html" %} +{% endblock %} + +{% block uppersidebar %} +
+ {% include "global_search_bar.html" %} +
+{% endblock %} + +{% block maincontent %} +

My Sources

+ + Add new source + + + {% for source in page_obj %} + + + {% if source.chant_set.exists %} + + {% else %} + + {% endif %} + + {% endfor %} + +
+ + {{ source.siglum }} + + + + Full text & volpiano editor + + + Source contains no chants – + Add new chant +
+ {% include "pagination.html" %} +{% endblock %} + +{% block lowersidebar %} +
+
+

Sources created by user

-
-
- {% include "global_search_bar.html" %} -
-
-
-

Sources created by user

-
-
- + Add new source - + -
-
-
-
-
+ {% if user_created_sources_page_obj.has_next %} + next + last + » + {% endif %} + +
+
+
{% endblock %} diff --git a/django/cantusdb_project/templates/base.html b/django/cantusdb_project/templates/base.html index 67f79df6c..5a34c789e 100644 --- a/django/cantusdb_project/templates/base.html +++ b/django/cantusdb_project/templates/base.html @@ -144,13 +144,6 @@ } } - @media (min-width: 992px) { /* 992px = bootstrap large breakpoint */ - .main-content { - margin-right: 16px; - - } - } - @media (max-width: 992px) { /* 992px = bootstrap large breakpoint */ .main-content { margin-bottom: 16px; diff --git a/django/cantusdb_project/templates/base_page_with_side_cards.html b/django/cantusdb_project/templates/base_page_with_side_cards.html new file mode 100644 index 000000000..c38b00c8a --- /dev/null +++ b/django/cantusdb_project/templates/base_page_with_side_cards.html @@ -0,0 +1,27 @@ +{% extends "base.html" %} +{% block content %} +{% block title %} +{% endblock %} +{% block script %} +{% endblock %} + +
+
+
+ {% block uppersidebar %} + {# Cards in this section will jump above the main content on small screens #} + {% endblock %} +
+
+ {% block maincontent %} + {% endblock %} +
+ +
+ {% block lowersidebar %} + {# Cards in this section will jump below the main content on small screens #} + {% endblock %} +
+
+
+{% endblock %} \ No newline at end of file diff --git a/django/cantusdb_project/templates/flatpages/default.html b/django/cantusdb_project/templates/flatpages/default.html index f928fdd75..b941e2947 100644 --- a/django/cantusdb_project/templates/flatpages/default.html +++ b/django/cantusdb_project/templates/flatpages/default.html @@ -1,158 +1,154 @@ -{% extends "base.html" %} +{% extends "base_page_with_side_cards.html" %} {% load helper_tags %} {# for source_links, recent_articles, get_user_source_pagination, get_user_created_source_pagination #} -{% block content %} -
+{% block title %} {{ flatpage.title }} | Cantus Database -
-
-

{{ flatpage.title }}

- {{ flatpage.content }} +{% endblock %} + +{% block uppersidebar %} +
+ {% include "global_search_bar.html" %} +
+
+
+ Jump to Source +
+
+
- -
-
- {% include "global_search_bar.html" %} -
-
-
- Jump to Source -
-
- -
+ +
+{% endblock %} - -
+{% block maincontent %} +

{{ flatpage.title }}

+ {{ flatpage.content }} +{% endblock %} - {% if request.user|has_group:"contributor" or request.user|has_group:"editor" or request.user|has_group:"project manager" %} -
-
- My Sources -
- {% get_user_source_pagination as user_sources_page_obj %} -
- + Add new source - + -
+ {% if user_sources_page_obj.has_next %} + next + last + » + {% endif %} +
-
{# for gap between "My sources" and "Sources created by user" cards #} -
-
- Sources created by user -
- {% get_user_created_source_pagination as user_created_sources_page_obj %} -
- + Add new source -
+
+
{# for gap between "My sources" and "Sources created by user" cards #} +
+
+ Sources created by user +
+ {% get_user_created_source_pagination as user_created_sources_page_obj %} +
+ + Add new source + - -
- {% else %} -
-
- What's New -
-
- {% recent_articles %} -
+ {% if user_created_sources_page_obj.has_next %} + next + last + » + {% endif %} +
- {% endif %} +
+
+ {% else %} +
+
+ What's New +
+
+ {% recent_articles %} +
-
-
- - + {% endif %} {% endblock %}