hyrax 2.2.3 → 2.2.4
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +2 -2
- data/app/assets/javascripts/hyrax.js +1 -0
- data/app/assets/javascripts/hyrax/app.js.erb +6 -0
- data/app/assets/javascripts/hyrax/i18n_helper.es6 +24 -0
- data/app/assets/stylesheets/hyrax/_header.scss +4 -0
- data/app/controllers/concerns/hyrax/collections_controller_behavior.rb +1 -0
- data/app/presenters/hyrax/file_set_presenter.rb +1 -1
- data/app/views/_masthead.html.erb +19 -16
- data/app/views/catalog/index.html.erb +4 -4
- data/app/views/hyrax/admin/admin_sets/_sort_and_per_page.html.erb +1 -1
- data/app/views/hyrax/admin/collection_types/index.html.erb +1 -1
- data/app/views/hyrax/content_blocks/templates/terms.html.erb +60 -60
- data/app/views/hyrax/dashboard/_admin_sets.html.erb +1 -1
- data/app/views/hyrax/dashboard/_index_partials/_proxy_rights.html.erb +2 -2
- data/app/views/hyrax/file_sets/show.html.erb +1 -0
- data/app/views/hyrax/my/_facet_layout.html.erb +3 -2
- data/app/views/hyrax/single_use_links_viewer/single_use_error.html.erb +1 -1
- data/app/views/hyrax/users/_activity_log.html.erb +1 -1
- data/app/views/layouts/error.html.erb +1 -1
- data/app/views/layouts/hyrax.html.erb +1 -1
- data/app/views/layouts/hyrax/dashboard.html.erb +1 -1
- data/app/views/shared/_locale_picker.html.erb +1 -1
- data/hyrax.gemspec +1 -1
- data/lib/hyrax/version.rb +1 -1
- data/spec/features/collection_spec.rb +8 -0
- data/template.rb +1 -1
- metadata +11 -4
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 1a9306e4b4844dbd7eeca0918cc90bbd199bb3ed
|
|
4
|
+
data.tar.gz: 4872c02a907df3571ecc9e4d906fa73fcb516919
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 88598e671c211babf2a3ecbb20832c5d31599f5d7d2bc1023ff09728850733313bf838c4f1ef79204aa4ee0d05327b61b9299f5c43bee69d1883973e87d83895
|
|
7
|
+
data.tar.gz: 58b7bc88ffac9e2202b22f4c3e27af8817733a99522a479d5d565d816240e4b9f86f066ac4e3f3a80c9e8f4aa08c1e0f08754b649a7f4c17bf08b9551dd97fe0
|
data/README.md
CHANGED
|
@@ -62,7 +62,7 @@ The Samvera community is here to help. Please see our [support guide](./.github/
|
|
|
62
62
|
# Getting started
|
|
63
63
|
|
|
64
64
|
This document contains instructions specific to setting up an app with __Hyrax
|
|
65
|
-
v2.2.
|
|
65
|
+
v2.2.4__. If you are looking for instructions on installing a different
|
|
66
66
|
version, be sure to select the appropriate branch or tag from the drop-down
|
|
67
67
|
menu above.
|
|
68
68
|
|
|
@@ -161,7 +161,7 @@ NOTE: The steps need to be done in order to create a new Hyrax based app.
|
|
|
161
161
|
Generate a new Rails application using the template.
|
|
162
162
|
|
|
163
163
|
```
|
|
164
|
-
rails _5.1.6_ new my_app -m https://raw.githubusercontent.com/samvera/hyrax/v2.2.
|
|
164
|
+
rails _5.1.6_ new my_app -m https://raw.githubusercontent.com/samvera/hyrax/v2.2.4/template.rb
|
|
165
165
|
```
|
|
166
166
|
|
|
167
167
|
Generating a new Rails application using Hyrax's template above takes cares of a number of steps for you, including:
|
|
@@ -103,6 +103,7 @@
|
|
|
103
103
|
//= require hyrax/batch_select
|
|
104
104
|
//= require hyrax/tabbed_form
|
|
105
105
|
//= require hyrax/turbolinks_events
|
|
106
|
+
//= require hyrax/i18n_helper
|
|
106
107
|
|
|
107
108
|
// this needs to be after batch_select so that the form ids get setup correctly
|
|
108
109
|
//= require hyrax/batch_edit
|
|
@@ -22,6 +22,7 @@ Hyrax = {
|
|
|
22
22
|
this.sortAndPerPage();
|
|
23
23
|
this.sidebar();
|
|
24
24
|
this.batchSelect();
|
|
25
|
+
this.internationalizationHelper();
|
|
25
26
|
},
|
|
26
27
|
|
|
27
28
|
// Add WYSIWYG editor functionality to editable content blocks
|
|
@@ -84,6 +85,11 @@ Hyrax = {
|
|
|
84
85
|
}
|
|
85
86
|
},
|
|
86
87
|
|
|
88
|
+
internationalizationHelper: function () {
|
|
89
|
+
var InternationalizationHelper = require('hyrax/i18n_helper');
|
|
90
|
+
new InternationalizationHelper();
|
|
91
|
+
},
|
|
92
|
+
|
|
87
93
|
// The work edit page
|
|
88
94
|
workEditor: function () {
|
|
89
95
|
var element = $("[data-behavior='work-form']")
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Helper class for internationalization event handling
|
|
3
|
+
*/
|
|
4
|
+
export default class InternationalizationHelper {
|
|
5
|
+
constructor() {
|
|
6
|
+
this.addLangClickListener();
|
|
7
|
+
}
|
|
8
|
+
|
|
9
|
+
/**
|
|
10
|
+
* Handle the event of selecting a new language from top bar, language select element.
|
|
11
|
+
* This updates the html@lang attribute, which is important for screen readers
|
|
12
|
+
*/
|
|
13
|
+
addLangClickListener() {
|
|
14
|
+
$('#user_utility_links')
|
|
15
|
+
.find('a.dropdown-item')
|
|
16
|
+
.on('click', e => {
|
|
17
|
+
let locale = e.target.dataset['locale'];
|
|
18
|
+
if (!locale) {
|
|
19
|
+
return;
|
|
20
|
+
}
|
|
21
|
+
$('html').attr('lang', locale);
|
|
22
|
+
});
|
|
23
|
+
}
|
|
24
|
+
}
|
|
@@ -1,18 +1,21 @@
|
|
|
1
|
-
<
|
|
2
|
-
<
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
<
|
|
6
|
-
<
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
1
|
+
<header>
|
|
2
|
+
<nav id="masthead" class="navbar navbar-inverse navbar-static-top" role="navigation">
|
|
3
|
+
<div class="container-fluid">
|
|
4
|
+
<!-- Brand and toggle get grouped for better mobile display -->
|
|
5
|
+
<div class="navbar-header">
|
|
6
|
+
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#top-navbar-collapse" aria-expanded="false">
|
|
7
|
+
<span class="sr-only">Toggle navigation</span>
|
|
8
|
+
<span class="icon-bar"></span>
|
|
9
|
+
<span class="icon-bar"></span>
|
|
10
|
+
<span class="icon-bar"></span>
|
|
11
|
+
</button>
|
|
12
|
+
<%= render '/logo' %>
|
|
13
|
+
</div>
|
|
13
14
|
|
|
14
|
-
|
|
15
|
-
|
|
15
|
+
<div class="collapse navbar-collapse" id="top-navbar-collapse">
|
|
16
|
+
<%= render '/user_util_links' %>
|
|
17
|
+
</div>
|
|
16
18
|
</div>
|
|
17
|
-
</
|
|
18
|
-
</
|
|
19
|
+
</nav>
|
|
20
|
+
</header>
|
|
21
|
+
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
<div id="
|
|
2
|
-
|
|
1
|
+
<div id="content" class="col-md-9 col-md-push-3 col-sm-8 col-sm-push-4">
|
|
2
|
+
<%= render 'search_results' %>
|
|
3
3
|
</div>
|
|
4
4
|
|
|
5
|
-
<div id="
|
|
6
|
-
|
|
5
|
+
<div id="sidebar" class="col-md-3 col-md-pull-9 col-sm-4 col-sm-pull-8">
|
|
6
|
+
<%= render 'search_sidebar' %>
|
|
7
7
|
</div>
|
|
@@ -1,62 +1,62 @@
|
|
|
1
1
|
<h1>Terms of Use for <%= ApplicationController.helpers.application_name %></h1>
|
|
2
2
|
|
|
3
|
-
<
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
<
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
</
|
|
54
|
-
</
|
|
55
|
-
|
|
56
|
-
<
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
<
|
|
61
|
-
|
|
62
|
-
</
|
|
3
|
+
<ol>
|
|
4
|
+
<li>
|
|
5
|
+
<strong>General:</strong> The Site is maintained by the <%= ApplicationController.helpers.institution_name_full %> Libraries and <%= ApplicationController.helpers.institution_name_full %> Information Technology Services (ITS), in support of our mission to disseminate information and research to scholars, educators and the public. As used in these Terms of Use, the terms "we, "us," and "our" refer to the Libraries, ITS, and <%= ApplicationController.helpers.institution_name_full %> ("<%= ApplicationController.helpers.institution_name %>"). Use of <%= ApplicationController.helpers.application_name %> (the Site and its contents) is subject to the following terms and conditions and all applicable laws. By using the Site or any of its content, you accept and agree to be bound by these Terms of Use and all applicable laws. If any of these Terms of Use are unacceptable to you, do not use the Site.
|
|
6
|
+
</li>
|
|
7
|
+
|
|
8
|
+
<li>
|
|
9
|
+
<strong>Changes to Terms of Use Are Binding:</strong> We may change these Terms of Use from time-to-time without advance notice. Your use of the Site or any of its content after any changes have been made will constitute your agreement on a prospective basis to the modified Terms of Use and all of the changes. Accordingly, you should read these Terms of Use from time-to-time for any changes.
|
|
10
|
+
</li>
|
|
11
|
+
|
|
12
|
+
<li>
|
|
13
|
+
<strong>Copyright and Use of <%= ApplicationController.helpers.application_name %> Content:</strong> The Site includes text, images, graphics, information, articles, multi-media objects, scholarly projects and other works protected by copyright, trademark and other laws ("Content"). Some of the Content on this site may include materials from older published works that have passed into the "public domain" under U.S. copyright law. Where such information is known, it is included specifically in the metadata associated with each item of Content. However, the Site itself and most of the materials held as Content on the Site are protected by copyright and other laws. These materials have been deposited to enable teaching, research, and other non-profit educational activities. Unless otherwise specified in the metadata attached to an item of Content, you may use the Site and the Content only for non-commercial, research, educational, or related academic purposes. Further, you have the responsibility to make your own assessment of the copyright or other legal concerns that might affect your use of <%= ApplicationController.helpers.application_name %> content and to assume personal responsibility for your uses of Content.
|
|
14
|
+
</li>
|
|
15
|
+
|
|
16
|
+
<li>
|
|
17
|
+
<strong>Special Permissions:</strong> <%= ApplicationController.helpers.application_name %> does not have the authority to grant or deny special permissions to use images or other Content found on the site beyond those uses that are specifically described in these Terms of Use or as noted specifically on individual items of Content. <%= ApplicationController.helpers.application_name %> staff are not able to undertake copyright investigations on behalf of Site users.
|
|
18
|
+
</li>
|
|
19
|
+
|
|
20
|
+
<li>
|
|
21
|
+
<strong><%= ApplicationController.helpers.application_name %> Access Levels:</strong> Where possible, <%= ApplicationController.helpers.application_name %> makes its Content available to the general public. However, some of the Content on this Site has been made available only to <%= ApplicationController.helpers.institution_name %> community users or other user subgroups by the depositor. Such Content cannot be used, downloaded, or distributed outside the <%= ApplicationController.helpers.institution_name %> community (or subgroup identified) without the specific permission of the depositor.
|
|
22
|
+
</li>
|
|
23
|
+
|
|
24
|
+
<li>
|
|
25
|
+
<strong>Use of <%= ApplicationController.helpers.application_name %> Site and Content:</strong> Unless otherwise specified in the metadata attached to an item, Content that has been made accessible to the general public may be used for non-commercial, research, educational, or related academic purposes only. Such uses include personal study, distribution to students, research and scholarship (including computational research uses such as data and text-mining, citation-extraction, or cross-referencing) as long as you do not sell the Content or sell advertising on any page on which the Content is displayed. If you make an item of Content available to others, you shall do so in accordance with the terms of the rights granted pursuant to the particular item of Content, or at a minimum, you will retain with the Content its title, the name of the author(s), a reference to these Terms of Use, any copyright notice included on the original, and any metadata associated with the original. You may not use a facsimile of the published version of an article that may be posted in <%= ApplicationController.helpers.application_name %> under these open access terms, unless the publisher so permits. You will not make any translation, adaptation or other derivative work of an item of Content except as authorized under U.S. law. You may not sublicense or otherwise transfer your rights in an item of Content, unless specifically authorized by the copyright license granted to the item of Content and will only make Content available to others for use by them under these Terms of Use. Links on the Site to third-party web sites are provided solely as a convenience to you. We do not approve or endorse the content of linked third-party sites, and you agree that we will have no responsibility or liability in connection with your use of any linked third-party sites. Nothing in these Terms of Use or on the Site will be construed as granting you any right or license to use any trademarks, service marks or logos displayed on the Site. You agree not to use or register any name, logo or insignia of <%= ApplicationController.helpers.institution_name_full %> or any of its subdivisions for any purpose except with our prior written approval and in accordance with any restrictions required by us.
|
|
26
|
+
</li>
|
|
27
|
+
|
|
28
|
+
<li>
|
|
29
|
+
<strong>Fair Use and Other Lawful Uses:</strong> Nothing in these Terms of Use is intended to restrict or limit you from making uses of Content that, in the absence of rights granted hereunder, would not infringe or violate anyone's copyright, trademark or other rights. To the extent permitted by law, adaptation of <%= ApplicationController.helpers.application_name %> Content to enable use and access by persons with disabilities is encouraged.
|
|
30
|
+
</li>
|
|
31
|
+
|
|
32
|
+
<li>
|
|
33
|
+
<strong>Reserved Rights; Obtaining Permissions:</strong> All rights in the Site and the Content that are not expressly granted are reserved. You agree to use the Site and the Content only in ways that comply with copyright and all other applicable laws, as well as with these Terms of Use, and that do not infringe or violate anyone's rights. If you wish to make any use of the Content that requires authorization under copyright, trademark or other rights, you agree to obtain all necessary permissions. You are responsible for determining whether permission is needed to make any use of the Content that you wish to make.
|
|
34
|
+
</li>
|
|
35
|
+
|
|
36
|
+
<li>
|
|
37
|
+
<strong>Disclaimer of Warranties:</strong> THE SITE AND THE CONTENT ARE PROVIDED "AS IS." TO THE FULLEST EXTENT PERMITTED BY APPLICABLE LAW, WE DISCLAIM ALL WARRANTIES OF ANY KIND (EXPRESS, IMPLIED OR OTHERWISE) REGARDING THE SITE OR THE CONTENT, INCLUDING BUT NOT LIMITED TO ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OWNERSHIP, AND NON-INFRINGEMENT. WE MAKE NO WARRANTY ABOUT THE ACCURACY, RELIABILITY, COMPLETENESS, TIMELINESS, SUFFICIENCY OR QUALITY OF THE SITE OR THE CONTENT, NOR THAT ANY PARTICULAR CONTENT WILL CONTINUE TO BE MADE AVAILABLE. WE DO NOT APPROVE OR ENDORSE ANY POSTED MATERIAL OR CONTENT PROVIDED BY OTHERS, INCLUDING <%= ApplicationController.helpers.institution_name.upcase %> AUTHORS. WE DO NOT WARRANT THAT THE SITE WILL OPERATE WITHOUT ERROR OR INTERRUPTION, OR THAT THE SITE OR ITS SERVER ARE FREE OF COMPUTER VIRUSES OR OTHER HARMFUL MATERIALS.
|
|
38
|
+
</li>
|
|
39
|
+
|
|
40
|
+
<li>
|
|
41
|
+
<strong>Limitations of Liability and Remedies:</strong> WE MAKE THE SITE AND THE CONTENT AVAILABLE FREE OF CHARGE. YOUR USE OF THE SITE AND THE CONTENT IS AT YOUR OWN SOLE RISK. IN NO EVENT SHALL WE BE LIABLE TO YOU, IN CONTRACT, TORT OR OTHERWISE, FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY OR OTHER DAMAGES OF ANY KIND ARISING OUT OF OR RELATING TO THE SITE OR THE CONTENT, OR YOUR USE OF THE SITE OR THE CONTENT, OR ANY THIRD PARTY RIGHTS IN THE CONTENT, EVEN IF THE SITE OR CONTENT IS DEFECTIVE OR WE ARE NEGLIGENT OR OTHERWISE AT FAULT, AND REGARDLESS WHETHER WE ARE ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. THE FOREGOING LIMITATIONS SHALL APPLY TO THE FULLEST EXTENT PERMITTED BY APPLICABLE LAW.
|
|
42
|
+
</li>
|
|
43
|
+
|
|
44
|
+
<li>
|
|
45
|
+
<strong>Indemnity:</strong> You agree to indemnify and hold harmless <%= ApplicationController.helpers.institution_name_full %> and its trustees, officers, fellows, students, employees and agents, from and against all claims, actions, suits, damages, liabilities and costs (including, without limitation, reasonable legal fees) arising from or relating to your use of the Site or any of the Content or your failure to comply with any provision of these Terms of Use.
|
|
46
|
+
</li>
|
|
47
|
+
|
|
48
|
+
<li>
|
|
49
|
+
<strong>Communications:</strong>
|
|
50
|
+
<ol type="A">
|
|
51
|
+
<li>Copyright Complaints: We respect the intellectual property rights of others. If you believe your copyright has been violated on the Site, please notify us through <%= ApplicationController.helpers.institution_name %>'s designated agent under the Digital Millennium Copyright Act (see 17 U.S.C. §512(c)(3).</li>
|
|
52
|
+
<li>Other Site Issues: Please direct all other communications to <a href="<%= Hyrax::Engine.routes.url_helpers.contact_path %>">contact form</a>.
|
|
53
|
+
</ol>
|
|
54
|
+
</li>
|
|
55
|
+
|
|
56
|
+
<li>
|
|
57
|
+
<strong>Applicable Law and Jurisdiction; Access from Outside the Commonwealth of Pennsylvania:</strong> The Site is controlled and operated from our facilities in and around University Park, PA. These Terms of Use, and any claim or dispute that arises from or relates to your use of the Site or the Content, will be governed by the laws of Pennsylvania, without regard to its conflicts of laws principles. You agree that all such claims and disputes will be heard and resolved exclusively in the courts of Centre County, Pennsylvania. You consent to the personal jurisdiction of such courts over you for this purpose, and waive and agree not to assert any objection to such proceedings in such courts (including any defense or objection of lack of proper jurisdiction or venue or inconvenience of forum). If you choose to access our website from locations other than Pennsylvania, you will be responsible for compliance with all local laws of those other locations.</li>
|
|
58
|
+
|
|
59
|
+
<li>
|
|
60
|
+
<strong>Termination:</strong> The permissions granted to you will terminate automatically upon any breach by you of these Terms of Use. If we take down or otherwise cease to make a work available as an item of Content, the permission granted to you hereunder to use that Content thereafter will terminate at that time. <%= ApplicationController.helpers.application_name %> is maintained as a scholarly and educational resource by <%= ApplicationController.helpers.institution_name %> which may be modified or terminated by the University in its sole discretion.
|
|
61
|
+
</li>
|
|
62
|
+
</ol>
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
</div>
|
|
7
7
|
<div class="row">
|
|
8
8
|
<div class="col-xs-6 proxy-search">
|
|
9
|
-
<
|
|
9
|
+
<h2><%= t("hyrax.dashboard.authorize_proxies") %></h2>
|
|
10
10
|
<div class="form-group">
|
|
11
11
|
<label for="user"><%= t("hyrax.dashboard.proxy_user") %></label>
|
|
12
12
|
<%= hidden_field_tag :user, nil, data: { grantor: current_user.to_param } %>
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
</div>
|
|
16
16
|
|
|
17
17
|
<div class="col-xs-6">
|
|
18
|
-
<
|
|
18
|
+
<h2><%= t("hyrax.dashboard.current_proxies") %></h2>
|
|
19
19
|
<table class="table table-condensed table-striped" id="authorizedProxies">
|
|
20
20
|
<tbody>
|
|
21
21
|
<% user.can_receive_deposits_from.each do |depositor| %>
|
|
@@ -1,7 +1,8 @@
|
|
|
1
|
-
<
|
|
1
|
+
<fieldset class="btn-group">
|
|
2
|
+
<legend class="sr-only"><%= facet_field_label(facet_field.field) %></legend>
|
|
2
3
|
<button class="btn btn-default dropdown-toggle" type="button" id="<%= facet_field.field.parameterize %>" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" aria-controls="<%= facet_field.field.parameterize + '-dropdown-options' %>">
|
|
3
4
|
<%= facet_field_label(facet_field.field) %>
|
|
4
5
|
<span class="caret"></span>
|
|
5
6
|
</button>
|
|
6
7
|
<%= yield %>
|
|
7
|
-
</
|
|
8
|
+
</fieldset>
|
|
@@ -9,7 +9,7 @@
|
|
|
9
9
|
<% events.each do |event| %>
|
|
10
10
|
<% next if event[:action].blank? or event[:timestamp].blank? %>
|
|
11
11
|
<tr>
|
|
12
|
-
<td><%= event[:action] %></td>
|
|
12
|
+
<td><%= sanitize event[:action] %></td>
|
|
13
13
|
<% time = Time.zone.at(event[:timestamp].to_i) %>
|
|
14
14
|
<td data-sort="<%= time.getutc.iso8601(5) %>">
|
|
15
15
|
<relative-time datetime="<%= time.getutc.iso8601 %>" title="<%= time.to_formatted_s(:standard) %>">
|
|
@@ -9,7 +9,7 @@
|
|
|
9
9
|
<li role="presentation" class="divider"></li>
|
|
10
10
|
<% available_translations.each do |language, label| %>
|
|
11
11
|
<li role="presentation" lang="<%= language %>">
|
|
12
|
-
<%= link_to label, "?locale=#{language}", class: 'dropdown-item', role: 'menuitem', tabindex: '-1' %>
|
|
12
|
+
<%= link_to label, "?locale=#{language}", class: 'dropdown-item', role: 'menuitem', tabindex: '-1', data: { locale: language } %>
|
|
13
13
|
</li>
|
|
14
14
|
<% end %>
|
|
15
15
|
</ul>
|
data/hyrax.gemspec
CHANGED
|
@@ -51,7 +51,7 @@ SUMMARY
|
|
|
51
51
|
spec.add_dependency 'hydra-derivatives', '~> 3.3'
|
|
52
52
|
spec.add_dependency 'hydra-editor', '>= 3.3', '< 5.0'
|
|
53
53
|
spec.add_dependency 'hydra-head', '>= 10.5.0'
|
|
54
|
-
spec.add_dependency 'hydra-works', '
|
|
54
|
+
spec.add_dependency 'hydra-works', '>= 0.16', '< 2.0'
|
|
55
55
|
spec.add_dependency 'iiif_manifest', '>= 0.3', '< 0.5'
|
|
56
56
|
spec.add_dependency 'jquery-datatables-rails', '~> 3.4'
|
|
57
57
|
spec.add_dependency 'jquery-ui-rails', '~> 6.0'
|
data/lib/hyrax/version.rb
CHANGED
|
@@ -54,6 +54,14 @@ RSpec.describe 'collection', type: :feature, clean_repo: true do
|
|
|
54
54
|
expect(page).not_to have_content(work2.title.first)
|
|
55
55
|
end
|
|
56
56
|
|
|
57
|
+
it "returns json results" do
|
|
58
|
+
visit "/collections/#{collection.id}.json"
|
|
59
|
+
expect(page).to have_http_status(:success)
|
|
60
|
+
json = JSON.parse(page.body)
|
|
61
|
+
expect(json['id']).to eq collection.id
|
|
62
|
+
expect(json['title']).to match_array collection.title
|
|
63
|
+
end
|
|
64
|
+
|
|
57
65
|
context "with a non-nestable collection type" do
|
|
58
66
|
let(:collection) do
|
|
59
67
|
build(:public_collection_lw, user: user, description: ['collection description'], collection_type_settings: :not_nestable, with_solr_document: true, with_permission_template: true)
|
data/template.rb
CHANGED
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: hyrax
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 2.2.
|
|
4
|
+
version: 2.2.4
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Justin Coyne
|
|
@@ -14,7 +14,7 @@ authors:
|
|
|
14
14
|
autorequire:
|
|
15
15
|
bindir: bin
|
|
16
16
|
cert_chain: []
|
|
17
|
-
date: 2018-09-
|
|
17
|
+
date: 2018-09-11 00:00:00.000000000 Z
|
|
18
18
|
dependencies:
|
|
19
19
|
- !ruby/object:Gem::Dependency
|
|
20
20
|
name: rails
|
|
@@ -298,16 +298,22 @@ dependencies:
|
|
|
298
298
|
name: hydra-works
|
|
299
299
|
requirement: !ruby/object:Gem::Requirement
|
|
300
300
|
requirements:
|
|
301
|
-
- - "
|
|
301
|
+
- - ">="
|
|
302
302
|
- !ruby/object:Gem::Version
|
|
303
303
|
version: '0.16'
|
|
304
|
+
- - "<"
|
|
305
|
+
- !ruby/object:Gem::Version
|
|
306
|
+
version: '2.0'
|
|
304
307
|
type: :runtime
|
|
305
308
|
prerelease: false
|
|
306
309
|
version_requirements: !ruby/object:Gem::Requirement
|
|
307
310
|
requirements:
|
|
308
|
-
- - "
|
|
311
|
+
- - ">="
|
|
309
312
|
- !ruby/object:Gem::Version
|
|
310
313
|
version: '0.16'
|
|
314
|
+
- - "<"
|
|
315
|
+
- !ruby/object:Gem::Version
|
|
316
|
+
version: '2.0'
|
|
311
317
|
- !ruby/object:Gem::Dependency
|
|
312
318
|
name: iiif_manifest
|
|
313
319
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -1145,6 +1151,7 @@ files:
|
|
|
1145
1151
|
- app/assets/javascripts/hyrax/fileupload.js
|
|
1146
1152
|
- app/assets/javascripts/hyrax/flot_stats.js
|
|
1147
1153
|
- app/assets/javascripts/hyrax/ga_events.js
|
|
1154
|
+
- app/assets/javascripts/hyrax/i18n_helper.es6
|
|
1148
1155
|
- app/assets/javascripts/hyrax/initialize.js
|
|
1149
1156
|
- app/assets/javascripts/hyrax/monkey_patch_turbolinks.js.coffee
|
|
1150
1157
|
- app/assets/javascripts/hyrax/nav_safety.js
|