Merge pull request #28 from scientist-softserv/fixes-for-staging-errors

Fixes for staging errors
scientist-softserv · Oct 3, 2023 · 6904119 · 6904119
2 parents 9cfcf0b + 810b3f4
commit 6904119
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 12 deletions.
diff --git a/app/forms/hyrax/forms/admin/appearance_decorator.rb b/app/forms/hyrax/forms/admin/appearance_decorator.rb
@@ -18,6 +18,7 @@ module AppearanceDecorator
           'footer_link_color'                  => '#985F03',
           'footer_link_hover_color'            => '#000000',
           'primary_button_hover_color'         => '#CE8C00',
+          'default_button_background_color'    => '#ffffff',
           'default_button_border_color'        => '#5B5B5B',
           'default_button_text_color'          => '#FFFFFF',
           'active_tabs_background_color'       => '#FFFFFF',
@@ -32,7 +33,7 @@ module AppearanceDecorator
 
         # OVERRIDE to add adventist's custom header & footer
         def default_values
-          ADL_DEFAULT_FONTS.merge(ADL_DEFAULT_COLORS)
+          @default_values ||= ADL_DEFAULT_FONTS.merge(ADL_DEFAULT_COLORS)
         end
 
         def custom_adl_header_footer_color

diff --git a/app/presenters/hyrax/generic_work_presenter_decorator.rb b/app/presenters/hyrax/generic_work_presenter_decorator.rb
@@ -2,8 +2,10 @@
 
 # Generated via
 #  `rails generate hyrax:work GenericWork`
-module Hyrax
-  class GenericWorkPresenter < Hyku::WorkShowPresenter
-    delegate :aark_id, :abstract, :date_issued, :alt, :part_of, :place_of_publication, :remote_url, to: :solr_document
-  end
-end
+# module Hyrax
+#   class GenericWorkPresenter < Hyku::WorkShowPresenter
+#     delegate :aark_id, :abstract, :date_issued, :alt, :part_of, :place_of_publication, :remote_url, to: :solr_document
+#   end
+# end
+
+Hyrax::GenericWorkPresenter.delegate :aark_id, :abstract, :date_issued, :alt, :part_of, :place_of_publication, :remote_url, to: :solr_document
diff --git a/app/views/_user_util_links.html.erb b/app/views/_user_util_links.html.erb
@@ -5,10 +5,8 @@
         <%= link_to t(:'hyrax.controls.home'), hyrax.root_path, aria: current_page?(hyrax.root_path) ? {current: 'page'} : nil %></li>
       <li <%= 'class=active' if current_page?(hyrax.about_path) %>>
         <%= link_to t(:'hyrax.controls.about'), hyrax.about_path, aria: current_page?(hyrax.about_path) ? {current: 'page'} : nil %></li>
-      <% if defined?(resources_path) %> <%#= TODO remove when path fix is merged %>
-        <li <%= 'class=active' if current_page?(main_app.resources_path) %>>
-          <%= link_to t(:'hyrax.controls.resources'), main_app.resources_path, aria: current_page?(main_app.resources_path) ? {current: 'page'} : nil %></li>
-      <% end %>
+      <li <%= 'class=active' if current_page?(hyku_knapsack.resources_path) %>>
+        <%= link_to t(:'hyrax.controls.resources'), hyku_knapsack.resources_path, aria: current_page?(hyku_knapsack.resources_path) ? {current: 'page'} : nil %></li>
       <li <%= 'class=active' if current_page?(hyrax.contact_path) %>>
         <%= link_to t(:'hyrax.controls.contact'), hyrax.contact_path, aria: current_page?(hyrax.contact_path) ? {current: 'page'} : nil %></li>
   <% if user_signed_in? %>

diff --git a/app/views/shared/_footer.html.erb b/app/views/shared/_footer.html.erb
@@ -16,7 +16,7 @@
     </div>
     <div class="col-xs-12 col-sm-6">
       <div class="footer-logo">
-        <a href="<%= root_path %>">
+        <a href="<%= hyrax.root_path %>">
           <%= image_tag "ADL-footer-logo.png", :class => "logo-img" %>
         </a>
       </div>

diff --git a/hyrax-webapp b/hyrax-webapp