diff options
| -rw-r--r-- | app/views/admin_general/index.rhtml | 2 | ||||
| -rw-r--r-- | app/views/admin_public_body/_tags.rhtml | 4 | ||||
| -rw-r--r-- | app/views/admin_public_body/show.rhtml | 2 | ||||
| -rw-r--r-- | app/views/admin_request/show.rhtml | 2 | ||||
| -rw-r--r-- | app/views/admin_user/show.rhtml | 4 | ||||
| -rw-r--r-- | app/views/comment/_single_comment.rhtml | 2 | ||||
| -rw-r--r-- | app/views/help/api.rhtml | 2 | ||||
| -rw-r--r-- | app/views/layouts/admin.rhtml | 18 | ||||
| -rw-r--r-- | app/views/public_body/show.rhtml | 2 | ||||
| -rw-r--r-- | app/views/request/_correspondence.rhtml | 2 | ||||
| -rw-r--r-- | app/views/user/show.rhtml | 2 |
11 files changed, 21 insertions, 21 deletions
diff --git a/app/views/admin_general/index.rhtml b/app/views/admin_general/index.rhtml index c683f411a..20248c250 100644 --- a/app/views/admin_general/index.rhtml +++ b/app/views/admin_general/index.rhtml @@ -97,7 +97,7 @@ <% end %> </ul> - <p>(<%= link_to "Full list", admin_request_list_old_unclassified_url %>, or play public + <p>(<%= link_to "Full list", admin_request_list_old_unclassified_path %>, or play public <%= link_to "Categorisation game", categorise_play_path %>) </p> <% end %> diff --git a/app/views/admin_public_body/_tags.rhtml b/app/views/admin_public_body/_tags.rhtml index e6eeed287..72ced09f2 100644 --- a/app/views/admin_public_body/_tags.rhtml +++ b/app/views/admin_public_body/_tags.rhtml @@ -1,8 +1,8 @@ <% for t in body.tags %> <% if t.value %> - <%= link_to(h(t.name), list_public_bodies_url(:tag => t.name)) %>:<%= link_to(h(t.value), list_public_bodies_url(:tag => t.name_and_value)) %> + <%= link_to(h(t.name), list_public_bodies_path(:tag => t.name)) %>:<%= link_to(h(t.value), list_public_bodies_path(:tag => t.name_and_value)) %> <% else %> - <%= link_to(h(t.name), list_public_bodies_url(:tag => t.name)) %> + <%= link_to(h(t.name), list_public_bodies_path(:tag => t.name)) %> <% end %> (<a href="<%= admin_body_list_url %>?query=<%= h(t.name)%>">admin</a>) <% end %> diff --git a/app/views/admin_public_body/show.rhtml b/app/views/admin_public_body/show.rhtml index 712ab083c..ee736bb91 100644 --- a/app/views/admin_public_body/show.rhtml +++ b/app/views/admin_public_body/show.rhtml @@ -35,7 +35,7 @@ <%= # url_name can be missing if the name hasn't been set for this locale if !@public_body.url_name.nil? - link_to 'Public page', public_body_url(@public_body) + link_to 'Public page', public_body_path(@public_body) else 'Public page not available' end diff --git a/app/views/admin_request/show.rhtml b/app/views/admin_request/show.rhtml index f9d6bdac8..56dcb9ee9 100644 --- a/app/views/admin_request/show.rhtml +++ b/app/views/admin_request/show.rhtml @@ -54,7 +54,7 @@ <% end %> <p> - <%= link_to 'Public page', request_url(@info_request) %> + <%= link_to 'Public page', request_path(@info_request) %> | <%= link_to 'Edit', '../edit/' + @info_request.id.to_s %> | <%= link_to 'FOI officer upload URL', '../generate_upload_url/' + @info_request.id.to_s %> (see also links on incoming messages below) </p> diff --git a/app/views/admin_user/show.rhtml b/app/views/admin_user/show.rhtml index 7dd849df5..a9a1c1a4b 100644 --- a/app/views/admin_user/show.rhtml +++ b/app/views/admin_user/show.rhtml @@ -34,7 +34,7 @@ </div> <p> - <%= link_to 'Public page', user_url(@admin_user) %> + <%= link_to 'Public page', user_path(@admin_user) %> | <%= link_to 'Edit', '../edit/' + @admin_user.id.to_s %> | <%= link_to 'Log in as this user', '../login_as/' + @admin_user.id.to_s %> (also confirms their email) </p> @@ -57,7 +57,7 @@ <td><%=h post_redirect.id %></td> <% for column in PostRedirect.content_columns.map { |c| c.name } %> <% if column == 'email_token' %> - <td><%=link_to post_redirect.send(column), confirm_url(:email_token => post_redirect.send(column)) %></td> + <td><%=link_to post_redirect.send(column), confirm_path(:email_token => post_redirect.send(column)) %></td> <% else %> <td><%=h post_redirect.send(column) %></td> <% end %> diff --git a/app/views/comment/_single_comment.rhtml b/app/views/comment/_single_comment.rhtml index 1529c76de..421a9d4ba 100644 --- a/app/views/comment/_single_comment.rhtml +++ b/app/views/comment/_single_comment.rhtml @@ -19,7 +19,7 @@ <% if !comment.id.nil? %> <%= link_to "Link to this", comment_path(comment), :class => "link_to_this" %> <% if !@user.nil? && @user.admin_page_links? %> - | <%= link_to "Admin", admin_request_edit_comment_url(comment) %> + | <%= link_to "Admin", admin_request_edit_comment_path(comment) %> <% end %> <!-- | <%= link_to _('Report abuse'), comment_path(comment) %> --> <% end %> diff --git a/app/views/help/api.rhtml b/app/views/help/api.rhtml index 84ec2f590..3a6c867ee 100644 --- a/app/views/help/api.rhtml +++ b/app/views/help/api.rhtml @@ -19,7 +19,7 @@ <dt>Linking to new requests</dt> <dd> <p>To encourage your users to make links to a particular public authority, use URLs of the form - <%= link_to new_request_to_body_url(:url_name => "liverpool_city_council") , new_request_to_body_path(:url_name => "liverpool_city_council") %>. + <%= link_to new_request_to_body_path(:url_name => "liverpool_city_council") , new_request_to_body_path(:url_name => "liverpool_city_council") %>. These are the parameters you can add to those URLs, either in the URL or from a form. <ul> diff --git a/app/views/layouts/admin.rhtml b/app/views/layouts/admin.rhtml index d6a7eec73..bc076bf40 100644 --- a/app/views/layouts/admin.rhtml +++ b/app/views/layouts/admin.rhtml @@ -12,16 +12,16 @@ <body class="admin"> <p> - <strong><%= link_to 'Alaveteli', frontpage_url %> admin:</strong> - <%= link_to 'Summary', admin_general_index_url %> - | <%= link_to 'Timeline', admin_timeline_url %> - | <%= link_to 'Stats', admin_stats_url %> - | <%= link_to 'Debug', admin_debug_url %> + <strong><%= link_to 'Alaveteli', frontpage_path %> admin:</strong> + <%= link_to 'Summary', admin_general_index_path %> + | <%= link_to 'Timeline', admin_timeline_path %> + | <%= link_to 'Stats', admin_stats_path %> + | <%= link_to 'Debug', admin_debug_path %> <strong>View:</strong> - <%= link_to 'Authorities', admin_body_list_url %> - | <%= link_to 'Requests', admin_request_list_url %> - | <%= link_to 'Users', admin_user_list_url %> - | <%= link_to 'Tracks', admin_track_list_url %> + <%= link_to 'Authorities', admin_body_list_path %> + | <%= link_to 'Requests', admin_request_list_path %> + | <%= link_to 'Users', admin_user_list_path %> + | <%= link_to 'Tracks', admin_track_list_path %> </p> <%= render :partial => 'general/locale_switcher' %> diff --git a/app/views/public_body/show.rhtml b/app/views/public_body/show.rhtml index a4c57305a..1f8e97b23 100644 --- a/app/views/public_body/show.rhtml +++ b/app/views/public_body/show.rhtml @@ -37,7 +37,7 @@ <%=@public_body.type_of_authority(true)%><% if not @public_body.short_name.empty? %>, <%= _('also called {{public_body_short_name}}', :public_body_short_name => h(@public_body.short_name))%><% end %> <% if !@user.nil? && @user.admin_page_links? %> - (<%= link_to _("admin"), admin_body_show_url(@public_body) %>) + (<%= link_to _("admin"), admin_body_show_path(@public_body) %>) <% end %> </p> diff --git a/app/views/request/_correspondence.rhtml b/app/views/request/_correspondence.rhtml index 445f7c825..68711b259 100644 --- a/app/views/request/_correspondence.rhtml +++ b/app/views/request/_correspondence.rhtml @@ -21,7 +21,7 @@ if not incoming_message.nil? <p class="event_actions"> <% if !@user.nil? && @user.admin_page_links? %> - <%= link_to "Admin", admin_request_show_raw_email_url(incoming_message.raw_email_id) %> | + <%= link_to "Admin", admin_request_show_raw_email_path(incoming_message.raw_email_id) %> | <% end %> <%= link_to _("Link to this"), incoming_message_path(incoming_message), :class => "link_to_this" %> </p> diff --git a/app/views/user/show.rhtml b/app/views/user/show.rhtml index 49e700ecb..54cc8b7ed 100644 --- a/app/views/user/show.rhtml +++ b/app/views/user/show.rhtml @@ -66,7 +66,7 @@ <p class="subtitle"> <%= _('Joined {{site_name}} in', :site_name=>site_name) %> <%= year_from_date(@display_user.created_at) %> <% if !@user.nil? && @user.admin_page_links? %> - (<%= link_to "admin", admin_user_show_url(@display_user) %>) + (<%= link_to "admin", admin_user_show_path(@display_user) %>) <% end %> </p> |