From a19b5b8a520a2fe6f7b58bede409a000544d5208 Mon Sep 17 00:00:00 2001 From: Karen Didrickson Date: Tue, 10 Jul 2018 15:32:57 -0500 Subject: [PATCH] remove turbolinks false --- app/views/hyrax/admin/collection_types/index.html.erb | 2 +- app/views/hyrax/base/_show_actions.html.erb | 4 +--- .../hyrax/dashboard/_index_partials/_transfers.html.erb | 2 +- .../hyrax/dashboard/collections/_edit_actions.html.erb | 3 +-- app/views/hyrax/dashboard/collections/_form.html.erb | 2 +- .../hyrax/dashboard/collections/_show_actions.html.erb | 3 +-- .../dashboard/collections/_show_add_items_actions.html.erb | 3 +-- .../hyrax/dashboard/sidebar/_repository_content.html.erb | 3 +-- app/views/hyrax/file_sets/_show_actions.html.erb | 2 +- app/views/hyrax/file_sets/media_display/_audio.html.erb | 2 +- app/views/hyrax/file_sets/media_display/_image.html.erb | 2 +- .../hyrax/file_sets/media_display/_office_document.html.erb | 1 - app/views/hyrax/file_sets/media_display/_pdf.html.erb | 1 - app/views/hyrax/file_sets/media_display/_video.html.erb | 2 +- app/views/hyrax/my/works/_batch_actions.html.erb | 2 +- app/views/hyrax/my/works/_tabs.html.erb | 6 +++--- app/views/hyrax/single_use_links_viewer/show.html.erb | 2 +- app/views/layouts/hyrax.html.erb | 2 +- app/views/layouts/hyrax/dashboard.html.erb | 2 +- spec/features/dashboard/collection_spec.rb | 4 ++-- .../hyrax/single_use_links_viewer/show.html.erb_spec.rb | 4 ---- 21 files changed, 21 insertions(+), 33 deletions(-) diff --git a/app/views/hyrax/admin/collection_types/index.html.erb b/app/views/hyrax/admin/collection_types/index.html.erb index d5ed21010f..46dab93d75 100644 --- a/app/views/hyrax/admin/collection_types/index.html.erb +++ b/app/views/hyrax/admin/collection_types/index.html.erb @@ -34,7 +34,7 @@ <%= collection_type.title %> - <%= link_to hyrax.edit_admin_collection_type_path(collection_type), class: 'btn btn-primary btn-sm', data: { turbolinks: false } do %> + <%= link_to hyrax.edit_admin_collection_type_path(collection_type), class: 'btn btn-primary btn-sm' do %> <%= t('helpers.action.edit') %> <% end %> <% unless collection_type.admin_set? || collection_type.user_collection? %> diff --git a/app/views/hyrax/base/_show_actions.html.erb b/app/views/hyrax/base/_show_actions.html.erb index 90c91b8361..08864384d1 100644 --- a/app/views/hyrax/base/_show_actions.html.erb +++ b/app/views/hyrax/base/_show_actions.html.erb @@ -1,6 +1,6 @@
<% if Hyrax.config.analytics? %> - <%= link_to "Analytics", presenter.stats_path, id: 'stats', class: 'btn btn-default', data: { turbolinks: false } %> + <%= link_to "Analytics", presenter.stats_path, id: 'stats', class: 'btn btn-default' %> <% end %> <% if presenter.editor? %> <%= link_to "Edit", edit_polymorphic_path([main_app, presenter]), class: 'btn btn-default' %> @@ -44,5 +44,3 @@ <%= render 'hyrax/dashboard/collections/form_for_select_collection', user_collections: @user_collections %> - - diff --git a/app/views/hyrax/dashboard/_index_partials/_transfers.html.erb b/app/views/hyrax/dashboard/_index_partials/_transfers.html.erb index 76e4b02a42..d9417e028a 100644 --- a/app/views/hyrax/dashboard/_index_partials/_transfers.html.erb +++ b/app/views/hyrax/dashboard/_index_partials/_transfers.html.erb @@ -3,7 +3,7 @@

<%= t("hyrax.dashboard.transfers_sent") %>

diff --git a/app/views/hyrax/dashboard/collections/_edit_actions.html.erb b/app/views/hyrax/dashboard/collections/_edit_actions.html.erb index 0213468bfa..8c94faf5c8 100644 --- a/app/views/hyrax/dashboard/collections/_edit_actions.html.erb +++ b/app/views/hyrax/dashboard/collections/_edit_actions.html.erb @@ -3,6 +3,5 @@ <%= link_to t('hyrax.collection.actions.add_existing_works.label'), hyrax.my_works_path(add_works_to_collection: @form.id), title: t('hyrax.collection.actions.add_existing_works.desc'), - class: 'btn btn-default', - data: { turbolinks: false } %> + class: 'btn btn-default' %> diff --git a/app/views/hyrax/dashboard/collections/_form.html.erb b/app/views/hyrax/dashboard/collections/_form.html.erb index 2092e7ace8..99bc1d57ba 100644 --- a/app/views/hyrax/dashboard/collections/_form.html.erb +++ b/app/views/hyrax/dashboard/collections/_form.html.erb @@ -97,7 +97,7 @@ <% end %> diff --git a/app/views/hyrax/dashboard/sidebar/_repository_content.html.erb b/app/views/hyrax/dashboard/sidebar/_repository_content.html.erb index dfbda0e5c9..4be74f8e7d 100644 --- a/app/views/hyrax/dashboard/sidebar/_repository_content.html.erb +++ b/app/views/hyrax/dashboard/sidebar/_repository_content.html.erb @@ -6,7 +6,6 @@ <% end %> <%= menu.nav_link(hyrax.my_works_path, - also_active_for: hyrax.dashboard_works_path, - data: { turbolinks: false }) do %> + also_active_for: hyrax.dashboard_works_path) do %> <%= t('hyrax.admin.sidebar.works') %> <% end %> diff --git a/app/views/hyrax/file_sets/_show_actions.html.erb b/app/views/hyrax/file_sets/_show_actions.html.erb index a251211871..3cdd295450 100644 --- a/app/views/hyrax/file_sets/_show_actions.html.erb +++ b/app/views/hyrax/file_sets/_show_actions.html.erb @@ -1,6 +1,6 @@
<% if Hyrax.config.analytics? %> - <%= link_to "Analytics", @presenter.stats_path, id: 'stats', class: 'btn btn-default', data: { turbolinks: false } %> + <%= link_to "Analytics", @presenter.stats_path, id: 'stats', class: 'btn btn-default' %> <% end %> <% if @presenter.editor? %> diff --git a/app/views/hyrax/file_sets/media_display/_audio.html.erb b/app/views/hyrax/file_sets/media_display/_audio.html.erb index 3a790450bc..b3d07cb3c1 100644 --- a/app/views/hyrax/file_sets/media_display/_audio.html.erb +++ b/app/views/hyrax/file_sets/media_display/_audio.html.erb @@ -8,7 +8,7 @@ <%= link_to t('hyrax.file_set.show.downloadable_content.audio_link'), hyrax.download_path(file_set), - data: { turbolinks: false, label: file_set.id }, + data: { label: file_set.id }, target: :_blank, id: "file_download" %>
diff --git a/app/views/hyrax/file_sets/media_display/_image.html.erb b/app/views/hyrax/file_sets/media_display/_image.html.erb index 30cdb745ad..ef9572bfdf 100644 --- a/app/views/hyrax/file_sets/media_display/_image.html.erb +++ b/app/views/hyrax/file_sets/media_display/_image.html.erb @@ -7,7 +7,7 @@ role: "presentation" %> <%= link_to t('hyrax.file_set.show.downloadable_content.image_link'), hyrax.download_path(file_set), - data: { turbolinks: false, label: file_set.id }, + data: { label: file_set.id }, target: :_blank, id: "file_download" %> diff --git a/app/views/hyrax/file_sets/media_display/_office_document.html.erb b/app/views/hyrax/file_sets/media_display/_office_document.html.erb index 0cf0cf5c53..a3f386dc65 100644 --- a/app/views/hyrax/file_sets/media_display/_office_document.html.erb +++ b/app/views/hyrax/file_sets/media_display/_office_document.html.erb @@ -7,7 +7,6 @@ role: "presentation" %> <%= link_to t('hyrax.file_set.show.downloadable_content.office_link'), hyrax.download_path(file_set), - data: { turbolinks: false }, target: :_blank, id: "file_download", data: { label: file_set.id } %> diff --git a/app/views/hyrax/file_sets/media_display/_pdf.html.erb b/app/views/hyrax/file_sets/media_display/_pdf.html.erb index d5f7441496..95af2cbe79 100644 --- a/app/views/hyrax/file_sets/media_display/_pdf.html.erb +++ b/app/views/hyrax/file_sets/media_display/_pdf.html.erb @@ -7,7 +7,6 @@ role: "presentation" %> <%= link_to t('hyrax.file_set.show.downloadable_content.pdf_link'), hyrax.download_path(file_set), - data: { turbolinks: false }, target: :_blank, id: "file_download", data: { label: file_set.id } %> diff --git a/app/views/hyrax/file_sets/media_display/_video.html.erb b/app/views/hyrax/file_sets/media_display/_video.html.erb index 3647da036a..2dc972881a 100644 --- a/app/views/hyrax/file_sets/media_display/_video.html.erb +++ b/app/views/hyrax/file_sets/media_display/_video.html.erb @@ -8,7 +8,7 @@ <%= link_to t('hyrax.file_set.show.downloadable_content.video_link'), hyrax.download_path(file_set), - data: { turbolinks: false, label: file_set.id }, + data: { label: file_set.id }, target: :_blank, id: "file_download" %> diff --git a/app/views/hyrax/my/works/_batch_actions.html.erb b/app/views/hyrax/my/works/_batch_actions.html.erb index cab5261a84..aa3cc2dd48 100644 --- a/app/views/hyrax/my/works/_batch_actions.html.erb +++ b/app/views/hyrax/my/works/_batch_actions.html.erb @@ -9,6 +9,6 @@ <%= batch_delete %> <%= button_tag t('hyrax.dashboard.my.action.add_to_collection'), class: 'btn btn-primary submits-batches submits-batches-add', - data: { toggle: "modal", target: "#collection-list-container", turbolinks: false } %> + data: { toggle: "modal", target: "#collection-list-container" } %> diff --git a/app/views/hyrax/my/works/_tabs.html.erb b/app/views/hyrax/my/works/_tabs.html.erb index 5119b0232f..7b9d701196 100644 --- a/app/views/hyrax/my/works/_tabs.html.erb +++ b/app/views/hyrax/my/works/_tabs.html.erb @@ -1,8 +1,8 @@ -