twitter-bootstrap-rails 2.0.7 → 2.0.8

data/README.md

@@ -176,6 +176,8 @@ gem 'twitter-bootstrap-rails', :git => 'git://github.com/seyhunak/twitter-bootst
   <li>Added SimpleForm support</li>
   <li>Added FontAwesome support</li>
   <li>Released gem v.2.0.6</li>
+  <li>Released gem v.2.0.7</li>
+  <li>Released gem v.2.0.8</li>
 </ul>
 
 

data/app/helpers/modal_helper.rb

@@ -0,0 +1,42 @@
+module ModalHelper
+  def modal_dialog(options = {}, escape = true, &block)
+    default_options = {:class => "bootstrap-modal modal"}
+    content_tag :div, nil, options.merge(default_options), escape, &block
+  end
+
+  def modal_header(options = {}, escape = true, &block)
+    default_options = {:class => 'modal-header'}
+    content_tag :div, nil, options.merge(default_options), escape do
+      raw("<button class=\"close\" data-dismiss=\"modal\">&times;</button>" + capture(&block))
+    end
+  end
+
+  def modal_body(options = {}, escape = true, &block)
+    default_options = {:class => 'modal-body'}
+    content_tag :div, nil, options.merge(default_options), escape, &block
+  end
+
+  def modal_footer(options = {}, escape = true, &block)
+    default_options = {:class => 'modal-footer'}
+    content_tag :div, nil, options.merge(default_options), escape, &block
+  end
+
+  def modal_toggle(content_or_options = nil, options = {}, &block)
+    if block_given?
+      options = content_or_options if content_or_options.is_a?(Hash)
+      default_options = {:class => 'btn', "data-toggle" => "modal", "href" => options[:dialog]}.merge(options)
+
+      content_tag :a, nil, default_options, true, &block
+    else
+      default_options = {:class => 'btn', "data-toggle" => "modal", "href" => options[:dialog]}.merge(options)
+      content_tag :a, content_or_options, default_options, true
+    end
+  end
+
+  def modal_cancel_button content, options = {}
+    default_options = {:class => "btn bootstrap-modal-cancel-button"}
+
+    content_tag_string "a", content, default_options.merge(options)
+  end
+end
+

data/app/helpers/twitter_breadcrumbs_helper.rb

@@ -1,5 +1,5 @@
 module TwitterBreadcrumbsHelper
   def render_breadcrumbs(divider = '/')
-    render partial: 'twitter-bootstrap/breadcrumbs', locals: {divider: divider}
+    render :partial => 'twitter-bootstrap/breadcrumbs', :locals => { :divider => divider }
   end
-end
+end

data/app/views/twitter-bootstrap/_breadcrumbs.html.erb

@@ -3,12 +3,12 @@
   <% separator = divider %>
   <% @breadcrumbs[0..-2].each do |crumb| %>
   <li>
-    <a href="<%= crumb[:url] %>"><%= crumb[:name] %></a>
+    <%= link_to crumb[:name], crumb[:url] %>
     <span class="divider"><%= separator %></span>
   </li>
   <% end %>
   <li class="active">
-    <a href="<%= @breadcrumbs.last[:url] %>"><%= @breadcrumbs.last[:name] %></a>
+    <%= link_to @breadcrumbs.last[:name], @breadcrumbs.last[:url] %>
   </li>
 </ul>
 <% end %>

data/lib/generators/bootstrap/themed/templates/edit.html.erb

@@ -1,4 +1,6 @@
 <%%- model_class = @<%= resource_name %>.class -%>
-<h1><%%=t '.title', :default => t('helpers.titles.edit', :model => model_class.model_name.human,
-                                 :default => "Edit #{model_class.model_name.human}") %></h1>
+<div class="page-header">
+  <h1><%%=t '.title', :default => t('helpers.titles.edit', :model => model_class.model_name.human,
+                                   :default => "Edit #{model_class.model_name.human}") %></h1>
+</div>
 <%%= render :partial => 'form' %>

data/lib/generators/bootstrap/themed/templates/edit.html.haml

@@ -1,3 +1,4 @@
 - model_class = @<%= resource_name %>.class
-%h1=t '.title', :default => t('helpers.titles.edit', :model => model_class.model_name.human, :default => "Edit #{model_class.model_name.human}")
+.page-header
+  %h1=t '.title', :default => t('helpers.titles.edit', :model => model_class.model_name.human, :default => "Edit #{model_class.model_name.human}")
 = render :partial => "form"

data/lib/generators/bootstrap/themed/templates/edit.html.slim

@@ -1,3 +1,4 @@
 - model_class = @<%= resource_name %>.class
-h1=t '.title', :default => t('helpers.titles.edit', :model => model_class.model_name.human, :default => "Edit #{model_class.model_name.human}")
-= render :partial => "form"
+div class="page-header"
+  h1=t '.title', :default => t('helpers.titles.edit', :model => model_class.model_name.human, :default => "Edit #{model_class.model_name.human}")
+= render :partial => "form"

data/lib/generators/bootstrap/themed/templates/index.html.erb

@@ -1,5 +1,7 @@
 <%%- model_class = <%= resource_name.classify %>.new.class -%>
-<h1><%%=t '.title', :default => model_class.model_name.human.pluralize %></h1>
+<div class="page-header">
+  <h1><%%=t '.title', :default => model_class.model_name.human.pluralize %></h1>
+</div>
 <table class="table table-striped">
   <thead>
     <tr>

data/lib/generators/bootstrap/themed/templates/index.html.haml

@@ -1,5 +1,6 @@
 - model_class = <%= resource_name.classify %>.new.class
-%h1=t '.title', :default => model_class.model_name.human.pluralize
+.page-header
+  %h1=t '.title', :default => model_class.model_name.human.pluralize
 %table.table.table-striped
   %thead
     %tr

data/lib/generators/bootstrap/themed/templates/index.html.slim

@@ -1,5 +1,6 @@
 - model_class = <%= resource_name.classify %>.new.class
-h1=t '.title', :default => model_class.model_name.human.pluralize
+div class="page-header"
+  h1=t '.title', :default => model_class.model_name.human.pluralize
 table class="table table-striped"
   thead
     tr

data/lib/generators/bootstrap/themed/templates/new.html.erb

@@ -1,4 +1,6 @@
 <%%- model_class = @<%= resource_name %>.class -%>
-<h1><%%=t '.title', :default => t('helpers.titles.new', :model => model_class.model_name.human,
-                               :default => "New #{model_class.model_name.human}") %></h1>
+<div class="page-header">
+  <h1><%%=t '.title', :default => t('helpers.titles.new', :model => model_class.model_name.human,
+                                 :default => "New #{model_class.model_name.human}") %></h1>
+</div>
 <%%= render :partial => 'form' %>

data/lib/generators/bootstrap/themed/templates/new.html.haml

@@ -1,3 +1,4 @@
 - model_class = @<%= resource_name %>.class
-%h1=t '.title', :default => t('helpers.titles.new', :model => model_class.model_name.human, :default => "New #{model_class.model_name.human}")
+.page-header
+  %h1=t '.title', :default => t('helpers.titles.new', :model => model_class.model_name.human, :default => "New #{model_class.model_name.human}")
 = render :partial => "form"

data/lib/generators/bootstrap/themed/templates/new.html.slim

@@ -1,3 +1,4 @@
 - model_class = @<%= resource_name %>.class
-h1=t '.title', :default => t('helpers.titles.new', :model => model_class.model_name.human, :default => "New #{model_class.model_name.human}")
+div class="page-header"
+  h1=t '.title', :default => t('helpers.titles.new', :model => model_class.model_name.human, :default => "New #{model_class.model_name.human}")
 = render :partial => "form"

data/lib/generators/bootstrap/themed/templates/show.html.erb

@@ -1,5 +1,7 @@
 <%%- model_class = @<%= resource_name %>.class -%>
-<h1><%%=t '.title', :default => model_class.model_name.human %></h1>
+<div class="page-header">
+  <h1><%%=t '.title', :default => model_class.model_name.human %></h1>
+</div>
 
 <dl class="dl-horizontal">
 <%- columns.each do |column| -%>

data/lib/generators/bootstrap/themed/templates/show.html.haml

@@ -1,5 +1,6 @@
 - model_class = @<%= resource_name %>.class
-%h1=t '.title', :default => model_class.model_name.human
+.page-header
+  %h1=t '.title', :default => model_class.model_name.human
 
 <%- columns.each do |column| -%>
 %p

data/lib/generators/bootstrap/themed/templates/show.html.slim

@@ -1,5 +1,6 @@
 - model_class = @<%= resource_name %>.class
-h1=t '.title', :default => model_class.model_name.human
+div class="page-header"
+  h1=t '.title', :default => model_class.model_name.human
 
 <%- columns.each do |column| -%>
 p

data/lib/twitter/bootstrap/rails/engine.rb

@@ -1,5 +1,8 @@
 require 'rails'
+
 require File.dirname(__FILE__) + '/twitter-bootstrap-breadcrumbs.rb'
+require File.dirname(__FILE__) + '/../../../../app/helpers/flash_block_helper.rb'
+require File.dirname(__FILE__) + '/../../../../app/helpers/modal_helper.rb'
 
 module Twitter
   module Bootstrap
@@ -15,6 +18,8 @@ module Twitter
         initializer 'twitter-bootstrap-rails.setup_helpers' do |app|
           app.config.to_prepare do
             ActionController::Base.send :include, BreadCrumbs
+            ActionController::Base.send :helper, FlashBlockHelper
+            ActionController::Base.send :helper, ModalHelper
             #ActionController::Base.send :helper_method, :render_breadcrumbs
           end
         end

data/lib/twitter/bootstrap/rails/version.rb

@@ -1,7 +1,7 @@
 module Twitter
   module Bootstrap
     module Rails
-      VERSION = "2.0.7"
+      VERSION = "2.0.8"
     end
   end
 end

data/vendor/assets/javascripts/twitter/bootstrap_ujs.js

@@ -0,0 +1,11 @@
+(function($, undefined) {
+  $(function () {
+    $('div.bootstrap-modal').modal();
+    $('div.bootstrap-modal').modal('hide').addClass('fade');
+
+    $("a.bootstrap-modal-cancel-button").click(function(event) {
+      $(event.target).closest("div.modal").modal("hide");
+    });
+  });
+})( jQuery );
+

data/vendor/toolkit/twitter/bootstrap/badges.less

@@ -23,6 +23,10 @@
 .badge-error            { background-color: @errorText; }
 .badge-error:hover      { background-color: darken(@errorText, 10%); }
 
+// Colors
+.badge-important        { background-color: @errorText; }
+.badge-important:hover  { background-color: darken(@errorText, 10%); }
+
 .badge-warning          { background-color: @orange; }
 .badge-warning:hover    { background-color: darken(@orange, 10%); }
 
@@ -33,4 +37,4 @@
 .badge-info:hover       { background-color: darken(@infoText, 10%); }
 
 .badge-inverse          { background-color: @grayDark; }
-.badge-inverse:hover    { background-color: darken(@grayDark, 10%); }
+.badge-inverse:hover    { background-color: darken(@grayDark, 10%); }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: twitter-bootstrap-rails
 version: !ruby/object:Gem::Version
-  version: 2.0.7
+  version: 2.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-07 00:00:00.000000000 Z
+date: 2012-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &70182731757680 !ruby/object:Gem::Requirement
+  requirement: &70356824137920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70182731757680
+  version_requirements: *70356824137920
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &70182731755340 !ruby/object:Gem::Requirement
+  requirement: &70356824137300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70182731755340
+  version_requirements: *70356824137300
 - !ruby/object:Gem::Dependency
   name: therubyracer
-  requirement: &70182731770260 !ruby/object:Gem::Requirement
+  requirement: &70356824136700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.10.1
   type: :runtime
   prerelease: false
-  version_requirements: *70182731770260
+  version_requirements: *70356824136700
 - !ruby/object:Gem::Dependency
   name: less-rails
-  requirement: &70182731767820 !ruby/object:Gem::Requirement
+  requirement: &70356824136040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *70182731767820
+  version_requirements: *70356824136040
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70182731765800 !ruby/object:Gem::Requirement
+  requirement: &70356824135300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '3.1'
   type: :development
   prerelease: false
-  version_requirements: *70182731765800
+  version_requirements: *70356824135300
 description: twitter-bootstrap-rails project integrates Bootstrap CSS toolkit for
   Rails 3.1 Asset Pipeline
 email:
@@ -127,6 +127,7 @@ files:
 - vendor/assets/javascripts/twitter/bootstrap/bootstrap-transition.js
 - vendor/assets/javascripts/twitter/bootstrap/bootstrap-typeahead.js
 - vendor/assets/javascripts/twitter/bootstrap.js
+- vendor/assets/javascripts/twitter/bootstrap_ujs.js
 - vendor/toolkit/fontawesome.less
 - vendor/toolkit/twitter/bootstrap/accordion.less
 - vendor/toolkit/twitter/bootstrap/alerts.less
@@ -172,6 +173,7 @@ files:
 - vendor/toolkit/twitter/bootstrap/wells.less
 - vendor/toolkit/twitter/bootstrap_base.less
 - app/helpers/flash_block_helper.rb
+- app/helpers/modal_helper.rb
 - app/helpers/twitter_breadcrumbs_helper.rb
 - app/views/twitter-bootstrap/_breadcrumbs.html.erb
 - Rakefile