Revert "LP1406451 Set rel=canonical for record and library pages"

This reverts commit bd76b81e72990149ccfde44bb0478db176f99a6b.

diff --git a/Open-ILS/src/templates/opac/library.tt2 b/Open-ILS/src/templates/opac/library.tt2
index 695566b..f733ca0 100644 (file)
--- a/Open-ILS/src/templates/opac/library.tt2
+++ b/Open-ILS/src/templates/opac/library.tt2
@@ -2,8 +2,6 @@
     WRAPPER "opac/parts/base.tt2";
     INCLUDE "opac/parts/topnav.tt2";
     ctx.page_title = l("Library details: [_1]", ctx.library.name);
-    canon = ctx.proto _ '://' _ ctx.hostname _ mkurl('', {}, 1);
-    metalinks = '<link rel="canonical" href="' _ canon  _ '" />';
 -%]
     [%- INCLUDE "opac/parts/searchbar.tt2" %]
     [%- INCLUDE "opac/parts/library/core_info.tt2"; %]

diff --git a/Open-ILS/src/templates/opac/parts/base.tt2 b/Open-ILS/src/templates/opac/parts/base.tt2
index 13f45ea..03e950d 100644 (file)
--- a/Open-ILS/src/templates/opac/parts/base.tt2
+++ b/Open-ILS/src/templates/opac/parts/base.tt2
@@ -14,8 +14,6 @@
         <title>[% l('Catalog - [_1]', ctx.page_title) %]</title>
         <link rel="unapi-server" type="application/xml" title="unAPI" href="/opac/extras/unapi" />
         <link type="application/opensearchdescription+xml" rel='search' title="[% l('Evergreen OpenSearch') %]" href="/opac/extras/opensearch/1.1/[% ctx.get_aou(ctx.search_ou).shortname %]/-/osd.xml" />
-        [%-# Hook for page-specific metadata such as <meta name="robots" content="noindex"> %]
-        [% metalinks; -%]
         [% IF want_dojo %]
         <style type="text/css">
             @import "[% ctx.media_prefix %]/js/dojo/dijit/themes/tundra/tundra.css";

diff --git a/Open-ILS/src/templates/opac/record.tt2 b/Open-ILS/src/templates/opac/record.tt2
index c07234f..0772c04 100644 (file)
--- a/Open-ILS/src/templates/opac/record.tt2
+++ b/Open-ILS/src/templates/opac/record.tt2
@@ -2,8 +2,6 @@
     WRAPPER "opac/parts/base.tt2";
     INCLUDE "opac/parts/topnav.tt2";
     ctx.page_title = l("Record Detail");
-    canon = ctx.proto _ '://' _ ctx.hostname _ mkurl('', {}, 1);
-    metalinks = '<link rel="canonical" href="' _ canon  _ '" />';
     IF CGI.param("expand"); basic_search = "f"; END;    
 -%]
     <h2 class="sr-only">[% l('Record Details') %]</h2>