RubyGems - twitter-bootstrap-rails - Versions diffs - 2.0.3 → 2.0.4 - Mend

twitter-bootstrap-rails 2.0.3 → 2.0.4

Potentially problematic release.

This version of twitter-bootstrap-rails might be problematic. Click here for more details.

Files changed (58) hide show

data/README.md CHANGED Viewed

@@ -6,6 +6,19 @@ twitter-bootstrap-rails project integrates Bootstrap CSS toolkit for Rails 3.1 A
 [![Build Status](https://secure.travis-ci.org/seyhunak/twitter-bootstrap-rails.png)](http://travis-ci.org/seyhunak/twitter-bootstrap-rails)
 [![Dependency Status](https://gemnasium.com/seyhunak/twitter-bootstrap-rails.png)](https://gemnasium.com/seyhunak/twitter-bootstrap-rails)
+## Screencasts
+#### Installing twitter-bootstrap-rails, generators, usage and more
+Screencasts provided by Railscasts (Ryan Bates)
+[Twitter Bootstrap Basics](http://railscasts.com/episodes/328-twitter-bootstrap-basics "Twitter Bootstrap Basics")
+in this episode you will learn how to include Twitter Bootstrap into Rails application with the twitter-bootstrap-rails gem.
+[More on Twitter Bootstrap](http://railscasts.com/episodes/329-more-on-twitter-bootstrap "More on Twitter Bootstrap")
+in this episode continues on the Twitter Bootstrap project showing how to display flash messages, add form validations with SimpleForm, customize layout with variables, and switch to using Sass.
+(Note: This episode is pro episode)
 ## Installing Gem
 Include Bootstrap in Gemfile;
@@ -147,6 +160,7 @@ twitter-bootstrap-rails has seperate branch (w/o Less) that just serves latest s
   <li>Fixes and release 2.0.0</li>
   <li>Updated to v2.0.1, versioned v2.0.1.0</li>
   <li>Released gem v.2.0.3</li>
+  <li>Released gem v.2.0.4</li>
 </ul>
@@ -163,6 +177,7 @@ twitter-bootstrap-rails has seperate branch (w/o Less) that just serves latest s
   <li>Masakuni Kato</li>
   <li>Gudleik Rasch</li>
   <li>Thomas Volkmar Worm</li>
+  <li>Thiago Almeida</li>
 </ul>
@@ -172,16 +187,21 @@ twitter-bootstrap-rails has seperate branch (w/o Less) that just serves latest s
   <li>Markup Helpers (alert, tabs, pagination, breadcrumbs etc.)</li>
 </ul>
 ## Credits
 Seyhun Akyürek - seyhunak [at] gmail com
-[Visit My Blog](http://www.seyhunakyurek.com/ "Visit My Blog")
 [Add Me On Twitter](http://twitter.com/seyhunak "Add Me On Twitter")
 [Add Me On Linkedin](http://tr.linkedin.com/in/seyhunak "Add Me On Linkedin")
 [Add Me On Facebook](https://www.facebook.com/seyhunak "Add Me On Facebook")
 [Add Me On Google+](http://plus.ly/seyhunak "Add Me On Google+")
+[Visit My Blog](http://www.seyhunakyurek.com/ "Visit My Blog")
 ## Thanks
 Twitter Bootstrap and all twitter-bootstrap-rails contributors
 http://twitter.github.com/bootstrap

data/lib/generators/bootstrap/install/templates/bootstrap_and_overrides.less CHANGED Viewed

@@ -1,4 +1,6 @@
 @import "twitter/bootstrap/bootstrap";
+body { padding-top: 60px; }
 @import "twitter/bootstrap/responsive";
 // Set the correct sprite paths

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

@@ -2,6 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title><%= app_name %></title>
     <%%= csrf_meta_tags %>
@@ -11,11 +12,6 @@
     <![endif]-->
     <!-- Le styles -->
-    <style>
-      body {
-        padding-top: 60px; /* 60px to make the container go all the way to the bottom of the topbar */
-      }
-    </style>
     <%%= stylesheet_link_tag "application", :media => "all" %>
     <!-- Le fav and touch icons -->
@@ -70,10 +66,9 @@
       <%- else -%>
       <div class="content">
         <div class="row">
-          <div class="span9">
-            <%%= yield %>
-          </div>
-          <div class="span1">&nbsp;</div>
+           <div class="span9">
+              <%%= yield %>
+            </div>
             <div class="span3">
               <div class="well sidebar-nav">
                 <h3>Sidebar</h3>
@@ -83,9 +78,8 @@
                     <li><%%= link_to "Link<%= i %>", "/path<%= i %>"  %></li>
                   <%- end -%>
                 </ul>
-              </div>
-            </div>
-          </div>
+              </div><!--/.well -->
+            </div><!--/span-->
         </div><!--/row-->
       </div><!--/content-->
       <%- end -%>

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

@@ -8,10 +8,6 @@
     /[if lt IE 9]
       = javascript_include_tag "http://html5shim.googlecode.com/svn/trunk/html5.js"
     / Le styles
-    :css
-      body {
-        padding-top: 60px; /* 60px to make the container go all the way to the bottom of the topbar */
-      }
     = stylesheet_link_tag "application", :media => "all"
     / Le fav and touch icons
     %link{:href => "images/favicon.ico", :rel => "shortcut icon"}/
@@ -57,7 +53,6 @@
         .row
           .span9
             = yield
-          .span1 &nbsp;
           .span3
             .well.sidebar-nav
               %h3 Sidebar

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

@@ -9,11 +9,7 @@ html lang="en"
     /[if lt IE 9]
       = javascript_include_tag "http://html5shim.googlecode.com/svn/trunk/html5.js"
     /! Le styles
-    css:
-      body {
-        padding-top: 60px; /* 60px to make the container go all the way to the bottom of the topbar */
-      }
-    = stylesheet_link_tag "application", :media => "all"
+      = stylesheet_link_tag "application", :media => "all"
     / Le fav and touch icons
     link href="images/favicon.ico" rel="shortcut icon"
     link href="images/apple-touch-icon.png" rel="apple-touch-icon"
@@ -58,7 +54,6 @@ html lang="en"
         .row
           .span9
             = yield
-          .span1 &nbsp;
           .span3
             .well.sidebar-nav
               h3 Sidebar

data/lib/generators/bootstrap/themed/templates/_form.html.erb CHANGED Viewed

@@ -1,4 +1,4 @@
-<%%= form_for @<%= model_name.underscore  %>, :html => { :class => 'form-horizontal' } do |f| %>
+<%%= form_for @<%= resource_name %>, :html => { :class => 'form-horizontal' } do |f| %>
   <fieldset>
     <legend><%%= controller.action_name.capitalize %> <%= model_name.titleize %></legend>

data/lib/generators/bootstrap/themed/templates/_form.html.haml CHANGED Viewed

@@ -1,11 +1,13 @@
-<%- columns.each do |column| -%>
-.clearfix
-  = f.label :<%= column.name %>, t("activerecord.attributes.<%= model_name.underscore %>.<%= column.name %>", :default => "<%= column.name.humanize %>"), :class => :label
-  .input
-    = f.<%= column.field_type %> :<%= column.name %>, :class => '<%= column.field_type %>'
-<%- end -%>
-.form-actions
-  %button{:class => "btn primary", :type => "submit"} Save
-  or
-  = link_to "Cancel", <%= controller_routing_path %>_path
+%fieldset
+  %legend
+    = controller.action_name.capitalize
+    <%= model_name.titleize %>
+  <%- columns.each do |column| -%>
+  .control-group
+    = f.label :<%= column.name %>, :class => 'control-label'
+    .controls
+      = f.<%= column.field_type %> :<%= column.name %>, :class => '<%= column.field_type %>'
+  <%- end -%>
+  .form-actions
+    = f.submit nil, :class => 'btn btn-primary'
+    = link_to "Cancel", <%= controller_routing_path %>_path, :class => 'btn'

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

@@ -1,3 +1,2 @@
-= form_for @<%= model_name.underscore  %>, :url => <%= singular_controller_routing_path %>_path(@<%= resource_name %>), :html => { :class => "edit_<%= model_name.underscore  %>", :id => "edit_<%= model_name.underscore %>" } do |f|
-  %input{:name => "_method", :type => "hidden", :value =>"put"}
+= form_for @<%= resource_name %>, :html => { :class => "edit_<%= resource_name %> form-horizontal", :id => "edit_<%= resource_name %>" } do |f|
   = render :partial => "form", :locals => {:f => f}

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

@@ -1,3 +1,3 @@
-= form_for @<%= model_name.underscore  %>, :url => <%= singular_controller_routing_path %>_path(@<%= resource_name %>), :html => { :class => "edit_<%= model_name.underscore  %>", :id => "edit_<%= model_name.underscore %>" } do |f|
+= form_for @<%= resource_name %>, :url => <%= singular_controller_routing_path %>_path(@<%= resource_name %>), :html => { :class => "edit_<%= resource_name %>", :id => "edit_<%= resource_name %>" } do |f|
   input name="_method" type="hidden" value="put"
   = render :partial => "form", :locals => {:f => f}

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

@@ -18,8 +18,8 @@
         <%- end -%>
         %td= <%= resource_name %>.created_at
         %td
-          = link_to "Show", <%= singular_controller_routing_path %>_path(<%= resource_name %>)
-          = link_to "Edit", edit_<%= singular_controller_routing_path %>_path(<%= resource_name %>)
-          = link_to "Destroy", <%= singular_controller_routing_path %>_path(<%= resource_name %>), :method => :delete, :confirm => "#{t("web-app-theme.confirm", :default => "Are you sure?")}"
+          = link_to "Show", <%= singular_controller_routing_path %>_path(<%= resource_name %>), :class => 'btn btn-mini'
+          = link_to "Edit", edit_<%= singular_controller_routing_path %>_path(<%= resource_name %>), :class => 'btn btn-mini'
+          = link_to "Destroy", <%= singular_controller_routing_path %>_path(<%= resource_name %>), :method => :delete, :confirm => "#{t("web-app-theme.confirm", :default => "Are you sure?")}", :class => 'btn btn-mini btn-danger'
 = link_to "New", new_<%= singular_controller_routing_path %>_path, :class => 'btn btn-primary'

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

@@ -1,2 +1,2 @@
-= form_for @<%= model_name.underscore  %>, :url => <%= controller_routing_path %>_path, :html => { :class => :form } do |f|
+= form_for @<%= resource_name %>, :html => { :class => 'form-horizontal' } do |f|
   = render :partial => "form", :locals => {:f => f}

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

@@ -1,2 +1,2 @@
-= form_for @<%= model_name.underscore  %>, :url => <%= controller_routing_path %>_path, :html => { :class => :form } do |f|
+= form_for @<%= resource_name %>, :url => <%= controller_routing_path %>_path, :html => { :class => :form } do |f|
   = render :partial => "form", :locals => {:f => f}

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

@@ -6,4 +6,4 @@
 .form-actions
   = link_to "Back", <%= controller_routing_path %>_path, :class => 'btn'
   = link_to "Edit", edit_<%= singular_controller_routing_path %>_path(@<%= resource_name %>), :class => 'btn'
-  = link_to "Delete", <%= singular_controller_routing_path %>_path(@<%= resource_name %>), :method => "delete", :confirm => "#{t("web-app-theme.confirm", :default => "Are you sure?")}", :class => 'btn'
+  = link_to "Delete", <%= singular_controller_routing_path %>_path(@<%= resource_name %>), :method => "delete", :confirm => "#{t("web-app-theme.confirm", :default => "Are you sure?")}", :class => 'btn btn-danger'

data/lib/generators/bootstrap/themed/themed_generator.rb CHANGED Viewed

@@ -24,7 +24,7 @@ module Bootstrap
       def initialize_views_variables
         @base_name, @controller_class_path, @controller_file_path, @controller_class_nesting, @controller_class_nesting_depth = extract_modules(controller_path)
         @controller_routing_path = @controller_file_path.gsub(/\//, '_')
-        @model_name = @base_name.singularize unless @model_name
+        @model_name = @controller_class_nesting + "::#{@base_name.singularize}" unless @model_name
         @model_name = @model_name.camelize
       end
@@ -45,7 +45,7 @@ module Bootstrap
       end
       def resource_name
-        @model_name.underscore
+        @model_name.demodulize.underscore
       end
       def plural_resource_name
@@ -55,9 +55,9 @@ module Bootstrap
       def columns
         begin
           excluded_column_names = %w[id created_at updated_at]
-          Kernel.const_get(@model_name).columns.reject{|c| excluded_column_names.include?(c.name) }.collect{|c| ::Rails::Generators::GeneratedAttribute.new(c.name, c.type)}
+          @model_name.constantize.columns.reject{|c| excluded_column_names.include?(c.name) }.collect{|c| ::Rails::Generators::GeneratedAttribute.new(c.name, c.type)}
         rescue NoMethodError
-          Kernel.const_get(@model_name).fields.collect{|c| c[1]}.reject{|c| excluded_column_names.include?(c.name) }.collect{|c| ::Rails::Generators::GeneratedAttribute.new(c.name, c.type.to_s)}
+          @model_name.constantize.fields.collect{|c| c[1]}.reject{|c| excluded_column_names.include?(c.name) }.collect{|c| ::Rails::Generators::GeneratedAttribute.new(c.name, c.type.to_s)}
         end
       end

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

@@ -1,16 +1,22 @@
 require 'rails'
+require File.dirname(__FILE__) + '/twitter-bootstrap-breadcrumbs.rb'
 module Twitter
   module Bootstrap
     module Rails
       class Engine < ::Rails::Engine
         initializer 'twitter-bootstrap-rails.setup',
           :after => 'less-rails.after.load_config_initializers',
           :group => :all do |app|
-            app.config.less.paths << File.join(config.root, 'vendor', 'toolkit')
-        end
+          app.config.less.paths << File.join(config.root, 'vendor', 'toolkit')
+          end
+        initializer 'twitter-bootstrap-rails.setup_helpers' do |app|
+          app.config.to_prepare do
+            ActionController::Base.send(:include, BreadCrumbs)
+          end
+        end
       end
     end
   end

data/lib/twitter/bootstrap/rails/twitter-bootstrap-breadcrumbs.rb ADDED Viewed

@@ -0,0 +1,25 @@
+module Twitter
+  module Bootstrap
+    module BreadCrumbs
+      def self.included(base)
+        base.extend(ClassMethods)
+      end
+      module ClassMethods
+        def add_breadcrumb name, url, options={}
+          before_filter options do |controller|
+            controller.send :add_breadcrumb, name, url
+          end
+        end
+      end
+      protected
+      def add_breadcrumb name, url = ''
+        @breadcrumbs ||= []
+        url = eval(url) if url =~ /_path|_url|@/
+          @breadcrumbs << {name => name, url => url}
+      end
+    end
+  end
+end

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

@@ -1,7 +1,7 @@
 module Twitter
   module Bootstrap
     module Rails
-      VERSION = "2.0.3"
+      VERSION = "2.0.4"
     end
   end
 end

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

@@ -1,5 +1,5 @@
 /* ==========================================================
- * bootstrap-alert.js v2.0.1
+ * bootstrap-alert.js v2.0.2
  * http://twitter.github.com/bootstrap/javascript.html#alerts
  * ==========================================================
  * Copyright 2012 Twitter, Inc.

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

@@ -1,5 +1,5 @@
 /* ============================================================
- * bootstrap-button.js v2.0.1
+ * bootstrap-button.js v2.0.2
  * http://twitter.github.com/bootstrap/javascript.html#buttons
  * ============================================================
  * Copyright 2012 Twitter, Inc.
@@ -91,7 +91,9 @@
   $(function () {
     $('body').on('click.button.data-api', '[data-toggle^=button]', function ( e ) {
-      $(e.currentTarget).button('toggle')
+      var $btn = $(e.target)
+      if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn')
+      $btn.button('toggle')
     })
   })

data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-carousel.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /* ==========================================================
- * bootstrap-carousel.js v2.0.1
+ * bootstrap-carousel.js v2.0.2
  * http://twitter.github.com/bootstrap/javascript.html#carousel
  * ==========================================================
  * Copyright 2012 Twitter, Inc.
@@ -29,6 +29,9 @@
     this.$element = $(element)
     this.options = $.extend({}, $.fn.carousel.defaults, 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 = {
@@ -83,14 +86,14 @@
         , fallback  = type == 'next' ? 'first' : 'last'
         , that = this
-      if (!$next.length) return
       this.sliding = true
       isCycling && this.pause()
       $next = $next.length ? $next : this.$element.find('.item')[fallback]()
+      if ($next.hasClass('active')) return
       if (!$.support.transition && this.$element.hasClass('slide')) {
         this.$element.trigger('slide')
         $active.removeClass('active')
@@ -136,6 +139,7 @@
   $.fn.carousel.defaults = {
     interval: 5000
+  , pause: 'hover'
   }
   $.fn.carousel.Constructor = Carousel

data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-collapse.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /* =============================================================
- * bootstrap-collapse.js v2.0.1
+ * bootstrap-collapse.js v2.0.2
  * http://twitter.github.com/bootstrap/javascript.html#collapse
  * =============================================================
  * Copyright 2012 Twitter, Inc.
@@ -74,7 +74,9 @@
         [dimension](size || 'auto')
         [0].offsetWidth
-      this.$element.addClass('collapse')
+      this.$element[size ? 'addClass' : 'removeClass']('collapse')
+      return this
     }
   , transition: function ( method, startEvent, completeEvent ) {

data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-dropdown.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /* ============================================================
- * bootstrap-dropdown.js v2.0.1
+ * bootstrap-dropdown.js v2.0.2
  * http://twitter.github.com/bootstrap/javascript.html#dropdowns
  * ============================================================
  * Copyright 2012 Twitter, Inc.

data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-modal.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /* =========================================================
- * bootstrap-modal.js v2.0.1
+ * bootstrap-modal.js v2.0.2
  * http://twitter.github.com/bootstrap/javascript.html#modals
  * =========================================================
  * Copyright 2012 Twitter, Inc.

data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-popover.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /* ===========================================================
- * bootstrap-popover.js v2.0.1
+ * bootstrap-popover.js v2.0.2
  * http://twitter.github.com/bootstrap/javascript.html#popovers
  * ===========================================================
  * Copyright 2012 Twitter, Inc.

data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-scrollspy.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /* =============================================================
- * bootstrap-scrollspy.js v2.0.1
+ * bootstrap-scrollspy.js v2.0.2
  * http://twitter.github.com/bootstrap/javascript.html#scrollspy
  * =============================================================
  * Copyright 2012 Twitter, Inc.

data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-tab.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /* ========================================================
- * bootstrap-tab.js v2.0.1
+ * bootstrap-tab.js v2.0.2
  * http://twitter.github.com/bootstrap/javascript.html#tabs
  * ========================================================
  * Copyright 2012 Twitter, Inc.