merb-search 0.3 → 0.3.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. data/Rakefile +1 -1
  2. data/app/views/search/_keyterms.html.erb +5 -7
  3. data/app/views/search/_resultset.html.erb +0 -15
  4. data/app/views/search/_spelling.html.erb +5 -7
  5. data/app/views/search/index.html.erb +20 -8
  6. metadata +2 -2
data/Rakefile CHANGED
@@ -15,7 +15,7 @@ spec = Gem::Specification.new do |s|
15
15
  s.name = 'merb-search'
16
16
  s.rubyforge_project = 'uipoet'
17
17
  s.summary = 'Search for Merb'
18
- s.version = '0.3'
18
+ s.version = '0.3.1'
19
19
  end
20
20
 
21
21
  Rake::GemPackageTask.new(spec) do |pkg|
data/app/views/search/_keyterms.html.erb CHANGED
@@ -1,9 +1,7 @@
1
1
  <% if @keyterms %>
2
- <%= mui_tray(:inline => true, :title => 'Key Terms', :width => '20em') do %>
3
- <% @keyterms.each do |term| %>
4
- <%= mui_block do %>
5
- <%= mui_link(:title => term, :url => "/?q=#{term}") %>
6
- <% end =%>
7
- <% end %>
8
- <% end =%>
2
+ <% @keyterms.each do |term| %>
3
+ <%= mui_block do %>
4
+ <%= mui_link(:title => term, :url => "/?q=#{term}") %>
5
+ <% end =%>
6
+ <% end %>
9
7
  <% end %>
data/app/views/search/_resultset.html.erb CHANGED
@@ -1,15 +0,0 @@
1
- <% if @web %>
2
- <% @web.each do |result| %>
3
- <%= partial(:page, :result => result) %>
4
- <% end %>
5
- <% end %>
6
- <% if @images %>
7
- <% @images.each do |result| %>
8
- <%= partial(:image, :result => result) %>
9
- <% end %>
10
- <% end %>
11
- <% if @news %>
12
- <% @news.each do |result| %>
13
- <%= partial(:article, :result => result) %>
14
- <% end %>
15
- <% end %>
data/app/views/search/_spelling.html.erb CHANGED
@@ -1,9 +1,7 @@
1
1
  <% if @spelling %>
2
- <%= mui_tray(:inline => true, :title => 'Did you mean...', :width => '20em') do %>
3
- <% @spelling.each do |result| %>
4
- <%= mui_block do %>
5
- <%= mui_link(:title => result.suggestion, :url => "/?q=#{result.query}") %>
6
- <% end =%>
7
- <% end %>
8
- <% end =%>
2
+ <% @spelling.each do |result| %>
3
+ <%= mui_block do %>
4
+ <%= mui_link(:title => result.suggestion, :url => "/?q=#{result.query}") %>
5
+ <% end =%>
6
+ <% end %>
9
7
  <% end %>
data/app/views/search/index.html.erb CHANGED
@@ -1,9 +1,21 @@
1
- <%= mui_grid(:cell_valign => 'top', :columns => 2, :width => '100%') do %>
2
- <%= mui_cell do %>
3
- <%= partial :keyterms %>
1
+ <% if @spelling | @keyterms %>
2
+ <% throw_content :mui_sidebar do %>
4
3
  <%= partial :spelling %>
5
- <% end =%>
6
- <%= mui_cell do %>
7
- <%= partial :resultset %>
8
- <% end =%>
9
- <% end =%>
4
+ <%= partial :keyterms %>
5
+ <% end %>
6
+ <% end %>
7
+ <% if @web %>
8
+ <% @web.each do |result| %>
9
+ <%= partial(:page, :result => result) %>
10
+ <% end %>
11
+ <% end %>
12
+ <% if @images %>
13
+ <% @images.each do |result| %>
14
+ <%= partial(:image, :result => result) %>
15
+ <% end %>
16
+ <% end %>
17
+ <% if @news %>
18
+ <% @news.each do |result| %>
19
+ <%= partial(:article, :result => result) %>
20
+ <% end %>
21
+ <% end %>
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: merb-search
3
3
  version: !ruby/object:Gem::Version
4
- version: "0.3"
4
+ version: 0.3.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - UiPoet
@@ -9,7 +9,7 @@ autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
11
 
12
- date: 2008-12-22 00:00:00 -08:00
12
+ date: 2008-12-23 00:00:00 -08:00
13
13
  default_executable:
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency