hyrax 3.3.0 → 4.0.0.beta1

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

@@ -2,18 +2,20 @@
 <tr id="document_<%= id %>">
   <td>&nbsp;
     <% if current_user and document.depositor != current_user.user_key %>
-      <i class="glyphicon glyphicon-share-alt" />
+      <i class="fa fa-share" />
     <% end %>
   </td>
   <td>
     <div class="media">
       <%= link_to [main_app, document], "class" => "media-left", "aria-hidden" => "true" do %>
-        <%= render_thumbnail_tag document, { class: "hidden-xs file_listing_thumbnail", alt: document.title_or_label }, { suppress_link: true } %>
+        <%= document_presenter(document)&.thumbnail&.thumbnail_tag(
+          { class: "d-none d-md-block file_listing_thumbnail", alt: document.title_or_label }, { suppress_link: true }
+        ) %>
       <% end %>
       <div class="media-body">
         <p class="media-heading">
           <strong><%= link_to document.title_or_label, [main_app, document], id: "src_copy_link#{id}", class: "#{'document-title' if document.title_or_label == document.label}" %></strong>
-          <a href="#" class="small" title="Click for more details"><i id="expand_<%= id %>" class="glyphicon glyphicon-chevron-right"></i></a>
+          <a href="#" class="small" title="Click for more details"><i id="expand_<%= id %>" class="fa fa-chevron-right"></i></a>
         </p>
         <%= render_other_collection_links(document, @presenter.id) %>
       </div>
@@ -26,19 +28,19 @@
   </td>
   <% if current_user and can? :edit, @collection %>
     <td class="text-center">
-      <%= button_for_remove_from_collection @collection, document, label: "Remove", btn_class: "btn-danger btn-xs" %>
+      <%= button_for_remove_from_collection @collection, document, label: "Remove", btn_class: "btn-danger btn-sm" %>
     </td>
   <% end %>
 </tr>
 <tr id="detail_<%= id %>"> <!--  document detail"> -->
   <td colspan="6">
     <dl class="expanded-details row">
-      <dt class="col-xs-3 col-lg-2"><%= t('.creator') %></dt>
-      <dd class="col-xs-9 col-lg-4"><%= document.creator.to_a.to_sentence %></dd>
-      <dt class="col-xs-3 col-lg-2"><%=  t('.depositor') %></dt>
-      <dd class="col-xs-9 col-lg-4"><%= link_to_profile document.depositor %></dd>
-      <dt class="col-xs-3 col-lg-2"><%= t('.edit_access') %></dt>
-      <dd class="col-xs-9 col-lg-10">
+      <dt class="col-3 col-lg-2"><%= t('.creator') %></dt>
+      <dd class="col-9 col-lg-4"><%= document.creator.to_a.to_sentence %></dd>
+      <dt class="col-3 col-lg-2"><%=  t('.depositor') %></dt>
+      <dd class="col-9 col-lg-4"><%= link_to_profile document.depositor %></dd>
+      <dt class="col-3 col-lg-2"><%= t('.edit_access') %></dt>
+      <dd class="col-9 col-lg-10">
         <% if document.edit_groups.present? %>
           Groups: <%= document.edit_groups.join(', ') %>
           <br />

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

@@ -8,10 +8,10 @@
     </div>
     <% if can? :edit, id %>
       <% if can? :edit, document.id %>
-        <button class="btn btn-xs btn-danger remove-from-collection-button"><%= t('hyrax.collections.show.buttons.remove_from_collection') %></button>
+        <button class="btn btn-sm btn-danger remove-from-collection-button"><%= t('hyrax.collections.show.buttons.remove_from_collection') %></button>
       <% else %>
         <%= link_to "#",
-                    class: 'btn btn-xs btn-danger remove-parent-from-collection-deny-button',
+                    class: 'btn btn-sm btn-danger remove-parent-from-collection-deny-button',
                     title: t('hyrax.collections.show.buttons.remove_from_collection') do %>
             <%= t('hyrax.collections.show.buttons.remove_from_collection') %>
         <% end %>

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

@@ -10,8 +10,8 @@
 
   <% if show_sort_and_per_page? && collection_member_sort_fields.many? %>
     <div class="sort-toggle">
-      <%= form_tag dashboard_collection_path(collection), method: :get, class: 'per_page form-horizontal' do %>
-         <div class="form-group form-group-lg">
+      <%= form_tag dashboard_collection_path(collection), method: :get, class: 'per_page' do %>
+         <div class="form-group row form-control-lg">
            <fieldset class="col-sm-9">
              <legend class="sr-only"><%= t('hyrax.sort_label') %></legend>
              <%= label_tag(:sort, t(".sort_by")) %>
@@ -19,8 +19,8 @@
              <%= label_tag(:per_page) do %>
                <%= t(".show_par_page_html", select: select_tag(:per_page, options_for_select(Hyrax.config.range_for_number_of_results_to_display_per_page, params[:per_page]), title: t('hyrax.dashboard.my.sr.results_per_page'))) %>
              <% end %>
-             <%= render_hash_as_hidden_fields(search_state.params_for_search.except(:per_page, :sort)) %>
-             <button class="btn btn-info"><span class="glyphicon glyphicon-refresh"></span> <%= t('helpers.action.refresh') %></button>
+             <%= render Blacklight::HiddenSearchStateComponent.new(params: search_state.params_for_search.except(:per_page, :sort)) %>
+             <button class="btn btn-info"><span class="fa fa-refresh"></span> <%= t('helpers.action.refresh') %></button>
            </fieldset>
            <div class="col-sm-3">
              <%= render 'hyrax/collections/view_type_group' %>

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

@@ -13,7 +13,7 @@
         <%= link_to document.title_or_label, [hyrax, :dashboard, document], id: "src_copy_link_#{document.id}" %>
       </div>
       <% if can? :edit, id %>
-      <button class="btn btn-xs btn-danger remove-subcollection-button"><%= t('hyrax.collections.show.buttons.remove_this_sub_collection') %></button>
+      <button class="btn btn-sm btn-danger remove-subcollection-button"><%= t('hyrax.collections.show.buttons.remove_this_sub_collection') %></button>
       <% end %>
     </div>
   </li>

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

@@ -3,37 +3,37 @@
   <button class="btn btn-sm dropdown-toggle" data-toggle="dropdown" type="button" id="dropdownMenu_<%= document.id %>" aria-haspopup="true">
     <span class="sr-only"><%= t('.press_to') %> </span>
     <%= t('.select_an_action') %>
-    <span class="caret" aria-hidden="true"></span>
   </button>
 
   <ul role="menu" class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenu_<%= document.id %>">
 
-    <li role="menuitem" tabindex="-1">
+    <li class="dropdown-item" role="menuitem" tabindex="-1">
       <%= button_for_remove_from_collection(@collection, document, label: t('.remove_from_collection')) %>
     </li>
 
-    <li role="menuitem" tabindex="-1">
+    <li class="dropdown-item" role="menuitem" tabindex="-1">
       <%= link_to [main_app, :edit, document] do %>
-        <i class="glyphicon glyphicon-pencil" aria-hidden="true"></i>
+        <i class="fa fa-pencil" aria-hidden="true"></i>
         <span> <%= t('.edit_work') %> </span>
       <% end %>
     </li>
 
-    <li role="menuitem" tabindex="-1">
+    <li class="dropdown-item" role="menuitem" tabindex="-1">
       <%= link_to [main_app, document], method: :delete, data: { confirm: t(".deleting_from_work", application_name: application_name) } do %>
-        <i class="glyphicon glyphicon-trash" aria-hidden="true"></i>
+        <i class="fa fa-trash" aria-hidden="true"></i>
         <span><%= t('.delete_work') %></span>
       <% end %>
     </li>
 
-    <li role="menuitem" tabindex="-1">
+    <li class="dropdown-item" role="menuitem" tabindex="-1">
       <%= display_trophy_link @user, document.id do |text| %>
-        <i class="glyphicon glyphicon-star" aria-hidden="true"></i> <%= text %>
+        <i class="fa fa-star" aria-hidden="true"></i> <%= text %>
       <% end %>
     </li>
-    <li role="menuitem" tabindex="-1">
+
+    <li class="dropdown-item" role="menuitem" tabindex="-1">
       <%= link_to(hyrax.new_work_transfer_path(document.id), class: 'itemicon itemtransfer', title: t('.transfer_ownership_of_work')) do %>
-        <i aria-hidden="true" class="glyphicon glyphicon-transfer"></i>
+        <i aria-hidden="true" class="fa fa-exchange"></i>
         <span> <%=t('.transfer_ownership_of_work') %> </span>
       <% end %>
     </li>

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

@@ -5,12 +5,12 @@
 <% end %>
 
 <div class="collections-wrapper">
-  <section class="panel panel-default collections-panel-wrapper admin-show-page">
-    <div class="panel-heading">
+  <section class="card collections-panel-wrapper admin-show-page">
+    <div class="card-header">
       <%= render 'collection_title', presenter: @presenter %>
     </div>
 
-    <div class="panel-body">
+    <div class="card-body">
       <section>
         <div itemscope itemtype="http://schema.org/CollectionPage" class="row collection">
           <div class="col-sm-3 text-center">
@@ -90,7 +90,7 @@
         <%= render 'hyrax/collections/paginate' %>
       </section>
 
-    </div><!-- /panel-body -->
+    </div><!-- /card-body -->
   </section><!-- /collections-panel-wrapper -->
 </div><!-- /collections-wrapper -->
 

data/app/views/hyrax/dashboard/profiles/_edit_primary.html.erb

@@ -1,19 +1,19 @@
 <%= form_for @user,
              url: hyrax.dashboard_profile_path(@user.to_param),
-             html: { multipart: true, class: 'form-horizontal' } do |f| %>
-  <div class="form-group">
-    <%= f.label :avatar, t(".change_picture").html_safe, class: "col-xs-4 control-label" %>
-    <div class="col-xs-8">
+             html: { multipart: true } do |f| %>
+  <div class="form-group row">
+    <%= f.label :avatar, t(".change_picture").html_safe, class: "col-4 col-form-label" %>
+    <div class="col-8">
       <%= image_tag @user.avatar.url(:thumb) if @user.avatar? %>
       <%= f.file_field :avatar %>
       <%= f.hidden_field :avatar_cache %>
-      <span class="help-block"><%= t('.help_change_picture_type') %></span>
+      <span class="form-text"><%= t('.help_change_picture_type') %></span>
 
-      <div class="checkbox">
-        <%= f.label :remove_avatar do %>
-          <%= f.check_box :remove_avatar %>
+      <div class="form-check">
+        <%= f.label :remove_avatar, class: 'form-check-label' do %>
+          <%= f.check_box :remove_avatar, class: 'form-check-input' %>
           <%= t(".delete_picture") %>
-          <a href="#" id="delete_picture_help" data-toggle="popover" data-content="<%= t('.delete_picture_data_content') %>" data-original-title="<%= t('.delete_picture_data_original_title') %>"><i class="glyphicon glyphicon-question-sign"></i></a>
+          <a href="#" id="delete_picture_help" data-toggle="popover" data-content="<%= t('.delete_picture_data_content') %>" data-original-title="<%= t('.delete_picture_data_original_title') %>"><i class="fa fa-question"></i></a>
         <% end %>
       </div>
     </div>
@@ -23,32 +23,32 @@
     <%= render partial: 'zotero', locals: { f: f, user: @user } %>
   <% end %>
 
-  <div class="form-group">
-    <%= f.label :orcid, class: 'col-xs-4 control-label' do %>
+  <div class="form-group row">
+    <%= f.label :orcid, class: 'col-4 col-form-label' do %>
       <%= orcid_label %>
     <% end %>
-    <div class="col-xs-8">
+    <div class="col-8">
        <%= f.text_field :orcid, class: "form-control" %>
     </div>
   </div><!-- .form-group -->
 
-  <div class="form-group">
-    <%= f.label :twitter_handle, t(".twitter_handle").html_safe, class: 'col-xs-4 control-label' %>
-    <div class="col-xs-8">
+  <div class="form-group row">
+    <%= f.label :twitter_handle, t(".twitter_handle").html_safe, class: 'col-4 col-form-label' %>
+    <div class="col-8">
        <%= f.text_field :twitter_handle, class: "form-control" %>
     </div>
   </div><!-- .form-group -->
 
-  <div class="form-group">
-    <%= f.label :facebook_handle, t(".facebook_handle").html_safe, class: 'col-xs-4 control-label' %>
-    <div class="col-xs-8">
+  <div class="form-group row">
+    <%= f.label :facebook_handle, t(".facebook_handle").html_safe, class: 'col-4 col-form-label' %>
+    <div class="col-8">
        <%= f.text_field :facebook_handle, class: "form-control" %>
     </div>
   </div><!-- .form-group -->
 
-  <div class="form-group">
-    <%= f.label :googleplus_handle, t(".google_handle").html_safe, class: 'col-xs-4 control-label' %>
-    <div class="col-xs-8">
+  <div class="form-group row">
+    <%= f.label :googleplus_handle, t(".google_handle").html_safe, class: 'col-4 col-form-label' %>
+    <div class="col-8">
        <%= f.text_field :googleplus_handle, class: "form-control" %>
     </div>
   </div><!-- .form-group -->

data/app/views/hyrax/dashboard/profiles/_trophy_edit.html.erb

@@ -1,13 +1,13 @@
 <% if trophies.any? %>
   <div class="form-group">
     <span>
-      <i class="glyphicon glyphicon-star trophy-on"></i> Remove Highlight Designation
-      <a href="#" id="remove_trophy_help" data-toggle="popover" data-content="If you would like to remove a highlight designation, check the box and save your profile." data-original-title="Remove Highlight Designation"><i class="glyphicon glyphicon-question-sign"></i></a>
+      <i class="fa fa-star trophy-on"></i> Remove Highlight Designation
+      <a href="#" id="remove_trophy_help" data-toggle="popover" data-content="If you would like to remove a highlight designation, check the box and save your profile." data-original-title="Remove Highlight Designation"><i class="fa fa-question"></i></a>
     </span>
     <% trophies.each do |t| %>
-      <div class="checkbox">
-        <label>
-          <%= check_box_tag "remove_trophy_#{t.id}" %>
+      <div class="form-check">
+        <label class="form-check-label">
+          <%= check_box_tag "remove_trophy_#{t.id}", class: "form-check-input" %>
           <%= link_to t, [main_app, t] %>
         </label>
       </div>

data/app/views/hyrax/dashboard/profiles/_zotero.html.erb

@@ -1,8 +1,8 @@
   <div class="form-group">
-    <%= f.label :zotero, class: 'col-xs-4 control-label' do %>
+    <%= f.label :zotero, class: 'col-4 col-form-label' do %>
       <%= zotero_label %>
     <% end %>
-    <div class="col-xs-8">
+    <div class="col-8">
     <% if user.zotero_userid.present? %>
        <%= link_to t('hyrax.user_profile.zotero.connected'), zotero_profile_url(user.zotero_userid), class: "form-control" %>
     <% else %>

data/app/views/hyrax/dashboard/profiles/edit.html.erb

@@ -1,8 +1,8 @@
 <% provide :page_header do %>
   <h1><span class="fa fa-id-card" aria-hidden="true"></span> Edit Profile</h1>
 <% end %>
-<div class="panel panel-default">
-  <div class="panel-body">
+<div class="card">
+  <div class="card-body">
     <div class="col-sm-6 profile">
       <%= render 'edit_primary' %>
     </div>

data/app/views/hyrax/dashboard/profiles/show.html.erb

@@ -1,7 +1,7 @@
 <% provide :page_header do %>
   <h1><span class="fa fa-id-card" aria-hidden="true"></span> <%= t("hyrax.admin.sidebar.profile") %></h1>
   <% if can? :edit, current_user %>
-    <div class="pull-right">
+    <div class="float-right">
       <%= link_to hyrax.edit_dashboard_profile_path(@user), class: "btn btn-primary" do %>
         <%= t("hyrax.edit_profile") %>
       <% end %>
@@ -9,8 +9,8 @@
   <% end %>
 <% end %>
 
-  <div class="panel panel-default">
-    <div class="panel-body">
+  <div class="card">
+    <div class="card-body">
       <div class="list-group col-md-5 col-sm-8">
         <%= render "hyrax/users/vitals", user: @user %>
 

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

@@ -2,50 +2,52 @@
   <h1><%= t("hyrax.dashboard.title") %></h1>
 <% end %>
 
-<% if Hyrax.config.analytics? %>
-<div class="row">
-  <div class="col-md-12">
-    <div class="panel panel-default">
-      <div class="panel-heading">
-        <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 class="spaced-rows">
+  <% if Hyrax.config.analytics? %>
+  <div class="row">
+    <div class="col">
+      <div class="card">
+        <div class="card-header">
+          <h2 class="card-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="card-body">
+          <%= render "hyrax/admin/analytics/date_range_form", redirect_path: hyrax.dashboard_path %>
+        </div>
       </div>
-      <div class="panel-body">
-        <%= render "hyrax/admin/analytics/date_range_form", redirect_path: hyrax.dashboard_path %>
+    </div>
+  </div>
+
+  <div class="row">
+    <div class="col">
+      <div class="card">
+        <%= render 'user_activity' %>
       </div>
     </div>
   </div>
-</div>
+  <% end %>
 
-<div class="row">
-  <div class="col-md-12">
-    <div class="panel panel-default">
-      <%= render 'user_activity' %>
+  <div class="row">
+    <div class="col">
+     <%= render 'repository_growth' %>
     </div>
   </div>
-</div>
-<% end %>
 
-<div class="row">
-  <div class="col-md-12">
-    <div class="panel panel-default">
-      <%= render 'repository_growth' %>
+  <div class="row">
+    <div class="col">
+      <%= render 'visibility_graph' %>
+    </div>
+    <div class="col">
+      <%= render 'work_type_graph' %>
+    </div>
+    <div class="col">
+      <%= render "resource_type_graph" %>
     </div>
   </div>
 </div>
 
-<div class="row">
-  <div class="col-md-4">
-    <%= 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 class="clearfix mt-5">
+  <%= render 'tabs' %>
 </div>
-<br>
-<br>
-<%= render 'tabs' %>
+

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

@@ -2,42 +2,42 @@
   <h1><%= t("hyrax.dashboard.title") %></h1>
 <% end %>
 
-<div class="panel panel-default user-activity">
-  <div class="panel-heading">
-    <h2 class="panel-title "><%= t("hyrax.dashboard.user_activity.title") %></h2>
+<div class="card user-activity">
+  <div class="card-header">
+    <h2 class="card-title "><%= t("hyrax.dashboard.user_activity.title") %></h2>
   </div>
-  <div class="panel-body">
+  <div class="card-body">
     <%= @presenter.render_recent_activity %>
   </div>
 </div>
 
-<div class="panel panel-default" id="notifications">
-  <div class="panel-heading">
-    <h2 class="panel-title "><%= t("hyrax.dashboard.user_notifications") %></h2>
+<div class="card" id="notifications">
+  <div class="card-header">
+    <h2 class="card-title "><%= t("hyrax.dashboard.user_notifications") %></h2>
   </div>
-  <div class="panel-body">
+  <div class="card-body">
     <%= @presenter.render_recent_notifications %>
     <%= @presenter.link_to_additional_notifications %>
   </div>
 </div>
 
 <% if Flipflop.proxy_deposit? %>
-  <div class="panel panel-default" id="proxy_management">
-    <div class="panel-heading">
-      <h2 class="panel-title "><%= t("hyrax.dashboard.current_proxies") %></h2>
+  <div class="card" id="proxy_management">
+    <div class="card-header">
+      <h2 class="card-title "><%= t("hyrax.dashboard.current_proxies") %></h2>
     </div>
-    <div class="panel-body">
+    <div class="card-body">
       <%= render 'hyrax/dashboard/_index_partials/current_proxy_rights', user: current_user %>
       <%= @presenter.link_to_manage_proxies %>
     </div>
   </div>
 <% end %>
 
-<div class="panel panel-default transfers">
-  <div class="panel-heading">
-    <h2 class="panel-title "><%= t("hyrax.dashboard.transfer_of_ownership") %></h2>
+<div class="card transfers">
+  <div class="card-header">
+    <h2 class="card-title "><%= t("hyrax.dashboard.transfer_of_ownership") %></h2>
   </div>
-  <div class="panel-body">
+  <div class="card-body">
     <%= render 'hyrax/dashboard/_index_partials/transfers', presenter: @presenter.transfers %>
   </div>
 </div>

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

@@ -1,25 +1,26 @@
-  <li class="h5"><%= t('hyrax.admin.sidebar.activity') %></li>
+  <li class="h5 nav-item"><%= t('hyrax.admin.sidebar.activity') %></li>
 
-  <li>
+  <li class="nav-item">
     <%= menu.collapsable_section t('hyrax.admin.sidebar.user_activity'),
                                  icon_class: "fa fa-line-chart",
                                  id: 'collapseUserActivity',
                                  open: menu.user_activity_section? do %>
       <%= menu.nav_link(hyrax.dashboard_profile_path(current_user),
+                        class: "nav-link",
                         also_active_for: hyrax.edit_dashboard_profile_path(current_user)) do %>
         <span class="fa fa-id-card" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.profile') %></span>
       <% end %>
 
-      <%= menu.nav_link(hyrax.notifications_path) do %>
+      <%= menu.nav_link(hyrax.notifications_path, class: "nav-link") do %>
         <span class="fa fa-bell" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.notifications') %></span>
       <% end %>
 
-      <%= menu.nav_link(hyrax.transfers_path) do %>
+      <%= menu.nav_link(hyrax.transfers_path, class: "nav-link") do %>
         <span class="fa fa-arrows-h" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.transfers') %></span>
       <% end %>
 
       <% if Flipflop.proxy_deposit? %>
-        <%= menu.nav_link(hyrax.depositors_path) do %>
+        <%= menu.nav_link(hyrax.depositors_path, class: "nav-link") do %>
           <span class="fa fa-users" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.dashboard.manage_proxies') %></span>
         <% end %>
       <% end %>
@@ -27,26 +28,25 @@
   </li>
 
   <% if can? :read, :admin_dashboard %>
-    <%= menu.nav_link(hyrax.admin_stats_path) do %>
+    <%= menu.nav_link(hyrax.admin_stats_path, class: "nav-link") do %>
       <span class="fa fa-bar-chart" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.statistics') %></span>
     <% end %>
   <% end %>
 
-  <% if current_ability.can_create_any_work? %>
-    <li>
+  <% if current_ability.can_create_any_work? && Hyrax.config.analytics? %>
+    <li class="nav-item">
       <%= 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 %>
+          <%= menu.nav_link(hyrax.admin_analytics_collection_reports_path, class: "nav-link", 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 %>
+                          onclick: "dontChangeAccordion(event);", class: "nav-link") do %>
           <span class="fa fa-file" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.works_report') %></span>
         <% end %>
 

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

@@ -1,28 +1,28 @@
   <% if menu.show_configuration? %>
-    <li class="h5"><%= t('hyrax.admin.sidebar.configuration') %></li>
-    <li>
+    <li class="h5 nav-item"><%= t('hyrax.admin.sidebar.configuration') %></li>
+    <li class="nav-item">
       <%= menu.collapsable_section t('hyrax.admin.sidebar.settings'),
                                    icon_class: "fa fa-cog",
                                    id: 'collapseSettings',
                                    open: menu.settings_section? do %>
         <% if can?(:update, :appearance) %>
-          <%= menu.nav_link(hyrax.admin_appearance_path) do %>
+          <%= menu.nav_link(hyrax.admin_appearance_path, class: "nav-link") do %>
             <span class="fa fa-paint-brush" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.appearance') %></span>
           <% end %>
         <% end %>
         <% if can?(:manage, :collection_types) %>
-          <%= menu.nav_link(hyrax.admin_collection_types_path) do %>
+          <%= menu.nav_link(hyrax.admin_collection_types_path, class: "nav-link") do %>
             <span class="fa fa-folder-open" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.collection_types') %></span>
           <% end %>
         <% end %>
         <% if can?(:manage, Hyrax::Feature) %>
-          <%= menu.nav_link(hyrax.edit_pages_path) do %>
+          <%= menu.nav_link(hyrax.edit_pages_path, class: "nav-link") do %>
             <span class="fa fa-file-text-o" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.pages') %></span>
           <% end %>
-          <%= menu.nav_link(hyrax.edit_content_blocks_path) do %>
+          <%= menu.nav_link(hyrax.edit_content_blocks_path, class: "nav-link") do %>
             <span class="fa fa-square-o" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.content_blocks') %></span>
           <% end %>
-          <%= menu.nav_link(hyrax.admin_features_path) do %>
+          <%= menu.nav_link(hyrax.admin_features_path, class: "nav-link") do %>
             <span class="fa fa-wrench" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.technical') %></span>
           <% end %>
         <% end %>
@@ -30,7 +30,7 @@
     </li>
 
     <% if can?(:manage, Sipity::WorkflowResponsibility) %>
-      <%= menu.nav_link(hyrax.admin_workflow_roles_path) do %>
+      <%= menu.nav_link(hyrax.admin_workflow_roles_path, class: "nav-link") do %>
         <span class="fa fa-users" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.workflow_roles') %></span>
       <% end %>
     <% end %>

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

@@ -1,12 +1,14 @@
-  <li class="h5"><%= t('hyrax.admin.sidebar.repository_objects') %></li>
+  <li class="h5 nav-item"><%= t('hyrax.admin.sidebar.repository_objects') %></li>
 
   <%= menu.nav_link(hyrax.my_collections_path,
+                    class: "nav-link",
                     onclick: "dontChangeAccordion(event);",
                     also_active_for: hyrax.dashboard_collections_path) do %>
     <span class="fa fa-folder-open" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.collections') %></span>
   <% end %>
 
   <%= menu.nav_link(hyrax.my_works_path,
+                    class: "nav-link",
                     onclick: "dontChangeAccordion(event);",
                     also_active_for: hyrax.dashboard_works_path) do %>
     <span class="fa fa-file" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.works') %></span>

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

@@ -1,6 +1,7 @@
   <% if can? :review, :submissions %>
-    <li class="h5"><%= t('hyrax.admin.sidebar.tasks') %></li>
+    <li class="h5 nav-item"><%= t('hyrax.admin.sidebar.tasks') %></li>
     <%= menu.nav_link(hyrax.admin_workflows_path,
+                      class: "nav-link",
                       onclick: "dontChangeAccordion(event);") do %>
       <span class="fa fa-flag" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.workflow_review') %></span>
     <% end %>
@@ -8,6 +9,7 @@
 
   <% if can? :manage, User %>
     <%= menu.nav_link(hyrax.admin_users_path,
+                      class: "nav-link",
                       onclick: "dontChangeAccordion(event);") do %>
       <span class="fa fa-user" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.users') %></span>
     <% end %>
@@ -15,11 +17,13 @@
 
   <% if can? :read, :admin_dashboard %>
     <%= menu.nav_link(hyrax.embargoes_path,
+                      class: "nav-link",
                       onclick: "dontChangeAccordion(event);") do %>
       <span class="fa fa-flag" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.embargoes.index.manage_embargoes') %></span>
     <% end %>
 
     <%= menu.nav_link(hyrax.leases_path,
+                      class: "nav-link",
                       onclick: "dontChangeAccordion(event);") do %>
       <span class="fa fa-flag" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.leases.index.manage_leases') %></span>
     <% end %>