diff --git a/CHANGELOG.md b/CHANGELOG.md index 12c1a8c9..a59fd53e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,28 @@ Versioning](https://semver.org/spec/v2.0.0.html). ### Contributors --> +## [v3.1.1](https://github.com/CDRH/orchid/compare/v3.1.0...v3.1.1) - splitting templates, fixing languages + +### Fixed +- bug with locales yaml creation + +### Added +- partials for browse, browse_facet, index, and search_preset header content for easier overriding +- displays language toggle options in respective languages, therefore English instead of en, Español instead of es, etc +- helper method `language_toggle_link` moves logic for language links out of view +- documentation for api connection and controller inheritance +- adds partials for easier overriding: + - `browse_header` + - `browse_facet_header` + - `index_header` + - `search_preset_header` + - `analytics` (head) + - `language` (head) + +### Changed +- `ALL_LANGUAGES` setting changed back to `languages` +- language documentation clarified and expanded + ## [v3.1.0](https://github.com/CDRH/orchid/compare/v3.0.3...v3.1.0) - search_preset, improved section links, and misc display ### Fixed diff --git a/Gemfile.lock b/Gemfile.lock index 01f1c92a..5b606416 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - orchid (3.0.3) + orchid (3.1.1) rails (~> 5.2.0) GEM diff --git a/app/helpers/orchid/application_helper.rb b/app/helpers/orchid/application_helper.rb index 39a44bde..e31ccb0e 100644 --- a/app/helpers/orchid/application_helper.rb +++ b/app/helpers/orchid/application_helper.rb @@ -157,6 +157,26 @@ def iiif(image, "#{server}/#{project}%2F#{image_esc}/#{iiif_opts}" end + # returns a link to switch site language preferences + def language_toggle_link(lang_code) + lang_name = t("languages.#{lang_code}", default: lang_code.upcase) + + if lang_code == I18n.locale.to_s + # if this is the current site language, disable link + link_to lang_name, "#", + class: "btn btn-primary disabled", + hreflang: lang_code, + rel: "alternate", + tabindex: -1 + else + link_to lang_name, + locale_link(lang_code), + class: "btn btn-default", + hreflang: lang_code, + rel: "alternate" + end + end + def locale I18n.locale end diff --git a/app/views/items/_browse_facet_header.html.erb b/app/views/items/_browse_facet_header.html.erb new file mode 100644 index 00000000..4f894cff --- /dev/null +++ b/app/views/items/_browse_facet_header.html.erb @@ -0,0 +1 @@ +

<%= t "browse.browse_type", default: "Browse by" %> <%= @browse_facet_info["label"] %>

diff --git a/app/views/items/_browse_header.html.erb b/app/views/items/_browse_header.html.erb new file mode 100644 index 00000000..4ce92642 --- /dev/null +++ b/app/views/items/_browse_header.html.erb @@ -0,0 +1,6 @@ +

<%= t "browse.title", default: "Browse" %>

+ +

+ <%= link_to t("browse.all_link", default: "All Items in the Collection"), prefix_path(route_path), + class: "btn btn-lg btn-default", rel: "search" %> +

diff --git a/app/views/items/_date_limit.html.erb b/app/views/items/_date_limit.html.erb index e1ad56b4..fa12fc1e 100644 --- a/app/views/items/_date_limit.html.erb +++ b/app/views/items/_date_limit.html.erb @@ -2,7 +2,7 @@ <% class_in = date_selected ? "in" : "" %> <% class_glyphicon = date_selected ? "glyphicon-chevron-down" : "glyphicon-chevron-right" %> -
+
"> diff --git a/app/views/items/_facets.html.erb b/app/views/items/_facets.html.erb index ae01edac..0c7e162c 100644 --- a/app/views/items/_facets.html.erb +++ b/app/views/items/_facets.html.erb @@ -11,7 +11,7 @@ <% class_in = start_open ? "in" : "" %> <% class_glyphicon = start_open ? "glyphicon-chevron-down" : "glyphicon-chevron-right" %> -
+
+

<%= t "search.all_items", default: "All Items" %>

+<% else %> +

<%= t "search.search_results", default: "Search Results" %>

+<% end %> diff --git a/app/views/items/_search_preset_header.html.erb b/app/views/items/_search_preset_header.html.erb new file mode 100644 index 00000000..7f1869c8 --- /dev/null +++ b/app/views/items/_search_preset_header.html.erb @@ -0,0 +1 @@ +

<%= @content_label || @title %>

diff --git a/app/views/items/browse.html.erb b/app/views/items/browse.html.erb index 1ff3776d..36316437 100644 --- a/app/views/items/browse.html.erb +++ b/app/views/items/browse.html.erb @@ -1,9 +1,4 @@ -

<% t "browse.title", default: "Browse" %>

- -

- <%= link_to t("browse.all_link", default: "All Items in the Archive"), prefix_path(route_path), - class: "btn btn-lg btn-default", rel: "search" %> -

+<%= render_overridable "items", "browse_header" %>

<%= t "browse.browse_type", default: "Browse by" %>:

<% @page_facets.each_slice(3) do |slice| %> diff --git a/app/views/items/browse_facet.html.erb b/app/views/items/browse_facet.html.erb index e6a33b2b..3da1296d 100644 --- a/app/views/items/browse_facet.html.erb +++ b/app/views/items/browse_facet.html.erb @@ -2,7 +2,7 @@ - "sort_by" sort value (e.g. "count|desc") %> -

<%= t "browse.browse_type", default: "Browse by" %> <%= @browse_facet_info["label"] %>

+<%= render_overridable "items", "browse_facet_header" %>