bootstrapped 0.0.4 → 0.0.6

data/{vendor/assets/stylesheets/scaffolding.css.less → lib/generators/bootstrapped/install/templates/scaffolding.less}

@@ -7,10 +7,8 @@
 // STRUCTURAL LAYOUT
 // -----------------
 
-html, body {
-  background-color: @white;
-}
 body {
+  background-color: @white;
   margin: 0;
   #font > .sans-serif(normal,@basefont,@baseline);
   color: @grayDark;
@@ -29,7 +27,9 @@ body {
   padding-right: 20px;
   .clearfix();
   > .sidebar {
-    float: left;
+    position: absolute;
+    top: 0;
+    left: 20px;
     width: 220px;
   }
   // TODO in v2: rename this and .popover .content to be more specific
@@ -77,12 +77,12 @@ a {
 
 .row {
   .clearfix();
-  margin-left: -1 * @gridGutterWidth;
+  margin-left: -@gridGutterWidth;
 }
 
 // Find all .span# classes within .row and give them the necessary properties for grid columns (supported by all browsers back to IE7)
 // Credit to @dhg for the idea
-[class*="span"] {
+.row > [class*="span"] {
   .gridColumn();
 }
 
@@ -115,18 +115,20 @@ a {
 .span24    { .columns(24); }
 
 // Offset column options
-.offset1   { .offset(1); }
-.offset2   { .offset(2); }
-.offset3   { .offset(3); }
-.offset4   { .offset(4); }
-.offset5   { .offset(5); }
-.offset6   { .offset(6); }
-.offset7   { .offset(7); }
-.offset8   { .offset(8); }
-.offset9   { .offset(9); }
-.offset10  { .offset(10); }
-.offset11  { .offset(11); }
-.offset12  { .offset(12); }
+.row {
+  > .offset1   { .offset(1); }
+  > .offset2   { .offset(2); }
+  > .offset3   { .offset(3); }
+  > .offset4   { .offset(4); }
+  > .offset5   { .offset(5); }
+  > .offset6   { .offset(6); }
+  > .offset7   { .offset(7); }
+  > .offset8   { .offset(8); }
+  > .offset9   { .offset(9); }
+  > .offset10  { .offset(10); }
+  > .offset11  { .offset(11); }
+  > .offset12  { .offset(12); }
+}
 
 // Unique column sizes for 16-column grid
 .span-one-third     { width: 300px; }

data/{vendor/assets/stylesheets/tables.css.less → lib/generators/bootstrapped/install/templates/tables.less}

@@ -11,12 +11,10 @@ table {
   width: 100%;
   margin-bottom: @baseline;
   padding: 0;
-  border-collapse: separate; // Done so we can round those corners!
-  *border-collapse: collapse; /* IE7, collapse table to remove spacing */
   font-size: @basefont;
-  border: 1px solid #ddd;
-  .border-radius(4px);
-  th, td {
+  border-collapse: collapse;
+  th,
+  td {
     padding: 10px 10px 9px;
     line-height: @baseline;
     text-align: left;
@@ -25,21 +23,47 @@ table {
     padding-top: 9px;
     font-weight: bold;
     vertical-align: middle;
-    border-bottom: 1px solid #ddd;
   }
   td {
     vertical-align: top;
+    border-top: 1px solid #ddd;
+  }
+  // When scoped to row, fix th in tbody
+  tbody th {
+    border-top: 1px solid #ddd;
+    vertical-align: top;
   }
+}
+
+
+// CONDENSED VERSION
+// -----------------
+.condensed-table {
+  th,
+  td {
+    padding: 5px 5px 4px;
+  }
+}
+
+
+// BORDERED VERSION
+// ----------------
+
+.bordered-table {
+  border: 1px solid #ddd;
+  border-collapse: separate; // Done so we can round those corners!
+  *border-collapse: collapse; /* IE7, collapse table to remove spacing */
+  .border-radius(4px);
   th + th,
-  td + td {
+  td + td,
+  th + td {
     border-left: 1px solid #ddd;
   }
-  tr + tr td {
-    border-top: 1px solid #ddd;
-  }
+  thead tr:first-child th:first-child,
   tbody tr:first-child td:first-child {
     .border-radius(4px 0 0 0);
   }
+  thead tr:first-child th:last-child,
   tbody tr:first-child td:last-child {
     .border-radius(0 4px 0 0);
   }
@@ -52,20 +76,52 @@ table {
 }
 
 
+// TABLE CELL SIZES
+// ----------------
+
+// This is a duplication of the main grid .columns() mixin, but subtracts 20px to account for input padding and border
+.tableColumns(@columnSpan: 1) {
+  width: ((@gridColumnWidth - 20) * @columnSpan) + ((@gridColumnWidth - 20) * (@columnSpan - 1));
+}
+table {
+  // Default columns
+  .span1     { .tableColumns(1); }
+  .span2     { .tableColumns(2); }
+  .span3     { .tableColumns(3); }
+  .span4     { .tableColumns(4); }
+  .span5     { .tableColumns(5); }
+  .span6     { .tableColumns(6); }
+  .span7     { .tableColumns(7); }
+  .span8     { .tableColumns(8); }
+  .span9     { .tableColumns(9); }
+  .span10    { .tableColumns(10); }
+  .span11    { .tableColumns(11); }
+  .span12    { .tableColumns(12); }
+  .span13    { .tableColumns(13); }
+  .span14    { .tableColumns(14); }
+  .span15    { .tableColumns(15); }
+  .span16    { .tableColumns(16); }
+}
+
+
 // ZEBRA-STRIPING
 // --------------
 
 // Default zebra-stripe styles (alternating gray and transparent backgrounds)
 .zebra-striped {
   tbody {
-    tr:nth-child(odd) td {
+    tr:nth-child(odd) td,
+    tr:nth-child(odd) th {
       background-color: #f9f9f9;
     }
-    tr:hover td {
+    tr:hover td,
+    tr:hover th {
       background-color: #f5f5f5;
     }
   }
+}
 
+table {
   // Tablesorting styles w/ jQuery plugin
   .header {
     cursor: pointer;
@@ -111,9 +167,6 @@ table {
       .opacity(60);
     }
   }
-}
-
-table {
   // Blue Table Headings
   .blue {
     color: @blue;

data/lib/generators/bootstrapped/layout/templates/error_messages_helper.rb

@@ -6,7 +6,8 @@ module ErrorMessagesHelper
     options[:message] ||= I18n.t(:"activerecord.errors.message", :default => "Correct the following errors and try again.")
     messages = objects.compact.map { |o| o.errors.full_messages }.flatten
     unless messages.empty?
-      content_tag(:div, :class => "error_messages") do
+        # forced as error but may not abstractly always be the case
+      content_tag(:div, :class => "alert-message block-message error") do
         list_items = messages.map { |msg| content_tag(:li, msg.html_safe) }
         content_tag(:h2, options[:header_message].html_safe) + content_tag(:p, options[:message].html_safe) + content_tag(:ul, list_items.join.html_safe)
       end
@@ -14,11 +15,12 @@ module ErrorMessagesHelper
   end
   
   def display_flash_message
-    flash.each do |key, value|  
-      css_class = key.eql?('notice') ? 'success' : 'error'
-      render :partial => 'share/flash', :locals => { :css => css_class, :message => value }
+  	partials = String.new
+	  flash.each do |key, value|  
+      css_class = key.to_s.eql?('notice') ? 'success' : 'error'
+      partials << render( :partial => 'share/flash', :locals => { :css => css_class, :message => value }) 
     end
-    nil
+	  partials.html_safe
   end
 
   module FormBuilderAdditions

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

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html lang="en">
   <head>
     <title><%%= content_for?(:title) ? yield(:title) : "Untitled" %></title>
     <%%= stylesheet_link_tag "application" %>
@@ -11,19 +11,25 @@
     <div class="topbar">
       <div class="fill">
         <div class="container">
-          <h3><%%= link_to 'Project Name', '#' %></h3>
+          <%%= link_to app_name, '#', :class => "brand" %>
+          <ul class="nav">
+          	<li class="active">
+          		<a href='#'>Home</a>
+          	</li>
+          	<li>
+          		<a href='#'>About</a>
+          	</li>
+          </ul>
+        <p class="pull-right"><%%= text_field '#', '#'%></p>
         </div>
       </div>
     </div>
     <%%= display_flash_message %>
     <div class="container">
-      <%% flash.each do |name, msg| %>
-        <%%= content_tag :div, msg, :id => "flash_#{name}" %>
-      <%% end %>
-      <%%= content_tag :h1, yield(:title) if show_title? %>
+      <%%= content_tag :h1, yield(:title) if show_title %>
       <%%= yield %>
       <footer>
-        <p>&copy; Company <%%= Time.now.year %></p>
+         <p><%%= app_name %> &copy;  <%= Time.now.year %></p>
       </footer>
     </div>
   </body>

data/lib/generators/bootstrapped/layout/templates/layout_helper.rb

@@ -8,7 +8,7 @@ module LayoutHelper
     @show_title = show_title
   end
 
-  def show_title?
+  def show_title
     @show_title
   end
 
@@ -19,4 +19,8 @@ module LayoutHelper
   def javascript(*args)
     content_for(:head) { javascript_include_tag(*args) }
   end
+  
+  def app_name
+    Rails.application.class.to_s.split("::").first
+  end
 end

data/lib/generators/bootstrapped/scaffold/templates/views/erb/_form.html.erb

@@ -1,3 +1,4 @@
+<%%= error_messages_for <%= item_path :instance_variable => true %> %>
 <%%= form_for <%= item_path :instance_variable => true %> do |f| %>
 	<fieldset>
 	<%- model_attributes.each do |attribute| -%>

data/vendor/assets/javascripts/{bootstrap-alerts.js → twitter/bootstrap/bootstrap-alerts.js}

@@ -1,5 +1,5 @@
 /* ==========================================================
- * bootstrap-alerts.js v1.3.0
+ * bootstrap-alerts.js v1.4.0
  * http://twitter.github.com/bootstrap/javascript.html#alerts
  * ==========================================================
  * Copyright 2011 Twitter, Inc.
@@ -20,6 +20,8 @@
 
 !function( $ ){
 
+  "use strict"
+
   /* CSS TRANSITION SUPPORT (https://gist.github.com/373874)
    * ======================================================= */
 
@@ -38,11 +40,11 @@
      if ( $.support.transition ) {
        transitionEnd = "TransitionEnd"
        if ( $.browser.webkit ) {
-       	transitionEnd = "webkitTransitionEnd"
+        transitionEnd = "webkitTransitionEnd"
        } else if ( $.browser.mozilla ) {
-       	transitionEnd = "transitionend"
+        transitionEnd = "transitionend"
        } else if ( $.browser.opera ) {
-       	transitionEnd = "oTransitionEnd"
+        transitionEnd = "oTransitionEnd"
        }
      }
 
@@ -51,9 +53,10 @@
  /* ALERT CLASS DEFINITION
   * ====================== */
 
-  var Alert = function ( content, selector ) {
+  var Alert = function ( content, options ) {
+    this.settings = $.extend({}, $.fn.alert.defaults, options)
     this.$element = $(content)
-      .delegate(selector || '.close', 'click', this.close)
+      .delegate(this.settings.selector, 'click', this.close)
   }
 
   Alert.prototype = {
@@ -92,13 +95,19 @@
         return $this.data('alert')[options]()
       }
 
-      $(this).data('alert', new Alert( this ))
+      $(this).data('alert', new Alert( this, options ))
 
     })
   }
 
+  $.fn.alert.defaults = {
+    selector: '.close'
+  }
+
   $(document).ready(function () {
-    new Alert($('body'), '.alert-message[data-alert] .close')
+    new Alert($('body'), {
+      selector: '.alert-message[data-alert] .close'
+    })
   })
 
-}( window.jQuery || window.ender )
+}( window.jQuery || window.ender );

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

@@ -0,0 +1,62 @@
+/* ============================================================
+ * bootstrap-buttons.js v1.4.0
+ * http://twitter.github.com/bootstrap/javascript.html#buttons
+ * ============================================================
+ * Copyright 2011 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============================================================ */
+
+!function( $ ){
+
+  "use strict"
+
+  function setState(el, state) {
+    var d = 'disabled'
+      , $el = $(el)
+      , data = $el.data()
+
+    state = state + 'Text'
+    data.resetText || $el.data('resetText', $el.html())
+
+    $el.html( data[state] || $.fn.button.defaults[state] )
+
+    state == 'loadingText' ?
+      $el.addClass(d).attr(d, d) :
+      $el.removeClass(d).removeAttr(d)
+  }
+
+  function toggle(el) {
+    $(el).toggleClass('active')
+  }
+
+  $.fn.button = function(options) {
+    return this.each(function () {
+      if (options == 'toggle') {
+        return toggle(this)
+      }
+      options && setState(this, options)
+    })
+  }
+
+  $.fn.button.defaults = {
+    loadingText: 'loading...'
+  }
+
+  $(function () {
+    $('body').delegate('.btn[data-toggle]', 'click', function () {
+      $(this).button('toggle')
+    })
+  })
+
+}( window.jQuery || window.ender );

data/vendor/assets/javascripts/{bootstrap-dropdown.js → twitter/bootstrap/bootstrap-dropdown.js}

@@ -1,5 +1,5 @@
 /* ============================================================
- * bootstrap-dropdown.js v1.3.0
+ * bootstrap-dropdown.js v1.4.0
  * http://twitter.github.com/bootstrap/javascript.html#dropdown
  * ============================================================
  * Copyright 2011 Twitter, Inc.
@@ -20,16 +20,7 @@
 
 !function( $ ){
 
-  var d = 'a.menu, .dropdown-toggle'
-
-  function clearMenus() {
-    $(d).parent('li').removeClass('open')
-  }
-
-  $(function () {
-    $('html').bind("click", clearMenus)
-    $('body').dropdown( '[data-dropdown] a.menu, [data-dropdown] .dropdown-toggle' )
-  })
+  "use strict"
 
   /* DROPDOWN PLUGIN DEFINITION
    * ========================== */
@@ -47,4 +38,18 @@
     })
   }
 
-}( window.jQuery || window.ender )
+  /* APPLY TO STANDARD DROPDOWN ELEMENTS
+   * =================================== */
+
+  var d = 'a.menu, .dropdown-toggle'
+
+  function clearMenus() {
+    $(d).parent('li').removeClass('open')
+  }
+
+  $(function () {
+    $('html').bind("click", clearMenus)
+    $('body').dropdown( '[data-dropdown] a.menu, [data-dropdown] .dropdown-toggle' )
+  })
+
+}( window.jQuery || window.ender );