blacklight 5.7.2 → 5.8.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/.travis.yml +1 -3
- data/Gemfile +1 -4
- data/VERSION +1 -1
- data/app/assets/stylesheets/blacklight/_catalog.css.scss +38 -1
- data/app/assets/stylesheets/blacklight/_facets.css.scss +10 -0
- data/app/assets/stylesheets/blacklight/_layout.css.scss +6 -0
- data/app/controllers/bookmarks_controller.rb +3 -163
- data/app/helpers/blacklight/blacklight_helper_behavior.rb +18 -186
- data/app/helpers/blacklight/catalog_helper_behavior.rb +36 -2
- data/app/helpers/blacklight/component_helper_behavior.rb +77 -0
- data/app/helpers/blacklight/configuration_helper_behavior.rb +30 -21
- data/app/helpers/blacklight/render_partials_helper.rb +185 -0
- data/app/helpers/blacklight/url_helper_behavior.rb +24 -3
- data/app/helpers/component_helper.rb +3 -0
- data/app/views/_user_util_links.html.erb +2 -15
- data/app/views/blacklight/nav/_bookmark.html.erb +4 -0
- data/app/views/blacklight/nav/_saved_searches.html.erb +1 -0
- data/app/views/blacklight/nav/_search_history.html.erb +1 -0
- data/app/views/bookmarks/_tools.html.erb +6 -9
- data/app/views/bookmarks/index.html.erb +1 -1
- data/app/views/catalog/_bookmark_control.html.erb +8 -8
- data/app/views/catalog/_constraints_element.html.erb +1 -1
- data/app/views/catalog/_document_action.html.erb +4 -0
- data/app/views/catalog/_email_form.html.erb +1 -1
- data/app/views/catalog/_facet_limit.html.erb +1 -1
- data/app/views/catalog/_index_header_default.html.erb +5 -6
- data/app/views/catalog/_per_page_widget.html.erb +3 -1
- data/app/views/catalog/_results_pagination.html.erb +1 -1
- data/app/views/catalog/_search_form.html.erb +5 -8
- data/app/views/catalog/_show_more_like_this.html.erb +2 -2
- data/app/views/catalog/_show_tools.html.erb +5 -34
- data/app/views/catalog/_sms_form.html.erb +1 -1
- data/app/views/catalog/_sort_and_per_page.html.erb +2 -6
- data/app/views/catalog/_sort_widget.html.erb +1 -1
- data/app/views/catalog/_zero_results.html.erb +2 -2
- data/app/views/catalog/citation.js.erb +1 -1
- data/app/views/catalog/email_sent.html.erb +2 -9
- data/app/views/catalog/email_success.html.erb +9 -0
- data/app/views/catalog/sms_sent.html.erb +2 -9
- data/app/views/catalog/sms_success.html.erb +9 -0
- data/app/views/kaminari/blacklight/_gap.html.erb +1 -1
- data/app/views/kaminari/blacklight/_page.html.erb +5 -1
- data/app/views/shared/_header_navbar.html.erb +1 -1
- data/config/locales/blacklight.en.yml +1 -1
- data/config/locales/blacklight.es.yml +1 -1
- data/config/locales/blacklight.fr.yml +1 -1
- data/config/locales/blacklight.pt-BR.yml +1 -1
- data/lib/blacklight.rb +3 -0
- data/lib/blacklight/base.rb +0 -1
- data/lib/blacklight/bookmarks.rb +135 -0
- data/lib/blacklight/catalog.rb +58 -77
- data/lib/blacklight/catalog/component_configuration.rb +99 -0
- data/lib/blacklight/configuration.rb +82 -4
- data/lib/blacklight/configuration/tool_config.rb +4 -0
- data/lib/blacklight/controller.rb +5 -1
- data/lib/blacklight/document_presenter.rb +17 -8
- data/lib/blacklight/request_builders.rb +136 -4
- data/lib/blacklight/routes.rb +5 -0
- data/lib/blacklight/solr_helper.rb +90 -208
- data/lib/blacklight/solr_repository.rb +69 -0
- data/lib/blacklight/token_based_user.rb +58 -0
- data/lib/blacklight/utils.rb +13 -1
- data/lib/generators/blacklight/install_generator.rb +6 -7
- data/spec/controllers/alternate_controller_spec.rb +19 -0
- data/spec/controllers/catalog_controller_spec.rb +89 -4
- data/spec/features/alternate_controller_spec.rb +0 -1
- data/spec/features/bookmarks_spec.rb +31 -6
- data/spec/features/search_results_spec.rb +11 -0
- data/spec/features/search_spec.rb +5 -0
- data/spec/helpers/blacklight_helper_spec.rb +49 -8
- data/spec/helpers/catalog_helper_spec.rb +56 -8
- data/spec/helpers/configuration_helper_spec.rb +5 -5
- data/spec/helpers/url_helper_spec.rb +15 -8
- data/spec/lib/blacklight/catalog/component_configuration_spec.rb +29 -0
- data/spec/lib/blacklight/configuration_spec.rb +15 -0
- data/spec/lib/blacklight/solr_helper_spec.rb +44 -104
- data/spec/lib/blacklight/solr_repository_spec.rb +113 -0
- data/spec/lib/utils_spec.rb +27 -0
- data/spec/views/_user_util_links.html.erb_spec.rb +6 -3
- data/spec/views/catalog/_show_sidebar.erb_spec.rb +8 -2
- data/spec/views/catalog/_show_tools.html.erb_spec.rb +82 -0
- data/spec/views/catalog/_sort_and_per_page.html.erb_spec.rb +15 -1
- data/tasks/blacklight.rake +25 -1
- metadata +24 -2
@@ -1,21 +1,8 @@
|
|
1
1
|
<div class="navbar-right">
|
2
2
|
<ul class="nav navbar-nav">
|
3
|
-
|
4
|
-
|
5
|
-
<%= link_to bookmarks_path, id:'bookmarks_nav' do %>
|
6
|
-
<%= t('blacklight.header_links.bookmarks') %>
|
7
|
-
(<span data-role='bookmark-counter'><%= current_or_guest_user.bookmarks.count %></span>)
|
8
|
-
<% end %>
|
9
|
-
</li>
|
10
|
-
<% end %>
|
11
|
-
<% if has_user_authentication_provider? and current_user %>
|
12
|
-
<li>
|
13
|
-
<%= link_to t('blacklight.header_links.saved_searches'), saved_searches_path %>
|
14
|
-
</li>
|
3
|
+
<%= render_nav_actions do |config, action|%>
|
4
|
+
<li><%= action %></li>
|
15
5
|
<% end %>
|
16
|
-
<li>
|
17
|
-
<%= link_to t('blacklight.header_links.search_history'), search_history_path %>
|
18
|
-
</li>
|
19
6
|
</ul>
|
20
7
|
|
21
8
|
<% if has_user_authentication_provider? %>
|
@@ -0,0 +1 @@
|
|
1
|
+
<%= link_to t('blacklight.header_links.saved_searches'), saved_searches_path %>
|
@@ -0,0 +1 @@
|
|
1
|
+
<%= link_to t('blacklight.header_links.search_history'), search_history_path %>
|
@@ -1,11 +1,8 @@
|
|
1
|
-
<ul class="
|
2
|
-
|
3
|
-
|
4
|
-
|
5
|
-
|
6
|
-
|
7
|
-
<%= link_to t('blacklight.tools.email'), email_catalog_path(:sort=>params[:sort], :per_page=>params[:per_page], :id => @response.documents.map {|doc| doc.id}), :class=>"btn btn-default", :id => "emailLink", :data => {:ajax_modal => "trigger"} %>
|
8
|
-
</li>
|
9
|
-
|
1
|
+
<ul class="<%= controller_name %>Tools nav nav-pills">
|
2
|
+
<%= render_show_doc_actions document_list, document: nil, document_list: @document_list, url_opts: sanitize_search_params(params) do |config, inner| %>
|
3
|
+
<li>
|
4
|
+
<%= inner %>
|
5
|
+
</li>
|
6
|
+
<% end %>
|
10
7
|
<%= render_marc_tools %>
|
11
8
|
</ul>
|
@@ -11,7 +11,7 @@
|
|
11
11
|
<% else %>
|
12
12
|
<%= link_to t('blacklight.bookmarks.clear.action_title'), clear_bookmarks_path, :method => :delete, :data => { :confirm => t('blacklight.bookmarks.clear.action_confirm') }, :class => 'clear-bookmarks btn btn-danger pull-right' %>
|
13
13
|
<%= render 'sort_and_per_page' %>
|
14
|
-
<%= render 'tools' %>
|
14
|
+
<%= render partial: 'tools', locals: { document_list: @document_list } %>
|
15
15
|
|
16
16
|
<%= render_document_index %>
|
17
17
|
<%= render 'results_pagination' %>
|
@@ -1,21 +1,21 @@
|
|
1
1
|
<% if current_or_guest_user %>
|
2
|
-
<%-
|
3
|
-
# Note these two forms are pretty similar but for different :methods, classes, and labels.
|
2
|
+
<%-
|
3
|
+
# Note these two forms are pretty similar but for different :methods, classes, and labels.
|
4
4
|
# but it was simpler to leave them seperate instead of DRYing them, got confusing trying that.
|
5
5
|
# the data-doc-id attribute is used by our JS that converts to a checkbox/label.
|
6
6
|
-%>
|
7
|
-
<% if current_bookmarks.find { |x| x.document_id == document.id and x.document_type == document.class }.blank? %>
|
7
|
+
<% if current_bookmarks.find { |x| x.document_id == document.id and x.document_type == document.class }.blank? %>
|
8
8
|
|
9
|
-
<%= form_tag( bookmark_path( document ), :method => :put, :class => "bookmark_toggle", "data-doc-id" => document.id, :'data-present' => t('blacklight.search.bookmarks.present'), :'data-absent' => t('blacklight.search.bookmarks.absent'), :'data-inprogress' => t('blacklight.search.bookmarks.inprogress')) do %>
|
9
|
+
<%= form_tag( bookmark_path( document ), :method => :put, :class => "bookmark_toggle", "data-doc-id" => document.id, :'data-present' => t('blacklight.search.bookmarks.present'), :'data-absent' => t('blacklight.search.bookmarks.absent'), :'data-inprogress' => t('blacklight.search.bookmarks.inprogress')) do %>
|
10
10
|
<%= submit_tag(t('blacklight.bookmarks.add.button'), :id => "bookmark_toggle_#{document.id.to_s.parameterize}", :class => "bookmark_add") %>
|
11
11
|
<% end %>
|
12
|
-
|
12
|
+
|
13
13
|
<% else %>
|
14
|
-
|
15
|
-
<%= form_tag( bookmark_path( document ), :method => :delete, :class => "bookmark_toggle", "data-doc-id" => document.id, :'data-present' => t('blacklight.search.bookmarks.present'), :'data-absent' => t('blacklight.search.bookmarks.absent'), :'data-inprogress' => t('blacklight.search.bookmarks.inprogress')) do %>
|
14
|
+
|
15
|
+
<%= form_tag( bookmark_path( document ), :method => :delete, :class => "bookmark_toggle", "data-doc-id" => document.id, :'data-present' => t('blacklight.search.bookmarks.present'), :'data-absent' => t('blacklight.search.bookmarks.absent'), :'data-inprogress' => t('blacklight.search.bookmarks.inprogress')) do %>
|
16
16
|
<%= submit_tag(t('blacklight.bookmarks.remove.button'), :id => "bookmark_toggle_#{document.id.to_s.parameterize}", :class => "bookmark_remove") %>
|
17
17
|
<% end %>
|
18
|
-
|
18
|
+
|
19
19
|
<% end %>
|
20
20
|
<% else %>
|
21
21
|
|
@@ -13,7 +13,7 @@
|
|
13
13
|
<span class="filterName"><%= label %></span>
|
14
14
|
<% end %>
|
15
15
|
<% unless value.blank? %>
|
16
|
-
|
16
|
+
<%= content_tag :span, value, class: 'filterValue', title: value %>
|
17
17
|
<% end %>
|
18
18
|
</span>
|
19
19
|
<% unless options[:remove].blank? %>
|
@@ -0,0 +1,4 @@
|
|
1
|
+
<%= link_to document_action_label(document_action_config.key, document_action_config),
|
2
|
+
document_action_path(document_action_config, (local_assigns.has_key?(:url_opts) ? url_opts : {}).merge(({id: document} if document) || {})),
|
3
|
+
id: document_action_config.fetch(:id, "#{document_action_config.key}Link"),
|
4
|
+
data: {}.merge(({ajax_modal: "trigger"} if document_action_config.modal != false) || {}) %>
|
@@ -1,4 +1,4 @@
|
|
1
|
-
<%= form_tag url_for(:controller =>
|
1
|
+
<%= form_tag url_for(:controller => controller_name, :action => "email"), :id => 'email_form', :class => "form-horizontal ajax_form", :method => :post do %>
|
2
2
|
|
3
3
|
<div class="modal-body">
|
4
4
|
<%= render :partial=>'/flash_msg' %>
|
@@ -4,6 +4,6 @@
|
|
4
4
|
|
5
5
|
<% unless paginator.last_page? || params[:action] == "facet" %>
|
6
6
|
<li class="more_facets_link"><%= link_to t('blacklight.search.facets.more'),
|
7
|
-
|
7
|
+
search_facet_url(id: solr_field), class: "more_facets_link" %></li>
|
8
8
|
<% end %>
|
9
9
|
</ul>
|
@@ -1,20 +1,19 @@
|
|
1
|
-
|
1
|
+
|
2
2
|
<% # header bar for doc items in index view -%>
|
3
3
|
<div class="documentHeader row">
|
4
|
-
|
5
|
-
<%# main title container for doc partial view
|
4
|
+
|
5
|
+
<%# main title container for doc partial view
|
6
6
|
How many bootstrap columns need to be reserved
|
7
|
-
for bookmarks control depends on size.
|
7
|
+
for bookmarks control depends on size.
|
8
8
|
-%>
|
9
9
|
<h5 class="index_title col-sm-9 col-lg-10">
|
10
10
|
<% counter = document_counter_with_offset(document_counter) %>
|
11
11
|
<span class="document-counter">
|
12
12
|
<%= t('blacklight.search.documents.counter', :counter => counter) if counter %>
|
13
13
|
</span>
|
14
|
-
<%= link_to_document document,
|
14
|
+
<%= link_to_document document, document_show_link_field(document), :counter => counter %>
|
15
15
|
</h5>
|
16
16
|
|
17
17
|
<% # bookmark functions for items/docs -%>
|
18
18
|
<%= render_index_doc_actions document, :wrapping_class => "index-document-functions col-sm-3 col-lg-2" %>
|
19
19
|
</div>
|
20
|
-
|
@@ -2,7 +2,9 @@
|
|
2
2
|
|
3
3
|
<span class="sr-only"><%= t('blacklight.search.per_page.title') %></span>
|
4
4
|
<div id="per_page-dropdown" class="btn-group">
|
5
|
-
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"
|
5
|
+
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
|
6
|
+
<%= t(:'blacklight.search.per_page.button_label', :count => current_per_page) %> <span class="caret"></span>
|
7
|
+
</button>
|
6
8
|
<ul class="dropdown-menu" role="menu">
|
7
9
|
<%- per_page_options_for_select.each do |(label, count)| %>
|
8
10
|
<li><%= link_to(label, url_for(params_for_search(:per_page => count))) %></li>
|
@@ -1,15 +1,12 @@
|
|
1
1
|
<%= form_tag search_action_url, :method => :get, :class => 'search-query-form form-inline clearfix navbar-form' do %>
|
2
2
|
<%= render_hash_as_hidden_fields(params_for_search().except(:q, :search_field, :qt, :page, :utf8)) %>
|
3
3
|
|
4
|
-
<div class="input-group">
|
5
4
|
<% unless search_fields.empty? %>
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
</span>
|
12
|
-
<% end %>
|
5
|
+
<label for="search_field" class="sr-only"><%= t('blacklight.search.form.search_field.label') %></label>
|
6
|
+
<%= select_tag(:search_field, options_for_select(search_fields, h(params[:search_field])), :title => t('blacklight.search.form.search_field.title'), :class=>"search_field form-control") %>
|
7
|
+
<span class="sr-only"><%= t('blacklight.search.form.search_field.post_label') %></span>
|
8
|
+
<% end %>
|
9
|
+
<div class="input-group search-input-group">
|
13
10
|
<label for="q" class="sr-only"><%= t('blacklight.search.form.q') %></label>
|
14
11
|
<%= text_field_tag :q, params[:q], :placeholder => t('blacklight.search.form.q'), :class => "search_q q form-control", :id => "q", :autofocus => should_autofocus_on_search_box? %>
|
15
12
|
|
@@ -1,3 +1,3 @@
|
|
1
1
|
<li class="more_like_this_document">
|
2
|
-
<span class="mlt_title"><%= link_to_document document,
|
3
|
-
</li>
|
2
|
+
<span class="mlt_title"><%= link_to_document document, document_show_link_field(document) %></span>
|
3
|
+
</li>
|
@@ -13,41 +13,12 @@
|
|
13
13
|
</div>
|
14
14
|
|
15
15
|
<div class="panel-body">
|
16
|
-
|
17
|
-
|
18
|
-
<%=
|
19
|
-
|
20
|
-
<% if (@document.respond_to?(:export_as_mla_citation_txt) || @document.respond_to?(:export_as_apa_citation_txt)) %>
|
21
|
-
<li class="cite">
|
22
|
-
<%= link_to t('blacklight.tools.cite'), citation_catalog_path(:id => @document), {:id => 'citeLink', :data => {:ajax_modal => "trigger"}} %>
|
16
|
+
<ul class="nav">
|
17
|
+
<%= render_show_doc_actions @document do |config, inner| %>
|
18
|
+
<li class="<%= config.key %>">
|
19
|
+
<%= inner %>
|
23
20
|
</li>
|
24
21
|
<% end %>
|
25
|
-
|
26
|
-
<li class="refworks">
|
27
|
-
<%= link_to t('blacklight.tools.refworks'), refworks_export_url(url: polymorphic_url(url_for_document(@document), format: :refworks_marc_txt, only_path: false)) %>
|
28
|
-
</li>
|
29
|
-
<% end %>
|
30
|
-
<% if @document.export_formats.keys.include?( :endnote ) %>
|
31
|
-
<li class="endnote">
|
32
|
-
<%= link_to t('blacklight.tools.endnote'), catalog_path(@document, :format => 'endnote') %>
|
33
|
-
</li>
|
34
|
-
<% end %>
|
35
|
-
<% if @document.respond_to?( :to_email_text ) %>
|
36
|
-
<li class="email">
|
37
|
-
<%= link_to t('blacklight.tools.email'), email_catalog_path(:id => @document), {:id => 'emailLink', :data => {:ajax_modal => "trigger"}} %>
|
38
|
-
</li>
|
39
|
-
<%- end -%>
|
40
|
-
<%- if @document.respond_to?( :to_sms_text ) -%>
|
41
|
-
<li class="sms">
|
42
|
-
<%= link_to t('blacklight.tools.sms'), sms_catalog_path(:id => @document), {:id => 'smsLink', :data => {:ajax_modal => "trigger"}} %>
|
43
|
-
</li>
|
44
|
-
<%- end -%>
|
45
|
-
|
46
|
-
<% if respond_to? :librarian_view_catalog_path and @document.respond_to?(:to_marc) %>
|
47
|
-
<li class="librarian_view">
|
48
|
-
<%= link_to t('blacklight.tools.librarian_view'), librarian_view_catalog_path(@document), {:id => 'librarianLink', :data => {:ajax_modal => "trigger"}} %>
|
49
|
-
</li>
|
50
|
-
<% end %>
|
51
|
-
</ul>
|
22
|
+
</ul>
|
52
23
|
</div>
|
53
24
|
</div>
|
@@ -1,4 +1,4 @@
|
|
1
|
-
<%= form_tag url_for(:controller =>
|
1
|
+
<%= form_tag url_for(:controller => controller_name, :action => "sms"), :id => 'sms_form', :class => "form-horizontal ajax_form", :method => :post do %>
|
2
2
|
<div class="modal-body">
|
3
3
|
<%= render :partial=>'/flash_msg' %>
|
4
4
|
<div class="form-group">
|
@@ -1,8 +1,4 @@
|
|
1
1
|
<div id="sortAndPerPage" class="clearfix">
|
2
|
-
<%= render :partial => "paginate_compact", :object => @response %>
|
3
|
-
|
4
|
-
<%= render :partial => 'sort_widget' %>
|
5
|
-
<%= render :partial => 'per_page_widget' %>
|
6
|
-
<%= render :partial => 'view_type_group' %>
|
7
|
-
</div>
|
2
|
+
<%= render :partial => "paginate_compact", :object => @response if show_pagination? %>
|
3
|
+
<%= render_results_collection_tools wrapping_class: "search-widgets pull-right" %>
|
8
4
|
</div>
|
@@ -1,7 +1,7 @@
|
|
1
1
|
<% if show_sort_and_per_page? and !active_sort_fields.blank? %>
|
2
2
|
<div id="sort-dropdown" class="btn-group">
|
3
3
|
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
|
4
|
-
<%=
|
4
|
+
<%= t('blacklight.search.sort.label', :field =>current_sort_field.label) %> <span class="caret"></span>
|
5
5
|
</button>
|
6
6
|
|
7
7
|
<ul class="dropdown-menu" role="menu">
|
@@ -4,9 +4,9 @@
|
|
4
4
|
<ul>
|
5
5
|
<li><%= t 'blacklight.search.zero_results.use_fewer_keywords' %></li>
|
6
6
|
|
7
|
-
<%- if params[:q] and params[:search_field] and params[:search_field] != blacklight_config.default_search_field -%>
|
7
|
+
<%- if params[:q] and params[:search_field] and params[:search_field] != blacklight_config.default_search_field.try(:key) -%>
|
8
8
|
<li><%= t 'blacklight.search.zero_results.search_fields', :search_fields => search_field_label(params) %> -
|
9
|
-
<%= link_to t('blacklight.search.zero_results.search_everything'), url_for(params_for_search(:search_field=>blacklight_config.default_search_field.key)) %>
|
9
|
+
<%= link_to t('blacklight.search.zero_results.search_everything', field: blacklight_config.default_search_field.label), url_for(params_for_search(:search_field=>blacklight_config.default_search_field.key)) %>
|
10
10
|
</li>
|
11
11
|
<%- end %>
|
12
12
|
|
@@ -1,6 +1,6 @@
|
|
1
1
|
<div class="modal-header">
|
2
2
|
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
|
3
|
-
<h3><%= t('blacklight.tools.
|
3
|
+
<h3><%= t('blacklight.tools.citation') %></h3>
|
4
4
|
</div>
|
5
5
|
<div class="modal-body">
|
6
6
|
<%= render :partial => 'citation' -%>
|
@@ -1,9 +1,2 @@
|
|
1
|
-
|
2
|
-
|
3
|
-
<h1><%= t('blacklight.email.form.title') %></h1>
|
4
|
-
</div>
|
5
|
-
|
6
|
-
<div class="modal-body">
|
7
|
-
<%= render :partial=>'/flash_msg' %>
|
8
|
-
<span class="ajax-close-modal"></span>
|
9
|
-
</div>
|
1
|
+
<% Deprecation.warn controller, "The template catalog/email_sent.html.erb is deprecated; use email_success instead" %>
|
2
|
+
<%= render template: "catalog/email_success" %>
|
@@ -0,0 +1,9 @@
|
|
1
|
+
<div class="modal-header">
|
2
|
+
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
|
3
|
+
<h1><%= t('blacklight.email.form.title') %></h1>
|
4
|
+
</div>
|
5
|
+
|
6
|
+
<div class="modal-body">
|
7
|
+
<%= render :partial=>'/flash_msg' %>
|
8
|
+
<span class="ajax-close-modal"></span>
|
9
|
+
</div>
|
@@ -1,9 +1,2 @@
|
|
1
|
-
|
2
|
-
|
3
|
-
<h1 class="modal-title"><%= t('blacklight.sms.form.title') %></h1>
|
4
|
-
</div>
|
5
|
-
|
6
|
-
<div class="modal-body">
|
7
|
-
<%= render :partial=>'/flash_msg' %>
|
8
|
-
<span class="ajax-close-modal"></span>
|
9
|
-
</div>
|
1
|
+
<% Deprecation.warn controller, "The template catalog/sms_sent.html.erb is deprecated; use sms_success instead" %>
|
2
|
+
<%= render template: "catalog/sms_success" %>
|
@@ -0,0 +1,9 @@
|
|
1
|
+
<div class="modal-header">
|
2
|
+
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
|
3
|
+
<h1 class="modal-title"><%= t('blacklight.sms.form.title') %></h1>
|
4
|
+
</div>
|
5
|
+
|
6
|
+
<div class="modal-body">
|
7
|
+
<%= render :partial=>'/flash_msg' %>
|
8
|
+
<span class="ajax-close-modal"></span>
|
9
|
+
</div>
|
@@ -8,6 +8,10 @@
|
|
8
8
|
remote: data-remote
|
9
9
|
-%>
|
10
10
|
<li class="<%= 'active' if page.current? %>">
|
11
|
-
|
11
|
+
<% if page.current? %>
|
12
|
+
<span><%= number_with_delimiter(page.to_s) %></span>
|
13
|
+
<% else %>
|
14
|
+
<%= link_to number_with_delimiter(page.to_s), url, opts = {:remote => remote, :rel => page.next? ? 'next' : page.prev? ? 'prev' : nil} %>
|
15
|
+
<% end %>
|
12
16
|
</li>
|
13
17
|
|
@@ -1,7 +1,7 @@
|
|
1
1
|
<div id="header-navbar" class="navbar navbar-inverse navbar-static-top" role="navigation">
|
2
2
|
<div class="container">
|
3
3
|
<div class="navbar-header">
|
4
|
-
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#user-util-collapse">
|
4
|
+
<button type="button" class="navbar-toggle btn collapsed" data-toggle="collapse" data-target="#user-util-collapse">
|
5
5
|
<span class="sr-only">Toggle navigation</span>
|
6
6
|
<span class="icon-bar"></span>
|
7
7
|
<span class="icon-bar"></span>
|
data/lib/blacklight.rb
CHANGED
@@ -10,6 +10,7 @@ module Blacklight
|
|
10
10
|
autoload :Solr, 'blacklight/solr'
|
11
11
|
|
12
12
|
autoload :SolrHelper, 'blacklight/solr_helper'
|
13
|
+
autoload :SolrRepository, 'blacklight/solr_repository'
|
13
14
|
autoload :RequestBuilders, 'blacklight/request_builders'
|
14
15
|
|
15
16
|
autoload :Exceptions, 'blacklight/exceptions'
|
@@ -19,6 +20,8 @@ module Blacklight
|
|
19
20
|
autoload :Controller, 'blacklight/controller'
|
20
21
|
autoload :Base, 'blacklight/base'
|
21
22
|
autoload :Catalog, 'blacklight/catalog'
|
23
|
+
autoload :TokenBasedUser, 'blacklight/token_based_user'
|
24
|
+
autoload :Bookmarks, 'blacklight/bookmarks'
|
22
25
|
autoload :DocumentPresenter, 'blacklight/document_presenter'
|
23
26
|
|
24
27
|
autoload :Routes, 'blacklight/routes'
|