bootstrap-generators 2.0.1 → 2.0.4

data/lib/generators/bootstrap/install/templates/assets/stylesheets/fluid.css

@@ -1,5 +1,7 @@
 /*
  *= require bootstrap
+ *= require_self
+ *= require bootstrap-responsive
 */
 
 body {

data/lib/generators/bootstrap/install/templates/assets/stylesheets/fluid.css.less

@@ -1,10 +1,13 @@
-@import "bootstrap-variables";
+@import "bootstrap";
 
 body {
-  padding-top: $navbarHeight + 20px;
+  padding-top: @navbarHeight + 20px;
   padding-bottom: 40px;
 }
 
+@import "responsive";
+@import "bootstrap-variables";
+
 .sidebar-nav {
   padding: 9px 0;
 }
@@ -18,5 +21,3 @@ body {
     margin-right: 8px;
   }
 }
-
-@import "less/bootstrap";

data/lib/generators/bootstrap/install/templates/assets/stylesheets/fluid.css.scss

@@ -1,10 +1,13 @@
 @import "bootstrap-variables";
+@import "bootstrap";
 
 body {
   padding-top: $navbarHeight + 20px;
   padding-bottom: 40px;
 }
 
+@import "responsive";
+
 .sidebar-nav {
   padding: 9px 0;
 }
@@ -18,5 +21,3 @@ body {
     margin-right: 8px;
   }
 }
-
-@import "scss/bootstrap";

data/lib/generators/bootstrap/install/templates/assets/stylesheets/hero.css

@@ -1,5 +1,7 @@
 /*
  *= require bootstrap
+ *= require_self
+ *= require bootstrap-responsive
 */
 
 body {

data/lib/generators/bootstrap/install/templates/assets/stylesheets/hero.css.less

@@ -1,10 +1,13 @@
-@import "bootstrap-variables"
+@import "bootstrap";
 
 body {
-  padding-top: $navbarHeight + 20px;
+  padding-top: @navbarHeight + 20px;
   padding-bottom: 40px;
 }
 
+@import "responsive";
+@import "bootstrap-variables";
+
 .page-header {
   a.btn {
     float: right;
@@ -14,5 +17,3 @@ body {
     margin-right: 8px;
   }
 }
-
-@import "less/bootstrap";

data/lib/generators/bootstrap/install/templates/assets/stylesheets/hero.css.scss

@@ -1,10 +1,13 @@
 @import "bootstrap-variables";
+@import "bootstrap";
 
 body {
   padding-top: $navbarHeight + 20px;
   padding-bottom: 40px;
 }
 
+@import "responsive";
+
 .page-header {
   a.btn {
     float: right;
@@ -14,5 +17,3 @@ body {
     margin-right: 8px;
   }
 }
-
-@import "scss/bootstrap";

data/lib/generators/bootstrap/install/templates/config/initializers/simple_form.rb

@@ -46,6 +46,7 @@ SimpleForm.setup do |config|
   end
 
   config.wrappers :bootstrap, :tag => 'div', :class => 'control-group', :error_class => 'error' do |b|
+    b.use :html5
     b.use :placeholder
     b.use :label
     b.wrapper :tag => 'div', :class => 'controls' do |ba|
@@ -56,6 +57,7 @@ SimpleForm.setup do |config|
   end
 
   config.wrappers :prepend, :tag => 'div', :class => "control-group", :error_class => 'error' do |b|
+    b.use :html5
     b.use :placeholder
     b.use :label
     b.wrapper :tag => 'div', :class => 'controls' do |input|
@@ -68,6 +70,7 @@ SimpleForm.setup do |config|
   end
 
   config.wrappers :append, :tag => 'div', :class => "control-group", :error_class => 'error' do |b|
+    b.use :html5
     b.use :placeholder
     b.use :label
     b.wrapper :tag => 'div', :class => 'controls' do |input|

data/lib/generators/bootstrap/install/templates/form_builders/form_builder/_form.html.erb

@@ -1,4 +1,4 @@
-<%%= form_for(@<%= singular_table_name %>) do |f| %>
+<%%= form_for(@<%= singular_table_name %>, :html => { :class => "form-horizontal" }) do |f| %>
   <%% if @<%= singular_table_name %>.errors.any? %>
     <div class="alert alert-error">
       <a class="close" data-dismiss="alert" href="#">×</a>
@@ -16,11 +16,11 @@
   <div class="control-group">
     <%%= f.label :<%= attribute.name %>, :class => "control-label" %>
     <div class="controls">
-      <%%= f.<%= attribute.field_type %> :<%= attribute.name %>, :class => "input-xxlarge" %>
+      <%%= f.<%= attribute.field_type %> :<%= attribute.name %>, :class => "input-xlarge" %>
     </div>
   </div>
 <% end -%>
   <div class="form-actions">
-    <%%= f.submit, :class => "btn btn-primary" %>
+    <%%= f.submit :class => "btn btn-primary" %>
   </div>
 <%% end %>

data/lib/generators/bootstrap/install/templates/form_builders/form_builder/_form.html.haml

@@ -1,4 +1,4 @@
-= form_for @<%= singular_table_name %> do |f|
+= form_for @<%= singular_table_name %>, :html => { :class => "form-horizontal" } do |f|
   -if @<%= singular_table_name %>.errors.any?
     .alert.alert-error
       %a.close{:href => "#", :"data-dismiss" => "alert"} ×
@@ -12,7 +12,7 @@
   .control-group
     = f.label :<%= attribute.name %>, :class => 'control-label'
     .controls
-      = f.<%= attribute.field_type %> :<%= attribute.name %>, :class => 'input-xxlarge'
+      = f.<%= attribute.field_type %> :<%= attribute.name %>, :class => 'input-xlarge'
 <% end -%>
   .actions
     = f.submit :class => 'btn btn-primary'

data/lib/generators/bootstrap/install/templates/form_builders/simple_form/_form.html.erb

@@ -1,4 +1,4 @@
-<%%= simple_form_for(@<%= singular_table_name %>, :defaults => { :input_html => { :class => 'input-xxlarge' } }) do |f| %>
+<%%= simple_form_for(@<%= singular_table_name %>, :defaults => { :input_html => { :class => 'input-xlarge' } }) do |f| %>
   <%%= f.error_notification %>
 
   <div class="form-inputs">

data/lib/generators/bootstrap/install/templates/form_builders/simple_form/_form.html.haml

@@ -1,4 +1,4 @@
-= simple_form_for(@<%= singular_table_name %>, :defaults => { :input_html => { :class => 'input-xxlarge' } }) do |f|
+= simple_form_for(@<%= singular_table_name %>, :defaults => { :input_html => { :class => 'input-xlarge' } }) do |f|
   = f.error_notification
 
   .form-inputs

data/test/fixtures/application.js

@@ -0,0 +1,3 @@
+//= require jquery
+//= require jquery_ujs
+//= require_tree .

data/test/lib/generators/bootstrap/install_generator_test.rb

@@ -7,6 +7,7 @@ class Bootstrap::Generators::InstallGeneratorTest < ::Rails::Generators::TestCas
 
   setup :prepare_destination
   setup :copy_routes
+  setup :copy_application_javascript
 
   test "should copy controller erb templates" do
     run_generator
@@ -40,10 +41,10 @@ class Bootstrap::Generators::InstallGeneratorTest < ::Rails::Generators::TestCas
     }
   end
 
-  test "should copy javascript files" do
+  test "should require javascript bootstrap file" do
     run_generator
 
-    assert_file "app/assets/javascripts/bootstrap-generators.js"
+    assert_file "app/assets/javascripts/application.js", /require bootstrap/ 
   end
 
   test "should copy css files" do
@@ -63,7 +64,7 @@ class Bootstrap::Generators::InstallGeneratorTest < ::Rails::Generators::TestCas
     run_generator %w(--stylesheet-engine less)
 
     assert_file "app/assets/stylesheets/bootstrap-generators.css.less"
-    assert_file "app/assets/stylesheets/bootstrap-variables.css.less"
+    assert_file "app/assets/stylesheets/bootstrap-variables.less"
   end
 
   test "should create erb layout" do

data/test/test_helper.rb

@@ -28,7 +28,14 @@ def copy_routes
   routes = File.expand_path(File.join(File.dirname(__FILE__), 'fixtures', 'routes.rb'))
   destination = File.join(Rails.root, "config")
   FileUtils.mkdir_p(destination)
-  FileUtils.cp File.expand_path(routes), destination
+  FileUtils.cp routes, destination
+end
+
+def copy_application_javascript
+  application_js = File.expand_path(File.join(File.dirname(__FILE__), 'fixtures', 'application.js'))
+  destination = File.join(Rails.root, "app", "assets", "javascripts")
+  FileUtils.mkdir_p(destination)
+  FileUtils.cp application_js, destination
 end
 
 require 'generators/bootstrap/install/install_generator'

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

@@ -1,5 +1,5 @@
 /* ==========================================================
- * bootstrap-alert.js v2.0.1
+ * bootstrap-alert.js v2.0.4
  * 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/bootstrap-button.js

@@ -1,5 +1,5 @@
 /* ============================================================
- * bootstrap-button.js v2.0.1
+ * bootstrap-button.js v2.0.4
  * 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);

data/vendor/assets/javascripts/bootstrap-carousel.js

@@ -1,5 +1,5 @@
 /* ==========================================================
- * bootstrap-carousel.js v2.0.1
+ * bootstrap-carousel.js v2.0.4
  * http://twitter.github.com/bootstrap/javascript.html#carousel
  * ==========================================================
  * Copyright 2012 Twitter, Inc.
@@ -18,23 +18,30 @@
  * ========================================================== */
 
 
-!function( $ ){
+!function ($) {
+
+  "use strict"; // jshint ;_;
 
-  "use strict"
 
  /* CAROUSEL CLASS DEFINITION
   * ========================= */
 
   var Carousel = function (element, options) {
     this.$element = $(element)
-    this.options = $.extend({}, $.fn.carousel.defaults, options)
+    this.options = options
     this.options.slide && this.slide(this.options.slide)
+    this.options.pause == 'hover' && this.$element
+      .on('mouseenter', $.proxy(this.pause, this))
+      .on('mouseleave', $.proxy(this.cycle, this))
   }
 
   Carousel.prototype = {
 
-    cycle: function () {
-      this.interval = setInterval($.proxy(this.next, this), this.options.interval)
+    cycle: function (e) {
+      if (!e) this.paused = false
+      this.options.interval
+        && !this.paused
+        && (this.interval = setInterval($.proxy(this.next, this), this.options.interval))
       return this
     }
 
@@ -59,7 +66,8 @@
       return this.slide(pos > activePos ? 'next' : 'prev', $(children[pos]))
     }
 
-  , pause: function () {
+  , pause: function (e) {
+      if (!e) this.paused = true
       clearInterval(this.interval)
       this.interval = null
       return this
@@ -82,8 +90,7 @@
         , direction = type == 'next' ? 'left' : 'right'
         , fallback  = type == 'next' ? 'first' : 'last'
         , that = this
-
-      if (!$next.length) return
+        , e = $.Event('slide')
 
       this.sliding = true
 
@@ -91,24 +98,28 @@
 
       $next = $next.length ? $next : this.$element.find('.item')[fallback]()
 
-      if (!$.support.transition && this.$element.hasClass('slide')) {
-        this.$element.trigger('slide')
-        $active.removeClass('active')
-        $next.addClass('active')
-        this.sliding = false
-        this.$element.trigger('slid')
-      } else {
+      if ($next.hasClass('active')) return
+
+      if ($.support.transition && this.$element.hasClass('slide')) {
+        this.$element.trigger(e)
+        if (e.isDefaultPrevented()) return
         $next.addClass(type)
         $next[0].offsetWidth // force reflow
         $active.addClass(direction)
         $next.addClass(direction)
-        this.$element.trigger('slide')
         this.$element.one($.support.transition.end, function () {
           $next.removeClass([type, direction].join(' ')).addClass('active')
           $active.removeClass(['active', direction].join(' '))
           that.sliding = false
           setTimeout(function () { that.$element.trigger('slid') }, 0)
         })
+      } else {
+        this.$element.trigger(e)
+        if (e.isDefaultPrevented()) return
+        $active.removeClass('active')
+        $next.addClass('active')
+        this.sliding = false
+        this.$element.trigger('slid')
       }
 
       isCycling && this.cycle()
@@ -122,20 +133,21 @@
  /* CAROUSEL PLUGIN DEFINITION
   * ========================== */
 
-  $.fn.carousel = function ( option ) {
+  $.fn.carousel = function (option) {
     return this.each(function () {
       var $this = $(this)
         , data = $this.data('carousel')
-        , options = typeof option == 'object' && option
+        , options = $.extend({}, $.fn.carousel.defaults, typeof option == 'object' && option)
       if (!data) $this.data('carousel', (data = new Carousel(this, options)))
       if (typeof option == 'number') data.to(option)
       else if (typeof option == 'string' || (option = options.slide)) data[option]()
-      else data.cycle()
+      else if (options.interval) data.cycle()
     })
   }
 
   $.fn.carousel.defaults = {
     interval: 5000
+  , pause: 'hover'
   }
 
   $.fn.carousel.Constructor = Carousel
@@ -154,4 +166,4 @@
     })
   })
 
-}( window.jQuery );
+}(window.jQuery);