aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--app/views/general/search.html.erb1
-rw-r--r--app/views/public_body/show.html.erb4
-rw-r--r--app/views/request/_request_filter_form.html.erb59
-rw-r--r--app/views/request/_request_search_form.html.erb35
-rw-r--r--app/views/request/_sidebar.html.erb1
-rw-r--r--app/views/request/list.html.erb7
-rw-r--r--app/views/track/_rss_feed.html.erb4
-rw-r--r--app/views/track/_tracking_links.html.erb5
-rw-r--r--app/views/user/show.html.erb1
9 files changed, 62 insertions, 55 deletions
diff --git a/app/views/general/search.html.erb b/app/views/general/search.html.erb
index 3914a2f30..96c91b791 100644
--- a/app/views/general/search.html.erb
+++ b/app/views/general/search.html.erb
@@ -131,6 +131,7 @@
<div id="header_right">
<h2><%= _('Track this search')%></h2>
<%= render :partial => 'track/tracking_links', :locals => { :track_thing => @track_thing, :own_request => false, :location => 'main' } %>
+ <%= render :partial => 'track/rss_feed', :locals => { :track_thing => @track_thing, :location => 'main' } %>
</div>
<% end %>
diff --git a/app/views/public_body/show.html.erb b/app/views/public_body/show.html.erb
index 5ac637a78..1dad1deb6 100644
--- a/app/views/public_body/show.html.erb
+++ b/app/views/public_body/show.html.erb
@@ -12,6 +12,7 @@
</p>
<%= render :partial => 'track/tracking_links', :locals => { :track_thing => @track_thing, :own_request => false, :location => 'sidebar' } %>
+ <%= render :partial => 'track/rss_feed', :locals => { :track_thing => @track_thing, :location => 'sidebar' } %>
<%= render :partial => 'more_info', :locals => { :public_body => @public_body } %>
</div>
@@ -91,7 +92,8 @@
<a name="results"></a>
<% if @public_body.info_requests.size > 4 %>
- <%= render :partial => 'request/request_filter_form' %>
+ <%= render :partial => 'request/request_search_form',
+ :locals => { :after_form_fields => render(:partial => 'request/request_filter_form') } %>
<% end %>
<% end %>
diff --git a/app/views/request/_request_filter_form.html.erb b/app/views/request/_request_filter_form.html.erb
index 090db01df..0983c8c57 100644
--- a/app/views/request/_request_filter_form.html.erb
+++ b/app/views/request/_request_filter_form.html.erb
@@ -1,41 +1,14 @@
-<%= render :partial => 'general/localised_datepicker' %>
-
-<div id="list-filter">
- <%= form_tag(request.path, :method => "get", :id=>"filter_requests_form") do %>
- <div class="list-filter-item">
- <%= label_tag(:query, _("Keywords"), :class=>"form_label title") %>
- <%= text_field_tag(:query, params[:query]) %>
- </div>
-<% if false # don't think we want this, but leaving as an example %>
- <div class="list-filter-item">
- <%= _("Search for words in:") %> <br/>
- <% [["sent", _("messages from users")],
- ["response", _("messages from authorities")],
- ["comment", _("comments")]].each_with_index do |item, index|
- variety, title = item %>
-
- <%= check_box_tag "request_variety[]", variety, params[:request_variety].nil? ? true : params[:request_variety].include?(variety), :id => "request_variety_#{index}" %>
- <%= label_tag("request_variety_#{index}", title) %> <br/>
- <% end %>
- </div>
-<% end %>
- <div class="list-filter-item">
- <%= label_tag(:query, _("Made between"), :class=>"form_label title") %>
- <%= text_field_tag(:request_date_after, params[:request_date_after], {:class => "use-datepicker", :size => 10}) %>&nbsp;&nbsp;
- <%= label_tag(:query, _("and"), :class=>"form_label") %>
- <%= text_field_tag(:request_date_before, params[:request_date_before], {:class => "use-datepicker", :size => 10}) %>
- </div>
- <div class="list-filter-item">
- <h3 class="title"><%= _("Showing") %></h3>
- <div class="filter-request-types">
- <% statuses = [["all", _("all requests")],
- ["successful", _("successful requests")],
- ["unsuccessful", _("unsuccessful requests")],
- ["awaiting", _("unresolved requests")]] %>
- <% for status, label in statuses %>
- <% if params[:view] != status %>
- <% if params[:controller] == "public_body" %>
- <%= link_to label, url_for(:controller => "public_body", :action => "show", :view => status, :url_name => @public_body.url_name) + "?" + request.query_string + '#results' %>
+<div class="list-filter-item">
+ <h3 class="title"><%= _("Showing") %></h3>
+ <div class="filter-request-types">
+ <% statuses = [["all", _("all requests")],
+ ["successful", _("successful requests")],
+ ["unsuccessful", _("unsuccessful requests")],
+ ["awaiting", _("unresolved requests")]] %>
+ <% statuses.each do |status, label| %>
+ <% if params[:view] != status %>
+ <% if params[:controller] == "public_body" %>
+ <%= link_to label, url_for(:controller => "public_body", :action => "show", :view => status, :url_name => @public_body.url_name) + "?" + request.query_string + '#results' %>
<% else %>
<%= link_to label, url_for(:controller => "request", :action => "list", :view => status) + "?" + request.query_string + '#results' %>
<% end %>
@@ -43,12 +16,6 @@
<%= label %>
<% end %>
<%= "|" unless statuses.last[0] == status %>
- <% end %>
- </div>
- </div>
-
- <div class="list-filter-item">
- <%= submit_tag(_("Search")) %>
- </div>
-<% end %>
+ <% end %>
+ </div>
</div>
diff --git a/app/views/request/_request_search_form.html.erb b/app/views/request/_request_search_form.html.erb
new file mode 100644
index 000000000..3f2f66950
--- /dev/null
+++ b/app/views/request/_request_search_form.html.erb
@@ -0,0 +1,35 @@
+<%= render :partial => 'general/localised_datepicker' %>
+
+<div id="list-filter">
+ <%= form_tag(request.path, :method => "get", :id=>"filter_requests_form") do %>
+ <div class="list-filter-item">
+ <%= label_tag(:query, _("Keywords"), :class=>"form_label title") %>
+ <%= text_field_tag(:query, params[:query]) %>
+ </div>
+<% if false # don't think we want this, but leaving as an example %>
+ <div class="list-filter-item">
+ <%= _("Search for words in:") %> <br/>
+ <% [["sent", _("messages from users")],
+ ["response", _("messages from authorities")],
+ ["comment", _("comments")]].each_with_index do |item, index|
+ variety, title = item %>
+
+ <%= check_box_tag "request_variety[]", variety, params[:request_variety].nil? ? true : params[:request_variety].include?(variety), :id => "request_variety_#{index}" %>
+ <%= label_tag("request_variety_#{index}", title) %> <br/>
+ <% end %>
+ </div>
+<% end %>
+ <div class="list-filter-item">
+ <%= label_tag(:query, _("Made between"), :class=>"form_label title") %>
+ <%= text_field_tag(:request_date_after, params[:request_date_after], {:class => "use-datepicker", :size => 10}) %>&nbsp;&nbsp;
+ <%= label_tag(:query, _("and"), :class=>"form_label") %>
+ <%= text_field_tag(:request_date_before, params[:request_date_before], {:class => "use-datepicker", :size => 10}) %>
+ </div>
+
+ <%= after_form_fields if defined?(after_form_fields) -%>
+
+ <div class="list-filter-item">
+ <%= submit_tag(_("Search")) %>
+ </div>
+<% end %>
+</div>
diff --git a/app/views/request/_sidebar.html.erb b/app/views/request/_sidebar.html.erb
index 0f7965ffa..0d81ef111 100644
--- a/app/views/request/_sidebar.html.erb
+++ b/app/views/request/_sidebar.html.erb
@@ -10,6 +10,7 @@
:count => follower_count) %>
</p>
<%= render :partial => 'track/tracking_links', :locals => { :track_thing => @track_thing, :own_request => @info_request.user && @info_request.user == @user, :location => 'sidebar' } %>
+ <%= render :partial => 'track/rss_feed', :locals => { :track_thing => @track_thing, :location => 'sidebar' } %>
</div>
<% if @info_request.described_state != "attention_requested" %>
<h2><%= _('Offensive? Unsuitable?') %></h2>
diff --git a/app/views/request/list.html.erb b/app/views/request/list.html.erb
index a465f03ba..75cb463ef 100644
--- a/app/views/request/list.html.erb
+++ b/app/views/request/list.html.erb
@@ -1,13 +1,14 @@
-
<div id="header_left">
- <h1><%=@title%></h1>
- <%= render :partial => 'request/request_filter_form' %>
+ <h1><%= @title %></h1>
+ <%= render :partial => 'request/request_search_form',
+ :locals => { :after_form_fields => render(:partial => 'request/request_filter_form') } %>
</div>
<div id="header_right">
<h2><%= _("Follow these requests") %></h2>
<% if @track_thing %>
<%= render :partial => 'track/tracking_links', :locals => { :track_thing => @track_thing, :own_request => false, :location => 'main' } %>
+ <%= render :partial => 'track/rss_feed', :locals => { :track_thing => @track_thing, :location => 'main' } %>
<% end %>
</div>
diff --git a/app/views/track/_rss_feed.html.erb b/app/views/track/_rss_feed.html.erb
new file mode 100644
index 000000000..4be46ffa9
--- /dev/null
+++ b/app/views/track/_rss_feed.html.erb
@@ -0,0 +1,4 @@
+<div class="feed_link feed_link_<%= location %>">
+ <%= link_to image_tag('feed-16.png', :alt => "RSS icon"), do_track_path(track_thing, 'feed') %>
+ <%= link_to (location == 'sidebar' ? _('RSS feed of updates') : _('RSS feed')), do_track_path(track_thing, 'feed') %>
+</div>
diff --git a/app/views/track/_tracking_links.html.erb b/app/views/track/_tracking_links.html.erb
index 5419ec605..8e0b07167 100644
--- a/app/views/track/_tracking_links.html.erb
+++ b/app/views/track/_tracking_links.html.erb
@@ -19,11 +19,6 @@
<%= link_to _("Follow"), do_track_path(track_thing), :class => "link_button_green" %>
<% end %>
</div>
-
- <div class="feed_link feed_link_<%=location%>">
- <%= link_to image_tag('feed-16.png', :alt => "RSS icon"), do_track_path(track_thing, 'feed') %>
- <%= link_to (location == 'sidebar' ? _('RSS feed of updates') : _('RSS feed')), do_track_path(track_thing, 'feed') %>
- </div>
<% end %>
diff --git a/app/views/user/show.html.erb b/app/views/user/show.html.erb
index 51882b8ef..7c8d52568 100644
--- a/app/views/user/show.html.erb
+++ b/app/views/user/show.html.erb
@@ -34,6 +34,7 @@
<% if !@track_thing.nil? %>
<h2><%= _('Track this person')%></h2>
<%= render :partial => 'track/tracking_links', :locals => { :track_thing => @track_thing, :own_request => false, :location => 'sidebar' } %>
+ <%= render :partial => 'track/rss_feed', :locals => { :track_thing => @track_thing, :location => 'sidebar' } %>
<% end %>
<% if !@xapian_requests.nil? %>
<h2><%= _('On this page')%></h2>
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-29 19:49:39 +0000