From c94feea404c97c3f4167a16e996dd7935c44b97d Mon Sep 17 00:00:00 2001
From: Kirk Wang <kirk.wang@scientist.com>
Date: Mon, 18 Dec 2023 11:38:35 -0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=A7=B9=20Post=20review=20adjustments?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

These are adjustments made after the PR has been reviewed.
---
 .../admin/appearances/_theme_form.html.erb    | 20 +++++++++--
 app/views/hyrax/contact_form/new.html.erb     | 17 +++++----
 .../collections/_form_discovery.html.erb      | 35 ++++++++++++-------
 .../hyrax/my/_collection_action_menu.html.erb |  2 --
 app/views/single_signon/index.html.erb        |  3 +-
 5 files changed, 50 insertions(+), 27 deletions(-)

diff --git a/app/views/hyrax/admin/appearances/_theme_form.html.erb b/app/views/hyrax/admin/appearances/_theme_form.html.erb
index 2b60e7453..9d0a0d662 100644
--- a/app/views/hyrax/admin/appearances/_theme_form.html.erb
+++ b/app/views/hyrax/admin/appearances/_theme_form.html.erb
@@ -27,6 +27,22 @@
       </div>
     </div>
     <hr />
+    <div class="row">
+      <div class="col-md-6">
+        <% search_options = @search_themes.map { |s| [s[0], s[1], { 'data-image' => image_path("themes/search/#{s[1]}.jpg") }] } %>
+        <%= f.input :search_theme, label: 'Search Results Page Theme' do %>
+          <%= f.select :search_theme, search_options, {}, { prompt: 'Select search results page theme...', class: 'form-control' } %>
+        <% end %>
+        <h4>Search Results Theme notes:</h4>
+        <ul>
+          <li>This will select a default view for the search results page. Users can select their preferred views on the search results page that will override this selection.</li>
+        </ul>
+      </div>
+      <div id="search-wireframe" class="col-md-6">
+        <%= image_tag "themes/search/list_view.jpg", class: "img-fluid" %>
+      </div>
+    </div>
+    <hr />
     <div class="row">
       <div class="col-sm-6">
         <% show_options = @show_theme_names.map { |g| [g[0], g[1], { 'data-image' => image_path("themes/#{g[1]}/#{g[1]}.jpg") }] } %>
@@ -45,7 +61,7 @@
     </div>
     <hr />
   </div>
-  <div class="panel-footer">
-    <%= f.submit class: 'btn btn-primary pull-right' %>
+  <div class="card-footer text-right">
+    <%= f.submit class: 'btn btn-secondary' %>
   </div>
 <% end %>
diff --git a/app/views/hyrax/contact_form/new.html.erb b/app/views/hyrax/contact_form/new.html.erb
index b008f454b..b1c6d774c 100644
--- a/app/views/hyrax/contact_form/new.html.erb
+++ b/app/views/hyrax/contact_form/new.html.erb
@@ -17,10 +17,9 @@
   <% em = '' %>
 <% end %>
 
-<%= form_for @contact_form, url: hyrax.contact_form_index_path,
-                            html: { class: '' } do |f| %>
+<%= form_for @contact_form, url: hyrax.contact_form_index_path, html: { class: 'needs-validation' } do |f| %>
   <%= raw negative_captcha(@captcha) %>
-  <%= f.text_field :contact_method, class: 'hide' %>
+  <%= f.text_field :contact_method, class: 'd-none' %>
 
   <div class="form-group row">
     <%= f.label :category, t('hyrax.contact_form.type_label'), class: "col-sm-2 col-form-label" %>
@@ -30,13 +29,13 @@
   </div>
 
   <div class="form-group row">
-    <%= f.label :name, t('hyrax.contact_form.name_label'), class: "col-sm-2 col-form-label" %>
-    <div class="col-sm-10"><%= f.text_field :name, value: nm, class: 'form-control', required: true %></div>
+    <%= negative_label_tag(@captcha, :name, t('hyrax.contact_form.name_label'), class: "col-sm-2 col-form-label") %>
+    <div class="col-sm-10"><%= negative_text_field_tag(@captcha, :name, value: nm, class: 'form-control', required: true) %></div>
   </div>
 
   <div class="form-group row">
-    <%= f.label :email, t('hyrax.contact_form.email_label'), class: "col-sm-2 col-form-label" %>
-    <div class="col-sm-10"><%= f.text_field :email, value: em, class: 'form-control', required: true %></div>
+    <%= negative_label_tag(@captcha, :email, t('hyrax.contact_form.email_label'), class: "col-sm-2 col-form-label") %>
+    <div class="col-sm-10"><%= negative_text_field_tag(@captcha, :email, value: em, class: 'form-control', required: true) %></div>
   </div>
 
   <div class="form-group row">
@@ -45,8 +44,8 @@
   </div>
 
   <div class="form-group row">
-    <%= f.label :message, t('hyrax.contact_form.message_label'), class: "col-sm-2 col-form-label" %>
-    <div class="col-sm-10"><%= f.text_area :message, rows: 4, class: 'form-control', required: true %></div>
+    <%= negative_label_tag(@captcha, :message, t('hyrax.contact_form.message_label'), class: "col-sm-2 col-form-label") %>
+    <div class="col-sm-10"><%= negative_text_area_tag(@captcha, :message, rows: 4, class: 'form-control', required: true) %></div>
   </div>
 
   <%= f.submit value: t('hyrax.contact_form.button_label'), class: "btn btn-primary" %>
diff --git a/app/views/hyrax/dashboard/collections/_form_discovery.html.erb b/app/views/hyrax/dashboard/collections/_form_discovery.html.erb
index 7b9fa4c14..2163c824f 100644
--- a/app/views/hyrax/dashboard/collections/_form_discovery.html.erb
+++ b/app/views/hyrax/dashboard/collections/_form_discovery.html.erb
@@ -8,56 +8,65 @@
   <p><%= t('.para2') %></p>
 
   <%# OVERRIDE: add conditional title %>
-  <div class="form-check" <% if cannot?(:manage_discovery, @collection) %>title="<%= t('permissions.collections.cannot.manage_discovery') %>"<% end %>>
-    <label class="form-check-label">
+  <div class="form-group" <% if cannot?(:manage_discovery, @collection) %>title="<%= t('permissions.collections.cannot.manage_discovery') %>"<% end %>>
+    <div class="custom-control custom-radio">
       <input
         type="radio"
         id="visibility_open"
         name="<%= f.object_name %>[visibility]"
         value="<%= Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC %>"
+        class="custom-control-input"
         <% if @collection.open_access? %>
-          checked="true"
+          checked="checked"
         <% end %>
         <%# OVERRIDE: add conditional disable %>
         <% if cannot?(:manage_discovery, @collection) %>
           disabled="disabled"
         <% end %>
       />
-      <strong><%= t('hyrax.visibility.open.text') %></strong> - <%= t('hyrax.visibility.open.note_html') %>
-    </label>
+      <label class="custom-control-label" for="visibility_open">
+        <strong><%= t('hyrax.visibility.open.text') %></strong> - <%= t('hyrax.visibility.open.note_html') %>
+      </label>
+    </div>
 
-    <label class="form-check-label">
+    <div class="custom-control custom-radio">
       <input
         type="radio"
         id="visibility_registered"
         name="<%= f.object_name %>[visibility]"
         value="<%= Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED %>"
+        class="custom-control-input"
         <% if @collection.authenticated_only_access? %>
-          checked="true"
+          checked="checked"
         <% end %>
         <%# OVERRIDE: add conditional disable %>
         <% if cannot?(:manage_discovery, @collection) %>
           disabled="disabled"
         <% end %>
       />
-      <strong><%= t('hyrax.visibility.authenticated.text', institution: institution_name) %></strong> - <%= t('hyrax.visibility.authenticated.note_html', institution: institution_name) %>
-    </label>
+      <label class="custom-control-label" for="visibility_registered">
+        <strong><%= t('hyrax.visibility.authenticated.text', institution: institution_name) %></strong> - <%= t('hyrax.visibility.authenticated.note_html', institution: institution_name) %>
+      </label>
+    </div>
 
-    <label class="form-check-label">
+    <div class="custom-control custom-radio">
       <input
         type="radio"
         id="visibility_restricted"
         name="<%= f.object_name %>[visibility]"
         value="<%= Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE %>"
+        class="custom-control-input"
         <% if @collection.private_access? %>
-          checked="true"
+          checked="checked"
         <% end %>
         <%# OVERRIDE: add conditional disable %>
         <% if cannot?(:manage_discovery, @collection) %>
           disabled="disabled"
         <% end %>
       />
-      <strong><%= t('hyrax.visibility.restricted.text') %></strong>- <%= t('hyrax.visibility.restricted.note_html') %>
-    </label>
+      <label class="custom-control-label" for="visibility_restricted">
+        <strong><%= t('hyrax.visibility.restricted.text') %></strong> - <%= t('hyrax.visibility.restricted.note_html') %>
+      </label>
+    </div>
   </div>
 </div>
diff --git a/app/views/hyrax/my/_collection_action_menu.html.erb b/app/views/hyrax/my/_collection_action_menu.html.erb
index ea9fa8e62..98cc23db7 100644
--- a/app/views/hyrax/my/_collection_action_menu.html.erb
+++ b/app/views/hyrax/my/_collection_action_menu.html.erb
@@ -44,9 +44,7 @@
       <% end %>
     </li>
 
-    <%# OVERRIDE begin %>
     <% if Hyrax::CollectionType.any_nestable? %>
-    <%# OVERRIDE end %>
       <% # The user should have deposit access to the parent we are adding, and read access to the child (the collection we are linking here). %>
       <li class="dropdown-item" role="menuitem" tabindex="-1">
         <%= link_to "#",
diff --git a/app/views/single_signon/index.html.erb b/app/views/single_signon/index.html.erb
index b7b1e3008..4858ef235 100644
--- a/app/views/single_signon/index.html.erb
+++ b/app/views/single_signon/index.html.erb
@@ -10,6 +10,7 @@
             <br />
             <%= t('.sign_in_with_provider', provider: ip.name) %>
           </div>
+          <span class='sso-button-fake btn btn-primary'>Sign In</span>
         <% end %>
       </div>
     <% end %>
@@ -18,6 +19,6 @@
 
 <% if @identity_providers.count == 1 %>
   <script>
-     $('form.button_to').submit();
+    $('form.button_to').submit();
   </script>
 <% end %>