[ckan-changes] [okfn/ckan] d22c05: [xs] Fix the RDF alternative rep of the page, and ...

Fri May 4 11:42:20 UTC 2012

Branch: refs/heads/master
  Home:   https://github.com/okfn/ckan
  Commit: d22c05fee2e114a4c5d8a9b921d5e38e1649b5e0
      https://github.com/okfn/ckan/commit/d22c05fee2e114a4c5d8a9b921d5e38e1649b5e0
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-05-04 (Fri, 04 May 2012)

  Changed paths:
    M ckan/templates/package/read.html

  Log Message:
  -----------
  [xs] Fix the RDF alternative rep of the page, and make the atom url absolute

diff --git a/ckan/templates/package/read.html b/ckan/templates/package/read.html
index a9da991..0245c7c 100644
--- a/ckan/templates/package/read.html
+++ b/ckan/templates/package/read.html
@@ -13,13 +13,13 @@
 
   <py:def function="page_title">${c.pkg_dict.get('title', c.pkg_dict['name'])}
   - Datasets</py:def>
-  
+
   <py:def function="page_heading" property="dc:title">
     ${c.pkg_dict['title']}
   </py:def>
-  
+
   <py:match path="primarysidebar">
-  
+
     <li py:if="c.pkg.license_id" id="dataset-license" class="sidebar-section">
       <strong>License:</strong>
         <py:choose test="">
@@ -94,15 +94,12 @@
   </div>
 
   <py:def function="optional_head">
-    <py:if test="config.get('rdf_packages')">
-      <link rel="alternate" type="application/rdf+xml" title="RDF/XML" href="${config['rdf_packages'] + '/' + c.pkg.id + '.rdf' }" />
-      <link rel="alternate" type="application/turtle" title="RDF/Turtle" href="${config['rdf_packages'] + '/' + c.pkg.id + '.ttl' }" />
-    </py:if>
+      <link rel="alternate" type="application/rdf+xml" title="RDF/XML" href="${g.site_url + h.url_for(controller='package', action='read', id=c.pkg.id)}.rdf" />
   </py:def>
 
   <py:def function="optional_feed">
   <link rel="alternate" type="application/atom+xml" title="Dataset History"
-    href="${h.url(controller='package', action='history', id=c.pkg.name, format='atom', days=7)}" />
+    href="${g.site_url + h.url(controller='package', action='history', id=c.pkg.name, format='atom', days=7)}" />
   </py:def>
 
   <xi:include href="layout.html" />


================================================================

