hyrax 3.2.0 → 3.4.1

data/app/views/hyrax/dashboard/collections/_form_share_table.html.erb

@@ -1,7 +1,7 @@
                   <h3><%= t(".#{access}.title") %></h3>
                   <p><%= t(".#{access}.help") %></p>
-                  <p><%= t(".#{access}.help_with_works", type_title: @collection.collection_type.title) if @collection.share_applies_to_new_works? && access != 'depositors' %></p>
-                  <% if @form.permission_template.access_grants.select(&filter).any? %>
+                  <p><%= t(".#{access}.help_with_works", type_title: @collection_type.title) if @collection_type.share_applies_to_new_works? && access != 'depositors' %></p>
+                  <% if collection_permission_template_form_for(form: @form).access_grants.select(&filter).any? %>
                     <table class="table table-striped share-status">
                       <thead>
                         <tr>
@@ -11,7 +11,7 @@
                         </tr>
                       </thead>
                       <tbody>
-                      <% @form.permission_template.access_grants.select(&filter).each do |g| %>
+                      <% collection_permission_template_form_for(form: @form).access_grants.select(&filter).each do |g| %>
                         <tr>
                           <td data-agent="<%= g.agent_id %>"><%= g.label %></td>
                           <td><%= g.agent_type.titleize %></td>

data/app/views/hyrax/dashboard/collections/_list_collections.html.erb

@@ -61,9 +61,9 @@
   <td class="collection_type">
     <%= collection_presenter.collection_type_badge %>
   </td>
-  <td><%= collection_presenter.permission_badge %>  </td>
+  <td class="date"><%= collection_presenter.modified_date %></td>
   <td><%= collection_presenter.total_viewable_items %></td>
-  <td class="date"><%= collection_presenter.modified_date.try(:to_formatted_s, :standard) %> </td>
+  <td><%= collection_presenter.permission_badge %>  </td>
   <td>
     <% if collection_presenter.solr_document.admin_set? %>
       <%= render '/hyrax/my/admin_set_action_menu', admin_set_presenter: collection_presenter %>

data/app/views/hyrax/dashboard/show_admin.html.erb

@@ -2,71 +2,50 @@
   <h1><%= t("hyrax.dashboard.title") %></h1>
 <% end %>
 
+<% if Hyrax.config.analytics? %>
 <div class="row">
-  <div class="col-md-3">
+  <div class="col-md-12">
     <div class="panel panel-default">
       <div class="panel-heading">
-        <h2 class="panel-title text-center"><%= t('.registered_users') %></h2>
+        <h2 class="panel-title"><%= t(".graph_reports") %>:</h2>
+        <%= params[:start_date].present? ? params[:start_date].to_date : 1.month.ago.beginning_of_day.to_date %> -
+        <%= params[:end_date].present? ? params[:end_date].to_date : Time.zone.now.end_of_day.to_date %>
       </div>
-      <div class="panel-body text-center">
-        <%= t('.current_registered_users') %>
-        <div class="h3"><%= @presenter.user_count %></div>
+      <div class="panel-body">
+        <%= render "hyrax/admin/analytics/date_range_form", redirect_path: hyrax.dashboard_path %>
       </div>
     </div>
   </div>
-
-  <div class="col-md-3">
-    <div class="panel panel-default">
-      <div class="panel-heading">
-        <h2 class="panel-title text-center"><%= t('.total_visitors') %></h2>
-      </div>
-      <div class="panel-body text-center"><%= t('.past_30_days') %>
-        <div class="h3">n/a</div>
-      </div>
-    </div>
-  </div>
-
-    <div class="col-md-3">
-      <div class="panel panel-default">
-        <div class="panel-heading">
-          <h2 class="panel-title text-center"><%= t('.returning_visitors') %></h2>
-        </div>
-        <div class="panel-body text-center"><%= t('.past_30_days') %>
-          <div class="h3">n/a</div>
-        </div>
-      </div>
-    </div>
-
-    <div class="col-md-3">
-      <div class="panel panel-default">
-        <div class="panel-heading">
-          <h2 class="panel-title text-center"><%= t('.new_visitors') %></h2>
-        </div>
-        <div class="panel-body text-center"><%= t('.past_30_days') %>
-          <div class="h3">n/a</div>
-        </div>
-      </div>
-    </div>
 </div>
 
-<%= render 'admin_sets' %>
-
 <div class="row">
-  <div class="col-md-4">
+  <div class="col-md-12">
     <div class="panel panel-default">
       <%= render 'user_activity' %>
     </div>
   </div>
+</div>
+<% end %>
 
-  <div class="col-md-4">
+<div class="row">
+  <div class="col-md-12">
     <div class="panel panel-default">
       <%= render 'repository_growth' %>
     </div>
   </div>
+</div>
 
+<div class="row">
   <div class="col-md-4">
-    <div class="panel panel-default">
-      <%= render 'repository_objects' %>
-    </div>
+    <%= render 'visibility_graph' %>
+  </div>
+  <div class="col-md-4">
+    <%= render 'work_type_graph' %>
+  </div>
+  <div class="col-md-4">
+    <%= render "resource_type_graph" %>
   </div>
 </div>
+<br>
+<br>
+<%= render 'tabs' %>

data/app/views/hyrax/dashboard/sidebar/_activity.html.erb

@@ -32,4 +32,26 @@
     <% end %>
   <% end %>
 
+  <% if current_ability.can_create_any_work? %>
+    <li>
+      <%= menu.collapsable_section t('hyrax.admin.sidebar.analytics'),
+                                        icon_class: "fa fa-pie-chart",
+                                        id: 'collapseAnalytics',
+                                        open: menu.analytics_reporting_section? do %>
+        <% if can? :read, :admin_dashboard %>
+          <%= menu.nav_link(hyrax.admin_analytics_collection_reports_path,
+                            onclick: "dontChangeAccordion(event);") do %>
+            <span class="fa fa-folder-open" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.collections_report') %></span>
+          <% end %>
+        <% end %>
+
+        <%= menu.nav_link(hyrax.admin_analytics_work_reports_path,
+                          onclick: "dontChangeAccordion(event);") do %>
+          <span class="fa fa-file" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.works_report') %></span>
+        <% end %>
+
+      <% end %>
+    </li>
+  <% end %>
+
   <%= render 'hyrax/dashboard/sidebar/menu_partials', menu: menu, section: :activity %>

data/app/views/hyrax/dashboard/works/_default_group.html.erb

@@ -5,7 +5,7 @@
     <tr>
       <th class="check-all"><label for="check_all" class="sr-only"><%= t("hyrax.dashboard.my.sr.check_all_label") %></label><%= render_check_all %></th>
       <th><%= t("hyrax.dashboard.my.heading.title") %></th>
-      <th class="date text-center"><%= t("hyrax.dashboard.my.heading.date_uploaded") %></th>
+      <th class="date text-center"><%= t("hyrax.dashboard.my.heading.date_modified") %></th>
       <th class="text-center"><%= t("blacklight.search.fields.facet.suppressed_bsi") %></th>
       <th class="text-center"><%= t("hyrax.dashboard.my.heading.work.visibility") %></th>
       <th class="text-center"><%= t("hyrax.dashboard.my.heading.action") %></th>

data/app/views/hyrax/dashboard/works/_list_works.html.erb

@@ -27,7 +27,7 @@
     </div>
   </td>
 
-  <td class='text-center'><%= document.date_uploaded %></td>
+  <td class="date text-center"><%= document.date_modified %></td>
   <td class='workflow-state text-center'><%= presenter.workflow.state_label %></td>
   <td class='text-center'><%= render_visibility_link document %></td>
 

data/app/views/hyrax/file_sets/_actions.html.erb

@@ -1,4 +1,4 @@
-<% if (can?(:download, file_set.id) || can?(:destroy, file_set.id) || can?(:edit, file_set.id)) && !workflow_restriction?(file_set.parent) %>
+<% if (can?(:download, file_set.id) || can?(:destroy, file_set.id) || can?(:edit, file_set.id)) && !workflow_restriction?(@parent) %>
   <% if can?(:download, file_set.id) && !(can?(:edit, file_set.id) || can?(:destroy, file_set.id)) %>
   <%= link_to t('.download'),
               hyrax.download_path(file_set),
@@ -6,7 +6,7 @@
               title: t('.download_title', file_set: file_set),
               target: "_blank",
               id: "file_download",
-              data: { label: file_set.id } %>
+              data: { label: file_set.id, work_id: @presenter.id, collection_ids: @presenter.member_of_collection_ids } %>
   <% else %>
   <div class="btn-group">
     <button class="btn btn-default dropdown-toggle" data-toggle="dropdown" type="button" id="dropdownMenu_<%= file_set.id %>" aria-haspopup="true" aria-expanded="false">
@@ -43,7 +43,8 @@
                     title: t('.download_title', file_set: file_set),
                     target: "_blank",
                     id: "file_download",
-                    data: { label: file_set.id } %>
+                    class: "download",
+                    data: { label: file_set.id, work_id: @presenter.id, collection_ids: @presenter.member_of_collection_ids } %>
       </li>
     <% end %>
 

data/app/views/hyrax/file_sets/show.html.erb

@@ -17,3 +17,9 @@
     </div><!-- /columns second -->
   </div> <!-- /.row -->
 </div><!-- /.container-fluid -->
+
+<% @presenter.member_of_collection_ids.each do |collection_id| %>
+  <span class='hide analytics-event' data-category="file-set-in-collection" data-action="file-set-in-collection-view" data-name="<%= collection_id %>" >
+<% end %>
+<span class='hide analytics-event' data-category="file-set-in-work" data-action="file-set-in-work-view" data-name="<%= @presenter.parent.id %>" >
+<span class='hide analytics-event' data-category="file-set" data-action="file-set-view" data-name="<%= @presenter.id %>" >

data/app/views/hyrax/my/_facet_pagination.html.erb

@@ -1,13 +1,16 @@
-    <div class="prev_next_links btn-group pull-left">
-      <%= link_to_previous_page @pagination, raw(t('views.pagination.previous')), route_set: hyrax, params: search_state.to_h, param_name: Blacklight::Solr::FacetPaginator.request_keys[:page], class: 'btn btn-link', data: {ajax_modal: "preserve"} do %>
-       <span class="disabled btn btn-disabled"><%= raw(t('views.pagination.previous')) %></span>
-     <% end %>
-      <%= link_to_next_page @pagination, raw(t('views.pagination.next')), route_set: hyrax, params: search_state.to_h, param_name: Blacklight::Solr::FacetPaginator.request_keys[:page], class: 'btn btn-link',  data: {ajax_modal: "preserve"} do %>
+  <div class="prev_next_links btn-group pull-left">
+    <% if @pagination.first_page? %>
+      <span class="disabled btn btn-disabled"><%= raw(t('views.pagination.previous')) %></span>
+    <% else %>
+      <%= link_to_previous_page @pagination, raw(t('views.pagination.previous')), route_set: hyrax, params: search_state.to_h, param_name: Blacklight::Solr::FacetPaginator.request_keys[:page], class: 'btn btn-link', data: {ajax_modal: "preserve"} %>
+    <% end %>
 
-       <span class="disabled btn  btn-disabled"><%= raw(t('views.pagination.next')) %></span>
-      <% end %>
-
-    </div>
+    <% if @pagination.last_page? %>
+      <span class="disabled btn  btn-disabled"><%= raw(t('views.pagination.next')) %></span>
+    <% else %>
+      <%= link_to_next_page @pagination, raw(t('views.pagination.next')), route_set: hyrax, params: search_state.to_h, param_name: Blacklight::Solr::FacetPaginator.request_keys[:page], class: 'btn btn-link',  data: {ajax_modal: "preserve"} %>
+    <% end %>
+  </div>
 
   <div class="sort_options btn-group pull-right">
     <% if @pagination.sort == 'index' -%>

data/app/views/hyrax/my/_work_action_menu.html.erb

@@ -12,34 +12,33 @@
 
     <% if can? :edit, document.id %>
       <li role="menuitem" tabindex="-1">
-        <%= link_to [main_app, :edit, document] do %>
-          <i class="glyphicon glyphicon-pencil" aria-hidden="true"></i>
-          <span> <%= t("hyrax.dashboard.my.action.edit_work") %> </span>
+        <%= link_to [main_app, :edit, document],
+                    id: 'action-edit-work' do %>
+          <%= t("hyrax.dashboard.my.action.edit_work") %>
         <% end %>
       </li>
 
       <li role="menuitem" tabindex="-1">
         <%= link_to [main_app, document],
                     method: :delete,
+                    id: 'action-delete-work',
                     data: {
                       confirm: t("hyrax.dashboard.my.action.work_confirmation", application_name: application_name) } do %>
-          <i class="glyphicon glyphicon-trash" aria-hidden="true"></i>
-          <span> <%= t("hyrax.dashboard.my.action.delete_work") %> </span>
+          <%= t("hyrax.dashboard.my.action.delete_work") %>
         <% end %>
       </li>
     <% end %>
 
     <li role="menuitem" tabindex="-1">
       <%= display_trophy_link(current_user, document.id) do |text| %>
-        <i class="glyphicon glyphicon-star" aria-hidden="true"></i> <%= text %>
+        <%= text %>
       <% end %>
     </li>
 
     <% if can? :transfer, document.id %>
       <li role="menuitem" tabindex="-1">
-        <%= link_to(hyrax.new_work_transfer_path(document.id), class: 'itemicon itemtransfer', title: t("hyrax.dashboard.my.action.transfer")) do %>
-          <i class="glyphicon glyphicon-transfer" aria-hidden="true"></i>
-          <span> <%= t("hyrax.dashboard.my.action.transfer") %> </span>
+        <%= link_to(hyrax.new_work_transfer_path(document.id), id: 'action-transfer-work', class: 'itemicon itemtransfer', title: t("hyrax.dashboard.my.action.transfer")) do %>
+          <%= t("hyrax.dashboard.my.action.transfer") %>
         <% end %>
       </li>
     <% end %>

data/app/views/hyrax/my/collections/_default_group.html.erb

@@ -5,9 +5,9 @@
     <th class="check-all"><label for="check_all" class="sr-only"><%= t("hyrax.dashboard.my.sr.check_all_label") %></label><%= render_check_all %></th>
     <th><%= t("hyrax.dashboard.my.heading.title") %></th>
     <th><%= t("hyrax.dashboard.my.heading.type") %></th>
-    <th><%= t("hyrax.dashboard.my.heading.collection.visibility") %></th>
-    <th><%= t("hyrax.dashboard.my.heading.items") %></th>
     <th><%= t("hyrax.dashboard.my.heading.last_modified") %></th>
+    <th><%= t("hyrax.dashboard.my.heading.items") %></th>
+    <th><%= t("hyrax.dashboard.my.heading.collection.visibility") %></th>
     <th><%= t("hyrax.dashboard.my.heading.action") %></th>
   </tr>
   </thead>

data/app/views/hyrax/my/collections/_list_collections.html.erb

@@ -60,9 +60,9 @@
   <td class="collection_type">
     <%= collection_presenter.collection_type_badge %>
   </td>
-  <td><%= collection_presenter.permission_badge %></td>
+  <td class="date"><%= collection_presenter.modified_date %> </td>
   <td><%= collection_presenter.total_viewable_items %></td>
-  <td class="date"><%= collection_presenter.modified_date.try(:to_formatted_s, :standard) %> </td>
+  <td><%= collection_presenter.permission_badge %></td>
   <td>
     <% if collection_presenter.solr_document.admin_set? %>
       <%= render '/hyrax/my/admin_set_action_menu', admin_set_presenter: collection_presenter %>

data/app/views/hyrax/my/collections/index.html.erb

@@ -21,10 +21,11 @@
     <!-- Page tabs -->
     <nav><%= render 'tabs' if @managed_collection_count > 0 %></nav>
 
-    <% if can?(:create_any, Collection) && @collection_type_list_presenter.any? %>
+    <% if can?(:create_any, Hyrax.config.collection_class) && @collection_type_list_presenter.any? %>
       <% if @collection_type_list_presenter.many? %>
         <% # modal to select type %>
         <button type="button"
+          id="add-new-collection-button"
           class="btn btn-primary"
           data-toggle="modal"
           data-target="#collectiontypes-to-create"
@@ -33,7 +34,7 @@
         </button>
       <% else @collection_type_list_presenter.any? %>
         <% # link directly to create collection form with type %>
-        <%= link_to(t('helpers.action.collection.new'), append_collection_type_url(new_dashboard_collection_path, @collection_type_list_presenter.first_collection_type.id), class: 'btn btn-primary') %>
+        <%= link_to(t('helpers.action.collection.new'), append_collection_type_url(new_dashboard_collection_path, @collection_type_list_presenter.first_collection_type.id), id: 'add-new-collection-button', class: 'btn btn-primary') %>
       <% end %>
     <% end %>
   </section>
@@ -46,7 +47,7 @@
       <% elsif current_page?(hyrax.dashboard_collections_path(locale: nil)) && !current_ability.admin? %>
         <span class="count-display"><%= I18n.t('hyrax.my.count.collections.you_manage', total_count: @response.total_count).html_safe %></span>
       <% else %>
-        <span class="count-display"><%= I18n.t('hyrax.my.count.collections.in_repo', total_count: @response.total_count).html_safe %></span>     
+        <span class="count-display"><%= I18n.t('hyrax.my.count.collections.in_repo', total_count: @response.total_count).html_safe %></span>
       <% end %>
     </div>
     <div class="panel-body">

data/app/views/hyrax/my/works/_default_group.html.erb

@@ -5,7 +5,7 @@
   <tr>
     <th class="check-all"><label for="check_all" class="sr-only"><%= t("hyrax.dashboard.my.sr.check_all_label") %></label><%= render_check_all %></th>
     <th><%= t("hyrax.dashboard.my.heading.title") %></th>
-    <th class='text-center'><%= t("hyrax.dashboard.my.heading.date_uploaded") %></th>
+    <th class='text-center'><%= t("hyrax.dashboard.my.heading.last_modified") %></th>
     <th class='text-center'><%= t("hyrax.dashboard.my.heading.highlighted") %></th>
     <th class='text-center'><%= t("hyrax.dashboard.my.heading.work.visibility") %></th>
     <th class='text-center'><%= t("hyrax.dashboard.my.heading.action") %></th>

data/app/views/hyrax/my/works/_list_works.html.erb

@@ -28,8 +28,7 @@
       </div>
     </div>
   </td>
-
-  <td class="date text-center"><%= document.date_uploaded %></td>
+  <td class="date text-center"><%= document.date_modified %></td>
   <td class='text-center'>
     <span class="fa <%= current_user.trophies.where(work_id: document.id).exists? ? 'fa-star highlighted-work' : 'fa-star-o trophy-off' %>" aria-hidden="true"></span></td>
   <td class='text-center'><%= render_visibility_link document %></td>

data/app/views/hyrax/my/works/index.html.erb

@@ -30,6 +30,7 @@
               t(:'helpers.action.work.new'),
               '#',
               data: { behavior: "select-work", target: "#worktypes-to-create", 'create-type' => 'single' },
+              id: 'add-new-work-button',
               class: 'btn btn-primary'
             ) %>
       <% else # simple link to the first work type %>
@@ -43,6 +44,7 @@
         <%= link_to(
               t(:'helpers.action.work.new'),
               new_polymorphic_path([main_app, @create_work_presenter.first_model]),
+              id: 'add-new-work-button',
               class: 'btn btn-primary'
             ) %>
       <% end %>
@@ -60,9 +62,9 @@
         <% elsif current_page?(hyrax.dashboard_works_path(locale: nil)) && !current_ability.admin? %>
           <span class="count-display"><%= I18n.t('hyrax.my.count.works.you_manage', total_count: @response.total_count).html_safe %></span>
         <% else %>
-          <span class="count-display"><%= I18n.t('hyrax.my.count.works.in_repo', total_count: @response.total_count).html_safe %></span>     
+          <span class="count-display"><%= I18n.t('hyrax.my.count.works.in_repo', total_count: @response.total_count).html_safe %></span>
         <% end %>
-      </div> 
+      </div>
       <div class="panel-body">
         <%= render 'search_header' %>
         <h2 class="sr-only"><%= t('hyrax.my.count.works.works_listing') %></h2>

data/app/views/hyrax/stats/_downloads.html.erb

@@ -0,0 +1,18 @@
+<script>
+  Morris.Bar({
+      element: 'downloads',
+      data: [
+        <% @downloads.list.take(30).reverse.each do |result| %>
+          { date: "<%= result[0] %>", metric: <%= result[1] %>},
+        <% end %>
+      ],  
+      xkey: 'date',
+      ykeys: ['metric'],
+      labels: ["<%= t('.downloads') %>"],
+      gridTextSize: '12px',
+      gridLineColor: '#E5E5E5',
+      gridIntegers: true,
+      ymin: 0,
+      resize: true
+    });
+</script>

data/app/views/hyrax/stats/_pageviews.html.erb

@@ -0,0 +1,18 @@
+<script>
+  Morris.Bar({
+      element: 'pageviews',
+      data: [
+        <% @pageviews.list.take(30).reverse.each do |result| %>
+          { date: "<%= result[0] %>", metric: <%= result[1] %>},
+        <% end %>
+      ],  
+      xkey: 'date',
+      ykeys: ['metric'],
+      labels: ["<%= t('.pageviews') %>"],
+      gridTextSize: '12px',
+      gridLineColor: '#E5E5E5',
+      gridIntegers: true,
+      ymin: 0,
+      resize: true
+    });
+</script>

data/app/views/hyrax/stats/work.html.erb

@@ -1,26 +1,34 @@
 <!-- Adapted from jquery-flot examples https://github.com/flot/flot/blob/master/examples/visitors/index.html -->
 <script>
 //<![CDATA[
-
-  var hyrax_item_stats = <%= raw json_escape @stats.to_flot.to_json %>;
-
+  var hyrax_item_stats = <%= raw json_escape @pageviews.to_flot.to_json %>;
 //]]>
 </script>
 
-<%= content_tag :h1, @stats, class: "lower" %>
+<%= content_tag :h1, @document, class: "lower" %>
 
 <div class="row">
   <div class="col-sm-12">
-    <%= content_tag :h2, "Work Analytics" %>
+    <%= content_tag :h2, "#{t('.header')}" %>
     <div class="alert alert-info">
       <span class="glyphicon glyphicon-signal large-icon"></span>
-      <%= content_tag :strong, @stats.total_pageviews %> views since <%= @stats.created.strftime("%B %-d, %Y") %>
+        <%= t('total_view', count: @pageviews.range(Hyrax.config.analytics_start_date.to_date, Time.zone.today)) %>
+        <%= t('download', count: @downloads.range(Hyrax.config.analytics_start_date.to_date, Time.zone.today)) %>
     </div>
+
     <div class="stats-container">
-      <div id="usage-stats" class="stats-placeholder"></div>
+      <h3 class="text-center"><%= t('.pageviews') %></h3>
+      <div id="pageviews">
+        <%= render 'pageviews' %>
+      </div>
     </div>
-    <div class="stats-container" style="height:150px;">
-      <div id="overview" class="stats-placeholder"></div>
+
+    <div class="stats-container">
+      <h3 class="text-center"><%= t('.downloads') %></h3>
+      <div id="downloads">
+        <%= render 'downloads' %>
+      </div>
     </div>
+
   </div>
 </div>

data/app/views/layouts/_head_tag_content.html.erb

@@ -25,8 +25,13 @@ signed in %>
 
 <%= render 'shared/appearance_styles' %>
 
-<!-- Google Analytics -->
-<%= render partial: '/ga', formats: [:html] %>
+<% if Hyrax.config.analytics? %>
+  <% if Hyrax.config.analytics_provider == 'google' %>
+    <%= render partial: 'shared/ga', formats: [:html]  %>
+  <% elsif Hyrax.config.analytics_provider == 'matomo' %>
+    <%= render partial: 'shared/matomo', formats: [:html] %>
+  <% end %>
+<% end %>
 
 <!-- for extras, e.g., a favicon -->
 <%= render partial: '/head_tag_extras', formats: [:html] %>

data/app/views/{_ga.html.erb → shared/_ga.html.erb}

@@ -1,20 +1,16 @@
-<%
-if Hyrax.config.google_analytics_id?
-tracking_id = Hyrax.config.google_analytics_id
-%>
 <script type="text/javascript">
   var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', '<%= tracking_id %>']);
+  _gaq.push(['_setAccount', '<%= Hyrax::Analytics.config.analytics_id %>']);
   <% if Rails.env.development? %>
     // This allows us to look at GA data live from locahost
     _gaq.push(['_setDomainName', 'none']);
   <% end %>
-  _gaq.push(['_trackPageview']);
 
   (function() {
     var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
     ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
     var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
   })();
+  window.analytics = _gaq;
 </script>
-<% end %>
+<meta name="analytics-provider" content="google">

data/app/views/shared/_matomo.html.erb

@@ -0,0 +1,15 @@
+<script type="text/javascript">
+  var _paq = window._paq || [];
+  /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
+  // _paq.push(['trackPageView']);
+  _paq.push(['enableLinkTracking']);
+  (function() {
+    var u="<%= Hyrax::Analytics.config.base_url %>";
+    _paq.push(['setTrackerUrl', u+'matomo.php']);
+    _paq.push(['setSiteId', "<%= Hyrax::Analytics.config.site_id %>"]);
+    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
+    g.type='text/javascript'; g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+  })();
+  window.analytics = _paq;
+</script>
+<meta name="analytics-provider" content="matomo">

data/chart/hyrax/Chart.yaml

@@ -2,8 +2,8 @@ apiVersion: v2
 name: hyrax
 description: An open-source, Samvera-powered digital repository system
 type: application
-version: 1.0.0
-appVersion: 3.1.0
+version: 1.1.0
+appVersion: 3.3.0
 dependencies:
   - name: fcrepo
     version: 0.8.0

data/chart/hyrax/README.md

@@ -116,7 +116,7 @@ Then update the helm charts with the following:
 HELM_EXPERIMENTAL_OCI=1 helm dependency update chart/hyrax
 ```
 
-Without the `HELM_EXPERIMENTAL_OCI=1` switch you might see the following error:
+If your `helm` version is before 3.8, without the `HELM_EXPERIMENTAL_OCI=1` switch you might see the following error:
 
 ```sh
 repository oci://ghcr.io/samvera is an OCI registry: this feature has been marked as experimental and is not enabled by default. Please set HELM_EXPERIMENTAL_OCI=1 in your environment to use this feature”
@@ -142,6 +142,27 @@ Some shell commands of house cleaning and destruction:
 *  Remove hanging docker instances: `docker rm $(docker ps -a -q) -f`
 *  Removing dangling docker images: `docker rmi $(docker images -f "dangling=true" -q)`
 
+## Building and Pushing the Chart Package
+
+We currently build and push new chart versions manually. This needs to happen
+any time the chart version in [`Chart.yaml`](./Chart.yaml) is incremented.
+
+To publish the Hyrax chart, you'll need to be in one of the GitHub groups with
+push permissions. These groups are:
+
+  - `@samvera/admins`
+  - `@samvera/hyrax` (and all its subgroups)
+
+To build the package, it's helpful to have a clean checkout of the current
+`main` branch, then:
+
+```sh
+HELM_EXPERIMENTAL_OCI=1 helm dependency update chart/hyrax
+HELM_EXPERIMENTAL_OCI=1 helm package chart/hyrax
+HELM_EXPERIMENTAL_OCI=1 helm push hyrax-[VERSION].tgz oci://ghcr.io/samvera/charts
+```
+
+
 [containers]: ../../CONTAINERS.md#hyrax-image
 [dassie]: ../../.dassie/README.md
 [dassie-image]: https://hub.docker.com/r/samveralabs/dassie

data/chart/hyrax/values.yaml

@@ -246,7 +246,7 @@ solr:
   enabled: true
   image:
     repository: bitnami/solr
-    tag: 8.8.1
+    tag: 8.11.1
   authentication:
     enabled: true
     adminUsername: admin

data/config/i18n-tasks.yml

@@ -85,9 +85,9 @@ search:
   ## See this example of a custom scanner: https://github.com/glebm/i18n-tasks/wiki/A-custom-scanner-example
 
 ## Google Translate
-# translation:
+#  translation:
 #   # Get an API key and set billing info at https://code.google.com/apis/console to use Google Translate
-#   api_key: "AbC-dEf5"
+ #   api_key: "AbC-dEf5"
 
 ## Do not consider these keys missing:
 # ignore_missing:

data/config/initializers/listeners.rb

@@ -1,15 +1,14 @@
 # frozen_string_literal: true
 
 Hyrax.publisher.subscribe(Hyrax::Listeners::AclIndexListener.new)
-Hyrax.publisher.subscribe(Hyrax::Listeners::ActiveFedoraAclIndexListener.new) unless
-  Hyrax.config.disable_wings
-Hyrax.publisher.subscribe(Hyrax::Listeners::MemberCleanupListener.new)
-Hyrax.publisher.subscribe(Hyrax::Listeners::MetadataIndexListener.new)
+Hyrax.publisher.subscribe(Hyrax::Listeners::ActiveFedoraAclIndexListener.new) unless Hyrax.config.disable_wings
 Hyrax.publisher.subscribe(Hyrax::Listeners::BatchNotificationListener.new)
-Hyrax.publisher.subscribe(Hyrax::Listeners::ObjectLifecycleListener.new)
+Hyrax.publisher.subscribe(Hyrax::Listeners::FileMetadataListener.new)
 Hyrax.publisher.subscribe(Hyrax::Listeners::FileSetLifecycleListener.new)
 Hyrax.publisher.subscribe(Hyrax::Listeners::FileSetLifecycleNotificationListener.new)
-Hyrax.publisher.subscribe(Hyrax::Listeners::ProxyDepositListener.new)
+Hyrax.publisher.subscribe(Hyrax::Listeners::MemberCleanupListener.new)
+Hyrax.publisher.subscribe(Hyrax::Listeners::MetadataIndexListener.new)
+Hyrax.publisher.subscribe(Hyrax::Listeners::ObjectLifecycleListener.new)
 Hyrax.publisher.subscribe(Hyrax::Listeners::TrophyCleanupListener.new)
 Hyrax.publisher.subscribe(Hyrax::Listeners::WorkflowListener.new)