X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/5cf53c5f133040aa21ebfb4e7687e8759cfea636..c6210b84588721c1e337c7dd9a0e25edb14301bb:/apps/workbench/app/views/user_agreements/index.html.erb

diff --git a/apps/workbench/app/views/user_agreements/index.html.erb b/apps/workbench/app/views/user_agreements/index.html.erb
index 53a37a2006..49516eb67d 100644
--- a/apps/workbench/app/views/user_agreements/index.html.erb
+++ b/apps/workbench/app/views/user_agreements/index.html.erb
@@ -1,55 +1,44 @@
-<h1>User agreements</h1>
-
-<p>You must read and sign all applicable user agreements before continuing.</p>
-
-<button data-toggle="modal" href="#open_user_agreement" class="btn btn-primary">Show details</button>
+<% content_for :breadcrumbs do raw '<!-- -->' end %>
 
 <% n_files = @required_user_agreements.collect(&:files).flatten(1).count %>
-
+<% content_for :page_title do %>
 <% if n_files == 1 %>
-<% content_for :css do %>
-#open_user_agreement { width: 900px; margin-left: -450px; }
-#open_user_agreement .modal-body { max-height: 900px; }
+<%= @required_user_agreements.first.files.first[1].sub(/\.[a-z]{3,4}$/,'') %>
+<% else %>
+User agreements
 <% end %>
 <% end %>
 
-<div id="open_user_agreement" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="uaModalLabel" aria-hidden="true" data-show="true">
-  <%= form_for(@required_user_agreements.first, {url: {action: 'sign', controller: 'user_agreements'}}) do |f| %>
-  <%= hidden_field_tag :return_to, request.url %>
-  <div class="modal-header">
-    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-    <h3 id="uaModalLabel">User agreement<%= 's' if n_files != 1 %></h3>
+<%= form_for(@required_user_agreements.first, {url: {action: 'sign', controller: 'user_agreements'}, method: 'post'}) do |f| %>
+<%= hidden_field_tag :return_to, request.url %>
+<div id="open_user_agreement">
+  <div class="alert alert-info">
+    <strong>Please check <%= n_files > 1 ? 'each' : 'the' %> box below</strong> to indicate that you have read and accepted the user agreement<%= 's' if n_files > 1 %>.
   </div>
-  <div class="modal-body">
-    <% if n_files == 1 %>
-      <% ua = @required_user_agreements.first; file = ua.files.first %>
-      <object data="<%= url_for(controller: 'collections', action: 'show_file', uuid: ua.uuid, file: "#{file[0]}/#{file[1]}") %>" type="<%= Rack::Mime::MIME_TYPES[file[1].match(/\.\w+$/)[0]] rescue '' %>" width="100%" height="400px">
-      </object>
+  <% if n_files == 1 and (Rails.configuration.show_user_agreement_inline rescue false) %>
+  <% ua = @required_user_agreements.first; file = ua.files.first %>
+  <object data="<%= url_for(controller: 'collections', action: 'show_file', uuid: ua.uuid, file: "#{file[0]}/#{file[1]}") %>" type="<%= Rack::Mime::MIME_TYPES[file[1].match(/\.\w+$/)[0]] rescue '' %>" width="100%" height="400px">
+  </object>
+  <% end %>
+  <div>
+    <% @required_user_agreements.each do |ua| %>
+    <% ua.files.each do |file| %>
+    <%= f.label 'checked[]', class: 'checkbox inline' do %>
+    <%= check_box_tag 'checked[]', "#{ua.uuid}/#{file[0]}/#{file[1]}", false %>
+    Accept <%= file[1].sub(/\.[a-z]{3,4}$/,'') %>
+    <%= link_to 'View agreement', {controller: 'collections', action: 'show_file', uuid: ua.uuid, file: "#{file[0]}/#{file[1]}"}, {target: '_blank', class: 'btn btn-mini btn-primary'} %>
+    <% end %>
+    <% end %>
     <% end %>
-    <div class="alert alert-info">
-      <strong>Please check <%= n_files > 1 ? 'each' : 'the' %> box</strong> to indicate that you have read and accepted the agreement.
-    </div>
-    <div style="margin-left: 4em">
-      <% @required_user_agreements.each do |ua| %>
-      <% ua.files.each do |file| %>
-      <%= f.label 'checked[]', class: 'checkbox inline' do %>
-      <%= check_box_tag 'checked[]', "#{ua.uuid}/#{file[0]}/#{file[1]}", false %>
-      <%= link_to 'open', {controller: 'collections', action: 'show_file', uuid: ua.uuid, file: "#{file[0]}/#{file[1]}"}, {target: '_blank', class: 'label label-info'} %>
-      <%= file[1] %>
-      <% end %>
-      <% end %>
-      <% end %>
-    </div>
   </div>
-  <div class="modal-footer">
-    <button class="btn" data-dismiss="modal" aria-hidden="true">Cancel</button>
-    <%= f.submit 'Accept', {class: 'btn btn-primary', disabled: true} %>
+  <div style="height: 1em"></div>
+  <div>
+    <%= f.submit 'Continue', {class: 'btn btn-primary', disabled: true} %>
   </div>
-  <% end %>
 </div>
+<% end %>
 
 <% content_for :footer_js do %>
-$('#open_user_agreement').modal();
 $('#open_user_agreement input[name="checked[]"]').on('click', function() {
     var dialog = $('#open_user_agreement')[0]
     $('input[type=submit]', dialog).prop('disabled',false);