sufia 4.0.0.beta4 → 4.0.0.rc1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.gitignore +3 -1
- data/Gemfile +1 -1
- data/History.md +325 -0
- data/RELEASING.md +1 -0
- data/SUFIA_VERSION +1 -1
- data/app/assets/javascripts/sufia.js +2 -2
- data/app/assets/javascripts/sufia/batch_edit.js +2 -2
- data/app/assets/javascripts/sufia/batch_select_all.js +7 -7
- data/app/assets/stylesheets/{dashboard.css.scss → file-listing.css.scss} +7 -1
- data/app/assets/stylesheets/styles.css.scss +23 -0
- data/app/assets/stylesheets/sufia.css.scss +5 -1
- data/app/controllers/concerns/sufia/catalog.rb +4 -4
- data/app/controllers/concerns/sufia/controller.rb +0 -4
- data/app/controllers/concerns/sufia/my_controller_behavior.rb +1 -5
- data/app/controllers/my/collections_controller.rb +7 -0
- data/app/controllers/my/files_controller.rb +7 -0
- data/app/controllers/my/highlights_controller.rb +7 -0
- data/app/controllers/my/shares_controller.rb +7 -0
- data/app/helpers/sufia/records_helper_behavior.rb +1 -1
- data/app/helpers/sufia/sufia_helper_behavior.rb +2 -2
- data/app/models/concerns/sufia/solr_document_behavior.rb +10 -0
- data/app/views/_user_util_links.html.erb +1 -1
- data/app/views/advanced/index.html.erb +10 -13
- data/app/views/batch/_edit.js.erb +15 -0
- data/app/views/batch/_metadata.html.erb +1 -1
- data/app/views/batch/edit.html.erb +10 -25
- data/app/views/batch_edits/_batch_edits_actions.html.erb +1 -1
- data/app/views/batch_edits/_check_all.html.erb +1 -1
- data/app/views/batch_edits/edit.html.erb +3 -3
- data/app/views/catalog/_document_list.html.erb +6 -1
- data/app/views/catalog/index.html.erb +34 -21
- data/app/views/collections/_action_menu.html.erb +5 -5
- data/app/views/collections/_batch_edits_actions.html.erb +1 -1
- data/app/views/collections/_collection.html.erb +36 -0
- data/app/views/collections/_document_list.html.erb +2 -2
- data/app/views/collections/_edit_descriptions.html.erb +1 -1
- data/app/views/collections/_form.html.erb +11 -8
- data/app/views/collections/_search_collection_dashboard_form.html.erb +1 -1
- data/app/views/collections/_sort_and_per_page.html.erb +1 -1
- data/app/views/dashboard/index.html.erb +1 -1
- data/app/views/generic_files/_descriptions.html.erb +1 -1
- data/app/views/generic_files/_edit.js.erb +22 -0
- data/app/views/generic_files/_extra_fields_modal.html.erb +18 -14
- data/app/views/generic_files/_generic_file.html.erb +36 -0
- data/app/views/generic_files/_media_display.html.erb +4 -0
- data/app/views/generic_files/_permission.html.erb +1 -1
- data/app/views/generic_files/_permission_form.html.erb +40 -36
- data/app/views/generic_files/_rights_modal.html.erb +37 -33
- data/app/views/generic_files/edit.html.erb +13 -30
- data/app/views/generic_files/new.html.erb +3 -3
- data/app/views/generic_files/show.html.erb +3 -7
- data/app/views/generic_files/stats.html.erb +1 -1
- data/app/views/generic_files/upload/_form_fields.html.erb +4 -4
- data/app/views/generic_files/upload/_local_file_import_chooser.html.erb +2 -2
- data/app/views/generic_files/upload/_script_templates.html.erb +2 -2
- data/app/views/homepage/_home_content.html.erb +2 -2
- data/app/views/homepage/_home_header.html.erb +1 -1
- data/app/views/homepage/_sortable_featured.html.erb +1 -1
- data/app/views/layouts/_head_tag_content.html.erb +1 -10
- data/app/views/layouts/error.html.erb +0 -9
- data/app/views/layouts/homepage.html.erb +1 -1
- data/app/views/layouts/sufia-dashboard.html.erb +6 -6
- data/app/views/layouts/sufia-one-column.html.erb +2 -2
- data/app/views/layouts/sufia-two-column.html.erb +2 -2
- data/app/views/mailbox/_notifications.html.erb +1 -1
- data/app/views/mailbox/index.html.erb +1 -1
- data/app/views/my/_batch_edits_actions.html.erb +1 -1
- data/app/views/my/_collection_action_menu.html.erb +4 -4
- data/app/views/my/_did_you_mean.html.erb +2 -7
- data/app/views/my/_document_list.html.erb +1 -1
- data/app/views/my/_facet_layout.html.erb +10 -9
- data/app/views/my/_facet_limit.html.erb +9 -9
- data/app/views/my/_facet_pagination.html.erb +14 -17
- data/app/views/my/_facet_selected.html.erb +1 -1
- data/app/views/my/_facets.html.erb +20 -7
- data/app/views/my/_index_partials/_default_group.html.erb +4 -4
- data/app/views/my/_index_partials/_list_collections.html.erb +1 -1
- data/app/views/my/_index_partials/_list_files.html.erb +2 -2
- data/app/views/my/_results_pagination.html.erb +7 -4
- data/app/views/my/_sort_and_per_page.html.erb +5 -8
- data/app/views/my/facet.html.erb +2 -5
- data/app/views/my/index.html.erb +1 -1
- data/app/views/single_use_links/new_download.html.erb +1 -1
- data/app/views/users/_contributions.html.erb +3 -3
- data/app/views/users/_profile_tabs.html.erb +3 -3
- 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 +4 -4
- data/app/views/users/edit.html.erb +5 -10
- data/app/views/users/show.html.erb +16 -21
- data/config/locales/sufia.en.yml +7 -6
- data/config/routes.rb +25 -32
- data/lib/generators/sufia/sufia_generator.rb +1 -1
- data/lib/generators/sufia/upgrade400_generator.rb +87 -0
- data/lib/sufia/version.rb +1 -1
- data/spec/controllers/catalog_controller_spec.rb +22 -0
- data/spec/features/browse_dashboard_files_spec.rb +22 -11
- data/spec/features/catalog_search_spec.rb +99 -0
- data/spec/features/collection_spec.rb +1 -1
- data/spec/helpers/records_helper_spec.rb +1 -1
- data/spec/helpers/sufia_helper_spec.rb +4 -3
- data/spec/models/generic_file_spec.rb +7 -3
- data/spec/models/solr_document_spec.rb +27 -9
- data/spec/services/noid_spec.rb +16 -0
- data/spec/spec_helper.rb +1 -1
- data/spec/views/batch/edit.html.erb_spec.rb +34 -0
- data/spec/views/my/facet.html.erb_spec.rb +34 -0
- data/sufia-models/app/models/concerns/sufia/generic_file/mime_types.rb +1 -1
- data/sufia-models/app/services/sufia/noid.rb +2 -5
- data/sufia-models/lib/generators/sufia/models/upgrade400_generator.rb +78 -0
- data/sufia-models/lib/sufia/models/engine.rb +1 -1
- data/sufia-models/lib/sufia/models/version.rb +1 -1
- data/sufia-models/sufia-models.gemspec +3 -3
- data/sufia.gemspec +1 -1
- data/tasks/sufia-dev.rake +1 -1
- metadata +24 -54
- data/.gitmodules +0 -4
- data/Releasing_sufia.md +0 -6
- data/UpgradeGuide.md +0 -3
- data/app/views/catalog/_bookmark_control.html.erb +0 -24
- data/app/views/catalog/_citation.html.erb +0 -11
- data/app/views/catalog/_constraints.html.erb +0 -6
- data/app/views/catalog/_constraints_element.html.erb +0 -20
- data/app/views/catalog/_did_you_mean.html.erb +0 -10
- data/app/views/catalog/_document.html.erb +0 -19
- data/app/views/catalog/_email_form.html.erb +0 -11
- data/app/views/catalog/_facet_layout.html.erb +0 -12
- data/app/views/catalog/_facet_selected.html.erb +0 -12
- data/app/views/catalog/_facets.html.erb +0 -7
- data/app/views/catalog/_folder_control.html.erb +0 -11
- data/app/views/catalog/_index_default.html.erb +0 -11
- data/app/views/catalog/_index_header_default.html.erb +0 -20
- data/app/views/catalog/_index_partials/_default_group.html.erb +0 -7
- data/app/views/catalog/_index_partials/_list_files.html.erb +0 -37
- data/app/views/catalog/_marc_view.html.erb +0 -33
- data/app/views/catalog/_opensearch_response_metadata.html.erb +0 -2
- data/app/views/catalog/_previous_next_doc.html.erb +0 -6
- data/app/views/catalog/_refworks_form.html.erb +0 -7
- data/app/views/catalog/_results_pagination.html.erb +0 -6
- data/app/views/catalog/_show_default.html.erb +0 -9
- data/app/views/catalog/_show_sidebar.html.erb +0 -1
- data/app/views/catalog/_show_tools.html.erb +0 -46
- data/app/views/catalog/_sms_form.html.erb +0 -21
- data/app/views/catalog/_sort_and_per_page.html.erb +0 -9
- data/app/views/catalog/about.html.erb +0 -0
- data/app/views/catalog/citation.html.erb +0 -1
- data/app/views/catalog/email.erb +0 -1
- data/app/views/catalog/endnote.endnote.erb +0 -1
- data/app/views/catalog/index.atom.builder +0 -109
- data/app/views/catalog/index.rss.builder +0 -19
- data/app/views/catalog/librarian_view.html.erb +0 -3
- data/app/views/catalog/opensearch.json.erb +0 -0
- data/app/views/catalog/opensearch.xml.builder +0 -10
- data/app/views/catalog/send_email_record.erb +0 -0
- data/app/views/catalog/show.endnote.erb +0 -1
- data/app/views/catalog/show.html.erb +0 -40
- data/app/views/catalog/show.refworks.erb +0 -1
- data/app/views/catalog/sms.erb +0 -1
- data/app/views/collections/_button_for_creating_empty_collection.html.erb +0 -3
- data/spec/views/my/facet_limit.html.erb_spec.rb +0 -15
@@ -1,19 +0,0 @@
|
|
1
|
-
xml.instruct! :xml, :version=>"1.0"
|
2
|
-
xml.rss(:version=>"2.0") {
|
3
|
-
|
4
|
-
xml.channel {
|
5
|
-
|
6
|
-
xml.title(application_name + " Search Results")
|
7
|
-
xml.link(catalog_index_url(params))
|
8
|
-
xml.description(application_name + " Search Results")
|
9
|
-
xml.language('en-us')
|
10
|
-
@document_list.each do |doc|
|
11
|
-
xml.item do
|
12
|
-
xml.title( doc.to_semantic_values[:title][0] || doc.id )
|
13
|
-
xml.link(catalog_url(doc[:id]))
|
14
|
-
xml.author( doc.to_semantic_values[:author][0] ) if doc.to_semantic_values[:author][0]
|
15
|
-
end
|
16
|
-
end
|
17
|
-
|
18
|
-
}
|
19
|
-
}
|
File without changes
|
@@ -1,10 +0,0 @@
|
|
1
|
-
xml.instruct! :xml, :version=>'1.0'
|
2
|
-
xml.OpenSearchDescription(:xmlns=>'http://a9.com/-/spec/opensearch/1.1/') {
|
3
|
-
xml.ShortName application_name
|
4
|
-
xml.Description "#{application_name} Search"
|
5
|
-
xml.Image "#{asset_url('favicon.ico')}", :height=>16, :width=>16, :type=>'image/x-icon'
|
6
|
-
xml.Contact
|
7
|
-
xml.Url :type=>'text/html', :method=>'get', :template=>"#{url_for :controller=>'catalog', :only_path => false}?q={searchTerms}"
|
8
|
-
xml.Url :type=>'application/rss+xml', :method=>'get', :template=>"#{url_for :controller=>'catalog', :only_path => false}.rss?q={searchTerms}"
|
9
|
-
xml.Url :type=>'application/x-suggestions+json', :method=>'get', :template=>"#{url_for :controller=>'catalog',:action => 'opensearch', :format=> 'json', :only_path => false}?q={searchTerms}"
|
10
|
-
}
|
File without changes
|
@@ -1 +0,0 @@
|
|
1
|
-
<%= render_endnote_text(@document) %>
|
@@ -1,40 +0,0 @@
|
|
1
|
-
<%-
|
2
|
-
doc_title = document_show_html_title.blank? ? @document[:id] : document_show_html_title.first
|
3
|
-
@page_title = "#{doc_title} - #{application_name}"
|
4
|
-
-%>
|
5
|
-
<div id="showHead">
|
6
|
-
<div id="showUtils">
|
7
|
-
<span class="back_to_cat"><%= link_back_to_catalog label: '← Return to search results' %></span>
|
8
|
-
<%- if @previous_document || @next_document -%>
|
9
|
-
<div id="previousNextDocument">
|
10
|
-
<span class="previous"><%= link_to_previous_document(@previous_document) %></span>
|
11
|
-
<%- end -%>
|
12
|
-
<%- if session[:search][:counter].to_i > 0 -%>
|
13
|
-
<span class="result-num">
|
14
|
-
<%= session[:search][:counter].to_i %> of <%= format_num(session[:search][:total]) %>
|
15
|
-
</span>
|
16
|
-
<%- end -%>
|
17
|
-
<%- if @previous_document || @next_document -%>
|
18
|
-
<span class="next"><%= link_to_next_document(@next_document)%></span>
|
19
|
-
</div>
|
20
|
-
<%- end -%>
|
21
|
-
<%- if editor? && controller.action_name != "delete" -%>
|
22
|
-
<span class="edit-browse">
|
23
|
-
<%= edit_and_browse_links %>
|
24
|
-
</span>
|
25
|
-
<%- end -%>
|
26
|
-
</div>
|
27
|
-
</div>
|
28
|
-
<div id="document" class="<%= controller.action_name == "edit" ? "document_edit" : "document_show" %> <%= "combined_document_view" if session[:scripts] %>">
|
29
|
-
<div id="<%= format_pid(@document[:id]) %>">
|
30
|
-
<%= "<h1>Add Your Work</h1>".html_safe if controller.action_name == "edit" %>
|
31
|
-
<div class="document">
|
32
|
-
<%= render_document_partial @document, params["action"] %>
|
33
|
-
</div>
|
34
|
-
</div>
|
35
|
-
</div>
|
36
|
-
<% if controller.action_name == "edit" %>
|
37
|
-
<div class="delete-asset">
|
38
|
-
<%= button_to("Delete This Item", {action: :destroy, controller: :assets, id: @document_fedora.pid}, confirm: 'Are you sure?', method: :delete )%>
|
39
|
-
</div>
|
40
|
-
<% end %>
|
@@ -1 +0,0 @@
|
|
1
|
-
<%= render_refworks_text(@document) %>
|
data/app/views/catalog/sms.erb
DELETED
@@ -1 +0,0 @@
|
|
1
|
-
<%= render partial: 'sms_form' %>
|
@@ -1,15 +0,0 @@
|
|
1
|
-
require 'spec_helper'
|
2
|
-
|
3
|
-
describe 'my/_facet_limit.html.erb' do
|
4
|
-
|
5
|
-
it "should draw facet links" do
|
6
|
-
allow(view).to receive(:display_facet).and_return(double(items: [double(value: 'Audio', hits: 3), double(value: 'Video', hits:2)]))
|
7
|
-
allow(view).to receive(:solr_field).and_return('desc_metadata__resource_type_sim')
|
8
|
-
allow(view).to receive(:facet_limit_for).and_return(5)
|
9
|
-
allow(view).to receive(:blacklight_config).and_return(MyController.blacklight_config)
|
10
|
-
allow(view).to receive(:search_action_path).and_return('/search')
|
11
|
-
allow(view).to receive(:params).and_return({controller: 'dashboard'})
|
12
|
-
render
|
13
|
-
expect(rendered).to include '<span class="facet-label"><a class="facet_select" href="/search">Audio</a></span><span class="facet-count">3</span>'
|
14
|
-
end
|
15
|
-
end
|