From 92ca5f4882fb7eba034fd714bad0b141a3cc132d Mon Sep 17 00:00:00 2001 From: Patryk Smacki Date: Mon, 11 Dec 2023 15:10:32 +0000 Subject: [PATCH] Comparing plugins from 2.8 to 3.4 versions --- README.md | 2 + .../frontend/views/site/_branding.html.erb | 8 +-- .../public/views/shared/_footer.html.erb | 6 +-- .../public/views/shared/_header.html.erb | 12 +++++ .../views/shared/_request_form.html.erb | 54 ++----------------- 5 files changed, 24 insertions(+), 58 deletions(-) diff --git a/README.md b/README.md index 7e1b077..1138e75 100644 --- a/README.md +++ b/README.md @@ -19,6 +19,8 @@ public/app/views/shared/_record_innards.html.erb--->plugins/local/public/views/s public/app/views/shared/_request_form.html.erb----->plugins/local/public/views/shared/_request_form.html.erb +public/app/views/shared/_modal.html.erb----->plugins/local/public/views/shared/_modal.html.erb +

The following files only have certain values overridden and cannot break code, unless there is a fundamental change in variable naming.

diff --git a/plugins/local/frontend/views/site/_branding.html.erb b/plugins/local/frontend/views/site/_branding.html.erb index 066bc2b..526e2e8 100644 --- a/plugins/local/frontend/views/site/_branding.html.erb +++ b/plugins/local/frontend/views/site/_branding.html.erb @@ -1,4 +1,4 @@ -

- <%= image_tag "/assets/uoe/UoELogo.gif", :alt => "University of Edinburgh" %> - <%= image_tag "/assets/uoe/archivesheader_frontend.png" %> -

\ No newline at end of file +
+ <%= image_tag asset_path("/assets/uoe/UoELogo.gif"), :class =>"header-logo", :alt => "University of Edinburgh" %> + <%= image_tag asset_path("/assets/uoe/archivesheader_frontend.png"), :class =>"header-logo", :alt => "University of Edinburgh" %> +
\ No newline at end of file diff --git a/plugins/local/public/views/shared/_footer.html.erb b/plugins/local/public/views/shared/_footer.html.erb index 8a6af45..8f7b673 100644 --- a/plugins/local/public/views/shared/_footer.html.erb +++ b/plugins/local/public/views/shared/_footer.html.erb @@ -1,6 +1,6 @@ -
-
-
+
+
+

Privacy & Cookies | Takedown Policy | Licensing & Copyright diff --git a/plugins/local/public/views/shared/_header.html.erb b/plugins/local/public/views/shared/_header.html.erb index e1c8cf1..6d3568f 100644 --- a/plugins/local/public/views/shared/_header.html.erb +++ b/plugins/local/public/views/shared/_header.html.erb @@ -6,6 +6,18 @@

+
+

+ <% unless request.original_fullpath == '/' %> + + <% end %> + <%= t('brand.title') %> + <% unless request.original_fullpath == '/' %> + + <% end %> +

+
+
diff --git a/plugins/local/public/views/shared/_request_form.html.erb b/plugins/local/public/views/shared/_request_form.html.erb index ed5be41..21c2aad 100755 --- a/plugins/local/public/views/shared/_request_form.html.erb +++ b/plugins/local/public/views/shared/_request_form.html.erb @@ -1,52 +1,4 @@ -<%= form_tag(app_prefix("fill_request"), method: 'post', :id => 'request_form') do %> - <%= render partial: 'shared/request_hiddens' %> -
-

Privacy Statement

-

Information about you: how we use it and with whom we share it

-

- The information you provide in this form will be used only for purposes of your enquiry. We will not share your personal information with any third party or use it for any other purpose. - We are using information about you because it is necessary to contact you regarding your enquiry. By providing your personal data when submitting an enquiry to us, consent for your personal data to be used in this way is implied. -

-

- We will hold the personal data you provided us for 6 years. We do not use profiling or automated decision-making processes. -

-

- If you would like to request access, or if you have any questions about accessing archive collections, please email us at heritagecollections@ed.ac.uk. -

-

Continued privacy statement

+

+If you would like to request access, or if you have any questions about accessing archive collections, please email us at heritagecollections@ed.ac.uk. +

-
- <%= label_tag(:user_name, "#{t('request.user_name')} #{t('request.required')}" , :class => 'sr-only') %> -
- <%= text_field_tag :user_name, nil, :placeholder => t('request.user_name'), :class => "form-control"%> -
- <%= t('request.required') %> -
-
-
-
- <%= label_tag(:user_email, "#{t('request.user_email')} #{t('request.required')}", :class => 'sr-only') %> -
- <%= text_field_tag :user_email, nil, :type => 'email', :placeholder => t('request.user_email'), :class => 'form-control' %> -
- <%= t('request.required') %> -
-
-
-
- <%= label_tag(:date, t('request.date'), :class => 'sr-only') %> - <%= text_field_tag :date, nil, :placeholder => t('request.date'), :class => 'form-control' %> -
-
- <%= label_tag(:note, t('request.note'), :class => 'sr-only') %> - <%= text_area_tag :note, nil, :rows=> "3", :cols => "25", :placeholder => t('request.note'), :class => 'form-control' %> -
-
- - <%= label_tag :comment %> - <%= text_field_tag :comment, nil, tabindex: '-1', :class => 'form-control'%> - -
- -
-<% end %>