RubyGems - sufia - Versions diffs - 3.7.2 → 4.0.0.beta1 - Mend

sufia 3.7.2 → 4.0.0.beta1

Files changed (275) hide show

checksums.yaml +4 -4
data/.travis.yml +1 -1
data/Gemfile +3 -0
data/README.md +88 -11
data/SUFIA_VERSION +1 -1
data/app/assets/images/old_main_tulips.jpg +0 -0
data/app/assets/javascripts/contact_form.js +0 -16
data/app/assets/javascripts/jquery.blacklightTagCloud.js +44 -0
data/app/assets/javascripts/jquery.tagcloud.js +116 -0
data/app/assets/javascripts/jquery.tinysort.min.js +7 -0
data/app/assets/javascripts/sufia.js +41 -44
data/app/assets/javascripts/sufia/edit_metadata.js +1 -1
data/app/assets/javascripts/sufia/editor.js +12 -0
data/app/assets/javascripts/sufia/featured_works.js +64 -0
data/app/assets/javascripts/sufia/fileupload.js +1 -1
data/app/assets/javascripts/sufia/multiForm.js +1 -1
data/app/assets/javascripts/sufia/permissions.js +4 -8
data/app/assets/javascripts/sufia/single_use_link.js +1 -2
data/app/assets/javascripts/sufia/trophy.js +42 -27
data/app/assets/javascripts/terms_of_service.js +1 -1
data/app/assets/stylesheets/dashboard.css.scss +81 -40
data/app/assets/stylesheets/featured.css.scss +16 -0
data/app/assets/stylesheets/fileupload/{jquery.fileupload-ui.css → jquery.fileupload-ui.css.erb} +2 -2
data/app/assets/stylesheets/{generic_files.css → generic_files.css.erb} +6 -7
data/app/assets/stylesheets/header.css.scss +93 -0
data/app/assets/stylesheets/home-page.css.scss +50 -0
data/app/assets/stylesheets/nestable.css.scss +111 -0
data/app/assets/stylesheets/styles.css.scss +106 -0
data/app/assets/stylesheets/sufia.css.scss +13 -8
data/app/assets/stylesheets/tagcloud.css +83 -0
data/app/assets/stylesheets/usage-stats.css +30 -0
data/app/controllers/batch_controller.rb +0 -1
data/app/controllers/concerns/sufia/catalog.rb +64 -0
data/app/controllers/concerns/sufia/dashboard_controller_behavior.rb +16 -13
data/app/controllers/content_blocks_controller.rb +8 -0
data/app/controllers/featured_work_lists_controller.rb +16 -0
data/app/controllers/featured_works_controller.rb +26 -0
data/app/controllers/mailbox_controller.rb +1 -1
data/app/controllers/pages_controller.rb +7 -0
data/app/controllers/single_use_links_viewer_controller.rb +2 -5
data/app/controllers/tinymce_assets_controller.rb +12 -0
data/app/helpers/content_block_helper.rb +21 -0
data/app/helpers/generic_file_helper.rb +2 -2
data/app/helpers/sufia_helper.rb +8 -4
data/app/helpers/trophy_helper.rb +15 -7
data/app/models/content_block.rb +2 -0
data/app/models/featured_work_list.rb +42 -0
data/app/models/tinymce_asset.rb +3 -0
data/app/uploaders/tinymce_asset_uploader.rb +51 -0
data/app/views/_add_assets_links.html.erb +0 -16
data/app/views/_controls.html.erb +17 -0
data/app/views/_flash_msg.html.erb +2 -18
data/app/views/_footer.html.erb +10 -15
data/app/views/_ga.html.erb +0 -16
data/app/views/_logo.html.erb +2 -2
data/app/views/_masthead.html.erb +9 -36
data/app/views/_user_util_links.html.erb +16 -11
data/app/views/advanced/_advanced_search_facets.html.erb +0 -16
data/app/views/advanced/_advanced_search_fields.html.erb +0 -16
data/app/views/advanced/_advanced_search_help.html.erb +0 -16
data/app/views/advanced/_facet_layout.html.erb +0 -16
data/app/views/advanced/_facet_limit.html.erb +0 -16
data/app/views/advanced/index.html.erb +2 -18
data/app/views/batch/_metadata.html.erb +3 -3
data/app/views/batch/edit.html.erb +4 -21
data/app/views/catalog/_facet_limit.html.erb +11 -12
data/app/views/catalog/_featured_researcher.html.erb +2 -0
data/app/views/catalog/_home.html.erb +6 -2
data/app/views/catalog/_home_content.html.erb +36 -0
data/app/views/catalog/_home_header.html.erb +15 -0
data/app/views/catalog/_recent_document.html.erb +1 -1
data/app/views/catalog/_recents.html.erb +3 -4
data/app/views/catalog/_search_form.html.erb +13 -9
data/app/views/catalog/_tagcloud.html.erb +7 -0
data/app/views/catalog/index.html.erb +4 -10
data/app/views/contact_form/create.html.erb +0 -16
data/app/views/contact_form/new.html.erb +0 -16
data/app/views/dashboard/_constraints.html.erb +3 -19
data/app/views/dashboard/_did_you_mean.html.erb +0 -16
data/app/views/dashboard/_document_list.html.erb +0 -16
data/app/views/dashboard/_facet_layout.html.erb +1 -17
data/app/views/dashboard/_facet_limit.html.erb +5 -5
data/app/views/dashboard/_facet_selected.html.erb +1 -17
data/app/views/dashboard/_facets.html.erb +0 -18
data/app/views/dashboard/_heading.html.erb +1 -1
data/app/views/dashboard/_index_partials/_default_group.html.erb +7 -23
data/app/views/dashboard/_index_partials/_list_files.html.erb +62 -57
data/app/views/dashboard/_search_form.html.erb +10 -7
data/app/views/dashboard/_show_partials/_default.html.erb +0 -18
data/app/views/dashboard/_show_partials/_default_details.html.erb +0 -16
data/app/views/dashboard/_show_partials/_facets.html.erb +0 -16
data/app/views/dashboard/_sort_and_per_page.html.erb +10 -9
data/app/views/dashboard/facet.html.erb +4 -19
data/app/views/dashboard/index.html.erb +27 -49
data/app/views/error/401.html.erb +1 -17
data/app/views/error/404.html.erb +0 -16
data/app/views/error/500.html.erb +0 -16
data/app/views/error/single_use_error.html.erb +1 -17
data/app/views/generic_files/_asset_deleted_flash.html.erb +0 -16
data/app/views/generic_files/_asset_permissions_denial_flash.html.erb +0 -16
data/app/views/generic_files/_asset_saved_flash.html.erb +0 -16
data/app/views/generic_files/_asset_updated_flash.html.erb +0 -16
data/app/views/generic_files/_breadcrumbs.html.erb +0 -16
data/app/views/generic_files/_browse_everything.html.erb +24 -0
data/app/views/generic_files/_descriptions.html.erb +1 -1
data/app/views/generic_files/_field_form.html.erb +5 -5
data/app/views/generic_files/_media_display.html.erb +3 -3
data/app/views/generic_files/_permission_form.html.erb +5 -5
data/app/views/generic_files/_rights_modal.html.erb +13 -29
data/app/views/generic_files/_show_actions.html.erb +13 -1
data/app/views/generic_files/_versioning.html.erb +14 -10
data/app/views/generic_files/citation.html.erb +0 -16
data/app/views/generic_files/edit.html.erb +10 -12
data/app/views/generic_files/edit_fields/_default.html.erb +1 -1
data/app/views/generic_files/edit_fields/_description.html.erb +1 -1
data/app/views/generic_files/edit_fields/_resource_type.html.erb +2 -3
data/app/views/generic_files/edit_fields/_rights.html.erb +1 -1
data/app/views/generic_files/new.html.erb +11 -26
data/app/views/generic_files/show.html.erb +7 -25
data/app/views/generic_files/stats.html.erb +141 -0
data/app/views/homepage/_featured.html.erb +11 -0
data/app/views/homepage/_featured_fields.html.erb +18 -0
data/app/views/homepage/_featured_works.html.erb +17 -0
data/app/views/homepage/_sortable_featured.html.erb +26 -0
data/app/views/layouts/_head_tag_content.html.erb +1 -1
data/app/views/layouts/_homepage_sidebar2.html.erb +14 -0
data/app/views/layouts/error.html.erb +3 -21
data/app/views/layouts/homepage.html.erb +8 -37
data/app/views/layouts/sufia-dashboard.html.erb +46 -0
data/app/views/layouts/sufia-one-column.html.erb +8 -24
data/app/views/layouts/sufia-two-column.html.erb +9 -8
data/app/views/pages/show.html.erb +4 -0
data/app/views/single_use_links_viewer/show.html.erb +2 -2
data/app/views/static/agreement.html.erb +0 -17
data/app/views/static/help.html.erb +0 -17
data/app/views/static/mendeley.html.erb +0 -16
data/app/views/static/subject_libraries.html.erb +0 -17
data/app/views/static/terms.html.erb +0 -16
data/app/views/static/zotero.html.erb +0 -16
data/app/views/users/_activity_log.html.erb +2 -2
data/app/views/users/_contributions.html.erb +6 -2
data/app/views/users/_follower_modal.html.erb +2 -2
data/app/views/users/_following_modal.html.erb +2 -2
data/app/views/users/_left_sidebar.html.erb +1 -1
data/app/views/users/_notify_link.html.erb +1 -1
data/app/views/users/_notify_number.html.erb +1 -1
data/app/views/users/_profile_actions.html.erb +3 -3
data/app/views/users/_profile_tabs.html.erb +1 -1
data/app/views/users/_search_form.html.erb +3 -2
data/app/views/users/_social_media_info.html.erb +3 -3
data/app/views/users/_trophy_edit.html.erb +2 -2
data/app/views/users/_user_info.html.erb +27 -27
data/app/views/users/_vitals.html.erb +2 -2
data/app/views/users/edit.html.erb +39 -39
data/app/views/users/index.html.erb +3 -3
data/app/views/users/show.html.erb +7 -9
data/config/locales/sufia.en.yml +15 -7
data/config/routes.rb +12 -9
data/lib/generators/sufia/sufia_generator.rb +18 -15
data/lib/generators/sufia/templates/catalog_controller.rb +11 -73
data/lib/generators/sufia/templates/config/tinymce.yml +7 -0
data/lib/sufia.rb +7 -0
data/lib/sufia/downloads_controller_behavior.rb +3 -4
data/lib/sufia/files_controller_behavior.rb +38 -27
data/lib/sufia/version.rb +1 -1
data/spec/controllers/batch_controller_spec.rb +1 -1
data/spec/controllers/batch_edits_controller_spec.rb +5 -5
data/spec/controllers/catalog_controller_spec.rb +37 -58
data/spec/controllers/content_blocks_controller_spec.rb +37 -0
data/spec/controllers/downloads_controller_spec.rb +3 -11
data/spec/controllers/featured_work_lists_controller_spec.rb +20 -0
data/spec/controllers/featured_works_controller_spec.rb +50 -0
data/spec/controllers/generic_files_controller_spec.rb +74 -9
data/spec/controllers/mailbox_controller_spec.rb +1 -1
data/spec/controllers/pages_controller_spec.rb +25 -0
data/spec/controllers/single_use_links_controller_spec.rb +1 -1
data/spec/controllers/single_use_links_viewer_controller_spec.rb +1 -1
data/spec/controllers/tinymce_assets_controller_spec.rb +39 -0
data/spec/controllers/users_controller_spec.rb +3 -8
data/spec/factories/content_blocks.rb +4 -0
data/spec/factories/featured_works.rb +4 -0
data/spec/factories/generic_files.rb +46 -39
data/spec/factories/users.rb +18 -18
data/spec/features/browse_dashboard_files_spec.rb +6 -7
data/spec/features/browse_files_spec.rb +9 -6
data/spec/features/cloud_upload_spec.rb +18 -0
data/spec/features/single_use_links_spec.rb +2 -3
data/spec/helpers/content_block_helper_spec.rb +31 -0
data/spec/helpers/generic_file_helper_spec.rb +3 -3
data/spec/helpers/sufia_helper_spec.rb +13 -81
data/spec/helpers/trophy_helper_spec.rb +39 -0
data/spec/jobs/import_url_job_spec.rb +1 -1
data/spec/jobs/ingest_local_file_job_spec.rb +1 -1
data/spec/lib/sufia/usage_statistics_spec.rb +75 -0
data/spec/models/ability_spec.rb +31 -0
data/spec/models/active_fedora_pid_based_job_spec.rb +1 -1
data/spec/models/audit_job_spec.rb +1 -1
data/spec/models/batch_spec.rb +1 -1
data/spec/models/batch_update_job_spec.rb +1 -1
data/spec/models/event_jobs_spec.rb +1 -1
data/spec/models/featured_work_list_spec.rb +23 -0
data/spec/models/featured_work_spec.rb +42 -0
data/spec/models/fits_datastream_spec.rb +2 -2
data/spec/models/generic_file/reload_on_save_spec.rb +1 -1
data/spec/models/generic_file/web_form_spec.rb +4 -4
data/spec/models/generic_file_spec.rb +41 -40
data/spec/models/pageview.rb +19 -0
data/spec/models/properties_datastream_spec.rb +2 -2
data/spec/models/solr_document_spec.rb +9 -0
data/spec/models/user_spec.rb +2 -2
data/spec/routing/featured_works_route_spec.rb +16 -0
data/spec/routing/route_spec.rb +10 -15
data/spec/spec_helper.rb +3 -0
data/spec/support/lib/generators/test_app_generator.rb +19 -8
data/spec/views/dashboard/facet_limit.html.erb_spec.rb +2 -2
data/spec/views/generic_file/show.html.erb_spec.rb +44 -0
data/spec/views/generic_file/stats.html.erb_spec.rb +47 -0
data/spec/views/users/_follower_modal.html.erb_spec.rb +18 -0
data/spec/views/users/_following_modal.html.erb_spec.rb +18 -0
data/spec/views/users/index.html.erb_spec.rb +1 -1
data/sufia-models/app/models/batch.rb +1 -1
data/sufia-models/app/models/concerns/sufia/properties_datastream_behavior.rb +30 -0
data/sufia-models/app/models/concerns/sufia/user.rb +1 -1
data/sufia-models/app/models/datastreams/batch_rdf_datastream.rb +4 -7
data/sufia-models/app/models/datastreams/fits_datastream.rb +3 -0
data/sufia-models/app/models/datastreams/generic_file_rdf_datastream.rb +53 -51
data/sufia-models/app/models/datastreams/properties_datastream.rb +1 -15
data/sufia-models/app/models/featured_work.rb +22 -0
data/sufia-models/app/models/sufia/pageview.rb +9 -0
data/sufia-models/{lib/sufia/models → app/services/sufia}/id_service.rb +0 -0
data/sufia-models/{lib/sufia/models → app/services/sufia}/noid.rb +0 -0
data/sufia-models/app/services/sufia/usage_statistics.rb +73 -0
data/sufia-models/config/locales/sufia.en.yml +3 -4
data/sufia-models/lib/generators/sufia/models/install_generator.rb +23 -8
data/sufia-models/lib/generators/sufia/models/templates/config/analytics.yml +9 -0
data/sufia-models/lib/generators/sufia/models/templates/config/mime_types.rb +6 -0
data/sufia-models/lib/generators/sufia/models/templates/config/sufia.rb +11 -2
data/sufia-models/lib/generators/sufia/models/templates/migrations/create_content_blocks.rb +10 -0
data/sufia-models/lib/generators/sufia/models/templates/migrations/create_featured_works.rb +12 -0
data/sufia-models/lib/generators/sufia/models/templates/migrations/create_tinymce_assets.rb +8 -0
data/sufia-models/lib/generators/sufia/models/usagestats_generator.rb +19 -0
data/sufia-models/lib/sufia/ability.rb +34 -0
data/sufia-models/lib/sufia/models/engine.rb +5 -3
data/sufia-models/lib/sufia/models/generic_file.rb +4 -2
data/sufia-models/lib/sufia/models/generic_file/export.rb +3 -3
data/sufia-models/lib/sufia/models/generic_file/featured.rb +14 -0
data/sufia-models/lib/sufia/models/solr_document_behavior.rb +11 -4
data/sufia-models/lib/sufia/models/version.rb +1 -1
data/sufia-models/sufia-models.gemspec +6 -5
data/sufia.gemspec +6 -4
data/tasks/release.rake +1 -0
data/tasks/sufia-dev.rake +5 -1
data/vendor/assets/javascripts/flot/excanvas.js +1428 -0
data/vendor/assets/javascripts/flot/jquery.flot.js +3137 -0
data/vendor/assets/javascripts/flot/jquery.flot.selection.js +360 -0
data/vendor/assets/javascripts/flot/jquery.flot.time.js +431 -0
data/vendor/assets/javascripts/nestable.js +647 -0
data/vendor/assets/javascripts/video.js +135 -126
data/{app → vendor}/assets/stylesheets/video-js.css.erb +7 -6
metadata +155 -33
data/app/assets/stylesheets/application-bootstrap.css.erb +0 -295
data/app/assets/stylesheets/audio-js.css +0 -3
data/app/assets/stylesheets/blacklight_more_facets.css +0 -427
data/app/assets/stylesheets/bootstrap.min.css.erb +0 -1433
data/app/assets/stylesheets/contact_form.css +0 -4
data/app/assets/stylesheets/reset_body.css +0 -4
data/app/assets/stylesheets/trophy.css +0 -7
data/app/helpers/blacklight/render_constraints_helper_behavior.rb +0 -84
data/app/helpers/facets_helper.rb +0 -3
data/app/helpers/sufia/facets_helper_behavior.rb +0 -23
data/app/views/catalog/_home_text.html.erb +0 -10
data/app/views/generic_files/_dropbox_import.html.erb +0 -3
data/app/views/generic_files/upload/_dropbox_chooser.html.erb +0 -39
data/app/views/static/about.html.erb +0 -21
data/spec/helpers/render_constraints_helper_behavior_spec.rb +0 -42

data/app/views/error/single_use_error.html.erb CHANGED Viewed

@@ -1,19 +1,3 @@
-<%#
-Copyright © 2012 The Pennsylvania State University
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-%>
 <!DOCTYPE html>
 <html>
   <head>
@@ -24,7 +8,7 @@ limitations under the License.
       <div class="column second">
         <h1>Single Use Link Expired or Not Found</h1>
         <p>
-          <%= t('sufia.product_name') %> could not locate the single use link.
+          <%= t('sufia.product_name') %> could not locate the single use link.
           This link either expired or had been used previously.  We apologize
           for the inconvenience. You might be interested in using
           <a href="/help/">the help page</a> for looking up

data/app/views/generic_files/_asset_deleted_flash.html.erb CHANGED Viewed

@@ -1,17 +1 @@
-<%#
-Copyright © 2012 The Pennsylvania State University
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-%>
 The file has been deleted.

data/app/views/generic_files/_asset_permissions_denial_flash.html.erb CHANGED Viewed

@@ -1,19 +1,3 @@
-<%#
-Copyright © 2012 The Pennsylvania State University
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-%>
 The file(s)
 <% generic_files.first(20).each  do |gf|%>
 <%= link_to(gf, generic_file_url(gf.noid)) %><%= ',' unless gf == generic_files.last %>

data/app/views/generic_files/_asset_saved_flash.html.erb CHANGED Viewed

@@ -1,19 +1,3 @@
-<%#
-Copyright © 2012 The Pennsylvania State University
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-%>
 The file(s)
 <% generic_files.first(20).each do |gf|%>
 <%= link_to(gf, generic_file_url(gf.noid)) %><%= ',' unless gf == generic_files.last %>

data/app/views/generic_files/_asset_updated_flash.html.erb CHANGED Viewed

@@ -1,17 +1 @@
-<%#
-Copyright © 2012 The Pennsylvania State University
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-%>
 The file <%= link_to(generic_file, sufia.generic_file_url(generic_file.noid)) %> has been updated.

data/app/views/generic_files/_breadcrumbs.html.erb CHANGED Viewed

@@ -1,19 +1,3 @@
-<%#
-Copyright © 2012 The Pennsylvania State University
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-%>
 <%# convert class variable to a local variable if the local hasn't been set %>
 <% generic_file = @generic_file unless generic_file  %>

data/app/views/generic_files/_browse_everything.html.erb ADDED Viewed

@@ -0,0 +1,24 @@
+<%= render partial: 'generic_files/upload/agreement' %>
+<%= render partial: 'generic_files/upload/alerts' %>
+<div class="well">
+  <%= form_tag(sufia.generic_files_path, id: 'browse_everything_form', method: 'post') do %>
+      <%= render partial: 'generic_files/upload/tos_checkbox' %>
+      <%= hidden_field_tag(:batch_id, @batch_noid) %>
+      <%= button_tag(t('sufia.upload.browse_everything.browse_files_button'), type: 'button', class: 'btn btn-large btn-success', id: "browse-btn",
+        'data-toggle' => 'browse-everything', 'data-route' => browse_everything_engine.root_path,
+        'data-target' => '#browse_everything_form' ) %>
+      <%= button_tag("Submit selected files", type: 'submit', class: 'activate-submit btn btn-large btn-primary', id: "submit-btn") %>
+  <% end %>
+  <p id="status">0 items selected</p>
+</div>
+<script>
+  // Update the count in #status element when user selects files.
+  $(document).ready(function() {
+    $('#browse-btn').browseEverything()
+      .done(function(data) {
+        $('#status').html(data.length.toString() + " <%= t('sufia.upload.browse_everything.files_selected')%>")
+        $('#submit-btn').html("Submit "+data.length.toString() + " selected files")
+      })
+  });
+</script>

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

@@ -4,7 +4,7 @@
 <div id="descriptions_display" class="tab-pane active">
   <%= form_for generic_file, :url => sufia.generic_file_path(@generic_file), :html => {:multipart => true, :class => 'form-horizontal'} do |f| %>
     <%= hidden_field_tag('redirect_tab', 'descriptions') %>
-    <h2 class="non lower">Descriptions <small class="pull-right"><span class="error">*</span> indicates required fields</small> </h2>
+    <h1>Descriptions <span class="pull-right required-field">* indicates required fields</span></h1>
       <div class="well">
         <% (generic_file.terms_for_editing).each do |term| %>

data/app/views/generic_files/_field_form.html.erb CHANGED Viewed

@@ -1,11 +1,11 @@
 <% render_req ||= true # render_req is true for single file edit, false for batch edit%>
-<div class="control-group">
+<div class="form-group">
   <% vals =  generic_file[key] %>
   <% if render_req && required?(key) %>
-    <% tmp = '<span class="error">*</span>' + get_label(key) %>
-    <%= f.label key, tmp.html_safe, :class=>"control-label"  %>
+    <% tmp = '<span class="required-field">*</span>' + get_label(key) %>
+    <%= f.label key, tmp.html_safe, :class=>"col-sm-3 control-label"  %>
   <% else %>
-    <%= f.label key, get_label(key), :class=>"control-label"%>
+    <%= f.label key, get_label(key), :class=>"col-sm-3 control-label"%>
   <% end %>
   <% if key == :resource_type %>
@@ -16,4 +16,4 @@
       <%= render_edit_field_partial(key, record: generic_file, f:f,  v: v, index: index, render_req: render_req) %>
     <% end %>
   <% end %>
- </div><!-- /control-group -->
+ </div><!-- /.form-group -->

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

@@ -1,5 +1,5 @@
 <% if @generic_file.image? %>
-  <%= link_to image_tag(sufia.download_path(@generic_file, datastream_id: 'thumbnail'),{width:"338", alt:"Download the full-sized image of #{@generic_file.title.first}"})+"Download the full-sized image", sufia.download_path(@generic_file), { target:"_new", title:"Download the full-sized image"}%>
+  <%= link_to image_tag(sufia.download_path(@generic_file, datastream_id: 'thumbnail'),{class:"img-responsive", alt:"Download the full-sized image of #{@generic_file.title.first}"})+"Download the full-sized image", sufia.download_path(@generic_file), { target:"_new", title:"Download the full-sized image"}%>
 <% elsif @generic_file.video? %>
   <video controls="controls" class="video-js vjs-default-skin" data-setup="{}" preload="auto">
     <source src="<%= sufia.download_path(@generic_file, datastream_id: 'webm') %>" type="video/webm" />
@@ -13,7 +13,7 @@
     Your browser does not support the audio tag.
   </audio>
 <% elsif @generic_file.pdf?%>
-  <%= link_to image_tag(sufia.download_path(@generic_file, datastream_id: 'thumbnail'),{width:"338", alt:"Download the full-sized PDF of #{@generic_file.title.first}"})+"Download the full-sized PDF", sufia.download_path(@generic_file), { target:"_new", title:"Download the full-sized PDF"}%>
+  <%= link_to image_tag(sufia.download_path(@generic_file, datastream_id: 'thumbnail'),{class:"img-responsive", alt:"Download the full-sized PDF of #{@generic_file.title.first}"})+"Download the full-sized PDF", sufia.download_path(@generic_file), { target:"_new", title:"Download the full-sized PDF"}%>
 <% else %>
-  <%= link_to image_tag("default.png", {alt:"No preview available", width:"338", height:"493"}),  sufia.download_path(@generic_file), { target:"_new", title:"Download the document"} %>
+  <%= link_to image_tag("default.png", {alt:"No preview available", class:"img-responsive"}),  sufia.download_path(@generic_file), { target:"_new", title:"Download the document"} %>
 <% end %>

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

@@ -13,7 +13,7 @@
   <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="icon-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 icon-large"></i></a>
 <!-- Modal -->
 <div class="modal hide" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
   <div class="modal-header">
@@ -32,7 +32,7 @@
     <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-important">Private</span> and then grant access to particular users and/or groups for that file in the &quot;Share With&quot;
+    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>
@@ -56,9 +56,9 @@
 </div>
     </p>
   </div>
-  <div class="control-group">
-    <h3>Visibility - <small>who should have the ability to read and download</small></h3>
-      <div class="controls">
+  <h3>Visibility - <small>who should have the ability to read and download</small></h3>
+  <div class="form-group">
+     <div class="controls">
         <label class="radio">
           <input type="radio" id="visibility_open" name="visibility" value="<%=Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC %>" <% if !public_perm.blank? %> checked="true"<% end %>/> <span class="label label-success">Open Access</span> Visible to the world.
         </label>

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

@@ -1,22 +1,6 @@
-<%#
-Copyright © 2012 The Pennsylvania State University
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-%>
 <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="icon-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 icon-large"></i></a>
 <!-- Modal -->
 <div class="modal hide" id="rightsModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
   <div class="modal-header">
@@ -25,25 +9,25 @@ limitations under the License.
   </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>
+    </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>
+    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 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/>
+    <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>
+    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>

data/app/views/generic_files/_show_actions.html.erb CHANGED Viewed

@@ -1,11 +1,24 @@
     <h2 class="non lower">Actions</h2>
     <p>
       <%= link_to "Download", sufia.download_path(@generic_file.noid) %>
+      <% if Sufia.config.usage_statistics %>
+        &nbsp;|&nbsp;
+        <%= link_to "Statistics", sufia.stats_generic_file_path(@generic_file), id: 'stats' %>
+      <% end %>
       <% if can? :edit, @generic_file %>
           &nbsp;|&nbsp;
           <%= link_to "Edit", sufia.edit_generic_file_path(@generic_file) unless @generic_file.processing?   %>
           <%= "File is being processed you may edit once it is complete" if @generic_file.processing?   %>
       <%end %>
+      <% if can?(:create, FeaturedWork) %>
+        <% if FeaturedWork.can_create_another? && !@generic_file.featured?%>
+          &nbsp;|&nbsp;
+          <%= link_to "Feature", sufia.featured_work_path(@generic_file, format: :json), data: {behavior: 'feature'} %>
+        <% elsif @generic_file.featured? %>
+          &nbsp;|&nbsp;
+          Featured
+        <% end %>
+      <% end %>
     </p>
     <p>Export to:
       <%= link_to 'EndNote', sufia.generic_file_path(@generic_file.noid, :format => 'endnote') %>
@@ -27,4 +40,3 @@
     <!-- COinS hook for Zotero -->
     <span class="Z3988" title="<%= @generic_file.export_as_openurl_ctx_kev %>"></span>

data/app/views/generic_files/_versioning.html.erb CHANGED Viewed

@@ -1,21 +1,25 @@
 <div id="versioning_display" class="tab-pane">
-  <h2 class="non lower">Versions</h2>
+  <h2>Versions</h2>
   <div class="well">
     <%= form_for @generic_file, :url => sufia.generic_file_path(@generic_file), :html => {:multipart => true, :class => 'form-horizontal'} do |f| %>
       <%= hidden_field_tag('redirect_tab', 'versions') %>
     <h3>Upload New Version</h3>
-    <p>Upload a new version of this file from your computer.</p>
-    <p id="upload_field">
-      <%= file_field_tag "filedata"  %>
-    </p>
-    <%= f.button '<i class="icon-upload-alt"></i> Upload New Version'.html_safe, :name => "update_versioning", :id => "upload_submit", :onclick => "confirmation_needed = false;", :class => "btn-primary btn-mini" %>
+        <div class="form-group">
+          <div class="col-xs-12">
+            <p>Upload a new version of this file from your computer.</p>
+            <p id="upload_field">
+                <%= file_field_tag "filedata"  %>
+             </p>
+            <%= f.button '<i class="glyphicon glyphicon-upload"></i> Upload New Version'.html_safe, :name => "update_versioning", :id => "upload_submit", :onclick => "confirmation_needed = false;", :class => "btn-primary btn-mini" %>
+          </div>
+        </div>
     <hr />
     <h3>Restore Previous Version</h3>
     <% @generic_file.content.versions.each_with_index do |version, index| %>
-      <div class="control-group">
-        <div>
+      <div class="form-group">
+        <div class="col-xs-12">
           <label class="radio">
-          <%= radio_button_tag(:revision, version.versionID, index == 0) %>
+            <%= radio_button_tag(:revision, version.versionID, index == 0) %>
           <%# label_tag("revision_#{version.versionID}".to_sym, "Restore from #{version.dsCreated.localtime.to_formatted_s(:long_ordinal)} [by #{@generic_file.content.version_committer(version)}]") %>
           Restore from <%= version.dsCreateDate.localtime.to_formatted_s(:long_ordinal) %> [by <%= @generic_file.content.version_committer(version) %>]
           </label>
@@ -23,7 +27,7 @@
       </div>
     <% end %>
     <div id="save_version_note" class="alert hide">You must click &quot;Save Revision&quot; to revert a previous version of this file</div>
-    <%= f.button '<i class="icon-save"></i> Save Revision'.html_safe, :type => 'submit', :class => 'btn-primary btn-mini', :onclick => "confirmation_needed = false;", :name => "revert_submit", :id => "revert_submit" %>
+    <%= f.button '<i class="glyphicon glyphicon-save"></i> Save Revision'.html_safe, :type => 'submit', :class => 'btn-primary btn-mini', :onclick => "confirmation_needed = false;", :name => "revert_submit", :id => "revert_submit" %>
   <% end %>
   </div> <!-- /well -->
 </div> <!-- /row -->

data/app/views/generic_files/citation.html.erb CHANGED Viewed

@@ -1,19 +1,3 @@
-<%#
-Copyright © 2012 The Pennsylvania State University
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-%>
 <h4>Citation Formats</h4>
 <h4>MLA</h4>

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

@@ -25,26 +25,24 @@ $("a[rel=popover]").popover({ html: true });
 <% 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="span40">
+  <div class="col-xs-12 col-sm-4">
     <%= render :partial => 'media_display' %>
   </div>
-  <div class="span2">&nbsp;</div>
-  <div class="span68">
-    <%= link_to "&lt;&lt;Browse view".html_safe, sufia.generic_file_path(@generic_file) %></li>
+  <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="icon-tags"></i> Descriptions</a></li>
-      <li id="edit_versioning_link"><a href="#versioning_display" data-toggle="tab"><i class="icon-sitemap"></i> Versions</a></li>
-      <li id="edit_permissions_link"><a href="#permissions_display" data-toggle="tab"><i class="icon-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 } %>
-      <%= render :partial => "permission", :locals => { :gf => @generic_file} %>
+        <%= render :partial => "permission", :locals => { :gf => @generic_file} %>
       <%= render :partial => "versioning", :locals => { :generic_file => @generic_file } %>
     </div>
-  </div> <!-- /.span68-->
+  </div> <!-- /.col-sm-9 -->
 </div><!-- /.row -->

data/app/views/generic_files/edit_fields/_default.html.erb CHANGED Viewed

@@ -1,4 +1,4 @@
-      <div class="controls" <%  if index == 0 %> id="additional_<%= key.to_s %>_clone" <% end %>>
+      <div class="col-sm-9" <%  if index == 0 %> id="additional_<%= key.to_s %>_clone" <% end %>>
         <% required = render_req && (index == 0) && required?(key) %>
         <%= f.text_field :title, :name=>"generic_file[#{key.to_s}][]", :id => "generic_file_"+key.to_s, :value=>v, :class => "input-large", :required => required  %>
         <%= render :partial=>"generic_files/edit_fields/suffix", :locals=>{key: key, index: index} %>

data/app/views/generic_files/edit_fields/_description.html.erb CHANGED Viewed

@@ -1,4 +1,4 @@
-      <div class="controls" <%  if index == 0%> id="additional_<%= key.to_s %>_clone" <% end %>>
+      <div class="col-sm-9" <%  if index == 0%> id="additional_<%= key.to_s %>_clone" <% end %>>
         <%= f.text_area :description, :name=>"generic_file[#{key.to_s}][]", :id => "generic_file_"+key.to_s, :value=>v, :class => "input-large" %>
         <%= render :partial=>"generic_files/edit_fields/suffix", :locals=>{key: key, index: index} %>
       </div><!-- /controls -->