hyrax 3.6.0 → 4.0.0.beta1

data/app/views/hyrax/users/_user_info.html.erb

@@ -34,12 +34,12 @@
   <dd><%= mail_to user.email %></dd>
 
   <% if user.chat_id %>
-    <dt><span class="glyphicon glyphicon-bullhorn" aria-hidden="true"></span> Chat ID</dt>
+    <dt><span class="fa fa-bullhorn" aria-hidden="true"></span> Chat ID</dt>
     <dd><%= user.chat_id %></dd>
   <% end %>
 
   <% if user.website %>
-    <dt><span class="glyphicon glyphicon-globe" aria-hidden="true"></span> Website(s)</dt>
+    <dt><span class="fa fa-globe" aria-hidden="true"></span> Website(s)</dt>
     <dd><%= iconify_auto_link(user.website) %></dd>
   <% end %>
 
@@ -64,7 +64,7 @@
   <% end %>
 
   <% if user.address %>
-    <dt><span class="glyphicon glyphicon-map-marker" aria-hidden="true"></span> Address</dt>
+    <dt><span class="fa fa-map-marker" aria-hidden="true"></span> Address</dt>
     <dd><%= user.address %></dd>
   <% end %>
 
@@ -74,7 +74,7 @@
   <% end %>
 
   <% if user.telephone %>
-    <dt><span class="glyphicon glyphicon-earphone" aria-hidden="true"></span> Telephone</dt>
+    <dt><span class="fa fa-phone" aria-hidden="true"></span> Telephone</dt>
     <dd><%= link_to_telephone(user) %></dd>
   <% end %>
 

data/app/views/hyrax/users/_vitals.html.erb

@@ -1,15 +1,15 @@
 <div class="list-group-item">
-  <span class="glyphicon glyphicon-time" aria-hidden="true"></span> <%= t("hyrax.dashboard.stats.joined_on") %> <%= user.created_at.to_date.strftime("%b %d, %Y") %>
+  <span class="fa fa-clock-o" aria-hidden="true"></span> <%= t("hyrax.dashboard.stats.joined_on") %> <%= user.created_at.to_date.strftime("%b %d, %Y") %>
 </div>
 
 <div class="list-group-item">
   <span class="badge"><%= number_of_collections(user) %></span>
-  <span class="glyphicon glyphicon-folder-open" aria-hidden="true"></span> <%= link_to_field('', '', t("hyrax.dashboard.stats.collections"), {generic_type: "Collection", depositor: user.to_s}) %>
+  <span class="fa fa-folder-open" aria-hidden="true"></span> <%= link_to_field('', '', t("hyrax.dashboard.stats.collections"), {generic_type: "Collection", depositor: user.to_s}) %>
 </div>
 
 <div class="list-group-item">
   <span class="badge"><%= number_of_works(user) %></span>
-  <span class="glyphicon glyphicon-upload" aria-hidden="true"></span> <%= link_to_field('', '', t("hyrax.dashboard.stats.works"), {generic_type: "Work", depositor: user.to_s}) %>
+  <span class="fa fa-upload" aria-hidden="true"></span> <%= link_to_field('', '', t("hyrax.dashboard.stats.works"), {generic_type: "Work", depositor: user.to_s}) %>
 
   <ul class="views-downloads-dashboard list-unstyled">
       <li><span class="badge badge-optional"><%= user.total_file_views %></span> <%= t("hyrax.dashboard.stats.file_views").pluralize(user.total_file_views) %></li>

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

@@ -1,9 +1,9 @@
 <div class="row profile">
-  <div class="col-xs-3">
+  <div class="col-3">
     <%= render 'left_sidebar' %>
   </div>
   <!-- right col -->
-  <div class="col-xs-9">
+  <div class="col-9">
     <%= render 'profile_tabs', presenter: @presenter %>
   </div>
 </div>

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

@@ -26,12 +26,9 @@ signed in %>
 <%= render 'shared/appearance_styles' %>
 
 <% if Hyrax.config.analytics? %>
-  <% case Hyrax.config.analytics_provider %>
-  <% when 'ga4' %>
-    <%= render partial: 'shared/ga4', formats: [:html] %>
-  <% when 'google' %>
+  <% if Hyrax.config.analytics_provider == 'google' %>
     <%= render partial: 'shared/ga', formats: [:html]  %>
-  <% when 'matomo' %>
+  <% elsif Hyrax.config.analytics_provider == 'matomo' %>
     <%= render partial: 'shared/matomo', formats: [:html] %>
   <% end %>
 <% end %>

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

@@ -9,18 +9,18 @@
     <div class="skip-to-content">
       <%= link_to "Skip to Content", "#skip-to-content" %>
     </div>
-    <%= render '/masthead' %>
+    <%= render '/masthead', placement_class: 'fixed-top' %>
     <%= content_for(:navbar) %>
     <div id="content-wrapper" role="main">
       <div class="sidebar maximized">
         <%= render 'hyrax/dashboard/sidebar' %>
       </div>
-      <div class="main-content maximized">
+      <div class="main-content maximized<%= " admin-stats" if request.fullpath.include? '/admin/stats' %>">
         <%= render_breadcrumbs builder: Hyrax::BootstrapBreadcrumbsBuilder %>
         <%= render '/flash_msg' %>
         <% if content_for?(:page_header) %>
           <div class="row">
-            <div class="col-xs-12 main-header">
+            <div class="col-12 main-header">
               <%= yield(:page_header) %>
             </div>
           </div>
@@ -33,6 +33,6 @@
       </div>
 
     </div><!-- /#content-wrapper -->
-    <%= render 'shared/ajax_modal' %>
+    <%= render 'shared/modal' %>
   </body>
 </html>

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

@@ -9,15 +9,16 @@
     <div class="skip-to-content">
       <%= link_to "Skip to Content", "#skip-to-content" %>
     </div>
-    <%= render '/masthead' %>
+    <%= render '/masthead', placement_class: nil %>
     <%= content_for(:navbar) %>
     <%= content_for(:precontainer_content) %>
     <div id="content-wrapper" class="container" role="main">
+      <%= content_for(:container_header) %>
       <%= render '/flash_msg' %>
       <%= render_breadcrumbs builder: Hyrax::BootstrapBreadcrumbsBuilder %>
       <% if content_for?(:page_header) %>
         <div class="row">
-          <div class="col-xs-12 main-header">
+          <div class="col-12 main-header">
             <%= yield(:page_header) %>
           </div>
         </div>
@@ -28,6 +29,6 @@
       <%= content_for?(:content) ? yield(:content) : yield %>
     </div><!-- /#content-wrapper -->
     <%= render 'shared/footer' %>
-    <%= render 'shared/ajax_modal' %>
+    <%= render 'shared/modal' %>
   </body>
 </html>

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

@@ -2,17 +2,17 @@
 <style>
 <% appearance = Hyrax::Forms::Admin::Appearance.new %>
 a { color: <%= appearance.link_color %>; }
-.navbar-inverse .navbar-link { color: <%= appearance.footer_link_color %>; }
+.navbar-dark.bg-dark .navbar-link { color: <%= appearance.footer_link_color %>; }
 
-.navbar-inverse { background-color: <%= appearance.header_background_color %>; }
+.navbar-dark.bg-dark { background-color: <%= appearance.header_background_color %> !important; }
 
-.navbar-inverse .navbar-nav > .open > a,
-.navbar-inverse .navbar-nav > .open > a:hover,
-.navbar-inverse .navbar-nav > .open > a:focus { background-color: <%= appearance.header_background_color %>; }
+.navbar-dark.bg-dark .navbar-nav > .open > a,
+.navbar-dark.bg-dark .navbar-nav > .open > a:hover,
+.navbar-dark.bg-dark .navbar-nav > .open > a:focus { background-color: <%= appearance.header_background_color %>; }
 
-.navbar-inverse .navbar-nav > li > a,
-.navbar-inverse .navbar-text,
-.navbar-inverse .navbar-brand { color: <%= appearance.header_text_color %>; }
+.navbar-dark.bg-dark .navbar-nav > li > a,
+.navbar-dark.bg-dark .navbar-text,
+.navbar-dark.bg-dark .navbar-brand { color: <%= appearance.header_text_color %>; }
 
 .btn-primary {
   background-color: <%= appearance.primary_button_background_color %>;

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

@@ -1,4 +1,4 @@
-<footer class="navbar navbar-inverse site-footer">
+<footer class="navbar navbar-dark bg-dark site-footer">
   <div class="container-fluid">
     <div class="navbar-text text-left">
         <p><%= t('hyrax.footer.service_html') %></p>

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

@@ -2,15 +2,12 @@
     <a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false" aria-controls="language-dropdown-menu">
         <span class="sr-only"><%= t('hyrax.toolbar.language_switch') %></span>
         <span title="<%= t('hyrax.toolbar.language_switch') %>"><%= available_translations[I18n.locale.to_s] %></span>
-        <b class="caret"></b>
     </a>
-    <ul id="language-dropdown-menu" class="dropdown-menu" role="menu">
-        <li role="presentation" class="dropdown-header"><%= t('hyrax.toolbar.language_switch') %></li>
-        <li role="presentation" class="divider"></li>
+    <div id="language-dropdown-menu" class="dropdown-menu" role="menu">
+        <div role="presentation" class="dropdown-header"><%= t('hyrax.toolbar.language_switch') %></div>
+        <div role="presentation" class="dropdown-divider"></div>
         <% available_translations.each do |language, label| %>
-            <li role="presentation" lang="<%= language %>">
-                <%= link_to label, "?locale=#{language}", class: 'dropdown-item', role: 'menuitem', tabindex: '-1', data: { locale: language } %>
-            </li>
+            <%= link_to label, "?locale=#{language}", class: 'dropdown-item', role: 'menuitem', lang: language, tabindex: '-1', data: { locale: language } %>
         <% end %>
-    </ul>
+    </div>
 </li>

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

@@ -5,8 +5,8 @@
         <%= t(:'hyrax.nav_safety.change_tab_message') %>
       </div>
       <div class="modal-footer">
-        <button type="button" class="btn btn-default" id="nav-safety-acknowledge" data-dismiss="modal">Cancel</button>
-        <button type="button" class="btn btn-default" id="nav-safety-dismiss" data-dismiss="modal">OK</button>
+        <button type="button" class="btn btn-secondary" id="nav-safety-acknowledge" data-dismiss="modal">Cancel</button>
+        <button type="button" class="btn btn-secondary" id="nav-safety-dismiss" data-dismiss="modal">OK</button>
       </div>
     </div>
   </div>

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

@@ -3,8 +3,8 @@
   <div class="modal-dialog" role="document">
     <form class="modal-content new-work-select">
       <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-label="<%= t('hyrax.dashboard.heading_actions.close') %>"><span aria-hidden="true">&times;</span></button>
         <h2 class="modal-title" id="select-worktype-label"><%= t('hyrax.dashboard.heading_actions.select_type_of_work') %></h2>
+        <button type="button" class="close" data-dismiss="modal" aria-label="<%= t('hyrax.dashboard.heading_actions.close') %>"><span aria-hidden="true">&times;</span></button>
       </div>
       <div class="modal-body">
         <% create_work_presenter.each do |row_presenter| %>
@@ -25,7 +25,7 @@
         <% end %>
       </div>
       <div class="modal-footer">
-        <button type="button" class="btn btn-default" data-dismiss="modal"><%= t('hyrax.dashboard.heading_actions.close') %></button>
+        <button type="button" class="btn btn-secondary" data-dismiss="modal"><%= t('hyrax.dashboard.heading_actions.close') %></button>
         <input type="submit" class="btn btn-primary" value="<%= t('hyrax.dashboard.heading_actions.create_work') %>" />
       </div>
     </form>

data/config/locales/hyrax.de.yml

@@ -557,7 +557,7 @@ de:
           actions: Aktion
           title: Sammlungstitel
       form_permission:
-        visibility: Sichtbarkeit <small> Wer sollte diesen Inhalt anzeigen oder herunterladen können? </small>
+        visibility: Sichtbarkeit <small> Wer sollte diesen Inhalt anzeigen oder herunterladen können? </ Small>
       form_permission_under_embargo:
         help_html: "<strong>Diese Arbeit ist unter Embargo.</strong> Hier können Sie die Einstellungen des Embargos ändern, oder Sie können den %{edit_link} besuchen, um ihn zu deaktivieren."
         legend_html: Sichtbarkeit <small>Wer sollte in der Lage sein, diesen Inhalt anzusehen oder herunterzuladen?</small>
@@ -596,7 +596,6 @@ de:
         legend_html: Miniaturansicht
       form_visibility_component:
         visibility: Sichtbarkeit
-        subtitle_html: <small>Wer sollte diesen Inhalt anzeigen oder herunterladen können?</small>
       inspect_work:
         back_to: Zurück zu
         entity_id: Mandanten-ID
@@ -1087,14 +1086,14 @@ de:
       no_transfers: Sie haben keine Arbeit übertragen
       profiles:
         edit_primary:
-          change_picture: <i class = "glyphicon glyphicon-camera"> </ i> Bild ändern
+          change_picture: <i class = "fa fa-camera"> </ i> Bild ändern
           delete_picture: Bild löschen
           delete_picture_data_content: Wenn Sie Ihr Bild vollständig entfernen möchten, aktivieren Sie das Kontrollkästchen und speichern Sie Ihr Profil.
           delete_picture_data_original_title: Bild löschen
           facebook_handle: <i class = "fa fa-facebook" aria-hidden = "true"> </ i> Facebook-Handle
           google_handle: <i class = "fa-fa-google-plus"> </ i> Google+ Handle
           help_change_picture_type: JPG, GIF oder PNG (weniger als 2 MB)
-          save_profile: <i class = "glyphicon glyphicon-save"> </ i> Profil speichern
+          save_profile: <i class = "fa fa-floppy-o"> </ i> Profil speichern
           twitter_handle: <i class = "fa fa-twitter" aria-hidden = "true"> </ i> Twitter-Handle
       proxy_activity: Vertreter-Aktivität
       proxy_add_deny: Sie können sich nicht selbst zum Stellvertreter machen
@@ -1484,7 +1483,7 @@ de:
       read: Lesen/Download
     search:
       button:
-        html: <span class="glyphicon glyphicon-search"></span> Suchen
+        html: <span class="fa fa-search"></span> Suchen
         text: Suche
       form:
         option:
@@ -1830,7 +1829,7 @@ de:
         find_child_work: Suche nach einer Arbeit ...
         member_of_collection_ids: Wählen Sie eine Sammlung ...
     required:
-      html: <span class="label label-info required-tag">erforderlich</span>
+      html: <span class="badge badge-info required-tag">erforderlich</span>
   total_view:
     one: Diese Arbeit hat 1 Gesamtansicht
     other: Dieses Werk hat insgesamt %{count} Aufrufe

data/config/locales/hyrax.en.yml

@@ -459,14 +459,6 @@ en:
       workflows:
         index:
           header: Review Submissions
-          heading:
-            work: Work
-            depositor: Depositor
-            submission_date: Submission Date
-            status: status
-          works_published: "<strong>%{total_count} works</strong> published"
-          works_under_review: "<strong>%{total_count} works</strong> under review"
-          works_listing: Works listing
           tabs:
             published: Published
             under_review: Under Review
@@ -596,7 +588,6 @@ en:
         legend_html: Thumbnail
       form_visibility_component:
         visibility: Visibility
-        subtitle_html: <small>Who should be able to view or download this content?</small>
       inspect_work:
         back_to: Back to
         entity_id: Entity ID
@@ -1086,14 +1077,14 @@ en:
       no_transfers: You haven't transferred any work
       profiles:
         edit_primary:
-          change_picture: <i class="glyphicon glyphicon-camera"></i> Change picture
+          change_picture: <i class="fa fa-camera"></i> Change picture
           delete_picture: Delete picture
           delete_picture_data_content: If you would like to remove your picture entirely, check the box and save your profile.
           delete_picture_data_original_title: Delete Picture
           facebook_handle: <i class="fa fa-facebook" aria-hidden="true"></i> Facebook Handle
           google_handle: <i class="fa fa-google-plus"></i> Google+ Handle
           help_change_picture_type: JPG, GIF, or PNG (less than 2MB)
-          save_profile: <i class="glyphicon glyphicon-save"></i> Save Profile
+          save_profile: <i class="fa fa-floppy-o"></i> Save Profile
           twitter_handle: <i class="fa fa-twitter" aria-hidden="true"></i> Twitter Handle
       proxy_activity: Proxy Activity
       proxy_add_deny: You cannot make yourself a proxy
@@ -1482,7 +1473,7 @@ en:
     read_only: The repository is in read-only mode for maintenance. No submissions or edits can be made at this time.
     search:
       button:
-        html: <span class="glyphicon glyphicon-search" aria-hidden="true"></span> Go
+        html: <span class="fa fa-search" aria-hidden="true"></span> Go
         text: Search
       form:
         option:
@@ -1696,8 +1687,6 @@ en:
         note_html: Keep to myself with option to share.
         text: Private
       restricted_title_attr: Change the visibility of this resource
-      unknown:
-        text: Unknown
     work_button_row:
       attach_child: Attach Child
     workflow:
@@ -1829,7 +1818,7 @@ en:
         find_child_work: Search for a work…
         member_of_collection_ids: Select a collection…
     required:
-      html: <span class="label label-info required-tag">required</span>
+      html: <span class="badge badge-info required-tag">required</span>
   total_view:
     one: This work has 1 total view
     other: This work has %{count} total views

data/config/locales/hyrax.es.yml

@@ -601,7 +601,6 @@ es:
         legend_html: Miniatura
       form_visibility_component:
         visibility: La visibilidad
-        subtitle_html: <small>¿Quién debería poder ver o descargar este contenido?</small>
       inspect_work:
         back_to: De regreso
         entity_id: ID de entidad
@@ -1092,14 +1091,14 @@ es:
       no_transfers: No ha transferido ningún trabajo
       profiles:
         edit_primary:
-          change_picture: <i class = "glyphicon glyphicon-camera"> </i> Cambiar imagen
+          change_picture: <i class = "fa fa-camera"> </i> Cambiar imagen
           delete_picture: Eliminar foto
           delete_picture_data_content: Si desea eliminar su imagen por completo, marque la casilla y guarde su perfil.
           delete_picture_data_original_title: Eliminar imagen
           facebook_handle: <i class = "fa fa-facebook" aria-hidden = "true"> </i> Asa de Facebook
           google_handle: <i class = "fa fa-google-plus"> </i> Manija de Google+
           help_change_picture_type: JPG, GIF o PNG (menos de 2 MB)
-          save_profile: <i class = "glyphicon glyphicon-save"> </i> Guardar perfil
+          save_profile: <i class = "fa fa-floppy-o"> </i> Guardar perfil
           twitter_handle: <i class = "fa fa-twitter" aria-hidden = "true"> </i> Twitter Handle
       proxy_activity: Actividad de Proxy
       proxy_add_deny: No puedes hacerte un proxy
@@ -1457,7 +1456,7 @@ es:
         changes_required:
           message: |-
             %{title} (%{link}) requiere cambios adicionales antes de la aprobación.
-             '%{comment}'
+             '%{comment}'
           subject: Su depósito requiere cambios
         deposited:
           message: "%{title} (%{link}) fue aprobado por %{user}. %{comment}"
@@ -1491,7 +1490,7 @@ es:
       read: Ver descarga
     search:
       button:
-        html: <span class="glyphicon glyphicon-search"></span> Ir
+        html: <span class="fa fa-search"></span> Ir
         text: Buscar
       form:
         option:
@@ -1837,7 +1836,7 @@ es:
         find_child_work: Busque un trabajo ...
         member_of_collection_ids: Seleccione una colección ...
     required:
-      html: <span class="label label-info required-tag">obligatorio</span>
+      html: <span class="badge badge-info required-tag">obligatorio</span>
   total_view:
     one: Este trabajo tiene 1 vista total
-    other: Este trabajo tiene un total de %{count} visualizaciones
+    other: Este trabajo tiene un total de %{count} visualizaciones

data/config/locales/hyrax.fr.yml

@@ -440,7 +440,7 @@ fr:
           end_label: Terminer [par défaut pour le moment]
           headers:
             main: Statistiques de travail
-            total: 'Total des travaux :'
+            total: 'Total des travaux :'
             visibility: Totaux par visibilité
           heading: Afficher les fichiers déposés par les utilisateurs
           start_label: Départ
@@ -563,7 +563,7 @@ fr:
           actions: action
           title: Titre de la collection
       form_permission:
-        visibility: Visibilité <small> Qui devrait être en mesure d’afficher ou de télécharger ce contenu? </small>
+        visibility: Visibilité <small> Qui devrait être en mesure d’afficher ou de télécharger ce contenu? </ Small>
       form_permission_under_embargo:
         help_html: "<strong>Ce travail est sous embargo.</strong> Vous pouvez modifier les paramètres de l'embargo ici, ou vous pouvez visiter le %{edit_link} pour le désactiver."
         legend_html: Visibilité <small>Qui devrait pouvoir afficher ou télécharger ce contenu?</small>
@@ -602,7 +602,6 @@ fr:
         legend_html: La vignette
       form_visibility_component:
         visibility: Visibilité
-        subtitle_html: <small>Qui devrait être en mesure d’afficher ou de télécharger ce contenu?</small>
       inspect_work:
         back_to: Retour à
         entity_id: ID d'entité
@@ -1093,14 +1092,14 @@ fr:
       no_transfers: Vous n'avez transféré aucun travail
       profiles:
         edit_primary:
-          change_picture: <i class = "glyphicon glyphicon-camera"> </ i> Changer photo
+          change_picture: <i class = "fa fa-camera"> </ i> Changer photo
           delete_picture: Supprimer la photo
           delete_picture_data_content: Si vous souhaitez supprimer entièrement votre image, cochez la case et enregistrez votre profil.
           delete_picture_data_original_title: Supprimer l'image
           facebook_handle: <i class = "fa fa-facebook" aria-hidden = "true"> </ i> Poignée Facebook
           google_handle: <i class = "fa fa-google-plus"> </ i> Poignée Google+
           help_change_picture_type: JPG, GIF ou PNG (moins de 2 Mo)
-          save_profile: <i class = "glyphicon glyphicon-save"> </ i> Enregistrer le profil
+          save_profile: <i class = "fa fa-floppy-o"> </ i> Enregistrer le profil
           twitter_handle: <i class = "fa fa-twitter" aria-hidden = "true"> </ i> Poignée Twitter
       proxy_activity: Activité de procuration
       proxy_add_deny: Vous ne pouvez pas vous faire un proxy
@@ -1456,7 +1455,7 @@ fr:
         changes_required:
           message: |-
             %{title} (%{link}) nécessite des modifications supplémentaires avant d'être approuvé.
-             '%{comment}'
+             '%{comment}'
           subject: Votre dépôt nécessite des modifications
         deposited:
           message: "%{title} (%{link}) a été approuvé par %{user}. %{comment}"
@@ -1490,7 +1489,7 @@ fr:
       read: Voir le téléchargement
     search:
       button:
-        html: <span class="glyphicon glyphicon-search"></span> Aller
+        html: <span class="fa fa-search"></span> Aller
         text: Chercher
       form:
         option:
@@ -1836,7 +1835,7 @@ fr:
         find_child_work: Rechercher un travail ...
         member_of_collection_ids: Sélectionnez une collection ...
     required:
-      html: <span class="label label-info required-tag">Champs obligatoires</span>
+      html: <span class="badge badge-info required-tag">Champs obligatoires</span>
   total_view:
     one: Ce travail a 1 vue totale
-    other: Ce travail a zxzxxx0 vues au total
+    other: Ce travail a zxzxxx0 vues au total

data/config/locales/hyrax.it.yml

@@ -601,7 +601,6 @@ it:
         legend_html: Thumbnail
       form_visibility_component:
         visibility: Visibilità
-        subtitle_html: <small>Chi dovrebbe essere in grado di visualizzare o scaricare questo contenuto?</small>
       inspect_work:
         back_to: Torna a
         entity_id: ID entità
@@ -1092,14 +1091,14 @@ it:
       no_transfers: Non hai trasferito alcun lavoro
       profiles:
         edit_primary:
-          change_picture: <i class = "glyphicon glyphicon-camera"> </i> Cambia immagine
+          change_picture: <i class = "fa fa-camera"> </i> Cambia immagine
           delete_picture: Elimina foto
           delete_picture_data_content: Se desideri rimuovere completamente la tua foto, seleziona la casella e salva il tuo profilo.
           delete_picture_data_original_title: Elimina immagine
           facebook_handle: <i class = "fa fa-facebook" aria-hidden = "true"> </i> Handle di Facebook
           google_handle: <i class = "fa fa-google-plus"> </i> Handle di Google+
           help_change_picture_type: JPG, GIF o PNG (meno di 2 MB)
-          save_profile: <i class = "glyphicon glyphicon-save"> </i> Salva profilo
+          save_profile: <i class = "fa fa-floppy-o"> </i> Salva profilo
           twitter_handle: <i class = "fa fa-twitter" aria-hidden = "true"> </i> Handle di Twitter
       proxy_activity: Attività proxy
       proxy_add_deny: Non puoi renderti un proxy
@@ -1455,7 +1454,7 @@ it:
         changes_required:
           message: |-
             %{title} (%{link}) richiede ulteriori modifiche prima dell'approvazione.
-             '%{comment}'
+             '%{comment}'
           subject: Il tuo deposito richiede modifiche
         deposited:
           message: "%{title} (%{link}) è stato approvato da %{user}. %{comment}"
@@ -1489,7 +1488,7 @@ it:
       read: Visualizza / Scarica
     search:
       button:
-        html: <span class="glyphicon glyphicon-search"></span> Partire
+        html: <span class="fa fa-search"></span> Partire
         text: Ricerca
       form:
         option:
@@ -1835,7 +1834,7 @@ it:
         find_child_work: Cerca un lavoro ...
         member_of_collection_ids: Seleziona una collezione ...
     required:
-      html: <span class="label label-info required-tag">necessario</span>
+      html: <span class="badge badge-info required-tag">necessario</span>
   total_view:
     one: Quest'opera ha 1 vista totale
-    other: Questo lavoro ha %{count} visualizzazioni totali
+    other: Questo lavoro ha %{count} visualizzazioni totali

data/config/locales/hyrax.pt-BR.yml

@@ -596,7 +596,6 @@ pt-BR:
         legend_html: Miniatura
       form_visibility_component:
         visibility: Visibilidade
-        subtitle_html: <small>Quem deve conseguir visualizar ou baixar este conteúdo?</small>
       inspect_work:
         back_to: De volta a
         entity_id: ID da entidade
@@ -1087,14 +1086,14 @@ pt-BR:
       no_transfers: Você não transferiu nenhuma obra
       profiles:
         edit_primary:
-          change_picture: <i class = "glyphicon glyphicon-camera"> </i> Alterar imagem
+          change_picture: <i class = "fa fa-camera"> </i> Alterar imagem
           delete_picture: Excluir foto
           delete_picture_data_content: Se você deseja remover sua foto completamente, marque a caixa e salve seu perfil.
           delete_picture_data_original_title: Excluir imagem
           facebook_handle: <i class = "fa-facebook" aria-hidden = "true"> </i> Manipulação do Facebook
           google_handle: <i class = "fa fa-google-plus"> </i> Manipulação do Google+
           help_change_picture_type: JPG, GIF ou PNG (menos de 2 MB)
-          save_profile: <i class = "glyphicon glyphicon-save"> </i> Salvar perfil
+          save_profile: <i class = "fa fa-floppy-o"> </i> Salvar perfil
           twitter_handle: <i class = "fa-twitter" aria-hidden = "true"> </i> Manipulação do Twitter
       proxy_activity: Atividade de suplente
       proxy_add_deny: Você não pode se tornar um proxy
@@ -1450,7 +1449,7 @@ pt-BR:
         changes_required:
           message: |-
             %{title} (%{link}) requer alterações adicionais antes da aprovação.
-             '%{comment}'
+             '%{comment}'
           subject: Seu depósito requer alterações
         deposited:
           message: "%{title} (%{link}) foi aprovado por %{user}. %{comment}"
@@ -1484,7 +1483,7 @@ pt-BR:
       read: Visualizar download
     search:
       button:
-        html: <span class="glyphicon glyphicon-search"></span> Ir
+        html: <span class="fa fa-search"></span> Ir
         text: Pesquisar
       form:
         option:
@@ -1830,7 +1829,7 @@ pt-BR:
         find_child_work: Procure uma obra ...
         member_of_collection_ids: Selecione uma coleção ...
     required:
-      html: <span class="label label-info required-tag">obrigatórios</span>
+      html: <span class="badge badge-info required-tag">obrigatórios</span>
   total_view:
     one: Este trabalho tem 1 visualização total
-    other: Este trabalho tem %{count} visualizações totais
+    other: Este trabalho tem %{count} visualizações totais

data/config/locales/hyrax.zh.yml

@@ -599,7 +599,6 @@ zh:
         legend_html: 缩略图
       form_visibility_component:
         visibility: 可见性
-        subtitle_html: <small>谁应该能够查看或下载此内容？</ small>
       inspect_work:
         back_to: 回到
         entity_id: 实体ID
@@ -1090,14 +1089,14 @@ zh:
       no_transfers: 您没有转让任何作品
       profiles:
         edit_primary:
-          change_picture: "<i class =“glyphicon glyphicon-camera”> </ i>更改图片"
+          change_picture: "<i class =“fa fa-camera”> </ i>更改图片"
           delete_picture: 删除图片
           delete_picture_data_content: 如果您想完全删除图片，请选中相应复选框并保存您的个人资料。
           delete_picture_data_original_title: 删除图片
           facebook_handle: "<i class =“fa fa-facebook”aria-hidden =“true”> </ i> Facebook句柄"
           google_handle: "<i class =“fa fa-google-plus”> </ i> Google+处理"
           help_change_picture_type: JPG，GIF或PNG（小于2MB）
-          save_profile: "<i class =“glyphicon glyphicon-save”> </ i>保存个人资料"
+          save_profile: "<i class =“fa fa-floppy-o”> </ i>保存个人资料"
           twitter_handle: "<i class =“fa fa-twitter”aria-hidden =“true”> </ i> Twitter句柄"
       proxy_activity: 代理活动
       proxy_add_deny: 你不能让自己成为代理人
@@ -1453,7 +1452,7 @@ zh:
         changes_required:
           message: |-
             %{title}（%{link}）在批准之前需要进行其他更改。
-             '%{comment}'
+             '%{comment}'
           subject: 您的存款需要更改
         deposited:
           message: zxzxzxx（%{link}）被%{user}批准。 %{comment}
@@ -1487,7 +1486,7 @@ zh:
       read: 查看/下载
     search:
       button:
-        html: <span class="glyphicon glyphicon-search"></span> 转到
+        html: <span class="fa fa-search"></span> 转到
         text: 搜索
       form:
         option:
@@ -1833,7 +1832,7 @@ zh:
         find_child_work: 搜索工作...
         member_of_collection_ids: 选择一个集合...
     required:
-      html: <span class="label label-info required-tag">需要的</span>
+      html: <span class="badge badge-info required-tag">需要的</span>
   total_view:
     one: 该作品共有 1 次浏览
-    other: 此作品总浏览量为 %{count}
+    other: 此作品总浏览量为 %{count}