Skip to content

Comparing plugins from 2.8 to 3.4 versions #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Koling80 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Comparing plugins from 2.8 to 3.4 versions #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

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

Expand Down
8 changes: 4 additions & 4 deletions plugins/local/frontend/views/site/_branding.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<h1>
<%= image_tag "/assets/uoe/UoELogo.gif", :alt => "University of Edinburgh" %>
<%= image_tag "/assets/uoe/archivesheader_frontend.png" %>
</h1>
<div class="container-fluid navbar-branding">
<%= 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" %>
</div>
6 changes: 3 additions & 3 deletions plugins/local/public/views/shared/_footer.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="panel-footer">
<div class="row-fluid">
<div class="span12">
<div class="container-fluid panel-footer">
<div class="row">
<div class="col-md-12">
<p> <a href="http://www.ed.ac.uk/about/website/privacy" title="Privacy and Cookies Link" target="_blank">Privacy &amp; Cookies</a>
| <a href="https://www.ed.ac.uk/information-services/library-museum-gallery/crc/services/copying-and-digitisation/image-licensing/takedown-policy" title="Takedown Policy Link" target="_blank">Takedown Policy</a>
| <a href="https://www.ed.ac.uk/information-services/library-museum-gallery/crc/services/copying-and-digitisation/image-licensing" title="Licensing and Copyright Link" target="_blank">Licensing &amp; Copyright</a>
Expand Down
12 changes: 12 additions & 0 deletions plugins/local/public/views/shared/_header.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,18 @@
</div>
</div>
<div class="row">
<div class="col-sm-8">
<h1>
<% unless request.original_fullpath == '/' %>
<a title="Archives Space at Edinburgh" href="<%= AppConfig[:public_proxy_url] %>">
<% end %>
<%= t('brand.title') %>
<% unless request.original_fullpath == '/' %>
</a>
<% end %>
</h1>
</div>
<div class="col-sm-4 hidden-xs"><img class="logo" src="<%= asset_path(AppConfig[:pui_branding_img]) %>" alt="<%= AppConfig[:pui_branding_img_alt_text] %>" /></div>
</div>
</section>

Expand Down
54 changes: 3 additions & 51 deletions plugins/local/public/views/shared/_request_form.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,52 +1,4 @@
<%= form_tag(app_prefix("fill_request"), method: 'post', :id => 'request_form') do %>
<%= render partial: 'shared/request_hiddens' %>
<div id="request">
<h3><strong>Privacy Statement</strong> </h3>
<p><strong>Information about you: how we use it and with whom we share it</strong></p>
<p>
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.
</p>
<p>
We will hold the personal data you provided us for 6 years. We do not use profiling or automated decision-making processes.
</p>
<p>
If you would like to request access, or if you have any questions about accessing archive collections, please email us at <a href="mailto:heritagecollections@ed.ac.uk">heritagecollections@ed.ac.uk</a>.
</p>
<p><a href="https://www.ed.ac.uk/records-management/notice" target="_blank">Continued privacy statement</a></p>
<p>
If you would like to request access, or if you have any questions about accessing archive collections, please email us at <a href="mailto:heritagecollections@ed.ac.uk">heritagecollections@ed.ac.uk</a>.
</p>

<div class="form-group required ">
<%= label_tag(:user_name, "#{t('request.user_name')} #{t('request.required')}" , :class => 'sr-only') %>
<div class="input-group">
<%= text_field_tag :user_name, nil, :placeholder => t('request.user_name'), :class => "form-control"%>
<div class="input-group-addon">
<span class="required aria-hidden"><%= t('request.required') %></span>
</div>
</div>
</div>
<div class="form-group required ">
<%= label_tag(:user_email, "#{t('request.user_email')} #{t('request.required')}", :class => 'sr-only') %>
<div class="input-group">
<%= text_field_tag :user_email, nil, :type => 'email', :placeholder => t('request.user_email'), :class => 'form-control' %>
<div class="input-group-addon">
<span class="required aria-hidden"><%= t('request.required') %></span>
</div>
</div>
</div>
<div class="form-group ">
<%= label_tag(:date, t('request.date'), :class => 'sr-only') %>
<%= text_field_tag :date, nil, :placeholder => t('request.date'), :class => 'form-control' %>
</div>
<div class="form-group ">
<%= 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' %>
</div>
<div class="form-group honeypot">
<span class="aria-hidden">
<%= label_tag :comment %>
<%= text_field_tag :comment, nil, tabindex: '-1', :class => 'form-control'%>
</span>
</div>
<button type="submit" class="btn btn-primary action-btn noscript"><%= t('request.submit') %></button>
</div>
<% end %>