twitter-bootstrap-rails 2.0.6 → 2.0.7

data/README.md

@@ -23,11 +23,15 @@ in this episode continues on the Twitter Bootstrap project showing how to displa
 
 Include Bootstrap in Gemfile;
 
-    gem "twitter-bootstrap-rails"
+```ruby
+gem "twitter-bootstrap-rails"
+```
 
 or you can install from latest build;
 
-    gem 'twitter-bootstrap-rails', :git => 'git://github.com/seyhunak/twitter-bootstrap-rails.git'
+```ruby
+gem 'twitter-bootstrap-rails', :git => 'git://github.com/seyhunak/twitter-bootstrap-rails.git'
+```
 
 You can run bundle from command line
 
@@ -75,7 +79,7 @@ Usage:
 Example:
 
 
-    rails g scaffold post title:string description:text
+    rails g scaffold Post title:string description:text
     rake db:migrate
     rails g bootstrap:themed Posts
 
@@ -89,30 +93,33 @@ Bootstrap was built with Preboot, an open-source pack of mixins and variables to
 
 You have to require Bootstrap LESS (bootstrap_and_overrides.css.less) in your application.css
 
-    /*
-     *= require bootstrap_and_overrides
-     */
-
-    /* Your stylesheets goes here... */
+```css
+/*
+ *= require bootstrap_and_overrides
+ */
 
+/* Your stylesheets goes here... */
+```
 
 If you'd like to alter Bootstrap's own variables, or define your LESS
 styles inheriting Bootstrap's mixins, you can do so inside bootstrap_and_overrides.css.less:
 
-    @linkColor: #ff0000;
-
+```css
+@linkColor: #ff0000;
+```
 
 
 ## Using Javascripts
 
 You have to require Bootstrap JS (bootstrap.js) in your application.js
 
-    //= require twitter/bootstrap
-
-    $(document).ready(function(){
-      /* Your javascripts goes here... */
-    });
+```js
+//= require twitter/bootstrap
 
+$(document).ready(function(){
+  /* Your javascripts goes here... */
+});
+```
 
 ## Using Coffeescript (optionally)
 
@@ -120,19 +127,23 @@ Using Twitter Bootstrap with the CoffeeScript is easy.
 twitter-bootstrap-rails generates a "bootstrap.js.coffee" file for you
 to /app/assets/javascripts/ folder.
 
-    jQuery ->
-      $("a[rel=popover]").popover()
-      $(".tooltip").tooltip()
-      $("a[rel=tooltip]").tooltip()
-
+```coffee
+jQuery ->
+  $("a[rel=popover]").popover()
+  $(".tooltip").tooltip()
+  $("a[rel=tooltip]").tooltip()
+```
 
 ## Using Static CSS, JS (w/o Less)
 
 twitter-bootstrap-rails has seperate branch (w/o Less) that just serves latest static CSS, JS files.
 
-    You can install from latest build (from branch);
+You can install from latest build (from branch);
 
-    gem 'twitter-bootstrap-rails', :git => "git://github.com/seyhunak/twitter-bootstrap-rails.git", :branch => "static"
+```ruby
+gem 'twitter-bootstrap-rails', :git => 'git://github.com/seyhunak/twitter-bootstrap-rails.git',
+                               :branch => 'static'
+```
 
 
 ## Changelog
@@ -184,6 +195,7 @@ twitter-bootstrap-rails has seperate branch (w/o Less) that just serves latest s
   <li>Thiago Almeida</li>
   <li>Sébastien Grosjean</li>
   <li>Nick DeSteffen</li>
+  <li>Christian Joudrey</li>
 </ul>
 
 
@@ -207,6 +219,12 @@ Seyhun Akyürek - seyhunak [at] gmail com
 
 [Visit My Blog](http://www.seyhunakyurek.com/ "Visit My Blog")
 
+## Score me
+<img src="https://addons.opera.com/media/extensions/55/14355/1.0.1-rev1/icons/icon_64x64.png"></img>
+
+Please +K my influence in Ruby on Rails on @klout
+
+http://klout.com/#/seyhunak
 
 ## Thanks
 Twitter Bootstrap and all twitter-bootstrap-rails contributors

data/app/helpers/flash_block_helper.rb

@@ -0,0 +1,17 @@
+module FlashBlockHelper
+  def flash_block
+    output = ''
+    flash.each do |type, message|
+      output += flash_container(type, message)
+    end
+
+    raw(output)
+  end
+
+  def flash_container(type, message)
+    raw(content_tag(:div, :class => "alert alert-#{type}") do
+      content_tag(:a, raw("×"),:class => 'close', :data => {:dismiss => 'alert'}) +
+      message
+    end)
+  end
+end

data/app/helpers/twitter_breadcrumbs_helper.rb

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

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

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

data/lib/generators/bootstrap/layout/templates/layout.html.erb

@@ -22,11 +22,7 @@
 
     <div class="navbar navbar-fixed-top">
       <div class="navbar-inner">
-        <%- if layout_type == "fluid" -%>
-          <div class="container-fluid">
-        <%- else -%>
-          <div class="container">
-        <%- end -%>
+        <div class="<%= container_class %>">
           <a class="btn btn-navbar" data-target=".nav-collapse" data-toggle="collapse">
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>

data/lib/generators/bootstrap/layout/templates/layout.html.haml

@@ -17,11 +17,7 @@
   %body
     .navbar.navbar-fixed-top
       .navbar-inner
-        <%- if layout_type == "fluid" -%>
-        .container-fluid
-        <%- else -%>
-        .container
-        <%- end -%>
+        .<%= container_class %>
           %a.btn.btn-navbar(data-target=".nav-collapse" data-toggle="collapse")
             %span.icon-bar
             %span.icon-bar

data/lib/generators/bootstrap/layout/templates/layout.html.slim

@@ -18,11 +18,7 @@ html lang="en"
   body
     .navbar.navbar-fixed-top
       .navbar-inner
-        <%- if layout_type == "fluid" -%>
-        .container-fluid
-        <%- else -%>
-        .container
-        <%- end -%>
+        .<%= container_class %>
           a.btn.btn-navbar data-target=".nav-collapse" data-toggle="collapse"
             span.icon-bar
             span.icon-bar

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

@@ -1,12 +1,12 @@
 <%%- model_class = @<%= resource_name %>.class -%>
 <h1><%%=t '.title', :default => model_class.model_name.human %></h1>
 
+<dl class="dl-horizontal">
 <%- columns.each do |column| -%>
-<p>
-  <strong><%%= model_class.human_attribute_name(:<%= column.name %>) %>:</strong><br>
-  <%%= @<%= resource_name %>.<%= column.name %> %>
-</p>
+  <dt><strong><%%= model_class.human_attribute_name(:<%= column.name %>) %>:</strong></dt>
+  <dd><%%= @<%= resource_name %>.<%= column.name %> %></dd>
 <%- end -%>
+</dl>
 
 <div class="form-actions">
   <%%= link_to t('.back', :default => t("helpers.links.back")),

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

@@ -15,7 +15,7 @@ module Twitter
         initializer 'twitter-bootstrap-rails.setup_helpers' do |app|
           app.config.to_prepare do
             ActionController::Base.send :include, BreadCrumbs
-            ActionController::Base.send :helper_method, :render_breadcrumbs
+            #ActionController::Base.send :helper_method, :render_breadcrumbs
           end
         end
       end

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

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

data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-alert.js

@@ -1,5 +1,5 @@
 /* ==========================================================
- * bootstrap-alert.js v2.0.2
+ * bootstrap-alert.js v2.0.3
  * http://twitter.github.com/bootstrap/javascript.html#alerts
  * ==========================================================
  * Copyright 2012 Twitter, Inc.
@@ -18,61 +18,57 @@
  * ========================================================== */
 
 
-!function( $ ){
+!function ($) {
+
+  "use strict"; // jshint ;_;
 
-  "use strict"
 
  /* ALERT CLASS DEFINITION
   * ====================== */
 
   var dismiss = '[data-dismiss="alert"]'
-    , Alert = function ( el ) {
+    , Alert = function (el) {
         $(el).on('click', dismiss, this.close)
       }
 
-  Alert.prototype = {
-
-    constructor: Alert
+  Alert.prototype.close = function (e) {
+    var $this = $(this)
+      , selector = $this.attr('data-target')
+      , $parent
 
-  , close: function ( e ) {
-      var $this = $(this)
-        , selector = $this.attr('data-target')
-        , $parent
+    if (!selector) {
+      selector = $this.attr('href')
+      selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
+    }
 
-      if (!selector) {
-        selector = $this.attr('href')
-        selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
-      }
+    $parent = $(selector)
 
-      $parent = $(selector)
-      $parent.trigger('close')
+    e && e.preventDefault()
 
-      e && e.preventDefault()
+    $parent.length || ($parent = $this.hasClass('alert') ? $this : $this.parent())
 
-      $parent.length || ($parent = $this.hasClass('alert') ? $this : $this.parent())
+    $parent.trigger(e = $.Event('close'))
 
-      $parent
-        .trigger('close')
-        .removeClass('in')
+    if (e.isDefaultPrevented()) return
 
-      function removeElement() {
-        $parent
-          .trigger('closed')
-          .remove()
-      }
+    $parent.removeClass('in')
 
-      $.support.transition && $parent.hasClass('fade') ?
-        $parent.on($.support.transition.end, removeElement) :
-        removeElement()
+    function removeElement() {
+      $parent
+        .trigger('closed')
+        .remove()
     }
 
+    $.support.transition && $parent.hasClass('fade') ?
+      $parent.on($.support.transition.end, removeElement) :
+      removeElement()
   }
 
 
  /* ALERT PLUGIN DEFINITION
   * ======================= */
 
-  $.fn.alert = function ( option ) {
+  $.fn.alert = function (option) {
     return this.each(function () {
       var $this = $(this)
         , data = $this.data('alert')
@@ -91,4 +87,4 @@
     $('body').on('click.alert.data-api', dismiss, Alert.prototype.close)
   })
 
-}( window.jQuery );
+}(window.jQuery);

data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-button.js

@@ -1,5 +1,5 @@
 /* ============================================================
- * bootstrap-button.js v2.0.2
+ * bootstrap-button.js v2.0.3
  * http://twitter.github.com/bootstrap/javascript.html#buttons
  * ============================================================
  * Copyright 2012 Twitter, Inc.
@@ -17,58 +17,54 @@
  * limitations under the License.
  * ============================================================ */
 
-!function( $ ){
 
-  "use strict"
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
 
  /* BUTTON PUBLIC CLASS DEFINITION
   * ============================== */
 
-  var Button = function ( element, options ) {
+  var Button = function (element, options) {
     this.$element = $(element)
     this.options = $.extend({}, $.fn.button.defaults, options)
   }
 
-  Button.prototype = {
-
-      constructor: Button
+  Button.prototype.setState = function (state) {
+    var d = 'disabled'
+      , $el = this.$element
+      , data = $el.data()
+      , val = $el.is('input') ? 'val' : 'html'
 
-    , setState: function ( state ) {
-        var d = 'disabled'
-          , $el = this.$element
-          , data = $el.data()
-          , val = $el.is('input') ? 'val' : 'html'
+    state = state + 'Text'
+    data.resetText || $el.data('resetText', $el[val]())
 
-        state = state + 'Text'
-        data.resetText || $el.data('resetText', $el[val]())
+    $el[val](data[state] || this.options[state])
 
-        $el[val](data[state] || this.options[state])
-
-        // push to event loop to allow forms to submit
-        setTimeout(function () {
-          state == 'loadingText' ?
-            $el.addClass(d).attr(d, d) :
-            $el.removeClass(d).removeAttr(d)
-        }, 0)
-      }
-
-    , toggle: function () {
-        var $parent = this.$element.parent('[data-toggle="buttons-radio"]')
+    // push to event loop to allow forms to submit
+    setTimeout(function () {
+      state == 'loadingText' ?
+        $el.addClass(d).attr(d, d) :
+        $el.removeClass(d).removeAttr(d)
+    }, 0)
+  }
 
-        $parent && $parent
-          .find('.active')
-          .removeClass('active')
+  Button.prototype.toggle = function () {
+    var $parent = this.$element.parent('[data-toggle="buttons-radio"]')
 
-        this.$element.toggleClass('active')
-      }
+    $parent && $parent
+      .find('.active')
+      .removeClass('active')
 
+    this.$element.toggleClass('active')
   }
 
 
  /* BUTTON PLUGIN DEFINITION
   * ======================== */
 
-  $.fn.button = function ( option ) {
+  $.fn.button = function (option) {
     return this.each(function () {
       var $this = $(this)
         , data = $this.data('button')
@@ -97,4 +93,4 @@
     })
   })
 
-}( window.jQuery );
+}(window.jQuery);