This is an automated email from the ASF dual-hosted git repository.
gcruz pushed a commit to branch gc/8469
in repository https://gitbox.apache.org/repos/asf/allura.git
The following commit(s) were added to refs/heads/gc/8469 by this push:
new ac3153185 [#8469] removed with context imports
ac3153185 is described below
commit ac31531853dc4fe1219fd2bdf3045f3e53ee9178
Author: Guillermo Cruz <[email protected]>
AuthorDate: Mon Sep 26 09:29:59 2022 -0600
[#8469] removed with context imports
---
Allura/allura/ext/user_profile/templates/user_index.html | 4 ++--
Allura/allura/templates/tool_list.html | 4 ++--
ForgeBlog/forgeblog/templates/blog/post.html | 4 ++--
ForgeDiscussion/forgediscussion/templates/discussionforums/index.html | 4 ++--
ForgeTracker/forgetracker/templates/tracker/ticket.html | 4 ++--
ForgeWiki/forgewiki/templates/wiki/browse_tags.html | 4 ++--
6 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/Allura/allura/ext/user_profile/templates/user_index.html
b/Allura/allura/ext/user_profile/templates/user_index.html
index 3678b5fbd..feace956b 100644
--- a/Allura/allura/ext/user_profile/templates/user_index.html
+++ b/Allura/allura/ext/user_profile/templates/user_index.html
@@ -18,7 +18,7 @@
-#}
{% set hide_left_bar = True %}
{% extends g.theme.master %}
-{% import 'allura:templates/jinja_master/lib.html' as lib with context %}
+{% from 'allura:templates/jinja_master/lib.html' import canonical_tag %}
{% block title %}{{user.username}} / Profile{% endblock %}
{% block header %}{{ user.display_name|default(user.username) }}{% endblock %}
@@ -29,7 +29,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() }}
+ {{ canonical_tag() }}
{%- endblock -%}
{% block actions %}
diff --git a/Allura/allura/templates/tool_list.html
b/Allura/allura/templates/tool_list.html
index 3a3287dc9..12a20712f 100644
--- a/Allura/allura/templates/tool_list.html
+++ b/Allura/allura/templates/tool_list.html
@@ -18,10 +18,10 @@
-#}
{% set hide_left_bar = True %}
{% extends g.theme.master %}
-
+{% from 'allura:templates/jinja_master/lib.html' import canonical_tag %}
{%- block head -%}
<meta name="robots" content="noindex, follow"/>
- <link rel="canonical" href="{{ request.host_url }}/{{ prefix }}{{
c.project.shortname }}/{{ type|lower }}" />
+ {{ canonical_tag() }}
{%- endblock -%}
{% block title %}{{c.project.name}} / {{type}} tools{% endblock %}
diff --git a/ForgeBlog/forgeblog/templates/blog/post.html
b/ForgeBlog/forgeblog/templates/blog/post.html
index d89063c80..dacb8c1dd 100644
--- a/ForgeBlog/forgeblog/templates/blog/post.html
+++ b/ForgeBlog/forgeblog/templates/blog/post.html
@@ -17,10 +17,10 @@
under the License.
-#}
{% extends g.theme.master %}
-{% import 'allura:templates/jinja_master/lib.html' as lib with context %}
+{% from 'allura:templates/jinja_master/lib.html' import canonical_tag %}
{%- block head -%}
- {{ lib.canonical_tag() }}
+ {{ canonical_tag() }}
{%- endblock -%}
{% block title %}{{c.project.name}} / {{c.app.config.options.mount_label}}:
{{post.title}}{% endblock %}
diff --git
a/ForgeDiscussion/forgediscussion/templates/discussionforums/index.html
b/ForgeDiscussion/forgediscussion/templates/discussionforums/index.html
index 7e3b97791..74b052111 100644
--- a/ForgeDiscussion/forgediscussion/templates/discussionforums/index.html
+++ b/ForgeDiscussion/forgediscussion/templates/discussionforums/index.html
@@ -17,7 +17,7 @@
under the License.
-#}
{% extends g.theme.master %}
-{% import 'allura:templates/jinja_master/lib.html' as lib with context %}
+{% from 'allura:templates/jinja_master/lib.html' import canonical_tag %}
{% block title %}{{c.project.name}} / {{c.app.config.options.mount_label}}{%
endblock %}
@@ -25,7 +25,7 @@
{% if noindex %}
<meta name="robots" content="noindex, follow">
{% endif %}
- {{ lib.canonical_tag() }}
+ {{ canonical_tag() }}
{%- endblock -%}
diff --git a/ForgeTracker/forgetracker/templates/tracker/ticket.html
b/ForgeTracker/forgetracker/templates/tracker/ticket.html
index 4cc747e23..9136127f5 100644
--- a/ForgeTracker/forgetracker/templates/tracker/ticket.html
+++ b/ForgeTracker/forgetracker/templates/tracker/ticket.html
@@ -18,7 +18,7 @@
-#}
{% extends g.theme.master %}
{% from 'allura:templates/jinja_master/lib.html' import abbr_date with context
%}
-{% from 'allura:templates/jinja_master/lib.html' import canonical_tag with
context %}
+{% from 'allura:templates/jinja_master/lib.html' import canonical_tag %}
{% do g.register_forge_css('css/forge/hilite.css') %}
{% do g.register_app_css('css/tracker.css') %}
@@ -28,7 +28,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() }}
+ {{ canonical_tag() }}
{%- endblock -%}
{% block header %}#{{ticket.ticket_num}} {{ticket.summary}}{% if
ticket.deleted %}<span> (deleted)</span>{% endif %}{% endblock %}
diff --git a/ForgeWiki/forgewiki/templates/wiki/browse_tags.html
b/ForgeWiki/forgewiki/templates/wiki/browse_tags.html
index cb23ca7ca..77a417493 100644
--- a/ForgeWiki/forgewiki/templates/wiki/browse_tags.html
+++ b/ForgeWiki/forgewiki/templates/wiki/browse_tags.html
@@ -17,13 +17,13 @@
under the License.
-#}
{% extends 'forgewiki:templates/wiki/master.html' %}
-{% import 'allura:templates/jinja_master/lib.html' as lib with context %}
+{% from 'allura:templates/jinja_master/lib.html' import pagination_meta_tags %}
{% block title %}{{c.project.name}} / {{c.app.config.options.mount_label}} /
Browse Labels{% endblock %}
{% block head %}
{{ super() }}
<meta name="robots" content="noindex, follow"/>
- {{ lib.pagination_meta_tags(request, page, count, limit) }}
+ {{ pagination_meta_tags(request, page, count, limit) }}
{% endblock %}
{% block header %}Browse Labels{% endblock %}
