2044: Sharing link now shown in "Sharing and permissions" panel, no longer uses

a modal popup.  Produces download link that is confirmed works.

diff --git a/apps/workbench/app/controllers/collections_controller.rb b/apps/workbench/app/controllers/collections_controller.rb
index 3e981e10d8b94de9e64c6b83029fc42495ebb55c..1d710419dad09a55810a2abba05a5693812adb7f 100644 (file)
--- a/apps/workbench/app/controllers/collections_controller.rb
+++ b/apps/workbench/app/controllers/collections_controller.rb
@@ -171,6 +171,12 @@ class CollectionsController < ApplicationController
     end
   end
 
+  helper_method :download_link
+
+  def download_link
+    collections_url + "/download/#{@object.uuid}/#{@search_sharing.first.api_token}"
+  end
+
   def share
     a = ApiClientAuthorization.create(scopes: sharing_scopes)
     @search_sharing = search_scopes.select { |s| s.scopes != ['all'] }

diff --git a/apps/workbench/app/views/collections/_sharing_button.html.erb b/apps/workbench/app/views/collections/_sharing_button.html.erb
index 36952d69d041430dd3ea7af734461921a6145104..b2ed43ab31a4546be19841c052921880828a210d 100644 (file)
--- a/apps/workbench/app/views/collections/_sharing_button.html.erb
+++ b/apps/workbench/app/views/collections/_sharing_button.html.erb
@@ -1,8 +1,17 @@
 <% if @search_sharing.any? %>
-  <% linktext = "Shared" %>
-  <% btnstyle = "btn-success" %>
+  <div>Shared at:
+    <span class="pull-right">
+  <%= link_to "Unshare", unshare_collection_url, {
+        class: 'btn-xs btn-info',
+        remote: true,
+        method: 'post'
+      } %></span>
+  <div class="smaller-text" style="word-break: break-all"><%= link_to download_link, download_link %></div>
+</div>
 <% else %>
-  <% linktext = "Share" %>
-  <% btnstyle = "btn-info" %>
+  <%= link_to "Create sharing link", share_collection_url, {
+        class: 'btn-xs btn-info',
+        remote: true,
+        method: 'post'
+      } %>
 <% end %>
-<%= link_to linktext, sharing_popup_collection_url(id: @object.uuid),  {class: "btn #{btnstyle}", :remote => true, 'data-toggle' =>  "modal", 'data-target' => '#collection-sharing-modal-window'}  %>

diff --git a/apps/workbench/app/views/collections/_sharing_popup.html.erb b/apps/workbench/app/views/collections/_sharing_popup.html.erb
deleted file mode 100644 (file)
index f7f0555..0000000
--- a/apps/workbench/app/views/collections/_sharing_popup.html.erb
+++ /dev/null
@@ -1,37 +0,0 @@
-
-<div class="modal-dialog">
-  <div class="modal-content">
-    <div class="modal-header">
-      <button type="button" class="close" onClick="reset_form()" data-dismiss="modal" aria-hidden="true">&times;</button>
-      <h4 class="modal-title">Sharing</h4>
-    </div>
-    <div class="modal-body">
-      <div id="sharing-text" style="text-align: center; word-wrap: break-word">
-        <% if @search_sharing.any? %>
-          Use this link to share this collection:<br>
-          <big>
-          <% link = collections_url + "/download/#{@object.uuid}/#{@search_sharing.first.api_token}" %>
-          <%= link_to link, link %>
-          </big>
-        <% else %>
-          Not shared.
-        <% end %>
-      </div>
-      <div style="text-align: center; padding-top: 1em">
-      <% if @search_sharing and @search_sharing.any? %>
-        <%= link_to "Unshare", unshare_collection_url, {
-            class: 'btn btn-success',
-              remote: true,
-            method: 'post'
-            } %>
-      <% else %>
-        <%= link_to "Share", share_collection_url, {
-              class: 'btn btn-info',
-              remote: true,
-              method: 'post'
-            } %>
-      <% end %>
-      </div>
-    </div>
-  </div>
-</div>

diff --git a/apps/workbench/app/views/collections/sharing_popup.js.erb b/apps/workbench/app/views/collections/sharing_popup.js.erb
index 933f08ddd84c0a6cfd2e112e1c35277268d0c73a..d2e0d9fc65d0664d56cedbf1830c7484b020e166 100644 (file)
--- a/apps/workbench/app/views/collections/sharing_popup.js.erb
+++ b/apps/workbench/app/views/collections/sharing_popup.js.erb
@@ -1,2 +1 @@
-$("#collection-sharing-modal-window").html("<%= escape_javascript(render partial: 'sharing_popup') %>");
 $("#sharing-button").html("<%= escape_javascript(render partial: 'sharing_button') %>");

diff --git a/apps/workbench/app/views/collections/show.html.erb b/apps/workbench/app/views/collections/show.html.erb
index c26b74c65a3d77bc000638730af8211f0d2ba40e..0be6705a9df7ddf25dd44082aa5888a367a21bca 100644 (file)
--- a/apps/workbench/app/views/collections/show.html.erb
+++ b/apps/workbench/app/views/collections/show.html.erb
@@ -79,7 +79,7 @@
        <input type="text" class="form-control" placeholder="Search"/>
         -->
 
-        <div id="sharing-button" style="text-align: center">
+        <div id="sharing-button">
           <%= render partial: 'sharing_button' %>
         </div>