muck-raker 0.1.4 → 0.1.5

data/Rakefile

@@ -42,6 +42,7 @@ begin
     gemspec.add_dependency "muck-users"
     gemspec.add_dependency "muck-solr"
     gemspec.files.include %w( tasks/*
+                          db/bootstrap/*.yml
                           db/migrate/*.rb
                           app/**/**/**/*
                           config/*

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/app/controllers/recommender/entries_controller.rb

@@ -5,16 +5,16 @@ class Recommender::EntriesController < ApplicationController
   end
   
   def index
-    @tags = CloudCache.language_tags('en') unless fragment_exist?({:controller => 'entries', :action => 'index'})
+    @tag_cloud = TagCloud.language_tags(Language.locale_id) 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
-    @browse_tags = params[:tags]
-    @top_tags = Entry.top_tags(@browse_tags)
-    @search = @browse_tags.join(' ') if (!@browse_tags.nil? && !@browse_tags.empty?)
+    @tag_filter = params[:tags]
+    @search = @tag_filter.join(' ') if (!@tag_filter.nil? && !@tag_filter.empty?)
+    @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
     respond_to do |format|
       format.html { render :template => 'entries/browse_by_tags' }
@@ -34,7 +34,7 @@ class Recommender::EntriesController < ApplicationController
     @limit = (params[:limit] || 10).to_i
     @term_list = URI.escape(@search) if !@search.nil?
     if !@search.nil?
-      results = Entry.search(@search, 'en', @limit, @offset)
+      results = Entry.search(@search, I18n.locale.to_s, @limit, @offset)
       @results = results.results
       @hit_count = results.total
     end

data/app/models/tag_cloud.rb

@@ -0,0 +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
+  end
+  
+end

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

@@ -0,0 +1,5 @@
+<div>
+<b><%= (link_to(t('muck.raker.previous'), {:action => :browse_by_tags, :tags => URI.unescape(@term_list), :locale => @language, :limit => @limit, :offset => @offset - @limit}, :rel => "nofollow") + "&nbsp;&nbsp;") if @offset > 0 %>
+<%= (link_to(t('muck.raker.next'), {:action => :browse_by_tags, :tags => URI.unescape(@term_list),  :locale => @language,:limit => @limit, :offset => @offset + @limit}, :rel => "nofollow") if @results.size >= @limit )%>
+</b>
+</div>           

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

@@ -0,0 +1,14 @@
+<div id="results-description" class="block">
+    <div class="column span-5">
+        <input type="radio" name="scope" value="all" checked/><%= t('folksemantic.all_resources') %> &nbsp&nbsp;&nbsp;
+        <input type="radio" name="scope" value="ocws"/><%= t('folksemantic.just_ocws') %><br/>
+    </div>
+    <div class="column span-19 align-right">
+        <%= t('muck.raker.results') %> 
+        <b><%= (@offset+1) %> - <%= (@offset + @limit) < @hit_count ? (@offset + @limit) : @hit_count %></b> 
+        <%= t('muck.raker.of') %> 
+        <b><%= @hit_count %></b> 
+        <%= t('muck.raker.for') %> 
+        <b><%= URI.unescape(@term_list) %></b></p>
+    </div>
+</div>

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

@@ -0,0 +1,3 @@
+<div id="results">
+<%= render(:partial => 'entries/result', :collection => @results) %>
+</div>

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

@@ -1,4 +1,12 @@
 <div id="tag-cloud">
-    <%= render(:partial => "cloud_type_selector") %>
-    <%= render(:partial => "tags") %>
-</div>
+    <fieldset>
+        <legend><%= t('folksemantic.tag_cloud_legend') %></legend>
+        <% if @tag_cloud.blank? -%>
+          <%= t('folksemantic.no_tags') %>
+        <% else -%>
+          <% tag_cloud @tag_cloud, %w(cloud1 cloud2 cloud3 cloud4 cloud5 cloud6) do |tag, css_class| %>
+              <%= link_to tag, { :action => :browse_by_tags, :tags => tag }, :class => css_class %>
+          <% end %>
+        <% end -%>
+    </fieldset>
+</div>

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

@@ -1,33 +1,14 @@
-<div id="finder">
-<div class="left">
-
-	<fieldset style="margin-top:20px;">
-		<legend style="font-size:12px; color:#555;">click more tags to narrow results</legend>
-	<div style="margin-top:3px;margin-left:10px;font-size:12px;">
-	<input type="radio" name="scope" value="all" checked style="vertical-align:center"/>All
-	<input type="radio" name="scope" value="ocws" style="vertical-align:center"/>Courses<br/>
-	</div>
-		<img src="/images/tag_cloud2.jpg" align="center" width="200px;" />
-	</fieldset>
-
-</div>
-<div class="left" style="width:480px; margin-left:20px; margin-top:10px;">
-
-<% if @results.length > 0 %>
-
-<p><%= t('muck.raker.results') %> <b><%= (@offset+1) %> - <%= (@offset + @limit) < @hit_count ? (@offset + @limit) : @hit_count %></b> <%= t('muck.raker.of') %> <b><%= @hit_count %></b> <%= t('muck.raker.for') %> <b><%= @terms %></b></p>
-<div id="results">
-<%= render(:partial => 'entries/result', :collection => @results) %>
-</div>
-
-<div>
-<b><%= (link_to(t('muck.raker.previous'), {:action => :browse_by_tags, :tags => URI.unescape(@term_list), :locale => @language, :limit => @limit, :offset => @offset - @limit}, :rel => "nofollow") + "&nbsp;&nbsp;") if @offset > 0 %>
-<%= (link_to(t('muck.raker.next'), {:action => :browse_by_tags, :tags => URI.unescape(@term_list),  :locale => @language,:limit => @limit, :offset => @offset + @limit}, :rel => "nofollow") if @results.size >= @limit )%>
-</b>
-</div>           
-
-<% else %>
-<p><%= t(:no_hits) %></p>
-<% end %>
-
+<div class="block">
+    <% if @results.length > 0 %>
+    <%= render(:partial => 'entries/result_status') %>
+    <div class="column span-15">
+        <%= render(:partial => 'entries/results') %>
+        <%= render(:partial => 'entries/result_navigation') %>
+    </div>
+    <div class="column span-9 last">
+        <%= render(:partial => 'entries/tag_cloud') %>
+    </div>
+    <% else %>
+        <p><%= t(:no_hits) %></p>
+    <% end %>
 </div>

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

@@ -1,8 +1,3 @@
-<% cache do %>
 <div align="center">
-  <fieldset id="tag-cloud" class="clear">
-    <legend style="font-size:12px; color:#555;">browse resources using tags</legend>
-    <%= render :partial => 'entries/tags', :object => @tags %>
-  </fieldset>
+    <%= render :partial => 'entries/tag_cloud' %>
 </div>
-<% end %>

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

@@ -1,21 +1,11 @@
-<div id="finder">
-
-<% if !@results.nil? && !@results.empty? %>
-
-<p id="results-description"><%= t('muck.raker.results') %> <b><%= (@offset+1) %> - <%= (@offset + @limit) < @hit_count ? (@offset + @limit) : @hit_count %></b> <%= t('muck.raker.of') %> <b><%= @hit_count %></b> <%= t('muck.raker.for') %> <b><%= URI.unescape(@term_list) %></b></p>
-
-<div id="results">
-<%= render(:partial => 'entries/result', :collection => @results) %>
-</div>
-
-<div>
-<b><%= (link_to(t('muck.raker.previous'), {:action => :browse_by_tags, :tags => @term_list, :locale => @language, :limit => @limit, :offset => @offset - @limit}, :rel => "nofollow") + "&nbsp;&nbsp;") if @offset > 0 %>
-<%= (link_to(t('muck.raker.next'), {:action => :browse_by_tags, :tags => @term_list,  :locale => @language,:limit => @limit, :offset => @offset + @limit}, :rel => "nofollow") if @results.size >= @limit )%>
-</b>
-</div>           
-
-<% else %>
-<p><%= t('muck.raker.no_hits') %></p>
-<% end %>
-
+<div id="search-results">
+    <% if @results.length > 0 %>
+    <div class="left">
+        <%= render(:partial => 'entries/result_status') %>
+        <%= render(:partial => 'entries/results') %>
+        <%= render(:partial => 'entries/result_navigation') %>
+    </div>
+    <% else %>
+        <p><%= t(:no_hits) %></p>
+    <% end %>
 </div>