muck-services 3.2.1 → 3.2.2
Sign up to get free protection for your applications and to get access to all the features.
- data/VERSION +1 -1
- data/app/controllers/muck/recommendations_controller.rb +1 -1
- data/app/helpers/muck_services_helper.rb +4 -4
- data/app/views/entries/_tag_cloud.html.erb +1 -1
- data/app/views/entries/browse_by_tags.html.erb +1 -1
- data/app/views/entries/search.html.erb +1 -1
- data/config/locales/en.yml +0 -1
- data/muck-services.gemspec +2 -2
- metadata +4 -4
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
3.2.
|
1
|
+
3.2.2
|
@@ -33,7 +33,7 @@ class Muck::RecommendationsController < ApplicationController
|
|
33
33
|
if !@entry.id.nil?
|
34
34
|
redirect_to resource_path(@entry) + "?limit=#{@limit}&order=#{@order}&details=#{@details}"
|
35
35
|
else
|
36
|
-
render(:text => t('muck.services.url_not_in_index', :uri => params[:uri]), :layout => true)
|
36
|
+
render(:text => t('muck.services.url_not_in_index', :uri => params[:uri]), :layout => true).html_safe
|
37
37
|
end
|
38
38
|
end
|
39
39
|
format.xml { render('recommendations/index.xml.builder', :layout => false) }
|
@@ -33,14 +33,14 @@ module MuckServicesHelper
|
|
33
33
|
:last => (@offset + @per_page) < @hit_count ? (@offset + @per_page) : @hit_count,
|
34
34
|
:total => @hit_count,
|
35
35
|
:filter => @tag_filter,
|
36
|
-
:terms => URI.unescape(@term_list))
|
36
|
+
:terms => URI.unescape(@term_list)).html_safe
|
37
37
|
else
|
38
38
|
t('muck.services.resource_search_results',
|
39
39
|
:first => @offset+1,
|
40
40
|
:last => (@offset + @per_page) < @hit_count ? (@offset + @per_page) : @hit_count,
|
41
41
|
:total => @hit_count,
|
42
42
|
:filter => @tag_filter,
|
43
|
-
:terms => URI.unescape(@term_list))
|
43
|
+
:terms => URI.unescape(@term_list)).html_safe
|
44
44
|
end
|
45
45
|
else
|
46
46
|
if (@grain_size == 'course')
|
@@ -49,14 +49,14 @@ module MuckServicesHelper
|
|
49
49
|
:last => (@offset + @per_page) < @hit_count ? (@offset + @per_page) : @hit_count,
|
50
50
|
:total => @hit_count,
|
51
51
|
:filter => @tag_filter,
|
52
|
-
:terms => @tag_filter.split('/').join('</b>, <b>'))
|
52
|
+
:terms => @tag_filter.split('/').join('</b>, <b>')).html_safe
|
53
53
|
else
|
54
54
|
t('muck.services.resource_tag_results',
|
55
55
|
:first => @offset+1,
|
56
56
|
:last => (@offset + @per_page) < @hit_count ? (@offset + @per_page) : @hit_count,
|
57
57
|
:total => @hit_count,
|
58
58
|
:filter => @tag_filter,
|
59
|
-
:terms => @tag_filter.split('/').join('</b>, <b>'))
|
59
|
+
:terms => @tag_filter.split('/').join('</b>, <b>')).html_safe
|
60
60
|
end
|
61
61
|
end
|
62
62
|
end
|
@@ -1,7 +1,7 @@
|
|
1
1
|
<% cache({:locale => Language.locale_id, :format => 'html', :grain_size => @grain_size, :tag_filter => @tag_filter}) do %>
|
2
2
|
<div id="tag-cloud">
|
3
3
|
<fieldset>
|
4
|
-
<legend><%= @tag_filter.nil? ? (@grain_size == 'course' ? t('muck.services.courses_tag_cloud_label') : t('muck.services.resources_tag_cloud_label')) : t('muck.services.narrow_further') %></legend>
|
4
|
+
<legend><%= @tag_filter.nil? ? (@grain_size == 'course' ? t('muck.services.courses_tag_cloud_label').html_safe : t('muck.services.resources_tag_cloud_label').html_safe) : t('muck.services.narrow_further') %></legend>
|
5
5
|
<% if @tag_cloud.blank? -%>
|
6
6
|
<%= t('muck.services.no_tags') %>
|
7
7
|
<% else -%>
|
@@ -10,7 +10,7 @@
|
|
10
10
|
<%= render(:partial => 'entries/tag_cloud') %>
|
11
11
|
</div>
|
12
12
|
<% else %>
|
13
|
-
<p><%= @grain_size == 'all' ? t('muck.services.no_tagged_resources', :tags => @search) : t('muck.services.no_tagged_courses', :tags => @tag_filter.split('/').join(', ')) %></p>
|
13
|
+
<p><%= @grain_size == 'all' ? t('muck.services.no_tagged_resources', :tags => @search).html_safe : t('muck.services.no_tagged_courses', :tags => @tag_filter.split('/').join(', ')) %></p>
|
14
14
|
<p><%= link_to('[' + t('muck.services.explore', :topic => @search.titleize) + ']', topic_path(safe_id(@search))) if @search %></p>
|
15
15
|
<% end %>
|
16
16
|
</div>
|
@@ -5,6 +5,6 @@
|
|
5
5
|
<%= render(:partial => 'entries/results') %>
|
6
6
|
<div class="results-nav"><%= will_paginate(@paginated_results, :next_label => '<b>' + t('muck.services.next_label') + ' »</b>', :previous_label => '<b>« ' + t('muck.services.previous_label') + '</b>') %></div>
|
7
7
|
<% else %>
|
8
|
-
<p><%= t('muck.services.no_hits', :search => @search, :resource_type => @grain_size == 'all' ? 'resources' : 'courses') %></p>
|
8
|
+
<p><%= t('muck.services.no_hits', :search => @search, :resource_type => @grain_size == 'all' ? 'resources' : 'courses').html_safe %></p>
|
9
9
|
<% end %>
|
10
10
|
</div>
|
data/config/locales/en.yml
CHANGED
@@ -67,7 +67,6 @@ en:
|
|
67
67
|
for: for
|
68
68
|
zotero_group_prompt: Zotero group URL
|
69
69
|
download_opml: Download OPML file for %{terms}
|
70
|
-
loading_content_image: <%= t('muck.services.loading_image') %>
|
71
70
|
save_aggreation: Save this Aggregation
|
72
71
|
metadata: metadata
|
73
72
|
signup_to_save_aggreation: "%{login} or %{signup} to save this search"
|
data/muck-services.gemspec
CHANGED
@@ -5,11 +5,11 @@
|
|
5
5
|
|
6
6
|
Gem::Specification.new do |s|
|
7
7
|
s.name = %q{muck-services}
|
8
|
-
s.version = "3.2.
|
8
|
+
s.version = "3.2.2"
|
9
9
|
|
10
10
|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
11
11
|
s.authors = ["Joel Duffin", "Justin Ball"]
|
12
|
-
s.date = %q{2011-02-
|
12
|
+
s.date = %q{2011-02-12}
|
13
13
|
s.description = %q{This gem contains the rails specific code for dealing with feeds, aggregations and recommendations. It is meant to work with the muck-raker gem.}
|
14
14
|
s.email = %q{justin@tatemae.com}
|
15
15
|
s.extra_rdoc_files = [
|
metadata
CHANGED
@@ -1,13 +1,13 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: muck-services
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
hash:
|
4
|
+
hash: 11
|
5
5
|
prerelease: false
|
6
6
|
segments:
|
7
7
|
- 3
|
8
8
|
- 2
|
9
|
-
-
|
10
|
-
version: 3.2.
|
9
|
+
- 2
|
10
|
+
version: 3.2.2
|
11
11
|
platform: ruby
|
12
12
|
authors:
|
13
13
|
- Joel Duffin
|
@@ -16,7 +16,7 @@ autorequire:
|
|
16
16
|
bindir: bin
|
17
17
|
cert_chain: []
|
18
18
|
|
19
|
-
date: 2011-02-
|
19
|
+
date: 2011-02-12 00:00:00 -07:00
|
20
20
|
default_executable:
|
21
21
|
dependencies:
|
22
22
|
- !ruby/object:Gem::Dependency
|