From 0da9d83ecfad17c547f2e882b34bd3cf8a92a348 Mon Sep 17 00:00:00 2001
From: LaRita Robinson <larita@scientist.com>
Date: Tue, 14 Jan 2025 19:25:36 -0500
Subject: [PATCH 1/7] Fix issues with homepage

---
 app/views/hyrax/base/_privacy_policy.html.erb |  1 +
 app/views/shared/_appearance_styles.html.erb  |  8 ++--
 app/views/shared/_footer.html.erb             | 38 +++++++++++++------
 .../hyrax/homepage/_featured_works.html.erb   |  2 +-
 4 files changed, 33 insertions(+), 16 deletions(-)
 create mode 100644 app/views/hyrax/base/_privacy_policy.html.erb

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 cc7da7090..67936c0c6 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 %>; }
 
@@ -28,8 +31,7 @@ body.public-facing footer.navbar {
 }
 body.public-facing footer.navbar .navbar-link { color: <%= appearance.footer_link_color %>; }
 body.public-facing footer.navbar .navbar-link:hover { color: <%= appearance.footer_link_hover_color %>; }
-body.public-facing footer.navbar .navbar-text,
-body.public-facing .navbar.navbar-expand-lg .navbar-nav a { 
+body.public-facing footer.navbar .navbar-text { 
   color: <%= appearance.header_and_footer_text_color %> !important;
 }
 body.public-facing .navbar.navbar-expand-lg { border-color: <%= appearance.header_background_border_color %> !important; }
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 %>
-<footer class="navbar navbar-dark bg-dark site-footer">
+<footer class="navbar navbar-inverse navbar-dark bg-dark site-footer w-100">
   <div class="container-fluid">
-    <div class="navbar-text d-flex justify-content-start">
-      <p><%= t('hyrax.footer.service_html') %></p>
-      <p>Hyku v<%= Hyku::VERSION %> with Hyrax v<%= Hyrax::VERSION %></p>
-    </div>
-    <div class="ml-auto">
-      <div class="navbar-text d-flex justify-content-end">
-        <p><%= t('hyrax.footer.copyright_html', current_year: current_year) %></p>
-        <p><%= t('hyrax.background_attribution_html') %></p>
-        <% unless user_signed_in? %>
-          <p><%= link_to t('hyku.footer.admin_login', default: [:'hyrax.toolbar.profile.login']), main_app.new_user_session_path, class: 'navbar-link' %></p>
-        <% end %>
+    <div class="navbar-text d-flex justify-content-between w-100">
+      <!-- Left Column -->
+      <div class="d-flex flex-column">
+        <div class='p-2'><%= t('hyrax.footer.service_html') %></div>
+        <div class='p-2'>Hyku v<%= Hyku::VERSION %> with Hyrax v<%= Hyrax::VERSION %></div>
+      </div>
+      <!-- Right Column -->
+      <div class="d-flex flex-column align-items-end flex-fill">
+        <div class='p-2'>
+          <%= t('hyrax.footer.copyright_html', current_year: current_year) %>
+          <%= t('hyrax.background_attribution_html') %>
+        </div>
+        <div class='p-2'>
+          <% if user_signed_in? %>
+            <%= link_to t("hyrax.toolbar.profile.logout"), main_app.destroy_user_session_path, class: 'navbar-link' %>
+          <% else %>
+            <%= link_to t('hyku.footer.admin_login', default: [:'hyrax.toolbar.profile.login']), main_app.new_user_session_path, class: 'navbar-link' %>
+          <% end %>
+          <span class='navbar-link'><%= render 'hyrax/base/privacy_policy' %></span>
+        </div>
       </div>
     </div>
   </div>
diff --git a/app/views/themes/neutral_repository/hyrax/homepage/_featured_works.html.erb b/app/views/themes/neutral_repository/hyrax/homepage/_featured_works.html.erb
index 1fb7d29d4..ec9dbd8e8 100644
--- a/app/views/themes/neutral_repository/hyrax/homepage/_featured_works.html.erb
+++ b/app/views/themes/neutral_repository/hyrax/homepage/_featured_works.html.erb
@@ -10,7 +10,7 @@
         <% end %>
       </ol>
     </div>
-    <%= f.submit("Save order", class: 'btn btn-primary mt-3') %>
+    <%= f.submit("Save order", class: 'btn btn-secondary mt-3') %>
   <% end %>
 <% else %>
   <%= render partial: 'themes/neutral_repository/featured_carousel' %>

From 2b73cf748c3de7ea4de2822690bece0aa78d7ccc Mon Sep 17 00:00:00 2001
From: LaRita Robinson <larita@scientist.com>
Date: Wed, 15 Jan 2025 19:10:18 -0500
Subject: [PATCH 2/7] Neutral Repository homepage fixes

---
 app/assets/stylesheets/hyku.scss                     |  4 ++++
 .../stylesheets/themes/neutral_repository.scss       |  9 +++++++--
 .../neutral_repository/_theme_container.html.erb     | 12 ++++++------
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/app/assets/stylesheets/hyku.scss b/app/assets/stylesheets/hyku.scss
index 49e74a31c..77d035114 100644
--- a/app/assets/stylesheets/hyku.scss
+++ b/app/assets/stylesheets/hyku.scss
@@ -510,6 +510,10 @@ body.public-facing {
   width: unset;
 }
 
+.featured-collection-section {
+  border: 1px solid #ccc;
+}
+
 .mb-30 {
   margin-bottom: 30px;
 }
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/themes/neutral_repository/_theme_container.html.erb b/app/views/themes/neutral_repository/_theme_container.html.erb
index 1858e12d7..bd987c059 100644
--- a/app/views/themes/neutral_repository/_theme_container.html.erb
+++ b/app/views/themes/neutral_repository/_theme_container.html.erb
@@ -1,5 +1,5 @@
 <div class="theme-container">
-  <div class="col-md-8 mb-30">
+  <div class="col-md-8 mb-30 pr-4">
     <!-- Adding a mobile style for the homepage text content block, hidden on md and lg -->
     <% if display_content_block? @home_text %>
       <div class="d-block d-md-none">
@@ -15,7 +15,7 @@
 
     <% if @presenter.display_featured_works? %>
       <div class="row">
-        <div class="col-12">
+        <div class="col-12 featured-works-section">
           <%= render 'themes/neutral_repository/hyrax/homepage/featured_works' %>
         </div>
       </div>
@@ -23,7 +23,7 @@
 
     <div class="row mb-30 mt-4">
       <div class="col-12 featured-collection-section">
-        <h3>Collections</h3>
+        <h2 class='mt-4'>Collections</h2>
         <%= render 'featured_collection_section' %>
       </div>
     </div>
@@ -34,7 +34,7 @@
     <% if display_content_block? @home_text %>
       <div class="d-none d-md-block">
         <div class="row">
-          <div class="col-12">
+          <div class="pl-15 col-12">
             <%= render 'themes/neutral_repository/home_text' if controller_name == 'homepage' %>
           </div>
         </div>
@@ -43,7 +43,7 @@
 
     <% if @presenter.display_featured_researcher? %>
       <div class="row">
-        <div class="col-12">
+        <div class="pl-15 col-12">
           <%= render 'themes/neutral_repository/hyrax/homepage/featured_researcher' %>
         </div>
       </div>
@@ -51,7 +51,7 @@
 
     <% if @presenter.display_recently_uploaded? %>
       <div class="row">
-        <div class="col-12">
+        <div class="pl-15 col-12">
           <%= render 'recently_uploaded', recent_documents: @recent_documents %>
         </div>
       </div>

From 338ee5a8379f502caf885bc95ec773ef0e3e0bba Mon Sep 17 00:00:00 2001
From: LaRita Robinson <larita@scientist.com>
Date: Wed, 15 Jan 2025 19:14:30 -0500
Subject: [PATCH 3/7] Remove stray classes

---
 .../themes/neutral_repository/_theme_container.html.erb     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/themes/neutral_repository/_theme_container.html.erb b/app/views/themes/neutral_repository/_theme_container.html.erb
index bd987c059..e7db427b3 100644
--- a/app/views/themes/neutral_repository/_theme_container.html.erb
+++ b/app/views/themes/neutral_repository/_theme_container.html.erb
@@ -34,7 +34,7 @@
     <% if display_content_block? @home_text %>
       <div class="d-none d-md-block">
         <div class="row">
-          <div class="pl-15 col-12">
+          <div class="col-12">
             <%= render 'themes/neutral_repository/home_text' if controller_name == 'homepage' %>
           </div>
         </div>
@@ -43,7 +43,7 @@
 
     <% if @presenter.display_featured_researcher? %>
       <div class="row">
-        <div class="pl-15 col-12">
+        <div class="col-12">
           <%= render 'themes/neutral_repository/hyrax/homepage/featured_researcher' %>
         </div>
       </div>
@@ -51,7 +51,7 @@
 
     <% if @presenter.display_recently_uploaded? %>
       <div class="row">
-        <div class="pl-15 col-12">
+        <div class="col-12">
           <%= render 'recently_uploaded', recent_documents: @recent_documents %>
         </div>
       </div>

From 7728ffb791501f476d6fc70a96d8c0744ae1cfdd Mon Sep 17 00:00:00 2001
From: LaRita Robinson <larita@scientist.com>
Date: Thu, 16 Jan 2025 17:30:16 -0500
Subject: [PATCH 4/7] Adjust featured collection justification.

---
 app/assets/stylesheets/hyku.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/hyku.scss b/app/assets/stylesheets/hyku.scss
index 77d035114..5b902c928 100644
--- a/app/assets/stylesheets/hyku.scss
+++ b/app/assets/stylesheets/hyku.scss
@@ -708,7 +708,7 @@ tr[data-feature="use-iiif-print"] {
 #featured_collections {
   display: flex;
   flex-wrap: wrap;
-  justify-content: space-between;
+  justify-content: left;
 }
 
 // slideshow heading

From 5823423f6b4f4a359650addace9bf2d0f7b2f930 Mon Sep 17 00:00:00 2001
From: LaRita Robinson <larita@scientist.com>
Date: Thu, 16 Jan 2025 18:07:07 -0500
Subject: [PATCH 5/7] Adds advanced search button where missing

---
 app/views/catalog/_search_form.html.erb | 39 +++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 app/views/catalog/_search_form.html.erb

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' %>
+  <div class="form-group row">
+
+    <label class="col-sm-3 mb-0" for="search-field-header">
+      <%= t("hyrax.search.form.q.label", application_name: application_name) %>
+    </label>
+
+    <div class="input-group col-sm-9">
+      <%= 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") %>
+
+      <div class="input-group-append">
+        <button type="submit" class="btn btn-primary" id="search-submit-header">
+          <%= t('hyrax.search.button.html') %>
+        </button>
+        <%# 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 %>
+          <button class="btn btn-secondary 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>
+          </button>
+          <div class="dropdown-menu dropdown-menu-right">
+            <%= 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") } %>
+          </div>
+        <% end %>
+      </div><!-- /.input-group-btn -->
+    </div><!-- /.input-group -->
+
+  </div><!-- /.form-group -->
+<% end %>

From 12a3c8701a0ab03e0b99bb3e7478d78f57bea0e8 Mon Sep 17 00:00:00 2001
From: LaRita Robinson <larita@scientist.com>
Date: Fri, 17 Jan 2025 15:58:07 -0500
Subject: [PATCH 6/7] Fix institutional repository footer

---
 .../hyrax/homepage/_recently_uploaded.html.erb                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/themes/institutional_repository/hyrax/homepage/_recently_uploaded.html.erb b/app/views/themes/institutional_repository/hyrax/homepage/_recently_uploaded.html.erb
index c06484912..e68c196ee 100644
--- a/app/views/themes/institutional_repository/hyrax/homepage/_recently_uploaded.html.erb
+++ b/app/views/themes/institutional_repository/hyrax/homepage/_recently_uploaded.html.erb
@@ -7,7 +7,7 @@
       <h3>Recent Uploads</h3>
       <div class="d-flex flex-wrap justify-content-between">
         <%= render partial: "themes/institutional_repository/hyrax/homepage/recent_document", collection: recent_documents %>
-      <div>
+      </div>
     <% end %>
   </div>
 </div>

From 7207498fb0d8904ea2929efd46cc47cdd38773ed Mon Sep 17 00:00:00 2001
From: LaRita Robinson <larita@scientist.com>
Date: Tue, 21 Jan 2025 11:53:16 -0500
Subject: [PATCH 7/7] Fix responsive layout for recently uploaded

---
 .../hyrax/homepage/_recently_uploaded.html.erb                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/themes/cultural_repository/hyrax/homepage/_recently_uploaded.html.erb b/app/views/themes/cultural_repository/hyrax/homepage/_recently_uploaded.html.erb
index 3eafc99b9..c63589e90 100644
--- a/app/views/themes/cultural_repository/hyrax/homepage/_recently_uploaded.html.erb
+++ b/app/views/themes/cultural_repository/hyrax/homepage/_recently_uploaded.html.erb
@@ -5,7 +5,7 @@
   <p><%= t('.no_public') %></p>
 <% else %>
   <div id="recent_docs">
-    <ol class="list-group list-group-flush recent_uploads">
+    <ol class="row list-group list-group-flush recent_uploads">
       <%= render partial: "themes/cultural_repository/hyrax/homepage/recent_document", collection: recent_documents %>
     </ol>
   </div>