twitter_bootstrap_builder 0.0.2 → 0.0.3

data/lib/twitter_bootstrap_builder/builders/fieldset_builder.rb

@@ -22,9 +22,9 @@ module TwitterBootstrapBuilder
         actions.to_s.html_safe
       end
 
-      def display_field(method)
-        ControlGroup.new(model.class.human_attribute_name(method)) do |cg|
-          cg.append Tag.block(:span, model.send(method), class: 'display')
+      def display_field(method, options={})
+        ControlGroup.new(options[:label] || model.class.human_attribute_name(method)) do |cg|
+          cg.append Tag.block(:span, model.send(method).to_s.gsub("\n", '<br>'), class: 'display')
         end.to_s.html_safe
       end
 
@@ -70,6 +70,12 @@ module TwitterBootstrapBuilder
         end.to_s.html_safe
       end
 
+      def check_box(method, options={})
+        ControlGroup.new(model.class.human_attribute_name(method), for: "#{form_builder.object_name}_#{method}") do |cg|
+          cg.append form_builder.check_box(method, options)
+        end.to_s.html_safe
+      end
+
       def hidden_field(method, options={})
         ControlGroup.new(model.class.human_attribute_name(method), for: "#{form_builder.object_name}_#{method}") do |cg|
           cg.append form_builder.hidden_field(method, options)

data/lib/twitter_bootstrap_builder/builders/nav_container_builder.rb

@@ -30,6 +30,10 @@ module TwitterBootstrapBuilder
         Tag.block(:li, DropDownLinkBuilder.new(template, text: text, &block).html_safe).to_s.html_safe
       end
 
+      def custom(&block)
+        Tag.block(:li, Tag.block(:a, template.capture(self, &block))).to_s.html_safe
+      end
+
     end
   end
 end

data/lib/twitter_bootstrap_builder/builders/nav_list_builder.rb

@@ -26,7 +26,11 @@ module TwitterBootstrapBuilder
       end
 
       def divider
-        Tag.block(:li, Divider.vertical).to_s.html_safe
+        Tag.block(:li, Divider.horizontal).to_s.html_safe
+      end
+
+      def custom(&block)
+        Tag.block(:li, template.capture(self, &block)).to_s.html_safe
       end
 
     end

data/lib/twitter_bootstrap_builder/builders/tab_builder.rb

@@ -0,0 +1,23 @@
+module TwitterBootstrapBuilder
+  module Builders
+    class TabBuilder < Base
+
+      def initialize(*args, &block)
+        super
+        @tab = Tab.new
+      end
+
+      def to_s
+        template.capture(self, &block) if block
+        @tab.to_s
+      end
+
+      def content_for(text, id=nil, &block)
+        id = text.parameterize('_') unless id
+        @tab.nav.append NavTab.new(text, "##{id}")
+        @tab.content.append id, template.capture(self, &block) if block_given?
+      end
+
+    end
+  end
+end

data/lib/twitter_bootstrap_builder/helpers/commons_helper.rb

@@ -18,6 +18,16 @@ module TwitterBootstrapBuilder
         end
       end
 
+      def side_bar(partial=nil, &block)
+        if partial
+          content_for(:side_bar) { render "layouts/#{partial}" }
+        elsif block
+          content_for(:side_bar, &block)
+        else
+          content_for?(:side_bar) ? content_for(:side_bar) : nil
+        end
+      end
+
       def alert_message
         unless content_for?(:alert_message)
           if flash[:danger]
@@ -42,6 +52,10 @@ module TwitterBootstrapBuilder
         Builders::NavListBuilder.new(self, &block).html_safe
       end
 
+      def tab(&block)
+        Builders::TabBuilder.new(self, &block).html_safe
+      end
+
       def well(size=nil, &block)
         well = TwitterBootstrapMarkup::Well.new(capture(&block))
         well.send(size) if size
@@ -86,6 +100,16 @@ module TwitterBootstrapBuilder
         TwitterBootstrapMarkup::Icon.white(name).to_s.html_safe
       end
 
+      TwitterBootstrapMarkup::LabelBase::TYPES.each do |type|
+        define_method "label_#{type}" do |text|
+          TwitterBootstrapMarkup::Label.send(type, text).to_s.html_safe
+        end
+
+        define_method "badge_#{type}" do |text|
+          TwitterBootstrapMarkup::Badge.send(type, text).to_s.html_safe
+        end
+      end
+
     end
   end
 end

data/lib/twitter_bootstrap_builder/version.rb

@@ -1,3 +1,3 @@
 module TwitterBootstrapBuilder
-  VERSION = "0.0.2"
+  VERSION = '0.0.3'
 end

data/lib/twitter_bootstrap_builder.rb

@@ -19,5 +19,6 @@ require 'twitter_bootstrap_builder/builders/nav_bar_builder'
 require 'twitter_bootstrap_builder/builders/nav_container_builder'
 require 'twitter_bootstrap_builder/builders/nav_list_builder'
 require 'twitter_bootstrap_builder/builders/submit_button_builder'
+require 'twitter_bootstrap_builder/builders/tab_builder'
 require 'twitter_bootstrap_builder/builders/table_builder'