Skip to content

Commit

Permalink
🎁 All users can see catalog search options
Browse files Browse the repository at this point in the history
Prior to this commit only signed in users could see the search options
but that condition was removed.

Ref:
- #646
  • Loading branch information
sjproctor committed Jul 31, 2024
1 parent e6c029e commit 8e4b10b
Showing 1 changed file with 15 additions and 22 deletions.
37 changes: 15 additions & 22 deletions app/views/themes/dc_repository/catalog/_search_form.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -5,41 +5,34 @@
<%= hidden_field_tag :search_field, 'all_fields' %>
<div class="form-group">
<%# OVERRIDE: Hyrax v3.4.1 Remove label from form-group %>

<div class="input-group">
<%= text_field_tag :q, current_search_parameters , class: "q form-control", id: "search-field-header", placeholder: t("hyrax.search.form.q.placeholder") %>
<%# OVERRIDE: Hyrax v3.4.1 switch button order %>
<div class="input-group-btn">
<% if current_user %>
<button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown" aria-expanded="false">

<span class="sr-only" data-search-element="label"><%= t("hyrax.search.form.option.all.label_long", application_name: application_name) %></span>
<span aria-hidden="true"><%= t("hyrax.search.form.option.all.label_short") %></span>
<%# OVERRIDE: Hyrax v3.4.1 change dropdown icon %>
<span class="fa fa-thin fa-chevron-down"></span>
</button>

<ul class="dropdown-menu pull-right">
<button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown" aria-expanded="false">
<span class="sr-only" data-search-element="label"><%= t("hyrax.search.form.option.all.label_long", application_name: application_name) %></span>
<span aria-hidden="true"><%= t("hyrax.search.form.option.all.label_short") %></span>
<%# OVERRIDE: Hyrax v3.4.1 change dropdown icon %>
<span class="fa fa-thin fa-chevron-down"></span>
</button>
<ul class="dropdown-menu pull-right">
<li>
<%= link_to t("hyrax.search.form.option.all.label_long", application_name: application_name), "#",
data: { "search-option" => main_app.search_catalog_path, "search-label" => t("hyrax.search.form.option.all.label_short") } %>
</li>
<% Hyrax.config.registered_curation_concern_types.map(&:titleize).each do |concern| %>
<% next if concern == 'Attachment' %>
<li>
<%= link_to t("hyrax.search.form.option.all.label_long", application_name: application_name), "#",
data: { "search-option" => main_app.search_catalog_path, "search-label" => t("hyrax.search.form.option.all.label_short") } %>
<%= link_to concern, "#",
data: { "search-option" => main_app.search_catalog_path(f: { human_readable_type_sim: [concern] }), "search-label" => concern } %>
</li>
<% Hyrax.config.registered_curation_concern_types.map(&:titleize).each do |concern| %>
<% next if concern == 'Attachment' %>
<li>
<%= link_to concern, "#",
data: { "search-option" => main_app.search_catalog_path(f: { human_readable_type_sim: [concern] }), "search-label" => concern } %>
</li>
<% end %>
<% end %>

</ul>
<button type="submit" class="btn" id="search-submit-header">
<span class="glyphicon glyphicon-search"></span>
<span class="search-submit-text"><%= t('hyrax.search.button.text') %></span>
</button>
</div><!-- /.input-group-btn -->
</div><!-- /.input-group -->

</div><!-- /.form-group -->
<% end %>

0 comments on commit 8e4b10b

Please sign in to comment.