From 4ef68b45a64a5a0e13f3700aae8bdadfeea30f31 Mon Sep 17 00:00:00 2001 From: Christy Karpinski Date: Thu, 27 Jul 2023 09:34:35 -0500 Subject: [PATCH 1/5] fixed work show themes to have citations and layout to match UI pictures --- app/assets/stylesheets/themes/cultural_show.scss | 8 ++++++++ .../themes/cultural_show/hyrax/base/show.html.erb | 5 +++-- .../themes/scholarly_show/hyrax/base/show.html.erb | 12 ++++++++---- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/app/assets/stylesheets/themes/cultural_show.scss b/app/assets/stylesheets/themes/cultural_show.scss index fd923dda..0eb8409f 100644 --- a/app/assets/stylesheets/themes/cultural_show.scss +++ b/app/assets/stylesheets/themes/cultural_show.scss @@ -1,5 +1,13 @@ .cultural_show { + .show-actions { + margin-bottom: 0.5em; + } + + .centered-media.text-center img.canonical-image { + max-width: 300px; + } + dl.work-show dd { border-bottom: 1px solid #ddd; diff --git a/app/views/themes/cultural_show/hyrax/base/show.html.erb b/app/views/themes/cultural_show/hyrax/base/show.html.erb index 8adeda83..061ce53b 100644 --- a/app/views/themes/cultural_show/hyrax/base/show.html.erb +++ b/app/views/themes/cultural_show/hyrax/base/show.html.erb @@ -27,14 +27,15 @@ <% end %> <% end %> -
+
<%= render 'work_description', presenter: @presenter %> <%= render 'metadata', presenter: @presenter %>
-
+
<%= render 'relationships', presenter: @presenter %>
+ <%= render 'citations', presenter: @presenter %>
<%= render 'items', presenter: @presenter %> diff --git a/app/views/themes/scholarly_show/hyrax/base/show.html.erb b/app/views/themes/scholarly_show/hyrax/base/show.html.erb index 7481f1dd..1aa52e72 100644 --- a/app/views/themes/scholarly_show/hyrax/base/show.html.erb +++ b/app/views/themes/scholarly_show/hyrax/base/show.html.erb @@ -20,7 +20,7 @@ <%= render 'video_embed_viewer', presenter: @presenter %>
- <%= render 'work_description', presenter: @presenter %> + <%# render 'work_description', presenter: @presenter %>
<% else %> @@ -30,7 +30,7 @@
- <%= render 'work_description', presenter: @presenter %> + <%# render 'work_description', presenter: @presenter %>
<% else %> @@ -38,15 +38,19 @@ <%= render 'representative_media', presenter: @presenter, viewer: false %>
- <%= render 'work_description', presenter: @presenter %> + <%# render 'work_description', presenter: @presenter %>
<% end %> <% end %>
-
+
+ <%= render 'work_description', presenter: @presenter %> <%= render 'metadata', presenter: @presenter %>
+
+ <%= render 'citations', presenter: @presenter %> +
<%= render 'relationships', presenter: @presenter %> <%= render 'items', presenter: @presenter %> From 292ee79b637e39fde88d2a67ec5a9f9b12b4494b Mon Sep 17 00:00:00 2001 From: Christy Karpinski Date: Thu, 27 Jul 2023 09:40:19 -0500 Subject: [PATCH 2/5] added tinymce functionality --- config/tinymce.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/config/tinymce.yml b/config/tinymce.yml index ed2b4c00..0091ad97 100644 --- a/config/tinymce.yml +++ b/config/tinymce.yml @@ -3,11 +3,15 @@ default: &default content_block: <<: *default menubar: false - toolbar1: styleselect | bold italic | undo redo - toolbar2: table | fullscreen | image + image_uploadtab: true + toolbar1: styleselect | bold italic underline | link hr | undo redo | image | code + toolbar2: indent outdent | alignleft aligncenter alignright | table | fullscreen plugins: - table - fullscreen + - link + - autolink - image + - code custom: <<: *default From b917c53261c5ab705fc80c7da3997c2d40f141af Mon Sep 17 00:00:00 2001 From: Christy Karpinski Date: Thu, 27 Jul 2023 09:52:24 -0500 Subject: [PATCH 3/5] changed authentication for private tenants to atla/hyku --- app/controllers/application_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 9449da3c..30e937cc 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -54,7 +54,7 @@ def authenticate_if_needed return true if Rails.env.test? if (is_hidden || is_staging) && !is_api_or_pdf authenticate_or_request_with_http_basic do |username, password| - username == "samvera" && password == "hyku" + username == "atla" && password == "hyku" end end end From ed277292e6fda2d68b6b99b406f543aca04c9d75 Mon Sep 17 00:00:00 2001 From: Christy Karpinski Date: Thu, 27 Jul 2023 10:16:24 -0500 Subject: [PATCH 4/5] authentication --- app/controllers/application_controller.rb | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 30e937cc..fde77b26 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -54,7 +54,7 @@ def authenticate_if_needed return true if Rails.env.test? if (is_hidden || is_staging) && !is_api_or_pdf authenticate_or_request_with_http_basic do |username, password| - username == "atla" && password == "hyku" + username == "samvera" && password == "hyku" end end end @@ -65,6 +65,18 @@ def super_and_current_users users end + ## + # Extra authentication for palni-palci during development phase + def authenticate_if_needed + # Disable this extra authentication in test mode + return true if Rails.env.test? + if (is_hidden || is_staging) && !is_api_or_pdf + authenticate_or_request_with_http_basic do |username, password| + username == "atla" && password == "hyku" + end + end + end + private def require_active_account! From 0ac9e458eb3d07190208956d7ea1aa4102f7b572 Mon Sep 17 00:00:00 2001 From: Christy Karpinski Date: Tue, 1 Aug 2023 16:24:20 -0500 Subject: [PATCH 5/5] fixed rubocop offenses --- app/controllers/application_controller.rb | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index fde77b26..9449da3c 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -65,18 +65,6 @@ def super_and_current_users users end - ## - # Extra authentication for palni-palci during development phase - def authenticate_if_needed - # Disable this extra authentication in test mode - return true if Rails.env.test? - if (is_hidden || is_staging) && !is_api_or_pdf - authenticate_or_request_with_http_basic do |username, password| - username == "atla" && password == "hyku" - end - end - end - private def require_active_account!