muck-services 3.2.1 → 3.2.2

data/VERSION

@@ -1 +1 @@
-3.2.1
+3.2.2

data/app/controllers/muck/recommendations_controller.rb

@@ -33,7 +33,7 @@ class Muck::RecommendationsController < ApplicationController
         if !@entry.id.nil?
           redirect_to resource_path(@entry) + "?limit=#{@limit}&order=#{@order}&details=#{@details}"
         else
-          render(:text => t('muck.services.url_not_in_index', :uri => params[:uri]), :layout => true)
+          render(:text => t('muck.services.url_not_in_index', :uri => params[:uri]), :layout => true).html_safe
         end
       end
       format.xml  { render('recommendations/index.xml.builder', :layout => false) }

data/app/helpers/muck_services_helper.rb

@@ -33,14 +33,14 @@ module MuckServicesHelper
         :last => (@offset + @per_page) < @hit_count ? (@offset + @per_page) : @hit_count,
         :total => @hit_count,
         :filter => @tag_filter,
-        :terms => URI.unescape(@term_list))
+        :terms => URI.unescape(@term_list)).html_safe
       else
         t('muck.services.resource_search_results', 
         :first => @offset+1, 
         :last => (@offset + @per_page) < @hit_count ? (@offset + @per_page) : @hit_count,
         :total => @hit_count,
         :filter => @tag_filter,
-        :terms => URI.unescape(@term_list))
+        :terms => URI.unescape(@term_list)).html_safe
       end
     else
       if (@grain_size == 'course')
@@ -49,14 +49,14 @@ module MuckServicesHelper
         :last => (@offset + @per_page) < @hit_count ? (@offset + @per_page) : @hit_count,
         :total => @hit_count,
         :filter => @tag_filter,
-        :terms => @tag_filter.split('/').join('</b>, <b>'))
+        :terms => @tag_filter.split('/').join('</b>, <b>')).html_safe
       else
         t('muck.services.resource_tag_results', 
         :first => @offset+1, 
         :last => (@offset + @per_page) < @hit_count ? (@offset + @per_page) : @hit_count,
         :total => @hit_count,
         :filter => @tag_filter,
-        :terms => @tag_filter.split('/').join('</b>, <b>'))
+        :terms => @tag_filter.split('/').join('</b>, <b>')).html_safe
       end
     end
   end

data/app/views/entries/_tag_cloud.html.erb

@@ -1,7 +1,7 @@
 <% cache({:locale => Language.locale_id, :format => 'html', :grain_size => @grain_size, :tag_filter => @tag_filter}) do %>
 <div id="tag-cloud">
   <fieldset>
-    <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>
+    <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>
     <% if @tag_cloud.blank? -%>
       <%= t('muck.services.no_tags') %>
     <% else -%>

data/app/views/entries/browse_by_tags.html.erb

@@ -10,7 +10,7 @@
       <%= render(:partial => 'entries/tag_cloud') %>
     </div>
   <% else %>
-    <p><%= @grain_size == 'all' ? t('muck.services.no_tagged_resources', :tags => @search) : t('muck.services.no_tagged_courses', :tags => @tag_filter.split('/').join(', ')) %></p>
+    <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>
     <p><%= link_to('[' + t('muck.services.explore', :topic => @search.titleize) + ']', topic_path(safe_id(@search))) if @search %></p>
   <% end %>
 </div>

data/app/views/entries/search.html.erb

@@ -5,6 +5,6 @@
     <%= render(:partial => 'entries/results') %>
     <div class="results-nav"><%= will_paginate(@paginated_results, :next_label => '<b>' + t('muck.services.next_label') + ' &raquo;</b>', :previous_label => '<b>&laquo; ' + t('muck.services.previous_label') + '</b>') %></div>
   <% else %>
-    <p><%= t('muck.services.no_hits', :search => @search, :resource_type => @grain_size == 'all' ? 'resources' : 'courses') %></p>
+    <p><%= t('muck.services.no_hits', :search => @search, :resource_type => @grain_size == 'all' ? 'resources' : 'courses').html_safe %></p>
   <% end %>
 </div>

data/config/locales/en.yml

@@ -67,7 +67,6 @@ en:
       for: for
       zotero_group_prompt: Zotero group URL
       download_opml: Download OPML file for %{terms}
-      loading_content_image: <%= t('muck.services.loading_image') %>
       save_aggreation: Save this Aggregation
       metadata: metadata
       signup_to_save_aggreation: "%{login} or %{signup} to save this search"

data/muck-services.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-services}
-  s.version = "3.2.1"
+  s.version = "3.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joel Duffin", "Justin Ball"]
-  s.date = %q{2011-02-07}
+  s.date = %q{2011-02-12}
   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.}
   s.email = %q{justin@tatemae.com}
   s.extra_rdoc_files = [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: muck-services
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: false
   segments: 
   - 3
   - 2
-  - 1
-  version: 3.2.1
+  - 2
+  version: 3.2.2
 platform: ruby
 authors: 
 - Joel Duffin
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-07 00:00:00 -07:00
+date: 2011-02-12 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency