merb-words 0.4 → 0.4.1

data/Rakefile

@@ -15,7 +15,7 @@ spec = Gem::Specification.new do |s|
   s.name = 'merb-words'
   s.rubyforge_project = 'uipoet'
   s.summary = 'Word Management for Merb'
-  s.version = '0.4'
+  s.version = '0.4.1'
 end
 
 Rake::GemPackageTask.new(spec) do |pkg|

data/app/views/pages/_category.html.erb

@@ -13,29 +13,31 @@
     <% end =%>
   <% end %>
 <% end =%>
-<% if category_id %>
-  <%= mui_link(:title => 'All', :title_size => '0.85em', :url => slice_url(:index, attributes)) %>
-<% else %>
-  <span style="font-size:0.85em;">All</span>
-<% end %>
-<% if categories %>
-  <% categories.each do |category| %>
-    <%= mui_grid(:columns => 2, :width => '100%') do %>
-      <%= mui_cell do %>
-        <% if category_id.to_i == category.id %>
-          <span style="font-size:0.85em;"><%= category.title %></span>
-        <% else %>
-          <% attributes[:category_id] = category.id %>
-          <%= mui_link(:title => category.title, :title_size => '0.85em', :url => slice_url(:index, attributes)) %>
+<%= mui_block do %>
+  <% if category_id %>
+    <%= mui_link(:title => 'All', :title_size => '0.85em', :url => slice_url(:index, attributes)) %>
+  <% else %>
+    <span style="font-size:0.85em;">All</span>
+  <% end %>
+  <% if categories %>
+    <% categories.each do |category| %>
+      <%= mui_grid(:columns => 2, :width => '100%') do %>
+        <%= mui_cell do %>
+          <% if category_id.to_i == category.id %>
+            <span style="font-size:0.85em;"><%= category.title %></span>
+          <% else %>
+            <% attributes[:category_id] = category.id %>
+            <%= mui_link(:title => category.title, :title_size => '0.85em', :url => slice_url(:index, attributes)) %>
+          <% end %>
+        <% end =%>
+        <% if merb_words_password? %>
+          <%= mui_cell(:align => 'right', :wrap => false) do %>
+            &nbsp;
+            <%= mui_button(:title => 'Update', :title_size => '0.75em', :url => slice_url(:category_update, :category_id => category.id), :window => 'open') %>
+            <%= mui_button(:title => '&#215;', :title_size => '0.75em', :tone => 'negative', :url => slice_url(:category_delete, :category_id => category.id), :window => 'open') %>
+          <% end =%>
         <% end %>
       <% end =%>
-      <% if merb_words_password? %>
-        <%= mui_cell(:align => 'right', :wrap => false) do %>
-          &nbsp;
-          <%= mui_button(:title => 'Update', :title_size => '0.75em', :url => slice_url(:category_update, :category_id => category.id), :window => 'open') %>
-          <%= mui_button(:title => '&#215;', :title_size => '0.75em', :tone => 'negative', :url => slice_url(:category_delete, :category_id => category.id), :window => 'open') %>
-        <% end =%>
-      <% end %>
-    <% end =%>
+    <% end %>
   <% end %>
-<% end %>
+<% end =%>

data/app/views/pages/_order.html.erb

@@ -1,16 +1,17 @@
-<%= mui_block(:title => 'Sort by', :title_size => '1em') %>
-<% orders.each do |order| %>
-  <div>
-    <% if order_property == order.property %>
-      <span style="font-size:0.85em;"><%= order.title %></span>
-    <% else %>
-      <%
-        attributes = {}
-        attributes[:category_id] = params[:category_id]
-        attributes[:order_property] = order.property
-        attributes[:search] = params[:search]
-      %>
-      <%= mui_link(:title => order.title, :title_size => '0.85em', :url => slice_url(:index, attributes)) %>
-    <% end %>
-  </div>
-<% end %>
+<%= mui_block(:title => 'Sort by', :title_size => '1em') do %>
+  <% orders.each do |order| %>
+    <div>
+      <% if order_property == order.property %>
+        <span style="font-size:0.85em;"><%= order.title %></span>
+      <% else %>
+        <%
+          attributes = {}
+          attributes[:category_id] = params[:category_id]
+          attributes[:order_property] = order.property
+          attributes[:search] = params[:search]
+        %>
+        <%= mui_link(:title => order.title, :title_size => '0.85em', :url => slice_url(:index, attributes)) %>
+      <% end %>
+    </div>
+  <% end %>
+<% end =%>

data/app/views/pages/_search.html.erb

@@ -1,17 +1,18 @@
 <% if queries = session[:merb_words_queries] and !queries.blank? %>
-  <%= mui_block(:title => 'Searches', :title_size => '1em') %>
-  <% attributes = {} %>
-  <% queries.each do |q| %>
-    <% attributes[:q] = CGI.unescape(q) %>
-    <%= mui_grid(:columns => 2, :width => '100%') do %>
-      <%= mui_cell do %>
-        <%= mui_link(:title => CGI.unescape(q), :title_size => '0.85em', :url => slice_url(:index, attributes)) %>
+  <%= mui_block(:title => 'Searches', :title_size => '1em') do %>
+    <% attributes = {} %>
+    <% queries.each do |q| %>
+      <% attributes[:q] = CGI.unescape(q) %>
+      <%= mui_grid(:columns => 2, :width => '100%') do %>
+        <%= mui_cell do %>
+          <%= mui_link(:title => CGI.unescape(q), :title_size => '0.85em', :url => slice_url(:index, attributes)) %>
+        <% end =%>
+        <%= mui_cell(:align => 'right', :wrap => false) do %>
+          &nbsp;
+          <%= mui_button(:title => '&#215;', :title_size => '0.75em', :tone => 'negative', :url => slice_url(:query_delete, :query => q)) %>
+        <% end =%>
       <% end =%>
-      <%= mui_cell(:align => 'right', :wrap => false) do %>
-        &nbsp;
-        <%= mui_button(:title => '&#215;', :title_size => '0.75em', :tone => 'negative', :url => slice_url(:query_delete, :query => q)) %>
-      <% end =%>
-    <% end =%>
-  <% end %>
+    <% end %>
+  <% end =%>
   <%= mui_divider %>
 <% end %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-words
 version: !ruby/object:Gem::Version 
-  version: "0.4"
+  version: 0.4.1
 platform: ruby
 authors: 
 - UiPoet
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-15 00:00:00 -08:00
+date: 2008-12-16 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency