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 %} + +{% 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 }}
- +{% 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 %} + +{% 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" %} -
- + {% 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 %} + +{% 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 -