aboutsummaryrefslogtreecommitdiffstats
path: root/app/views/layouts
diff options
context:
space:
mode:
Diffstat (limited to 'app/views/layouts')
-rw-r--r--app/views/layouts/admin.rhtml2
-rw-r--r--app/views/layouts/default.rhtml2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/layouts/admin.rhtml b/app/views/layouts/admin.rhtml
index d85eecbf2..a9bc0556b 100644
--- a/app/views/layouts/admin.rhtml
+++ b/app/views/layouts/admin.rhtml
@@ -12,7 +12,7 @@
<body class="admin">
<p>
- <strong><%= link_to 'Alaveteli', main_url('/') %> admin:</strong>
+ <strong><%= link_to 'Alaveteli', frontpage_url %> admin:</strong>
<%= link_to 'Summary', admin_url("") %>
| <%= link_to 'Timeline', admin_url("timeline") %>
| <%= link_to 'Stats', admin_url("stats") %>
diff --git a/app/views/layouts/default.rhtml b/app/views/layouts/default.rhtml
index 216e50e7a..fffb3d061 100644
--- a/app/views/layouts/default.rhtml
+++ b/app/views/layouts/default.rhtml
@@ -32,7 +32,7 @@
<% end %>
<% end %>
<% if @has_json %>
- <link rel="alternate" type="application/json" title="JSON version of this page" href="<%=h main_url(request.request_uri, '.json') %>">
+ <link rel="alternate" type="application/json" title="JSON version of this page" href="<%=h url_for(request.query_parameters.merge(:format => 'json')) %>">
<% end %>
<% if @no_crawl %>