muck-raker 0.1.13 → 0.1.14

data/Rakefile

@@ -5,20 +5,39 @@ require 'rake/rdoctask'
 desc 'Default: run unit tests.'
 task :default => :test
 
-desc 'Translate this gem'
-task :translate do
-  file = File.join(File.dirname(__FILE__), 'locales', 'en.yml')
-  system("babelphish -o -y #{file}")
-end
+desc 'Default: run unit tests.'
+task :default => :test
 
-desc 'Test the recommender plugin.'
+desc 'Test muck-raker.'
 Rake::TestTask.new(:test) do |t|
   t.libs << 'lib'
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
+  t.libs << 'test/rails_root/test'
+  t.pattern = 'test/rails_root/test/**/*_test.rb'
   t.verbose = true
 end
 
+begin
+  require 'rcov/rcovtask'
+  Rcov::RcovTask.new do |t|
+    #t.libs << 'lib'
+    t.libs << 'test/rails_root/lib'
+    t.pattern = 'test/rails_root/test/**/*_test.rb'
+    t.verbose = true
+    t.output_dir = 'coverage'
+    t.rcov_opts << '--exclude "gems/*"'
+  end
+rescue LoadError
+  task :rcov do
+    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
+  end
+end
+
+desc 'Translate this gem'
+task :translate do
+  file = File.join(File.dirname(__FILE__), 'locales', 'en.yml')
+  system("babelphish -o -y #{file}")
+end
+
 desc 'Generate documentation for the recommender plugin.'
 Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'

data/VERSION

@@ -1 +1 @@
-0.1.13
+0.1.14

data/app/controllers/recommender/entries_controller.rb

@@ -5,28 +5,29 @@ class Recommender::EntriesController < ApplicationController
   end
   
   def index
-    @tag_cloud = TagCloud.language_tags(Language.locale_id) unless fragment_exist?({:controller => 'entries', :action => 'index', :language => Language.locale_id})
-    @refresh_results = true
+    @grain_size = params[:grain_size] || 'all'
+    @tag_cloud = TagCloud.language_tags(Language.locale_id, @grain_size) unless fragment_exist?({:controller => 'entries', :action => 'index', :language => Language.locale_id})
     respond_to do |format|
       format.html { render :template => 'entries/index' }
     end
   end
   
   def browse_by_tags
-    @refresh_results = true
     @tag_filter = params[:tags]
-    @search = @tag_filter.join(' ') if (!@tag_filter.nil? && !@tag_filter.empty?)
-    @tag_filter = @tag_filter.join('/')
-    @tag_cloud = TagCloud.language_tags(Language.locale_id, @tag_filter) unless fragment_exist?({:controller => 'entries', :action => 'index', :language => Language.locale_id, :filter => @tag_filter})
-    _search(:and)
+    @grain_size = params[:grain_size] || 'all'
+    if !fragment_exist?({:controller => 'entries', :action => 'index', :language => Language.locale_id, :filter => @tag_filter, :grain_size => @grain_size})
+      @search = @tag_filter.split('/').join(' AND ') if !@tag_filter.empty? 
+      @tag_cloud = TagCloud.language_tags(Language.locale_id, @grain_size, @tag_filter)
+      _search(:and)
+    end
     respond_to do |format|
       format.html { render :template => 'entries/browse_by_tags' }
     end
   end
   
   def search
-    @refresh_results = true
     @search = params[:q]
+    @grain_size = params[:grain_size] || 'all'
     _search
     respond_to do |format|
       format.html { render :template => 'entries/search' }
@@ -76,11 +77,11 @@ class Recommender::EntriesController < ApplicationController
     @offset = @page*@per_page
     if !@search.nil?
       @term_list = URI.escape(@search) 
-      results = Entry.search(@search, I18n.locale.to_s, @per_page, @offset, operator)
+      results = Entry.search(@search, @grain_size, I18n.locale.to_s, @per_page, @offset, operator)
       @hit_count = results.total
       @results = results.results
       @paginated_results = @results.paginate(:page => @page+1, :per_page => @per_page, :total_entries => @hit_count)
-      log_query(current_user.id, @tag_filter.nil? ? 'search' : 'browse', Language.locale_id, @search, @hit_count)
+      log_query(current_user.nil? ? request.remote_addr : current_user.id, Language.locale_id, @tag_filter.nil? ? 'search' : 'browse', @search, @grain_size, @hit_count)
     end
   end
   
@@ -88,7 +89,7 @@ class Recommender::EntriesController < ApplicationController
     @@query_logger ||= Logger.new("#{RAILS_ROOT}/log/queries_#{Date.today}.log")
   end
   
-  def log_query(user_id, search_type, locale, query, hits)
-    query_logger.info "#{Time.new.to_i},#{user_id},#{search_type},#{locale},\"#{query.gsub(/"/, '\\\\"')}\",#{hits}"
+  def log_query(user_id, locale, search_type, query, grain_size, hits)
+    query_logger.info "#{Time.new.to_i},#{user_id},#{locale},#{search_type},\"#{query.gsub(/"/, '\\\\"')}\",#{grain_size},#{hits}"
   end
 end

data/app/controllers/recommender/feeds_controller.rb

@@ -0,0 +1,64 @@
+class Recommender::FeedsController < ApplicationController
+
+  def create
+    @feed = Feed.new(params[:feed])
+    @feed.harvested_from_display_uri = @feed.display_uri
+    @feed.entries_count = 0
+    @feed.last_requested_at = Time.now - 2592000 
+    @feed.last_harvested_at = Time.now - 2592000
+
+    respond_to do |format|
+      if @feed.save
+        flash[:notice] = 'Feed was successfully created.'
+
+        # email the admin to let them know a feed has been added
+        #        notification_feed_added(@feed)
+
+        # redirect to a page letting them know the feed has been created
+        #format.html { redirect_to entries_path(@feed) + "?new_feed=true" }
+        format.html { redirect_to "/feeds/" }
+        format.xml  { head :created, :location => feed_url(@feed) }
+      else
+        format.html { render :action => "new" }
+        format.xml  { render :xml => @feed.errors.to_xml }
+      end
+    end
+  end
+
+  # PUT /feeds/1
+  # PUT /feeds/1.xml
+  def update
+    @feed = Feed.find(params[:id])
+
+    # force a harvest now
+    #    harvest_now
+
+    respond_to do |format|
+      if @feed.update_attributes(params[:feed])
+        #        notification_feed_updated(@feed)
+        flash[:notice] = 'Feed was successfully updated.'
+        format.html { 
+          redirect_to "/feeds/"
+          return
+        }
+        format.xml  { head :ok }
+      else
+        format.html { render :action => "edit" }
+        format.xml  { render :xml => @feed.errors.to_xml }
+      end
+    end
+  end
+
+  # DELETE /feeds/1
+  # DELETE /feeds/1.xml
+  def destroy
+    @feed = Feed.find(params[:id])
+    @feed.destroy
+
+    respond_to do |format|
+      format.html { redirect_to feeds_url }
+      format.xml  { head :ok }
+    end
+  end
+
+end

data/app/controllers/recommender/recommendations_controller.rb

@@ -16,7 +16,7 @@ class Recommender::RecommendationsController < ApplicationController
 
     Entry.track_time_on_page(session, @uri)
     @document = Entry.recommender_entry(@uri)
-    I18n.locale = @document.language[0..1] if !@document.nil?
+#    I18n.locale = @document.language[0..1] if !@document.nil?
 
     @limit = params[:limit] ? params[:limit].to_i : 5
     @limit = 25 if @limit > 25

data/app/helpers/muck_raker_feeds_helper.rb

@@ -0,0 +1,3 @@
+module MuckRakerFeedsHelper
+  
+end

data/app/helpers/muck_raker_helper.rb

@@ -9,25 +9,47 @@ module MuckRakerHelper
     atags.each_slice(2){|tag,index| yield tag, classes[((index.to_i - min)*scale).to_i]}
   end
   
-  def tag_link(tag, filter, css_class)
-     link_to h(tag), "/resources/tags/#{filter.nil? ? '' : filter + '/'}#{tag}", :class => css_class
+  def tag_link(tag, css_class, grain_size)
+     link_to h(tag), "/resources/tags/#{tag}?grain_size=#{grain_size}", :class => css_class
+  end
+  
+  def filtered_tag_link(tag, filter, css_class, grain_size)
+     link_to h(tag), "/resources/tags/#{filter}/#{tag}?grain_size=#{grain_size}", :class => css_class
   end
   
   def results_status
     if @tag_filter.nil?
-        t('muck.raker.search_results_status', 
+      if (@grain_size == 'course')
+        t('muck.raker.course_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))
+      else
+        t('muck.raker.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))
+      end
     else
-        t('muck.raker.browse_results_status', 
+      if (@grain_size == 'course')
+        t('muck.raker.course_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>'))
+      else
+        t('muck.raker.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>'))
+      end
     end
   end
   
@@ -53,4 +75,5 @@ module MuckRakerHelper
   def feed_query_uri(feed)
     "/search/results?terms=feed_id:" + feed.id.to_s + "&locale=en"
   end
+  
 end

data/app/models/entry.rb

@@ -5,14 +5,15 @@ class Entry < ActiveRecord::Base
   
   @@default_time_on_page = 60.0
   
-  acts_as_solr({:if => false, :fields => [{:feed_id => :integer}]}, {:type_field => :type_s})
+  acts_as_solr({:if => false, :fields => [{:feed_id => :integer}, {:grain_size => :string}]}, {:type_field => :type_s})
 
   def self.top_tags(tags = nil)
     
   end
   
-  def self.search(search_terms, language = "en", limit = 10, offset = 0, operator = :or)
-    return find_by_solr(search_terms, :limit => limit, :offset => offset, :scores => true, :select => "entries.id, entries.title, entries.permalink, entries.direct_link, entries.published_at, entries.description, entries.feed_id, feeds.short_title AS collection", :joins => "INNER JOIN feeds ON feeds.id = entries.feed_id", :core => language, :operator => operator)
+  def self.search(search_terms, grain_size = nil, language = "en", limit = 10, offset = 0, operator = :or)
+    query = (!grain_size.nil? && grain_size != 'all') ? (search_terms + ") AND (grain_size:#{grain_size}") : search_terms
+    return find_by_solr(query, :limit => limit, :offset => offset, :scores => true, :select => "entries.id, entries.title, entries.permalink, entries.direct_link, entries.published_at, entries.description, entries.feed_id, feeds.short_title AS collection", :joins => "INNER JOIN feeds ON feeds.id = entries.feed_id", :core => language, :operator => operator)
   end
 
   def self.normalized_uri(uri)
@@ -26,7 +27,7 @@ class Entry < ActiveRecord::Base
   end
   
   def recommendations(limit = 20, order = "relevance", details = false, omit_feeds = nil)
-    sql = "SELECT recommendations.id AS recommendation_id, dest_entry_id AS id, permalink, entries.title, relevance_calculated_at, relevance, clicks, avg_time_at_dest AS avg_time_on_target, direct_link, feeds.short_title AS collection "
+    sql = "SELECT recommendations.id, dest_entry_id, permalink, entries.title, relevance_calculated_at, relevance, clicks, avg_time_at_dest AS avg_time_on_target, direct_link, feeds.short_title AS collection "
     sql << ", entries.description, author, published_at " if details == true
     sql << "FROM recommendations "
     sql << "INNER JOIN entries ON recommendations.dest_entry_id = entries.id "

data/app/models/feed.rb

@@ -6,6 +6,7 @@ class Feed < ActiveRecord::Base
   # format :xml
   
   has_many :entries
+  belongs_to :contributor, :class_name => 'User', :foreign_key => 'contributor_id'
   
   # named_scope :ready_to_harvest, lambda { |*args| { :conditions => [ "feeds.last_harvested_at < ?", args.first || 1.day.ago.end_of_day ] } }
                                                                         

data/app/models/tag_cloud.rb

@@ -1,8 +1,8 @@
 class TagCloud < ActiveRecord::Base
   
-  def self.language_tags language_id = 38, filter = ''
-    results = TagCloud.find(:all, :conditions => ["language_id = ? AND filter = ?", language_id, filter])
-    results.empty? ? '' : results[0].tag_list
+  def self.language_tags language_id = 38, grain_size = 'all', filter = ''
+    cloud = TagCloud.find(:first, :conditions => ["language_id = ? AND grain_size = ? AND filter = ? ", language_id, grain_size, filter.sort.join('/')])
+    cloud.nil? ? '' : cloud.tag_list
   end
   
 end

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

@@ -2,7 +2,14 @@
     <div class="column span-24 align-right">
         <span>
             <%= results_status %> 
-            <%= ('&nbsp;&nbsp;' + link_to('[' + t('muck.raker.start_over') + ']', {:action => 'index'}) + '&nbsp;') unless @tag_filter.nil? %>
+            <%= ('&nbsp;&nbsp;' + link_to('[' + t('muck.raker.start_over') + ']', {:action => 'index', :grain_size => @grain_size}) + '&nbsp;') unless @tag_filter.nil? %>
+            &nbsp;&nbsp;
+            <% if @grain_size == 'course' %>
+                <%= link_to('[' + t('muck.raker.show_tagged_resources') + ']', {:grain_size => 'all'}) %>
+            <% else %>
+                <%= link_to('[' + t('muck.raker.show_tagged_courses') + ']', {:grain_size => 'course'}) %>
+            <% end %>
+            &nbsp;
         </span>
     </div>
 </div>

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

@@ -1,11 +1,11 @@
 <div id="tag-cloud">
     <fieldset>
-        <legend><%= @tag_filter.nil? ? t('muck.raker.tag_cloud_legend') : t('muck.raker.narrow_further') %></legend>
+        <legend><%= @tag_filter.nil? ? (@grain_size == 'course' ? t('muck.raker.courses_tag_cloud_label') : t('muck.raker.resources_tag_cloud_label')) : t('muck.raker.narrow_further') %></legend>
         <% if @tag_cloud.blank? -%>
           <%= t('muck.raker.no_tags') %>
         <% else -%>
           <% tag_cloud @tag_cloud, %w(cloud1 cloud2 cloud3 cloud4 cloud5 cloud6) do |tag, css_class| %>
-              <%= tag_link(tag, @tag_filter, css_class) %>
+              <%= tag_link(tag, @tag_filter, css_class, @grain_size) %>
           <% end %>
         <% end -%>
     </fieldset>

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

@@ -9,6 +9,6 @@
         <%= render(:partial => 'entries/tag_cloud') %>
     </div>
     <% else %>
-        <p><%= t('muck.raker.no_hits') %></p>
+      <p><%= @grain_size == 'all' ? t('muck.raker.no_tagged_resources', :tags => @search) : t('muck.raker.no_tagged_courses', :tags => @tag_filter.split('/').join(', ')) %></p>
     <% end %>
 </div>

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

@@ -3,13 +3,13 @@
 <table border="1" cellpadding="3px">
 <tr>
 <th>Related Resources <span style="color:#888;font-weight:normal;">(<%= t('muck.raker.calculated') %> <%= @entry.relevance_calculated_at.strftime("%d %b %Y") %>)</span></th>
-<th>Relevance</th>
-<th>Clicks</th>
-<th>Avg Time<br/>(seconds)</th>
+<th class="centered">Relevance</th>
+<th class="centered">Clicks</th>
+<th class="centered">Avg Time<br/>(seconds)</th>
 </tr>
 <% @entry.ranked_recommendations(@limit, params[:order] || "relevance").each do |r| %>
 <tr>
-<td><%= link_to r["title"] + " (" + r["collection"] + ")", "/r?id=" + r["recommendation_id"].to_s %></td>
+<td><%= link_to r["title"] + " (" + r["collection"] + ")", "/r?id=" + r["id"].to_s %></td>
 <td class="centered"><%= round(r["relevance"]) %></td>
 <td class="centered"><%= r["clicks"] %></td>
 <td class="centered"><%= r["avg_time_on_target"] %></td>

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

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

data/app/views/recommendations/index.xml.builder

@@ -5,17 +5,19 @@ if @document.nil?
 else
 
 @recommendations = @document.ranked_recommendations(@limit, params[:order] || "mixed", @details)
-xml.recommendations(:document_id => @document.nil? ? "" : @document.id, :uri => @uri, :title => t(:gm_title), :more_prompt => t(:gm_more_prompt), :direct_link_text => t(:direct_link), :locale => @document.language) do
+#xml.recommendations(:document_id => @document.nil? ? "" : @document.id, :uri => @uri, :title => t(:gm_title), :more_prompt => t(:gm_more_prompt), :direct_link_text => t(:direct_link), :locale => @document.language) do
+xml.recommendations(:document_id => @document.nil? ? "" : @document.id, :uri => @uri, :title => t("muck.raker.gm_title"), :more_prompt => t("muck.raker.gm_more_prompt"), :direct_link_text => t("muck.raker.direct_link")) do
     @recommendations.each do |recommendation|
         xml.recommendation do
             xml.title recommendation["title"]
             xml.collection recommendation["collection"]
-            xml.link "http://www.oerrecommender.org/r?id=" + recommendation["id"].to_s  
+            xml.link "http://www.folksemantic.com/r?id=" + recommendation["recommendation_id"].to_s  
 #            xml.link "http://localhost:3000/r?id=" + recommendation["id"].to_s
             xml.has_direct_link "true" if (recommendation["direct_link"] != nil and @uri[0..20] == recommendation["uri"][0..20]) 
             
             if @details == true
-	            xml.direct_link "http://www.oerrecommender.org/r?id=" + recommendation["id"].to_s + "&u=" + recommendation["direct_link"] if recommendation["direct_link"] != nil 
+	            xml.direct_link "http://www.folksemantic.com/r?id=" + recommendation["recommendation_id"].to_s + "&u=" + recommendation["direct_link"] if recommendation["direct_link"] != nil 
+#	            xml.direct_link "http://localhost:3000/r?id=" + recommendation["recommendation_id"].to_s + "&u=" + recommendation["direct_link"] if recommendation["direct_link"] != nil 
 	            xml.uri recommendation["uri"]
 	            xml.direct_uri recommendation["direct_link"]
 	            xml.description recommendation["description"]

data/config/muck_raker_routes.rb

@@ -16,6 +16,7 @@ ActionController::Routing::Routes.draw do |map|
   map.connect 'r', :controller => 'recommender/entries', :action => 'track_clicks'
   map.connect 'collections', :controller => 'entries', :action => 'collections'
 
+  map.resources :feeds, :controller => 'recommender/feeds'
   map.resources :recommendations, :controller => 'recommender/recommendations'
 
   # redirect (and hit tracking)

data/db/migrate/20090716035935_change_tag_cloud_grain_sizes.rb

@@ -0,0 +1,9 @@
+class ChangeTagCloudGrainSizes < ActiveRecord::Migration
+  def self.up
+    execute "update tag_clouds set grain_size = 'all' where grain_size = 'unknown'"
+  end
+
+  def self.down
+    execute "update tag_clouds set grain_size = 'unknown' where grain_size = 'all'"
+  end
+end

data/db/migrate/20090717173900_add_contributor_to_feeds.rb

@@ -0,0 +1,9 @@
+class AddContributorToFeeds < ActiveRecord::Migration
+  def self.up
+    add_column :feeds, :contributor_id, :integer
+  end
+
+  def self.down
+    remove_column :feeds, :contributor_id
+  end
+end

data/db/migrate/20090717175825_normalize_entries_subjects.rb

@@ -0,0 +1,17 @@
+class NormalizeEntriesSubjects < ActiveRecord::Migration
+  def self.up
+    execute "ALTER TABLE entries_subjects DROP PRIMARY KEY, ADD PRIMARY KEY USING BTREE(subject_id, entry_id);"
+    remove_column :entries_subjects, :language_id 
+    remove_column :entries_subjects, :grain_size 
+    execute "delete from entries_subjects where entry_id IN (select entries.id from entries inner join feeds ON feeds.id = entries.feed_id where feeds.uri = 'http://ndr.nsdl.org/oai?verb=ListRecords&metadataPrefix=nsdl_dc&set=439869');"
+  end
+
+  def self.down
+    add_column :entries_subjects, :language_id, :integer
+    add_column :entries_subjects, :grain_size, :string
+    add_index "entries_subjects", ["language_id"]
+    add_index "entries_subjects", ["grain_size"]
+    execute "ALTER TABLE entries_subjects DROP PRIMARY KEY, ADD PRIMARY KEY USING BTREE(subject_id, language_id, grain_size, entry_id);"
+    execute "UPDATE entries_subjects AS es INNER JOIN entries AS e ON e.id = es.entry_id SET es.language_id = e.language_id, es.grain_size = e.grain_size"
+  end
+end

data/lib/muck_raker/tasks.rb

@@ -184,7 +184,27 @@ module MuckRaker
             end
           end
 
-          desc "Recommend without harvesting"
+          desc "Rebuild entry recommendation caches"
+          task :rebuild_recommendation_cache => :environment do
+            require File.expand_path("#{File.dirname(__FILE__)}/../../config/muck_raker_environment")
+            separator = (RUBY_PLATFORM =~ /(win|w)32$/ ? ';' : ':')
+            puts "RAILS_ENV=" + ENV['RAILS_ENV']
+            Dir.chdir(File.join(File.dirname(__FILE__), '../../', 'raker', 'lib')) do
+              jars = Dir['*.jar'].join(separator)
+              options = "-Dsolr.solr.home=\"#{SOLR_CONFIG_PATH}\" -Dsolr.data.dir=\"#{SOLR_DATA_PATH}\" -DRAILS_ENV=#{ENV['RAILS_ENV']} -DRAILS_DB_CONFIG=\"#{RAILS_DB_CONFIG}\" -DLOG_FILE_PREFIX=\"#{LOG_FILE_PREFIX}\" "
+              options << "-DDEBUG=true " unless ENV['DEBUG'] == 'false'
+              options << "-DLOG_TO_CONSOLE=true " unless ENV['DEBUG'] == 'false'
+              options << "-DFEED_ARCHIVE_PATH=\"#{FEED_ARCHIVE_PATH}\" "
+              classpath = "-classpath #{jars}#{separator}. "
+              javaclass = "edu.usu.cosl.recommender.Recommender "
+              cmdlineoption = "rebuild_cache "
+              cmd = "java " + options + classpath + javaclass + cmdlineoption
+              puts ("Executing: " + cmd) if ENV['DEBUG']
+              exec cmd  
+            end
+          end
+
+          desc "Redo everything (re-index, redo autogenerated subjects, rebuild tag clouds re-recommend)"
           task :rebuild => :environment do
             require File.expand_path("#{File.dirname(__FILE__)}/../../config/muck_raker_environment")
             separator = (RUBY_PLATFORM =~ /(win|w)32$/ ? ';' : ':')
@@ -217,8 +237,6 @@ module MuckRaker
         end  
 
       end
-      
-      
 
     end
   end

data/locales/en.yml

@@ -11,7 +11,9 @@ en:
         collections_long: Indexed Collections
         developers_long: Information for Developers
         powered_by: powered by
-        no_hits: No hits. Please try a different search or choose a different language.
+        no_hits: Your search - <b>{{search}}</b> - did not match any <b>{{resource_type}}</b>. Please try a different search or choose a different language.
+        no_tagged_courses: No <b>courses</b> were found tagged with <b>{{tags}}</b>. <a href='/resources'>Start over</a> or show <a href='/resources/tags/{{tags}}'>all resources tagged {{tags}}</a>.
+        no_tagged_resources: No <b>resources</b> were found tagged with <b>{{tags}}</b>. <a href='/resources'>Start over</a>.
         previous: Previous
         next: Next
         results: Results
@@ -40,12 +42,17 @@ en:
         search_link: Find Resources!
         search_description: Find learning resources by <span class="highlight">searching</span> and <span class="highlight">browsing</span> over <span class="highlight">110,000</span> open educational resources.
         welcome_user: "Welcome {{user}}"
-        tag_cloud_legend: browse resources using tags
+        resources_tag_cloud_label: browse resources using tags <a href="/resources?grain_size=course">[browse only courses]</a>
+        courses_tag_cloud_label: browse courses using tags <a href="/resources">[browse all resources]</a>
         narrow_further: narrow results further
+        show_tagged_courses: show only courses 
+        show_tagged_resources: show any kind of resource
         tags: tags
         start_over: start over
-        browse_results_status: Results <b>{{first}} - {{last}}</b> of <b>{{total}}</b> for tags <b>{{terms}}</b>  
-        search_results_status: Results <b>{{first}} - {{last}}</b> of <b>{{total}}</b> for <b>{{terms}}</b>
+        course_tag_results: Courses <b>{{first}} - {{last}}</b> of <b>{{total}}</b> tagged <b>{{terms}}</b>  
+        resource_tag_results: Resources <b>{{first}} - {{last}}</b> of <b>{{total}}</b> tagged <b>{{terms}}</b>  
+        course_search_results: Courses <b>{{first}} - {{last}}</b> of <b>{{total}}</b> for search <b>{{terms}}</b>
+        resource_search_results: Resources <b>{{first}} - {{last}}</b> of <b>{{total}}</b> for search <b>{{terms}}</b>
         next_label: Next
         previous_label: Previous
         all_resources: All Resources