twitter-bootstrap-rails 2.1.7 → 2.2.8

data/{vendor → app}/assets/stylesheets/twitter-bootstrap-static/sprites.css.erb

@@ -3,7 +3,7 @@
 .hide-text{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0;}
 .input-block-level{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;}
 [class^="icon-"],[class*=" icon-"]{display:inline-block;width:14px;height:14px;*margin-right:.3em;line-height:14px;vertical-align:text-top;background-image:url("<%= asset_path 'twitter/bootstrap/glyphicons-halflings.png' %>");background-position:14px 14px;background-repeat:no-repeat;margin-top:1px;}
-.icon-white,.nav-pills>.active>a>[class^="icon-"],.nav-pills>.active>a>[class*=" icon-"],.nav-list>.active>a>[class^="icon-"],.nav-list>.active>a>[class*=" icon-"],.navbar-inverse .nav>.active>a>[class^="icon-"],.navbar-inverse .nav>.active>a>[class*=" icon-"],.dropdown-menu>li>a:hover>[class^="icon-"],.dropdown-menu>li>a:hover>[class*=" icon-"],.dropdown-menu>.active>a>[class^="icon-"],.dropdown-menu>.active>a>[class*=" icon-"],.dropdown-submenu:hover>a>[class^="icon-"],.dropdown-submenu:hover>a>[class*=" icon-"]{background-image:url("<%= asset_path 'twitter/bootstrap/glyphicons-halflings-white.png' %>");}
+.icon-white,.nav-pills>.active>a>[class^="icon-"],.nav-pills>.active>a>[class*=" icon-"],.nav-list>.active>a>[class^="icon-"],.nav-list>.active>a>[class*=" icon-"],.navbar-inverse .nav>.active>a>[class^="icon-"],.navbar-inverse .nav>.active>a>[class*=" icon-"],.dropdown-menu>li>a:hover>[class^="icon-"],.dropdown-menu>li>a:focus>[class^="icon-"],.dropdown-menu>li>a:hover>[class*=" icon-"],.dropdown-menu>li>a:focus>[class*=" icon-"],.dropdown-menu>.active>a>[class^="icon-"],.dropdown-menu>.active>a>[class*=" icon-"],.dropdown-submenu:hover>a>[class^="icon-"],.dropdown-submenu:focus>a>[class^="icon-"],.dropdown-submenu:hover>a>[class*=" icon-"],.dropdown-submenu:focus>a>[class*=" icon-"]{background-image:url("<%= asset_path 'twitter/bootstrap/glyphicons-halflings-white.png' %>");}
 .icon-glass{background-position:0 0;}
 .icon-music{background-position:-24px 0;}
 .icon-search{background-position:-48px 0;}
@@ -120,7 +120,7 @@
 .icon-chevron-down{background-position:-313px -119px;}
 .icon-retweet{background-position:-336px -120px;}
 .icon-shopping-cart{background-position:-360px -120px;}
-.icon-folder-close{background-position:-384px -120px;}
+.icon-folder-close{background-position:-384px -120px;width:16px;}
 .icon-folder-open{background-position:-408px -120px;width:16px;}
 .icon-resize-vertical{background-position:-432px -119px;}
 .icon-resize-horizontal{background-position:-456px -118px;}

data/app/helpers/badge_label_helper.rb

@@ -0,0 +1,16 @@
+module BadgeLabelHelper
+  def badge(*args)
+    badge_label(:badge, *args)
+  end
+
+  def tag_label(*args)
+    badge_label(:label, *args)
+  end
+
+  private
+  def badge_label(what, value, type = nil)
+    klass = [what]
+    klass << "#{what}-#{type}" if type.present?
+    content_tag :span, value, :class => "#{klass.join(' ')}"
+  end
+end

data/app/helpers/bootstrap_flash_helper.rb

@@ -1,17 +1,23 @@
-module BootstrapFlashHelper  
+module BootstrapFlashHelper
+  ALERT_TYPES = [:error, :info, :success, :warning]
+
   def bootstrap_flash
-   flash_messages = []
-   flash.each do |type, message|
-     # Skip Devise :timeout and :timedout flags
-     next if type == :timeout
-     next if type == :timedout
-     type = :success if type == :notice
-     type = :error   if type == :alert
-     text = content_tag(:div, 
-              content_tag(:button, raw("×"), :class => "close", "data-dismiss" => "alert") +
-              message, :class => "alert fade in alert-#{type}")
-     flash_messages << text if message
-   end
-   flash_messages.join("\n").html_safe
- end
-end
+    flash_messages = []
+    flash.each do |type, message|
+      # Skip empty messages, e.g. for devise messages set to nothing in a locale file.
+      next if message.blank?
+      
+      type = :success if type == :notice
+      type = :error   if type == :alert
+      next unless ALERT_TYPES.include?(type)
+
+      Array(message).each do |msg|
+        text = content_tag(:div,
+                           content_tag(:button, raw("&times;"), :class => "close", "data-dismiss" => "alert") +
+                           msg.html_safe, :class => "alert fade in alert-#{type}")
+        flash_messages << text if msg
+      end
+    end
+    flash_messages.join("\n").html_safe
+  end
+end

data/app/helpers/glyph_helper.rb

@@ -4,9 +4,14 @@ module GlyphHelper
   # # => <i class="icon-share-alt"></i>
   # glyph(:lock, :white)
   # # => <i class="icon-lock icon-white"></i>
+  # glyph(:thumbs_up, :pull_left)
+  # # => <i class="icon-thumbs-up pull-left"></i>
 
   def glyph(*names)
-    content_tag :i, nil, :class => names.map{|name| "icon-#{name.to_s.gsub('_','-')}" }
+    names.map! { |name| name.to_s.gsub('_','-') }
+    names.map! do |name|
+      name =~ /pull-(?:left|right)/ ? name : "icon-#{name}"
+    end
+    content_tag :i, nil, :class => names
   end
 end
-

data/app/helpers/modal_helper.rb

@@ -1,42 +1,55 @@
 module ModalHelper
-  def modal_dialog(options = {}, escape = true, &block)
-    default_options = {:class => "bootstrap-modal modal"}
-    content_tag :div, nil, options.merge(default_options), escape, &block
+
+  #modals have a header, a body, a footer for options.
+  def modal_dialog(options = {}, &block)
+    content_tag :div, :id => options[:id], :class => "bootstrap-modal modal hide fade" do
+      modal_header(options[:header]) +
+      modal_body(options[:body]) +
+      modal_footer(options[:footer])
+    end
   end
 
-  def modal_header(options = {}, escape = true, &block)
-    default_options = {:class => 'modal-header'}
-    content_tag :div, nil, options.merge(default_options), escape do
-      raw("<button class=\"close\" data-dismiss=\"modal\">&times;</button>" + capture(&block))
+  def modal_header(options = {}, &block)
+    content_tag :div, :class => 'modal-header' do
+      if options[:show_close] 
+        close_button(options[:dismiss]) +
+        content_tag(:h3, options[:title], &block)
+      else
+        content_tag(:h3, options[:title], &block)
+      end	
     end
   end
 
-  def modal_body(options = {}, escape = true, &block)
-    default_options = {:class => 'modal-body'}
-    content_tag :div, nil, options.merge(default_options), escape, &block
+  def modal_body(options = {}, &block)
+    content_tag :div, options, :class => 'modal-body', &block
   end
 
-  def modal_footer(options = {}, escape = true, &block)
-    default_options = {:class => 'modal-footer'}
-    content_tag :div, nil, options.merge(default_options), escape, &block
+  def modal_footer(options = {}, &block)
+    content_tag :div, options, :class => 'modal-footer', &block
+  end
+
+  def close_button(dismiss)
+    #It doesn't seem to like content_tag, so we do this instead.	
+    raw("<button class=\"close\" data-dismiss=\"#{dismiss}\">&times;</button>")
   end
 
   def modal_toggle(content_or_options = nil, options = {}, &block)
     if block_given?
       options = content_or_options if content_or_options.is_a?(Hash)
-      default_options = {:class => 'btn', "data-toggle" => "modal", "href" => options[:dialog]}.merge(options)
+      default_options = { :class => 'btn', "data-toggle" => "modal", "href" => options[:dialog] }.merge(options)
 
       content_tag :a, nil, default_options, true, &block
     else
-      default_options = {:class => 'btn', "data-toggle" => "modal", "href" => options[:dialog]}.merge(options)
+      default_options = { :class => 'btn', "data-toggle" => "modal", "href" => options[:dialog] }.merge(options)
       content_tag :a, content_or_options, default_options, true
     end
   end
 
   def modal_cancel_button content, options = {}
-    default_options = {:class => "btn bootstrap-modal-cancel-button"}
+    default_options = { :class => "btn bootstrap-modal-cancel-button" }
 
     content_tag_string "a", content, default_options.merge(options)
   end
+
 end
 

data/app/helpers/navbar_helper.rb

@@ -0,0 +1,194 @@
+#Credit for this goes to https://github.com/julescopeland/Rails-Bootstrap-Navbar
+module NavbarHelper
+  def nav_bar(options={}, &block)
+    nav_bar_div(options) do
+      navbar_inner_div do
+        container_div(options[:brand], options[:brand_link], options[:responsive], options[:fluid]) do
+          yield if block_given?
+        end
+      end
+    end
+  end
+
+  def menu_group(options={}, &block)
+    pull_class = "pull-#{options[:pull].to_s}" if options[:pull].present?
+    content_tag(:ul, :class => "nav #{pull_class}", &block)
+  end
+
+  def menu_item(name=nil, path="#", *args, &block)
+    path = name || path if block_given?
+    options = args.extract_options!
+    content_tag :li, :class => is_active?(path, options) do
+      name, path = path, options if block_given?
+      link_to name, path, options, &block
+    end
+  end
+
+  def drop_down(name)
+    content_tag :li, :class => "dropdown" do
+      drop_down_link(name) + drop_down_list { yield }
+    end
+  end
+
+  def drop_down_with_submenu(name, &block)
+    content_tag :li, :class => "dropdown" do
+      drop_down_link(name) + drop_down_sublist(&block)
+    end
+  end
+
+  def drop_down_sublist(&block)
+    content_tag :ul, :class => "dropdown-menu", &block
+  end
+
+  def drop_down_submenu(name, &block)
+    content_tag :li, :class => "dropdown-submenu" do
+      link_to(name, "") + drop_down_list(&block)
+    end
+  end
+
+  def drop_down_divider
+    content_tag :li, "", :class => "divider"
+  end
+
+  def drop_down_header(text)
+    content_tag :li, text, :class => "nav-header"
+  end
+
+  def menu_divider
+    content_tag :li, "", :class => "divider-vertical"
+  end
+
+  def menu_text(text=nil, options={}, &block)
+    pull       = options.delete(:pull)
+    pull_class = pull.present? ? "pull-#{pull.to_s}" : nil
+    options.append_merge!(:class, pull_class)
+    options.append_merge!(:class, "navbar-text")
+    content_tag :p, options do
+      text || yield
+    end
+  end
+
+  # Returns current url or path state (useful for buttons).
+  # Example:
+  #   # Assume we'r currently at blog/categories/test
+  #   uri_state('/blog/categories/test', {})               # :active
+  #   uri_state('/blog/categories', {})                    # :chosen
+  #   uri_state('/blog/categories/test', {method: delete}) # :inactive
+  #   uri_state('/blog/categories/test/3', {})             # :inactive
+  def uri_state(uri, options={})
+    root_url = request.host_with_port + '/'
+    root = uri == '/' || uri == root_url
+
+    request_uri = if uri.start_with?(root_url)
+      request.url
+    else
+      request.path
+    end
+
+    if !options[:method].nil? || !options["data-method"].nil?
+      :inactive
+    elsif uri == request_uri
+      :active
+    else
+      if request_uri.start_with?(uri) and not(root)
+        :chosen
+      else
+        :inactive
+      end
+    end
+  end  
+
+  private
+
+  def nav_bar_div(options, &block)
+
+    position = "static-#{options[:static].to_s}" if options[:static]
+    position = "fixed-#{options[:fixed].to_s}" if options[:fixed]
+    inverse = (options[:inverse].present? && options[:inverse] == true) ? true : false
+
+    content_tag :div, :class => nav_bar_css_class(position, inverse) do
+      yield
+    end
+  end
+
+  def navbar_inner_div(&block)
+    content_tag :div, :class => "navbar-inner" do
+      yield
+    end
+  end
+
+  def container_div(brand, brand_link, responsive, fluid, &block)
+    content_tag :div, :class => "container#{"-fluid" if fluid}" do
+      container_div_with_block(brand, brand_link, responsive, &block)
+    end
+  end
+
+  def container_div_with_block(brand, brand_link, responsive, &block)
+    output = []
+    if responsive == true
+      output << responsive_button
+      output << brand_link(brand, brand_link)
+      output << responsive_div { capture(&block) }
+    else
+      output << brand_link(brand, brand_link)
+      output << capture(&block)
+    end
+    output.join("\n").html_safe
+  end
+
+  def nav_bar_css_class(position, inverse = false)
+    css_class = ["navbar"]
+    css_class << "navbar-#{position}" if position.present?
+    css_class << "navbar-inverse" if inverse
+    css_class.join(" ")
+  end
+
+  def brand_link(name, url)
+    return "" if name.blank?
+    url ||= root_url
+    link_to(name, url, :class => "brand")
+  end
+
+  def responsive_button
+    %{<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+	        <span class="icon-bar"></span>
+	        <span class="icon-bar"></span>
+	        <span class="icon-bar"></span>
+	      </a>}
+  end
+
+  def responsive_div(&block)
+    content_tag(:div, :class => "nav-collapse collapse", &block)
+  end
+
+  def is_active?(path, options={})
+    "active" if uri_state(path, options).in?([:active, :chosen])
+  end
+
+  def name_and_caret(name)
+    "#{name} #{content_tag(:b, :class => "caret") {}}".html_safe
+  end
+
+  def drop_down_link(name)
+    link_to(name_and_caret(name), "#", :class => "dropdown-toggle", "data-toggle" => "dropdown")
+  end
+
+  def drop_down_list(&block)
+    content_tag :ul, :class => "dropdown-menu", &block
+  end
+end
+
+class Hash
+  # appends a string to a hash key's value after a space character (Good for merging CSS classes in options hashes)
+  def append_merge!(key, value)
+    # just return self if value is blank
+    return self if value.blank?
+
+    current_value = self[key]
+    # just merge if it doesn't already have that key
+    self[key] = value and return if current_value.blank?
+    # raise error if we're trying to merge into something that isn't a string
+    raise ArgumentError, "Can only merge strings" unless current_value.is_a?(String)
+    self[key] = [current_value, value].compact.join(" ")
+  end
+end

data/app/helpers/twitter_breadcrumbs_helper.rb

@@ -1,5 +1,10 @@
 module TwitterBreadcrumbsHelper
-  def render_breadcrumbs(divider = '/')
-    render :partial => 'twitter-bootstrap/breadcrumbs', :locals => { :divider => divider }
+  def render_breadcrumbs(divider = '/', &block)
+    content = render :partial => 'twitter-bootstrap/breadcrumbs', :layout => false, :locals => { :divider => divider }
+    if block_given?
+      capture(content, &block)
+    else
+      content
+    end
   end
 end

data/app/views/twitter-bootstrap/_breadcrumbs.html.erb

@@ -1,6 +1,6 @@
 <% if @breadcrumbs.present? %>
   <ul class="breadcrumb">
-    <% separator = divider %>
+    <% separator = divider.html_safe %>
     <% @breadcrumbs[0..-2].each do |crumb| %>
       <li>
         <%= link_to crumb[:name], crumb[:url], crumb[:options] %>
@@ -11,4 +11,4 @@
       <%= @breadcrumbs.last[:name] %>
     </li>
   </ul>
-<% end %>
+<% end %>

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

@@ -10,20 +10,24 @@ module Bootstrap
 
       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"
+        js_manifest = 'app/assets/javascripts/application.js'
+
+        if File.exist?(js_manifest)
+          insert_into_file js_manifest, "//= require twitter/bootstrap\n", :after => "jquery_ujs\n"
         else
-          copy_file "application.js", "app/assets/javascripts/application.js"
+          copy_file "application.js", js_manifest
         end
 
-        if File.exist?('app/assets/stylesheets/application.css')
+        css_manifest = 'app/assets/stylesheets/application.css'
+
+        if File.exist?(css_manifest)
           # Add our own require:
-          content = File.read("app/assets/stylesheets/application.css")
+          content = File.read(css_manifest)
           if content.match(/require_tree\s+\.\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"
+            insert_into_file css_manifest, style_require_block, :after => "require_self\n"
           end
         else
           copy_file "application.css", "app/assets/stylesheets/application.css"
@@ -44,6 +48,15 @@ module Bootstrap
         end
       end
 
+      def add_locale
+        if File.exist?("config/locales/en.bootstrap.yml")
+          localez = File.read("config/locales/en.bootstrap.yml")
+          insert_into_file "config/locales/en.bootstrap.yml", localez, :after => "en\n"
+        else
+          copy_file "en.bootstrap.yml", "config/locales/en.bootstrap.yml"
+        end
+      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|, "")

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

@@ -1,4 +1,3 @@
 jQuery ->
-  $("a[rel=popover]").popover()
-  $(".tooltip").tooltip()
-  $("a[rel=tooltip]").tooltip()
+  $("a[rel~=popover], .has-popover").popover()
+  $("a[rel~=tooltip], .has-tooltip").tooltip()

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

@@ -1,5 +1,4 @@
 jQuery(function() {
-  $("a[rel=popover]").popover();
-  $(".tooltip").tooltip();
-  $("a[rel=tooltip]").tooltip();
+  $("a[rel~=popover], .has-popover").popover();
+  $("a[rel~=tooltip], .has-tooltip").tooltip();
 });

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

@@ -2,20 +2,18 @@
 @import "twitter/bootstrap/responsive";
 
 // Set the correct sprite paths
-@iconSpritePath: asset-path("twitter/bootstrap/glyphicons-halflings");
-@iconWhiteSpritePath: asset-path("twitter/bootstrap/glyphicons-halflings-white");
+@iconSpritePath: image-url("twitter/bootstrap/glyphicons-halflings.png");
+@iconWhiteSpritePath: image-url("twitter/bootstrap/glyphicons-halflings-white.png");
 
 // Set the Font Awesome (Font Awesome is default. You can disable by commenting below lines)
-// Note: If you use asset_path() here, your compiled bootstrap_and_overrides.css will not
-//       have the proper paths. So for now we use the absolute path.
-@fontAwesomeEotPath: asset-path("fontawesome-webfont.eot");
-@fontAwesomeEotPath_iefix: asset-path("fontawesome-webfont.eot#iefix");
-@fontAwesomeWoffPath: asset-path("fontawesome-webfont.woff");
-@fontAwesomeTtfPath: asset-path("fontawesome-webfont.ttf");
-@fontAwesomeSvgPath: asset-path("fontawesome-webfont.svg");
+@fontAwesomeEotPath: asset-url("fontawesome-webfont.eot");
+@fontAwesomeEotPath_iefix: asset-url("fontawesome-webfont.eot?#iefix");
+@fontAwesomeWoffPath: asset-url("fontawesome-webfont.woff");
+@fontAwesomeTtfPath: asset-url("fontawesome-webfont.ttf");
+@fontAwesomeSvgPath: asset-url("fontawesome-webfont.svg#fontawesomeregular");
 
 // Font Awesome
-@import "fontawesome";
+@import "fontawesome/font-awesome";
 
 // Glyphicons
 //@import "twitter/bootstrap/sprites.less";

data/lib/generators/bootstrap/install/templates/en.bootstrap.yml

@@ -0,0 +1,18 @@
+# Sample localization file for English. Add more files in this directory for other locales.
+# See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
+
+en:
+  helpers:
+    actions: "Actions"
+    links:
+      back: "Back"
+      cancel: "Cancel"
+      confirm: "Are you sure?"
+      destroy: "Delete"
+      new: "New"
+      edit: "Edit"
+    titles:
+      edit: "Edit %{model}"
+      save: "Save %{model}"
+      new: "New %{model}"
+      delete: "Delete %{model}"

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

@@ -16,23 +16,25 @@
 
     <!-- For third-generation iPad with high-resolution Retina display: -->
     <!-- Size should be 144 x 144 pixels -->
-    <%%= favicon_link_tag 'images/apple-touch-icon-144x144-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type => 'image/png', :sizes => '144x144' %>
+    <%%= favicon_link_tag 'apple-touch-icon-144x144-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type => 'image/png', :sizes => '144x144' %>
 
     <!-- For iPhone with high-resolution Retina display: -->
     <!-- Size should be 114 x 114 pixels -->
-    <%%= favicon_link_tag 'images/apple-touch-icon-114x114-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type => 'image/png', :sizes => '114x114' %>
+    <%%= favicon_link_tag 'apple-touch-icon-114x114-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type => 'image/png', :sizes => '114x114' %>
 
     <!-- For first- and second-generation iPad: -->
     <!-- Size should be 72 x 72 pixels -->
-    <%%= favicon_link_tag 'images/apple-touch-icon-72x72-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type => 'image/png', :sizes => '72x72' %>
+    <%%= favicon_link_tag 'apple-touch-icon-72x72-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type => 'image/png', :sizes => '72x72' %>
 
     <!-- For non-Retina iPhone, iPod Touch, and Android 2.1+ devices: -->
     <!-- Size should be 57 x 57 pixels -->
-    <%%= favicon_link_tag 'images/apple-touch-icon-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type => 'image/png' %>
+    <%%= favicon_link_tag 'apple-touch-icon-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type => 'image/png' %>
 
     <!-- For all other devices -->
     <!-- Size should be 32 x 32 pixels -->
-    <%%= favicon_link_tag 'images/favicon.ico', :rel => 'shortcut icon' %>
+    <%%= favicon_link_tag 'favicon.ico', :rel => 'shortcut icon' %>
+
+    <%%= javascript_include_tag "application" %>
   </head>
   <body>
 
@@ -77,7 +79,8 @@
       <%- else -%>
         <div class="row">
           <div class="span9">
-             <%%= yield %>
+            <%%= bootstrap_flash %>
+            <%%= yield %>
           </div>
           <div class="span3">
             <div class="well sidebar-nav">
@@ -94,15 +97,10 @@
       <%- end -%>
 
       <footer>
-        <p>&copy; Company 2012</p>
+        <p>&copy; Company <%= Date.today.year %></p>
       </footer>
 
     </div> <!-- /container -->
 
-    <!-- Javascripts
-    ================================================== -->
-    <!-- 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.haml

@@ -10,11 +10,12 @@
     /[if lt IE 9]
       = javascript_include_tag "//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.6.1/html5shiv.js"
     = stylesheet_link_tag "application", :media => "all"
-    %link(href="images/apple-touch-icon-144x144.png" rel="apple-touch-icon-precomposed" sizes="144x144")
-    %link(href="images/apple-touch-icon-114x114.png" rel="apple-touch-icon-precomposed" sizes="114x114")
-    %link(href="images/apple-touch-icon-72x72.png" rel="apple-touch-icon-precomposed" sizes="72x72")
-    %link(href="images/apple-touch-icon.png" rel="apple-touch-icon-precomposed")
-    %link(href="images/favicon.ico" rel="shortcut icon")
+    = favicon_link_tag 'apple-touch-icon-144x144-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type => 'image/png', :sizes => '144x144'
+    = favicon_link_tag 'apple-touch-icon-114x114-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type => 'image/png', :sizes => '114x114'
+    = favicon_link_tag 'apple-touch-icon-72x72-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type => 'image/png', :sizes => '72x72'
+    = favicon_link_tag 'apple-touch-icon-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type => 'image/png'
+    = favicon_link_tag 'favicon.ico', :rel => 'shortcut icon'
+    = javascript_include_tag "application"
 
 
   %body
@@ -44,6 +45,7 @@
               %li= link_to "Link 2", "/path2"
               %li= link_to "Link 3", "/path3"
         .span9
+          = bootstrap_flash
           = yield
     <% else %>
       .row
@@ -60,9 +62,4 @@
               %li= link_to "Link 3", "/path3"
     <% end %>
       %footer
-        %p &copy; Company 2012
-    /
-      Javascripts
-      \==================================================
-    / Placed at the end of the document so the pages load faster
-    = javascript_include_tag "application"
+        %p &copy; Company <%= Date.today.year %>

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

@@ -11,11 +11,14 @@ html lang="en"
     /[if lt IE 9]
       = javascript_include_tag "//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.6.1/html5shiv.js"
     = stylesheet_link_tag "application", :media => "all"
-    link href="images/apple-touch-icon-144x144.png" rel="apple-touch-icon-precomposed" sizes="144x144"
-    link href="images/apple-touch-icon-114x114.png" rel="apple-touch-icon-precomposed" sizes="114x114"
-    link href="images/apple-touch-icon-72x72.png" rel="apple-touch-icon-precomposed" sizes="72x72"
-    link href="images/apple-touch-icon.png" rel="apple-touch-icon-precomposed"
-    link href="images/favicon.ico" rel="shortcut icon"
+    = favicon_link_tag 'apple-touch-icon-144x144-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type => 'image/png', :sizes => '144x144'
+    = favicon_link_tag 'apple-touch-icon-114x114-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type => 'image/png', :sizes => '114x114'
+    = favicon_link_tag 'apple-touch-icon-72x72-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type => 'image/png', :sizes => '72x72'
+    = favicon_link_tag 'apple-touch-icon-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type => 'image/png'
+    = favicon_link_tag 'favicon.ico', :rel => 'shortcut icon'
+    = javascript_include_tag "application"
+
+
 
   body
     .navbar.navbar-<%= layout_type %>-top
@@ -44,6 +47,7 @@ html lang="en"
               li= link_to "Link 2", "/path2"
               li= link_to "Link 3", "/path3"
         .span9
+          = bootstrap_flash
           = yield
     <% else %>
       .row
@@ -60,9 +64,4 @@ html lang="en"
               li= link_to "Link 3", "/path3"
     <% end %>
       footer
-        p &copy; Company 2012
-    /!
-      Javascripts
-      \==================================================
-    /! Placed at the end of the document so the pages load faster
-    = javascript_include_tag "application"
+        p &copy; Company <%= Date.today.year %>

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

@@ -1,6 +1,5 @@
 <%%- model_class = <%= resource_name.classify %> -%>
 <div class="page-header">
-  <h1><%%=t '.title', :default => t('helpers.titles.edit', :model => model_class.model_name.human,
-                                   :default => "Edit #{model_class.model_name.human}") %></h1>
+  <h1><%%=t '.title', :default => [:'helpers.titles.edit', 'Edit %{model}'], :model => model_class.model_name.human.titleize %></h1>
 </div>
 <%%= render :partial => 'form' %>