merb-search 0.3 → 0.3.1

data/Rakefile

@@ -15,7 +15,7 @@ spec = Gem::Specification.new do |s|
   s.name = 'merb-search'
   s.rubyforge_project = 'uipoet'
   s.summary = 'Search for Merb'
-  s.version = '0.3'
+  s.version = '0.3.1'
 end
 
 Rake::GemPackageTask.new(spec) do |pkg|

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

@@ -1,9 +1,7 @@
 <% if @keyterms %>
-  <%= mui_tray(:inline => true, :title => 'Key Terms', :width => '20em') do %>
-    <% @keyterms.each do |term| %>
-      <%= mui_block do %>
-        <%= mui_link(:title => term, :url => "/?q=#{term}") %>
-      <% end =%>
-    <% end %>
-  <% end =%>
+  <% @keyterms.each do |term| %>
+    <%= mui_block do %>
+      <%= mui_link(:title => term, :url => "/?q=#{term}") %>
+    <% end =%>
+  <% end %>
 <% end %>

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

@@ -1,15 +0,0 @@
-<% if @web %>
-  <% @web.each do |result| %>
-    <%= partial(:page, :result => result) %>
-  <% end %>
-<% end %>
-<% if @images %>
-  <% @images.each do |result| %>
-    <%= partial(:image, :result => result) %>
-  <% end %>
-<% end %>
-<% if @news %>
-  <% @news.each do |result| %>
-    <%= partial(:article, :result => result) %>
-  <% end %>
-<% end %>

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

@@ -1,9 +1,7 @@
 <% if @spelling %>
-  <%= mui_tray(:inline => true, :title => 'Did you mean...', :width => '20em') do %>
-    <% @spelling.each do |result| %>
-      <%= mui_block do %>
-        <%= mui_link(:title => result.suggestion, :url => "/?q=#{result.query}") %>
-      <% end =%>
-    <% end %>
-  <% end =%>
+  <% @spelling.each do |result| %>
+    <%= mui_block do %>
+      <%= mui_link(:title => result.suggestion, :url => "/?q=#{result.query}") %>
+    <% end =%>
+  <% end %>
 <% end %>

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

@@ -1,9 +1,21 @@
-<%= mui_grid(:cell_valign => 'top', :columns => 2, :width => '100%') do %>
-  <%= mui_cell do %>
-    <%= partial :keyterms %>
+<% if @spelling | @keyterms %>
+  <% throw_content :mui_sidebar do %>
     <%= partial :spelling %>
-  <% end =%>
-  <%= mui_cell do %>
-    <%= partial :resultset %>
-  <% end =%>
-<% end =%>
+    <%= partial :keyterms %>
+  <% end %>
+<% end %>
+<% if @web %>
+  <% @web.each do |result| %>
+    <%= partial(:page, :result => result) %>
+  <% end %>
+<% end %>
+<% if @images %>
+  <% @images.each do |result| %>
+    <%= partial(:image, :result => result) %>
+  <% end %>
+<% end %>
+<% if @news %>
+  <% @news.each do |result| %>
+    <%= partial(:article, :result => result) %>
+  <% end %>
+<% end %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-search
 version: !ruby/object:Gem::Version 
-  version: "0.3"
+  version: 0.3.1
 platform: ruby
 authors: 
 - UiPoet
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-22 00:00:00 -08:00
+date: 2008-12-23 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency