From 6b6539f670909702a576b002ebe500bc8d24cdb4 Mon Sep 17 00:00:00 2001 From: LaRita Robinson Date: Tue, 21 Jan 2025 12:43:20 -0500 Subject: [PATCH] Homepage fixes (#2417) * Fix issues with homepage * Neutral Repository homepage fixes * Remove stray classes * Adjust featured collection justification. * Adds advanced search button where missing * Fix institutional repository footer * Fix responsive layout for recently uploaded --------- Co-authored-by: LaRita Robinson --- app/assets/stylesheets/hyku.scss | 6 ++- .../themes/neutral_repository.scss | 9 ++++- app/views/catalog/_search_form.html.erb | 39 +++++++++++++++++++ app/views/hyrax/base/_privacy_policy.html.erb | 1 + app/views/shared/_appearance_styles.html.erb | 5 ++- app/views/shared/_footer.html.erb | 38 ++++++++++++------ .../homepage/_recently_uploaded.html.erb | 2 +- .../homepage/_recently_uploaded.html.erb | 2 +- .../_theme_container.html.erb | 6 +-- .../hyrax/homepage/_featured_works.html.erb | 2 +- 10 files changed, 88 insertions(+), 22 deletions(-) create mode 100644 app/views/catalog/_search_form.html.erb create mode 100644 app/views/hyrax/base/_privacy_policy.html.erb diff --git a/app/assets/stylesheets/hyku.scss b/app/assets/stylesheets/hyku.scss index 2e3bf6156..2ce0a2e65 100644 --- a/app/assets/stylesheets/hyku.scss +++ b/app/assets/stylesheets/hyku.scss @@ -515,6 +515,10 @@ body.public-facing { width: unset; } +.featured-collection-section { + border: 1px solid #ccc; +} + .mb-30 { margin-bottom: 30px; } @@ -709,7 +713,7 @@ tr[data-feature="use-iiif-print"] { #featured_collections { display: flex; flex-wrap: wrap; - justify-content: space-between; + justify-content: left; } // slideshow heading diff --git a/app/assets/stylesheets/themes/neutral_repository.scss b/app/assets/stylesheets/themes/neutral_repository.scss index ab06686ee..7096c65e1 100644 --- a/app/assets/stylesheets/themes/neutral_repository.scss +++ b/app/assets/stylesheets/themes/neutral_repository.scss @@ -15,6 +15,10 @@ ////// Basic Apperance Styles ////// + .mt-4 { + margin-top: 40px; + } + .mb-40 { margin-bottom: 40px; } @@ -109,9 +113,10 @@ border: 1px solid #ddd; } - ////// Carousel ////// + ////// Carousel & Featured Works ////// + - #featured-carousel { + .featured-works-section { border: 1px solid #ccc; padding: 1em; } diff --git a/app/views/catalog/_search_form.html.erb b/app/views/catalog/_search_form.html.erb new file mode 100644 index 000000000..4ca2f8956 --- /dev/null +++ b/app/views/catalog/_search_form.html.erb @@ -0,0 +1,39 @@ +<% # OVERRIDE: Hyrax v5.0.1 template to include the advanced_search button %> +<%= form_tag search_form_action, method: :get, class: "search-form", id: "search-form-header", role: "search" do %> + <%= render Blacklight::HiddenSearchStateComponent.new(params: search_state.params_for_search.except(:q, :search_field, :qt, :page, :utf8)) %> + <%= hidden_field_tag :search_field, 'all_fields' %> +
+ + + +
+ <%= text_field_tag :q, current_search_parameters , 'aria-label': 'Search', class: "q form-control", id: "search-field-header", placeholder: t("hyrax.search.form.q.placeholder") %> + +
+ + <%# OVERRIDE here to include the advanced search button in the search bar %> + <%= link_to "Advanced", "/advanced", class: 'btn btn-secondary', id: 'advanced-top-button' %> + <% if current_user %> + +
+ <%= link_to t("hyrax.search.form.option.all.label_long", application_name: application_name), "#", class: "dropdown-item", + data: { "search-option" => main_app.search_catalog_path, "search-label" => t("hyrax.search.form.option.all.label_short") } %> + <%= link_to t("hyrax.search.form.option.my_works.label_long"), "#", class: "dropdown-item", + data: { "search-option" => hyrax.my_works_path, "search-label" => t("hyrax.search.form.option.my_works.label_short") } %> + <%= link_to t("hyrax.search.form.option.my_collections.label_long"), "#", class: "dropdown-item", + data: { "search-option" => hyrax.my_collections_path, "search-label" => t("hyrax.search.form.option.my_collections.label_short") } %> +
+ <% end %> +
+
+ +
+<% end %> diff --git a/app/views/hyrax/base/_privacy_policy.html.erb b/app/views/hyrax/base/_privacy_policy.html.erb new file mode 100644 index 000000000..a8f29dffd --- /dev/null +++ b/app/views/hyrax/base/_privacy_policy.html.erb @@ -0,0 +1 @@ +<%# Override Hyrax 5.0.1 - empty partial to allow override for custom privacy policy link %> \ No newline at end of file diff --git a/app/views/shared/_appearance_styles.html.erb b/app/views/shared/_appearance_styles.html.erb index 6e40b31f2..4c6b3417e 100644 --- a/app/views/shared/_appearance_styles.html.erb +++ b/app/views/shared/_appearance_styles.html.erb @@ -17,7 +17,10 @@ body.public-facing h5, body.public-facing h6 { font-family: <%= appearance.font_headline_family %>; } /* LINK COLORS */ -body.public-facing a { color: <%= appearance.link_color %>; } +body.public-facing a, +body.public-facing .dropdown-menu a { + color: <%= appearance.link_color %>; +} body.public-facing a:hover, body.public-facing a:focus { color: <%= appearance.link_hover_color %>; } diff --git a/app/views/shared/_footer.html.erb b/app/views/shared/_footer.html.erb index 113c74fe9..07e30bec0 100644 --- a/app/views/shared/_footer.html.erb +++ b/app/views/shared/_footer.html.erb @@ -1,17 +1,31 @@ +<%# Override Hyrax 5.0.1 + - add privacy policy partial + - add login & logout link + - add Hyku version + - navbar-inverse class %> <% current_year = Time.now.year %> -