This is an automated email from the ASF dual-hosted git repository.
gcruz pushed a commit to branch gc/8444
in repository https://gitbox.apache.org/repos/asf/allura.git
The following commit(s) were added to refs/heads/gc/8444 by this push:
new 1a9679274 [#8444] remove page=0 from url string for meta canonical and
prev link
1a9679274 is described below
commit 1a96792744c558e964205247d08a0b67e5a0d32d
Author: Guillermo Cruz <[email protected]>
AuthorDate: Mon Jul 18 18:06:06 2022 +0000
[#8444] remove page=0 from url string for meta canonical and prev link
---
Allura/allura/templates/jinja_master/lib.html | 18 ++++++++++++++----
ForgeBlog/forgeblog/templates/blog/index.html | 2 +-
ForgeBlog/forgeblog/templates/blog/search.html | 2 +-
.../templates/discussionforums/search.html | 2 +-
.../templates/discussionforums/thread.html | 2 +-
ForgeDiscussion/forgediscussion/templates/index.html | 2 +-
ForgeTracker/forgetracker/templates/tracker/index.html | 2 +-
.../forgetracker/templates/tracker/milestone.html | 2 +-
.../forgetracker/templates/tracker/search.html | 2 +-
9 files changed, 22 insertions(+), 12 deletions(-)
diff --git a/Allura/allura/templates/jinja_master/lib.html
b/Allura/allura/templates/jinja_master/lib.html
index 5b2035dc4..cd1f92d52 100644
--- a/Allura/allura/templates/jinja_master/lib.html
+++ b/Allura/allura/templates/jinja_master/lib.html
@@ -886,14 +886,24 @@ This page is based on some examples from Greg Schueler,
<a href="mailto:greg@var
{%- do g.register_forge_js('js/prop-types.min.js', location=location) %}
{%- endmacro %}
-{% macro canonical_tag() %}
-{% set page= '?page=' ~ request.GET['page'] if 'page=' in request.query_string
and request.GET['page']|int > 0 else '' %}
-<link rel="canonical" href="{{ h.querystring(request, dict(limit=None)) }}"/>
+{% macro canonical_tag(page=None) %}
+ {# in case is inherithed from a child template and has no access to a
page value #}
+ {% set page = request.GET['page'] if not page and 'page=' in
request.query_string else page %}
+ {% if page == '0' %}
+ <link rel="canonical" href="{{ h.querystring(request,
dict(page=None,limit=None)) }}"/>
+ {% else %}
+ <link rel="canonical" href="{{ h.querystring(request,
dict(limit=None)) }}"/>
+
+ {% endif %}
{% endmacro %}
{% macro pagination_meta_tags(request, current_page=None, results_count=None,
limit=None) %}
{%- if current_page > 0 -%}
- <link rel="prev" href="{{ h.querystring(request,
dict(page=current_page - 1,limit=None)) }}"/>
+ {% if current_page == 1 %}
+ <link rel="prev" href="{{ h.querystring(request,
dict(page=None,limit=None)) }}"/>
+ {% else %}
+ <link rel="prev" href="{{ h.querystring(request,
dict(page=current_page - 1,limit=None)) }}"/>
+ {% endif %}
{% endif %}
{% set current_page = current_page + 1 %}
{% set total_pages = h.ceil(results_count/limit) %}
diff --git a/ForgeBlog/forgeblog/templates/blog/index.html
b/ForgeBlog/forgeblog/templates/blog/index.html
index 8998b54d0..c88a3aa19 100644
--- a/ForgeBlog/forgeblog/templates/blog/index.html
+++ b/ForgeBlog/forgeblog/templates/blog/index.html
@@ -24,7 +24,7 @@
{% if count == 0 %}
<meta name="robots" content="noindex, follow"/>
{% endif %}
- {{ lib.canonical_tag() }}
+ {{ lib.canonical_tag(page) }}
{{ lib.pagination_meta_tags(request, page, count, limit) }}
{% endblock %}
diff --git a/ForgeBlog/forgeblog/templates/blog/search.html
b/ForgeBlog/forgeblog/templates/blog/search.html
index a59677615..b7b84eb63 100644
--- a/ForgeBlog/forgeblog/templates/blog/search.html
+++ b/ForgeBlog/forgeblog/templates/blog/search.html
@@ -22,7 +22,7 @@
{% block head %}
<meta name="robots" content="noindex, follow">
- {{ lib.canonical_tag() }}
+ {{ lib.canonical_tag(page) }}
{{ lib.pagination_meta_tags(request, page, count, limit) }}
{% endblock %}
diff --git
a/ForgeDiscussion/forgediscussion/templates/discussionforums/search.html
b/ForgeDiscussion/forgediscussion/templates/discussionforums/search.html
index bd2568393..4ea1e5f37 100644
--- a/ForgeDiscussion/forgediscussion/templates/discussionforums/search.html
+++ b/ForgeDiscussion/forgediscussion/templates/discussionforums/search.html
@@ -22,7 +22,7 @@
{% block head %}
<meta name="robots" content="noindex, follow">
- {{ lib.canonical_tag() }}
+ {{ lib.canonical_tag(page) }}
{{ lib.pagination_meta_tags(request, page, count, limit) }}
{% endblock %}
diff --git
a/ForgeDiscussion/forgediscussion/templates/discussionforums/thread.html
b/ForgeDiscussion/forgediscussion/templates/discussionforums/thread.html
index c06d9676b..ab8d3f4c9 100644
--- a/ForgeDiscussion/forgediscussion/templates/discussionforums/thread.html
+++ b/ForgeDiscussion/forgediscussion/templates/discussionforums/thread.html
@@ -23,7 +23,7 @@
{{thread.subject and '%s: %s' % (thread.discussion.name, (thread.subject or
'(no subject)')) or thread.discussion.name}}
{% endblock %}
{% block head %}
- {{ lib.canonical_tag() }}
+ {{ lib.canonical_tag(page) }}
{{ lib.pagination_meta_tags(request, page, count, limit) }}
{% endblock %}
{% block header %}{{'subject' in thread and thread.subject or '(no
subject)'}}{% endblock %}
diff --git a/ForgeDiscussion/forgediscussion/templates/index.html
b/ForgeDiscussion/forgediscussion/templates/index.html
index 8f199a05f..b3a74b57b 100644
--- a/ForgeDiscussion/forgediscussion/templates/index.html
+++ b/ForgeDiscussion/forgediscussion/templates/index.html
@@ -23,7 +23,7 @@
{% if not threads|length %}
<meta name="robots" content="noindex, follow">
{% endif %}
- {{ lib.canonical_tag() }}
+ {{ lib.canonical_tag(page) }}
{{ lib.pagination_meta_tags(request, page, count, limit) }}
{% endblock %}
diff --git a/ForgeTracker/forgetracker/templates/tracker/index.html
b/ForgeTracker/forgetracker/templates/tracker/index.html
index d0ddfc337..7e15113ef 100644
--- a/ForgeTracker/forgetracker/templates/tracker/index.html
+++ b/ForgeTracker/forgetracker/templates/tracker/index.html
@@ -25,7 +25,7 @@
{% block head %}
<link rel="alternate" type="application/rss+xml" title="RSS"
href="feed.rss"/>
<link rel="alternate" type="application/atom+xml" title="Atom"
href="feed.atom"/>
- {{ lib.canonical_tag() }}
+ {{ lib.canonical_tag(page) }}
{{ lib.pagination_meta_tags(request, page, count, limit) }}
{% endblock %}
diff --git a/ForgeTracker/forgetracker/templates/tracker/milestone.html
b/ForgeTracker/forgetracker/templates/tracker/milestone.html
index 35ecf8a3c..0bdca6b61 100644
--- a/ForgeTracker/forgetracker/templates/tracker/milestone.html
+++ b/ForgeTracker/forgetracker/templates/tracker/milestone.html
@@ -25,7 +25,7 @@
{% block header %}{{field.label}} {{milestone.name}}{% endblock %}
{% block head %}
- {{ lib.canonical_tag() }}
+ {{ lib.canonical_tag(page) }}
{{ lib.pagination_meta_tags(request, page, count, limit) }}
{% endblock %}
diff --git a/ForgeTracker/forgetracker/templates/tracker/search.html
b/ForgeTracker/forgetracker/templates/tracker/search.html
index e492043e0..8d43892e9 100644
--- a/ForgeTracker/forgetracker/templates/tracker/search.html
+++ b/ForgeTracker/forgetracker/templates/tracker/search.html
@@ -30,7 +30,7 @@
{% endif %}
<link rel="alternate" type="application/rss+xml" title="RSS"
href="feed.rss"/>
<link rel="alternate" type="application/atom+xml" title="Atom"
href="feed.atom"/>
- {{ lib.canonical_tag() }}
+ {{ lib.canonical_tag(page) }}
{{ lib.pagination_meta_tags(request, page, count, limit) }}
{% endblock %}
