blacklight 3.4.2 → 3.5.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (95) hide show
  1. data/Gemfile +4 -0
  2. data/VERSION +1 -1
  3. data/app/assets/javascripts/blacklight/blacklight.js +15 -474
  4. data/app/assets/javascripts/blacklight/bookmark_toggle.js +21 -0
  5. data/app/assets/javascripts/blacklight/checkbox_submit.js +126 -0
  6. data/app/assets/javascripts/blacklight/core.js +2 -0
  7. data/app/assets/javascripts/blacklight/facet_expand_contract.js +40 -0
  8. data/app/assets/javascripts/blacklight/folder_toggle.js +24 -0
  9. data/app/assets/javascripts/blacklight/lightbox_dialog.js +15 -0
  10. data/app/assets/javascripts/blacklight/more_facets.js +15 -0
  11. data/app/assets/javascripts/blacklight/search_context.js +26 -0
  12. data/app/assets/javascripts/blacklight/select_submit.js +18 -0
  13. data/app/assets/javascripts/blacklight/zebra_stripe.js +13 -0
  14. data/app/assets/javascripts/jquery.uiExt.ajaxyDialog.js +180 -0
  15. data/app/controllers/bookmarks_controller.rb +9 -9
  16. data/app/controllers/feedback_controller.rb +3 -3
  17. data/app/controllers/folder_controller.rb +3 -3
  18. data/app/controllers/saved_searches_controller.rb +7 -7
  19. data/app/controllers/search_history_controller.rb +2 -2
  20. data/app/helpers/blacklight/blacklight_helper_behavior.rb +6 -10
  21. data/app/helpers/blacklight/catalog_helper_behavior.rb +8 -11
  22. data/app/helpers/blacklight/facets_helper_behavior.rb +2 -2
  23. data/app/helpers/blacklight/search_history_constraints_helper_behavior.rb +2 -2
  24. data/app/models/bookmark.rb +5 -0
  25. data/app/models/record_mailer.rb +5 -11
  26. data/app/views/_user_util_links.html.erb +6 -6
  27. data/app/views/bookmarks/index.html.erb +8 -8
  28. data/app/views/catalog/_bookmark_control.html.erb +2 -2
  29. data/app/views/catalog/_bookmark_form.html.erb +3 -3
  30. data/app/views/catalog/_citation.html.erb +3 -3
  31. data/app/views/catalog/_constraints.html.erb +1 -1
  32. data/app/views/catalog/_constraints_element.html.erb +2 -2
  33. data/app/views/catalog/_did_you_mean.html.erb +2 -7
  34. data/app/views/catalog/_document.html.erb +1 -1
  35. data/app/views/catalog/_email_form.html.erb +4 -4
  36. data/app/views/catalog/_facet_limit.html.erb +1 -1
  37. data/app/views/catalog/_facet_pagination.html.erb +7 -7
  38. data/app/views/catalog/_facets.html.erb +1 -1
  39. data/app/views/catalog/_folder_control.html.erb +1 -1
  40. data/app/views/catalog/_home_text.html.erb +1 -1
  41. data/app/views/catalog/_marc_view.html.erb +2 -2
  42. data/app/views/catalog/_refworks_form.html.erb +2 -2
  43. data/app/views/catalog/_results_pagination.html.erb +1 -1
  44. data/app/views/catalog/_search_form.html.erb +5 -5
  45. data/app/views/catalog/_show_tools.html.erb +6 -6
  46. data/app/views/catalog/_sms_form.html.erb +5 -5
  47. data/app/views/catalog/_sort_and_per_page.html.erb +6 -9
  48. data/app/views/catalog/index.atom.builder +3 -3
  49. data/app/views/catalog/index.html.erb +2 -2
  50. data/app/views/catalog/index.rss.builder +3 -3
  51. data/app/views/catalog/show.html.erb +2 -2
  52. data/app/views/feedback/complete.html.erb +2 -2
  53. data/app/views/feedback/show.html.erb +5 -5
  54. data/app/views/folder/_tools.html.erb +4 -4
  55. data/app/views/folder/index.html.erb +1 -1
  56. data/app/views/layouts/blacklight.html.erb +1 -1
  57. data/app/views/record_mailer/email_record.text.erb +2 -2
  58. data/app/views/record_mailer/sms_record.text.erb +1 -1
  59. data/app/views/saved_searches/index.html.erb +6 -6
  60. data/app/views/search_history/index.html.erb +6 -6
  61. data/config/locales/blacklight.en.yml +227 -0
  62. data/lib/blacklight.rb +0 -2
  63. data/lib/blacklight/catalog.rb +11 -13
  64. data/lib/blacklight/configurable.rb +0 -3
  65. data/lib/blacklight/configuration.rb +0 -42
  66. data/lib/blacklight/configuration/fields.rb +2 -0
  67. data/lib/blacklight/routes.rb +14 -2
  68. data/lib/blacklight/search_fields.rb +1 -1
  69. data/lib/blacklight/solr/document/email.rb +6 -6
  70. data/lib/blacklight/solr/document/sms.rb +4 -4
  71. data/lib/blacklight/solr_helper.rb +1 -3
  72. data/lib/generators/blacklight/blacklight_generator.rb +3 -0
  73. data/lib/railties/blacklight_cucumber.rake +12 -3
  74. data/lib/railties/blacklight_rspec.rake +9 -2
  75. data/test_support/alternate_controller.rb +4 -0
  76. data/test_support/bin/test.sh +13 -1
  77. data/test_support/features/bookmarks.feature +1 -1
  78. data/test_support/features/librarian_view.feature +2 -1
  79. data/test_support/features/record_view.feature +1 -0
  80. data/test_support/features/search.feature +1 -0
  81. data/test_support/features/step_definitions/general_steps.rb +4 -0
  82. data/test_support/features/support/env.rb +12 -1
  83. data/test_support/features/support/paths.rb +2 -1
  84. data/test_support/spec/helpers/blacklight_helper_spec.rb +8 -2
  85. data/test_support/spec/helpers/search_history_constraints_helper_spec.rb +6 -18
  86. data/test_support/spec/lib/search_fields_spec.rb +18 -25
  87. data/test_support/spec/models/record_mailer_spec.rb +5 -4
  88. data/test_support/spec/requests/alternate_controller_spec.rb +15 -0
  89. data/test_support/spec/spec_helper.rb +12 -0
  90. data/test_support/spec/views/catalog/_index_default.erb_spec.rb +6 -17
  91. data/test_support/spec/views/catalog/_show_default.erb_spec.rb +7 -17
  92. metadata +19 -8
  93. data/config/locales/kaminari.yml +0 -10
  94. data/lib/blacklight/global_configurable.rb +0 -46
  95. data/test_support/spec/lib/global_configurable_spec.rb +0 -98
@@ -1,6 +1,6 @@
1
1
  <div id="appliedParams">
2
2
 
3
- <h3 class="label">You searched for:</h3>
3
+ <h3 class="label"><%= t('blacklight.search.filters.title') %></h3>
4
4
 
5
5
  <%= render_constraints(localized_params) %>
6
6
 
@@ -19,9 +19,9 @@
19
19
  <%- unless options[:remove].blank? -%>
20
20
  <% accessible_remove_label =
21
21
  if label.blank?
22
- "Remove constraint #{options[:escape_value] ? h(value) : value}"
22
+ t('blacklight.search.filters.remove.value', :value => (options[:escape_value] ? h(value) : value))
23
23
  else
24
- "Remove constraint #{options[:escape_label] ? h(label) : label}: #{options[:escape_value] ? h(value) : value}"
24
+ t('blacklight.search.filters.remove.label_value', :label => (options[:escape_label] ? h(label) : label), :value => (options[:escape_value] ? h(value) : value))
25
25
  end
26
26
  %>
27
27
  <%= link_to(accessible_remove_label,
@@ -1,10 +1,5 @@
1
1
  <% if @response.response[:numFound] <= spell_check_max and @response.spelling.words.size > 0 %>
2
2
  <div id="spell">
3
- <h4 class="suggest"><i>Did you mean to type
4
- <% @response.spelling.words.each_with_index do |word,index| -%>
5
- <% if index > 0 -%>, or <% end -%>
6
- <%= link_to_query(word) -%>
7
- <% end -%>
8
- ?</i></h4>
3
+ <h4 class="suggest"><i><%= t('blacklight.did_you_mean', :options => @response.spelling.words.map { |word| link_to_query(word) }.join(" #{t('blacklight.or')} ")).html_safe %></i></h4>
9
4
  </div>
10
- <% end %>
5
+ <% end %>
@@ -9,7 +9,7 @@
9
9
 
10
10
  <% # main title container for doc partial view -%>
11
11
  <div class="yui-u">
12
- <h3 class="index_title"><%= document_counter + 1 + @response.params[:start].to_i %>. <%= link_to_document document, :label=>document_show_link_field, :counter => (document_counter + 1 + @response.params[:start].to_i) %></h3>
12
+ <h3 class="index_title"><%= t('blacklight.search.documents.counter', :counter => (document_counter + 1 + @response.params[:start].to_i)) %><%= link_to_document document, :label=>document_show_link_field, :counter => (document_counter + 1 + @response.params[:start].to_i) %></h3>
13
13
  </div>
14
14
  </div>
15
15
 
@@ -1,8 +1,8 @@
1
- <h1>Email This</h1>
1
+ <h1><%= t('blacklight.email.form.title') %></h1>
2
2
  <%= form_tag url_for(:controller => "catalog", :action => "email"), :id => 'email_form', :method => :post do %>
3
- <%= label_tag(:to, "Email:") %><br/>
3
+ <%= label_tag(:to, t('blacklight.email.form.to')) %><br/>
4
4
  <%= text_field_tag :to %><br/>
5
- <%= label_tag(:message, "Message:") %><br/>
5
+ <%= label_tag(:message, t('blacklight.email.form.message')) %><br/>
6
6
  <%= text_area_tag :message %><br/>
7
7
  <% @documents.each do |doc| %>
8
8
  <%=hidden_field_tag "id[]", doc.get(:id)%>
@@ -13,5 +13,5 @@
13
13
  <%- if params[:per_page] -%>
14
14
  <%= hidden_field_tag "per_page", params[:per_page] %>
15
15
  <%- end -%>
16
- <%= submit_tag "Send" %>
16
+ <%= submit_tag t('blacklight.email.form.submit') %>
17
17
  <% end %>
@@ -14,7 +14,7 @@
14
14
  <% end %>
15
15
 
16
16
  <% if(paginator.has_next?) %>
17
- <li class="more_facets_link"><%= link_to('more »', params.merge(:id => solr_field, :action=>"facet"), :class => "more_facets_link") %></li>
17
+ <li class="more_facets_link"><%= link_to(t('blacklight.search.facets.more'), params.merge(:id => solr_field, :action=>"facet"), :class => "more_facets_link") %></li>
18
18
  <% end %>
19
19
 
20
20
  </ul>
@@ -1,15 +1,15 @@
1
1
  <% if @pagination.has_previous? || @pagination.has_next? %>
2
2
  <div class="prev_next_links">
3
3
  <% if @pagination.has_previous? -%>
4
- <%= link_to('« Previous', catalog_facet_path( @pagination.params_for_previous_url( params) ) , :class=>:prev_page) %>
4
+ <%= link_to(raw(t('views.pagination.previous')), catalog_facet_path( @pagination.params_for_previous_url( params) ) , :class=>:prev_page) %>
5
5
  <% else -%>
6
- <span class="disabled ui-state-active prev_page" Previous</span>
6
+ <span class="disabled ui-state-active prev_page"><%= raw(t 'views.pagination.previous') %></span>
7
7
  <% end -%>
8
8
 
9
9
  <% if @pagination.has_next? -%>
10
- <%= link_to('Next »', catalog_facet_path( @pagination.params_for_next_url(params)), :class => :next_page ) %>
10
+ <%= link_to(raw(t('views.pagination.next')), catalog_facet_path( @pagination.params_for_next_url(params)), :class => :next_page ) %>
11
11
  <% else -%>
12
- <span class="disabled ui-state-active next_page">Next »</span>
12
+ <span class="disabled ui-state-active next_page"><%= raw(t 'views.pagination.next') %></span>
13
13
  <% end -%>
14
14
 
15
15
  </div>
@@ -17,11 +17,11 @@
17
17
 
18
18
  <div class="sort_options">
19
19
  <% if @pagination.sort == 'index' -%>
20
- <span class="disabled az">A-Z Sort</span><%= link_to_unless(@pagination.sort == 'count', "Numerical Sort",
20
+ <span class="disabled az"><%= t('blacklight.search.facets.sort.index') %></span><%= link_to_unless(@pagination.sort == 'count', t('blacklight.search.facets.sort.count'),
21
21
  @pagination.params_for_resort_url('count', params), :class => "sort_change numeric") %>
22
22
  <% elsif @pagination.sort == 'count' -%>
23
- <%= link_to("A-Z Sort", @pagination.params_for_resort_url('index', params),
24
- :class => "sort_change az") %><span class="disabled numeric">Numerical Sort</span>
23
+ <%= link_to(t('blacklight.search.facets.sort.index'), @pagination.params_for_resort_url('index', params),
24
+ :class => "sort_change az") %><span class="disabled numeric"><%= t('blacklight.search.facets.sort.count') %></span>
25
25
  <% end -%>
26
26
  </div>
27
27
 
@@ -1,5 +1,5 @@
1
1
  <% # main container for facets/limits menu -%>
2
2
  <div id="facets" class="facets">
3
- <h2>Limit your search</h2>
3
+ <h2><%= t('blacklight.search.facets.title') %></h2>
4
4
  <%= render_facet_partials %>
5
5
  </div>
@@ -1,7 +1,7 @@
1
1
  <%-
2
2
  # pass in local :document with a SolrDocument
3
3
  method = (item_in_folder?(document.id) ? "delete" : "put")
4
- label = (item_in_folder?(document.id) ? "Unselect" : "Select")
4
+ label = (item_in_folder?(document.id) ? t('blacklight.search.folder.unselect') : t('blacklight.search.folder.select'))
5
5
  cssClass = (item_in_folder?(document.id) ? "deleteFolder" : "addFolder")
6
6
  -%>
7
7
 
@@ -1,4 +1,4 @@
1
- <h3>Welcome!</h3>
1
+ <h3><%= t('blacklight.welcome') %></h3>
2
2
  <p>To modify this text to your specifications, copy this file located in the blacklight plugin directory:<br/>
3
3
  &nbsp;&nbsp;&nbsp;<%= Blacklight.root %>/app/views/catalog/_home_text.html.erb</p>
4
4
  <p>to your top level rails app:<br/>
@@ -1,7 +1,7 @@
1
- <h1>Librarian View</h1>
1
+ <h1><%= t('blacklight.search.librarian_view.title') %></h1>
2
2
  <div id="marc_view">
3
3
  <% fields = @document.to_marc.find_all{|f| ('000'..'999') === f.tag } %>
4
- <div class="field">LEADER <%= @document.to_marc.leader %></div>
4
+ <div class="field"><%= t('blacklight.search.librarian_view.leader', :leader => @document.to_marc.leader) %></div>
5
5
  <%- fields.each do |field| -%>
6
6
  <%- unless field.tag.to_s == "940" -%>
7
7
  <div class="field">
@@ -1,7 +1,7 @@
1
1
  <%= form_tag "http://www.refworks.com/express/expressimport.asp?vendor=#{application_name}&filter=MARC%20Format&encoding=65001", :name => "refworks", :target => "_blank" do %>
2
2
 
3
3
  <%= hidden_field_tag "ImportData", render_refworks_texts(documents) %>
4
- <%= submit_tag "Export to Refworks", :class => 'submit'%>
5
- <%= link_to_function "Export to Refworks", "document.refworks.submit();" %>
4
+ <%= submit_tag t('blacklight.tools.refworks'), :class => 'submit'%>
5
+ <%= link_to_function t('blacklight.tools.refworks'), "document.refworks.submit();" %>
6
6
  <% end %>
7
7
 
@@ -1,6 +1,6 @@
1
1
  <% if paginate_params(@response).num_pages > 1 %>
2
2
  <div class="pagination">
3
- <h2>Results navigation</h2>
3
+ <h2><%= t('blacklight.search.pagination.title') %></h2>
4
4
  <%= paginate_rsolr_response @response, :outer_window => 2, :theme => 'blacklight' %>
5
5
  </div>
6
6
  <% end %>
@@ -1,14 +1,14 @@
1
1
  <div id="search" class="search">
2
- <%= form_tag catalog_index_path, :method => :get do %>
3
- <h2 class="search"><%= label_tag(:q, "Search ") %></h2>
2
+ <%= form_tag url_for(:action=>'index'), :method => :get do %>
3
+ <h2 class="search"><%= label_tag(:q, t('blacklight.search.form.q')) %></h2>
4
4
  <%= text_field_tag :q, params[:q], :class => "q" %>
5
5
  <% unless search_fields.empty? %>
6
- <%= label_tag(:search_field, " in ") %>
7
- <%= select_tag(:search_field, options_for_select(search_fields, h(params[:search_field])), :title => "Targeted search options", :class=>"search_field") %>
6
+ <%= label_tag(:search_field, " #{t('blacklight.search.form.search_field.label')} ") %>
7
+ <%= select_tag(:search_field, options_for_select(search_fields, h(params[:search_field])), :title => t('blacklight.search.form.search_field.title'), :class=>"search_field") %>
8
8
  <% end %>
9
9
  <%= search_as_hidden_fields(:omit_keys => [:q, :search_field, :qt, :page]).html_safe %>
10
10
 
11
- <%= submit_tag 'search', :class=>'submit' %>
11
+ <%= submit_tag t('blacklight.search.form.submit'), :class=>'submit' %>
12
12
  <% end %>
13
13
 
14
14
  <hr/>
@@ -10,36 +10,36 @@
10
10
 
11
11
  <% if (@document.respond_to?(:export_as_mla_citation_txt) || @document.respond_to?(:export_as_apa_citation_txt)) %>
12
12
  <li class="cite">
13
- <%= link_to "Cite This", citation_catalog_path(:id => @document), {:id => 'citeLink', :name => 'citation', :class => 'lightboxLink'} %>
13
+ <%= link_to t('blacklight.tools.cite'), citation_catalog_path(:id => @document), {:id => 'citeLink', :name => 'citation', :class => 'lightboxLink'} %>
14
14
  </li>
15
15
  <% end %>
16
16
 
17
17
  <% if @document.export_formats.keys.include?( :refworks_marc_txt ) %>
18
18
  <li class="refworks">
19
- <%= link_to "Export to RefWorks", refworks_export_url(:id => @document) %>
19
+ <%= link_to t('blacklight.tools.refworks'), refworks_export_url(:id => @document) %>
20
20
  </li>
21
21
  <% end %>
22
22
 
23
23
  <% if @document.export_formats.keys.include?( :endnote ) %>
24
24
  <li class="endnote">
25
- <%= link_to "Export to EndNote", catalog_path(@document, :format => 'endnote') %>
25
+ <%= link_to t('blacklight.tools.endnote'), catalog_path(@document, :format => 'endnote') %>
26
26
  </li>
27
27
  <% end %>
28
28
 
29
29
  <% if @document.respond_to?( :to_email_text ) %>
30
30
  <li class="email">
31
- <%= link_to "Email This", email_catalog_path(:id => @document), {:id => 'emailLink', :name => 'email', :class => 'lightboxLink'} %>
31
+ <%= link_to t('blacklight.tools.email'), email_catalog_path(:id => @document), {:id => 'emailLink', :name => 'email', :class => 'lightboxLink'} %>
32
32
  </li>
33
33
  <%- end -%>
34
34
  <%- if @document.respond_to?( :to_sms_text ) -%>
35
35
  <li class="sms">
36
- <%= link_to "SMS This", sms_catalog_path(:id => @document), {:id => 'smsLink', :name => 'sms', :class => 'lightboxLink'} %>
36
+ <%= link_to t('blacklight.tools.sms'), sms_catalog_path(:id => @document), {:id => 'smsLink', :name => 'sms', :class => 'lightboxLink'} %>
37
37
  </li>
38
38
  <%- end -%>
39
39
 
40
40
  <% if @document.respond_to?(:to_marc) %>
41
41
  <li class="librarian_view">
42
- <%= link_to "Librarian View", librarian_view_catalog_path(@document), {:id => 'librarianLink', :name => 'librarian_view', :class => 'lightboxLink'} %>
42
+ <%= link_to t('blacklight.tools.librarian_view'), librarian_view_catalog_path(@document), {:id => 'librarianLink', :name => 'librarian_view', :class => 'lightboxLink'} %>
43
43
  </li>
44
44
  <% end %>
45
45
 
@@ -10,14 +10,14 @@
10
10
  'Cricket' => 'cricket'
11
11
  }
12
12
  %>
13
- <h1>SMS This</h1>
13
+ <h1><%= t('blacklight.sms.form.title') %></h1>
14
14
  <%= form_tag url_for(:controller => "catalog", :action => "sms"), :id => 'sms_form', :method => :post do %>
15
- <%= label_tag(:to, "Phone Number:") %><br/>
15
+ <%= label_tag(:to, t('blacklight.sms.form.to')) %><br/>
16
16
  <%= text_field_tag :to %><br/>
17
- <%= label_tag(:carrier, "Carrier:") %><br/>
18
- <%= select_tag(:carrier, options_for_select(carriers.to_a.sort.unshift(["Please select your carrier",'']), '')) %><br/>
17
+ <%= label_tag(:carrier, t('blacklight.sms.form.carrier')) %><br/>
18
+ <%= select_tag(:carrier, options_for_select(carriers.to_a.sort.unshift([t('blacklight.sms.form.carrier_prompt'),'']), '')) %><br/>
19
19
  <% @documents.each do |doc| %>
20
20
  <%=hidden_field_tag "id[]", doc.get(:id)%>
21
21
  <% end %>
22
- <%= submit_tag "Send" %>
22
+ <%= submit_tag t('blacklight.sms.form.submit') %>
23
23
  <% end %>
@@ -1,20 +1,17 @@
1
1
  <div id="sortAndPerPage">
2
2
  <% unless @response.response['numFound'] < 2 %>
3
3
  <%-# kind of hacky way to get this to work on catalog and folder controllers. May be able to simple do {:action=>"index"} but I'm not sure -%>
4
- <%= form_tag params[:controller] == "folder" ? folder_index_path : catalog_index_path, :method=>:get, :class=>'per_page' do %>
5
- <%= label_tag(:per_page) do %>
6
- Show <%= select_tag(:per_page, options_for_select(['10', '20', '50', '100'], h(params[:per_page])), :title => "Number of results to display per page") %> per page
7
- <% end %>
4
+ <%= form_tag params[:controller] == "folder" ? folder_index_path : url_for(:action=>'index'), :method=>:get, :class=>'per_page' do %>
5
+ <%= label_tag(:per_page, t('blacklight.search.per_page.label', :select => select_tag(:per_page, options_for_select(['10', '20', '50', '100'], h(params[:per_page])), :title => t('blacklight.search.per_page.title'))).html_safe) %>
8
6
  <%= search_as_hidden_fields(:omit_keys => [:page, :per_page]) %>
9
- <%= submit_tag 'update' %>
7
+ <%= submit_tag t('blacklight.search.per_page.submit') %>
10
8
  <% end %>
11
9
 
12
10
  <%-# kind of hacky way to get this to work on catalog and folder controllers. May be able to simple do {:action=>"index"} but I'm not sure -%>
13
- <%= form_tag params[:controller] == "folder" ? folder_index_path : catalog_index_path, :method=>:get, :class=>'sort', :id => "sort_form" do %>
14
- <%= label_tag(:sort, "Sort by ") %>
15
- <%= select_tag(:sort, options_for_select(sort_fields, h(params[:sort]))) %>
11
+ <%= form_tag params[:controller] == "folder" ? folder_index_path : url_for(:action=>'index'), :method=>:get, :class=>'sort', :id => "sort_form" do %>
12
+ <%= label_tag(:sort, t('blacklight.search.sort.label', :select => select_tag(:sort, options_for_select(sort_fields, h(params[:sort])))).html_safe) %>
16
13
  <%= search_as_hidden_fields(:omit_keys => [:page, :sort]) %>
17
- <%= submit_tag 'sort results' %>
14
+ <%= submit_tag t('blacklight.search.sort.submit') %>
18
15
  <% end unless sort_fields.empty? %>
19
16
  <% end %>
20
17
  </div>
@@ -6,7 +6,7 @@ xml.instruct!(:xml, :encoding => "UTF-8")
6
6
  xml.feed("xmlns" => "http://www.w3.org/2005/Atom",
7
7
  "xmlns:opensearch"=>"http://a9.com/-/spec/opensearch/1.1/") do
8
8
 
9
- xml.title application_name + " Search Results"
9
+ xml.title t('blacklight.search.title', :application_name => application_name)
10
10
  # an author is required, so we'll just use the app name
11
11
  xml.author { xml.name application_name }
12
12
 
@@ -53,12 +53,12 @@ xml.feed("xmlns" => "http://www.w3.org/2005/Atom",
53
53
  # updated is required, for now we'll just set it to now, sorry
54
54
  xml.updated Time.now.strftime("%Y-%m-%dT%H:%M:%SZ")
55
55
 
56
- xml.link "rel" => "alternate", "type" => "text/html", "href" => catalog_url(doc)
56
+ xml.link "rel" => "alternate", "type" => "text/html", "href" => polymorphic_url(doc)
57
57
  # add other doc-specific formats, atom only lets us have one per
58
58
  # content type, so the first one in the list wins.
59
59
  xml << render_link_rel_alternates(doc, :unique => true)
60
60
 
61
- xml.id catalog_url(doc[:id])
61
+ xml.id polymorphic_url(doc)
62
62
 
63
63
 
64
64
  if doc.to_semantic_values[:author][0]
@@ -4,7 +4,7 @@
4
4
  <%= render 'home' %>
5
5
  <% else %>
6
6
 
7
- <% @page_title = application_name + " Search Results" %>
7
+ <% @page_title = t('blacklight.search.title', :application_name => application_name) %>
8
8
 
9
9
  <% extra_head_content << render_opensearch_response_metadata.html_safe %>
10
10
 
@@ -16,7 +16,7 @@
16
16
 
17
17
  <div class="pageEntriesInfo">
18
18
  <%= render_pagination_info @response, :entry_name=>'item' %>
19
- <%=link_to "start over", catalog_index_path, :id=>"startOverLink" %>
19
+ <%=link_to t('blacklight.search.start_over'), url_for(:action=>'index'), :id=>"startOverLink" %>
20
20
  </div>
21
21
 
22
22
  <%= render 'sort_and_per_page' %>
@@ -3,14 +3,14 @@ xml.rss(:version=>"2.0") {
3
3
 
4
4
  xml.channel {
5
5
 
6
- xml.title(application_name + " Search Results")
6
+ xml.title(t('blacklight.search.title', :application_name => application_name))
7
7
  xml.link(catalog_index_url(params))
8
- xml.description(application_name + " Search Results")
8
+ xml.description(t('blacklight.search.title', :application_name => application_name))
9
9
  xml.language('en-us')
10
10
  @document_list.each do |doc|
11
11
  xml.item do
12
12
  xml.title( doc.to_semantic_values[:title][0] || doc.id )
13
- xml.link(catalog_url(doc[:id]))
13
+ xml.link(polymorphic_url(doc))
14
14
  xml.author( doc.to_semantic_values[:author][0] ) if doc.to_semantic_values[:author][0]
15
15
  end
16
16
  end
@@ -1,4 +1,4 @@
1
- <% @page_title = "#{document_show_html_title} - #{application_name}" %>
1
+ <% @page_title = t('blacklight.search.show.title', :document_title => document_show_html_title, :application_name => application_name) %>
2
2
  <% extra_head_content << render_link_rel_alternates %>
3
3
  <% sidebar_items << render_document_sidebar_partial %>
4
4
 
@@ -8,7 +8,7 @@
8
8
 
9
9
  <div class="pageEntriesInfo">
10
10
  <%= item_page_entry_info %>
11
- <%=link_to "start over", catalog_index_path, :id=>"startOverLink" %>
11
+ <%=link_to t('blacklight.search.start_over'), catalog_index_path, :id=>"startOverLink" %>
12
12
  </div>
13
13
 
14
14
  <%= render 'previous_next_doc' %>
@@ -1,3 +1,3 @@
1
- <h1>Thank-you for your feedback</h1>
1
+ <h1><%= t('blacklight.feedback.complete.title') %></h1>
2
2
 
3
- <%= link_to '<< Back to search', catalog_index_path %>
3
+ <%= link_to t('blacklight.back_to_search'), catalog_index_path %>
@@ -1,7 +1,7 @@
1
1
  <h1>Send Us Feedback</h1>
2
2
 
3
3
  <% unless @errors.empty? %>
4
- <strong>Please fix the following form errors:</strong>
4
+ <strong><%= t('blacklight.feedback.errors.title') %></strong>
5
5
  <ul class="errors">
6
6
  <% @errors.each do |msg| %>
7
7
  <li><%= msg %></li>
@@ -11,10 +11,10 @@
11
11
 
12
12
  <%= form_tag do %>
13
13
  <fieldset>
14
- <div class="row"><%= label_tag 'Your Name' %> <%= text_field_tag :name, params[:name] %></div>
15
- <div class="row"><%= label_tag 'Your Email' %> <%= text_field_tag :email, params[:email] %></div>
16
- <div class="row"><%= label_tag 'Your Message' %> <%= text_area_tag :message, params[:message] %></div>
14
+ <div class="row"><%= label_tag t('active_record.attributes.feedback.name') %> <%= text_field_tag :name, params[:name] %></div>
15
+ <div class="row"><%= label_tag t('active_record.attributes.feedback.email') %> <%= text_field_tag :email, params[:email] %></div>
16
+ <div class="row"><%= label_tag t('active_record.attributes.feedback.message') %> <%= text_area_tag :message, params[:message] %></div>
17
17
  <%#= show_simple_captcha(:image_style => 'random', :label => "Enter the characters you see into the text field") %>
18
- <div class="row"><%= label_tag '' %><%= submit_tag 'Send!' %></div>
18
+ <div class="row"><%= label_tag '' %><%= submit_tag t('blacklight.feedback.submit') %></div>
19
19
  </fieldset>
20
20
  <% end %>
@@ -1,15 +1,15 @@
1
1
  <ul class="folderTools">
2
2
  <li class="cite">
3
- <%= link_to "Cite", citation_catalog_path(:sort=>params[:sort], :per_page=>params[:per_page], :id => @documents.collect{|doc| doc.id}), {:id => 'citeLink', :name => 'citation'} %>
3
+ <%= link_to t('blacklight.tools.cite'), citation_catalog_path(:sort=>params[:sort], :per_page=>params[:per_page], :id => @documents.collect{|doc| doc.id}), {:id => 'citeLink', :name => 'citation'} %>
4
4
  </li>
5
5
  <li class="refworks">
6
6
  <%= render :partial => 'catalog/refworks_form', :locals => {:documents=>@documents} %>
7
7
  </li>
8
8
  <li class="endnote">
9
- <%= link_to "Export to EndNote", endnote_catalog_path(:sort=>params[:sort], :per_page=>params[:per_page], :id => @documents.collect {|doc| doc.id}, :format => 'endnote')%>
9
+ <%= link_to t('blacklight.tools.endnote'), endnote_catalog_path(:sort=>params[:sort], :per_page=>params[:per_page], :id => @documents.collect {|doc| doc.id}, :format => 'endnote')%>
10
10
  </li>
11
11
  <li class="email">
12
- <%= link_to "Email", email_catalog_path(:sort=>params[:sort], :per_page=>params[:per_page], :id => @documents.collect {|doc| doc.id}), :class=>"lightboxLink", :id => "emailLink" %>
12
+ <%= link_to t('blacklight.tools.email'), email_catalog_path(:sort=>params[:sort], :per_page=>params[:per_page], :id => @documents.collect {|doc| doc.id}), :class=>"lightboxLink", :id => "emailLink" %>
13
13
  </li>
14
14
  <% if has_user_authentication_provider? and current_user %>
15
15
  <li>
@@ -17,7 +17,7 @@
17
17
  </li>
18
18
  <% end %>
19
19
  <li>
20
- <%= link_to "Clear Selected Items", clear_folder_path, :method => :delete %>
20
+ <%= link_to t('blacklight.tools.clear'), clear_folder_path, :method => :delete %>
21
21
  </li>
22
22
  </ul>
23
23
 
@@ -1,7 +1,7 @@
1
1
  <% sidebar_items << capture do %>
2
2
  <p><%= link_back_to_catalog %></p>
3
3
  <% end %>
4
- <h1>Selected Items</h1>
4
+ <h1><%= t('blacklight.folder.title') %></h1>
5
5
 
6
6
  <% unless @documents.empty? %>
7
7
  <%- # just adding pageEntriedInfo div to get the proper rounded corners at the top -%>
@@ -14,7 +14,7 @@
14
14
  <div id="page">
15
15
  <div id="hd">
16
16
  <div id="logo">
17
- <h1 class="site_title"><%= link_to application_name, "/" %><%= (params[:controller] == "catalog" and !params[:id]) ? "<span id='results_text'>Search Results</span>".html_safe : "" %></h1>
17
+ <h1 class="site_title"><%= link_to application_name, root_path %><%= (params[:controller] == "catalog" and !params[:id]) ? content_tag(:span, t('blacklight.search.search_results'), :id => 'results_text') : "" %></h1>
18
18
  </div>
19
19
  <div id="user_util_links">
20
20
  <%= render :partial=>'/user_util_links' %>
@@ -1,5 +1,5 @@
1
1
  <% @documents.each do |document| %>
2
2
  <%= document.to_email_text %>
3
- URL: <%= catalog_path(document, {:only_path => false}.merge(@url_gen_params)) %>
3
+ <%= t('blacklight.email.text.url', :url =>polymorphic_path(document, {:only_path => false}.merge(@url_gen_params))) %>
4
4
  <% end %>
5
- Message: <%= @message %>
5
+ <%= t('blacklight.email.text.message', :message => @message) %>