diff options
| -rw-r--r-- | app/models/track_thing.rb | 4 | ||||
| -rw-r--r-- | app/views/body/show.rhtml | 2 | ||||
| -rw-r--r-- | app/views/general/search.rhtml | 16 | ||||
| -rw-r--r-- | app/views/request/list.rhtml | 4 | ||||
| -rw-r--r-- | app/views/request/show.rhtml | 2 | ||||
| -rw-r--r-- | app/views/track/_tracking_links.rhtml | 11 | ||||
| -rw-r--r-- | app/views/user/show.rhtml | 2 | ||||
| -rw-r--r-- | public/stylesheets/main.css | 4 | ||||
| -rw-r--r-- | todo.txt | 6 |
9 files changed, 27 insertions, 24 deletions
diff --git a/app/models/track_thing.rb b/app/models/track_thing.rb index 98b1b43f3..c32974483 100644 --- a/app/models/track_thing.rb +++ b/app/models/track_thing.rb @@ -21,7 +21,7 @@ # Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ # -# $Id: track_thing.rb,v 1.29 2008-08-08 20:44:54 francis Exp $ +# $Id: track_thing.rb,v 1.30 2008-08-08 21:12:49 francis Exp $ class TrackThing < ActiveRecord::Base belongs_to :tracking_user, :class_name => 'User' @@ -190,7 +190,7 @@ class TrackThing < ActiveRecord::Base # Website :set_title => "How would you like to be updated about new requests and responses matching '" + CGI.escapeHTML(self.track_query) + "'?", :list_description => "'<a href=\"/search/" + CGI.escapeHTML(self.track_query) + "/newest\">" + CGI.escapeHTML(self.track_query) + "</a>' in new requests/responses", # XXX yeuch, sometimes I just want to call view helpers from the model, sorry! can't work out how - :verb_on_page => "Email me about requests/responses matching '" + CGI.escapeHTML(self.track_query) + "'", + :verb_on_page => "Email me new requests/responses matching '" + CGI.escapeHTML(self.track_query) + "'", :verb_on_page_already => "Being emailed about '" + CGI.escapeHTML(self.track_query) + "'", # Email :title_in_email => "Requests or responses matching '" + self.track_query + "'", diff --git a/app/views/body/show.rhtml b/app/views/body/show.rhtml index 3ced6c6c2..4c748644c 100644 --- a/app/views/body/show.rhtml +++ b/app/views/body/show.rhtml @@ -2,7 +2,7 @@ <div id="request_sidebar"> <h2>Track this authority</h2> - <%= render :partial => 'track/tracking_links', :locals => { :track_thing => @track_thing, :own_request => false } %> + <%= render :partial => 'track/tracking_links', :locals => { :track_thing => @track_thing, :own_request => false, :location => 'sidebar' } %> </div> <h1><%=h(@public_body.name)%></h1> diff --git a/app/views/general/search.rhtml b/app/views/general/search.rhtml index f3c703959..f68d19169 100644 --- a/app/views/general/search.rhtml +++ b/app/views/general/search.rhtml @@ -1,13 +1,5 @@ <% @show_tips = @xapian_requests.nil? || (@total_hits == 0) %> -<% # XXX should call find_tracking_people in controller, not here / in partial - if @track_thing and TrackThing.find_tracking_people(@track_thing).size > 0 %> - <div id="request_sidebar"> - <h2>People tracking this search</h2> - <%= render :partial => 'track/tracking_links', :locals => { :track_thing => @track_thing, :own_request => false } %> - </div> -<% end %> - <% if @query.nil? %> <% @title = "Search Freedom of Information requests, public authorities and users" %> <h1><%=@title%></h1> @@ -29,12 +21,14 @@ <% end %> <% if not @query.nil? %> + <p> <%=link_to_unless @sortby.nil?, "Show most relevant results first", search_url(@query, nil) %> | <%=link_to_unless @sortby == 'newest', "Newest results first", search_url(@query, 'newest') %> <% if @sortby == 'described' %> | Recently described results first <% end %> + </p> <% end %> <% if @total_hits == 0 %> @@ -47,7 +41,7 @@ <% end %> <% if @track_thing %> - <%= render :partial => 'track/tracking_links', :locals => { :track_thing => @track_thing, :own_request => false } %> + <%= render :partial => 'track/tracking_links', :locals => { :track_thing => @track_thing, :own_request => false, :location => 'main' } %> <% end %> <% if @xapian_bodies.results.size > 0 %> @@ -74,7 +68,7 @@ <h1><%= "FOI requests " + ((@page-1)*@requests_per_page+1).to_s + "-" + [@page*@requests_per_page, @xapian_requests.matches_estimated].min.to_s + " of " + @xapian_requests.matches_estimated.to_s + " for '" + h(@query) + "'" %></h1> <% if @track_thing %> - <%= render :partial => 'track/tracking_links', :locals => { :track_thing => @track_thing, :own_request => false } %> + <%= render :partial => 'track/tracking_links', :locals => { :track_thing => @track_thing, :own_request => false, :location => 'main' } %> <% end %> <% for result in @xapian_requests.results %> @@ -83,7 +77,7 @@ <%= will_paginate WillPaginate::Collection.new(@page, @requests_per_page, @xapian_requests.matches_estimated) %> <% if @track_thing %> - <%= render :partial => 'track/tracking_links', :locals => { :track_thing => @track_thing, :own_request => false } %> + <%= render :partial => 'track/tracking_links', :locals => { :track_thing => @track_thing, :own_request => false, :location => 'main' } %> <% end %> <% end %> <% end %> diff --git a/app/views/request/list.rhtml b/app/views/request/list.rhtml index 209f0a533..1e1eb4a5b 100644 --- a/app/views/request/list.rhtml +++ b/app/views/request/list.rhtml @@ -12,7 +12,7 @@ <h1><%=@title%></h1> <% if @track_thing %> - <%= render :partial => 'track/tracking_links', :locals => { :track_thing => @track_thing, :own_request => false } %> + <%= render :partial => 'track/tracking_links', :locals => { :track_thing => @track_thing, :own_request => false, :location => 'main' } %> <% end %> <% if @xapian_object.results.empty? %> @@ -30,5 +30,5 @@ <%= will_paginate WillPaginate::Collection.new(@page, @per_page, @xapian_object.matches_estimated) %> <% if @track_thing %> - <%= render :partial => 'track/tracking_links', :locals => { :track_thing => @track_thing, :own_request => false } %> + <%= render :partial => 'track/tracking_links', :locals => { :track_thing => @track_thing, :own_request => false, :location => 'main' } %> <% end %> diff --git a/app/views/request/show.rhtml b/app/views/request/show.rhtml index 498e375b3..0393200ab 100644 --- a/app/views/request/show.rhtml +++ b/app/views/request/show.rhtml @@ -8,7 +8,7 @@ <div id="request_sidebar"> <h2>Track this request</h2> - <%= render :partial => 'track/tracking_links', :locals => { :track_thing => @track_thing, :own_request => @info_request.user == @user } %> + <%= 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> <p> diff --git a/app/views/track/_tracking_links.rhtml b/app/views/track/_tracking_links.rhtml index a104010b7..7828ca9f3 100644 --- a/app/views/track/_tracking_links.rhtml +++ b/app/views/track/_tracking_links.rhtml @@ -17,10 +17,15 @@ </p> <% end %> <% else %> - <div class="feed_link"><%= link_to '<img src="/images/email-16.png" alt="" class="rss">', do_track_url(track_thing) %> - <%= link_to track_thing.params[:verb_on_page], do_track_url(track_thing) %></div> + <div class="feed_link feed_link_<%=location%>"> + <%= link_to '<img src="/images/email-16.png" alt="" class="rss">', do_track_url(track_thing) %> + <%= link_to track_thing.params[:verb_on_page], do_track_url(track_thing) %> + </div> <% end %> -<div class="feed_link"><%= link_to '<img src="/images/feed-16.png" alt="" class="rss">', do_track_url(track_thing, 'feed') %> <%= link_to 'RSS feed of updates', do_track_url(track_thing, 'feed') %></div> +<div class="feed_link feed_link_<%=location%>"> + <%= link_to '<img src="/images/feed-16.png" alt="" class="rss">', do_track_url(track_thing, 'feed') %> + <%= link_to (location == 'sidebar' ? 'RSS feed of updates' : 'RSS feed'), do_track_url(track_thing, 'feed') %> +</div> diff --git a/app/views/user/show.rhtml b/app/views/user/show.rhtml index b7dab4746..8bca14097 100644 --- a/app/views/user/show.rhtml +++ b/app/views/user/show.rhtml @@ -9,7 +9,7 @@ <div id="request_sidebar"> <h2>Track this person</h2> - <%= render :partial => 'track/tracking_links', :locals => { :track_thing => @track_thing, :own_request => false } %> + <%= render :partial => 'track/tracking_links', :locals => { :track_thing => @track_thing, :own_request => false, :location => 'sidebar' } %> </div> <div class="single_user"> diff --git a/public/stylesheets/main.css b/public/stylesheets/main.css index 6ac6250a4..fd1b806bb 100644 --- a/public/stylesheets/main.css +++ b/public/stylesheets/main.css @@ -784,6 +784,10 @@ div.feed_link img { text-decoration: none; } +div.feed_link_main { + display: inline; +} + /*------------------------------------------------ footer */ @@ -1,10 +1,10 @@ RSS move: - Spacing on http://localhost:3000/search/hello - Rename tracking_people_and_link Redo styling a bit of action icons so consistent + with writetothem link Add some tests - In controllers/track_controller.rb fiddle with wording of now/already + Spacing at end of search results + Remove find_tracking_people http://www.whatdotheyknow.com/request/communications_about_whatdotheyk Mask all emails from binary attachments |