sufia 4.0.0.beta4 → 4.0.0.rc1

data/app/views/collections/_collection.html.erb

@@ -0,0 +1,36 @@
+<li>
+  <h2>
+    <%= link_to collection.title_or_label, [collections, collection] %>
+  </h2>
+  <table class="table">
+    <tr>
+      <td rowspan="6" class="span20">
+        <%= link_to [collections, collection] do %>
+          <%= image_tag "folder.png", { width: 150 } %>
+        <% end %>
+      </td>
+      <th><h4>Title:</h4></th>
+      <td><%= collection.title %></td>
+    </tr>
+    <tr>
+      <th><h4>Depositor:<h4></div>
+      <td><%= link_to_profile collection.depositor("no depositor value") %></td>
+    </tr>
+    <tr>
+      <th><h4>Creator:</h4></th>
+      <td><%= collection.creator %></td>
+    </tr>
+    <tr>
+      <th><h4>Description:</h4></th>
+      <td><%= iconify_auto_link(collection.description) %></th>
+    </tr>
+    <tr>
+      <th><h4>Keywords:</h4></th>
+      <td><%= collection.tags.join(', ') %></td>
+    </tr>
+    <tr>
+      <th><h4>Date Uploaded:</h4></th>
+      <td><%= collection.date_uploaded %></td>
+    </tr>
+  </table>
+</li>

data/app/views/collections/_document_list.html.erb

@@ -6,5 +6,5 @@
 <% if params[:action] == "edit" %>
   <%= render partial:'my/_index_partials/default_group', locals:{documents: documents, docs:documents} %>
 <% else %>
-  <%= render partial:'catalog/_index_partials/default_group', locals:{documents: documents, docs:documents} %>
-<% end %>
+  <%= render 'catalog/document_list', documents: documents %>
+<% end %>

data/app/views/collections/_edit_descriptions.html.erb

@@ -12,7 +12,7 @@
       </div><!-- /well -->
     <div class="row">
       <div class="form-actions">
-        <%= f.button '<i class="icon-save"></i> Save Descriptions'.html_safe, type: 'submit', class: 'btn-primary', 
+        <%= f.button '<i class="glyphicon glyphicon-floppy-disk"></i> Save Descriptions'.html_safe, type: 'submit', class: 'btn-primary',
           onclick: "confirmation_needed = false;", id: "upload_submit", name: "update_descriptions" %>
       </div>
     </div>

data/app/views/collections/_form.html.erb

@@ -13,12 +13,15 @@
       <input type="hidden" name="batch_document_ids[]" value="<%= batch_item %>"/>
     <% end %>
   <% end %>
-  <%= f.actions do %>
-    <% if params[:action] == "new" %>
-      <%= f.submit 'Create Collection' %>
-    <% else %>
-      <%= f.submit 'Update Collection' %>
-    <% end %>
-    <%= f.cancel %>
-  <% end %>
+  
+  <div class="form-actions">
+    <div class="primary-actions">
+      <% if params[:action] == "new" %>
+        <%= f.primary 'Create Collection' %>
+      <% else %>
+        <%= f.primary 'Update Collection' %>
+      <% end %>
+      <%= link_to t(:'helpers.action.cancel'), main_app.root_path, class: 'btn btn-link' %>
+    </div>
+  </div>
 <% end %>

data/app/views/collections/_search_collection_dashboard_form.html.erb

@@ -5,6 +5,6 @@
       <%= text_field_tag :cq, params[:cq], class: "collection-query", placeholder: "Search Collection", size: '30', type: "search", id: "collection_search" %>
       <%= hidden_field_tag :sort, params[:sort], id: 'collection_sort' %>
       <%= render_hash_as_hidden_fields(params_for_search.except(:cq, :sort, :qt, :page)) %>
-      <button type="submit" class="btn btn-primary" id="collection_submit"><i class="icon-search"></i> Go</button>
+      <button type="submit" class="btn btn-primary" id="collection_submit"><i class="glyphicon glyphicon-search"></i> Go</button>
   <% end %>
 </div>

data/app/views/collections/_sort_and_per_page.html.erb

@@ -21,7 +21,7 @@
             <% end %>
             <%= render_hash_as_hidden_fields(params_for_search.except(:per_page, :sort)) %>
             &nbsp;&nbsp;&nbsp;
-            <button class="btn btn-primary"><i class="icon-refresh"></i> Refresh</button>
+            <button class="btn btn-primary"><i class="glyphicon glyphicon-refresh"></i> Refresh</button>
             <%= render 'view_type_group' %>
          <% end %>
       <% end unless sort_fields.empty? %>

data/app/views/dashboard/index.html.erb

@@ -16,7 +16,7 @@
     </div>
     <div class="col-xs-4 heading-tile">
     <span class="glyphicon glyphicon-folder-open"></span>
-      <%= link_to t("sufia.dashboard.create_collection"), collections.new_collection_path %>
+      <%= link_to t("sufia.dashboard.create_collection"), collections.new_collection_path, id: "hydra-collection-add" %>
     </div>
     <div class="col-xs-4 heading-tile">
     <span class="glyphicon glyphicon-eye-open"></span>

data/app/views/generic_files/_descriptions.html.erb

@@ -14,7 +14,7 @@
       </div><!-- /well -->
     <div class="row">
       <div class="form-actions">
-        <%= f.button '<i class="icon-save"></i> Save Descriptions'.html_safe, type: 'submit', class: 'btn-primary', onclick: "confirmation_needed = false;", id: "upload_submit", name: "update_descriptions" %>
+        <%= f.button '<i class="glyphicon glyphicon-floppy-disk"></i> Save Descriptions'.html_safe, type: 'submit', class: 'btn-primary', onclick: "confirmation_needed = false;", id: "upload_submit", name: "update_descriptions" %>
       </div>
     </div>
   <% end %>

data/app/views/generic_files/_edit.js.erb

@@ -0,0 +1,22 @@
+if (navigator.userAgent.match("MSIE"))
+  $("form").validate();
+
+initialize_audio();
+
+$('input[name=revision]:radio').on('click', function() {
+  $('#save_version_note').fadeIn('slow');
+});
+
+confirmation_needed = false;
+window.onbeforeunload = confirmExit;
+
+function confirmExit(){
+  if(confirmation_needed) {
+    // if you return a string it will be displayed in between "don't navigate away"
+    // and "click Ok to navigate away or cancel to stay put" in the confirm dialog
+    return "Your metadata has not been saved.";
+  }
+}
+
+// only valid for perm tab
+set_access_levels();

data/app/views/generic_files/_extra_fields_modal.html.erb

@@ -1,21 +1,25 @@
 <div class="modal-div extra_tag">
 <% label = name.to_s.titleize %>
 <!-- Button to trigger modal -->
-<a href="#extraFieldsModal_<%=name %>" role="button" class="btn btn-warning fright vmiddle" data-toggle="modal">Additional <%= label %> <i class="icon-plus-sign icon-large"></i></a>
+<a href="#extraFieldsModal_<%=name %>" role="button" class="btn btn-warning fright vmiddle" data-toggle="modal">Additional <%= label %> <i class="glyphicon glyphicon-plus large-icon"></i></a>
 <!-- Modal -->
-<div class="modal hide" id="extraFieldsModal_<%=name %>" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-  <div class="modal-header">
-    <button type="button" class="close" data-dismiss="modal" aria-hidden="true"></button>
-    <h2 id="extraFieldsModal_<%=name %>_Label">Additional <%= label %>(s)</h2>
-  </div>
-  <div class="modal-body" aria-hidden="true">
-      <% values[start..values.length].each do |value| %>
-         <% next if value.empty? %>
-         <%= "#{value.truncate(250)}" %><br />
-      <% end %>
-  </div>
-  <div class="modal-footer">
-    <button class="btn btn-primary" data-dismiss="modal" aria-hidden="true">Close</button>
+<div class="modal fade" id="extraFieldsModal_<%=name %>" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true"></button>
+        <h2 id="extraFieldsModal_<%=name %>_Label">Additional <%= label %>(s)</h2>
+      </div>
+      <div class="modal-body">
+          <% values[start..values.length].each do |value| %>
+             <% next if value.empty? %>
+             <%= "#{value.truncate(250)}" %><br />
+          <% end %>
+      </div>
+      <div class="modal-footer">
+        <button class="btn btn-primary" data-dismiss="modal">Close</button>
+      </div>
+    </div>
   </div>
 </div>
 </div>

data/app/views/generic_files/_generic_file.html.erb

@@ -0,0 +1,36 @@
+<li>
+  <h2>
+    <%= link_to generic_file.title_or_label, sufia.generic_file_path(generic_file) %>
+    <small>[<%= link_to 'Download', sufia.download_path(generic_file), target: '_new' %>]</small>
+  </h2>
+  <table class="table">
+    <tr>
+      <td rowspan="6" class="span20">
+        <%= render_thumbnail_tag generic_file, { width: 150 } %>
+      </td>
+      <th><h4>Title:</h4></th>
+      <td><%= generic_file.title %></td>
+    </tr>
+    <tr>
+      <th><h4>Depositor:<h4></div>
+      <td><%= link_to_profile generic_file.depositor("no depositor value") %></td>
+    </tr>
+    <tr>
+      <th><h4>Creator:</h4></th>
+      <td><%= generic_file.creator %></td>
+    </tr>
+    <tr>
+      <th><h4>Description:</h4></th>
+      <td><%= iconify_auto_link(generic_file.description) %></th>
+    </tr>
+    <tr>
+      <th><h4>Keywords:</h4></th>
+      <td><%= generic_file.tags.join(', ') %></td>
+    </tr>
+    <tr>
+      <th><h4>Date Uploaded:</h4></th>
+      <td><%= generic_file.date_uploaded %></td>
+    </tr>
+  </table>
+</li>
+

data/app/views/generic_files/_media_display.html.erb

@@ -22,6 +22,10 @@
 
   <%= render_download_icon "Download the full-sized PDF" %>
 
+<% elsif @generic_file.office_document?%>
+
+    <%= render_download_icon "Download the full-sized Document" %>
+
 <% else %>
 
   <%= render_download_icon %>

data/app/views/generic_files/_permission.html.erb

@@ -3,7 +3,7 @@
       <%= hidden_field_tag('redirect_tab', 'permissions') %>
       <%= render partial: "generic_files/permission_form", locals: { gf: @generic_file, f: f } %>
       <div class="row form-actions" id="permissions_submit">
-              <%= button_tag '<i class="icon-save"></i> Save'.html_safe, type: 'submit', class: 'btn-primary btn-large', onclick: "confirmation_needed = false;", id: "upload_submit", name: "update_permission" %>
+              <%= button_tag '<i class="glyphicon glyphicon-floppy-disk"></i> Save'.html_safe, type: 'submit', class: 'btn-primary btn-large', onclick: "confirmation_needed = false;", id: "upload_submit", name: "update_permission" %>
       </div>
   <% end %>
 </div><!-- /#permissions_display -->

data/app/views/generic_files/_permission_form.html.erb

@@ -13,45 +13,49 @@
   <div class="row">
     <p class="pull-right">
     <!-- Button to trigger modal -->
-    <a href="#myModal" role="button" class="btn btn-warning" data-toggle="modal">What's this <i class="glyphicon glyphicon-question-sign icon-large"></i></a>
+    <a href="#myModal" role="button" class="btn btn-warning" data-toggle="modal">What's this <i class="glyphicon glyphicon-question-sign large-icon"></i></a>
 <!-- Modal -->
-<div class="modal hide" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-  <div class="modal-header">
-    <button type="button" class="close" data-dismiss="modal" aria-hidden="true"></button>
-    <h2 id="myModalLabel"><%=t('sufia.product_name') %> Permissions</h2>
-  </div>
-  <div class="modal-body">
-    <h3>Visibility</h3>
-    <p>This setting will determine who can view your file, and the associated metadata. Setting
-    the visibility to <span class="label label-success">Open Access</span> will allow your content to be discovered in Google and viewed by anyone.
-    The visibility setting <span class="label label-info"><%=t('sufia.institution_name') %></span> will only allow users who are logged into <%=t('sufia.product_name') %>
-    (via WebAccess) to view the content.  Files that are marked <span class="label label-important">Private</span> are only able to be viewed
-    by users and/or groups that have been given specific access in the &quot;Share With&quot; section.
-    </p>
+<div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true"></button>
+        <h2 id="myModalLabel"><%=t('sufia.product_name') %> Permissions</h2>
+      </div>
+      <div class="modal-body">
+        <h3>Visibility</h3>
+        <p>This setting will determine who can view your file, and the associated metadata. Setting
+        the visibility to <span class="label label-success">Open Access</span> will allow your content to be discovered in Google and viewed by anyone.
+        The visibility setting <span class="label label-info"><%=t('sufia.institution_name') %></span> will only allow users who are logged into <%=t('sufia.product_name') %>
+        (via WebAccess) to view the content.  Files that are marked <span class="label label-important">Private</span> are only able to be viewed
+        by users and/or groups that have been given specific access in the &quot;Share With&quot; section.
+        </p>
 
-    <p>
-    Permissions in <%=t('sufia.product_name') %> are hierarchical.  This means that you cannot set the visibility of a file to <span class="label label-success">Open Access</span> or
-    <span class="label label-info"><%=t('sufia.institution_name') %></span> and simultaneously try to restrict the access of a single user. However, you may mark the visibility of
-    a file as <span class="label label-danger">Private</span> and then grant access to particular users and/or groups for that file in the &quot;Share With&quot;
-    section.
-    </p>
+        <p>
+        Permissions in <%=t('sufia.product_name') %> are hierarchical.  This means that you cannot set the visibility of a file to <span class="label label-success">Open Access</span> or
+        <span class="label label-info"><%=t('sufia.institution_name') %></span> and simultaneously try to restrict the access of a single user. However, you may mark the visibility of
+        a file as <span class="label label-danger">Private</span> and then grant access to particular users and/or groups for that file in the &quot;Share With&quot;
+        section.
+        </p>
 
-    <h3>Share With</h3>
-    <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('sufia.account_name') %>, one at a time, select the access level for that user and click
-    <button class="btn btn-mini btn-inverse" onclick="return false;"><i class="icon-plus-sign" ></i>Add</button>.
-    </p>
+        <h3>Share With</h3>
+        <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('sufia.account_name') %>, one at a time, select the access level for that user and click
+        <button class="btn btn-mini btn-inverse" onclick="return false;"><i class="glyphicon glyphicon-plus" ></i>Add</button>.
+        </p>
 
-    <%= render partial: 'generic_files/groups_description' %>
+        <%= render partial: 'generic_files/groups_description' %>
 
-    <h3>Permission Definitions</h3>
-    <p>
-    <strong>View/Download:</strong> this file (both contents and metadata) is accessible from within <%=t('sufia.product_name') %>.<br />
-    <strong>Edit:</strong> this file (both contents and metadata) can be edited.  You may only grant this permission to <%=t('sufia.institution_name') %> users and/or groups.
-    </p>
-  </div>
-  <div class="modal-footer">
-    <button class="btn btn-primary" data-dismiss="modal" aria-hidden="true">Close</button>
+        <h3>Permission Definitions</h3>
+        <p>
+        <strong>View/Download:</strong> this file (both contents and metadata) is accessible from within <%=t('sufia.product_name') %>.<br />
+        <strong>Edit:</strong> this file (both contents and metadata) can be edited.  You may only grant this permission to <%=t('sufia.institution_name') %> users and/or groups.
+        </p>
+      </div>
+      <div class="modal-footer">
+        <button class="btn btn-primary" data-dismiss="modal">Close</button>
+      </div>
+    </div>
   </div>
 </div>
     </p>
@@ -79,7 +83,7 @@
         <p class="help-block">Enter <%=t('sufia.account_label') %> (one at a time)</p>
         <%= text_field_tag 'new_user_name_skel', nil, class: "span29" %><span class="add-on"><%=t('sufia.directory.suffix') %></span>
         <%= select_tag 'new_user_permission_skel', options_for_select(Sufia.config.permission_levels), class: 'span17' %>
-        <button class="btn btn-mini btn-inverse" id="add_new_user_skel"><i class="icon-plus-sign"></i> Add</button>
+        <button class="btn btn-mini btn-inverse" id="add_new_user_skel"><i class="glyphicon glyphicon-plus"></i> Add</button>
         <br /> <span id="directory_user_result"></span>
       </div>
     </div>
@@ -89,7 +93,7 @@
       <div class="input-append">
         <%= select_tag 'new_group_name_skel', options_for_select(["Select a group"] + current_user.groups), class: 'span38' %>
         <%= select_tag 'new_group_permission_skel', options_for_select(Sufia.config.permission_levels), class: 'span17' %>
-        <button class="btn btn-mini btn-inverse" id="add_new_group_skel" ><i class="icon-plus-sign"></i> Add</button>
+        <button class="btn btn-mini btn-inverse" id="add_new_group_skel" ><i class="glyphicon glyphicon-plus"></i> Add</button>
         <br /><span id="directory_group_result"></span>
       </div>
     </div>

data/app/views/generic_files/_rights_modal.html.erb

@@ -1,39 +1,43 @@
 <div class="modal-div">
 <!-- Button to trigger modal -->
-<a href="#rightsModal" role="button" class="btn btn-warning fright" data-toggle="modal">License Descriptions <i class="glyphicon glyphicon-question-sign icon-large"></i></a>
+<a href="#rightsModal" role="button" class="btn btn-warning fright" data-toggle="modal">License Descriptions <i class="glyphicon glyphicon-question-sign large-icon"></i></a>
 <!-- Modal -->
-<div class="modal hide" id="rightsModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-  <div class="modal-header">
-    <button type="button" class="close" data-dismiss="modal" aria-hidden="true"></button>
-    <h2 id="rightsModallLabel"><%= t('sufia.product_name') %> License Descriptions</h2>
-  </div>
-  <div class="modal-body" aria-hidden="true">
-    <p>Creative Commons licenses can take the following combinations, which is what a depositor sees on the page where metadata (descriptions) are entered. Via the drop-down menu, the depositor may select any of the following licenses (these are all described at "About the Licenses" on the Creative Commons site):
-    </p> <ul>
-    <li><b>Attribution 3.0: CC BY</b><br/>
-    With this license you allow others to "distribute, remix, tweak, and build" on your deposited content - including for commercial purposes - provided they attribute you as the original creator.</li>
-    <li><b>Attribution-Share-Alike 3.0: CC BY-SA</b> <br/>
-    With this license you allow others to "remix, tweak, and build" on your deposited content, including for commercial uses, provided they attribute you as the original creator AND incorporate the same level of licensing (i.e., CC BY-SA) for the newly resulting creation. "All new works based on yours will carry the same license, so any derivatives will also allow commercial use."</li>
-    <li><b>Attribution-NoDerivs 3.0: CC BY-ND </b><br/>
-    With this license you permit "redistribution, commercial and non-commercial," provided the content remains unaltered and intact (i.e., whole) and provided you are attributed as the original creator.</li>
-    <li><b>Attribution-Non-Commercial 3.0: CC BY-NC</b><br/>
-    With this license you allow others to "remix, tweak, and build" on your content in non-commercial ways. While they must credit you as the original creator and while the remixed, tweaked, or expanded upon content must remain non-commercial, they do not have to apply identical license terms on the new content.</li>
-    <li><b>Attribution-NonCommercial-NoDerivs 3.0 CC BY-NC-ND</b><br/>
-    With this license you share your work with others and allow them to download your work, provided they attribute you as the creator and refrain from changing the content in any way and from using it for commercial means. </li>
-    <li><b>Attribution-Non-Commercial-Share-Alike 3.0: CC BY-NC-SA</b><br/>
-    With this license you allow others to "remix, tweak, and build" on your content in non-commercial ways, provided they give you credit (as the original creator) and also apply the same license level to the newly resulting creations.</li>
-    <li><b>Attribution-Non-Commercial-Share-Alike-NoDerivs 3.0: CC BY-NC-SA-ND</b><br/>
-    With this license you share your work with others and allow them to download it, provided they attribute you as the creator; they must also refrain from changing the content in any way and from using it for commercial means. </li>
-    <li><b>Public Domain Mark 1.0 </b><br/>
-    When content is in the public domain, it has no known copyright owner. </li>
-    <li><b>CC0 1.0 Universal </b><br/>
-    With this license you are waiving your rights as copyright owner to the content you upload. This means your content may be distributed and reused without attribution, without restriction. CC0 is a license that one applies to one's own work; rarely does one apply it to another's work, unless one has the appropriate rights to do so.</li>
-    </ul>
-</p>
-<p> Please note: Another license option that is listed is <b>"All rights reserved."</b> With this license you - as the copyright holder - reserve all rights held under copyright law, such as for distribution and creation of derivative works. This means that no one can use your content in a work - such as a presentation or article - or create derivatives from it without your permission.</p>
-  </div>
-  <div class="modal-footer">
-    <button class="btn btn-primary" data-dismiss="modal" aria-hidden="true">Close</button>
+<div class="modal fade" id="rightsModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true"></button>
+        <h2 id="rightsModallLabel"><%= t('sufia.product_name') %> License Descriptions</h2>
+      </div>
+      <div class="modal-body">
+        <p>Creative Commons licenses can take the following combinations, which is what a depositor sees on the page where metadata (descriptions) are entered. Via the drop-down menu, the depositor may select any of the following licenses (these are all described at "About the Licenses" on the Creative Commons site):
+        </p> <ul>
+        <li><b>Attribution 3.0: CC BY</b><br/>
+        With this license you allow others to "distribute, remix, tweak, and build" on your deposited content - including for commercial purposes - provided they attribute you as the original creator.</li>
+        <li><b>Attribution-Share-Alike 3.0: CC BY-SA</b> <br/>
+        With this license you allow others to "remix, tweak, and build" on your deposited content, including for commercial uses, provided they attribute you as the original creator AND incorporate the same level of licensing (i.e., CC BY-SA) for the newly resulting creation. "All new works based on yours will carry the same license, so any derivatives will also allow commercial use."</li>
+        <li><b>Attribution-NoDerivs 3.0: CC BY-ND </b><br/>
+        With this license you permit "redistribution, commercial and non-commercial," provided the content remains unaltered and intact (i.e., whole) and provided you are attributed as the original creator.</li>
+        <li><b>Attribution-Non-Commercial 3.0: CC BY-NC</b><br/>
+        With this license you allow others to "remix, tweak, and build" on your content in non-commercial ways. While they must credit you as the original creator and while the remixed, tweaked, or expanded upon content must remain non-commercial, they do not have to apply identical license terms on the new content.</li>
+        <li><b>Attribution-NonCommercial-NoDerivs 3.0 CC BY-NC-ND</b><br/>
+        With this license you share your work with others and allow them to download your work, provided they attribute you as the creator and refrain from changing the content in any way and from using it for commercial means. </li>
+        <li><b>Attribution-Non-Commercial-Share-Alike 3.0: CC BY-NC-SA</b><br/>
+        With this license you allow others to "remix, tweak, and build" on your content in non-commercial ways, provided they give you credit (as the original creator) and also apply the same license level to the newly resulting creations.</li>
+        <li><b>Attribution-Non-Commercial-Share-Alike-NoDerivs 3.0: CC BY-NC-SA-ND</b><br/>
+        With this license you share your work with others and allow them to download it, provided they attribute you as the creator; they must also refrain from changing the content in any way and from using it for commercial means. </li>
+        <li><b>Public Domain Mark 1.0 </b><br/>
+        When content is in the public domain, it has no known copyright owner. </li>
+        <li><b>CC0 1.0 Universal </b><br/>
+        With this license you are waiving your rights as copyright owner to the content you upload. This means your content may be distributed and reused without attribution, without restriction. CC0 is a license that one applies to one's own work; rarely does one apply it to another's work, unless one has the appropriate rights to do so.</li>
+        </ul>
+    </p>
+    <p> Please note: Another license option that is listed is <b>"All rights reserved."</b> With this license you - as the copyright holder - reserve all rights held under copyright law, such as for distribution and creation of derivative works. This means that no one can use your content in a work - such as a presentation or article - or create derivatives from it without your permission.</p>
+      </div>
+      <div class="modal-footer">
+        <button class="btn btn-primary" data-dismiss="modal">Close</button>
+      </div>
+    </div>
   </div>
 </div>
 </div>

data/app/views/generic_files/edit.html.erb

@@ -1,32 +1,9 @@
-<% content_for :local_js do %>
-   if (navigator.userAgent.match("MSIE")){
-      $("form").validate();
-   }
-initialize_audio();
-
-$('input[name=revision]:radio').on('click', function() {
-    $('#save_version_note').fadeIn('slow');
-    });
-
-confirmation_needed = false;
-window.onbeforeunload = confirmExit;
-function confirmExit(){
-      if(confirmation_needed){
-      // if you return a string it will be displayed in between "don't navigate away"
-      // and "click Ok to navigate away or cancel to stay put" in the confirm dialog
-         return "Your metadata has not been saved.";
-      }
- }
-// only valid for perm tab
-set_access_levels();
-
-// initialize popover helpers
-$("a[rel=popover]").popover({ html: true });
-
+<%= javascript_tag do %>
+  <%= render partial: "edit", formats: [:js] %>
 <% end %>
 
-    <%= render partial: 'breadcrumbs' %>
-    <h1 class="lower">Edit <%= @generic_file %></h1>
+<%= render partial: 'breadcrumbs' %>
+<h1 class="lower">Edit <%= @generic_file %></h1>
 
 <div class="row">
   <div class="col-xs-12 col-sm-4">
@@ -35,9 +12,15 @@ $("a[rel=popover]").popover({ html: true });
   <div class="col-xs-12 col-sm-8">
     <%= link_to "&lt;&lt;Browse view".html_safe, sufia.generic_file_path(@generic_file) %>
     <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_versioning_link"><a href="#versioning_display" data-toggle="tab"><i class="glyphicon glyphicon-sitemap"></i> Versions</a></li>
-      <li id="edit_permissions_link"><a href="#permissions_display" data-toggle="tab"><i class="glyphicon glyphicon-key"></i> Permissions</a></li>
+      <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_versioning_link">
+        <a href="#versioning_display" data-toggle="tab"><i class="glyphicon glyphicon-sitemap"></i> Versions</a>
+      </li>
+      <li id="edit_permissions_link"><a href="#permissions_display" data-toggle="tab">
+        <i class="glyphicon glyphicon-key"></i> Permissions</a>
+      </li>
     </ul>
     <div class="tab-content">
       <%= render partial: "descriptions", locals: { generic_file: @generic_file } %>