From 72713062105e779078a023310b371c7ee0d5ac9b Mon Sep 17 00:00:00 2001
From: Matthew Landauer <matthew@openaustralia.org>
Date: Wed, 13 Feb 2013 10:03:38 +1100
Subject: Inline link helper method by using a preexisting named route

---
 app/helpers/link_to_helper.rb | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'app/helpers/link_to_helper.rb')

diff --git a/app/helpers/link_to_helper.rb b/app/helpers/link_to_helper.rb
index 030fab20b..87bec6bf0 100755
--- a/app/helpers/link_to_helper.rb
+++ b/app/helpers/link_to_helper.rb
@@ -88,10 +88,6 @@ module LinkToHelper
         link_to(h(public_body.name), main_url(public_body_url(public_body))) + " (" + link_to("admin", public_body_admin_url(public_body)) + ")"
     end
 
-    def list_public_bodies_default
-        list_public_bodies_url(:tag => 'all')
-    end
-
     # Users
     def user_url(user)
         return show_user_url(:url_name => user.url_name, :only_path => true)
-- 
cgit v1.2.3


From 17cf3d0b9d253e07dc65442f376736a92abe99f7 Mon Sep 17 00:00:00 2001
From: Matthew Landauer <matthew@openaustralia.org>
Date: Wed, 13 Feb 2013 12:31:56 +1100
Subject: Make tracking links relative

---
 app/helpers/link_to_helper.rb | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

(limited to 'app/helpers/link_to_helper.rb')

diff --git a/app/helpers/link_to_helper.rb b/app/helpers/link_to_helper.rb
index 87bec6bf0..1463096e8 100755
--- a/app/helpers/link_to_helper.rb
+++ b/app/helpers/link_to_helper.rb
@@ -164,24 +164,28 @@ module LinkToHelper
     end
 
     # Tracks. feed can be 'track' or 'feed'
-    def do_track_url(track_thing, feed = 'track')
+    def do_track_url(track_thing, feed = 'track', options = {})
         if track_thing.track_type == 'request_updates'
-            track_request_url(:url_title => track_thing.info_request.url_title, :feed => feed)
+            track_request_url(options.merge(:url_title => track_thing.info_request.url_title, :feed => feed))
         elsif track_thing.track_type == 'all_new_requests'
-            track_list_url(:view => 'recent', :feed => feed)
+            track_list_url(options.merge(:view => 'recent', :feed => feed))
         elsif track_thing.track_type == 'all_successful_requests'
-            track_list_url(:view => 'successful', :feed => feed)
+            track_list_url(options.merge(:view => 'successful', :feed => feed))
         elsif track_thing.track_type == 'public_body_updates'
-            track_public_body_url(:url_name => track_thing.public_body.url_name, :feed => feed)
+            track_public_body_url(options.merge(:url_name => track_thing.public_body.url_name, :feed => feed))
         elsif track_thing.track_type == 'user_updates'
-            track_user_url(:url_name => track_thing.tracked_user.url_name, :feed => feed)
+            track_user_url(options.merge(:url_name => track_thing.tracked_user.url_name, :feed => feed))
         elsif track_thing.track_type == 'search_query'
-            track_search_url(:query_array => track_thing.track_query, :feed => feed)
+            track_search_url(options.merge(:query_array => track_thing.track_query, :feed => feed))
         else
             raise "unknown tracking type " + track_thing.track_type
         end
     end
 
+    def do_track_path(track_thing, feed = 'track')
+        do_track_url(track_thing, feed, :only_path => true)
+    end
+
     # General pages.
     def search_url(query, params = nil)
         if query.kind_of?(Array)
-- 
cgit v1.2.3


From 20a1a5fb38f0a4ec621c93e41a9565971827b429 Mon Sep 17 00:00:00 2001
From: Matthew Landauer <matthew@openaustralia.org>
Date: Wed, 13 Feb 2013 14:47:22 +1100
Subject: Make link to follow up message relative

---
 app/helpers/link_to_helper.rb | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'app/helpers/link_to_helper.rb')

diff --git a/app/helpers/link_to_helper.rb b/app/helpers/link_to_helper.rb
index 1463096e8..5c9f51baa 100755
--- a/app/helpers/link_to_helper.rb
+++ b/app/helpers/link_to_helper.rb
@@ -53,14 +53,17 @@ module LinkToHelper
     end
 
     # Respond to request
-    def respond_to_last_url(info_request)
+    def respond_to_last_url(info_request, options = {})
         last_response = info_request.get_last_response
         if last_response.nil?
-            respond_url = show_response_no_followup_url(:id => info_request.id)
+            show_response_no_followup_url(options.merge(:id => info_request.id))
         else
-            respond_url = show_response_url(:id => info_request.id, :incoming_message_id => last_response.id)
+            show_response_url(options.merge(:id => info_request.id, :incoming_message_id => last_response.id))
         end
-        return respond_url
+    end
+
+    def respond_to_last_path(info_request)
+        respond_to_last_url(info_request, :only_path => true)
     end
 
     # Public bodies
-- 
cgit v1.2.3


From c8c27e88146bc2761981d7d7e0a04bc3cccfaefd Mon Sep 17 00:00:00 2001
From: Matthew Landauer <matthew@openaustralia.org>
Date: Wed, 13 Feb 2013 16:14:42 +1100
Subject: Rename helper method

---
 app/helpers/link_to_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/helpers/link_to_helper.rb')

diff --git a/app/helpers/link_to_helper.rb b/app/helpers/link_to_helper.rb
index 5c9f51baa..f16af7f0b 100755
--- a/app/helpers/link_to_helper.rb
+++ b/app/helpers/link_to_helper.rb
@@ -35,7 +35,7 @@ module LinkToHelper
         return similar_request_url(:url_title => info_request.url_title, :only_path => true)
     end
 
-    def request_details_url(info_request)
+    def request_details_path(info_request)
         return details_request_url(:url_title => info_request.url_title, :only_path => true)
     end
 
-- 
cgit v1.2.3


From f54aaf27a19739b44c5ec032a4b1b2b172074a9c Mon Sep 17 00:00:00 2001
From: Matthew Landauer <matthew@openaustralia.org>
Date: Wed, 13 Feb 2013 16:21:17 +1100
Subject: Add options parameter to url helpers

---
 app/helpers/link_to_helper.rb | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'app/helpers/link_to_helper.rb')

diff --git a/app/helpers/link_to_helper.rb b/app/helpers/link_to_helper.rb
index f16af7f0b..6af0b9a29 100755
--- a/app/helpers/link_to_helper.rb
+++ b/app/helpers/link_to_helper.rb
@@ -40,16 +40,16 @@ module LinkToHelper
     end
 
     # Incoming / outgoing messages
-    def incoming_message_url(incoming_message)
-        return request_url(incoming_message.info_request)+"#incoming-"+incoming_message.id.to_s
+    def incoming_message_url(incoming_message, options = {})
+        return request_url(incoming_message.info_request, options.merge(:anchor => "incoming-#{incoming_message.id}"))
     end
 
-    def outgoing_message_url(outgoing_message)
-        return request_url(outgoing_message.info_request)+"#outgoing-"+outgoing_message.id.to_s
+    def outgoing_message_url(outgoing_message, options = {})
+        return request_url(outgoing_message.info_request, options.merge(:anchor => "outgoing-#{outgoing_message.id}"))
     end
 
-    def comment_url(comment)
-        return request_url(comment.info_request)+"#comment-"+comment.id.to_s
+    def comment_url(comment, options = {})
+        return request_url(comment.info_request, options.merge(:anchor => "comment-#{comment.id}"))
     end
 
     # Respond to request
-- 
cgit v1.2.3


From a5e2adf08cdcea0bec25e14b83584091edfb79fb Mon Sep 17 00:00:00 2001
From: Matthew Landauer <matthew@openaustralia.org>
Date: Wed, 13 Feb 2013 16:24:43 +1100
Subject: Make links to within the site use relative urls

---
 app/helpers/link_to_helper.rb | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'app/helpers/link_to_helper.rb')

diff --git a/app/helpers/link_to_helper.rb b/app/helpers/link_to_helper.rb
index 6af0b9a29..48423ff45 100755
--- a/app/helpers/link_to_helper.rb
+++ b/app/helpers/link_to_helper.rb
@@ -44,14 +44,26 @@ module LinkToHelper
         return request_url(incoming_message.info_request, options.merge(:anchor => "incoming-#{incoming_message.id}"))
     end
 
+    def incoming_message_path(incoming_message)
+        incoming_message_url(incoming_message, :only_path => true)
+    end
+
     def outgoing_message_url(outgoing_message, options = {})
         return request_url(outgoing_message.info_request, options.merge(:anchor => "outgoing-#{outgoing_message.id}"))
     end
 
+    def outgoing_message_path(outgoing_message)
+        outgoing_message_url(outgoing_message, :only_path => true)
+    end
+
     def comment_url(comment, options = {})
         return request_url(comment.info_request, options.merge(:anchor => "comment-#{comment.id}"))
     end
 
+    def comment_path(comment)
+        comment_url(comment, :only_path => true)
+    end
+
     # Respond to request
     def respond_to_last_url(info_request, options = {})
         last_response = info_request.get_last_response
-- 
cgit v1.2.3


From 4b83519e02d5d42708dd1770f965b122a11c4440 Mon Sep 17 00:00:00 2001
From: Matthew Landauer <matthew@openaustralia.org>
Date: Wed, 13 Feb 2013 16:58:33 +1100
Subject: Rename helper method

---
 app/helpers/link_to_helper.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'app/helpers/link_to_helper.rb')

diff --git a/app/helpers/link_to_helper.rb b/app/helpers/link_to_helper.rb
index 48423ff45..0c0128182 100755
--- a/app/helpers/link_to_helper.rb
+++ b/app/helpers/link_to_helper.rb
@@ -79,20 +79,20 @@ module LinkToHelper
     end
 
     # Public bodies
-    def public_body_url(public_body)
+    def public_body_path(public_body)
         public_body.url_name.nil? ? '' : show_public_body_url(:url_name => public_body.url_name, :only_path => true)
     end
 
     def public_body_link_short(public_body)
-        link_to h(public_body.short_or_long_name), public_body_url(public_body)
+        link_to h(public_body.short_or_long_name), public_body_path(public_body)
     end
 
     def public_body_link(public_body, cls=nil)
-        link_to h(public_body.name), public_body_url(public_body), :class => cls
+        link_to h(public_body.name), public_body_path(public_body), :class => cls
     end
 
     def public_body_link_absolute(public_body) # e.g. for in RSS
-        link_to h(public_body.name), main_url(public_body_url(public_body))
+        link_to h(public_body.name), main_url(public_body_path(public_body))
     end
 
     def public_body_admin_url(public_body)
@@ -100,7 +100,7 @@ module LinkToHelper
     end
 
     def public_body_both_links(public_body)
-        link_to(h(public_body.name), main_url(public_body_url(public_body))) + " (" + link_to("admin", public_body_admin_url(public_body)) + ")"
+        link_to(h(public_body.name), main_url(public_body_path(public_body))) + " (" + link_to("admin", public_body_admin_url(public_body)) + ")"
     end
 
     # Users
-- 
cgit v1.2.3


From 85223bb2b630c8576352816b47b3c93f5c0b593b Mon Sep 17 00:00:00 2001
From: Matthew Landauer <matthew@openaustralia.org>
Date: Wed, 13 Feb 2013 17:05:39 +1100
Subject: Redirects should be done with absolute urls

---
 app/helpers/link_to_helper.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'app/helpers/link_to_helper.rb')

diff --git a/app/helpers/link_to_helper.rb b/app/helpers/link_to_helper.rb
index 0c0128182..4f749d9d3 100755
--- a/app/helpers/link_to_helper.rb
+++ b/app/helpers/link_to_helper.rb
@@ -79,8 +79,12 @@ module LinkToHelper
     end
 
     # Public bodies
+    def public_body_url(public_body, options = {})
+        public_body.url_name.nil? ? '' : show_public_body_url(options.merge(:url_name => public_body.url_name))
+    end
+
     def public_body_path(public_body)
-        public_body.url_name.nil? ? '' : show_public_body_url(:url_name => public_body.url_name, :only_path => true)
+        public_body_url(public_body, :only_path => true)
     end
 
     def public_body_link_short(public_body)
-- 
cgit v1.2.3


From 8bae996d578fd18af7f8490b01924fe4718628f0 Mon Sep 17 00:00:00 2001
From: Matthew Landauer <matthew@openaustralia.org>
Date: Wed, 13 Feb 2013 17:30:05 +1100
Subject: Rename helper method

---
 app/helpers/link_to_helper.rb | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'app/helpers/link_to_helper.rb')

diff --git a/app/helpers/link_to_helper.rb b/app/helpers/link_to_helper.rb
index 4f749d9d3..7bbab3b24 100755
--- a/app/helpers/link_to_helper.rb
+++ b/app/helpers/link_to_helper.rb
@@ -108,12 +108,12 @@ module LinkToHelper
     end
 
     # Users
-    def user_url(user)
+    def user_path(user)
         return show_user_url(:url_name => user.url_name, :only_path => true)
     end
 
     def user_link(user, cls=nil)
-        link_to h(user.name), user_url(user), :class => cls
+        link_to h(user.name), user_path(user), :class => cls
     end
 
     def user_link_for_request(request, cls=nil)
@@ -125,7 +125,7 @@ module LinkToHelper
                 user_name
             end
         else
-            link_to h(request.user.name), user_url(request.user), :class => cls
+            link_to h(request.user.name), user_path(request.user), :class => cls
         end
     end
 
@@ -139,7 +139,7 @@ module LinkToHelper
     end
 
     def user_link_absolute(user)
-        link_to h(user.name), main_url(user_url(user))
+        link_to h(user.name), main_url(user_path(user))
     end
 
     def request_user_link_absolute(request)
@@ -152,9 +152,9 @@ module LinkToHelper
 
     def user_or_you_link(user)
         if @user && user == @user
-            link_to h("you"), user_url(user)
+            link_to h("you"), user_path(user)
         else
-            link_to h(user.name), user_url(user)
+            link_to h(user.name), user_path(user)
         end
     end
 
@@ -167,7 +167,7 @@ module LinkToHelper
     end
 
     def user_or_you_capital_link(user)
-        link_to user_or_you_capital(user), user_url(user)
+        link_to user_or_you_capital(user), user_path(user)
     end
 
     def user_admin_url(user)
@@ -179,7 +179,7 @@ module LinkToHelper
     end
 
     def user_both_links(user)
-        link_to(h(user.name), main_url(user_url(user))) + " (" + link_to("admin", user_admin_url(user)) + ")"
+        link_to(h(user.name), main_url(user_path(user))) + " (" + link_to("admin", user_admin_url(user)) + ")"
     end
 
     # Tracks. feed can be 'track' or 'feed'
-- 
cgit v1.2.3


From 448dce2ce597937bb7af006065076c85d11d95ff Mon Sep 17 00:00:00 2001
From: Matthew Landauer <matthew@openaustralia.org>
Date: Wed, 13 Feb 2013 17:35:47 +1100
Subject: Redirects should be done with absolute urls

---
 app/helpers/link_to_helper.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'app/helpers/link_to_helper.rb')

diff --git a/app/helpers/link_to_helper.rb b/app/helpers/link_to_helper.rb
index 7bbab3b24..6682af0c4 100755
--- a/app/helpers/link_to_helper.rb
+++ b/app/helpers/link_to_helper.rb
@@ -108,8 +108,12 @@ module LinkToHelper
     end
 
     # Users
+    def user_url(user, options = {})
+        show_user_url(options.merge(:url_name => user.url_name))
+    end
+
     def user_path(user)
-        return show_user_url(:url_name => user.url_name, :only_path => true)
+        user_url(user, :only_path => true)
     end
 
     def user_link(user, cls=nil)
-- 
cgit v1.2.3


From 8e8f8bb435ad66deaf9d7a9eb1ec221fde3540d2 Mon Sep 17 00:00:00 2001
From: Matthew Landauer <matthew@openaustralia.org>
Date: Wed, 13 Feb 2013 17:45:59 +1100
Subject: Make links to within the site use relative urls

---
 app/helpers/link_to_helper.rb | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'app/helpers/link_to_helper.rb')

diff --git a/app/helpers/link_to_helper.rb b/app/helpers/link_to_helper.rb
index 6682af0c4..07727a06a 100755
--- a/app/helpers/link_to_helper.rb
+++ b/app/helpers/link_to_helper.rb
@@ -236,6 +236,11 @@ module LinkToHelper
 
         return url
     end
+
+    def search_path(query, options = {})
+        search_url(query, options.merge(:only_path => true))
+    end
+
     def search_link(query, variety_postfix = nil, sort_postfix = nil, advanced = nil)
         link_to h(query), search_url(query)
     end
-- 
cgit v1.2.3


From ba15c9b78dca182f74281d7354e77942860259e7 Mon Sep 17 00:00:00 2001
From: Matthew Landauer <matthew@openaustralia.org>
Date: Wed, 13 Feb 2013 19:15:51 +1100
Subject: Rename helper method

---
 app/helpers/link_to_helper.rb | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'app/helpers/link_to_helper.rb')

diff --git a/app/helpers/link_to_helper.rb b/app/helpers/link_to_helper.rb
index 07727a06a..aee67d93f 100755
--- a/app/helpers/link_to_helper.rb
+++ b/app/helpers/link_to_helper.rb
@@ -10,13 +10,13 @@ module LinkToHelper
     # Links to various models
 
     # Requests
-    def request_url(info_request, extra_params={})
+    def request_path(info_request, extra_params={})
         params = {:url_title => info_request.url_title, :only_path => true}
         return show_request_url(params.merge(extra_params))
     end
 
     def request_link(info_request, cls=nil )
-        link_to h(info_request.title), request_url(info_request), :class => cls
+        link_to h(info_request.title), request_path(info_request), :class => cls
     end
 
     def request_admin_url(info_request)
@@ -28,7 +28,7 @@ module LinkToHelper
     end
 
     def request_both_links(info_request)
-        link_to(h(info_request.title), main_url(request_url(info_request))) + " (" + link_to("admin", request_admin_url(info_request)) + ")"
+        link_to(h(info_request.title), main_url(request_path(info_request))) + " (" + link_to("admin", request_admin_url(info_request)) + ")"
     end
 
     def request_similar_url(info_request)
@@ -41,7 +41,7 @@ module LinkToHelper
 
     # Incoming / outgoing messages
     def incoming_message_url(incoming_message, options = {})
-        return request_url(incoming_message.info_request, options.merge(:anchor => "incoming-#{incoming_message.id}"))
+        return request_path(incoming_message.info_request, options.merge(:anchor => "incoming-#{incoming_message.id}"))
     end
 
     def incoming_message_path(incoming_message)
@@ -49,7 +49,7 @@ module LinkToHelper
     end
 
     def outgoing_message_url(outgoing_message, options = {})
-        return request_url(outgoing_message.info_request, options.merge(:anchor => "outgoing-#{outgoing_message.id}"))
+        return request_path(outgoing_message.info_request, options.merge(:anchor => "outgoing-#{outgoing_message.id}"))
     end
 
     def outgoing_message_path(outgoing_message)
@@ -57,7 +57,7 @@ module LinkToHelper
     end
 
     def comment_url(comment, options = {})
-        return request_url(comment.info_request, options.merge(:anchor => "comment-#{comment.id}"))
+        return request_path(comment.info_request, options.merge(:anchor => "comment-#{comment.id}"))
     end
 
     def comment_path(comment)
-- 
cgit v1.2.3


From 5dce6d1465efa82a33a07706363221b39e8ca029 Mon Sep 17 00:00:00 2001
From: Matthew Landauer <matthew@openaustralia.org>
Date: Wed, 13 Feb 2013 19:32:50 +1100
Subject: Redirects should be done with absolute urls

---
 app/helpers/link_to_helper.rb | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'app/helpers/link_to_helper.rb')

diff --git a/app/helpers/link_to_helper.rb b/app/helpers/link_to_helper.rb
index aee67d93f..f32ab9b64 100755
--- a/app/helpers/link_to_helper.rb
+++ b/app/helpers/link_to_helper.rb
@@ -10,9 +10,12 @@ module LinkToHelper
     # Links to various models
 
     # Requests
-    def request_path(info_request, extra_params={})
-        params = {:url_title => info_request.url_title, :only_path => true}
-        return show_request_url(params.merge(extra_params))
+    def request_url(info_request, options = {})
+        show_request_url({:url_title => info_request.url_title}.merge(options))
+    end
+
+    def request_path(info_request, options = {})
+        request_url(info_request, {:only_path => true}.merge(options))
     end
 
     def request_link(info_request, cls=nil )
-- 
cgit v1.2.3


From 114d00d1c1e2a997d1921ae044ed7d51237b6434 Mon Sep 17 00:00:00 2001
From: Matthew Landauer <matthew@openaustralia.org>
Date: Thu, 14 Feb 2013 05:12:18 +1100
Subject: Make links relative

---
 app/helpers/link_to_helper.rb | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'app/helpers/link_to_helper.rb')

diff --git a/app/helpers/link_to_helper.rb b/app/helpers/link_to_helper.rb
index f32ab9b64..7d0dd7766 100755
--- a/app/helpers/link_to_helper.rb
+++ b/app/helpers/link_to_helper.rb
@@ -149,6 +149,10 @@ module LinkToHelper
         link_to h(user.name), main_url(user_path(user))
     end
 
+    def user_link(user)
+        link_to h(user.name), user_path(user)
+    end
+
     def request_user_link_absolute(request)
         if request.is_external?
             request.external_user_name || _("Anonymous user")
@@ -157,6 +161,14 @@ module LinkToHelper
         end
     end
 
+    def request_user_link(request)
+        if request.is_external?
+            request.external_user_name || _("Anonymous user")
+        else
+            user_link(request.user)
+        end
+    end
+
     def user_or_you_link(user)
         if @user && user == @user
             link_to h("you"), user_path(user)
-- 
cgit v1.2.3


From 4c9f7f7f12a47b516137bf000c3f36120033a077 Mon Sep 17 00:00:00 2001
From: Matthew Landauer <matthew@openaustralia.org>
Date: Fri, 15 Feb 2013 13:11:46 +1100
Subject: Stop using main_url to generate absolute urls for the main site

---
 app/helpers/link_to_helper.rb | 29 ++++++-----------------------
 1 file changed, 6 insertions(+), 23 deletions(-)

(limited to 'app/helpers/link_to_helper.rb')

diff --git a/app/helpers/link_to_helper.rb b/app/helpers/link_to_helper.rb
index 7d0dd7766..6e0a6f355 100755
--- a/app/helpers/link_to_helper.rb
+++ b/app/helpers/link_to_helper.rb
@@ -31,7 +31,7 @@ module LinkToHelper
     end
 
     def request_both_links(info_request)
-        link_to(h(info_request.title), main_url(request_path(info_request))) + " (" + link_to("admin", request_admin_url(info_request)) + ")"
+        link_to(h(info_request.title), request_url(info_request)) + " (" + link_to("admin", request_admin_url(info_request)) + ")"
     end
 
     def request_similar_url(info_request)
@@ -60,7 +60,7 @@ module LinkToHelper
     end
 
     def comment_url(comment, options = {})
-        return request_path(comment.info_request, options.merge(:anchor => "comment-#{comment.id}"))
+        request_url(comment.info_request, options.merge(:anchor => "comment-#{comment.id}"))
     end
 
     def comment_path(comment)
@@ -99,7 +99,7 @@ module LinkToHelper
     end
 
     def public_body_link_absolute(public_body) # e.g. for in RSS
-        link_to h(public_body.name), main_url(public_body_path(public_body))
+        link_to h(public_body.name), public_body_url(public_body)
     end
 
     def public_body_admin_url(public_body)
@@ -107,7 +107,7 @@ module LinkToHelper
     end
 
     def public_body_both_links(public_body)
-        link_to(h(public_body.name), main_url(public_body_path(public_body))) + " (" + link_to("admin", public_body_admin_url(public_body)) + ")"
+        link_to(h(public_body.name), public_body_url(public_body)) + " (" + link_to("admin", public_body_admin_url(public_body)) + ")"
     end
 
     # Users
@@ -146,7 +146,7 @@ module LinkToHelper
     end
 
     def user_link_absolute(user)
-        link_to h(user.name), main_url(user_path(user))
+        link_to h(user.name), user_url(user)
     end
 
     def user_link(user)
@@ -198,7 +198,7 @@ module LinkToHelper
     end
 
     def user_both_links(user)
-        link_to(h(user.name), main_url(user_path(user))) + " (" + link_to("admin", user_admin_url(user)) + ")"
+        link_to(h(user.name), user_url(user)) + " (" + link_to("admin", user_admin_url(user)) + ")"
     end
 
     # Tracks. feed can be 'track' or 'feed'
@@ -279,23 +279,6 @@ module LinkToHelper
         end
     end
 
-
-    def main_url(relative_path, append = nil)
-        url_prefix = "http://" + Configuration::domain
-        url = url_prefix + relative_path
-        if !append.nil?
-            begin
-                env = Rack::MockRequest.env_for(url)
-                req = Rack::Request.new(env)
-                req.path_info += append
-                url = req.url
-            rescue URI::InvalidURIError
-                # don't append to it
-            end
-        end
-        return url
-    end
-
     # Basic date format
     def simple_date(date)
         date = date.in_time_zone.to_date unless date.is_a? Date
-- 
cgit v1.2.3


From 902631ec4f5e1a16b8f08a2ed0ccc86ad2b72c6c Mon Sep 17 00:00:00 2001
From: Matthew Landauer <matthew@openaustralia.org>
Date: Fri, 15 Feb 2013 13:57:28 +1100
Subject: Stop using admin_url to generate absolute url for the admin interface

---
 app/helpers/link_to_helper.rb | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

(limited to 'app/helpers/link_to_helper.rb')

diff --git a/app/helpers/link_to_helper.rb b/app/helpers/link_to_helper.rb
index 6e0a6f355..bd59f24d0 100755
--- a/app/helpers/link_to_helper.rb
+++ b/app/helpers/link_to_helper.rb
@@ -23,7 +23,7 @@ module LinkToHelper
     end
 
     def request_admin_url(info_request)
-        return admin_url('request/show/' + info_request.id.to_s)
+        admin_request_show_url(info_request)
     end
 
     def request_admin_link(info_request, name="admin", cls=nil)
@@ -103,7 +103,7 @@ module LinkToHelper
     end
 
     def public_body_admin_url(public_body)
-        return admin_url('body/show/' + public_body.id.to_s)
+        admin_body_show_url(public_body)
     end
 
     def public_body_both_links(public_body)
@@ -190,7 +190,7 @@ module LinkToHelper
     end
 
     def user_admin_url(user)
-        return admin_url('user/show/' + user.id.to_s)
+        admin_user_show_url(user)
     end
 
     def user_admin_link(user, name="admin", cls=nil)
@@ -260,12 +260,6 @@ module LinkToHelper
         link_to h(query), search_url(query)
     end
 
-    # Admin pages
-    def admin_url(relative_path)
-        admin_url_prefix = Configuration::admin_base_url
-        (admin_url_prefix.empty? ? admin_general_index_url + '/' : admin_url_prefix) + relative_path
-    end
-
     # About page URLs
     def about_url
         return help_general_url(:action => 'about')
-- 
cgit v1.2.3


From b59116c168c7ca24c36faf73c7848e4537daec47 Mon Sep 17 00:00:00 2001
From: Matthew Landauer <matthew@openaustralia.org>
Date: Fri, 15 Feb 2013 14:16:10 +1100
Subject: Inline helper

---
 app/helpers/link_to_helper.rb | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'app/helpers/link_to_helper.rb')

diff --git a/app/helpers/link_to_helper.rb b/app/helpers/link_to_helper.rb
index bd59f24d0..2c4a30eda 100755
--- a/app/helpers/link_to_helper.rb
+++ b/app/helpers/link_to_helper.rb
@@ -22,16 +22,12 @@ module LinkToHelper
         link_to h(info_request.title), request_path(info_request), :class => cls
     end
 
-    def request_admin_url(info_request)
-        admin_request_show_url(info_request)
-    end
-
     def request_admin_link(info_request, name="admin", cls=nil)
-      link_to name, request_admin_url(info_request), :class => cls
+      link_to name, admin_request_show_url(info_request), :class => cls
     end
 
     def request_both_links(info_request)
-        link_to(h(info_request.title), request_url(info_request)) + " (" + link_to("admin", request_admin_url(info_request)) + ")"
+        link_to(h(info_request.title), request_url(info_request)) + " (" + link_to("admin", admin_request_show_url(info_request)) + ")"
     end
 
     def request_similar_url(info_request)
-- 
cgit v1.2.3


From 7c078a56cdbdc90007ccbd4104d159f272913694 Mon Sep 17 00:00:00 2001
From: Matthew Landauer <matthew@openaustralia.org>
Date: Fri, 15 Feb 2013 14:23:09 +1100
Subject: Inline helper

---
 app/helpers/link_to_helper.rb | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'app/helpers/link_to_helper.rb')

diff --git a/app/helpers/link_to_helper.rb b/app/helpers/link_to_helper.rb
index 2c4a30eda..0af4570ab 100755
--- a/app/helpers/link_to_helper.rb
+++ b/app/helpers/link_to_helper.rb
@@ -98,12 +98,8 @@ module LinkToHelper
         link_to h(public_body.name), public_body_url(public_body)
     end
 
-    def public_body_admin_url(public_body)
-        admin_body_show_url(public_body)
-    end
-
     def public_body_both_links(public_body)
-        link_to(h(public_body.name), public_body_url(public_body)) + " (" + link_to("admin", public_body_admin_url(public_body)) + ")"
+        link_to(h(public_body.name), public_body_url(public_body)) + " (" + link_to("admin", admin_body_show_url(public_body)) + ")"
     end
 
     # Users
-- 
cgit v1.2.3


From 44e876fc4ef955808ebc868b0308266aa5a06d1f Mon Sep 17 00:00:00 2001
From: Matthew Landauer <matthew@openaustralia.org>
Date: Fri, 15 Feb 2013 14:25:10 +1100
Subject: Inline helper method

---
 app/helpers/link_to_helper.rb | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'app/helpers/link_to_helper.rb')

diff --git a/app/helpers/link_to_helper.rb b/app/helpers/link_to_helper.rb
index 0af4570ab..a2286825f 100755
--- a/app/helpers/link_to_helper.rb
+++ b/app/helpers/link_to_helper.rb
@@ -133,7 +133,7 @@ module LinkToHelper
             text = external_text ? external_text : (request.external_user_name || _("Anonymous user")) + " (external)"
         else
             text = internal_text ? internal_text : request.user.name
-            link_to(h(text), user_admin_url(request.user))
+            link_to(h(text), admin_user_show_url(request.user))
         end
     end
 
@@ -181,16 +181,12 @@ module LinkToHelper
         link_to user_or_you_capital(user), user_path(user)
     end
 
-    def user_admin_url(user)
-        admin_user_show_url(user)
-    end
-
     def user_admin_link(user, name="admin", cls=nil)
-      link_to name, user_admin_url(user), :class => cls
+      link_to name, admin_user_show_url(user), :class => cls
     end
 
     def user_both_links(user)
-        link_to(h(user.name), user_url(user)) + " (" + link_to("admin", user_admin_url(user)) + ")"
+        link_to(h(user.name), user_url(user)) + " (" + link_to("admin", admin_user_show_url(user)) + ")"
     end
 
     # Tracks. feed can be 'track' or 'feed'
-- 
cgit v1.2.3


From 35f4455c4f5e62778ec8b5560b8216028bd9e487 Mon Sep 17 00:00:00 2001
From: Matthew Landauer <matthew@openaustralia.org>
Date: Fri, 15 Feb 2013 14:29:37 +1100
Subject: Replace use of route_url(:only_path => true) with route_path where we
 can

---
 app/helpers/link_to_helper.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/helpers/link_to_helper.rb')

diff --git a/app/helpers/link_to_helper.rb b/app/helpers/link_to_helper.rb
index a2286825f..f1bec2b51 100755
--- a/app/helpers/link_to_helper.rb
+++ b/app/helpers/link_to_helper.rb
@@ -31,11 +31,11 @@ module LinkToHelper
     end
 
     def request_similar_url(info_request)
-        return similar_request_url(:url_title => info_request.url_title, :only_path => true)
+        similar_request_path(:url_title => info_request.url_title)
     end
 
     def request_details_path(info_request)
-        return details_request_url(:url_title => info_request.url_title, :only_path => true)
+        details_request_path(:url_title => info_request.url_title)
     end
 
     # Incoming / outgoing messages
-- 
cgit v1.2.3


From 472a56bb6d65e84d5c806098dce9a43321a7460c Mon Sep 17 00:00:00 2001
From: Matthew Landauer <matthew@openaustralia.org>
Date: Fri, 15 Feb 2013 14:31:47 +1100
Subject: Remove unused helper

---
 app/helpers/link_to_helper.rb | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'app/helpers/link_to_helper.rb')

diff --git a/app/helpers/link_to_helper.rb b/app/helpers/link_to_helper.rb
index f1bec2b51..afd999ea2 100755
--- a/app/helpers/link_to_helper.rb
+++ b/app/helpers/link_to_helper.rb
@@ -30,10 +30,6 @@ module LinkToHelper
         link_to(h(info_request.title), request_url(info_request)) + " (" + link_to("admin", admin_request_show_url(info_request)) + ")"
     end
 
-    def request_similar_url(info_request)
-        similar_request_path(:url_title => info_request.url_title)
-    end
-
     def request_details_path(info_request)
         details_request_path(:url_title => info_request.url_title)
     end
-- 
cgit v1.2.3


From aeec301ca8516bf89bd0269e760f070e60c0be50 Mon Sep 17 00:00:00 2001
From: Matthew Landauer <matthew@openaustralia.org>
Date: Fri, 15 Feb 2013 14:38:20 +1100
Subject: Fix incoming_message_url to return an absolute path. Don't use this
 helper with links

---
 app/helpers/link_to_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/helpers/link_to_helper.rb')

diff --git a/app/helpers/link_to_helper.rb b/app/helpers/link_to_helper.rb
index afd999ea2..bbaa6c31a 100755
--- a/app/helpers/link_to_helper.rb
+++ b/app/helpers/link_to_helper.rb
@@ -36,7 +36,7 @@ module LinkToHelper
 
     # Incoming / outgoing messages
     def incoming_message_url(incoming_message, options = {})
-        return request_path(incoming_message.info_request, options.merge(:anchor => "incoming-#{incoming_message.id}"))
+        return request_url(incoming_message.info_request, options.merge(:anchor => "incoming-#{incoming_message.id}"))
     end
 
     def incoming_message_path(incoming_message)
-- 
cgit v1.2.3


From 366ef12cc959545c018ff8853818dfabba3787d8 Mon Sep 17 00:00:00 2001
From: Matthew Landauer <matthew@openaustralia.org>
Date: Fri, 15 Feb 2013 15:14:00 +1100
Subject: Remove unused parameters from helper method

---
 app/helpers/link_to_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/helpers/link_to_helper.rb')

diff --git a/app/helpers/link_to_helper.rb b/app/helpers/link_to_helper.rb
index bbaa6c31a..ea12fbb5c 100755
--- a/app/helpers/link_to_helper.rb
+++ b/app/helpers/link_to_helper.rb
@@ -240,7 +240,7 @@ module LinkToHelper
         search_url(query, options.merge(:only_path => true))
     end
 
-    def search_link(query, variety_postfix = nil, sort_postfix = nil, advanced = nil)
+    def search_link(query)
         link_to h(query), search_url(query)
     end
 
-- 
cgit v1.2.3


From 7abb45b0549af892b7f1ec2beeca5a42f8c2ef7a Mon Sep 17 00:00:00 2001
From: Matthew Landauer <matthew@openaustralia.org>
Date: Mon, 18 Feb 2013 10:01:51 +1100
Subject: Reinstate main_url and admin_url helpers with deprecation warning

---
 app/helpers/link_to_helper.rb | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

(limited to 'app/helpers/link_to_helper.rb')

diff --git a/app/helpers/link_to_helper.rb b/app/helpers/link_to_helper.rb
index ea12fbb5c..cd60ba5ef 100755
--- a/app/helpers/link_to_helper.rb
+++ b/app/helpers/link_to_helper.rb
@@ -244,6 +244,32 @@ module LinkToHelper
         link_to h(query), search_url(query)
     end
 
+    # Deprecated helper
+    # TODO: Remove in next release
+    def admin_url(relative_path)
+        warn "[DEPRECATION] admin_url is deprecated. Please remove it from your theme."
+        relative_path
+    end
+
+    # Deprecated helper
+    # TODO: Remove in next release
+    def main_url(relative_path, append = nil)
+        warn "[DEPRECATION] main_url is deprecated. Please remove it from your theme."
+        url_prefix = "http://" + Configuration::domain
+        url = url_prefix + relative_path
+        if !append.nil?
+            begin
+                env = Rack::MockRequest.env_for(url)
+                req = Rack::Request.new(env)
+                req.path_info += append
+                url = req.url
+            rescue URI::InvalidURIError
+                # don't append to it
+            end
+        end
+        return url
+    end
+
     # About page URLs
     def about_url
         return help_general_url(:action => 'about')
-- 
cgit v1.2.3