aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--app/views/request/_request_listing_single.html.erb18
-rw-r--r--app/views/request_game/play.html.erb24
2 files changed, 26 insertions, 16 deletions
diff --git a/app/views/request/_request_listing_single.html.erb b/app/views/request/_request_listing_single.html.erb
index 50f889d75..0f1d7f4ef 100644
--- a/app/views/request/_request_listing_single.html.erb
+++ b/app/views/request/_request_listing_single.html.erb
@@ -2,14 +2,20 @@
<span class="head">
<%= link_to h(info_request.title), (@play_urls ? categorise_request_path(:url_title => info_request.url_title) : request_path(info_request)) %>
</span>
+
<span class="desc">
<%= excerpt(info_request.initial_request_text, "", :radius => 150) %>
- </span>
- <span class="bottomline icon_<%= info_request.calculate_status %>">
- <strong>
+ </span>
+
+ <span class="bottomline icon_<%= info_request.calculate_status %>">
+ <strong>
<%= info_request.display_status %>
- </strong><br>
- <%= _('Requested from {{public_body_name}} by {{info_request_user}} on {{date}}',:public_body_name=>public_body_link(info_request.public_body),:info_request_user=>user_link(info_request.user),:date=>simple_date(info_request.created_at)) %>
- </span>
+ </strong>
+ <br>
+ <%= _('Requested from {{public_body_name}} by {{info_request_user}} on {{date}}',
+ :public_body_name => public_body_link(info_request.public_body),
+ :info_request_user => user_link(info_request.user),
+ :date => simple_date(info_request.created_at)) %>
+ </span>
</div>
diff --git a/app/views/request_game/play.html.erb b/app/views/request_game/play.html.erb
index 544274e93..471a0e09e 100644
--- a/app/views/request_game/play.html.erb
+++ b/app/views/request_game/play.html.erb
@@ -5,43 +5,47 @@
<img width=250 height=125 src="http://chart.apis.google.com/chart?chs=250x125&cht=gom&chd=t:<%=@percentage%>" alt="<%=@percentage%>% of requests have been categorised">
<br><%=pluralize(@missing, 'request')%> left to categorise / <%=@total %> total
</p>
+
<h2>Top recent players</h2>
<table>
- <% c = 0; for classifications in @league_table_28_days %>
+ <% @league_table_28_days.each_with_index do |classifications, index| %>
<tr>
- <td> <%= c += 1 %>. <td>
+ <td> <%= index += 1 %>. <td>
<td> <%= user_link(classifications.user) %> </td>
- <td> <%=pluralize(classifications.cnt, 'request').gsub(" ", "&nbsp;").html_safe %> </td>
+ <td> <%= pluralize(classifications.cnt, 'request').gsub(" ", "&nbsp;").html_safe %> </td>
</tr>
<% end %>
</table>
<h2>All time best players</h2>
<table>
- <% c = 0; for classifications in @league_table_all_time %>
+ <% @league_table_all_time.each_with_index do |classifications, index| %>
<tr>
- <td> <%= c += 1 %>. <td>
+ <td> <%= index += 1 %>. <td>
<td> <%= user_link(classifications.user) %> </td>
<td> <%= pluralize(classifications.cnt, 'request').gsub(" ", "&nbsp;").html_safe %> </td>
</tr>
<% end %>
</table>
</div>
+
<div id="game">
<h2><%= _("Play the request categorisation game!")%></h2>
+
<p><%= _("Some people who've made requests haven't let us know whether they were
successful or not. We need <strong>your</strong> help &ndash;
choose one of these requests, read it, and let everyone know whether or not the
information has been provided. Everyone'll be exceedingly grateful.")%></p>
- <% for info_request in @requests %>
+
+ <% @requests.each do |info_request| %>
<%= render :partial => 'request/request_listing_single', :locals => { :info_request => info_request } %>
<% end %>
+
<p id="game_buttons">
- <%= button_to _('I don\'t like these ones &mdash; give me some more!'), categorise_play_url %>
- <%= button_to _('I don\'t want to do any more tidying now!'), categorise_stop_url %>
+ <%= button_to _('I don\'t like these ones &mdash; give me some more!'), categorise_play_url %>
+ <%= button_to _('I don\'t want to do any more tidying now!'), categorise_stop_url %>
</p>
+
<p><%= _('Thanks for helping - your work will make it easier for everyone to find successful
responses, and maybe even let us make league tables...')%></p>
</div>
-
-