diff options
| -rw-r--r-- | app/views/public_body/show.rhtml | 6 | ||||
| -rw-r--r-- | app/views/request/_sidebar.rhtml | 5 | ||||
| -rw-r--r-- | app/views/request/list.rhtml | 2 | ||||
| -rw-r--r-- | app/views/track/_tracking_links.rhtml | 5 |
4 files changed, 12 insertions, 6 deletions
diff --git a/app/views/public_body/show.rhtml b/app/views/public_body/show.rhtml index 85506a1bd..2aab549b6 100644 --- a/app/views/public_body/show.rhtml +++ b/app/views/public_body/show.rhtml @@ -1,7 +1,11 @@ <% @title = h(@public_body.name) + " - view and make Freedom of Information requests" %> <div> <div id="header_right"> - <h2><%= _('Track this authority')%></h2> + <h2><%= _('Follow this authority')%></h2> + + <% follower_count = TrackThing.count(:all, :conditions => ["public_body_id = ?", @public_body.id]) %> + <p><%= n_("There is %d person following this authority", "There are %d people following this authority", follower_count) % follower_count %></p> + <%= render :partial => 'track/tracking_links', :locals => { :track_thing => @track_thing, :own_request => false, :location => 'sidebar' } %> <h2><%= _('More about this authority')%></h2> <% if !@public_body.calculated_home_page.nil? %> diff --git a/app/views/request/_sidebar.rhtml b/app/views/request/_sidebar.rhtml index e562c4f6a..62ece4821 100644 --- a/app/views/request/_sidebar.rhtml +++ b/app/views/request/_sidebar.rhtml @@ -1,5 +1,8 @@ <div id="right_column"> - <h2><%= _('Track this request') %></h2> + <h2><%= _('Follow this request') %></h2> + + <% follower_count = TrackThing.count(:all, :conditions => ["info_request_id = ?", @info_request.id]) + 1 %> + <p><%= n_("There is %d person following this request", "There are %d people following this request", follower_count) % follower_count %></p> <%= render :partial => 'track/tracking_links', :locals => { :track_thing => @track_thing, :own_request => @info_request.user == @user, :location => 'sidebar' } %> <h2><%= _("Act on what you've learnt") %></h2> diff --git a/app/views/request/list.rhtml b/app/views/request/list.rhtml index 28dc55cdf..44c53ca1d 100644 --- a/app/views/request/list.rhtml +++ b/app/views/request/list.rhtml @@ -5,7 +5,7 @@ </div> <div id="header_right"> - <h2>Track these requests</h2> + <h2>Follow these requests</h2> <% if @track_thing %> <%= render :partial => 'track/tracking_links', :locals => { :track_thing => @track_thing, :own_request => false, :location => 'main' } %> <% end %> diff --git a/app/views/track/_tracking_links.rhtml b/app/views/track/_tracking_links.rhtml index 5a8316db4..09206528c 100644 --- a/app/views/track/_tracking_links.rhtml +++ b/app/views/track/_tracking_links.rhtml @@ -4,11 +4,10 @@ end %> - <% if own_request %> <p><%= _('This is your own request, so you will be automatically emailed when new responses arrive.')%></p> <% elsif existing_track %> - <% form_tag({:controller => 'track', :action => 'update', :track_id => existing_track.id}, :class => "feed_form_" + location) do %> + <% form_tag({:controller => 'track', :action => 'update', :track_id => existing_track.id}, :class => "feed_form feed_form_" + location) do %> <p> <%= track_thing.params[:verb_on_page_already] %> <%= hidden_field_tag 'track_medium', "delete" %> @@ -19,7 +18,7 @@ <% elsif track_thing %> <div class="feed_link feed_link_<%=location%>"> <%= link_to '<img src="/images/email-16.png" alt="">', do_track_url(track_thing) %> - <%= link_to "Track by email", do_track_url(track_thing) %> + <%= link_to "Follow by email", do_track_url(track_thing) %> </div> <div class="feed_link feed_link_<%=location%>"> |