From 0dce5976f33cff155a976976071b860c59d09b9d Mon Sep 17 00:00:00 2001 From: Adam Ploshay Date: Thu, 5 Sep 2024 13:41:04 -0400 Subject: [PATCH 1/6] directly import hyrax homepage layout --- app/views/layouts/homepage.html.erb | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 app/views/layouts/homepage.html.erb diff --git a/app/views/layouts/homepage.html.erb b/app/views/layouts/homepage.html.erb new file mode 100644 index 0000000..c663297 --- /dev/null +++ b/app/views/layouts/homepage.html.erb @@ -0,0 +1,20 @@ +<% content_for(:navbar) do %> +
+
+ + +
+
+ <%= render "hyrax/homepage/marketing" if controller_name == 'homepage' %> +
+
+ + <%= render '/controls' %> +
+<% end %> + +<% content_for(:precontainer_content) do %> + <%= render 'hyrax/homepage/announcement' if controller_name == 'homepage' %> +<% end %> + +<%= render template: 'layouts/hyrax' %> From 2c86efe82fb1f6a503d7077490448681fbd5c070 Mon Sep 17 00:00:00 2001 From: Adam Ploshay Date: Thu, 5 Sep 2024 15:51:50 -0400 Subject: [PATCH 2/6] remove banner image --- app/views/layouts/homepage.html.erb | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/app/views/layouts/homepage.html.erb b/app/views/layouts/homepage.html.erb index c663297..db9e818 100644 --- a/app/views/layouts/homepage.html.erb +++ b/app/views/layouts/homepage.html.erb @@ -1,16 +1,5 @@ <% content_for(:navbar) do %> -
-
- - -
-
- <%= render "hyrax/homepage/marketing" if controller_name == 'homepage' %> -
-
- - <%= render '/controls' %> -
+ <%= render '/controls' %> <% end %> <% content_for(:precontainer_content) do %> From b9fa1b6975d308d2f5d17039d2d84915a9303a43 Mon Sep 17 00:00:00 2001 From: Adam Ploshay Date: Thu, 5 Sep 2024 15:52:18 -0400 Subject: [PATCH 3/6] directly import hyrax controls partial --- app/views/_controls.html.erb | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 app/views/_controls.html.erb diff --git a/app/views/_controls.html.erb b/app/views/_controls.html.erb new file mode 100644 index 0000000..024622b --- /dev/null +++ b/app/views/_controls.html.erb @@ -0,0 +1,15 @@ + \ No newline at end of file From de7014b3707e267d537f86ff2a8eb3aae7c53b41 Mon Sep 17 00:00:00 2001 From: Adam Ploshay Date: Thu, 5 Sep 2024 15:54:46 -0400 Subject: [PATCH 4/6] drop Help link --- app/views/_controls.html.erb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/views/_controls.html.erb b/app/views/_controls.html.erb index 024622b..06d16d5 100644 --- a/app/views/_controls.html.erb +++ b/app/views/_controls.html.erb @@ -4,12 +4,10 @@ <%= link_to t(:'hyrax.controls.home'), hyrax.root_path, class: "nav-link", aria: current_page?(hyrax.root_path) ? {current: 'page'} : nil %>
  • <%= link_to t(:'hyrax.controls.about'), hyrax.about_path, class: "nav-link", aria: current_page?(hyrax.about_path) ? {current: 'page'} : nil %>
    • -
  • - <%= link_to t(:'hyrax.controls.help'), hyrax.help_path, class: "nav-link", aria: current_page?(hyrax.help_path) ? {current: 'page'} : nil %>
  • <%= link_to t(:'hyrax.controls.contact'), hyrax.contact_path, class: "nav-link", aria: current_page?(hyrax.contact_path) ? {current: 'page'} : nil %>
    • <%= render partial: 'catalog/search_form' %>
    - \ No newline at end of file + From bec1b876f0e00686313f559a4dc9c320d6603f3e Mon Sep 17 00:00:00 2001 From: Adam Ploshay Date: Fri, 6 Sep 2024 14:06:13 -0400 Subject: [PATCH 5/6] import hyrax default value for en.hyrax.contact_form.notice --- config/locales/hyrax.en.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/locales/hyrax.en.yml b/config/locales/hyrax.en.yml index 99e5cc9..b514d1d 100644 --- a/config/locales/hyrax.en.yml +++ b/config/locales/hyrax.en.yml @@ -47,6 +47,8 @@ en: title_tesim: Title hyrax: account_name: My Institution Account Id + contact_form: + notice: Please use the contact form to submit inquiries about this system; to report a problem you are experiencing with the system; to request assistance using the system; or to provide general feedback. See the Help page for additional information about this system. directory: suffix: "@example.org" footer: From 3a9a510da6fb5f558a165ef84f501295c18f2f84 Mon Sep 17 00:00:00 2001 From: Adam Ploshay Date: Fri, 6 Sep 2024 14:06:34 -0400 Subject: [PATCH 6/6] modify en.hyrax.contact_form.notice --- config/locales/hyrax.en.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/hyrax.en.yml b/config/locales/hyrax.en.yml index b514d1d..1b135f4 100644 --- a/config/locales/hyrax.en.yml +++ b/config/locales/hyrax.en.yml @@ -48,7 +48,7 @@ en: hyrax: account_name: My Institution Account Id contact_form: - notice: Please use the contact form to submit inquiries about this system; to report a problem you are experiencing with the system; to request assistance using the system; or to provide general feedback. See the Help page for additional information about this system. + notice: Please use the contact form to submit inquiries about this system; to report a problem you are experiencing with the system; to request assistance using the system; or to provide general feedback. directory: suffix: "@example.org" footer: