hyrax 2.1.0.beta1 → 2.1.0.beta2

data/app/views/hyrax/base/_file_manager_actions.html.erb

@@ -1,5 +1,5 @@
   <div class="actions form-horizontal panel panel-default">
-    <%= button_tag "Save", class: "btn btn-primary disabled", data: { action: "save-actions" }%>
-    <%= button_tag "Sort alphabetically", class: "btn btn-primary", data: { action: "alpha-sort-action" }%>
+    <%= button_tag "Save", class: "btn btn-primary disabled", data: { action: "save-actions" } %>
+    <%= button_tag "Sort alphabetically", class: "btn btn-primary", data: { action: "alpha-sort-action" } %>
   </div>
   <%= render "file_manager_resource_form" %>

data/app/views/hyrax/base/_file_manager_member.html.erb

@@ -21,7 +21,7 @@
             <%= render "file_manager_thumbnail", node: node %>
           </div>
           <div class="attributes">
-            <%= render "file_manager_attributes", node: node, f: f%>
+            <%= render "file_manager_attributes", node: node, f: f %>
           </div>
           <div class="spacer">
           </div>

data/app/views/hyrax/base/_form_child_work_relationships.html.erb

@@ -8,8 +8,7 @@ CSS:
 HTML Properties:
   table:
     [data-behavior="child-relationships"] : allows the javascript to be initialized
-    data-param-key : the parameter key value for this model type
-%>
+    data-param-key : the parameter key value for this model type %>
 <div class="form-group" data-behavior="child-relationships" data-param-key="<%= f.object.model_name.param_key %>" data-members="<%= f.object.work_members_json %>">
   <div class="form-inline">
       <%= f.label :find_child_work %>

data/app/views/hyrax/base/_form_files.html.erb

@@ -1,6 +1,6 @@
      <div id="fileupload">
         <!-- Redirect browsers with JavaScript disabled to the origin page -->
-        <noscript><input type="hidden" name="redirect" value="<%= main_app.root_path %>"></noscript>
+        <noscript><input type="hidden" name="redirect" value="<%= main_app.root_path %>" /></noscript>
         <!-- The table listing the files available for upload/download -->
         <table role="presentation" class="table table-striped"><tbody class="files"></tbody></table>
         <% if Hyrax.config.browse_everything? %>
@@ -16,13 +16,13 @@
                 <span id="addfiles" class="btn btn-success fileinput-button">
                     <span class="glyphicon glyphicon-plus"></span>
                     <span>Add files...</span>
-                    <input type="file" name="files[]" multiple>
+                    <input type="file" name="files[]" multiple />
                 </span>
                 <!-- The fileinput-button span is used to style the file input field as button -->
                 <span id="addfolder" class="btn btn-success fileinput-button">
                     <span class="glyphicon glyphicon-plus"></span>
                     <span>Add folder...</span>
-                    <input type="file" name="files[]" multiple directory webkitdirectory>
+                    <input type="file" name="files[]" multiple directory webkitdirectory />
                 </span>
                 <% if Hyrax.config.browse_everything? %>
                   <%= button_tag(type: 'button', class: 'btn btn-success', id: "browse-btn",

data/app/views/hyrax/base/_form_member_of_collections.html.erb

@@ -8,8 +8,7 @@ CSS:
 HTML Properties:
   table:
     [data-behavior="child-relationships"] : allows the javascript to be initialized
-    data-param-key : the parameter key value for this model type
-%>
+    data-param-key : the parameter key value for this model type %>
 <h2><%= t("hyrax.works.form.in_collections") %></h2>
 
 <div class="form-group" data-behavior="collection-relationships" data-param-key="<%= f.object.model_name.param_key %>" data-members="<%= f.object.member_of_collections_json %>">

data/app/views/hyrax/base/_form_progress.html.erb

@@ -32,19 +32,19 @@
       <% if ::Flipflop.active_deposit_agreement_acceptance? %>
         <label>
           <%= check_box_tag 'agreement', 1, f.object.agreement_accepted, required: true %>
-          <%= t('hyrax.active_consent_to_agreement') %><br>
+          <%= t('hyrax.active_consent_to_agreement') %><br />
           <%= link_to t('hyrax.pages.tabs.agreement_page'),
                       hyrax.agreement_path,
                       target: '_blank' %>
         </label>
       <% else %>
-        <%= t('hyrax.passive_consent_to_agreement') %><br>
+        <%= t('hyrax.passive_consent_to_agreement') %><br />
         <%= link_to t('hyrax.pages.tabs.agreement_page'),
                     hyrax.agreement_path,
                     target: '_blank' %>
       <% end %>
     <% end %>
-    <br>
+    <br />
     <% cancel_path = f.object.persisted? ? polymorphic_path([main_app, f.object]) : hyrax.my_works_path %>
     <%= link_to t(:'helpers.action.cancel'),
                 cancel_path,

data/app/views/hyrax/base/_form_relationships.html.erb

@@ -3,8 +3,7 @@
   <%= f.input :admin_set_id, as: :select,
       include_blank: false,
       collection: Hyrax::AdminSetOptionsPresenter.new(Hyrax::AdminSetService.new(controller)).select_options,
-      input_html: { class: 'form-control' },
-      selected: AdminSet::DEFAULT_ID %>
+      input_html: { class: 'form-control' } %>
 <% end %>
 
 <%= render 'form_in_works', f: f %>
@@ -12,5 +11,5 @@
 
 <% if f.object.persisted? %>
   <h2><%= t("hyrax.works.form.in_this_work") %></h2>
-  <%= render 'form_child_work_relationships', f: f  %>
+  <%= render 'form_child_work_relationships', f: f %>
 <% end %>

data/app/views/hyrax/base/_form_representative.html.erb

@@ -9,4 +9,3 @@
       </fieldset>
     </div>
   </div>
-

data/app/views/hyrax/base/_form_share.html.erb

@@ -10,8 +10,7 @@
   <span id="permissions_error_text"></span>
 </div>
 
-
-<p class="sr-only">Use the add button to give access to one <%=t('hyrax.account_label') %> at a time (it will be added to the list below).
+<p class="sr-only">Use the add button to give access to one <%= t('hyrax.account_label') %> at a time (it will be added to the list below).
   Select the user, by name or <%= t('hyrax.account_label') %>. Then select the access level you wish to grant and click on Add this
   <%= t('hyrax.account_label') %> to complete adding the permission.
 </p>
@@ -79,7 +78,6 @@
   <% end %>
 </table>
 
-
 <script type="text/x-tmpl" id="tmpl-work-grant">
 <tr>
   <td>{%= o.accessLabel %}</td>

data/app/views/hyrax/base/_form_thumbnail.html.erb

@@ -9,4 +9,3 @@
       </fieldset>
     </div>
   </div>
-

data/app/views/hyrax/base/_form_visibility_component.html.erb

@@ -8,9 +8,9 @@
       <ul class="visibility">
         <li class="radio">
           <label>
-            <%= f.radio_button :visibility, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC, data: { 'target': '#collapsePublic' }  %>
+            <%= f.radio_button :visibility, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC, data: { 'target': '#collapsePublic' } %>
             <%= visibility_badge(Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC) %>
-            <br>
+            <br />
             <%= t('hyrax.visibility.open.note_html', type: f.object.human_readable_type) %>
             <div class="collapse" id="collapsePublic">
               <%= t('hyrax.visibility.open.warning_html', label: visibility_badge(Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC)) %>
@@ -21,7 +21,7 @@
           <label>
             <%= f.radio_button :visibility, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED %>
             <%= visibility_badge(Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED) %>
-            <br>
+            <br />
             <%= t('hyrax.visibility.authenticated.note_html', institution: institution_name) %>
           </label>
         </li>
@@ -29,7 +29,7 @@
           <label>
             <%= f.radio_button :visibility, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_EMBARGO, data: { 'target': '#collapseEmbargo' } %>
             <%= visibility_badge(Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_EMBARGO) %>
-            <br>
+            <br />
             <%= t('hyrax.visibility.embargo.note_html') %>
             <div class="collapse" id="collapseEmbargo">
               <div class="form-inline">
@@ -45,7 +45,7 @@
           <label>
             <%= f.radio_button :visibility, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_LEASE, data: { 'target': '#collapseLease' } %>
             <%= visibility_badge(Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_LEASE) %>
-            <br>
+            <br />
             <%= t('hyrax.visibility.lease.note_html') %>
             <div class="collapse" id="collapseLease">
               <div class="form-inline">
@@ -61,7 +61,7 @@
           <label>
             <%= f.radio_button :visibility, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE %>
             <%= visibility_badge(Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE) %>
-            <br>
+            <br />
             <%= t('hyrax.visibility.restricted.note_html') %>
           </label>
         </li>

data/app/views/hyrax/base/_relationships_parent_rows.html.erb

@@ -10,4 +10,6 @@
   <% end %>
 <% end %>
 
-<%= presenter.attribute_to_html(:admin_set, render_as: :faceted) %>
+<% if current_user %>
+  <%= presenter.attribute_to_html(:admin_set, render_as: :faceted) %>
+<% end %>

data/app/views/hyrax/base/_representative_media.html.erb

@@ -2,7 +2,7 @@
   <% if defined?(viewer) && viewer %>
     <%= PulUvRails::UniversalViewer.script_tag %>
     <div class="viewer-wrapper">
-      <div class="uv viewer" data-uri="<%= main_app.polymorphic_path [main_app, :manifest, presenter] %>"></div>
+      <div class="uv viewer" data-uri="<%= main_app.polymorphic_path [main_app, :manifest, presenter], { locale: nil } %>"></div>
     </div>
   <% else %>
     <%= media_display presenter.representative_presenter %>

data/app/views/hyrax/base/_share_with.html.erb

@@ -1,6 +1,6 @@
 <p>You may grant &quot;View/Download&quot; or &quot;Edit&quot; access for specific users and/or groups to files.
-  Enter a valid <%=t('hyrax.account_name') %>, one at a time, select the access level for that user and click
-  <button class='btn btn-xs btn-inverse' onclick='return false;'><i class='glyphicon glyphicon-plus' ></i>Add</button>.
+  Enter a valid <%= t('hyrax.account_name') %>, one at a time, select the access level for that user and click
+  <button class='btn btn-xs btn-inverse' onclick='return false;'><i class='glyphicon glyphicon-plus'></i>Add</button>.
 </p>
 
 <%= render 'hyrax/file_sets/groups_description' %>
@@ -8,7 +8,7 @@
 <h5><b>Permission Definitions</b></h5>
 <p>
   <strong>View/Download:</strong> this file (both contents and metadata) is accessible from within
-  <%=application_name %>.<br />
+  <%= application_name %>.<br />
   <strong>Edit:</strong> this file (both contents and metadata) can be edited. You may only grant
   this permission to <%= institution_name %> users and/or groups.
 </p>

data/app/views/hyrax/base/_show_actions.html.erb

@@ -8,8 +8,21 @@
       <% if presenter.member_presenters.size > 1 %>
           <%= link_to t("hyrax.file_manager.link_text"), polymorphic_path([main_app, :file_manager, presenter]), class: 'btn btn-default' %>
       <% end %>
+      <% if presenter.valid_child_concerns.length > 0 %>
+        <div class="btn-group">
+          <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+            Attach Child <span class="caret"></span>
+          </button>
+          <ul class="dropdown-menu">
+            <% presenter.valid_child_concerns.each do |concern| %>
+              <li>
+                <%= link_to "Attach #{concern.human_readable_type}", polymorphic_path([main_app, :new, :hyrax, :parent, concern.model_name.singular], parent_id: presenter.id) %>
+              </li>
+            <% end %>
+          </ul>
+        </div>
+      <% end %>
   <% end %>
-
   <% if presenter.work_featurable? %>
       <%= link_to "Feature", hyrax.featured_work_path(presenter, format: :json),
           data: { behavior: 'feature' },

data/app/views/hyrax/base/_social_media.html.erb

@@ -6,7 +6,7 @@
     <div class="resp-sharing-button resp-sharing-button--facebook resp-sharing-button--small"><div aria-hidden="true" class="resp-sharing-button__icon resp-sharing-button__icon--solid">
       <svg version="1.1" x="0px" y="0px" width="24px" height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
           <g>
-              <path d="M18.768,7.465H14.5V5.56c0-0.896,0.594-1.105,1.012-1.105s2.988,0,2.988,0V0.513L14.171,0.5C10.244,0.5,9.5,3.438,9.5,5.32 v2.145h-3v4h3c0,5.212,0,12,0,12h5c0,0,0-6.85,0-12h3.851L18.768,7.465z"/>
+              <path d="M18.768,7.465H14.5V5.56c0-0.896,0.594-1.105,1.012-1.105s2.988,0,2.988,0V0.513L14.171,0.5C10.244,0.5,9.5,3.438,9.5,5.32 v2.145h-3v4h3c0,5.212,0,12,0,12h5c0,0,0-6.85,0-12h3.851L18.768,7.465z" />
           </g>
       </svg>
       </div>
@@ -18,7 +18,7 @@
     <div class="resp-sharing-button resp-sharing-button--twitter resp-sharing-button--small"><div aria-hidden="true" class="resp-sharing-button__icon resp-sharing-button__icon--solid">
       <svg version="1.1" x="0px" y="0px" width="24px" height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
           <g>
-              <path d="M23.444,4.834c-0.814,0.363-1.5,0.375-2.228,0.016c0.938-0.562,0.981-0.957,1.32-2.019c-0.878,0.521-1.851,0.9-2.886,1.104 C18.823,3.053,17.642,2.5,16.335,2.5c-2.51,0-4.544,2.036-4.544,4.544c0,0.356,0.04,0.703,0.117,1.036 C8.132,7.891,4.783,6.082,2.542,3.332C2.151,4.003,1.927,4.784,1.927,5.617c0,1.577,0.803,2.967,2.021,3.782 C3.203,9.375,2.503,9.171,1.891,8.831C1.89,8.85,1.89,8.868,1.89,8.888c0,2.202,1.566,4.038,3.646,4.456 c-0.666,0.181-1.368,0.209-2.053,0.079c0.579,1.804,2.257,3.118,4.245,3.155C5.783,18.102,3.372,18.737,1,18.459 C3.012,19.748,5.399,20.5,7.966,20.5c8.358,0,12.928-6.924,12.928-12.929c0-0.198-0.003-0.393-0.012-0.588 C21.769,6.343,22.835,5.746,23.444,4.834z"/>
+              <path d="M23.444,4.834c-0.814,0.363-1.5,0.375-2.228,0.016c0.938-0.562,0.981-0.957,1.32-2.019c-0.878,0.521-1.851,0.9-2.886,1.104 C18.823,3.053,17.642,2.5,16.335,2.5c-2.51,0-4.544,2.036-4.544,4.544c0,0.356,0.04,0.703,0.117,1.036 C8.132,7.891,4.783,6.082,2.542,3.332C2.151,4.003,1.927,4.784,1.927,5.617c0,1.577,0.803,2.967,2.021,3.782 C3.203,9.375,2.503,9.171,1.891,8.831C1.89,8.85,1.89,8.868,1.89,8.888c0,2.202,1.566,4.038,3.646,4.456 c-0.666,0.181-1.368,0.209-2.053,0.079c0.579,1.804,2.257,3.118,4.245,3.155C5.783,18.102,3.372,18.737,1,18.459 C3.012,19.748,5.399,20.5,7.966,20.5c8.358,0,12.928-6.924,12.928-12.929c0-0.198-0.003-0.393-0.012-0.588 C21.769,6.343,22.835,5.746,23.444,4.834z" />
           </g>
       </svg>
       </div>
@@ -30,8 +30,8 @@
     <div class="resp-sharing-button resp-sharing-button--google resp-sharing-button--small"><div aria-hidden="true" class="resp-sharing-button__icon resp-sharing-button__icon--solid">
       <svg version="1.1" x="0px" y="0px" width="24px" height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
           <g>
-              <path d="M11.366,12.928c-0.729-0.516-1.393-1.273-1.404-1.505c0-0.425,0.038-0.627,0.988-1.368 c1.229-0.962,1.906-2.228,1.906-3.564c0-1.212-0.37-2.289-1.001-3.044h0.488c0.102,0,0.2-0.033,0.282-0.091l1.364-0.989 c0.169-0.121,0.24-0.338,0.176-0.536C14.102,1.635,13.918,1.5,13.709,1.5H7.608c-0.667,0-1.345,0.118-2.011,0.347 c-2.225,0.766-3.778,2.66-3.778,4.605c0,2.755,2.134,4.845,4.987,4.91c-0.056,0.22-0.084,0.434-0.084,0.645 c0,0.425,0.108,0.827,0.33,1.216c-0.026,0-0.051,0-0.079,0c-2.72,0-5.175,1.334-6.107,3.32C0.623,17.06,0.5,17.582,0.5,18.098 c0,0.501,0.129,0.984,0.382,1.438c0.585,1.046,1.843,1.861,3.544,2.289c0.877,0.223,1.82,0.335,2.8,0.335 c0.88,0,1.718-0.114,2.494-0.338c2.419-0.702,3.981-2.482,3.981-4.538C13.701,15.312,13.068,14.132,11.366,12.928z M3.66,17.443 c0-1.435,1.823-2.693,3.899-2.693h0.057c0.451,0.005,0.892,0.072,1.309,0.2c0.142,0.098,0.28,0.192,0.412,0.282 c0.962,0.656,1.597,1.088,1.774,1.783c0.041,0.175,0.063,0.35,0.063,0.519c0,1.787-1.333,2.693-3.961,2.693 C5.221,20.225,3.66,19.002,3.66,17.443z M5.551,3.89c0.324-0.371,0.75-0.566,1.227-0.566l0.055,0 c1.349,0.041,2.639,1.543,2.876,3.349c0.133,1.013-0.092,1.964-0.601,2.544C8.782,9.589,8.363,9.783,7.866,9.783H7.865H7.844 c-1.321-0.04-2.639-1.6-2.875-3.405C4.836,5.37,5.049,4.462,5.551,3.89z"/>
-              <polygon points="23.5,9.5 20.5,9.5 20.5,6.5 18.5,6.5 18.5,9.5 15.5,9.5 15.5,11.5 18.5,11.5 18.5,14.5 20.5,14.5 20.5,11.5  23.5,11.5 	"/>
+              <path d="M11.366,12.928c-0.729-0.516-1.393-1.273-1.404-1.505c0-0.425,0.038-0.627,0.988-1.368 c1.229-0.962,1.906-2.228,1.906-3.564c0-1.212-0.37-2.289-1.001-3.044h0.488c0.102,0,0.2-0.033,0.282-0.091l1.364-0.989 c0.169-0.121,0.24-0.338,0.176-0.536C14.102,1.635,13.918,1.5,13.709,1.5H7.608c-0.667,0-1.345,0.118-2.011,0.347 c-2.225,0.766-3.778,2.66-3.778,4.605c0,2.755,2.134,4.845,4.987,4.91c-0.056,0.22-0.084,0.434-0.084,0.645 c0,0.425,0.108,0.827,0.33,1.216c-0.026,0-0.051,0-0.079,0c-2.72,0-5.175,1.334-6.107,3.32C0.623,17.06,0.5,17.582,0.5,18.098 c0,0.501,0.129,0.984,0.382,1.438c0.585,1.046,1.843,1.861,3.544,2.289c0.877,0.223,1.82,0.335,2.8,0.335 c0.88,0,1.718-0.114,2.494-0.338c2.419-0.702,3.981-2.482,3.981-4.538C13.701,15.312,13.068,14.132,11.366,12.928z M3.66,17.443 c0-1.435,1.823-2.693,3.899-2.693h0.057c0.451,0.005,0.892,0.072,1.309,0.2c0.142,0.098,0.28,0.192,0.412,0.282 c0.962,0.656,1.597,1.088,1.774,1.783c0.041,0.175,0.063,0.35,0.063,0.519c0,1.787-1.333,2.693-3.961,2.693 C5.221,20.225,3.66,19.002,3.66,17.443z M5.551,3.89c0.324-0.371,0.75-0.566,1.227-0.566l0.055,0 c1.349,0.041,2.639,1.543,2.876,3.349c0.133,1.013-0.092,1.964-0.601,2.544C8.782,9.589,8.363,9.783,7.866,9.783H7.865H7.844 c-1.321-0.04-2.639-1.6-2.875-3.405C4.836,5.37,5.049,4.462,5.551,3.89z" />
+              <polygon points="23.5,9.5 20.5,9.5 20.5,6.5 18.5,6.5 18.5,9.5 15.5,9.5 15.5,11.5 18.5,11.5 18.5,14.5 20.5,14.5 20.5,11.5  23.5,11.5 	" />
           </g>
       </svg>
       </div>
@@ -43,7 +43,7 @@
     <div class="resp-sharing-button resp-sharing-button--tumblr resp-sharing-button--small"><div aria-hidden="true" class="resp-sharing-button__icon resp-sharing-button__icon--solid">
       <svg version="1.1" x="0px" y="0px" width="24px" height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
           <g>
-              <path d="M13.5,0.5v5h5v4h-5v5.515c0,5.028,3.52,4.427,6,2.798v4.433c-6.728,3.172-12-0.064-12-4.255V9.5h-3V6.668 c0.903-0.293,2.245-0.714,2.889-1.261c0.646-0.551,1.162-1.208,1.551-1.976C9.331,2.664,9.6,1.686,9.746,0.5H13.5z"/>
+              <path d="M13.5,0.5v5h5v4h-5v5.515c0,5.028,3.52,4.427,6,2.798v4.433c-6.728,3.172-12-0.064-12-4.255V9.5h-3V6.668 c0.903-0.293,2.245-0.714,2.889-1.261c0.646-0.551,1.162-1.208,1.551-1.976C9.331,2.664,9.6,1.686,9.746,0.5H13.5z" />
           </g>
       </svg>
       </div>

data/app/views/hyrax/base/_work_title.erb

@@ -10,7 +10,9 @@
       <% end %>
     </div>
     <div class="col-sm-4 text-right">
-      <%= render "show_actions", presenter: presenter %>
+      <% if index == 0 %>
+        <%= render "show_actions", presenter: presenter %>
+      <% end %>
     </div>
   </div>
 <% end %>

data/app/views/hyrax/base/_workflow_actions.html.erb

@@ -24,7 +24,7 @@
           <textarea class="form-control" name="workflow_action[comment]" id="workflow_action_comment"></textarea>
         </div>
 
-        <input class="btn btn-primary" type="submit" value="Submit">
+        <input class="btn btn-primary" type="submit" value="Submit" />
 
         <h4>Previous Comments</h4>
         <dl>

data/app/views/hyrax/base/inspect_work.html.erb

@@ -34,4 +34,4 @@
 <dl>
   <dt>Solr</dt>
   <dd><%= @presenter.inspect_work.solr %></dd>
-</dl>
+</dl>

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

@@ -33,8 +33,8 @@
             <%= render 'relationships', presenter: @presenter %>
             <%= render 'items', presenter: @presenter %>
             <%# TODO: we may consider adding these partials in the future %>
-            <%#= render 'sharing_with', presenter: @presenter %>
-            <%#= render 'user_activity', presenter: @presenter %>
+            <%# = render 'sharing_with', presenter: @presenter %>
+            <%# = render 'user_activity', presenter: @presenter %>
           </div>
         </div>
       </div>

data/app/views/hyrax/batch_edits/_check_all.html.erb

@@ -1,7 +1,7 @@
-<div class="dropdown batch_document_selector_all" >
+<div class="dropdown batch_document_selector_all">
   <%= check_box_tag 'check_all', 'yes', @all_checked, disabled: @disable_select_all %>
   <% if !@disable_select_all %>
-    <a class="dropdown-toggle"  data-toggle="dropdown" href="#"><span class="sr-only">Select to access selection options</span><span class="caret"></span></a>
+    <a class="dropdown-toggle" data-toggle="dropdown" href="#"><span class="sr-only">Select to access selection options</span><span class="caret"></span></a>
     <ul class="dropdown-menu">
       <%= render "batch_edits_actions" %>
     </ul>

data/app/views/hyrax/batch_edits/edit.html.erb

@@ -5,31 +5,32 @@
    <%= @form.names.join(", ").html_safe %>
 </div> <!-- /original values -->
 
-<div >
+<div>
   <h3> Descriptions:</h3>
-
+  <div class="panel panel-default tabs">
     <ul class="nav nav-tabs">
       <li id="edit_descriptions_link" class="active"><a href="#descriptions_display" data-toggle="tab"><i class="glyphicon glyphicon-tags"></i> Descriptions</a></li>
       <li id="edit_permissions_link"><a href="#permissions_display" data-toggle="tab"><i class="glyphicon glyphicon-lock"></i> Permissions</a></li>
     </ul>
-    <div class="tab-content">
-      <div class="tab-pane active" id="descriptions_display">
-        <% @form.terms.each do |term| %>
-          <div class="row">
-            <%= simple_form_for @form,
-                                url: hyrax.batch_edits_path,
-                                method: :put,
-                                remote: true,
-                                builder: Hyrax::FormBuilder,
-                                html: { id: "form_#{term.to_s}",
-                                        class: "ajax-form" },
-                                data: { model: @form.model_name.param_key } do |f| %>
-              <div class="col-xs-12 col-sm-4">
-                <a class="accordion-toggle grey glyphicon-chevron-right-helper collapsed" data-toggle="collapse" href="#collapse_<%= term %>" id="expand_link_<%=term.to_s%>">
-                  <%= f.input_label term %> <span class="chevron"></span>
-                </a>
-              </div>
-              <div id="collapse_<%= term %>" class="collapse scrolly col-xs-12 col-sm-7">
+    <div class="panel-body">
+      <div class="tab-content">
+        <div class="tab-pane active" id="descriptions_display">
+          <% @form.terms.each do |term| %>
+            <div class="row">
+              <%= simple_form_for @form,
+                                  url: hyrax.batch_edits_path,
+                                  method: :put,
+                                  remote: true,
+                                  builder: Hyrax::FormBuilder,
+                                  html: { id: "form_#{term.to_s}",
+                                          class: "ajax-form" },
+                                  data: { model: @form.model_name.param_key } do |f| %>
+                <div class="col-xs-12 col-sm-4">
+                  <a class="accordion-toggle grey glyphicon-chevron-right-helper collapsed" data-toggle="collapse" href="#collapse_<%= term %>" id="expand_link_<%=term.to_s%>">
+                    <%= f.input_label term %> <span class="chevron"></span>
+                  </a>
+                </div>
+                <div id="collapse_<%= term %>" class="collapse scrolly col-xs-12 col-sm-7">
                   <%= hidden_field_tag('update_type', 'update') %>
                   <%= hidden_field_tag('key', term.to_s) %>
                   <%# TODO we don't need to show required %>
@@ -42,34 +43,36 @@
                     <a class="btn btn-default" data-toggle="collapse" data-parent="#row_<%= term.to_s %>" href="#collapse_<%= term.to_s %>">Cancel </a>
                     <div class="status fleft"></div>
                   </div>
-              </div>
-            <% end %>
-          </div>
-        <% end %>
-      </div><!-- #descriptions_display -->
+                </div>
+              <% end %>
+            </div>
+          <% end %>
+        </div><!-- #descriptions_display -->
 
-    <div id="permissions_display" class="tab-pane">
-      <%= simple_form_for @form.model,
-                          url: hyrax.batch_edits_path,
-                          method: :put,
-                          remote: true,
-                          html: { id: "form_permissions", class: "ajax-form"},
-                          data: { 'param-key' => @form.model_name.param_key } do |f| %>
-        <%= hidden_field_tag('update_type', 'update') %>
-        <%= hidden_field_tag('key', 'permissions') %>
-        <%= render "hyrax/base/form_permission", f: f %>
-        <%= render "hyrax/base/form_share", f: f %>
+        <div id="permissions_display" class="tab-pane">
+          <%= simple_form_for @form.model,
+                              url: hyrax.batch_edits_path,
+                              method: :put,
+                              remote: true,
+                              html: { id: "form_permissions", class: "ajax-form"},
+                              data: { 'param-key' => @form.model_name.param_key } do |f| %>
+            <%= hidden_field_tag('update_type', 'update') %>
+            <%= hidden_field_tag('key', 'permissions') %>
+            <%= render "hyrax/base/form_permission", f: f %>
+            <%= render "hyrax/base/form_share", f: f %>
 
-        <% @form.batch_document_ids.each do |batch_id| %>
-          <%= hidden_field_tag "batch_document_ids[]", batch_id %>
-        <% end %>
-        <div class="row">
-            <%= f.submit "Save changes", class: 'btn btn-primary', id: 'permissions_save' %>
-            <div id="status_permissions" class="status fleft"></div>
+            <% @form.batch_document_ids.each do |batch_id| %>
+              <%= hidden_field_tag "batch_document_ids[]", batch_id %>
+            <% end %>
+            <div class="row">
+              <%= f.submit "Save changes", class: 'btn btn-primary', id: 'permissions_save' %>
+              <div id="status_permissions" class="status fleft"></div>
+            </div>
+          <% end %>
         </div>
-      <% end %>
+      </div> <!-- .tab-content -->
     </div>
-  </div> <!-- .tab-content -->
+  </div>
 
 <!-- Ajax call to clear the batch before page uload. -->
 <%= button_to "Clear Batch", hyrax.clear_batch_edits_path, form_class: 'hidden', remote: true, id: 'clear_batch' %>