From 5f4b0a45975fe454d9d8538d0526ca012bf28ada Mon Sep 17 00:00:00 2001 From: Matthieu Guimard <matthieu.guimard@univ-grenoble-alpes.fr> Date: Fri, 21 Feb 2025 14:37:59 +0100 Subject: [PATCH 1/4] added condition is_cr --- src/ptf/views/base_views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ptf/views/base_views.py b/src/ptf/views/base_views.py index d5ba39c0..158bc9a9 100644 --- a/src/ptf/views/base_views.py +++ b/src/ptf/views/base_views.py @@ -649,7 +649,7 @@ class VolumeDetailView(TemplateView): year = int(issues_articles[0]["issue"].year.split("-")[0]) context["modern_cras"] = False context["year"] = year - if year >= 2021: + if year >= 2021 and is_cr: self.template_name = "blocks/volume-general-items.html" # used for special issue with year == context["year"] in_year_special_issues = collection.content.exclude(title_html="").filter(Q(year=year) | Q(resources_in_special_issue__resource__date_published__year=year)).order_by("-year", "-volume", "-number").distinct() -- GitLab From 2ca23b4b25e62325356beaa109ba5b1e8b2e1b53 Mon Sep 17 00:00:00 2001 From: Matthieu Guimard <matthieu.guimard@univ-grenoble-alpes.fr> Date: Fri, 21 Feb 2025 14:42:29 +0100 Subject: [PATCH 2/4] =?UTF-8?q?un=20comment=20bread=20crumb=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/ptf/templates/ptf/bs5/blocks/volume-items.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ptf/templates/ptf/bs5/blocks/volume-items.html b/src/ptf/templates/ptf/bs5/blocks/volume-items.html index b1b10e17..d55a0d49 100644 --- a/src/ptf/templates/ptf/bs5/blocks/volume-items.html +++ b/src/ptf/templates/ptf/bs5/blocks/volume-items.html @@ -12,10 +12,10 @@ {% endwith %} {% endif %} {% endblock %} -{% comment %} + {% block breadcrumb %} {% include "common/breadcrumb.html" %} -{% endblock %} {% endcomment %} +{% endblock %} {% block center_middle %} {% if all_issues %} -- GitLab From e6b2c77ec1512006153a5a508bb5958c7e7667b5 Mon Sep 17 00:00:00 2001 From: Matthieu Guimard <matthieu.guimard@univ-grenoble-alpes.fr> Date: Fri, 21 Feb 2025 15:02:27 +0100 Subject: [PATCH 3/4] added is_cr in tempaltes --- .../templates/ptf/bs5/blocks/issue-list.html | 20 ++++++++++--------- .../bs5/common/issue/special-issue-list.html | 1 + 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/ptf/templates/ptf/bs5/blocks/issue-list.html b/src/ptf/templates/ptf/bs5/blocks/issue-list.html index 300a0fb5..3fc7047f 100644 --- a/src/ptf/templates/ptf/bs5/blocks/issue-list.html +++ b/src/ptf/templates/ptf/bs5/blocks/issue-list.html @@ -17,16 +17,18 @@ <img href="{% static logo_path %}" src="{% static logo_path %}" class="lightbox journal-image"> {% endif %} {% endwith %} - <div class="w-100 cras-issue-list"> - <div class="year-listing"> - {% include "common/issue/issue-list.html" %} + {% if is_cr %} + <div class="w-100 cras-issue-list"> + <div class="year-listing"> + {% include "common/issue/issue-list.html" %} + </div> + + <div class="special-issues-listing"> + + {% include "common/issue/special-issue-list.html" %} + </div> </div> - - <div class="special-issues-listing"> - - {% include "common/issue/special-issue-list.html" %} - </div> - </div> + {% endif %} </div> {% endblock %} diff --git a/src/ptf/templates/ptf/bs5/common/issue/special-issue-list.html b/src/ptf/templates/ptf/bs5/common/issue/special-issue-list.html index 6144227b..ecbda84d 100644 --- a/src/ptf/templates/ptf/bs5/common/issue/special-issue-list.html +++ b/src/ptf/templates/ptf/bs5/common/issue/special-issue-list.html @@ -50,6 +50,7 @@ {% comment %} {% endif %} {% endcomment %} {% endfor %} </div> + <div style="text-align:center;"> {% if LANGUAGE_CODE == 'en' %} <a href="{% url 'all_issues' journal.pid %}" >See all special issues</a> -- GitLab From a22c550c0452b91a1f8cd759cfe92e98f00a3ae8 Mon Sep 17 00:00:00 2001 From: Matthieu Guimard <matthieu.guimard@univ-grenoble-alpes.fr> Date: Fri, 21 Feb 2025 15:09:18 +0100 Subject: [PATCH 4/4] added is_cr in tempaltes --- src/ptf/templates/ptf/bs5/blocks/issue-list.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ptf/templates/ptf/bs5/blocks/issue-list.html b/src/ptf/templates/ptf/bs5/blocks/issue-list.html index 3fc7047f..e1692f14 100644 --- a/src/ptf/templates/ptf/bs5/blocks/issue-list.html +++ b/src/ptf/templates/ptf/bs5/blocks/issue-list.html @@ -17,12 +17,12 @@ <img href="{% static logo_path %}" src="{% static logo_path %}" class="lightbox journal-image"> {% endif %} {% endwith %} - {% if is_cr %} + <div class="w-100 cras-issue-list"> <div class="year-listing"> {% include "common/issue/issue-list.html" %} </div> - + {% if is_cr %} <div class="special-issues-listing"> {% include "common/issue/special-issue-list.html" %} -- GitLab