RubyGems - bootstrap-generators - Versions diffs - 1.4.0 → 2.0.0 - Mend

bootstrap-generators 1.4.0 → 2.0.0

Files changed (101) hide show

data/lib/generators/bootstrap/install/templates/form_builders/simple_form/_form.html.erb CHANGED Viewed

@@ -1,18 +1,16 @@
-<%%= simple_form_for(@<%= singular_table_name %>) do |f| %>
+<%%= simple_form_for(@<%= singular_table_name %>, :defaults => { :input_html => { :class => 'input-xxlarge' } }) do |f| %>
   <%% if @<%= singular_table_name %>.errors.any? %>
-    <div class="alert-message error">
+    <div class="alert alert-error">
+      <a class="close" data-dismiss="alert" href="#">×</a>
       <%%= f.error_notification %>
     </div>
   <%% end %>
-  <div class="inputs">
   <%- attributes.each do |attribute| -%>
     <%%= f.<%= attribute.reference? ? :association : :input %> :<%= attribute.name %> %>
   <%- end -%>
-  </div>
-  <div class="actions">
-    <%%= f.button :submit, :class => "btn primary" %>
+  <div class="form-actions">
+    <%%= f.button :submit, :class => "btn btn-primary" %>
   </div>
 <%% end %>

data/lib/generators/bootstrap/install/templates/form_builders/simple_form/_form.html.haml CHANGED Viewed

@@ -1,13 +1,12 @@
-= simple_form_for(@<%= singular_table_name %>) do |f|
+= simple_form_for(@<%= singular_table_name %>, :defaults => { :input_html => { :class => 'input-xxlarge' } }) do |f|
   -if @<%= singular_table_name %>.errors.any?
-    .alert-message.error
+    .alert.alert-error
+      %a.close{:href => "#", :"data-dismiss" => "alert"} ×
       = f.error_notification
-  .inputs
   <%- attributes.each do |attribute| -%>
-    = f.<%= attribute.reference? ? :association : :input %> :<%= attribute.name %>
+  = f.<%= attribute.reference? ? :association : :input %> :<%= attribute.name %>
   <%- end -%>
-  .actions
-    = f.button :submit, :class => "btn primary"
+  .form-actions
+    = f.button :submit, :class => "btn btn-primary"

data/lib/generators/bootstrap/install/templates/layouts/fluid.html.erb CHANGED Viewed

@@ -16,61 +16,64 @@
   <%%= csrf_meta_tags %>
 </head>
 <body>
-  <div class="topbar">
-    <div class="topbar-inner">
+  <div class="navbar navbar-fixed-top">
+    <div class="navbar-inner">
       <div class="container-fluid">
-        <a class="brand" href="#">Project name</a>
-        <ul class="nav">
-          <li class="active"><a href="#">Home</a></li>
-          <li><a href="#about">About</a></li>
-          <li><a href="#contact">Contact</a></li>
-        </ul>
-        <p class="pull-right">Logged in as <a href="#">username</a></p>
+        <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>
+        <%%= link_to "Project name", "#", :class => "brand" %>
+        <div class="nav-collapse">
+          <ul class="nav">
+            <li class="active"><a href="#">Home</a></li>
+            <li><a href="#about">About</a></li>
+            <li><a href="#contact">Contact</a></li>
+          </ul>
+          <p class="navbar-text pull-right">Logged in as <a href="#">username</a></p>
+        </div>
       </div>
     </div>
   </div>
   <div class="container-fluid">
-    <div class="sidebar">
-      <div class="well">
-        <h5>Sidebar</h5>
-        <ul>
-          <li><a href="#">Link</a></li>
-          <li><a href="#">Link</a></li>
-          <li><a href="#">Link</a></li>
-          <li><a href="#">Link</a></li>
-        </ul>
-        <h5>Sidebar</h5>
-        <ul>
-          <li><a href="#">Link</a></li>
-          <li><a href="#">Link</a></li>
-          <li><a href="#">Link</a></li>
-          <li><a href="#">Link</a></li>
-          <li><a href="#">Link</a></li>
-          <li><a href="#">Link</a></li>
-        </ul>
-        <h5>Sidebar</h5>
-        <ul>
-          <li><a href="#">Link</a></li>
-          <li><a href="#">Link</a></li>
-        </ul>
-      </div>
-    </div>
-    <%% flash.each do |name, msg| %>
-      <%%= content_tag :div, :class => "container alert-message #{name == :error ? "error" : "success" }", :"data-alert" => "alert" do %>
-        <a class="close" href="#">×</a>
-        <p><%%= msg %></p>
-      <%% end %>
-    <%% end %>
-    <div class="content">
-      <div class="row">
-        <div class="span16">
-<%%= yield %>
+    <div class="row-fluid">
+      <div class="span3">
+        <div class="well sidebar-nav">
+          <ul class="nav nav-list">
+            <li class="nav-header">Sidebar</li>
+            <li class="active"><a href="#">Link</a></li>
+            <li><a href="#">Link</a></li>
+            <li><a href="#">Link</a></li>
+            <li><a href="#">Link</a></li>
+            <li class="nav-header">Sidebar</li>
+            <li><a href="#">Link</a></li>
+            <li><a href="#">Link</a></li>
+            <li><a href="#">Link</a></li>
+            <li><a href="#">Link</a></li>
+            <li><a href="#">Link</a></li>
+            <li><a href="#">Link</a></li>
+            <li class="nav-header">Sidebar</li>
+            <li><a href="#">Link</a></li>
+            <li><a href="#">Link</a></li>
+            <li><a href="#">Link</a></li>
+          </ul>
         </div>
       </div>
-      <footer>
-        <p>&copy; Company 2011</p>
-      </footer>
+      <div class="span9">
+        <%% flash.each do |name, msg| %>
+          <%%= content_tag :div, :class => "alert #{name == :error ? "alert-error" : "alert-success" }" do %>
+            <a class="close" data-dismiss="alert" href="#">×</a>
+            <%%= msg %>
+          <%% end %>
+        <%% end %>
+        <%%= yield %>
+      </div>
     </div>
+    <hr>
+    <footer>
+      <p>&copy; Company 2012</p>
+    </footer>
   </div>
 </body>
 </html>

data/lib/generators/bootstrap/install/templates/layouts/fluid.html.haml CHANGED Viewed

@@ -13,61 +13,81 @@
     = javascript_include_tag "application"
     = csrf_meta_tags
   %body
-    .topbar
-      .topbar-inner
+    .navbar.navbar-fixed-top
+      .navbar-inner
         .container-fluid
+          %a.btn.btn-navbar{:"data-toggle" => "collapse", :"data-target" => ".nav-collapse"}
+            %span.icon-bar
+            %span.icon-bar
+            %span.icon-bar
           %a.brand{:href => "#"} Project name
-          %ul.nav
-            %li.active
-              %a{:href => "#"} Home
-            %li
-              %a{:href => "#about"} About
-            %li
-              %a{:href => "#contact"} Contact
-          %p.pull-right
-            Logged in as
-            %a{:href => "#"} username
+          .nav-collapse
+            %ul.nav
+              %li.active
+                %a{:href => "#"} Home
+              %li
+                %a{:href => "#about"} About
+              %li
+                %a{:href => "#contact"} Contact
+            %p.navbar-text.pull-right
+              Logged in as
+              %a{:href => "#"} username
     .container-fluid
-      .sidebar
-        .well
-          %h5 Sidebar
-          %ul
-            %li
-              %a{:href => "#"} Link
-            %li
-              %a{:href => "#"} Link
-            %li
-              %a{:href => "#"} Link
-            %li
-              %a{:href => "#"} Link
-          %h5 Sidebar
-          %ul
-            %li
-              %a{:href => "#"} Link
-            %li
-              %a{:href => "#"} Link
-            %li
-              %a{:href => "#"} Link
-            %li
-              %a{:href => "#"} Link
-            %li
-              %a{:href => "#"} Link
-            %li
-              %a{:href => "#"} Link
-          %h5 Sidebar
-          %ul
-            %li
-              %a{:href => "#"} Link
-            %li
-              %a{:href => "#"} Link
-      - flash.each do |name, msg|
-        = content_tag :div, :class => "container alert-message #{name == :error ? "error" : "success" }", :"data-alert" => "alert" do
-          %a.close{:href => "#"} ×
-          %p= msg
-      .content
-        .row
-          .span16
-            = yield
-        %footer
-          %p © Company 2011 (haml)
+      .row-fluid
+        .span3
+          .well.sidebar-nav
+            %ul.nav.nav-list
+              %li.nav-header
+                Sidebar
+              %li.active
+                %a{:href => "#"}
+                  Link
+              %li
+                %a{:href => "#"}
+                  Link
+              %li
+                %a{:href => "#"}
+                  Link
+              %li
+                %a{:href => "#"}
+                  Link
+              %li.nav-header
+                Sidebar
+              %li
+                %a{:href => "#"}
+                  Link
+              %li
+                %a{:href => "#"}
+                  Link
+              %li
+                %a{:href => "#"}
+                  Link
+              %li
+                %a{:href => "#"}
+                  Link
+              %li
+                %a{:href => "#"}
+                  Link
+              %li
+                %a{:href => "#"}
+                  Link
+              %li.nav-header
+                Sidebar
+              %li
+                %a{:href => "#"}
+                  Link
+              %li
+                %a{:href => "#"}
+                  Link
+              %li
+                %a{:href => "#"}
+                  Link
+        .span9
+          - flash.each do |name, msg|
+            = content_tag :div, :class => "alert #{name == :error ? "alert-error" : "alert-success" }" do
+              %a.close{:href => "#", :"data-dismiss" => "alert"} ×
+              = msg
+          = yield
+      %hr
+      %footer
+        %p &copy; Company 2012

data/lib/generators/bootstrap/install/templates/layouts/hero.html.erb CHANGED Viewed

@@ -16,8 +16,8 @@
   <%%= csrf_meta_tags %>
 </head>
 <body>
-  <div class="topbar">
-    <div class="fill">
+  <div class="navbar navbar-fixed-top">
+    <div class="navbar-inner">
       <div class="container">
         <%%= link_to "Project name", "#", :class => "brand" %>
         <ul class="nav">
@@ -28,20 +28,17 @@
       </div>
     </div>
   </div>
-  <%% flash.each do |name, msg| %>
-    <%%= content_tag :div, :class => "container alert-message #{name == :error ? "error" : "success" }", :"data-alert" => "alert" do %>
-      <a class="close" href="#">×</a>
-      <p><%%= msg %></p>
-    <%% end %>
-  <%% end %>
   <div class="container">
-    <div class="row">
-      <div class="span16">
-<%%= yield %>
-      </div>
-    </div>
+    <%% flash.each do |name, msg| %>
+      <%%= content_tag :div, :class => "alert #{name == :error ? "alert-error" : "alert-success" }" do %>
+        <a class="close" data-dismiss="alert" href="#">×</a>
+        <%%= msg %>
+      <%% end %>
+    <%% end %>
+    <%%= yield %>
+    <hr>
     <footer>
-      <p>&copy; Company 2011</p>
+      <p>&copy; Company 2012</p>
     </footer>
   </div>
 </body>

data/lib/generators/bootstrap/install/templates/layouts/hero.html.haml CHANGED Viewed

@@ -13,8 +13,8 @@
     = javascript_include_tag "application"
     = csrf_meta_tags
   %body
-    .topbar
-      .fill
+    .navbar.navbar-fixed-top
+      .navbar-inner
         .container
           = link_to "Project name", "#", :class => "brand"
           %ul.nav
@@ -24,14 +24,12 @@
               %a{:href => "#about"} About
             %li
               %a{:href => "#contact"} Contact
-    - flash.each do |name, msg|
-      = content_tag :div, :class => "container alert-message #{name == :error ? "error" : "success" }", :"data-alert" => "alert" do
-        %a.close{:href => "#"} ×
-        %p= msg
     .container
-      .row
-        .span16
-          = yield
+      - flash.each do |name, msg|
+        = content_tag :div, :class => "alert #{name == :error ? "alert-error" : "alert-success" }" do
+          %a.close{:href => "#", :"data-dismiss" => "alert"} ×
+          = msg
+      = yield
+      %hr
       %footer
-        %p © Company 2011 (haml)
+        %p &copy; Company 2012

data/lib/generators/bootstrap/install/templates/lib/templates/erb/scaffold/edit.html.erb CHANGED Viewed

@@ -1,6 +1,12 @@
 <div class="page-header">
-  <%%= link_to 'Back', <%= index_helper %>_path, :class => 'btn' %>
-  <%%= link_to 'Show', @<%= singular_table_name %>, :class => 'btn primary' %>
+  <%%= link_to <%= index_helper %>_path, :class => 'btn' do %>
+    <i class="icon-list-alt"></i>
+    Back
+  <%% end %>
+  <%%= link_to @<%= singular_table_name %>, :class => 'btn btn-primary' do %>
+    <i class="icon-info-sign icon-white"></i>
+    Show
+  <%% end %>
   <h1>Editing <%= singular_table_name %></h1>
 </div>

data/lib/generators/bootstrap/install/templates/lib/templates/erb/scaffold/index.html.erb CHANGED Viewed

@@ -1,9 +1,12 @@
 <div class="page-header">
-  <%%= link_to 'New <%= human_name %>', new_<%= singular_table_name %>_path, :class => 'btn primary' %>
+  <%%= link_to new_<%= singular_table_name %>_path, :class => 'btn btn-primary' do %>
+    <i class="icon-plus icon-white"></i>
+    New <%= human_name %>
+  <%% end %>
   <h1>Listing <%= plural_table_name %></h1>
 </div>
-<table class="zebra-striped">
+<table class="table table-bordered table-striped">
   <thead>
     <tr>
 <% attributes.each do |attribute| -%>

data/lib/generators/bootstrap/install/templates/lib/templates/erb/scaffold/new.html.erb CHANGED Viewed

@@ -1,5 +1,8 @@
 <div class="page-header">
-  <%%= link_to 'Back', <%= index_helper %>_path, :class => 'btn' %>
+  <%%= link_to <%= index_helper %>_path, :class => 'btn' do %>
+    <i class="icon-list-alt"></i>
+    Back
+  <%% end %>
   <h1>New <%= singular_table_name %></h1>
 </div>

data/lib/generators/bootstrap/install/templates/lib/templates/erb/scaffold/show.html.erb CHANGED Viewed

@@ -1,6 +1,12 @@
 <div class="page-header">
-  <%%= link_to 'Back', <%= index_helper %>_path, :class => 'btn' %>
-  <%%= link_to 'Edit', edit_<%= singular_table_name %>_path(@<%= singular_table_name %>), :class => 'btn primary' %>
+  <%%= link_to <%= index_helper %>_path, :class => 'btn' do %>
+    <i class="icon-list-alt"></i>
+    Back
+  <%% end %>
+  <%%= link_to edit_<%= singular_table_name %>_path(@<%= singular_table_name %>), :class => 'btn btn-primary' do %>
+    <i class="icon-pencil icon-white"></i>
+    Edit
+  <%% end %>
   <h1>Listing <%= plural_table_name %></h1>
 </div>

data/lib/generators/bootstrap/install/templates/lib/templates/haml/scaffold/edit.html.haml CHANGED Viewed

@@ -1,6 +1,10 @@
 .page-header
-  = link_to 'Back', <%= index_helper %>_path, :class => 'btn'
-  = link_to 'Show', @<%= singular_table_name %>, :class => 'btn primary'
+  = link_to <%= index_helper %>_path, :class => 'btn' do
+    %i.icon-list-alt
+    Back
+  = link_to @<%= singular_table_name %>, :class => 'btn btn-primary' do
+    %i.icon-info-sign.icon-white
+    Show
   %h1 Editing <%= singular_table_name %>
 = render 'form'

data/lib/generators/bootstrap/install/templates/lib/templates/haml/scaffold/index.html.haml CHANGED Viewed

@@ -1,8 +1,10 @@
 .page-header
-  = link_to 'New <%= human_name %>', new_<%= singular_table_name %>_path, :class => 'btn primary'
+  = link_to new_<%= singular_table_name %>_path, :class => 'btn btn-primary' do
+    %i.icon-plus.icon-white
+    New <%= human_name %>
   %h1 Listing <%= plural_table_name %>
-%table.zebra-striped
+%table.table.table-bordered.table-striped
   %thead
     %tr
 <% for attribute in attributes -%>