hyrax 2.2.4 → 2.3.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (35) hide show
  1. checksums.yaml +4 -4
  2. data/.circleci/config.yml +75 -0
  3. data/README.md +7 -2
  4. data/app/assets/javascripts/hyrax/batch_select_all.js +5 -0
  5. data/app/assets/stylesheets/hyrax/_forms.scss +7 -0
  6. data/app/assets/stylesheets/hyrax/_header.scss +4 -0
  7. data/app/presenters/hyrax/dashboard/user_presenter.rb +1 -1
  8. data/app/services/hyrax/admin_set_service.rb +12 -7
  9. data/app/views/_controls.html.erb +6 -6
  10. data/app/views/catalog/_search_form.html.erb +35 -30
  11. data/app/views/hyrax/batch_select/_add_button.html.erb +2 -2
  12. data/app/views/hyrax/dashboard/_index_partials/_current_proxy_rights.html.erb +12 -14
  13. data/app/views/hyrax/dashboard/_repository_growth.html.erb +30 -0
  14. data/app/views/hyrax/dashboard/_repository_objects.html.erb +28 -0
  15. data/app/views/hyrax/dashboard/_sidebar.html.erb +17 -15
  16. data/app/views/hyrax/dashboard/_user_activity.html.erb +28 -0
  17. data/app/views/hyrax/dashboard/show_admin.html.erb +15 -37
  18. data/app/views/hyrax/dashboard/show_user.html.erb +1 -1
  19. data/app/views/hyrax/embargoes/_list_expired_active_embargoes.html.erb +2 -2
  20. data/app/views/hyrax/my/_search_form.html.erb +15 -10
  21. data/app/views/hyrax/my/_search_header.html.erb +2 -2
  22. data/config/locales/hyrax.de.yml +15 -10
  23. data/config/locales/hyrax.en.yml +15 -10
  24. data/config/locales/hyrax.es.yml +15 -10
  25. data/config/locales/hyrax.fr.yml +15 -10
  26. data/config/locales/hyrax.it.yml +15 -10
  27. data/config/locales/hyrax.pt-BR.yml +15 -10
  28. data/config/locales/hyrax.zh.yml +15 -10
  29. data/hyrax.gemspec +5 -1
  30. data/lib/hyrax/version.rb +1 -1
  31. data/spec/factories/generic_works.rb +2 -2
  32. data/spec/features/admin_spec.rb +5 -5
  33. data/spec/services/hyrax/admin_set_service_spec.rb +95 -46
  34. data/template.rb +1 -1
  35. metadata +34 -16
@@ -5,7 +5,9 @@
5
5
  <div class="row">
6
6
  <div class="col-md-3">
7
7
  <div class="panel panel-default">
8
- <div class="panel-heading"><div class="h3 panel-title text-center"><%= t('.registered_users') %></div></div>
8
+ <div class="panel-heading">
9
+ <h3 class="panel-title text-center"><%= t('.registered_users') %></h3>
10
+ </div>
9
11
  <div class="panel-body text-center">
10
12
  Current
11
13
  <div class="h3"><%= @presenter.user_count %></div>
@@ -15,7 +17,9 @@
15
17
 
16
18
  <div class="col-md-3">
17
19
  <div class="panel panel-default">
18
- <div class="panel-heading"><div class="h3 panel-title text-center"><%= t('.total_visitors') %></div></div>
20
+ <div class="panel-heading">
21
+ <h3 class="panel-title text-center"><%= t('.total_visitors') %></h3>
22
+ </div>
19
23
  <div class="panel-body text-center">Past 30 days
20
24
  <div class="h3">n/a</div>
21
25
  </div>
@@ -24,7 +28,9 @@
24
28
 
25
29
  <div class="col-md-3">
26
30
  <div class="panel panel-default">
27
- <div class="panel-heading"><div class="h3 panel-title text-center"><%= t('.returning_visitors') %></div></div>
31
+ <div class="panel-heading">
32
+ <h3 class="panel-title text-center"><%= t('.returning_visitors') %></h3>
33
+ </div>
28
34
  <div class="panel-body text-center">Past 30 days
29
35
  <div class="h3">n/a</div>
30
36
  </div>
@@ -33,7 +39,9 @@
33
39
 
34
40
  <div class="col-md-3">
35
41
  <div class="panel panel-default">
36
- <div class="panel-heading"><div class="h3 panel-title text-center"><%= t('.new_visitors') %></div></div>
42
+ <div class="panel-heading">
43
+ <h3 class="panel-title text-center"><%= t('.new_visitors') %></h3>
44
+ </div>
37
45
  <div class="panel-body text-center">Past 30 days
38
46
  <div class="h3">n/a</div>
39
47
  </div>
@@ -46,49 +54,19 @@
46
54
  <div class="row">
47
55
  <div class="col-md-4">
48
56
  <div class="panel panel-default">
49
- <div class="panel-heading">
50
- <div class="h3 panel-title"><%= t('.user_activity.title') %></div>
51
- <div><%= t('.user_activity.subtitle') %></div>
52
- </div>
53
- <div class="panel-body text-center">
54
- <div id="user-activity" style="height: 200px"><script>
55
- //<![CDATA[
56
- Hyrax.statistics.userActivity = <%== @presenter.user_activity.to_json %>
57
- //]]>
58
- </script></div>
59
- </div>
57
+ <%= render 'user_activity' %>
60
58
  </div>
61
59
  </div>
62
60
 
63
61
  <div class="col-md-4">
64
62
  <div class="panel panel-default">
65
- <div class="panel-heading">
66
- <div class="h3 panel-title"><%= t('.repository_growth.title') %></div>
67
- <div><%= t('.repository_growth.subtitle') %></div>
68
- </div>
69
- <div class="panel-body text-center">
70
- <div id="dashboard-growth" style="height: 200px"><script>
71
- //<![CDATA[
72
- Hyrax.statistics.repositoryGrowth = <%== @presenter.repository_growth.to_json %>
73
- //]]>
74
- </script></div>
75
- </div>
63
+ <%= render 'repository_growth' %>
76
64
  </div>
77
65
  </div>
78
66
 
79
67
  <div class="col-md-4">
80
68
  <div class="panel panel-default">
81
- <div class="panel-heading">
82
- <div class="h3 panel-title"><%= t('.repository_objects.title') %></div>
83
- <div><%= t('.repository_objects.subtitle') %></div>
84
- </div>
85
- <div class="panel-body text-center">
86
- <div id="dashboard-repository-objects" style="height: 200px"><script>
87
- //<![CDATA[
88
- Hyrax.statistics.repositoryObjects = <%== @presenter.repository_objects.to_json %>
89
- //]]>
90
- </script></div>
91
- </div>
69
+ <%= render 'repository_objects' %>
92
70
  </div>
93
71
  </div>
94
72
  </div>
@@ -4,7 +4,7 @@
4
4
 
5
5
  <div class="panel panel-default user-activity">
6
6
  <div class="panel-heading">
7
- <h3 class="panel-title "><%= t("hyrax.dashboard.user_activity") %></h3>
7
+ <h3 class="panel-title "><%= t("hyrax.dashboard.user_activity.title") %></h3>
8
8
  </div>
9
9
  <div class="panel-body">
10
10
  <%= @presenter.render_recent_activity %>
@@ -22,7 +22,7 @@
22
22
  <table class="embargoes table">
23
23
  <thead>
24
24
  <tr>
25
- <th></th>
25
+ <th><input type="checkbox" id="checkAllBox" class="batch_document_selector"/> Select All</th>
26
26
  <%= render partial: 'table_headers' %>
27
27
  </tr>
28
28
  </thead>
@@ -40,7 +40,7 @@
40
40
  <tr data-behavior="extra" data-id="<%= curation_concern.id %>" class="extra-embargo-info">
41
41
  <td></td>
42
42
  <td colspan=5>
43
- <%= check_box_tag "embargoes[#{i}][copy_visibility]", curation_concern.id, true %>
43
+ <%= check_box_tag "embargoes[#{i}][copy_visibility]", curation_concern.id, false %>
44
44
  <%= t('.change_all', cc: curation_concern) %>
45
45
  <%= visibility_badge(curation_concern.visibility_after_embargo) %>?
46
46
  </td>
@@ -1,14 +1,19 @@
1
- <%= form_tag search_action_url, method: :get, class: "search-query-form", role: "search" do %>
1
+ <%= form_tag search_action_url, method: :get, class: "search-query-form form-horizontal search-form", role: "search" do %>
2
+
2
3
  <%= render_hash_as_hidden_fields(search_state.params_for_search.except(:q, :search_field, :qt, :page, :utf8)) %>
3
- <div class="input-group">
4
+ <div class="form-group">
5
+ <label class="control-label col-sm-3" for="search-field-header">
6
+ <%= t("hyrax.search.form.q.label", application_name: application_name) %>
7
+ </label>
4
8
 
5
- <label class="sr-only" for="search-field-header"><%= t("hyrax.search.form.q.label", application_name: application_name) %></label>
6
- <%= text_field_tag :q, current_search_parameters , class: "q form-control", id: "search-field-header", placeholder: t("hyrax.search.form.q.placeholder") %>
9
+ <div class="input-group">
10
+ <%= text_field_tag :q, current_search_parameters , class: "q form-control", id: "search-field-header", placeholder: t("hyrax.search.form.q.placeholder") %>
7
11
 
8
- <div class="input-group-btn">
9
- <button type="submit" class="btn btn-primary" id="search-submit-header">
10
- <%= t('hyrax.search.button.html') %>
11
- </button>
12
- </div>
13
- </div>
12
+ <div class="input-group-btn">
13
+ <button type="submit" class="btn btn-primary" id="search-submit-header">
14
+ <%= t('hyrax.search.button.html') %>
15
+ </button>
16
+ </div>
17
+ </div><!-- /.input-group -->
18
+ </div><!-- /.form-group -->
14
19
  <% end %>
@@ -4,10 +4,10 @@
4
4
  <%= render 'constraints' %>
5
5
 
6
6
  <div class="row">
7
- <div class="col-sm-5 col-md-6">
7
+ <div class="col-sm-5">
8
8
  <%= render 'hyrax/my/sort_and_per_page' %>
9
9
  </div>
10
- <div class="col-sm-7 col-md-6">
10
+ <div class="col-sm-7">
11
11
  <%= render 'search_form' %>
12
12
  </div>
13
13
  </div>
@@ -760,20 +760,21 @@ de:
760
760
  proxy_delete: Vertreter löschen
761
761
  proxy_help: Wählen Sie einen Benutzer aus, der Arbeiten in Ihrem Namen hinterlegen kann. Sie sind der Eigentümer von Werken, die dieser Benutzer für Sie hinterlegt. Sie können einen Proxy widerrufen, indem Sie auf die Schaltfläche Proxy löschen klicken.
762
762
  proxy_user: Vertreter-Benutzer
763
+ repository_growth:
764
+ collections: Sammlungen
765
+ date: Datum
766
+ objects: Objekte
767
+ subtitle: Die letzten 90 Tage
768
+ title: Repository-Wachstum
769
+ repository_objects:
770
+ status: Aktueller Status
771
+ subtitle: Aktueller Status
772
+ title: Repository-Objekte
763
773
  show_admin:
764
774
  new_visitors: Neue Besucher
765
775
  registered_users: Registrierte Benutzer
766
- repository_growth:
767
- subtitle: Letzte 90 Tage
768
- title: Repositoriums- Wachstum
769
- repository_objects:
770
- subtitle: Aktueller Status
771
- title: Repositoriums- Objekte
772
776
  returning_visitors: Besucher wiederkehrend
773
777
  total_visitors: Besucher insgesamt
774
- user_activity:
775
- subtitle: Benutzer- Neuanmeldungen
776
- title: Benutzeraktivität
777
778
  stats:
778
779
  collections: Sammlungen erstellt
779
780
  file_downloads: Herunterladen
@@ -786,7 +787,11 @@ de:
786
787
  transfer_works_link: Wählen Sie die zu übertragenden Arbeiten aus
787
788
  transfers_received: Transfers erhalten
788
789
  transfers_sent: Transfers gesendet
789
- user_activity: Benutzeraktivität
790
+ user_activity:
791
+ date: Datum
792
+ new_users: Neue Nutzer
793
+ subtitle: Neue Benutzeranmeldungen
794
+ title: Benutzeraktivität
790
795
  user_notifications: Benutzerbenachrichtigungen
791
796
  view_files: Dateien ansehen
792
797
  document_language: de
@@ -759,20 +759,21 @@ en:
759
759
  proxy_delete: Delete Proxy
760
760
  proxy_help: Select a user who can deposit works on your behalf. Both you and your proxy will be able to make changes to these works. You can revoke a proxy by clicking the Delete Proxy button. To revoke their ability to edit a work they previously submitted, remove them from the Sharing tab on each work.
761
761
  proxy_user: Proxy User
762
+ repository_growth:
763
+ collections: Collections
764
+ date: Date
765
+ objects: Objects
766
+ subtitle: Past 90 days
767
+ title: Repository Growth
768
+ repository_objects:
769
+ status: Current Status
770
+ subtitle: Current Status
771
+ title: Repository Objects
762
772
  show_admin:
763
773
  new_visitors: New Visitors
764
774
  registered_users: Registered Users
765
- repository_growth:
766
- subtitle: Past 90 days
767
- title: Repository Growth
768
- repository_objects:
769
- subtitle: Current Status
770
- title: Repository Objects
771
775
  returning_visitors: Returning Visitors
772
776
  total_visitors: Total Visitors
773
- user_activity:
774
- subtitle: New user signups
775
- title: User Activity
776
777
  stats:
777
778
  collections: Collections created
778
779
  file_downloads: Download
@@ -785,7 +786,11 @@ en:
785
786
  transfer_works_link: Select works to transfer
786
787
  transfers_received: Transfers Received
787
788
  transfers_sent: Transfers Sent
788
- user_activity: User Activity
789
+ user_activity:
790
+ date: Date
791
+ new_users: New Users
792
+ subtitle: New user signups
793
+ title: User Activity
789
794
  user_notifications: User Notifications
790
795
  view_files: View Files
791
796
  document_language: en
@@ -758,20 +758,21 @@ es:
758
758
  proxy_delete: Eliminar proxy
759
759
  proxy_help: Seleccione un usuario que pueda depositar trabajos en su nombre. Usted será el propietario de los trabajos que este usuario deposite para usted. Puede revocar un proxy haciendo clic en el botón Eliminar proxy.
760
760
  proxy_user: Usuario de Proxy
761
+ repository_growth:
762
+ collections: Colecciones
763
+ date: Fecha
764
+ objects: Objetos
765
+ subtitle: Últimos 90 días
766
+ title: Crecimiento del repositorio
767
+ repository_objects:
768
+ status: Estado actual
769
+ subtitle: Estado actual
770
+ title: Objetos de repositorio
761
771
  show_admin:
762
772
  new_visitors: Visitantes Nuevos
763
773
  registered_users: Usuarios registrados
764
- repository_growth:
765
- subtitle: Pasados 90 días
766
- title: Crecimiento del Repositorio
767
- repository_objects:
768
- subtitle: Estado Actual
769
- title: Objetos del Repositorio
770
774
  returning_visitors: Visitantes Recurrentes
771
775
  total_visitors: Visitantes Totales
772
- user_activity:
773
- subtitle: Nuevas inscripciones de usuarios
774
- title: Actividad de Usuario
775
776
  stats:
776
777
  collections: Colecciones creadas
777
778
  file_downloads: Descargar
@@ -784,7 +785,11 @@ es:
784
785
  transfer_works_link: Seleccionar los trabajos a transferir
785
786
  transfers_received: Transferencias Recibidas
786
787
  transfers_sent: Transferencias Enviadas
787
- user_activity: Actividad de usuario
788
+ user_activity:
789
+ date: Fecha
790
+ new_users: Usuarios nuevos
791
+ subtitle: Nuevos registros de usuarios
792
+ title: Actividad del usuario
788
793
  user_notifications: Notificaciones de Usuario
789
794
  view_files: Ver Archivos
790
795
  document_language: es
@@ -759,20 +759,21 @@ fr:
759
759
  proxy_delete: Supprimer le proxy
760
760
  proxy_help: Sélectionnez un utilisateur qui peut déposer des œuvres en votre nom. Vous serez le propriétaire des œuvres que cet utilisateur dépose pour vous. Vous pouvez révoquer un proxy en cliquant sur le bouton Supprimer le proxy.
761
761
  proxy_user: Utilisateur proxy
762
+ repository_growth:
763
+ collections: Collections
764
+ date: Rendez-vous amoureux
765
+ objects: Objets
766
+ subtitle: 90 derniers jours
767
+ title: Croissance du dépôt
768
+ repository_objects:
769
+ status: Statut actuel
770
+ subtitle: Statut actuel
771
+ title: Objets de référentiel
762
772
  show_admin:
763
773
  new_visitors: Nouveaux visiteurs
764
774
  registered_users: Utilisateurs enregistrés
765
- repository_growth:
766
- subtitle: 90 jours précédents
767
- title: Croissance du dépôt
768
- repository_objects:
769
- subtitle: Statut actuel
770
- title: Objets de dépôt
771
775
  returning_visitors: Retrouver les visiteurs
772
776
  total_visitors: Total des visiteurs
773
- user_activity:
774
- subtitle: Nouvelles inscriptions d'utilisateurs
775
- title: Activité de l'utilisateur
776
777
  stats:
777
778
  collections: Collections créées
778
779
  file_downloads: Télécharger
@@ -785,7 +786,11 @@ fr:
785
786
  transfer_works_link: Sélectionnez les travaux à transférer
786
787
  transfers_received: Transferts reçus
787
788
  transfers_sent: Transferts envoyés
788
- user_activity: Activité de l'utilisateur
789
+ user_activity:
790
+ date: Rendez-vous amoureux
791
+ new_users: Nouveaux utilisateurs
792
+ subtitle: Nouvelles inscriptions d'utilisateurs
793
+ title: Activité de l'utilisateur
789
794
  user_notifications: Notifications de l'utilisateur
790
795
  view_files: Afficher les fichiers
791
796
  document_language: fr
@@ -758,20 +758,21 @@ it:
758
758
  proxy_delete: Elimina proxy
759
759
  proxy_help: Seleziona un utente che può depositare opere per tuo conto. Sarai il proprietario delle opere che questo utente deposita per te. È possibile revocare un proxy facendo clic sul pulsante Elimina proxy.
760
760
  proxy_user: Utente Proxy
761
+ repository_growth:
762
+ collections: collezioni
763
+ date: Data
764
+ objects: Oggetti
765
+ subtitle: Ultimi 90 giorni
766
+ title: Crescita del repository
767
+ repository_objects:
768
+ status: Stato attuale
769
+ subtitle: Stato attuale
770
+ title: Oggetti del repository
761
771
  show_admin:
762
772
  new_visitors: Nuovi visitatori
763
773
  registered_users: Utente registrato
764
- repository_growth:
765
- subtitle: Ultimi 90 giorni
766
- title: Crescita dei repository
767
- repository_objects:
768
- subtitle: Stato attuale
769
- title: Oggetti di repository
770
774
  returning_visitors: Visitatori di ritorno
771
775
  total_visitors: Totale visitatori
772
- user_activity:
773
- subtitle: Nuove iscrizioni degli utenti
774
- title: Attività utente
775
776
  stats:
776
777
  collections: Collezioni create
777
778
  file_downloads: Scaricare
@@ -784,7 +785,11 @@ it:
784
785
  transfer_works_link: Seleziona le opere da trasferire
785
786
  transfers_received: Trasferimenti ricevuti
786
787
  transfers_sent: Trasferimenti inviati
787
- user_activity: Attività utente
788
+ user_activity:
789
+ date: Data
790
+ new_users: Nuovi utenti
791
+ subtitle: Nuove iscrizioni utente
792
+ title: Attività dell'utente
788
793
  user_notifications: Notifiche utente
789
794
  view_files: Vedi files
790
795
  document_language: it
@@ -753,20 +753,21 @@ pt-BR:
753
753
  proxy_delete: Eliminar Suplente
754
754
  proxy_help: Selecione um usuário que possa depositar obras em seu nome. Tanto você quanto o seu suplente poderão modificar estas obras. Você pode revogar a função de suplente clicando no botão Eliminar Suplente. Para revogar a abilidade de editar uma obra que o suplente submeteu, remova seu acesso na guia de Compartilhamento relativa à obra.
755
755
  proxy_user: Usuário Suplente
756
+ repository_growth:
757
+ collections: Coleções
758
+ date: Encontro
759
+ objects: Objetos
760
+ subtitle: Últimos 90 dias
761
+ title: Crescimento do Repositório
762
+ repository_objects:
763
+ status: Status atual
764
+ subtitle: Status atual
765
+ title: Objetos de Repositório
756
766
  show_admin:
757
767
  new_visitors: Novos visitantes
758
768
  registered_users: Usuários cadastrados
759
- repository_growth:
760
- subtitle: Últimos 90 dias
761
- title: Crescimento do depósito
762
- repository_objects:
763
- subtitle: Status atual
764
- title: Objetos de repositório
765
769
  returning_visitors: Visitantes recorrentes
766
770
  total_visitors: Total de visitantes
767
- user_activity:
768
- subtitle: Novas inscrições de usuários
769
- title: Atividade do usuário
770
771
  stats:
771
772
  collections: Coleções criadas
772
773
  file_downloads: Download
@@ -779,7 +780,11 @@ pt-BR:
779
780
  transfer_works_link: Selecione as obras a transferir
780
781
  transfers_received: Transferências Recebidas
781
782
  transfers_sent: Transferências enviadas
782
- user_activity: Atividade do usuário
783
+ user_activity:
784
+ date: Encontro
785
+ new_users: Novos usuários
786
+ subtitle: Novas inscrições de usuários
787
+ title: Atividade do usuário
783
788
  user_notifications: Notificações do usuário
784
789
  view_files: Ver arquivos
785
790
  document_language: pt-BR
@@ -756,20 +756,21 @@ zh:
756
756
  proxy_delete: 删除代理
757
757
  proxy_help: 选择一个可以代表您存放作品的用户。您将成为该用户为您存储的作品的所有者。您可以通过单击删除代理按钮来撤销代理。
758
758
  proxy_user: 代理用户
759
+ repository_growth:
760
+ collections: 集合
761
+ date: 日期
762
+ objects: 对象
763
+ subtitle: 过去90天
764
+ title: 存储库增长
765
+ repository_objects:
766
+ status: 当前状态
767
+ subtitle: 当前状态
768
+ title: 存储库对象
759
769
  show_admin:
760
770
  new_visitors: 新访问者
761
771
  registered_users: 注册用户
762
- repository_growth:
763
- subtitle: 过去90天
764
- title: 储存库增长
765
- repository_objects:
766
- subtitle: 现状
767
- title: 储存库物件
768
772
  returning_visitors: 老访问者
769
773
  total_visitors: 所有访问者
770
- user_activity:
771
- subtitle: 新用户注册
772
- title: 用户活动
773
774
  stats:
774
775
  collections: 已建立的收藏集
775
776
  file_downloads: 下载
@@ -782,7 +783,11 @@ zh:
782
783
  transfer_works_link: 选择作品转让
783
784
  transfers_received: 收到转让
784
785
  transfers_sent: 转让已发出
785
- user_activity: 用户活动
786
+ user_activity:
787
+ date: 日期
788
+ new_users: 新用户
789
+ subtitle: 新用户注册
790
+ title: 用户活动
786
791
  user_notifications: 用户通知
787
792
  view_files: 阅览文件
788
793
  document_language: zh