diff options
| author | Louise Crow <louise.crow@gmail.com> | 2012-10-01 10:10:39 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2012-10-01 10:10:39 +0100 |
| commit | 3cfa6c4d1c4ae6ba5e3f22ff8757d1ec9dcd8b68 (patch) | |
| tree | 284cb37879a4074f9faaa141cb78ba71d8132110 | |
| parent | 21ad19e8157b9c59e8fbe7ae4d780bbba751e52e (diff) | |
| parent | 287c7f3944fb35ba939a74da368d6b8f973454aa (diff) | |
Merge remote-tracking branch 'openaustralia_github/requests_frontpage_wording' into develop
| -rw-r--r-- | app/controllers/general_controller.rb | 3 | ||||
| -rw-r--r-- | app/views/general/frontpage.rhtml | 16 |
2 files changed, 17 insertions, 2 deletions
diff --git a/app/controllers/general_controller.rb b/app/controllers/general_controller.rb index 5a7b006a0..dc8e03d7a 100644 --- a/app/controllers/general_controller.rb +++ b/app/controllers/general_controller.rb @@ -55,10 +55,13 @@ class GeneralController < ApplicationController # If there are not yet enough successful requests, fill out the list with # other requests if @request_events.count < max_count + @request_events_all_successful = false query = 'variety:sent' xapian_object = perform_search([InfoRequestEvent], query, sortby, 'request_title_collapse', max_count-@request_events.count) more_events = xapian_object.results.map { |r| r[:model] } @request_events += more_events + else + @request_events_all_successful = true end rescue @request_events = [] diff --git a/app/views/general/frontpage.rhtml b/app/views/general/frontpage.rhtml index 8b078836e..e2d74a5e2 100644 --- a/app/views/general/frontpage.rhtml +++ b/app/views/general/frontpage.rhtml @@ -51,7 +51,13 @@ <% end %> <div id="examples_1"> - <h3><%= _("What information has been released?") %></h3> + <h3> + <% if @request_events_all_successful %> + <%= _("What information has been released?") %> + <% else %> + <%= _("What information has been requested?") %> + <% end %> + </h3> <%= _("{{site_name}} users have made {{number_of_requests}} requests, including:", :site_name => site_name, :number_of_requests => InfoRequest.count) %> <ul> @@ -64,7 +70,13 @@ </li> <% end %> </ul> - <p><strong><%=link_to _('More successful requests...'), request_list_successful_url %></strong></p> + <p><strong> + <% if @request_events_all_successful %> + <%=link_to _('More successful requests...'), request_list_successful_url %> + <% else %> + <%=link_to _('More requests...'), request_list_all_url %> + <% end %> + </strong></p> </div> </div> |