qui-toolbar 0.0.2 → 0.0.3

data/Rakefile

@@ -9,7 +9,7 @@ begin
     gemspec.email = "marcin@saepia.net"
     gemspec.homepage = "http://q.saepia.net"
     gemspec.authors = ["Marcin Lewandowski"]
-    gemspec.version = "0.0.2"
+    gemspec.version = "0.0.3"
     gemspec.files = Rake::FileList.new [ "MIT-LICENSE", "Rakefile",  "public/stylesheets/qui/*", "lib/*", "rails/*", "README.rdoc" ]
   end
 rescue LoadError

data/lib/qui-toolbar-base.rb

@@ -4,7 +4,7 @@ module QUI
       include ActionView::Helpers::UrlHelper
       include ActionView::Helpers::AssetTagHelper
       include ActionView::Helpers::TagHelper
-      
+
       def initialize(binding)
         @binding = binding
         @controller = eval("controller", @binding)
@@ -19,7 +19,7 @@ module QUI
       end
 
       def delete
-        add_toolbar_link_to({ :controller => controller_name, :action => "destroy", :method => :post }, :action => :delete)
+        add_toolbar_link_to({ :controller => controller_name, :action => "destroy" }, { :link_options => { :confirm => true, :method => :delete }, :action => :delete })
       end
 
       protected
@@ -34,15 +34,22 @@ module QUI
             d = description
           end
         
-          if options[:icon]
+          if options[:action]
             options[:icon_alt] ||= ""
-            d = image_tag(File.join("qui/toolbar/", options[:icon]), :alt => options[:icon_alt]) + d
+            d = image_tag(File.join("qui/toolbar/", "#{options[:action]}.png"), :alt => options[:icon_alt]) + d
+          end
+          
+          link_to_options = {}
+          if options[:link_options]
+            link_to_options[:confirm] = I18n.t(:"toolbar.deleteConfirmation") if options[:link_options][:confirm]
+            link_to_options[:method] = options[:link_options][:method] if options[:link_options][:method]
           end
-          link_to d, url, options
+                    
+          eval "link_to #{d.inspect}, #{url.inspect}, #{link_to_options.inspect}", @binding
         end
         
         def add_toolbar_link_to(url, options = {})
-          toolbar_link_to :"toolbar.#{options[:action]}", url, :icon => "#{options[:action]}.png"
+          toolbar_link_to :"toolbar.#{options[:action]}", url, options
         end
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: qui-toolbar
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Marcin Lewandowski