twitter-bootstrap-rails 2.0 → 2.0.1.0

data/README.md

@@ -1,9 +1,10 @@
-# Twitter Bootstrap for Rails 3.2 Asset Pipeline
+# 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.
 
+twitter-bootstrap-rails project integrates Bootstrap CSS toolkit for Rails 3.1 Asset Pipeline (Rails 3.2 supported)
 
-twitter-bootstrap-rails project integrates Bootstrap CSS toolkit for Rails 3.2 Asset Pipeline
-
+[![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)
 
 ## Installing Gem
 
@@ -20,6 +21,10 @@ You can run bundle from command line
     bundle install
 
 
+## Gem Version
+    twitter-bootstrap-rails v2.0.1.0 (Gem Version 0 with Twitter Bootstrap V.2.0.1)
+
+
 ## Installing to App (using Generators)
 
 You can run following generators to get started with Twitter Bootstrap quickly.
@@ -34,13 +39,13 @@ Usage:
     rails g bootstrap:install
 
 
-Layout (generates Twitter Bootstrap compatible layout.)
+Layout (generates Twitter Bootstrap compatible layout) - (Haml and Slim supported)
 
 
 Usage:
 
 
-    rails g bootstrap:layout [LAYOUT_NAME] [*fixed or fluid] [options]
+    rails g bootstrap:layout [LAYOUT_NAME] [*fixed or fluid]
 
 
 Example:
@@ -49,19 +54,20 @@ Example:
     rails g bootstrap:layout application fixed
 
 
-Themed (generates Twitter Bootstrap compatible scaffold views.)
+Themed (generates Twitter Bootstrap compatible scaffold views.) - (Haml and Slim supported)
 
 
 Usage:
 
 
-    rails g bootstrap:themed [RESOURCE_NAME] [LAYOUT] [options]
+    rails g bootstrap:themed [RESOURCE_NAME]
 
 
 Example:
 
 
     rails g scaffold post title:string description:text
+    rake db:migrate
     rails g bootstrap:themed posts
 
 
@@ -72,22 +78,20 @@ Bootstrap was built with Preboot, an open-source pack of mixins and variables to
 
 ## Using stylesheets with Less
 
-You have to require Bootstrap LESS (bootstrap.less) in your application.css
+You have to require Bootstrap LESS (bootstrap_and_overrides.css.less) in your application.css
 
     /*
-     *= require twitter/bootstrap
-    */
+     *= require bootstrap_and_overrides
+     */
 
     /* Your stylesheets goes here... */
 
 
-Now, you can override LESS files provided by Twitter Bootstrap
+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:
 
-     @import "twitter/bootstrap";
+    @linkColor: #ff0000;
 
-     // Baseline grid
-     @basefont:          13px;
-     @baseline:          18px;
 
 
 ## Using Javascripts
@@ -107,28 +111,10 @@ Using Twitter Bootstrap with the CoffeeScript is easy.
 twitter-bootstrap-rails generates a "bootstrap.js.coffee" file for you
 to /app/assets/javascripts/ folder.
 
-    $ ->
-      $(".alert-message").alert()
-    $ ->
-      $(".tabs").button()
-    $ ->
-      $(".carousel").carousel()
-    $ ->
-      $(".collapse").collapse()
-    $ ->
-      $(".dropdown-toggle").dropdown()
-    $ ->
-      $("#myModal").modal options
-    $ ->
-      $("#example").popover options
-    $ ->
-      $("#navbar").scrollspy()
-    $ ->
-      $("#myTab").tab "show"
-    $ ->
-      $("#example").tooltip options
-    $ ->
-      $(".typeahead").typeahead()
+    jQuery ->
+      $("a[rel=popover]").popover()
+      $(".tooltip").tooltip()
+      $("a[rel=tooltip]").tooltip()
 
 
 ## Using Static CSS, JS (w/o Less)
@@ -159,6 +145,11 @@ twitter-bootstrap-rails has seperate branch (w/o Less) that just serves latest s
   <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>
+  <li>Added Haml and Slim support</li>
+  <li>Added Responsive layout support</li>
+  <li>Fixes and release 2.0.0</li>
+  <li>Updated to v2.0.1, versioned v2.0.1.0</li>
 </ul>
 
 
@@ -173,6 +164,8 @@ twitter-bootstrap-rails has seperate branch (w/o Less) that just serves latest s
   <li>Colin Warren</li>
   <li>Giovanni Cappellotto</li>
   <li>Masakuni Kato</li>
+  <li>Gudleik Rasch</li>
+  <li>Thomas Volkmar Worm</li>
 </ul>
 
 
@@ -187,6 +180,7 @@ twitter-bootstrap-rails has seperate branch (w/o Less) that just serves latest s
 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+")
 
 

data/Rakefile

@@ -1,3 +1,14 @@
+#!/usr/bin/env rake
 require 'bundler'
 Bundler::GemHelper.install_tasks
 
+desc "Bundle the gem"
+task :bundle do
+  sh('bundle install')
+  sh 'gem build *.gemspec'
+  sh 'gem install *.gem'
+  sh 'rm *.gem'
+end
+
+task(:default).clear
+task :default => :bundle

data/lib/generators/bootstrap/install/install_generator.rb

@@ -2,26 +2,50 @@ require 'rails/generators'
 
 module Bootstrap
   module Generators
-    class InstallGenerator < Rails::Generators::Base
+    class InstallGenerator < ::Rails::Generators::Base
+
       source_root File.expand_path("../templates", __FILE__)
       desc "This generator installs Twitter Bootstrap to Asset Pipeline"
 
       def add_assets
-       if File.exist?('app/assets/javascripts/application.js')
-	      insert_into_file "app/assets/javascripts/application.js", "//= require twitter/bootstrap\n", :after => "jquery_ujs\n"
-	     else
-	      copy_file "application.js", "app/assets/javascripts/application.js"
-	     end
-       if File.exist?('app/assets/stylesheets/application.css')
-	      insert_into_file "app/assets/stylesheets/application.css", " *= require twitter/bootstrap\n", :after => "require_self\n"
-	     else
-	      copy_file "application.css", "app/assets/stylesheets/application.css"
-	     end
-  	  end
+
+        if File.exist?('app/assets/javascripts/application.js')
+          insert_into_file "app/assets/javascripts/application.js", "//= require twitter/bootstrap\n", :after => "jquery_ujs\n"
+        else
+          copy_file "application.js", "app/assets/javascripts/application.js"
+        end
+
+        if File.exist?('app/assets/stylesheets/application.css')
+          # Add our own require:
+          content = File.read("app/assets/stylesheets/application.css")
+          if content.match(/require_tree\s+\./)
+            # Good enough - that'll include our bootstrap_and_overrides.css.less
+          else
+            style_require_block = " *= require bootstrap_and_overrides\n"
+            insert_into_file "app/assets/stylesheets/application.css", style_require_block, :after => "require_self\n"
+          end
+        else
+          copy_file "application.css", "app/assets/stylesheets/application.css"
+        end
+
+      end
 
       def add_bootstrap
         copy_file "bootstrap.coffee", "app/assets/javascripts/bootstrap.js.coffee"
-        copy_file "bootstrap.less", "app/assets/stylesheets/bootstrap.css.less"
+        copy_file "bootstrap_and_overrides.less", "app/assets/stylesheets/bootstrap_and_overrides.css.less"
+      end
+
+      def cleanup_legacy
+        # Remove old requires (if any) that included twitter/bootstrap directly:
+        gsub_file("app/assets/stylesheets/application.css", %r|\s*\*=\s*twitter/bootstrap\s*\n|, "")
+        gsub_file("app/assets/stylesheets/application.css", %r|\s*\*=\s*twitter/bootstrap_responsive\s*\n|, "")
+        if File.exist?('app/assets/stylesheets/bootstrap_override.css.less')
+          puts <<-EOM
+          Warning:
+            app/assets/stylesheets/bootstrap_override.css.less exists
+            It should be removed, as it has been superceded by app/assets/stylesheets/bootstrap_and_overrides.css.less
+          EOM
+        end
       end
 
     end

data/lib/generators/bootstrap/install/templates/application.css

@@ -3,6 +3,5 @@
  * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
  * the top of the compiled file, but it's generally better to create a new file per style scope.
  *= require_self
- *= require twitter/bootstrap
  *= require_tree .
 */

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

@@ -1,22 +1,13 @@
-$ ->
+jQuery ->
   $(".alert-message").alert()
-$ ->
   $(".tabs").button()
-$ ->
   $(".carousel").carousel()
-$ ->
   $(".collapse").collapse()
-$ ->
   $(".dropdown-toggle").dropdown()
-$ ->
-  $(".modal").modal
-$ ->
-  $("a[rel]").popover
-$ ->
+  $(".modal").modal()
+  $("a[rel=popover]").popover()
   $(".navbar").scrollspy()
-$ ->
   $(".tab").tab "show"
-$ ->
-  $(".tooltip").tooltip
-$ ->
-  $(".typeahead").typeahead()  
+  $(".tooltip").tooltip()
+  $(".typeahead").typeahead()
+  $("a[rel=tooltip]").tooltip()

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

@@ -0,0 +1,13 @@
+@import "twitter/bootstrap/bootstrap";
+@import "twitter/bootstrap/responsive";
+
+// Your custom LESS stylesheets goes here
+//
+// Since bootstrap was imported above you have access to its mixins which
+// you may use and inherit here
+//
+// If you'd like to override bootstrap's own variables, you can do so here as well
+// See http://twitter.github.com/bootstrap/less.html for their names and documentation
+//
+// Example:
+// @linkColor: #ff0000;

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

@@ -2,9 +2,9 @@ require 'rails/generators'
 
 module Bootstrap
   module Generators
-    class LayoutGenerator < Rails::Generators::Base
+    class LayoutGenerator < ::Rails::Generators::Base
       source_root File.expand_path("../templates", __FILE__)
-      desc "This generator creates layout file with navigation."
+      desc "This generator generates layout file with navigation."
       argument :layout_name, :type => :string, :default => "application"
       argument :layout_type, :type => :string, :default => "fixed",
                :banner => "*fixed or fluid"
@@ -12,11 +12,11 @@ module Bootstrap
       attr_reader :app_name, :container_class
 
       def generate_layout
-        app = Rails.application
+        app = ::Rails.application
         @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" type="text/javascript"></script>
+    <![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 -->
+    <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">
+  </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-target=".nav-collapse" data-toggle="collapse">
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-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>
+      <%- 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>