twitter-bootstrap-rails 1.4.3 → 2.0rc0

data/README.md

@@ -1,6 +1,5 @@
 # Twitter Bootstrap for Rails 3.1 Asset Pipeline
-Bootstrap is a toolkit from Twitter designed to kickstart development of webapps and sites.
-It includes base CSS and HTML for typography, forms, buttons, tables, grids, navigation, and more.
+Bootstrap is a toolkit from Twitter designed to kickstart development of webapps and sites. It includes base CSS and HTML for typography, forms, buttons, tables, grids, navigation, and more.
 
 
 twitter-bootstrap-rails project integrates Bootstrap CSS toolkit for Rails 3.1 Asset Pipeline
@@ -10,7 +9,7 @@ twitter-bootstrap-rails project integrates Bootstrap CSS toolkit for Rails 3.1 A
 
 Include Bootstrap in Gemfile;
 
-    gem 'twitter-bootstrap-rails'
+    gem 'twitter-bootstrap-rails', :group => :assets
 
 or you can install from latest build;
 
@@ -25,42 +24,47 @@ You can run bundle from command line
 
 You can run following generators to get started with Twitter Bootstrap quickly.
 
-1. Install (requires directives to Asset pipeline.)
+
+Install (requires directives to Asset pipeline.)
 
 
 Usage:
 
-     rails g bootstrap:install
+
+    rails g bootstrap:install
 
 
-2. Layout (generates Twitter Bootstrap compatible layout.)
+Layout (generates Twitter Bootstrap compatible layout.) - (Slim supported)
 
 
 Usage:
 
-     rails g bootstrap:layout [LAYOUT_NAME] [*fixed or fluid] [options]
+
+    rails g bootstrap:layout [LAYOUT_NAME] [*fixed or fluid] [options]
 
 
 Example:
 
 
-     rails g bootstrap:layout application fixed
+    rails g bootstrap:layout application fixed
 
 
-3. Themed (generates Twitter Bootstrap compatible scaffold views.)
+Themed (generates Twitter Bootstrap compatible scaffold views.)
 
 
 Usage:
 
 
-     rails g bootstrap:themed [RESOURCE_NAME] [LAYOUT] [options]
+    rails g bootstrap:themed [RESOURCE_NAME] [LAYOUT] [options]
 
 
 Example:
 
 
-     rails g scaffold post title:string description:text
-     rails g bootstrap:themed posts
+    rails g scaffold post title:string description:text
+    rake db:migrate
+    rails g bootstrap:themed posts
+
 
 
 ## Using with Less
@@ -104,45 +108,28 @@ Using Twitter Bootstrap with the CoffeeScript is easy.
 twitter-bootstrap-rails generates a "bootstrap.js.coffee" file for you
 to /app/assets/javascripts/ folder.
 
-		$ ->
-			$("body > .topbar").scrollSpy()
-		$ ->
-			$(".tabs").tabs()
-		$ ->
-			$("a[rel=twipsy]").twipsy live: true
-		$ ->
-			$("a[rel=popover]").popover offset: 10
-		$ ->
-			$(".topbar-wrapper").dropdown()
-		$ ->
-			$(".alert-message").alert()
-		$ ->
-			domModal = $(".modal").modal(
-				backdrop: true
-				closeOnEscape: true
-			)
-			$(".open-modal").click ->
-				domModal.toggle()
-		$ ->
-			$(".btn").button "complete"
-
-
-## Using simple_form and integrating Twitter Bootstrap (optionally)
-
-First, include simple_form in Gemfile;
-
-     gem 'simple_form'
-
-
-Create initializer for simple_form to ("/config/initializers/simple_form.rb")
-
-
-Check this gist;
-
-     https://gist.github.com/1479043
-
-
-Note: Don't forget to reboot server.
+    $ ->
+      $(".alert-message").alert()
+    $ ->
+      $(".tabs").button()
+    $ ->
+      $(".carousel").carousel()
+    $ ->
+      $(".collapse").collapse()
+    $ ->
+      $(".dropdown-toggle").dropdown()
+    $ ->
+      $(".modal").modal
+    $ ->
+      $("a[rel]").popover
+    $ ->
+      $(".navbar").scrollspy()
+    $ ->
+      $(".tab").tab "show"
+    $ ->
+      $(".tooltip").tooltip
+    $ ->
+      $(".typeahead").typeahead()
 
 
 ## Using Static CSS, JS (w/o Less)
@@ -154,14 +141,60 @@ twitter-bootstrap-rails has seperate branch (w/o Less) that just serves latest s
     gem 'twitter-bootstrap-rails', :git => "git://github.com/seyhunak/twitter-bootstrap-rails.git", :branch => "static"
 
 
+## Changelog
+<ul>
+  <li>Version 0.0.5 deprecated</li>
+  <li>Asset files updated to latest and removed version numbers</li>
+  <li>Implemented Less::Rails Railtie to use with LESS</li>
+  <li>Fixed railtie to only initialize Less when installed</li>
+  <li>New branch for the static version of Bootstrap (w/o Less) - check static branch</li>
+  <li>Added path to support heroku deploy</li>
+  <li>Rake precompile issue fixed</li>
+  <li>Updated asset files to 1.4.0</li>
+  <li>Updated dependency less-rails (now requires 2.1.0)</li>
+  <li>Added generators</li>
+  <li>Fixed generators</li>
+  <li>Fixed class name conflicts from (bootstrap.js.coffee)</li>
+  <li>Fixed jquery-rails gem version dependency</li>
+  <li>Updated asset files</li>
+  <li>Added new generators (install, layout and themed)</li>
+  <li>Compability to Rails 3.2</li>
+  <li>Transitioning to 2.0</li>
+  <li>Released gem v.2.0rc0</li>
+</ul>
+
+
+## Contributors & Patches & Forks
+<ul>
+  <li>Daniel Morris</li>
+  <li>Bradly Feeley</li>
+  <li>Guilherme Moreira</li>
+  <li>Alex Behar</li>
+  <li>Brandon Keene</li>
+  <li>Anthony Corcutt</li>
+  <li>Colin Warren</li>
+  <li>Giovanni Cappellotto</li>
+  <li>Masakuni Kato</li>
+  <li>Gudleik Rasch</li>
+</ul>
+
+
+## Future
+<ul>
+  <li>Writing tests (not implemented yet)</li>
+  <li>Markup Helpers (alert, tabs, pagination, breadcrumbs etc.)</li>
+</ul>
+
+
 ## Credits
 Seyhun Akyürek - seyhunak [at] gmail com
 
 [Follow me on Twitter](http://twitter.com/seyhunak "Twitter")
+[Follow me on Google+](http://plus.ly/seyhunak "Google+")
 
 
 ## Thanks
-Twitter Bootstrap
+Twitter Bootstrap and all twitter-bootstrap-rails contributors
 http://twitter.github.com/bootstrap
 
 

data/lib/generators/bootstrap/install/templates/bootstrap.coffee

@@ -1,19 +1,22 @@
 $ ->
-  $("body > .topbar").scrollSpy()
+  $(".alert-message").alert()
 $ ->
-  $(".tabs").tabs()
+  $(".tabs").button()
 $ ->
-  $("a[rel=twipsy]").twipsy live: true
+  $(".carousel").carousel()
 $ ->
-  $("a[rel=popover]").popover offset: 10
+  $(".collapse").collapse()
 $ ->
-  $(".topbar-wrapper").dropdown()
+  $(".dropdown-toggle").dropdown()
 $ ->
-  $(".alert-message").alert()
+  $(".modal").modal
+$ ->
+  $("a[rel]").popover
+$ ->
+  $(".navbar").scrollspy()
+$ ->
+  $(".tab").tab "show"
+$ ->
+  $(".tooltip").tooltip
 $ ->
-  domModal = $(".modal").modal(
-    backdrop: true
-    closeOnEscape: true
-  )
-  $(".open-modal").click ->
-    domModal.toggle()  
+  $(".typeahead").typeahead()  

data/lib/generators/bootstrap/layout/layout_generator.rb

@@ -16,7 +16,7 @@ module Bootstrap
         @app_name = app.class.to_s.split("::").first
         @container_class = layout_type == "fluid" ? "container-fluid" : "container"
         ext = app.config.generators.options[:rails][:template_engine] || :erb
-        template "layout.html.erb", "app/views/layouts/#{layout_name}.html.erb"
+        template "layout.html.#{ext}", "app/views/layouts/#{layout_name}.html.#{ext}"
       end
     end
   end

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

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

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

@@ -0,0 +1,40 @@
+doctype html
+html lang="en"
+  head
+    meta charset="utf-8"
+    title= content_for?(:title) ? yield(:title) : "<%= app_name %>"
+    = javascript_include_tag "application"
+    = stylesheet_link_tag    "application"
+
+  body
+    .navbar
+      .navbar-inner
+        .<%= container_class %>
+          h3= link_to "<%= app_name %>", root_path, :class => "brand"
+          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" -%>
+      .sidebar
+        .well
+          h5 Sidebar
+          ul
+            li= link_to "Link 1", "/path1"
+            li= link_to "Link 2", "/path2"
+            li= link_to "Link 3", "/path3"
+      .content= yield
+    <% else %>
+      .content
+        .row
+          .span9= yield
+          .span1 &nbsp;
+          .span3
+            h3 Sidebar
+            ul
+              li= link_to "Link 1", "/path1"
+              li= link_to "Link 2", "/path2"
+              li= link_to "Link 3", "/path3"
+    <% end %>

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

@@ -1,6 +1,10 @@
 <% columns.each do |column| %>
-    <%%= f.label :<%= column.name %>, t("activerecord.attributes.<%= model_name.underscore %>.<%= column.name %>", :default => "<%= column.name.humanize %>"), :class => :label %>
+<div class="clearfix">
+   <%%= f.label :<%= column.name %>, t("activerecord.attributes.<%= model_name.underscore %>.<%= column.name %>", :default => "<%= column.name.humanize %>"), :class => :label %>
+  <div class="input">
     <%%= f.<%= column.field_type %> :<%= column.name %>, :class => '<%= column.field_type %>' %>
+  </div>
+</div>
 <%- end -%>
 <div class="actions">
   <button class="btn primary" type="submit">Save</button> or