Skip to content

Commit

Permalink
Merge branch 'signpost-request-contributions' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
garethrees committed Nov 10, 2023
2 parents 83a517c + 8c6ab94 commit 60e5822
Show file tree
Hide file tree
Showing 6 changed files with 37 additions and 12 deletions.
17 changes: 11 additions & 6 deletions app/assets/stylesheets/responsive/_search_style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -136,15 +136,20 @@ input.use-datepicker[type=text] {
}
}

.search_latest {
ul.search_latest__list {
list-style: none;
padding-left: 0;
}
.search_sidebar_list {
list-style: none;
padding-left: 0;

li.search_latest__item {
.search_sidebar_list__item {
a:after {
content: ""
}
}
}

.search_latest,
.help_requests {
h2 {
margin-top: 1.5em !important;
}
}
13 changes: 13 additions & 0 deletions app/views/general/_help_requests.html.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<div class="help_requests">
<h2><%= _('Help Out') %></h2>

<ul class="search_sidebar_list">
<li class="search_sidebar_list__item">
<%= link_to _('Classify requests'), categorise_play_path %>
</li>

<li class="search_sidebar_list__item">
<%= link_to _('Find updated contact details'), search_requests_path('latest_status:error_message') %>
</li>
</ul>
</div>
12 changes: 7 additions & 5 deletions app/views/general/_search_latest.html.erb
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
<div class="search_latest">
<ul class="search_latest__list">
<li class="search_latest__item">
<%= link_to _('Browse latest responses'), search_general_all_path('variety:response') %>
<h2><%= _('Latest') %></h2>

<ul class="search_sidebar_list">
<li class="search_sidebar_list__item">
<%= link_to _('Browse latest responses'), search_requests_path('variety:response') %>
</li>

<li class="search_latest__item">
<%= link_to _('Browse latest requests'), search_general_all_path('variety:sent') %>
<li class="search_sidebar_list__item">
<%= link_to _('Browse latest requests'), search_requests_path('variety:sent') %>
</li>
</ul>
</div>
2 changes: 1 addition & 1 deletion app/views/request/list.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
<%= render :partial => 'track/rss_feed', :locals => { :track_thing => @track_thing, :location => 'main' } %>
<% end %>

<h2><%= _('Latest') %></h2>
<%= render partial: 'general/search_latest' %>
<%= render partial: 'general/help_requests' %>
</div>

<div style="clear:both"></div>
Expand Down
3 changes: 3 additions & 0 deletions config/routes.rb
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,9 @@ def matches?(request)
match '/search(/*combined)' => 'general#search',
:as => :search_general,
:via => :get
match '/search/:query/requests' => 'general#search',
as: :search_requests,
via: :get
match '/search/:query/users' => 'general#search',
as: :search_users,
via: :get
Expand Down
2 changes: 2 additions & 0 deletions doc/CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

## Highlighted Features

* Signpost key user administration contributions for requests on request list
pages (Gareth Rees)
* Signpost users to find new contact details for requests with delivery errors
(Gareth Rees)
* Add admin view of unmasked version of main body part attachments (Gareth Rees)
Expand Down

0 comments on commit 60e5822

Please sign in to comment.