diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-03-06 17:11:47 -0800 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-03-06 17:11:47 -0800 |
| commit | fc770ee6eb342d4562b6588612f1c9aca46f58e1 (patch) | |
| tree | 8833be60c0f0cb39d33dbaf4538ceca8d848e57f /app/views/help | |
| parent | 455a1f07f3099d1d94fff2a7efcf99fb8fd6841d (diff) | |
| parent | 7abb45b0549af892b7f1ec2beeca5a42f8c2ef7a (diff) | |
Merge remote-tracking branch 'openaustralia_github/make-links-relative' into develop
Conflicts:
app/controllers/admin_request_controller.rb
app/models/request_mailer.rb
app/views/admin_general/index.rhtml
app/views/admin_general/stats.rhtml
app/views/admin_public_body/_one_list.rhtml
app/views/admin_public_body/_tags.rhtml
app/views/admin_public_body/show.rhtml
app/views/admin_request/show.rhtml
app/views/admin_user/show.rhtml
app/views/layouts/admin.rhtml
app/views/public_body/show.rhtml
app/views/request/new.rhtml
Diffstat (limited to 'app/views/help')
| -rw-r--r-- | app/views/help/api.rhtml | 4 | ||||
| -rw-r--r-- | app/views/help/contact.rhtml | 2 | ||||
| -rw-r--r-- | app/views/help/unhappy.rhtml | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/app/views/help/api.rhtml b/app/views/help/api.rhtml index da6253f87..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_url(: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> @@ -67,7 +67,7 @@ <dd> <p> A spreadsheet file listing every body in WhatDoTheyKnow is available: - <%= link_to "all-authorities.csv", all_public_bodies_csv_url() %> + <%= link_to "all-authorities.csv", all_public_bodies_csv_path %> </p> </dd> diff --git a/app/views/help/contact.rhtml b/app/views/help/contact.rhtml index fab5017b8..b1b5d4f24 100644 --- a/app/views/help/contact.rhtml +++ b/app/views/help/contact.rhtml @@ -46,7 +46,7 @@ <p> <label class="form_label" for="contact_name">Your name:</label> <%= f.text_field :name, :size => 20 %> - (or <%= link_to "sign in", signin_url(:r => request.request_uri) %>) + (or <%= link_to "sign in", signin_path(:r => request.request_uri) %>) </p> <p> diff --git a/app/views/help/unhappy.rhtml b/app/views/help/unhappy.rhtml index 2b00341c2..79e3f8273 100644 --- a/app/views/help/unhappy.rhtml +++ b/app/views/help/unhappy.rhtml @@ -29,7 +29,7 @@ to your request '<%=request_link(@info_request) %>'? <p> <% if !@info_request.nil? %> - <%= link_to "Request an internal review", show_response_no_followup_url(:id => @info_request.id, :incoming_message_id => nil) + "?internal_review=1#followup", :class => 'link_button_green' %> and then write a message asking the authority to review your request. + <%= link_to "Request an internal review", show_response_no_followup_path(:id => @info_request.id, :incoming_message_id => nil) + "?internal_review=1#followup", :class => 'link_button_green' %> and then write a message asking the authority to review your request. <% else %> At the bottom of the relevant request page on <%= site_name %> choose "request an internal review". Then write a message asking for an internal @@ -62,7 +62,7 @@ to the Scottish Information Commissioner</a>. Information Commissioner, either <% if !@info_request.nil? %> include a link to your request - <strong><%=h main_url(request_url(@info_request)) %></strong> + <strong><%=h request_url(@info_request) %></strong> <% else %> include a link to your request on <%= site_name %> <% end %> |