twitter-bootstrap-rails 2.0 → 2.0.1

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

@@ -0,0 +1,77 @@
+doctype html
+html lang="en"
+  head
+    meta charset="utf-8"
+    title= content_for?(:title) ? yield(:title) : "<%= app_name %>"
+    = csrf_meta_tags
+
+    /! Le HTML5 shim, for IE6-8 support of HTML elements
+    /[if lt IE 9]
+      = javascript_include_tag "http://html5shim.googlecode.com/svn/trunk/html5.js"
+    /! Le styles
+    = stylesheet_link_tag    "application"
+    css:
+      body {
+        padding-top: 60px; /* 60px to make the container go all the way to the bottom of the topbar */
+      }
+    / Le fav and touch icons
+    link href="images/favicon.ico" rel="shortcut icon"
+    link href="images/apple-touch-icon.png" rel="apple-touch-icon"
+    link href="images/apple-touch-icon-72x72.png" rel="apple-touch-icon" sizes="72x72"
+    link href="images/apple-touch-icon-114x114.png" rel="apple-touch-icon" sizes="114x114"
+
+
+  body
+    .navbar.navbar-fixed-top
+      .navbar-inner
+        <%- if layout_type == "fluid" -%>
+        .container-fluid
+        <%- else -%>
+        .container
+        <%- end -%>
+          a.btn.btn-navbar data-target=".nav-collapse" data-toggle="collapse"
+            span.i-bar
+            span.i-bar
+            span.i-bar
+          a.brand href="#"<%= app_name %>
+          .<%=container_class%>.nav-collapse
+            ul.nav
+              li= link_to "Link 1", "/path1"
+              li= link_to "Link 2", "/path2"
+              li= link_to "Link 3", "/path3"
+
+    .<%= container_class %>
+    <%- if layout_type == "fluid" -%>
+
+      .row-fluid
+        .span3
+          .well.sidebar-nav
+            ul.nav.nav-list
+              li.nav-header Sidebar
+              li= link_to "Link 1", "/path1"
+              li= link_to "Link 2", "/path2"
+              li= link_to "Link 3", "/path3"
+        .span9
+          = yield
+    <% else %>
+      .content
+        .row
+          .span9
+            = yield
+          .span1 &nbsp;
+          .span3
+            .well.sidebar-nav
+              h3 Sidebar
+              ul.nav.nav-list
+                li.nav-header Sidebar
+                li= link_to "Link 1", "/path1"
+                li= link_to "Link 2", "/path2"
+                li= link_to "Link 3", "/path3"
+    <% end %>
+      footer
+        p &copy; Company 2012
+    /!
+      Le javascript
+      \==================================================
+    /! Placed at the end of the document so the pages load faster
+    = javascript_include_tag "application"

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

@@ -6,7 +6,7 @@
   </div>
 </div>
 <%- end -%>
-<div class="actions">
+<div class="form-actions">
   <button class="btn primary" type="submit">Save</button> or
 	<%%= link_to "Cancel", <%= controller_routing_path %>_path %>
 </div>

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

@@ -0,0 +1,11 @@
+<%- 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

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

@@ -0,0 +1,11 @@
+<%- 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

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

@@ -0,0 +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|
+  %input{:name => "_method", :type => "hidden", :value =>"put"}
+  = render :partial => "form", :locals => {:f => f}

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

@@ -0,0 +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|
+  input name="_method" type="hidden" value="put"
+  = render :partial => "form", :locals => {:f => f}

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

@@ -1,5 +1,5 @@
 <h1><%= resource_name.titleize %>s</h1>
-<table class="zebra-striped">
+<table class="table table-striped">
  <thead>
   <tr>
     <th>ID</th>
@@ -31,4 +31,4 @@
    </tbody>
 </table>
 
-<%%= link_to "New", new_<%= singular_controller_routing_path %>_path, :class => 'btn primary' %>
+<%%= link_to "New", new_<%= singular_controller_routing_path %>_path, :class => 'btn btn-primary' %>

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

@@ -0,0 +1,25 @@
+%h1 <%= resource_name.titleize %>s
+%table{:class => "table table-striped"}
+  %thead
+    %tr
+      %th ID
+      <%- unless columns.empty? -%>
+      %th
+        = t("activerecord.attributes.<%= singular_controller_routing_path %>.<%= columns.first.name %>", :default => t("activerecord.labels.<%= columns.first.name %>", :default => "<%= columns.first.name.capitalize %>"))
+      <%- end -%>
+      %th Created at
+      %th Actions
+  %tbody
+    - @<%= plural_resource_name %>.each do |<%= resource_name %>|
+      %tr
+        %td= <%= resource_name %>.id
+        <%- unless columns.empty? -%>
+        %td= link_to <%= resource_name %>.<%= columns.first.name %>, <%= singular_controller_routing_path %>_path(<%= resource_name %>)
+        <%- 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 "New", new_<%= singular_controller_routing_path %>_path, :class => 'btn btn-primary'

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

@@ -0,0 +1,25 @@
+h1 <%= resource_name.titleize %>s
+table class="table table-striped"
+  thead
+    tr
+      th ID
+      <%- unless columns.empty? -%>
+      th
+        = t("activerecord.attributes.<%= singular_controller_routing_path %>.<%= columns.first.name %>", :default => t("activerecord.labels.<%= columns.first.name %>", :default => "<%= columns.first.name.capitalize %>"))
+      <%- end -%>
+      th Created at
+      th Actions
+  tbody
+    - @<%= plural_resource_name %>.each do |<%= resource_name %>|
+      tr
+        td= <%= resource_name %>.id
+        <%- unless columns.empty? -%>
+        td= link_to <%= resource_name %>.<%= columns.first.name %>, <%= singular_controller_routing_path %>_path(<%= resource_name %>)
+        <%- 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 "New", new_<%= singular_controller_routing_path %>_path, :class => 'btn btn-primary'

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

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

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

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

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

@@ -2,8 +2,9 @@
 <label class="label"><%%= t("activerecord.attributes.<%= singular_controller_routing_path %>.<%= column.name %>", :default => t("activerecord.labels.<%= column.name %>", :default => "<%= column.name.humanize %>")) %>:</label>
 <p><%%= @<%= resource_name %>.<%= column.name %> %></p>
 <%- end -%>
-<div class="actions">
-<%%= link_to "Back", <%= controller_routing_path %>_path, :class => 'btn primary'  %>
-<%%= link_to "Edit", edit_<%= singular_controller_routing_path %>_path(@<%= resource_name %>), :class => 'btn primary' %>
-<%%= link_to "Delete", <%= singular_controller_routing_path %>_path(@<%= resource_name %>), :method => "delete", :confirm => "#{t("web-app-theme.confirm", :default => "Are you sure?")}", :class => 'btn primary' %>
+
+<div class="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' %>
 </div>

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

@@ -0,0 +1,9 @@
+<%- columns.each do |column| -%>
+%label{:class => "label"}= t("activerecord.attributes.<%= singular_controller_routing_path %>.<%= column.name %>", :default => t("activerecord.labels.<%= column.name %>", :default => "<%= column.name.humanize %>")) + ":"
+%p= @<%= resource_name %>.<%= column.name %>
+<%- end -%>
+
+.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'

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

@@ -0,0 +1,9 @@
+<%- columns.each do |column| -%>
+label class="label"= t("activerecord.attributes.<%= singular_controller_routing_path %>.<%= column.name %>", :default => t("activerecord.labels.<%= column.name %>", :default => "<%= column.name.humanize %>")) + ":"
+p= @<%= resource_name %>.<%= column.name %>
+<%- end -%>
+
+.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'

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

@@ -3,7 +3,7 @@ require 'rails/generators/generated_attribute'
 
 module Bootstrap
   module Generators
-    class ThemedGenerator < Rails::Generators::Base
+    class ThemedGenerator < ::Rails::Generators::Base
       source_root File.expand_path('../templates', __FILE__)
       argument :controller_path,    :type => :string
       argument :model_name,         :type => :string, :required => false
@@ -15,12 +15,8 @@ module Bootstrap
         initialize_views_variables
       end
 
-  	  def copy_views
+      def copy_views
         generate_views
-        gsub_file(File.join('app/views/layouts', "#{layout}.html.erb"), /\<ul\s+class=\"nav\">.*\<\/ul\>/mi) do |match|
-          match.gsub!(/\<\/ul\>/, "")
-            %|#{match} <li class="<%= controller.controller_path == '#{@controller_file_path}' ? 'active' : '' %>"><a href="<%= #{controller_routing_path}_path %>">#{plural_model_name}</a></li></ul>|
-          end
       end
 
       protected
@@ -59,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)}
+          Kernel.const_get(@model_name).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)}
+          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)}
         end
       end
 
@@ -76,11 +72,11 @@ module Bootstrap
 
       def generate_views
         views = {
-          'index.html.erb'   => File.join('app/views', @controller_file_path, "index.html.erb"),
-          'new.html.erb'     => File.join('app/views', @controller_file_path, "new.html.erb"),
-          'edit.html.erb'    => File.join('app/views', @controller_file_path, "edit.html.erb"),
-          '_form.html.erb'   => File.join('app/views', @controller_file_path, "_form.html.erb"),
-          'show.html.erb'    => File.join('app/views', @controller_file_path, "show.html.erb")}
+          "index.html.#{ext}"   => File.join('app/views', @controller_file_path, "index.html.#{ext}"),
+          "new.html.#{ext}"     => File.join('app/views', @controller_file_path, "new.html.#{ext}"),
+          "edit.html.#{ext}"    => File.join('app/views', @controller_file_path, "edit.html.#{ext}"),
+          "_form.html.#{ext}"   => File.join('app/views', @controller_file_path, "_form.html.#{ext}"),
+          "show.html.#{ext}"    => File.join('app/views', @controller_file_path, "show.html.#{ext}")}
         selected_views = views
         options.engine == generate_erb(selected_views)
       end
@@ -91,6 +87,10 @@ module Bootstrap
         end
       end
 
+      def ext
+        ::Rails.application.config.generators.options[:rails][:template_engine] || :erb
+      end
+
     end
   end
 end

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

@@ -1,7 +1,7 @@
 module Twitter
   module Bootstrap
     module Rails
-      VERSION = "2.0"
+      VERSION = "2.0.1"
     end
   end
 end

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

@@ -36,9 +36,15 @@
 
   , close: function ( e ) {
       var $this = $(this)
-        , selector = $this.attr('data-target') || $this.attr('href')
-        , $parent = $(selector)
+        , selector = $this.attr('data-target')
+        , $parent
 
+      if (!selector) {
+        selector = $this.attr('href')
+        selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
+      }
+
+      $parent = $(selector)
       $parent.trigger('close')
 
       e && e.preventDefault()
@@ -82,4 +88,4 @@
     $('body').on('click.alert.data-api', dismiss, Alert.prototype.close)
   })
 
-}( window.jQuery )
+}( window.jQuery )

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

@@ -95,4 +95,4 @@
     })
   })
 
-}( window.jQuery )
+}( window.jQuery )

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

@@ -143,12 +143,12 @@
 
   $(function () {
     $('body').on('click.carousel.data-api', '[data-slide]', function ( e ) {
-      var $this = $(this)
-        , $target = $($this.attr('data-target') || $this.attr('href'))
+      var $this = $(this), href
+        , $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
         , options = !$target.data('modal') && $.extend({}, $target.data(), $this.data())
       $target.carousel(options)
       e.preventDefault()
     })
   })
 
-}( window.jQuery )
+}( window.jQuery )

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

@@ -71,7 +71,7 @@
 
       this.$element
         .removeClass('collapse')
-        [dimension](size || '')
+        [dimension](size || 'auto')
         [0].offsetWidth
 
       this.$element.addClass('collapse')
@@ -124,11 +124,13 @@
 
   $(function () {
     $('body').on('click.collapse.data-api', '[data-toggle=collapse]', function ( e ) {
-      var $this = $(this)
-        , target = $this.attr('data-target') || e.preventDefault() || $this.attr('href')
+      var $this = $(this), href
+        , target = $this.attr('data-target')
+          || e.preventDefault()
+          || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7
         , option = $(target).data('collapse') ? 'toggle' : $this.data()
       $(target).collapse(option)
     })
   })
 
-}( window.jQuery )
+}( window.jQuery )

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

@@ -27,7 +27,10 @@
 
   var toggle = '[data-toggle="dropdown"]'
     , Dropdown = function ( element ) {
-        $(element).bind('click', this.toggle)
+        var $el = $(element).on('click.dropdown.data-api', this.toggle)
+        $('html').on('click.dropdown.data-api', function () {
+          $el.parent().removeClass('open')
+        })
       }
 
   Dropdown.prototype = {
@@ -36,15 +39,21 @@
 
   , toggle: function ( e ) {
       var $this = $(this)
-        , selector = $this.attr('data-target') || $this.attr('href')
-        , $parent = $(selector)
+        , selector = $this.attr('data-target')
+        , $parent
         , isActive
 
+      if (!selector) {
+        selector = $this.attr('href')
+        selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
+      }
+
+      $parent = $(selector)
       $parent.length || ($parent = $this.parent())
+
       isActive = $parent.hasClass('open')
 
       clearMenus()
-
       !isActive && $parent.toggleClass('open')
 
       return false
@@ -76,8 +85,8 @@
    * =================================== */
 
   $(function () {
-    $(window).on('click.dropdown.data-api', clearMenus)
+    $('html').on('click.dropdown.data-api', clearMenus)
     $('body').on('click.dropdown.data-api', toggle, Dropdown.prototype.toggle)
   })
 
-}( window.jQuery )
+}( window.jQuery )

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

@@ -44,6 +44,8 @@
 
         if (this.isShown) return
 
+        $('body').addClass('modal-open')
+
         this.isShown = true
         this.$element.trigger('show')
 
@@ -77,6 +79,8 @@
         var that = this
         this.isShown = false
 
+        $('body').removeClass('modal-open')
+
         escape.call(this)
 
         this.$element
@@ -193,8 +197,8 @@
 
   $(function () {
     $('body').on('click.modal.data-api', '[data-toggle="modal"]', function ( e ) {
-      var $this = $(this)
-        , $target = $($this.attr('data-target') || $this.attr('href'))
+      var $this = $(this), href
+        , $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
         , option = $target.data('modal') ? 'toggle' : $.extend({}, $target.data(), $this.data())
 
       e.preventDefault()
@@ -202,4 +206,4 @@
     })
   })
 
-}( window.jQuery )
+}( window.jQuery )