twitter-bootstrap-rails 2.0.2 → 2.0.3

data/README.md

@@ -10,7 +10,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"
 
 or you can install from latest build;
 
@@ -74,24 +74,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
-Also, you can import additional files (.ie responsive)
+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;
 
-    // import responsive layout
-    @import "twitter/bootstrap/responsive";
-
-    // Your custom stylesheets goes here (override Less here)
 
 
 ## Using Javascripts
@@ -112,17 +108,9 @@ twitter-bootstrap-rails generates a "bootstrap.js.coffee" file for you
 to /app/assets/javascripts/ folder.
 
     jQuery ->
-      $(".alert-message").alert()
-      $(".tabs").button()
-      $(".carousel").carousel()
-      $(".collapse").collapse()
-      $(".dropdown-toggle").dropdown()
-      $(".modal").modal()
-      $("a[rel]").popover()
-      $(".navbar").scrollspy()
-      $(".tab").tab "show"
+      $("a[rel=popover]").popover()
       $(".tooltip").tooltip()
-      $(".typeahead").typeahead()
+      $("a[rel=tooltip]").tooltip()
 
 
 ## Using Static CSS, JS (w/o Less)
@@ -157,6 +145,8 @@ twitter-bootstrap-rails has seperate branch (w/o Less) that just serves latest s
   <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>
+  <li>Released gem v.2.0.3</li>
 </ul>
 
 
@@ -182,14 +172,15 @@ 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
 
-[Follow me on Twitter](http://twitter.com/seyhunak "Twitter")
-
-[Follow me on Google+](http://plus.ly/seyhunak "Google+")
+[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+")
 
 ## Thanks
 Twitter Bootstrap and all twitter-bootstrap-rails contributors

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

@@ -3,25 +3,49 @@ require 'rails/generators'
 module Bootstrap
   module Generators
     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,13 +1,4 @@
 jQuery ->
-  $(".alert-message").alert()
-  $(".tabs").button()
-  $(".carousel").carousel()
-  $(".collapse").collapse()
-  $(".dropdown-toggle").dropdown()
-  $(".modal").modal()
   $("a[rel=popover]").popover()
-  $(".navbar").scrollspy()
-  $(".tab").tab "show"
   $(".tooltip").tooltip()
-  $(".typeahead").typeahead()
-  $("a[rel=tooltip]").tooltip()
+  $("a[rel=tooltip]").tooltip()

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

@@ -0,0 +1,17 @@
+@import "twitter/bootstrap/bootstrap";
+@import "twitter/bootstrap/responsive";
+
+// Set the correct sprite paths
+@iconSpritePath: asset-path('twitter/bootstrap/glyphicons-halflings.png');
+@iconWhiteSpritePath: asset-path('twitter/bootstrap/glyphicons-halflings-white.png');
+
+// 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/templates/layout.html.erb

@@ -11,12 +11,12 @@
     <![endif]-->
 
     <!-- Le styles -->
-    <%%= stylesheet_link_tag    "application", :media => "all" %>
     <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">
@@ -34,9 +34,9 @@
           <div class="container">
         <%- end -%>
           <a class="btn btn-navbar" data-target=".nav-collapse" data-toggle="collapse">
-            <span class="i-bar"></span>
-            <span class="i-bar"></span>
-            <span class="i-bar"></span>
+            <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">
@@ -52,14 +52,14 @@
 
     <div class="<%= container_class %>">
       <%- if layout_type == "fluid" -%>
-       <div class="row-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 -%>
+                <li><%%= link_to "Link<%= i %>", "/path<%= i %>"  %></li>
+              <%- end -%>
             </ul>
           </div><!--/.well -->
         </div><!--/span-->
@@ -68,25 +68,26 @@
         </div>
       </div><!--/row-->
       <%- else -%>
-        <div class="content">
-          <div class="row">
-            <div class="span9">
+      <div class="content">
+        <div class="row">
+          <div class="span9">
             <%%= yield %>
-            </div>
-            <div class="span1">&nbsp;</div>
+          </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>
+                <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><!--/row-->
+      </div><!--/content-->
       <%- end -%>
 
       <footer>

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

@@ -8,11 +8,11 @@
     /[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 */
       }
+    = 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"}/
@@ -29,9 +29,9 @@
         .container
         <%- end -%>
           %a.btn.btn-navbar{"data-target" => ".nav-collapse", "data-toggle" => "collapse"}
-            %span.i-bar
-            %span.i-bar
-            %span.i-bar
+            %span.icon-bar
+            %span.icon-bar
+            %span.icon-bar
           %a.brand{:href => "#"}<%= app_name %>
           .<%=container_class%>.nav-collapse
             %ul.nav

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

@@ -9,11 +9,11 @@ html lang="en"
     /[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 */
       }
+    = 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"
@@ -30,9 +30,9 @@ html lang="en"
         .container
         <%- end -%>
           a.btn.btn-navbar data-target=".nav-collapse" data-toggle="collapse"
-            span.i-bar
-            span.i-bar
-            span.i-bar
+            span.icon-bar
+            span.icon-bar
+            span.icon-bar
           a.brand href="#"<%= app_name %>
           .<%=container_class%>.nav-collapse
             ul.nav

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

@@ -1,12 +1,19 @@
-<% columns.each do |column| %>
-<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="form-actions">
-  <button class="btn primary" type="submit">Save</button> or
-	<%%= link_to "Cancel", <%= controller_routing_path %>_path %>
-</div>
+<%%= form_for @<%= model_name.underscore  %>, :html => { :class => 'form-horizontal' } do |f| %>
+  <fieldset>
+    <legend><%%= controller.action_name.capitalize %> <%= model_name.titleize %></legend>
+
+    <%- columns.each do |column| -%>
+    <div class="control-group">
+      <%%= f.label :<%= column.name %>, :class => 'control-label' %>
+      <div class="controls">
+        <%%= f.<%= column.field_type %> :<%= column.name %>, :class => '<%= column.field_type %>' %>
+      </div>
+    </div>
+
+    <%- end -%>
+    <div class="form-actions">
+      <%%= f.submit nil, :class => 'btn btn-primary' %>
+      <%%= link_to 'Cancel', <%= controller_routing_path %>_path, :class => 'btn' %>
+    </div>
+  </fieldset>
+<%% end %>

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

@@ -1,4 +1 @@
-<%%= 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} %>
-<%% end -%>
+<%%= render :partial => 'form' %>

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

@@ -1,34 +1,30 @@
 <h1><%= resource_name.titleize %>s</h1>
 <table class="table table-striped">
- <thead>
-  <tr>
-    <th>ID</th>
-    <% 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 %>")) %>
-    </th>
-    <% end -%>
-    <th>Created at</th>
-    <th>Actions</th>
-  </tr>
+  <thead>
+    <tr>
+      <th>ID</th>
+      <%- unless columns.empty? -%>
+      <th><%= columns.first.name.humanize %></th>
+      <%- end -%>
+      <th>Created at</th>
+      <th>Actions</th>
+    </tr>
   </thead>
   <tbody>
-  <%% @<%= plural_resource_name %>.each do |<%= resource_name %>| -%>
-   <tr>
-    <td><%%= <%= resource_name %>.id %></td>
-    <% unless columns.empty? -%>
-    <td><%%= link_to <%= resource_name %>.<%= columns.first.name %>, <%= singular_controller_routing_path %>_path(<%= resource_name %>) %>
-    </td>
-    <% end -%>
-    <td><%%= <%= resource_name %>.created_at %></td>
-    <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?")}" %>
-    </td>
-    </tr>
-    <%% end -%>
-   </tbody>
+    <%% @<%= plural_resource_name %>.each do |<%= resource_name %>| %>
+      <tr>
+        <td><%%= <%= resource_name %>.id %></td>
+        <%- unless columns.empty? -%>
+        <td><%%= link_to <%= resource_name %>.<%= columns.first.name %>, <%= singular_controller_routing_path %>_path(<%= resource_name %>) %></td>
+        <%- end -%>
+        <td><%%= <%= resource_name %>.created_at %></td>
+        <td>
+          <%%= 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 => 'Are you sure?', :class => 'btn btn-mini btn-danger' %>
+        </td>
+      </tr>
+    <%% end %>
+  </tbody>
 </table>
 
-<%%= link_to "New", new_<%= singular_controller_routing_path %>_path, :class => 'btn btn-primary' %>
+<%%= link_to 'New', new_<%= singular_controller_routing_path %>_path, :class => 'btn btn-primary' %>

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

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

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

@@ -1,10 +1,14 @@
-<% 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 %>")) %>:</label>
-<p><%%= @<%= resource_name %>.<%= column.name %> %></p>
-<%- end -%>
+<h1><%= model_name.titleize %></h1>
+
+<%- columns.each do |column| -%>
+<p>
+  <b><%= column.name.humanize %></b><br>
+  <%%= @<%= resource_name %>.<%= column.name %> %>
+</p>
 
+<%- end -%>
 <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' %>
+  <%%= 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 => 'Are you sure?', :class => 'btn btn-danger' %>
 </div>