twitter_bootstrap_helpers 0.1.0 → 0.2.0

data/README.md

@@ -1,4 +1,18 @@
 twitter_bootstrap_helpers
 =========================
 
-Хелперы для Twitter Bootstrap
+nav_tabs
+========
+
+
+```
+= nav_tabs do |tabs|
+  = tabs.pane 'id1', 'title', :active => true, :tooltip => 'tooltip' do
+    = 'content1'
+  = tabs.pane 'id2', 'title2', :tooltip => 'tooltip' do
+    = 'content1'
+```
+
+
+
+Хелперы для Twitter Bootstrap

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/app/helpers/bootstrap_helper.rb

@@ -36,7 +36,7 @@ module BootstrapHelper
   #
   def error_notification(form)
     if form.error_notification
-      alert :error, :close=>true do
+      show_alert :error, :close=>true do
         form.error_notification
       end
     end
@@ -62,7 +62,7 @@ module BootstrapHelper
   # = alert :close=>true, :block=>true do
   # Можно и так, без типа
 
-  def alert type_or_options=nil, options={}, &block
+  def show_alert type_or_options=nil, options={}, &block
     alert_classes = ['alert']
 
     if type_or_options.is_a?(Hash)
@@ -84,7 +84,7 @@ module BootstrapHelper
   def show_flashes
     flashes=''
     flash.each do |type,content|
-      flashes << alert(type, :close=>true) do
+      flashes << show_alert(type, :close=>true) do
         content
       end
     end
@@ -114,8 +114,8 @@ module BootstrapHelper
   #     = g.button('Home')
   #     = g.button('Posts')
   #
-  def button_group(type, &block)
-    builder = TwitterBootstrap::ButtonGroupBuilder.new(type, self)
+  def button_group(id,&block)
+    builder = TwitterBootstrap::ButtonGroupBuilder.new(id,self)
     builder.build(block)
   end
 
@@ -135,5 +135,43 @@ module BootstrapHelper
     builder = TwitterBootstrap::ButtonGroupWithTabsBuilder.new(self)
     builder.build(block)
   end
+  
+  # Вывод кнопки с иконкой, можно и без иконки
+  def button(text, url = nil, options = {})
+    # ОПЦИИ
+    # :color        цвет кнопки, может быть пустым, 
+    #               :red, :blue, :green, :yellow, :black, либо согласно bootstrap (напр. :primary)
+    #
+    # :icon         имя иконки, символ или строка. если nil - иконки нет.
+    #               список здесь: http://twitter.github.com/bootstrap/base-css.html#icons
+    #
+    # :icon_color   в идеале - не используется, цвет иконки выбирается автоматически, если :color задан корректно. 
+    #               если нет, заменяет цвет иконки. может быть :white.
+    #
+    # другие параметры передаются напрямую хелперу link_to, можно использовать их        
+    # 
+    # ПРИМЕР
+    # button 'Обновить', items_path, color: :blue, icon: :refresh, remote: true
+    #
+    # !!!ВАЖНО!!!
+    # не вставлять в text пользовательский текст, он может содержать вредоносный код, вызывается html_safe
+    button_class = case options[:color]
+      when nil     then 'btn'
+      when :red    then 'btn btn-danger'
+      when :blue   then 'btn btn-primary'
+      when :green  then 'btn btn-success'
+      when :yellow then 'btn btn-warning'
+      when :black  then 'btn btn-inverse'
+      else              'btn btn-'+options[:color].to_s
+    end
+    if options[:icon]
+      icon = '<i class="icon'+('-white' if options[:icon_color].to_s == "white" || [:red, :blue, :green, :black].include?(options[:color])).to_s+' icon-'+options[:icon].to_s+'"> </i> '
+      text = icon+text
+    end
+    options.delete_if{|k,v|[:color, :icon, :icon_color].include?(k)}
+    options[:class] = button_class
+    # если кто-то сильно против тега A и хочет BUTTON - можно сделать, но будет адский костыль.
+    link_to text.html_safe, url, options 
+  end
 
 end

data/lib/twitter_bootstrap_helpers/button_group_builder.rb

@@ -1,18 +1,19 @@
 # encoding: utf-8
 
+include ::ActionView::Helpers::TagHelper
+
 module TwitterBootstrap
 
   class ButtonGroupBuilder
-    def initialize(type, view_context)
-      @type = type
+    def initialize(id,view_context)
+      @id = id
       @view_context = view_context
-
       @buttons = ""
     end
 
     def build(block)
       block.call(self)
-      @view_context.content_tag(:div, @buttons.html_safe, class: 'btn-group', data: {toggle: "buttons-#{@type}"})
+      @view_context.content_tag(:div, @buttons.html_safe, class: 'btn-group',id: @id);
     end
 
     def button(label, options = {})
@@ -30,6 +31,13 @@ module TwitterBootstrap
 
       ""
     end
+
+    def dropdown_button(item_title,dropdown_menu)
+      title = (item_title << ' ' << content_tag(:span, nil, class: 'caret')).html_safe
+      link  = content_tag(:a, title, :href => '#', :class => 'btn btn-mini dropdown-toggle', 'data-toggle' => 'dropdown')
+
+      @buttons << (link << dropdown_menu) 
+    end
   end
 
   class ButtonGroupWithTabsBuilder < ButtonGroupBuilder

data/twitter_bootstrap_helpers.gemspec

@@ -5,24 +5,22 @@
 
 Gem::Specification.new do |s|
   s.name = "twitter_bootstrap_helpers"
-  s.version = "0.1.0"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Danil Pismenny"]
-  s.date = "2012-05-21"
+  s.date = "2012-09-02"
   s.description = "\u{425}\u{435}\u{43b}\u{43f}\u{435}\u{440}\u{44b} \u{434}\u{43b}\u{44f} Twitter Bootstrap"
   s.email = "danil@orionet.ru"
   s.extra_rdoc_files = [
     "LICENSE.txt",
-    "README.md",
-    "README.rdoc"
+    "README.md"
   ]
   s.files = [
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",
     "README.md",
-    "README.rdoc",
     "Rakefile",
     "VERSION",
     "app/helpers/bootstrap_helper.rb",
@@ -30,6 +28,7 @@ Gem::Specification.new do |s|
     "lib/twitter_bootstrap_helpers/button_group_builder.rb",
     "lib/twitter_bootstrap_helpers/engine.rb",
     "lib/twitter_bootstrap_helpers/tabs_generator.rb",
+    "pkg/twitter_bootstrap_helpers-0.1.0.gem",
     "test/helper.rb",
     "test/test_twitter_bootstrap_helpers.rb",
     "twitter_bootstrap_helpers.gemspec",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: twitter_bootstrap_helpers
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-21 00:00:00.000000000Z
+date: 2012-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &23121800 !ruby/object:Gem::Requirement
+  requirement: &13973260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23121800
+  version_requirements: *13973260
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &23117100 !ruby/object:Gem::Requirement
+  requirement: &13969200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *23117100
+  version_requirements: *13969200
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &23115660 !ruby/object:Gem::Requirement
+  requirement: &13967620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *23115660
+  version_requirements: *13967620
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &23113220 !ruby/object:Gem::Requirement
+  requirement: &13981280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23113220
+  version_requirements: *13981280
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &23111820 !ruby/object:Gem::Requirement
+  requirement: &13977640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *23111820
+  version_requirements: *13977640
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &23006580 !ruby/object:Gem::Requirement
+  requirement: &13990600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *23006580
+  version_requirements: *13990600
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &23003260 !ruby/object:Gem::Requirement
+  requirement: &13986520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23003260
+  version_requirements: *13986520
 description: Хелперы для Twitter Bootstrap
 email: danil@orionet.ru
 executables: []
@@ -95,13 +95,11 @@ extensions: []
 extra_rdoc_files:
 - LICENSE.txt
 - README.md
-- README.rdoc
 files:
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
 - README.md
-- README.rdoc
 - Rakefile
 - VERSION
 - app/helpers/bootstrap_helper.rb
@@ -109,6 +107,7 @@ files:
 - lib/twitter_bootstrap_helpers/button_group_builder.rb
 - lib/twitter_bootstrap_helpers/engine.rb
 - lib/twitter_bootstrap_helpers/tabs_generator.rb
+- pkg/twitter_bootstrap_helpers-0.1.0.gem
 - test/helper.rb
 - test/test_twitter_bootstrap_helpers.rb
 - twitter_bootstrap_helpers.gemspec
@@ -128,7 +127,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4016655193622081367
+      hash: 3120713679349540384
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/README.rdoc

@@ -1,19 +0,0 @@
-= twitter_bootstrap_helpers
-
-Description goes here.
-
-== Contributing to twitter_bootstrap_helpers
- 
-* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
-* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
-* Fork the project
-* Start a feature/bugfix branch
-* Commit and push until you are happy with your contribution
-* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
-* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
-
-== Copyright
-
-Copyright (c) 2011 Danil Pismenny. See LICENSE.txt for
-further details.
-