From d895d8d6363b72cc2e97e0e76674bebc96ba65bb Mon Sep 17 00:00:00 2001 From: Dan Scott Date: Fri, 6 Feb 2015 17:13:27 -0500 Subject: [PATCH] LP#1414033: Add rel="nofollow" to search/browse links Mark links in the TPAC that robots should not attempt to crawl (such as search results, call number browsing, adding records to temporary lists, placing holds, logging in) using the rel="nofollow" convention, per https://support.google.com/webmasters/answer/96569?hl=en Signed-off-by: Dan Scott Signed-off-by: Ben Shum --- Open-ILS/src/templates/opac/browse.tt2 | 18 +++++++++--------- .../templates/opac/parts/advanced/search.tt2 | 2 +- .../opac/parts/record/addedcontent.tt2 | 2 +- .../templates/opac/parts/record/authors.tt2 | 2 +- .../templates/opac/parts/record/cnbrowse.tt2 | 6 +++--- .../templates/opac/parts/record/copy_table.tt2 | 4 ++-- .../src/templates/opac/parts/record/extras.tt2 | 2 +- .../templates/opac/parts/record/navigation.tt2 | 6 +++--- .../templates/opac/parts/record/refworks.tt2 | 2 +- .../src/templates/opac/parts/record/series.tt2 | 2 +- .../templates/opac/parts/record/subjects.tt2 | 2 +- .../templates/opac/parts/record/summary.tt2 | 8 ++++---- .../src/templates/opac/parts/result/facets.tt2 | 10 +++++----- .../templates/opac/parts/result/paginate.tt2 | 6 +++--- .../src/templates/opac/parts/result/table.tt2 | 8 ++++---- .../src/templates/opac/parts/searchbar.tt2 | 6 +++--- Open-ILS/src/templates/opac/results.tt2 | 12 ++++++------ 17 files changed, 49 insertions(+), 49 deletions(-) diff --git a/Open-ILS/src/templates/opac/browse.tt2 b/Open-ILS/src/templates/opac/browse.tt2 index cde8fde2b4..e7557e12b2 100644 --- a/Open-ILS/src/templates/opac/browse.tt2 +++ b/Open-ILS/src/templates/opac/browse.tt2 @@ -18,9 +18,9 @@ [%# XXX TODO Give searchbar.tt2 more smarts so we can just do: # INCLUDE "opac/parts/searchbar.tt2" %] @@ -54,19 +54,19 @@ [% BLOCK browse_pager %]
[% IF ctx.back_pivot %] - ← [%l ('Back') %] + ← [%l ('Back') %] [% END %] [% IF ctx.pager_shortcuts; current_qtype = CGI.param('qtype') || 'title' %] [% FOR shortcut IN ctx.pager_shortcuts %] - [% shortcut.1 %] + [% shortcut.1 %] [% END %] [% END %] [% IF ctx.forward_pivot %] - [%l ('Next') %] → + [%l ('Next') %] → [% END %] [% alternative_link = BLOCK %] - [% ctx.browse_leading_article_alternative | html %] + [% ctx.browse_leading_article_alternative | html %] [%- END; # alternative_link BLOCK l("Did you mean [_1]?", alternative_link); END # IF %] @@ -108,7 +108,7 @@ [% result.value | html %] + }) %]" rel="nofollow" vocab="">[% result.value | html %] ([% IF result.accurate == 'f'; l("At least"); " "; @@ -151,7 +151,7 @@ [% END %]
  • [% field.name %] - [% h.heading | html %] + [% h.heading | html %] ([% h.target_count %])
    • [% END %] @@ -187,7 +187,7 @@
      [% END %]
    • [% field.name %] - [% h.heading | html %] + [% h.heading | html %] ([% h.target_count %])
      • [% END %] diff --git a/Open-ILS/src/templates/opac/parts/advanced/search.tt2 b/Open-ILS/src/templates/opac/parts/advanced/search.tt2 index 52427338ec..e35095b074 100644 --- a/Open-ILS/src/templates/opac/parts/advanced/search.tt2 +++ b/Open-ILS/src/templates/opac/parts/advanced/search.tt2 @@ -40,7 +40,7 @@ [% l('Clear Form') %] + class="opac-button" rel="nofollow" vocab="">[% l('Clear Form') %]
    diff --git a/Open-ILS/src/templates/opac/parts/record/addedcontent.tt2 b/Open-ILS/src/templates/opac/parts/record/addedcontent.tt2 index 477d2787bc..dd9181a8c2 100644 --- a/Open-ILS/src/templates/opac/parts/record/addedcontent.tt2 +++ b/Open-ILS/src/templates/opac/parts/record/addedcontent.tt2 @@ -29,7 +29,7 @@ tab_class = tab_class _ ' hidden'; END %] [% END; END; diff --git a/Open-ILS/src/templates/opac/parts/record/authors.tt2 b/Open-ILS/src/templates/opac/parts/record/authors.tt2 index 735b3ef1df..fa8471ad3a 100644 --- a/Open-ILS/src/templates/opac/parts/record/authors.tt2 +++ b/Open-ILS/src/templates/opac/parts/record/authors.tt2 @@ -114,7 +114,7 @@ BLOCK build_author_links; END; iprop = iprop _ '"'; END; - authtml = ' '; + authtml = ' '; IF iprop; authtml = authtml _ ''; END; authtml = authtml _ link_term.replace('^\s+', ''); IF iprop; authtml = authtml _ ''; END; diff --git a/Open-ILS/src/templates/opac/parts/record/cnbrowse.tt2 b/Open-ILS/src/templates/opac/parts/record/cnbrowse.tt2 index 51ef1adf4b..4699883a4a 100644 --- a/Open-ILS/src/templates/opac/parts/record/cnbrowse.tt2 +++ b/Open-ILS/src/templates/opac/parts/record/cnbrowse.tt2 @@ -13,12 +13,12 @@ [% l("<< Previous Page") %] + href="[% mkurl('', {cnoffset => cnoffset - 1}) %]#cnbrowse" rel="nofollow" vocab="">[% l("<< Previous Page") %] [% l("Shelf Browser") %] [% l("Next Page >>") %] + href="[% mkurl('', {cnoffset => cnoffset + 1}) %]#cnbrowse" rel="nofollow" vocab="">[% l("Next Page >>") %] @@ -46,7 +46,7 @@ href="[%- authorquery = rec_attrs.author | replace('[,\.:;]', ''); mkurl(ctx.opac_root _ '/results', {qtype => 'author', query => authorquery, $loc_name => loc_value}, 1) - -%]">[% rec_attrs.author | html %] + -%]" rel="nofollow" vocab="">[% rec_attrs.author | html %]
    [% END %]
    [% cn.owning_lib.name | html %]
    diff --git a/Open-ILS/src/templates/opac/parts/record/copy_table.tt2 b/Open-ILS/src/templates/opac/parts/record/copy_table.tt2 index 7f529b05de..033ac5bf3f 100644 --- a/Open-ILS/src/templates/opac/parts/record/copy_table.tt2 +++ b/Open-ILS/src/templates/opac/parts/record/copy_table.tt2 @@ -98,7 +98,7 @@ END; # FOREACH bib [% END %] - [% callnum | html %] [% IF ctx.get_org_setting(CGI.param('loc') OR ctx.aou_tree.id, 'sms.enable') == 1 %](Text)[% END %] + [% callnum | html %] [% IF ctx.get_org_setting(CGI.param('loc') OR ctx.aou_tree.id, 'sms.enable') == 1 %](Text)[% END %] [%- IF has_parts == 'true' %] [% copy_info.part_label | html %] [%- END %] @@ -187,7 +187,7 @@ END; # FOREACH bib hold_target => copy_info.issuance, hold_type => 'I', hold_source_page => mkurl() - }) _ '">' _ l('Issue hold') _ ''; + }) _ '" rel="nofollow" vocab="">' _ l('Issue hold') _ ''; END; hold_link; diff --git a/Open-ILS/src/templates/opac/parts/record/extras.tt2 b/Open-ILS/src/templates/opac/parts/record/extras.tt2 index 017b75f1cb..04cdd141e0 100644 --- a/Open-ILS/src/templates/opac/parts/record/extras.tt2 +++ b/Open-ILS/src/templates/opac/parts/record/extras.tt2 @@ -85,7 +85,7 @@ arrow = arrow_right; END; %] - [% arrow %] [% extra.label | html %] + [% arrow %] [% extra.label | html %]
    diff --git a/Open-ILS/src/templates/opac/parts/record/navigation.tt2 b/Open-ILS/src/templates/opac/parts/record/navigation.tt2 index 003f6bdd59..b93d6f47ff 100644 --- a/Open-ILS/src/templates/opac/parts/record/navigation.tt2 +++ b/Open-ILS/src/templates/opac/parts/record/navigation.tt2 @@ -1,7 +1,7 @@ [% IF ctx.search_result_index.defined && ctx.search_result_index >= 0 %]
    - ◄ [% l('Search Results') %] + ◄ [% l('Search Results') %] [% l('Showing Item [_1] of [_2]', ctx.search_result_index + 1, ctx.hit_count) %] @@ -18,7 +18,7 @@ ctx.prev_rec_url = mkurl(ctx.prev_search_record, prev_args, stop_parms); %] ◄ [% l('Previous') %] + href='[% ctx.prev_rec_url %]' rel="nofollow" vocab="">◄ [% l('Previous') %] [% END %] [% @@ -30,7 +30,7 @@ ctx.next_rec_url = mkurl(ctx.next_search_record, next_args, stop_parms); %] [% l('Next') %] ► + href='[% ctx.next_rec_url %]' rel="nofollow" vocab="">[% l('Next') %] ► [% END %]
    diff --git a/Open-ILS/src/templates/opac/parts/record/refworks.tt2 b/Open-ILS/src/templates/opac/parts/record/refworks.tt2 index 2628063d9c..8deea61b12 100644 --- a/Open-ILS/src/templates/opac/parts/record/refworks.tt2 +++ b/Open-ILS/src/templates/opac/parts/record/refworks.tt2 @@ -16,5 +16,5 @@ ctx.bre_id; %]
    - [% l('Export to RefWorks') %] + [% l('Export to RefWorks') %]
    diff --git a/Open-ILS/src/templates/opac/parts/record/series.tt2 b/Open-ILS/src/templates/opac/parts/record/series.tt2 index 4be6b8326c..8f47bf6225 100644 --- a/Open-ILS/src/templates/opac/parts/record/series.tt2 +++ b/Open-ILS/src/templates/opac/parts/record/series.tt2 @@ -26,7 +26,7 @@ BLOCK render_series; url = mkurl(ctx.opac_root _ '/results', { qtype=>'series', query=>total_term }, stop_parms.merge(expert_search_parms, general_search_parms, browse_search_parms, facet_search_parms) ); - series = series _ '' _ single_term _ ' '; + series = series _ '' _ single_term _ ' '; END; FOREACH link880 IN graphics; link = link880.value | html; diff --git a/Open-ILS/src/templates/opac/parts/record/subjects.tt2 b/Open-ILS/src/templates/opac/parts/record/subjects.tt2 index a89a1be27f..fe0df366ad 100644 --- a/Open-ILS/src/templates/opac/parts/record/subjects.tt2 +++ b/Open-ILS/src/templates/opac/parts/record/subjects.tt2 @@ -48,7 +48,7 @@ all_terms.push(subfield.textContent.replace('\-', ' ').replace('[#"^$\+,\.:;&|\[\]()]', '')); total_term = all_terms.join(" ").replace('\s+$', ''); %] -[% single_term %] +[% single_term %] [%- END; IF all_terms.size; "
    "; END; FOREACH link880 IN graphics; diff --git a/Open-ILS/src/templates/opac/parts/record/summary.tt2 b/Open-ILS/src/templates/opac/parts/record/summary.tt2 index 2db3a65dc8..2e494fbd35 100644 --- a/Open-ILS/src/templates/opac/parts/record/summary.tt2 +++ b/Open-ILS/src/templates/opac/parts/record/summary.tt2 @@ -49,7 +49,7 @@
    [% l('Place Hold') %]
    @@ -62,7 +62,7 @@ operation = ctx.mylist.grep(ctx.bre_id).size ? "delete" : "add"; label = (operation == "add") ? l("Add to my list") : l("Remove from my list"); %] - + [% label %] @@ -70,8 +70,8 @@
    [% l('Print / Email Actions Image') %] - [% l('Print') %] / - [% l('Email') %] + [% l('Print') %] / + [% l('Email') %]
    [%- IF ctx.refworks.enabled == 'true' %] [%- INCLUDE 'opac/parts/record/refworks.tt2' %] diff --git a/Open-ILS/src/templates/opac/parts/result/facets.tt2 b/Open-ILS/src/templates/opac/parts/result/facets.tt2 index 82d2c6f969..c8c7196f65 100644 --- a/Open-ILS/src/templates/opac/parts/result/facets.tt2 +++ b/Open-ILS/src/templates/opac/parts/result/facets.tt2 @@ -68,13 +68,13 @@ FOR facet IN sorted_facets; END; %] + title="[% l('Show Fewer [_1] Entries', facet.cmf.label) %]" rel="nofollow" vocab=""> [% l("Fewer") %] [% ELSIF facet.data.size > DEFAULT_DISPLAY_COUNT %] + href="[% mkurl('', {long_facet => long_facets.merge([long_key])}) %]" rel="nofollow" vocab=""> [% l("More") %] [% END %] @@ -113,11 +113,11 @@ FOR facet IN sorted_facets; [% IF new_facets.size == 0 %] [% display_value %] + href="[% mkurl('', {}, ['facet']) %]" rel="nofollow" vocab="">[% display_value %] [% ELSE %] [% display_value %] + href="[% mkurl('', {facet => new_facets}) %]" rel="nofollow" vocab="">[% display_value %] [% END %]
    ([% facet_data.count %])
    @@ -131,7 +131,7 @@ FOR facet IN sorted_facets;
    selected_facets.merge([param_string])}, ['page']) %]'> + href='[% mkurl('', {facet => selected_facets.merge([param_string])}, ['page']) %]' rel="nofollow" vocab=""> [% display_value %]
    diff --git a/Open-ILS/src/templates/opac/parts/result/paginate.tt2 b/Open-ILS/src/templates/opac/parts/result/paginate.tt2 index 86de79894e..cccf18bf4b 100644 --- a/Open-ILS/src/templates/opac/parts/result/paginate.tt2 +++ b/Open-ILS/src/templates/opac/parts/result/paginate.tt2 @@ -24,7 +24,7 @@ href = mkurl('', {page => page - 1}); -%] ◄ [% l('Previous') %] + title='[% l("Previous page") %]' rel="nofollow" vocab="">◄ [% l('Previous') %] [%- END; # show links to 4 previous pages, the current page, and 3 more pages. @@ -39,7 +39,7 @@ IF pageitr == page; %] [% pageitr + 1%] [% ELSE %] - [% pageitr + 1%] + [% pageitr + 1%] [% END; added = added + 1; IF added == 8; LAST; END; @@ -54,7 +54,7 @@ href = mkurl('', {page => page + 1}); -%] [% l('Next') %] ► + title='[% l("Next page") %]' rel="nofollow" vocab=""> [% l('Next') %] ► [%- END; -%] diff --git a/Open-ILS/src/templates/opac/parts/result/table.tt2 b/Open-ILS/src/templates/opac/parts/result/table.tt2 index baebf636b6..80f2e140a9 100644 --- a/Open-ILS/src/templates/opac/parts/result/table.tt2 +++ b/Open-ILS/src/templates/opac/parts/result/table.tt2 @@ -115,7 +115,7 @@ END; href="[%- authorquery = attrs.author | replace('[#"^$\+\-,\.:;&|\[\]()]', ' '); mkurl(ctx.opac_root _ '/results', {qtype => 'author', query => authorquery}, general_search_parms.merge(expert_search_parms, browse_search_parms, facet_search_parms)) - -%]">[% attrs.author | html %] + -%]" rel="nofollow" vocab="">[% attrs.author | html %] [%- FOR entry IN attrs.graphic_authors; FOR alt IN entry.graphic; @@ -372,7 +372,7 @@ END; {hold_target => rec.id, hold_type => hold_type, hold_source_page => mkurl()}, ['query','tag','subfield','term','_special','sort','page']) %]" [% html_text_attr('title', l('Place Hold on [_1]', attrs.title)) %] - class="no-dec">[% l('Place Hold') %] @@ -391,7 +391,7 @@ END; {record => rec.id, anchor => 'record_' _ rec.id}, 1); %] + [% html_text_attr('title', title_label) %] rel="nofollow" vocab=""> [% label %] @@ -404,7 +404,7 @@ END; [% html_text_attr('title', l('Reviews and More for [_1]', attrs.title)) %] href="[% ctx.ext_proto %]://contentcafe2.btol.com/ContentCafeClient/ContentCafe.aspx?UserID=[%- ENV.OILS_CONTENT_CAFE_USER %]&Password=[%- - ENV.OILS_CONTENT_CAFE_PASS %]&ItemKey=[% ident | uri %]&Options=Y"> + ENV.OILS_CONTENT_CAFE_PASS %]&ItemKey=[% ident | uri %]&Options=Y" rel="nofollow" vocab=""> [% l('Ratings Icon') %] [% l('Reviews & More') %] diff --git a/Open-ILS/src/templates/opac/parts/searchbar.tt2 b/Open-ILS/src/templates/opac/parts/searchbar.tt2 index 5eb3873f6d..2ff37f72ef 100644 --- a/Open-ILS/src/templates/opac/parts/searchbar.tt2 +++ b/Open-ILS/src/templates/opac/parts/searchbar.tt2 @@ -7,8 +7,8 @@
    @@ -96,7 +96,7 @@ [% UNLESS took_care_of_form %][% END %] [% IF (is_advanced AND NOT is_special) AND CGI.param('qtype') %]
    - [ [% + [ [% l('Refine My Original Search') %] ]
    diff --git a/Open-ILS/src/templates/opac/results.tt2 b/Open-ILS/src/templates/opac/results.tt2 index 1036774e02..20c476aeae 100644 --- a/Open-ILS/src/templates/opac/results.tt2 +++ b/Open-ILS/src/templates/opac/results.tt2 @@ -37,7 +37,7 @@
    [% IF CGI.param('query') %]
    - + [% l('◄ Return to Grouped Search Results') %]
    @@ -47,10 +47,10 @@