From d43e24a474cb5272105a3ff7a001e7bb86559f13 Mon Sep 17 00:00:00 2001 From: Chris Beer Date: Fri, 30 Mar 2018 13:57:40 -0700 Subject: [PATCH] Remove the application name from an h1, and bump up page titles (and other headers) as appropriate --- app/views/bookmarks/index.html.erb | 7 +++---- app/views/catalog/_citation.html.erb | 8 ++++---- app/views/catalog/_did_you_mean.html.erb | 3 ++- app/views/catalog/_group.html.erb | 2 +- app/views/catalog/_home_text.html.erb | 8 ++++---- app/views/catalog/_index_header.html.erb | 4 ++-- app/views/catalog/_search_results.html.erb | 2 +- app/views/catalog/_zero_results.html.erb | 6 +++--- app/views/catalog/citation.js.erb | 2 +- app/views/catalog/facet.html.erb | 4 ++-- app/views/layouts/blacklight.html.erb | 8 ++++---- app/views/search_history/index.html.erb | 6 +++--- app/views/shared/_header_navbar.html.erb | 2 +- spec/views/catalog/facet.html.erb_spec.rb | 2 +- 14 files changed, 32 insertions(+), 32 deletions(-) diff --git a/app/views/bookmarks/index.html.erb b/app/views/bookmarks/index.html.erb index bcb696cc26..8272fb1ac1 100644 --- a/app/views/bookmarks/index.html.erb +++ b/app/views/bookmarks/index.html.erb @@ -1,15 +1,15 @@ <% @page_title = t('blacklight.bookmarks.page_title', :application_name => application_name) %>
-

<%= t('blacklight.bookmarks.title') %>

+

<%= t('blacklight.bookmarks.title') %>

<%- if current_or_guest_user.blank? -%> -

<%= t('blacklight.bookmarks.need_login') %>

+

<%= t('blacklight.bookmarks.need_login') %>

<%- elsif @response.documents.blank? -%> -

<%= t('blacklight.bookmarks.no_bookmarks') %>

+

<%= t('blacklight.bookmarks.no_bookmarks') %>

<% else %> <%= render 'sort_and_per_page' %> <%= render partial: 'tools', locals: { document_list: @response.documents } %> @@ -18,4 +18,3 @@ <%= render 'results_pagination' %> <% end %>
- diff --git a/app/views/catalog/_citation.html.erb b/app/views/catalog/_citation.html.erb index c8c05101d2..75477e38e6 100644 --- a/app/views/catalog/_citation.html.erb +++ b/app/views/catalog/_citation.html.erb @@ -1,20 +1,20 @@ <% @documents.each do |document| %> -

<%= document_heading(document) %>

+

<%= document_heading(document) %>

<% if document.respond_to?(:export_as_mla_citation_txt) %> -

<%= t('blacklight.citation.mla') %>

+

<%= t('blacklight.citation.mla') %>

<%= document.send(:export_as_mla_citation_txt).html_safe %>

<% end %> <% if document.respond_to?(:export_as_apa_citation_txt) %> -

<%= t('blacklight.citation.apa') %>

+

<%= t('blacklight.citation.apa') %>

<%= document.send(:export_as_apa_citation_txt).html_safe %>

<% end %> <%- if document.respond_to?(:export_as_chicago_citation_txt) -%> -

<%= t('blacklight.citation.chicago') %>

+

<%= t('blacklight.citation.chicago') %>

<%= document.send(:export_as_chicago_citation_txt).html_safe %> <%- end -%> diff --git a/app/views/catalog/_did_you_mean.html.erb b/app/views/catalog/_did_you_mean.html.erb index 9d47605c8c..da228c259c 100644 --- a/app/views/catalog/_did_you_mean.html.erb +++ b/app/views/catalog/_did_you_mean.html.erb @@ -1,5 +1,6 @@ <% if should_show_spellcheck_suggestions? @response %>
-

<%= t('blacklight.did_you_mean', :options => safe_join(@response.spelling.words.map { |word| link_to_query(word) }, " #{t('blacklight.or')} ")).html_safe %>

+ +

<%= t('blacklight.did_you_mean', :options => safe_join(@response.spelling.words.map { |word| link_to_query(word) }, " #{t('blacklight.or')} ")).html_safe %>

<% end %> diff --git a/app/views/catalog/_group.html.erb b/app/views/catalog/_group.html.erb index 2a4f5d49b9..20a9c42cbb 100644 --- a/app/views/catalog/_group.html.erb +++ b/app/views/catalog/_group.html.erb @@ -1,7 +1,7 @@ <% # container for all groups in index view -%>
<%- @response.groups.each do |g| %> -

<%= g.key %>

+

<%= g.key %>

<%= render_document_index g.docs %>
diff --git a/app/views/catalog/_home_text.html.erb b/app/views/catalog/_home_text.html.erb index 8e8955d384..c568069b5e 100644 --- a/app/views/catalog/_home_text.html.erb +++ b/app/views/catalog/_home_text.html.erb @@ -1,8 +1,8 @@
-

<%= t('blacklight.welcome') %>

+

<%= t('blacklight.welcome') %>

Blacklight is a multi-institutional open-source collaboration building a better discovery platform framework.

- +

<%= link_to 'Read the Documentation', 'https://github.com/projectblacklight/blacklight/wiki', class: 'btn btn-primary' %> <%= link_to 'See Examples', 'http://projectblacklight.org', class: 'btn btn-secondary' %> @@ -10,7 +10,7 @@

-

Here’s how to get started customizing your application:

+

Here’s how to get started customizing your application:

There are many ways to override specific behaviors and views in Blacklight. Because Blacklight is distributed as a Rails engine-based gem, all customization of Blacklight behavior should be done within your application by overriding Blacklight-provided behaviors with your own.

@@ -31,7 +31,7 @@ <%# This is the same panel shown in the Rails welcome template %> diff --git a/app/views/catalog/_index_header.html.erb b/app/views/catalog/_index_header.html.erb index cf80e15b16..0b0adfa439 100644 --- a/app/views/catalog/_index_header.html.erb +++ b/app/views/catalog/_index_header.html.erb @@ -9,14 +9,14 @@ <%= render_index_doc_actions document, wrapping_class: "index-document-functions col-sm-3 col-lg-2" %> <% end %> -

"> +

"> <% if counter = document_counter_with_offset(document_counter) %> <%= t('blacklight.search.documents.counter', counter: counter) %> <% end %> <%= link_to_document document, document_show_link_field(document), counter: counter %> -

+ <%= document_actions %> diff --git a/app/views/catalog/_search_results.html.erb b/app/views/catalog/_search_results.html.erb index 66c10a1604..f71a8045f1 100644 --- a/app/views/catalog/_search_results.html.erb +++ b/app/views/catalog/_search_results.html.erb @@ -1,4 +1,4 @@ -

<%= t('blacklight.search.search_results_header') %>

+

<%= t('blacklight.search.search_results_header') %>

<% @page_title = t('blacklight.search.page_title.title', :constraints => render_search_to_page_title(params), :application_name => application_name) %> diff --git a/app/views/catalog/_zero_results.html.erb b/app/views/catalog/_zero_results.html.erb index 2de336cea8..71b3a9c537 100644 --- a/app/views/catalog/_zero_results.html.erb +++ b/app/views/catalog/_zero_results.html.erb @@ -1,11 +1,11 @@ -

<%= t 'blacklight.search.zero_results.title' %>

+

<%= t 'blacklight.search.zero_results.title' %>

-

<%= t 'blacklight.search.zero_results.modify_search' %>

+

<%= t 'blacklight.search.zero_results.modify_search' %>

  • <%= t 'blacklight.search.zero_results.use_fewer_keywords' %>
    • <%- if params[:q] and params[:search_field] and params[:search_field] != blacklight_config.default_search_field.try(:key) -%> -
  • <%= t 'blacklight.search.zero_results.search_fields', :search_fields => search_field_label(params) %> - +
  • <%= t 'blacklight.search.zero_results.search_fields', :search_fields => search_field_label(params) %> - <%= link_to t('blacklight.search.zero_results.search_everything', field: blacklight_config.default_search_field.label), url_for(search_state.params_for_search(search_field: blacklight_config.default_search_field.key)) %>
    • <%- end %> diff --git a/app/views/catalog/citation.js.erb b/app/views/catalog/citation.js.erb index 32f9e5e8ce..ffcdcc6e8d 100644 --- a/app/views/catalog/citation.js.erb +++ b/app/views/catalog/citation.js.erb @@ -1,5 +1,5 @@
    -

    <%= t('blacklight.tools.citation') %>

    +

    <%= t('blacklight.tools.citation') %>

    diff --git a/app/views/catalog/facet.html.erb b/app/views/catalog/facet.html.erb index d289a12330..c8accca73e 100644 --- a/app/views/catalog/facet.html.erb +++ b/app/views/catalog/facet.html.erb @@ -3,7 +3,7 @@
    -

    <%= facet_field_label(@facet.key) %>

    +

    <%= facet_field_label(@facet.key) %>

    @@ -15,7 +15,7 @@ <%= render_facet_limit(@display_facet, layout: false) %>
- +
diff --git a/app/views/layouts/blacklight.html.erb b/app/views/layouts/blacklight.html.erb index 546abf2953..25b5129838 100644 --- a/app/views/layouts/blacklight.html.erb +++ b/app/views/layouts/blacklight.html.erb @@ -1,11 +1,11 @@ <% content_for(:content) do %> <% if content_for? :sidebar %> -