From 47bb2a5c1b3f6fad38f7f701b23de218ae2b4abe Mon Sep 17 00:00:00 2001
From: Toby <toby@potatolondon.com>
Date: Fri, 10 Feb 2012 11:56:12 +0000
Subject: [PATCH] replace usage of url with h.url in templates to fix tests

---
 ckan/templates/package/history.html          | 4 ++--
 ckan/templates/package/new_package_form.html | 2 +-
 ckan/templates/package/read.html             | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ckan/templates/package/history.html b/ckan/templates/package/history.html
index 595835aa122..b0c3b62aa99 100644
--- a/ckan/templates/package/history.html
+++ b/ckan/templates/package/history.html
@@ -12,7 +12,7 @@
         <h4>Updates</h4>
         <p class="atom-feed-link dataset-history-link">
           <a
-            href="${url(controller='package', action='history', id=c.pkg_dict['name'], format='atom', days=7)}"
+            href="${h.url(controller='package', action='history', id=c.pkg_dict['name'], format='atom', days=7)}"
             title="${g.site_title} - Dataset History - ${c.pkg_dict['name']}">
             Subscribe &raquo;</a>
         </p>
@@ -59,7 +59,7 @@ <h3 py:if="c.error" class="form-errors">
 
   <py:def function="optional_feed">
   <link rel="alternate" type="application/atom+xml" title="Dataset History"
-    href="${url(controller='package', action='history', id=c.pkg_dict['name'], format='atom', days=7)}" />
+    href="${h.url(controller='package', action='history', id=c.pkg_dict['name'], format='atom', days=7)}" />
   </py:def>
 
   <xi:include href="layout.html" />
diff --git a/ckan/templates/package/new_package_form.html b/ckan/templates/package/new_package_form.html
index 80ce7c217a1..6d15fffae42 100644
--- a/ckan/templates/package/new_package_form.html
+++ b/ckan/templates/package/new_package_form.html
@@ -41,7 +41,7 @@ <h2>Errors in form</h2>
 
     <dt class="name-label"><label class="field_req" for="name">Url</label></dt>
     <dd class="name-field">
-      <span class="js-url-text url-text">${url(controller='package', action='index')+'/'}<span class="js-url-viewmode js-url-suffix">&nbsp;</span><a href="#" style="display: none;" class="url-edit js-url-editlink js-url-viewmode">(edit)</a></span>
+      <span class="js-url-text url-text">${h.url(controller='package', action='index')+'/'}<span class="js-url-viewmode js-url-suffix">&nbsp;</span><a href="#" style="display: none;" class="url-edit js-url-editlink js-url-viewmode">(edit)</a></span>
       <input style="display: none;" id="name" maxlength="100" name="name" type="text" class="url-input js-url-editmode js-url-input" value="${data.get('name', '')}" />
       <p class="js-url-is-valid">&nbsp;</p>
     </dd>
diff --git a/ckan/templates/package/read.html b/ckan/templates/package/read.html
index 2682e9f7d4d..51bac82ca6d 100644
--- a/ckan/templates/package/read.html
+++ b/ckan/templates/package/read.html
@@ -84,7 +84,7 @@ <h3>Related Datasets</h3>
   <div py:match="content">
     <py:if test="c.pkg_revision_id">
       <div id="revision" class="widget-container">
-        <p py:if="c.pkg_revision_not_latest">This is an old revision of this dataset, as edited <!--!by ${h.linked_user(rev.author)}-->at ${h.render_datetime(c.pkg_revision_timestamp, with_hours=True)}. It may differ significantly from the <a href="${url(controller='package', action='read', id=c.pkg.name)}">current revision</a>.</p>
+        <p py:if="c.pkg_revision_not_latest">This is an old revision of this dataset, as edited <!--!by ${h.linked_user(rev.author)}-->at ${h.render_datetime(c.pkg_revision_timestamp, with_hours=True)}. It may differ significantly from the <a href="${h.url(controller='package', action='read', id=c.pkg.name)}">current revision</a>.</p>
         <p py:if="not c.pkg_revision_not_latest">This is the current revision of this dataset, as edited <!--!by ${h.linked_user(rev.author)}-->at ${h.render_datetime(c.pkg_revision_timestamp, with_hours=True)}.</p>
       </div>
     </py:if>
@@ -101,7 +101,7 @@ <h3>Related Datasets</h3>
 
   <py:def function="optional_feed">
   <link rel="alternate" type="application/atom+xml" title="Dataset History"
-    href="${url(controller='package', action='history', id=c.pkg.name, format='atom', days=7)}" />
+    href="${h.url(controller='package', action='history', id=c.pkg.name, format='atom', days=7)}" />
   </py:def>
 
   <xi:include href="layout.html" />