You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by gc...@apache.org on 2022/06/13 17:02:41 UTC

[allura] branch gc/8439 updated: fixup! [#8439] added noindex, follow header to searches for Tickets, Block, Wiki and Discussion tools and nofollow to search result links

This is an automated email from the ASF dual-hosted git repository.

gcruz pushed a commit to branch gc/8439
in repository https://gitbox.apache.org/repos/asf/allura.git


The following commit(s) were added to refs/heads/gc/8439 by this push:
     new 0660ba5f3 fixup! [#8439] added noindex, follow header to searches for Tickets, Block, Wiki and Discussion tools and nofollow to search result links
0660ba5f3 is described below

commit 0660ba5f3f8f99336767cdd906a6fb064edfeaaf
Author: Guillermo Cruz <gu...@slashdotmedia.com>
AuthorDate: Mon Jun 13 11:02:26 2022 -0600

    fixup! [#8439] added noindex, follow header to searches for Tickets, Block, Wiki and Discussion tools and nofollow to search result links
---
 ForgeTracker/forgetracker/templates/tracker/search.html            | 7 +++++--
 .../templates/tracker_widgets/ticket_search_results.html           | 4 +---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/ForgeTracker/forgetracker/templates/tracker/search.html b/ForgeTracker/forgetracker/templates/tracker/search.html
index 36280aa74..03c86c914 100644
--- a/ForgeTracker/forgetracker/templates/tracker/search.html
+++ b/ForgeTracker/forgetracker/templates/tracker/search.html
@@ -25,8 +25,11 @@
 {% block header %}Search {{c.app.config.options.mount_point}}: {{q}}{% endblock %}
 
 {% 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"/>
+    {% if 'q=' in request.query_string %}
+    <meta name="robots" content="noindex, follow">
+    {% 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"/>
 {% endblock %}
 
 {% block actions %}
diff --git a/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_search_results.html b/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_search_results.html
index 192413c7e..853b22c7f 100644
--- a/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_search_results.html
+++ b/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_search_results.html
@@ -18,9 +18,7 @@
 -#}
 {% from 'allura:templates/jinja_master/lib.html' import abbr_date with context %}
 {% block head %}
-    {% if 'q=' in request.query_string %}
-        <meta name="robots" content="noindex, follow">
-    {% endif %}
+
 {% endblock %}
 <div id="ticket_search_results_holder">
   {% if solr_error %}<p>{{solr_error}}</p>{% endif %}