sufia 4.0.0.beta2 → 4.0.0.beta3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile +3 -0
- data/README.md +6 -4
- data/SUFIA_VERSION +1 -1
- data/app/assets/images/folder.png +0 -0
- data/app/assets/javascripts/sufia.js +5 -0
- data/app/assets/javascripts/sufia/app.js +1 -0
- data/app/assets/javascripts/sufia/batch_select_all.js +1 -2
- data/app/assets/javascripts/sufia/dashboard_actions.js +13 -0
- data/app/assets/javascripts/sufia/editor.js +1 -1
- data/app/assets/javascripts/sufia/ga_events.js +10 -0
- data/app/assets/javascripts/sufia/search.js +67 -0
- data/app/assets/stylesheets/dashboard.css.scss +15 -1
- data/app/assets/stylesheets/sufia.css.scss +12 -0
- data/app/controllers/authorities_controller.rb +4 -4
- data/app/controllers/batch_controller.rb +4 -4
- data/app/controllers/collections_controller.rb +44 -0
- data/{lib → app/controllers/concerns}/sufia/batch_edits_controller_behavior.rb +1 -1
- data/app/controllers/concerns/sufia/catalog.rb +9 -45
- data/{lib → app/controllers/concerns}/sufia/controller.rb +11 -21
- data/app/controllers/concerns/sufia/dashboard_controller_behavior.rb +34 -6
- data/{lib → app/controllers/concerns}/sufia/downloads_controller_behavior.rb +0 -0
- data/app/controllers/concerns/sufia/files_controller/browse_everything.rb +35 -0
- data/{lib → app/controllers/concerns}/sufia/files_controller/local_ingest_behavior.rb +19 -7
- data/{lib → app/controllers/concerns}/sufia/files_controller/upload_complete_behavior.rb +1 -1
- data/app/controllers/concerns/sufia/files_controller_behavior.rb +219 -0
- data/app/controllers/concerns/sufia/homepage_controller.rb +41 -0
- data/app/controllers/concerns/sufia/users_controller_behavior.rb +3 -2
- data/app/controllers/dashboard/collections_controller.rb +19 -0
- data/app/controllers/dashboard/files_controller.rb +13 -0
- data/app/controllers/dashboard/highlights_controller.rb +20 -0
- data/app/controllers/dashboard/lists_controller.rb +13 -0
- data/app/controllers/dashboard/shares_controller.rb +19 -0
- data/app/controllers/directory_controller.rb +8 -8
- data/app/controllers/featured_work_lists_controller.rb +1 -1
- data/app/controllers/homepage_controller.rb +4 -0
- data/app/controllers/single_use_links_controller.rb +6 -6
- data/app/controllers/single_use_links_viewer_controller.rb +6 -6
- data/app/controllers/static_controller.rb +4 -3
- data/app/helpers/batch_edits_helper.rb +3 -6
- data/app/helpers/content_block_helper.rb +7 -2
- data/app/helpers/generic_file_helper.rb +33 -39
- data/app/helpers/records_helper.rb +4 -0
- data/app/helpers/sufia/blacklight_override.rb +11 -0
- data/app/helpers/sufia/records_helper_behavior.rb +38 -0
- data/app/helpers/sufia/sufia_helper_behavior.rb +109 -0
- data/{sufia-models/lib/sufia/models → app/models/concerns/sufia}/solr_document_behavior.rb +6 -1
- data/app/models/contact_form.rb +13 -13
- data/app/uploaders/tinymce_asset_uploader.rb +2 -2
- data/app/views/_controls.html.erb +1 -1
- data/app/views/_flash_msg.html.erb +2 -8
- data/app/views/_ga.html.erb +4 -0
- data/app/views/_user_util_links.html.erb +7 -7
- data/app/views/advanced/_advanced_search_facets.html.erb +1 -1
- data/app/views/advanced/_advanced_search_fields.html.erb +2 -2
- data/app/views/advanced/_advanced_search_form.html.erb +12 -12
- data/app/views/batch/_metadata.html.erb +12 -12
- data/app/views/batch/_more_metadata.html.erb +1 -2
- data/app/views/batch/edit.html.erb +5 -5
- data/app/views/batch_edits/_check_all.html.erb +1 -1
- data/app/views/batch_edits/_delete_selected.html.erb +2 -3
- data/app/views/batch_edits/edit.html.erb +20 -21
- data/app/views/catalog/_bookmark_control.html.erb +7 -8
- data/app/views/catalog/_constraints_element.html.erb +2 -2
- data/app/views/catalog/_delete_partials/_default.html.erb +9 -12
- data/app/views/catalog/_document.html.erb +5 -5
- data/app/views/catalog/_document_list.html.erb +2 -2
- data/app/views/catalog/_edit_partials/_default.html.erb +6 -9
- data/app/views/catalog/_edit_partials/_default_details.html.erb +2 -4
- data/app/views/catalog/_email_form.html.erb +1 -1
- data/app/views/catalog/_facet_limit.html.erb +6 -7
- data/app/views/catalog/_facet_selected.html.erb +3 -3
- data/app/views/catalog/_folder_control.html.erb +7 -8
- data/app/views/catalog/_index_default.html.erb +2 -2
- data/app/views/catalog/_index_header_default.html.erb +20 -0
- data/app/views/catalog/_index_partials/_default_group.html.erb +1 -1
- data/app/views/catalog/_index_partials/_list_files.html.erb +5 -2
- data/app/views/catalog/_refworks_form.html.erb +2 -2
- data/app/views/catalog/_results_pagination.html.erb +1 -1
- data/app/views/catalog/_search_form.html.erb +24 -9
- data/app/views/catalog/_show_default.html.erb +2 -2
- data/app/views/catalog/_show_partials/_default.html.erb +4 -5
- data/app/views/catalog/_show_partials/_default_details.html.erb +5 -5
- data/app/views/catalog/_show_partials/_facets.html.erb +7 -7
- data/app/views/catalog/_show_tools.html.erb +6 -6
- data/app/views/catalog/_sms_form.html.erb +1 -1
- data/app/views/catalog/_sort_and_per_page.html.erb +8 -14
- data/app/views/catalog/citation.html.erb +1 -1
- data/app/views/catalog/email.erb +1 -1
- data/app/views/catalog/index.html.erb +16 -27
- data/app/views/catalog/recent.js.erb +1 -1
- data/app/views/catalog/show.html.erb +2 -2
- data/app/views/catalog/sms.erb +1 -1
- data/app/views/collections/_action_menu.html.erb +24 -0
- data/app/views/collections/_batch_edits_actions.html.erb +3 -0
- data/app/views/collections/_button_for_creating_empty_collection.html.erb +3 -0
- data/app/views/collections/_dashboard_document_list.html.erb +6 -0
- data/app/views/collections/_document_list.html.erb +10 -0
- data/app/views/collections/_edit_actions.html.erb +5 -0
- data/app/views/collections/_edit_descriptions.html.erb +20 -0
- data/app/views/collections/_form.html.erb +24 -0
- data/app/views/collections/_form_for_select_collection.html.erb +34 -0
- data/app/views/collections/_media_display.html.erb +1 -0
- data/app/views/collections/_paginate.html.erb +6 -0
- data/app/views/collections/_search_collection_dashboard_form.html.erb +10 -0
- data/app/views/collections/_show_actions.html.erb +7 -0
- data/app/views/collections/_show_descriptions.html.erb +8 -0
- data/app/views/collections/_show_fields.html.erb +0 -0
- data/app/views/collections/_single_item_action_fields.html.erb +6 -0
- data/app/views/collections/_sort_and_per_page.html.erb +29 -0
- data/app/views/collections/_view_type_group.html.erb +13 -0
- data/app/views/collections/edit.html.erb +30 -0
- data/app/views/collections/show.html.erb +32 -0
- data/app/views/contact_form/new.html.erb +13 -13
- data/app/views/dashboard/_action_menu.html.erb +29 -0
- data/app/views/dashboard/_collection_action_menu.html.erb +15 -0
- data/app/views/dashboard/_document_list.html.erb +1 -1
- data/app/views/dashboard/_facet_limit.html.erb +2 -2
- data/app/views/dashboard/_facet_pagination.html.erb +12 -12
- data/app/views/dashboard/_facet_selected.html.erb +2 -2
- data/app/views/dashboard/_facets.html.erb +2 -0
- data/app/views/dashboard/_index_partials/_default_group.html.erb +9 -2
- data/app/views/dashboard/_index_partials/_list_collections.html.erb +45 -0
- data/app/views/dashboard/_index_partials/_list_files.html.erb +5 -25
- data/app/views/dashboard/_results_pagination.html.erb +1 -1
- data/app/views/dashboard/_search_form.html.erb +2 -2
- data/app/views/dashboard/_show_partials/_default.html.erb +3 -3
- data/app/views/dashboard/_show_partials/_default_details.html.erb +5 -5
- data/app/views/dashboard/_show_partials/_facets.html.erb +6 -6
- data/app/views/dashboard/_sort_and_per_page.html.erb +24 -8
- data/app/views/dashboard/facet.html.erb +3 -3
- data/app/views/dashboard/index.html.erb +18 -41
- data/app/views/dashboard/lists/index.html.erb +59 -0
- data/app/views/generic_files/_breadcrumbs.html.erb +4 -4
- data/app/views/generic_files/_descriptions.html.erb +4 -4
- data/app/views/generic_files/_field_form.html.erb +5 -5
- data/app/views/generic_files/_flot_stats.js.erb +120 -0
- data/app/views/generic_files/_media_display.html.erb +14 -4
- data/app/views/generic_files/_permission.html.erb +3 -3
- data/app/views/generic_files/_permission_form.html.erb +20 -21
- data/app/views/generic_files/_show_actions.html.erb +13 -10
- data/app/views/generic_files/_show_details.html.erb +16 -9
- data/app/views/generic_files/_versioning.html.erb +3 -3
- data/app/views/generic_files/edit.html.erb +7 -7
- data/app/views/generic_files/edit_fields/_default.html.erb +3 -4
- data/app/views/generic_files/edit_fields/_description.html.erb +3 -4
- data/app/views/generic_files/edit_fields/_resource_type.html.erb +1 -3
- data/app/views/generic_files/edit_fields/_rights.html.erb +3 -5
- data/app/views/generic_files/edit_fields/_suffix.html.erb +1 -1
- data/app/views/generic_files/show.html.erb +3 -3
- data/app/views/generic_files/stats.html.erb +8 -124
- data/app/views/generic_files/upload/_alerts.html.erb +2 -4
- data/app/views/generic_files/upload/_form.html.erb +1 -1
- data/app/views/generic_files/upload/_local_file_import_chooser.html.erb +1 -1
- data/app/views/generic_files/upload/_tos_checkbox.html.erb +1 -1
- data/app/views/homepage/_featured.html.erb +3 -1
- data/app/views/{catalog → homepage}/_featured_researcher.html.erb +0 -0
- data/app/views/{catalog → homepage}/_home.html.erb +1 -0
- data/app/views/{catalog → homepage}/_home_content.html.erb +4 -4
- data/app/views/homepage/_home_header.html.erb +12 -0
- data/app/views/homepage/_marketing.html.erb +4 -0
- data/app/views/{catalog → homepage}/_recent_document.html.erb +10 -5
- data/app/views/homepage/_recents.html.erb +15 -0
- data/app/views/homepage/_sortable_featured.html.erb +3 -1
- data/app/views/{catalog → homepage}/_tagcloud.html.erb +0 -0
- data/app/views/homepage/index.html.erb +1 -0
- data/app/views/kaminari/blacklight/_first_page.html.erb +1 -1
- data/app/views/kaminari/blacklight/_last_page.html.erb +1 -1
- data/app/views/kaminari/blacklight/_next_page.html.erb +1 -1
- data/app/views/kaminari/blacklight/_page.html.erb +1 -1
- data/app/views/kaminari/blacklight/_prev_page.html.erb +1 -1
- data/app/views/layouts/_head_tag_content.html.erb +1 -1
- data/app/views/layouts/error.html.erb +2 -2
- data/app/views/layouts/homepage.html.erb +4 -4
- data/app/views/layouts/sufia-dashboard.html.erb +7 -7
- data/app/views/layouts/sufia-one-column.html.erb +4 -4
- data/app/views/layouts/sufia-two-column.html.erb +7 -7
- data/app/views/mailbox/index.html.erb +2 -2
- data/app/views/pages/show.html.erb +1 -0
- data/app/views/records/_edit_field.html.erb +18 -0
- data/app/views/records/edit_fields/_description.html.erb +10 -0
- data/app/views/records/edit_fields/_resource_type.html.erb +7 -0
- data/app/views/records/edit_fields/_rights.html.erb +6 -0
- data/app/views/records/edit_fields/_suffix.html.erb +9 -0
- data/app/views/records/edit_fields/_type.html.erb +13 -0
- data/app/views/single_use_links/new_download.html.erb +1 -1
- data/app/views/users/_activity.html.erb +1 -1
- data/app/views/users/_contributions.html.erb +3 -1
- data/app/views/users/_left_sidebar.html.erb +1 -1
- data/app/views/users/_notify_link.html.erb +2 -2
- data/app/views/users/_profile.html.erb +2 -2
- data/app/views/users/_search_form.html.erb +3 -3
- data/app/views/users/edit.html.erb +15 -15
- data/app/views/users/index.html.erb +3 -3
- data/app/views/users/notifications_number.js.erb +1 -1
- data/config/locales/sufia.en.yml +13 -2
- data/config/routes.rb +56 -20
- data/db/seeds.rb +2 -2
- data/lib/generators/sufia/sufia_generator.rb +14 -4
- data/lib/generators/sufia/templates/catalog_controller.rb +98 -97
- data/lib/generators/sufia/templates/sufia_helper.rb +5 -0
- data/lib/sufia.rb +4 -0
- data/spec/{models/generic_file/actions_spec.rb → actors/generic_file/actor_spec.rb} +2 -2
- data/spec/controllers/authorities_controller_spec.rb +7 -7
- data/spec/controllers/batch_controller_spec.rb +22 -23
- data/spec/controllers/batch_edits_controller_spec.rb +4 -4
- data/spec/controllers/catalog_controller_spec.rb +27 -37
- data/spec/controllers/collections_controller_spec.rb +179 -0
- data/spec/controllers/dashboard/collections_controller_spec.rb +71 -0
- data/spec/controllers/dashboard/files_controller_spec.rb +71 -0
- data/spec/controllers/dashboard/highlights_controller_spec.rb +66 -0
- data/spec/controllers/dashboard/shares_controller_spec.rb +78 -0
- data/spec/controllers/dashboard_controller_spec.rb +0 -47
- data/spec/controllers/downloads_controller_spec.rb +10 -11
- data/spec/controllers/generic_files_controller_spec.rb +147 -118
- data/spec/controllers/homepage_controller_spec.rb +57 -0
- data/spec/controllers/mailbox_controller_spec.rb +3 -3
- data/spec/controllers/single_use_links_viewer_controller_spec.rb +3 -3
- data/spec/factories/generic_files.rb +4 -0
- data/spec/factories/users.rb +0 -1
- data/spec/features/browse_dashboard_files_spec.rb +5 -1
- data/spec/features/collection_spec.rb +232 -0
- data/spec/features/display_dashboard_spec.rb +1 -0
- data/spec/features/notifications_spec.rb +1 -1
- data/spec/features/search_spec.rb +22 -0
- data/spec/features/single_use_links_spec.rb +2 -2
- data/spec/features/users_spec.rb +1 -1
- data/spec/fixtures/charter.docx +0 -0
- data/spec/helpers/records_helper_spec.rb +61 -0
- data/spec/helpers/sufia_helper_spec.rb +40 -2
- data/spec/{models → jobs}/active_fedora_pid_based_job_spec.rb +0 -0
- data/spec/{models → jobs}/audit_job_spec.rb +0 -2
- data/spec/{models → jobs}/batch_update_job_spec.rb +2 -2
- data/spec/jobs/characterize_job_spec.rb +25 -0
- data/spec/jobs/create_derivatives_job_spec.rb +186 -0
- data/spec/{models → jobs}/event_jobs_spec.rb +0 -1
- data/spec/jobs/import_url_job_spec.rb +36 -14
- data/spec/jobs/ingest_local_file_job_spec.rb +2 -2
- data/spec/lib/sufia/analytics_spec.rb +29 -0
- data/spec/lib/sufia/upload_complete_behavior_spec.rb +1 -1
- data/spec/models/batch_spec.rb +3 -9
- data/spec/models/checksum_audit_log_spec.rb +5 -6
- data/spec/models/collection_spec.rb +24 -0
- data/spec/models/download_spec.rb +21 -0
- data/spec/models/featured_work_list_spec.rb +0 -1
- data/spec/models/file_content_datastream_spec.rb +8 -14
- data/spec/models/file_usage_spec.rb +91 -0
- data/spec/models/fits_datastream_spec.rb +1 -1
- data/spec/models/generic_file/web_form_spec.rb +2 -2
- data/spec/models/generic_file_rdf_datastream_spec.rb +12 -0
- data/spec/models/generic_file_spec.rb +150 -168
- data/spec/models/local_authority_spec.rb +9 -9
- data/spec/models/{pageview.rb → pageview_spec.rb} +0 -0
- data/spec/models/single_use_link_spec.rb +32 -35
- data/spec/routing/route_spec.rb +19 -3
- data/spec/spec_helper.rb +28 -6
- data/spec/support/features/session_helpers.rb +5 -6
- data/spec/support/lib/generators/test_app_generator.rb +6 -0
- data/spec/views/generic_file/edit.html.erb_spec.rb +4 -4
- data/spec/views/generic_file/show.html.erb_spec.rb +45 -17
- data/spec/views/generic_file/stats.html.erb_spec.rb +26 -7
- data/sufia-models/app/actors/sufia/generic_file/actor.rb +98 -0
- data/sufia-models/app/models/batch.rb +3 -3
- data/sufia-models/app/models/checksum_audit_log.rb +3 -3
- data/sufia-models/app/models/collection.rb +41 -0
- data/sufia-models/{lib/sufia/models → app/models/concerns/sufia}/generic_file.rb +33 -43
- data/sufia-models/{lib/sufia/models → app/models/concerns/sufia}/generic_file/accessible_attributes.rb +3 -3
- data/sufia-models/{lib/sufia/models → app/models/concerns/sufia}/generic_file/audit.rb +12 -18
- data/sufia-models/{lib/sufia/models → app/models/concerns/sufia}/generic_file/characterization.rb +1 -8
- data/sufia-models/app/models/concerns/sufia/generic_file/derivatives.rb +26 -0
- data/sufia-models/{lib/sufia/models → app/models/concerns/sufia}/generic_file/export.rb +13 -13
- data/sufia-models/{lib/sufia/models → app/models/concerns/sufia}/generic_file/featured.rb +0 -0
- data/sufia-models/{lib/sufia/models → app/models/concerns/sufia}/generic_file/metadata.rb +0 -0
- data/sufia-models/{lib/sufia/models → app/models/concerns/sufia}/generic_file/mime_types.rb +15 -1
- data/sufia-models/{lib/sufia/models → app/models/concerns/sufia}/generic_file/permissions.rb +5 -1
- data/sufia-models/{lib/sufia/models → app/models/concerns/sufia}/generic_file/reload_on_save.rb +0 -0
- data/sufia-models/{lib/sufia/models → app/models/concerns/sufia}/generic_file/trophies.rb +0 -0
- data/sufia-models/app/models/concerns/sufia/generic_file/versions.rb +16 -0
- data/sufia-models/{lib/sufia/models → app/models/concerns/sufia}/generic_file/virus_check.rb +2 -3
- data/sufia-models/{lib/sufia/models → app/models/concerns/sufia}/generic_file/web_form.rb +9 -2
- data/sufia-models/app/models/concerns/sufia/properties_datastream_behavior.rb +3 -4
- data/sufia-models/app/models/concerns/sufia/user.rb +2 -2
- data/sufia-models/app/models/datastreams/fits_datastream.rb +137 -136
- data/sufia-models/app/models/datastreams/generic_file_rdf_datastream.rb +6 -0
- data/sufia-models/app/models/datastreams/paranoid_rights_datastream.rb +3 -3
- data/sufia-models/app/models/file_usage.rb +53 -0
- data/sufia-models/app/models/follow.rb +2 -4
- data/sufia-models/app/models/geo_names_resource.rb +5 -7
- data/sufia-models/app/models/local_authority.rb +14 -14
- data/sufia-models/app/models/single_use_link.rb +1 -1
- data/sufia-models/app/models/sufia/download.rb +9 -0
- data/sufia-models/app/models/trophy.rb +1 -1
- data/sufia-models/app/services/sufia/{usage_statistics.rb → analytics.rb} +1 -24
- data/sufia-models/app/services/sufia/id_service.rb +2 -2
- data/sufia-models/lib/generators/sufia/models/install_generator.rb +5 -2
- data/sufia-models/lib/generators/sufia/models/templates/config/setup_mail.rb +1 -1
- data/sufia-models/lib/generators/sufia/models/templates/config/sufia.rb +5 -3
- data/sufia-models/lib/generators/sufia/models/templates/migrations/acts_as_follower_migration.rb +6 -6
- data/sufia-models/lib/generators/sufia/models/templates/migrations/create_checksum_audit_logs.rb +2 -3
- data/sufia-models/lib/generators/sufia/models/templates/migrations/create_local_authorities.rb +20 -20
- data/sufia-models/lib/sufia/ability.rb +1 -1
- data/sufia-models/lib/sufia/models/engine.rb +3 -9
- data/sufia-models/lib/sufia/models/file_content/versions.rb +3 -3
- data/sufia-models/lib/sufia/models/jobs/active_fedora_pid_based_job.rb +6 -2
- data/sufia-models/lib/sufia/models/jobs/batch_update_job.rb +6 -10
- data/sufia-models/lib/sufia/models/jobs/characterize_job.rb +1 -13
- data/sufia-models/lib/sufia/models/jobs/create_derivatives_job.rb +14 -0
- data/sufia-models/lib/sufia/models/jobs/import_url_job.rb +27 -23
- data/sufia-models/lib/tasks/sufia-models_tasks.rake +1 -1
- data/sufia-models/sufia-models.gemspec +1 -1
- data/sufia.gemspec +7 -2
- data/tasks/jetty.rake +4 -4
- data/tasks/release.rake +8 -8
- data/tasks/sufia-db.rake +4 -4
- data/tasks/sufia-dev.rake +11 -5
- metadata +226 -95
- data/app/helpers/sufia_helper.rb +0 -93
- data/app/views/catalog/_bookmark_form.html.erb +0 -8
- data/app/views/catalog/_home_header.html.erb +0 -15
- data/app/views/catalog/_recents.html.erb +0 -17
- data/app/views/dashboard/_index_partials/_thumbnail_display.html.erb +0 -9
- data/app/views/layouts/_homepage_sidebar2.html.erb +0 -14
- data/lib/sufia/files_controller_behavior.rb +0 -253
- data/spec/helpers/generic_file_helper_spec.rb +0 -28
- data/spec/lib/sufia/usage_statistics_spec.rb +0 -75
- data/spec/models/characterize_job_spec.rb +0 -93
- data/spec/models/transcode_audio_job_spec.rb +0 -85
- data/spec/models/transcode_video_job_spec.rb +0 -31
- data/spec/views/dashboard/index_partials/_thumbnail_display.html.erb_spec.rb +0 -22
- data/sufia-models/lib/sufia/models/generic_file/actions.rb +0 -50
- data/sufia-models/lib/sufia/models/generic_file/derivatives.rb +0 -31
- data/sufia-models/lib/sufia/models/generic_file/thumbnail.rb +0 -37
- data/sufia-models/lib/sufia/models/generic_file/versions.rb +0 -16
- data/sufia-models/lib/sufia/models/jobs/transcode_audio_job.rb +0 -15
- data/sufia-models/lib/sufia/models/jobs/transcode_video_job.rb +0 -15
@@ -1,10 +1,15 @@
|
|
1
1
|
<tr>
|
2
2
|
<% if display_thumbs %>
|
3
|
-
<td class="span10"
|
3
|
+
<td class="span10">
|
4
|
+
<%= link_to_profile recent_document.depositor("no depositor value") %>
|
5
|
+
<%= link_to sufia.generic_file_path(recent_document) do %>
|
6
|
+
<%= render_thumbnail_tag recent_document, { width: 45 } %>
|
7
|
+
<% end %>
|
8
|
+
</td>
|
4
9
|
<% end %>
|
5
10
|
<td>
|
6
11
|
<h3>
|
7
|
-
<%= link_to truncate(recent_document.title_or_label, :
|
12
|
+
<%= link_to truncate(recent_document.title_or_label, length: 28, separator: ' '), sufia.generic_file_path(recent_document.noid), title: recent_document.title_or_label %>
|
8
13
|
|
9
14
|
<% if display_access %>
|
10
15
|
<% if recent_document.registered? %>
|
@@ -16,9 +21,9 @@
|
|
16
21
|
<% end %>
|
17
22
|
<% end %>
|
18
23
|
</h3>
|
19
|
-
<p>
|
20
|
-
<%= link_to truncate(recent_document.label, :
|
21
|
-
sufia.generic_file_path(recent_document.noid), :
|
24
|
+
<p>
|
25
|
+
<%= link_to truncate(recent_document.label, length: 25),
|
26
|
+
sufia.generic_file_path(recent_document.noid), title: recent_document.label %><br />
|
22
27
|
<%= link_to_facet_list(recent_document.tags, 'desc_metadata__tag', 'no keywords specified').html_safe %>
|
23
28
|
</p>
|
24
29
|
</td>
|
@@ -0,0 +1,15 @@
|
|
1
|
+
<div>
|
2
|
+
<% if recent_documents.blank? %>
|
3
|
+
<% msg = 'Login to see your recently added documents' if msg.blank? and current_user.blank? %>
|
4
|
+
<% msg = 'You have no documents to display. Contribute some of your documents!' if msg.blank? %>
|
5
|
+
<h3><%= msg %></h3>
|
6
|
+
<% else %>
|
7
|
+
|
8
|
+
<div id="recent_docs">
|
9
|
+
<table class="table table-bordered table-striped">
|
10
|
+
<%= render partial: "recent_document", collection: recent_documents, locals: {display_thumbs: display_thumbs, display_access: display_access} %>
|
11
|
+
</table>
|
12
|
+
</div>
|
13
|
+
<% end %>
|
14
|
+
|
15
|
+
</div>
|
@@ -6,7 +6,9 @@
|
|
6
6
|
<%= f.hidden_field :order, data: {property: "order"} %>
|
7
7
|
<div class="main row">
|
8
8
|
<div class="col-sm-3">
|
9
|
-
<%=
|
9
|
+
<%= link_to sufia.generic_file_path(featured) do %>
|
10
|
+
<%= render_thumbnail_tag featured, {width: 90} %>
|
11
|
+
<% end %>
|
10
12
|
</div>
|
11
13
|
<div class="col-sm-9">
|
12
14
|
<% if can? :destroy, FeaturedWork %>
|
File without changes
|
@@ -0,0 +1 @@
|
|
1
|
+
<%= render 'home' %>
|
@@ -6,4 +6,4 @@
|
|
6
6
|
per_page: number of items to fetch per page
|
7
7
|
remote: data-remote
|
8
8
|
-%>
|
9
|
-
<%= link_to raw(t 'views.pagination.first'), url, :
|
9
|
+
<%= link_to raw(t 'views.pagination.first'), url, remote: remote, class: current_page.first? ? 'disabled' : nil %>
|
@@ -6,4 +6,4 @@
|
|
6
6
|
per_page: number of items to fetch per page
|
7
7
|
remote: data-remote
|
8
8
|
-%>
|
9
|
-
<%= link_to raw(t 'views.pagination.last'), url, {:
|
9
|
+
<%= link_to raw(t 'views.pagination.last'), url, {remote: remote, class: current_page.last? ? 'disabled' : nil} %>
|
@@ -6,4 +6,4 @@
|
|
6
6
|
per_page: number of items to fetch per page
|
7
7
|
remote: data-remote
|
8
8
|
-%>
|
9
|
-
<%= link_to raw(t 'views.pagination.next'), url, :
|
9
|
+
<%= link_to raw(t 'views.pagination.next'), url, rel: 'next', remote: remote, class: current_page.last? ? 'disabled' : nil %>
|
@@ -7,4 +7,4 @@
|
|
7
7
|
per_page: number of items to fetch per page
|
8
8
|
remote: data-remote
|
9
9
|
-%>
|
10
|
-
<%= link_to number_with_delimiter(page.to_s), url, opts = {:
|
10
|
+
<%= link_to number_with_delimiter(page.to_s), url, opts = {remote: remote, rel: page.next? ? 'next' : page.prev? ? 'prev' : nil, class: page.current? ? 'disabled' : nil} %>
|
@@ -6,4 +6,4 @@
|
|
6
6
|
per_page: number of items to fetch per page
|
7
7
|
remote: data-remote
|
8
8
|
-%>
|
9
|
-
<%= link_to raw(t 'views.pagination.previous'), url, :
|
9
|
+
<%= link_to raw(t 'views.pagination.previous'), url, rel: 'prev', remote: remote, class: current_page.first? ? 'disabled' : nil %>
|
@@ -20,14 +20,14 @@
|
|
20
20
|
});
|
21
21
|
</script>
|
22
22
|
|
23
|
-
<%= render :
|
23
|
+
<%= render partial: '/ga', formats: [:html] %>
|
24
24
|
</head>
|
25
25
|
|
26
26
|
<body>
|
27
27
|
<div id="wrapper">
|
28
28
|
<div class="container-fluid">
|
29
29
|
<div id="page-positioner">
|
30
|
-
<%= render :
|
30
|
+
<%= render partial: '/masthead', formats: [:html] %>
|
31
31
|
<div id="content-wrapper">
|
32
32
|
<div id="content" class="row">
|
33
33
|
<div class="col-sm-8 col-md-8 col-lg-8">
|
@@ -1,16 +1,16 @@
|
|
1
1
|
<!DOCTYPE html>
|
2
2
|
<html>
|
3
3
|
<head>
|
4
|
-
<%= render :
|
4
|
+
<%= render partial: "layouts/head_tag_content"%>
|
5
5
|
</head>
|
6
6
|
|
7
7
|
<body>
|
8
8
|
<div id="wrapper">
|
9
9
|
<div class="container-fluid">
|
10
10
|
<div id="page-positioner">
|
11
|
-
<%= render :
|
12
|
-
<%= render :
|
13
|
-
<%= render :
|
11
|
+
<%= render partial: '/masthead' %>
|
12
|
+
<%= render partial: '/controls' %>
|
13
|
+
<%= render partial: '/flash_msg' %>
|
14
14
|
<div id="content-wrapper">
|
15
15
|
<div id="content">
|
16
16
|
<div class="col-xs-12">
|
@@ -2,26 +2,26 @@
|
|
2
2
|
<html>
|
3
3
|
<head>
|
4
4
|
|
5
|
-
<%= render :
|
5
|
+
<%= render partial: "layouts/head_tag_content"%>
|
6
6
|
</head>
|
7
7
|
|
8
8
|
<body>
|
9
9
|
<div id="wrapper">
|
10
10
|
<div class="container-fluid">
|
11
11
|
<div id="page-positioner">
|
12
|
-
<%= render :
|
13
|
-
<%= render :
|
14
|
-
<%= render :
|
12
|
+
<%= render partial: '/masthead' %>
|
13
|
+
<%= render partial: '/controls' %>
|
14
|
+
<%= render partial: '/flash_msg' %>
|
15
15
|
<div id="content-wrapper">
|
16
16
|
<div class="container-fluid">
|
17
17
|
<div id="content-header" class="row">
|
18
18
|
<div class="col-xs-12 col-sm-3">
|
19
|
-
<%= link_to '<i class="glyphicon glyphicon-upload"></i> Upload File(s)'.html_safe, sufia.new_generic_file_path, {:
|
19
|
+
<%= link_to '<i class="glyphicon glyphicon-upload"></i> Upload File(s)'.html_safe, sufia.new_generic_file_path, {class: "btn btn-primary"} %><br />
|
20
20
|
</div>
|
21
21
|
<div class="col-xs-12 col-sm-9">
|
22
22
|
<div class="row">
|
23
|
-
<%= render :
|
24
|
-
<%= render :
|
23
|
+
<%= render partial: 'heading' %>
|
24
|
+
<%= render partial: 'search_form' %>
|
25
25
|
</div>
|
26
26
|
</div>
|
27
27
|
</div>
|
@@ -1,16 +1,16 @@
|
|
1
1
|
<!DOCTYPE html>
|
2
2
|
<html>
|
3
3
|
<head>
|
4
|
-
<%= render :
|
4
|
+
<%= render partial: "layouts/head_tag_content"%>
|
5
5
|
</head>
|
6
6
|
|
7
7
|
<body>
|
8
8
|
<div id="wrapper">
|
9
9
|
<div class="container-fluid">
|
10
10
|
<div id="page-positioner">
|
11
|
-
<%= render :
|
12
|
-
<%= render :
|
13
|
-
<%= render :
|
11
|
+
<%= render partial: '/masthead' %>
|
12
|
+
<%= render partial: '/controls' %>
|
13
|
+
<%= render partial: '/flash_msg' %>
|
14
14
|
<div id="content-wrapper" class="container-fluid">
|
15
15
|
<div id="content" class="row">
|
16
16
|
<div class="col-xs-12">
|
@@ -1,22 +1,22 @@
|
|
1
1
|
<!DOCTYPE html>
|
2
2
|
<html>
|
3
3
|
<head>
|
4
|
-
<%= render :
|
4
|
+
<%= render partial: "layouts/head_tag_content"%>
|
5
5
|
</head>
|
6
6
|
|
7
7
|
<body>
|
8
8
|
<div id="wrapper">
|
9
9
|
<div class="container-fluid">
|
10
10
|
<div id="page-positioner">
|
11
|
-
<%= render :
|
12
|
-
<%= render :
|
13
|
-
<%= render :
|
11
|
+
<%= render partial: '/masthead' %>
|
12
|
+
<%= render partial: '/controls' %>
|
13
|
+
<%= render partial: '/flash_msg' %>
|
14
14
|
<div id="content-wrapper" class="container-fluid">
|
15
|
-
<div
|
16
|
-
<div class="col-xs-12 col-sm-3">
|
15
|
+
<div class="row">
|
16
|
+
<div id="sidebar" class="col-xs-12 col-sm-3">
|
17
17
|
<%= yield :sidebar %>
|
18
18
|
</div>
|
19
|
-
<div class="col-xs-12 col-sm-9">
|
19
|
+
<div id="content" class="col-xs-12 col-sm-9">
|
20
20
|
<%= yield %>
|
21
21
|
</div>
|
22
22
|
</div><!-- /#content -->
|
@@ -18,8 +18,8 @@
|
|
18
18
|
<td><%= msg.last_message.subject.html_safe %></td>
|
19
19
|
<td><%= msg.last_message.body.html_safe %></td>
|
20
20
|
<td><%= link_to raw('<i class="icon-trash icon-large"></i>'),
|
21
|
-
sufia.notification_path(msg.id), :
|
22
|
-
:
|
21
|
+
sufia.notification_path(msg.id), class: 'itemicon itemtrash',
|
22
|
+
title: 'Delete File', method: :delete %>
|
23
23
|
</td>
|
24
24
|
</tr>
|
25
25
|
<% end %>
|
@@ -0,0 +1,18 @@
|
|
1
|
+
<%# Overriding hydra-editor so that we can replace the call to 'render_edit_field_partial'
|
2
|
+
# With render_edit_field_partial_with_action because there is also a
|
3
|
+
# 'render_edit_field_partial' in sufia that uses 'generic_file' as the action. %>
|
4
|
+
<% render_req ||= true # render_req is true for single file edit, false for batch edit%>
|
5
|
+
<div class="control-group">
|
6
|
+
<% vals = f.object[key] %>
|
7
|
+
<% if render_req && f.object.required?(key) %>
|
8
|
+
<% tmp = '<span class="error">*</span>' + field_label(key) %>
|
9
|
+
<%= f.label key, tmp.html_safe, class: "control-label" %>
|
10
|
+
<% else %>
|
11
|
+
<%= f.label key, field_label(key), class: "control-label"%>
|
12
|
+
<% end %>
|
13
|
+
|
14
|
+
<% vals.to_ary.each_with_index do |v, index| %>
|
15
|
+
<%= render_edit_field_partial_with_action('records', key, f: f, v: v, index: index, render_req: render_req) %>
|
16
|
+
<% end %>
|
17
|
+
</div><!-- /control-group -->
|
18
|
+
|
@@ -0,0 +1,10 @@
|
|
1
|
+
<div class="controls" <% if index == 0 %> id="additional_<%= key.to_s %>_clone" <% end %>>
|
2
|
+
<% required = render_req && (index == 0) && f.object.required?(key) %>
|
3
|
+
<%= text_area_tag "#{ActiveModel::Naming.singular(f.object)}[#{key.to_s}][]", v,
|
4
|
+
id: "#{ActiveModel::Naming.singular(f.object)}_#{key.to_s}", class: "input-large", required: required %>
|
5
|
+
|
6
|
+
<% unless f.object.class.unique?(key) %>
|
7
|
+
<%= render partial: "records/edit_fields/suffix", locals: { key: key, index: index } %>
|
8
|
+
<% end %>
|
9
|
+
</div>
|
10
|
+
<div id="additional_<%= key %>_elements"></div>
|
@@ -0,0 +1,7 @@
|
|
1
|
+
<%# convert class variable to a local variable if the local hasn't been set %>
|
2
|
+
<% generic_file ||= @generic_file %>
|
3
|
+
<div class="controls">
|
4
|
+
<p class="help-block">You may select multiple types to apply<p>
|
5
|
+
<%= f.select "resource_type", options_for_select(Sufia.config.resource_types.keys, generic_file.resource_type), {}, { multiple: true, size: 7 } %>
|
6
|
+
<%= help_icon(:resource_type) %>
|
7
|
+
</div>
|
@@ -0,0 +1,6 @@
|
|
1
|
+
<div class="controls"<%= if index == 0 ? " id=\"additional_#{key.to_s}_clone\"" : '' %>>
|
2
|
+
<%= f.select "rights", options_for_select(Sufia.config.cc_licenses, v), include_blank: true %>
|
3
|
+
<%= render partial: "generic_files/edit_fields/suffix", locals: { key: key, index: index } %>
|
4
|
+
</div><!-- /controls -->
|
5
|
+
<div id="additional_<%= key %>_elements"></div>
|
6
|
+
|
@@ -0,0 +1,13 @@
|
|
1
|
+
<%# convert class variable to a local variable if the local hasn't been set %>
|
2
|
+
<% generic_file = @generic_file unless generic_file %>
|
3
|
+
|
4
|
+
<div class="control-group">
|
5
|
+
<%= f.label :resource_type, "Resource Types", class: "control-label", for: "resource_type" %>
|
6
|
+
<div class="controls">
|
7
|
+
<p class="help-block">You may select multiple types to apply<p>
|
8
|
+
<%= f.select :resource_type, options_for_select(Sufia.config.resource_types.keys, generic_file.resource_type), {},
|
9
|
+
{multiple: true, size: 7} %>
|
10
|
+
<%= help_icon(:resource_type) %>
|
11
|
+
</div>
|
12
|
+
</div><!-- /control-group -->
|
13
|
+
|
@@ -1,5 +1,5 @@
|
|
1
1
|
<div class="single-use-link">
|
2
2
|
<h1>Single Use Link</h1>
|
3
3
|
<p>Anyone can use the following link once to download the file</p>
|
4
|
-
<%= link_to @asset, @link, :
|
4
|
+
<%= link_to @asset, @link, class: 'download-link' %> <%= link_to raw('<i class="icon-link icon-large"></i>'), '#', class: 'copypaste itemicon itemcode', title: 'Copy File URL', id: "copy_link_#{@asset.pid}" %>
|
5
5
|
</div>
|
@@ -5,7 +5,9 @@
|
|
5
5
|
<% @trophies.each do |t| %>
|
6
6
|
<tr id="trophyrow_<%= t.noid %>">
|
7
7
|
<td>
|
8
|
-
<%=
|
8
|
+
<%= link_to sufia.generic_file_path(t) do %>
|
9
|
+
<%= render_thumbnail_tag t, { width: 90 } %>
|
10
|
+
<% end %>
|
9
11
|
</td>
|
10
12
|
<td>
|
11
13
|
<%= link_to display_title(t), sufia.generic_file_path(t) %>
|
@@ -1,6 +1,6 @@
|
|
1
1
|
<%= link_to sufia.notifications_path, id: "notify_link", class: "btn btn-default", title: "User Notifications" do %>
|
2
|
-
<%= render :
|
2
|
+
<%= render partial: 'users/notify_number' %>
|
3
3
|
<% end %>
|
4
4
|
<div class='hide'>
|
5
|
-
<%= link_to "notify", sufia.user_notify_path, :
|
5
|
+
<%= link_to "notify", sufia.user_notify_path, remote: true, id: 'notify_update_link' %>
|
6
6
|
</div>
|
@@ -1,7 +1,7 @@
|
|
1
1
|
<div class="tab-pane" id="profile">
|
2
2
|
<h2>User Info</h2>
|
3
3
|
<dl id="user_info">
|
4
|
-
<%= render :
|
5
|
-
<%= render :
|
4
|
+
<%= render partial: 'social_media_info', locals: {user: @user} %>
|
5
|
+
<%= render partial: 'user_info', locals: {user: @user} %>
|
6
6
|
</dl>
|
7
7
|
</div>
|
@@ -1,9 +1,9 @@
|
|
1
1
|
<div>
|
2
|
-
<%= form_tag sufia.profiles_path, :
|
2
|
+
<%= form_tag sufia.profiles_path, method: :get, class: "well form-search" do %>
|
3
3
|
<label class="sr-only">Search Users</label>
|
4
4
|
<label class="accessible-hidden">Search Users</label>
|
5
|
-
<%= text_field_tag :uq, params[:uq], :
|
6
|
-
<%= hidden_field_tag :sort, params[:sort], :
|
5
|
+
<%= text_field_tag :uq, params[:uq], class: "q", placeholder: "Search Users", size: '30', type: "search", id: "user_search" %>
|
6
|
+
<%= hidden_field_tag :sort, params[:sort], id: 'user_sort' %>
|
7
7
|
<%= render_hash_as_hidden_fields(params_for_search().except(:uq, :sort, :qt, :page, :utf8)) %>
|
8
8
|
<button type="submit" class="btn btn-primary" id="user_submit">
|
9
9
|
<i class="glyphicon glyphicon-search"></i> Go
|
@@ -5,9 +5,9 @@ $("a[rel=popover]").popover({ html: true });
|
|
5
5
|
|
6
6
|
<h1>Edit Profile</h1>
|
7
7
|
<div class="col-xs-12 col-sm-5 well">
|
8
|
-
<%= form_for @user, :
|
8
|
+
<%= form_for @user, url: sufia.profile_path(@user.to_param), html: {multipart: true, class: 'form-horizontal' } do |f| %>
|
9
9
|
<div class="form-group">
|
10
|
-
<%= f.label :avatar, '<i class="glyphicon glyphicon-camera"></i> Change picture'.html_safe, :
|
10
|
+
<%= f.label :avatar, '<i class="glyphicon glyphicon-camera"></i> Change picture'.html_safe, class: "col-xs-4 control-label" %>
|
11
11
|
<div class="col-xs-8">
|
12
12
|
<%= image_tag @user.avatar.url(:thumb) if @user.avatar? %>
|
13
13
|
<%= f.file_field :avatar %>
|
@@ -17,7 +17,7 @@ $("a[rel=popover]").popover({ html: true });
|
|
17
17
|
</div><!-- .form-group -->
|
18
18
|
|
19
19
|
<div class="form-group">
|
20
|
-
<%= f.label :delete_avatar, '<i class="glyphicon glyphicon-remove"></i> Delete picture'.html_safe, :
|
20
|
+
<%= f.label :delete_avatar, '<i class="glyphicon glyphicon-remove"></i> Delete picture'.html_safe, class: 'col-xs-4 control-label' %>
|
21
21
|
<div class="col-xs-8">
|
22
22
|
<label class="checkbox">
|
23
23
|
<%= f.check_box :remove_avatar %> Yes
|
@@ -27,7 +27,7 @@ $("a[rel=popover]").popover({ html: true });
|
|
27
27
|
</div><!-- .form-group -->
|
28
28
|
|
29
29
|
<div class="form-group">
|
30
|
-
<%= f.label :update_directory, '<i class="glyphicon glyphicon-refresh"></i> Refresh directory info'.html_safe, :
|
30
|
+
<%= f.label :update_directory, '<i class="glyphicon glyphicon-refresh"></i> Refresh directory info'.html_safe, class: 'col-xs-4 control-label' %>
|
31
31
|
<div class="col-xs-8">
|
32
32
|
<label class="checkbox">
|
33
33
|
<%= check_box_tag 'update_directory' %> Yes
|
@@ -37,41 +37,41 @@ $("a[rel=popover]").popover({ html: true });
|
|
37
37
|
</div><!-- .form-group -->
|
38
38
|
|
39
39
|
<div class="form-group">
|
40
|
-
<%= f.label :twitter_handle, '<i class="glyphicon glyphicon-twitter"></i> Twitter Handle'.html_safe, :
|
40
|
+
<%= f.label :twitter_handle, '<i class="glyphicon glyphicon-twitter"></i> Twitter Handle'.html_safe, class: 'col-xs-4 control-label' %>
|
41
41
|
<div class="col-xs-8">
|
42
|
-
<%= f.text_field :twitter_handle, :
|
42
|
+
<%= f.text_field :twitter_handle, class: "input-medium" %>
|
43
43
|
</div><!-- .controls -->
|
44
44
|
</div><!-- .form-group -->
|
45
45
|
|
46
46
|
<div class="form-group">
|
47
|
-
<%= f.label :facebook_handle, '<i class="glyphicon glyphicon-facebook"></i> Facebook Handle'.html_safe, :
|
47
|
+
<%= f.label :facebook_handle, '<i class="glyphicon glyphicon-facebook"></i> Facebook Handle'.html_safe, class: 'col-xs-4 control-label' %>
|
48
48
|
<div class="col-xs-8">
|
49
|
-
<%= f.text_field :facebook_handle, :
|
49
|
+
<%= f.text_field :facebook_handle, class: "input-medium" %>
|
50
50
|
</div><!-- .controls -->
|
51
51
|
</div><!-- .form-group -->
|
52
52
|
|
53
53
|
<div class="form-group">
|
54
|
-
<%= f.label :googleplus_handle, '<i class="glyphicon glyphicon-google-plus"></i> Google+ Handle'.html_safe, :
|
54
|
+
<%= f.label :googleplus_handle, '<i class="glyphicon glyphicon-google-plus"></i> Google+ Handle'.html_safe, class: 'col-xs-4 control-label' %>
|
55
55
|
<div class="col-xs-8">
|
56
|
-
<%= f.text_field :googleplus_handle, :
|
56
|
+
<%= f.text_field :googleplus_handle, class: "input-medium" %>
|
57
57
|
</div><!-- .controls -->
|
58
58
|
</div><!-- .form-group -->
|
59
59
|
|
60
|
-
<%= render :
|
60
|
+
<%= render partial: 'trophy_edit', locals: {trophies: @trophies} %>
|
61
61
|
|
62
62
|
<div class="form-actions">
|
63
|
-
<%= f.button '<i class="glyphicon glyphicon-save"></i> Save Profile'.html_safe, :
|
63
|
+
<%= f.button '<i class="glyphicon glyphicon-save"></i> Save Profile'.html_safe, type: 'submit', class: "btn-primary btn-large" %>
|
64
64
|
</div>
|
65
65
|
<% end %>
|
66
66
|
</div><!-- .col-xs-5 /well-->
|
67
67
|
|
68
68
|
<div class="col-xs-12 col-sm-offset-1 col-sm-6 well">
|
69
|
-
<h2><i class="glyphicon glyphicon-user"></i> Directory Info (LDAP) <%= link_to 'Edit Instructions', 'http://www.psu.edu/directory/#update', :
|
70
|
-
<%= render :
|
69
|
+
<h2><i class="glyphicon glyphicon-user"></i> Directory Info (LDAP) <%= link_to 'Edit Instructions', 'http://www.psu.edu/directory/#update', class: 'btn btn-mini btn-primary' %></h3>
|
70
|
+
<%= render partial: 'user_info', locals: {user: @user} %>
|
71
71
|
|
72
72
|
<hr />
|
73
73
|
|
74
|
-
<h2><i class="glyphicon glyphicon-group"></i> User Managed Groups Info (UMG) <%= link_to 'Manage UMG', 'http://umg.its.psu.edu/', :
|
74
|
+
<h2><i class="glyphicon glyphicon-group"></i> User Managed Groups Info (UMG) <%= link_to 'Manage UMG', 'http://umg.its.psu.edu/', class: 'btn btn-mini btn-primary' %> </h3>
|
75
75
|
<% current_user.groups.each do |g| %>
|
76
76
|
<i class="icon-caret-right"></i> <%= g %><br />
|
77
77
|
<% end %>
|