beautiful_scaffold 0.3.3 → 0.3.4

data/lib/generators/templates/app/views/_form.html.erb

@@ -5,7 +5,7 @@ if not namespace_alone.blank? then
 end
 -%>
 
-<%%= form_for(<%= strformfor %>, :html => { :class => "form-horizontal" }) do |f| %>
+<%%= form_for(<%= strformfor %>) do |f| %>
   <%% if @<%= singular_table_name %>.errors.any? %>
     <div id="error_explanation">
       <h2><%%= pluralize(@<%= singular_table_name %>.errors.count, "error") %> prohibited this <%= singular_table_name %> from being saved:</h2>
@@ -16,7 +16,7 @@ end
     </div>
   <%% end %>
   <%= render_partial 'app/views/partials/_form_field.html.erb' %><!-- Beautiful_scaffold - AddField - Do not remove -->
-  <div class="form-actions">
+  <div>
     <%%= f.submit :class => "btn btn-primary" %>
   </div>
 <%% end %>

data/lib/generators/templates/app/views/_form_habtm_tag.html.erb

@@ -13,9 +13,9 @@
 %>
 <% path_namespace = '/' + namespace_bs if not namespace_bs.blank? %>
 
-<div class="control-group">
+<div class="form-group">
     <%= f.label plural_linked_model_name.to_sym, t(plural_linked_model_name.to_sym, :default => plural_linked_model_name.capitalize), :class => "control-label" %>
-    <div class="controls">
+    <div>
         <ul class="bs-tagit" id="<%= model_name %>_<%= linked_model_name %>_ids" name="<%= model_name %>[<%= linked_model_name %>_ids][]" data-url="<%= path_namespace %>/<%= plural_linked_model_name %>/search_and_filter.json" data-param="q[<%= field_to_search_for_linked_model %>_cont]" data-result="caption">
           <% begin %>
             <% for elt in model_class.send(plural_linked_model_name) %>

data/lib/generators/templates/app/views/_mass_inserting.html.erb

@@ -3,7 +3,7 @@
   <% formparams << namespace %>
 <% end %>
 <% formparams << model_name.camelize.constantize.new %>
-<%= form_for formparams, :method => :post, :html => { :class => "well well-small form-horizontal mass-inserting #{(params[:mass_inserting] ? 'setfocus' : '')}" } do |f| %>
+<%= form_for formparams, :method => :post, :html => { :class => "well well-small form-inline mass-inserting #{(params[:mass_inserting] ? 'setfocus' : '')}" } do |f| %>
   <%= hidden_field_tag :mass_inserting, true %>
   <% for col in model_columns %>
     <div <%= visible_column(model_name, col, 'inline') %> class="col-<%= col %>">
@@ -13,24 +13,24 @@
           case ar.type
           when :integer then
             if col =~ /.*_id/ then
-              f.collection_select((col).to_sym, col.camelize.constantize.all, :id, :caption, { :include_blank => true, :selected => (begin params[:q][col + "_eq"].to_i rescue '' end) }, { :class => "input-small" })
+              f.collection_select((col).to_sym, col.camelize.constantize.all, :id, :caption, { :include_blank => true, :selected => (begin params[:q][col + "_eq"].to_i rescue '' end) }, {:class => "form-control"})
             else
-              f.text_field(col.to_sym, :class => "input-small", :placeholder => t(i18n_translate_path(model_name, col)).capitalize)
+              f.text_field(col.to_sym, :placeholder => t(i18n_translate_path(model_name, col)).capitalize, :class => "form-control")
             end
           when :boolean then
             (
             "<label class='bs-label-ib'>#{f.check_box(col.to_sym, {}, true, false)}#{t(i18n_translate_path(model_name, col)).capitalize}</label>".html_safe
             )
           else
-            f.text_field(col.to_sym, :class => "input-small", :placeholder => t(i18n_translate_path(model_name, col)).capitalize)
+            f.text_field(col.to_sym, :placeholder => t(i18n_translate_path(model_name, col)).capitalize, :class => "form-control")
           end
         else
-          f.collection_select((col + '_id').to_sym, col.camelize.constantize.all, :id, :caption, { :include_blank => true, :selected => (begin params[:q][col + "_id_eq"].to_i rescue '' end) }, { :class => "input-small" })
+          f.collection_select((col + '_id').to_sym, col.camelize.constantize.all, :id, :caption, { :include_blank => true, :selected => (begin params[:q][col + "_id_eq"].to_i rescue '' end) }, {:class => "form-control"})
         end
       %>
     </div>
   <% end %>
   <div style="display:inline;">
-    <%= f.submit t(:create, :default => "Create"), :class => "btn" %>
+    <%= f.submit t(:create, :default => "Create"), :class => "btn btn-default" %>
   </div>
 <% end %>

data/lib/generators/templates/app/views/_modal_columns.html.erb

@@ -1,17 +1,21 @@
-<div class="modal hide" id="modal-columns">
-  <div class="modal-header">
-    <button type="button" class="close" data-dismiss="modal">×</button>
-    <h3><%= t(:select_columns, :default => "Select Columns") %></h3>
-  </div>
-  <div class="modal-body">
-    <% for field in model_columns %>
-      <label class="checkbox">
-        <input type="checkbox" name="field[]" value="<%= field %>" <%= "checked" if session[:fields][model_name.to_sym].include?(field) %>> <%= t("app.models.#{model_name}.bs_attributes.#{field}", :default => field.capitalize) %>
-      </label><br />
-    <% end %>
-  </div>
-  <div class="modal-footer">
-    <button type="button" class="btn btn-primary" id="filter-columns" data-url="/<%= model_name %>/select_fields">Ok</button>
-    <button type="button" class="btn" id="cancel-filter-columns"><%= t(:cancel, :default => "Cancel") %></button>
+<div class="modal fade" id="modal-columns">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal">×</button>
+        <h3><%= t(:select_columns, :default => "Select Columns") %></h3>
+      </div>
+      <div class="modal-body">
+        <% for field in model_columns %>
+          <label class="checkbox">
+            <input type="checkbox" name="field[]" value="<%= field %>" <%= "checked" if session[:fields][model_name].include?(field) %>> <%= t("app.models.#{model_name}.bs_attributes.#{field}", :default => field.capitalize) %>
+          </label><br />
+        <% end %>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-primary" id="filter-columns" data-url="/<%= model_name %>/select_fields">Ok</button>
+        <button type="button" class="btn btn-default" id="cancel-filter-columns"><%= t(:cancel, :default => "Cancel") %></button>
+      </div>
+    </div>
   </div>
 </div>

data/lib/generators/templates/app/views/edit.html.erb

@@ -2,4 +2,4 @@
 
 <%%= render 'form' %>
 
-<%%= link_to t(:back, :default => "Back"), <%= namespace_for_route %><%= plural_table_name %>_path, :class => "btn" %>
+<%%= link_to t(:back, :default => "Back"), <%= namespace_for_route %><%= plural_table_name %>_path, :class => "btn btn-default" %>

data/lib/generators/templates/app/views/index.html.erb

@@ -1,9 +1,9 @@
 <h2><%%= t(:listing, :default => "Listing") %> <%%= <%= i18n_t_m_p(singular_table_name) %> %></h2>
 
 <p>
-  <%%= link_to '<i class="icon-plus"></i> '.html_safe + t(:new, :default => "New") + ' ' + <%= i18n_t_m(model) %>, new_<%= namespace_for_route %><%= singular_table_name %>_path, :class => "btn" %>
+  <%%= link_to '<i class="fa fa-plus"></i> '.html_safe + t(:new, :default => "New") + ' ' + <%= i18n_t_m(model) %>, new_<%= namespace_for_route %><%= singular_table_name %>_path, :class => "btn btn-default" %>
   <%% if <%= model_camelize %>.columns.map(&:name).include?("<%= model %>_id") then %>
-    <%%= link_to '<i class="icon-folder-close"></i> '.html_safe + t(:treeview, :default => "Treeview") + ' ' + <%= i18n_t_m(model) %>, treeview_<%= namespace_for_route %><%= model_pluralize %>_path, :class => "btn" %>
+    <%%= link_to '<i class="fa fa-folder-close"></i> '.html_safe + t(:treeview, :default => "Treeview") + ' ' + <%= i18n_t_m(model) %>, treeview_<%= namespace_for_route %><%= model_pluralize %>_path, :class => "btn btn-default" %>
   <%% end %>
 </p>
 
@@ -14,26 +14,26 @@
 <%% if not scopes.blank? then %>
 <div class="btn-toolbar">
   <div class="btn-group">
-    <%%= link_to "All (#{@<%= model %>_scope_for_scope.count})", <%= namespace_for_route %><%= plural_table_name %>_path(:scope => ""), :class => "btn #{((session[:scope][:<%= model %>].to_s == '') ? 'active' : '')}" %>
+    <%%= link_to "All (#{@<%= model %>_scope_for_scope.count})", <%= namespace_for_route %><%= plural_table_name %>_path(:scope => ""), :class => "btn btn-default #{((session[:scope][:<%= model %>].to_s == '') ? 'active' : '')}" %>
     <%% for scope in scopes %>
-    <%%= link_to "#{scope} (#{@<%= model %>_scope_for_scope.send(scope).count})", <%= namespace_for_route %><%= plural_table_name %>_path(:scope => scope), :class => "btn #{((session[:scope][:<%= model %>].to_s == scope) ? 'active' : '')}" %>
+    <%%= link_to "#{scope} (#{@<%= model %>_scope_for_scope.send(scope).count})", <%= namespace_for_route %><%= plural_table_name %>_path(:scope => scope), :class => "btn btn-default #{((session[:scope][:<%= model %>].to_s == scope) ? 'active' : '')}" %>
     <%% end %>
   </div>
 </div>
 <%% end %>
 
-<div class="row-fluid">
-  <div class="span9">
+<div class="row">
+  <div class="col-md-9">
     <%%= form_tag  batch_<%= namespace_for_route %><%= plural_table_name %>_path, :class => "form-inline" do %>
       <div class="well well-small">
         <label class="control-label" for="select01"><%%= t(:batch, :default => "Batch") %></label>
 
-        <select id="select01" name="actionprocess">
+        <select id="select01" name="actionprocess" class="form-control">
           <option value="destroy"><%%= t(:destroy, :default => "Destroy") %></option>
-          <%= render_partial 'app/views/partials/_index_batch.html.erb' %>
+<%= render_partial 'app/views/partials/_index_batch.html.erb' %>
           <!-- Beautiful_scaffold - AddField - Batch - Do not remove -->
         </select>
-        <button class="btn" type="submit"><i class="icon-ok"></i> <%%= t(:process, :default => "Process") %></button>
+        <button class="btn btn-default" type="submit"><i class="fa fa-ok"></i> <%%= t(:process, :default => "Process") %></button>
       </div>
 
       <%%= render :partial => "layouts/modal_columns", :locals => { :model_name => "<%= singular_table_name %>", :model_columns => [<%= (attributes.map{ |e| "'#{e.name}'" }.to_a + ["'created_at'", "'updated_at'"]).join(',') %>] } %>
@@ -42,23 +42,23 @@
         <thead>
           <tr>
             <th class="ac">
-              <a class="" data-toggle="modal" href="#modal-columns" title="<%%= t(:select_columns, :default => "Select Columns") %>" ><i class="icon-th-list"></i></a>
+              <a class="" data-toggle="modal" href="#modal-columns" title="<%%= t(:select_columns, :default => "Select Columns") %>" ><i class="fa fa-th-list"></i></a>
             </th>
             <th>
               <%%= check_box_tag :checkall, '' %>
             </th>
-            <%= render_partial 'app/views/partials/_index_header.html.erb' %>
+<%= render_partial 'app/views/partials/_index_header.html.erb' %>
             <!-- Beautiful_scaffold - AddField - Header - Do not remove -->
-            <th <%%= visible_column("<%= singular_table_name %>", "created_at") %> class="col-created_at">
+            <th <%%= visible_column("<%= singular_table_name %>", "created_at") %> class="bs-col-created_at">
               <%%= sorting_header("<%= singular_table_name %>", "created_at", "<%= namespace_alone %>") %>
             </th>
-            <th <%%= visible_column("<%= singular_table_name %>", "updated_at") %> class="col-updated_at">
+            <th <%%= visible_column("<%= singular_table_name %>", "updated_at") %> class="bs-col-updated_at">
               <%%= sorting_header("<%= singular_table_name %>", "updated_at", "<%= namespace_alone %>") %>
             </th>
             <th colspan="3">
               <label class="checkbox">
                 <%%= check_box_tag :checkallelt, 'all' %>
-                <%%= pluralize(@<%= singular_table_name %>_scope.count, "<%= i18n_t_m(singular_table_name) %>", "<%= i18n_t_m_p(singular_table_name) %>") %>
+                <%%= pluralize(@<%= singular_table_name %>_scope.count, <%= i18n_t_m(singular_table_name) %>, <%= i18n_t_m_p(singular_table_name) %>) %>
               </label>
             </th>
           </tr>
@@ -68,16 +68,16 @@
           <tr class="line-<%%= cycle("1","2") %>">
             <td class="ar"><%%= <%= singular_table_name %>.id %></td>
             <td><%%= check_box_tag "ids[]",<%= singular_table_name %>.id, false, :class => 'cbbatch' %></td>
-            <%= render_partial 'app/views/partials/_index_column.html.erb' %><!-- Beautiful_scaffold - AddField - Column - Do not remove -->
-            <td <%%= visible_column("<%= singular_table_name %>", "created_at") %> class="col-created_at <%%= align_attribute("datetime") %>">
+<%= render_partial 'app/views/partials/_index_column.html.erb' %><!-- Beautiful_scaffold - AddField - Column - Do not remove -->
+            <td <%%= visible_column("<%= singular_table_name %>", "created_at") %> class="bs-col-created_at <%%= align_attribute("datetime") %>">
               <%%= l(<%= singular_table_name %>.created_at, :format => :long) %>
             </td>
-            <td <%%= visible_column("<%= singular_table_name %>", "updated_at") %> class="col-updated_at <%%= align_attribute("datetime") %>">
+            <td <%%= visible_column("<%= singular_table_name %>", "updated_at") %> class="bs-col-updated_at <%%= align_attribute("datetime") %>">
               <%%= l(<%= singular_table_name %>.updated_at, :format => :long) %>
             </td>
-            <td class="ac am"><%%= link_to '<i class="icon-search"></i>'.html_safe, <%= namespace_for_route %><%= singular_table_name %>_path(<%= singular_table_name %>), :title => t(:show, :default => "Show") %></td>
-            <td class="ac am"><%%= link_to '<i class="icon-pencil"></i>'.html_safe, edit_<%= namespace_for_route %><%= singular_table_name %>_path(<%= singular_table_name %>), :title => t(:edit, :default => "Edit") %></td>
-            <td class="ac am"><%%= link_to '<i class="icon-remove"></i>'.html_safe, <%= namespace_for_route %><%= singular_table_name %>_path(<%= singular_table_name %>), :data => { :confirm => t(:are_you_sure, :default => "Are you sure?") }, :method => :delete, :title => t(:destroy, :default => "Destroy") %></td>
+            <td class="ac am"><%%= link_to '<i class="fa fa-search"></i>'.html_safe, <%= namespace_for_route %><%= singular_table_name %>_path(<%= singular_table_name %>), :title => t(:show, :default => "Show") %></td>
+            <td class="ac am"><%%= link_to '<i class="fa fa-pencil"></i>'.html_safe, edit_<%= namespace_for_route %><%= singular_table_name %>_path(<%= singular_table_name %>), :title => t(:edit, :default => "Edit") %></td>
+            <td class="ac am"><%%= link_to '<i class="fa fa-times"></i>'.html_safe, <%= namespace_for_route %><%= singular_table_name %>_path(<%= singular_table_name %>), :data => { :confirm => t(:are_you_sure, :default => "Are you sure?") }, :method => :delete, :title => t(:destroy, :default => "Destroy") %></td>
           </tr>
           <%% end %>
         </tbody>
@@ -94,39 +94,41 @@
 
         </div>
         <div class="btn-group pull-right">
-          <%%= link_to '<i class="icon-download"></i> CSV'.html_safe,  <%= namespace_for_route %><%= plural_table_name %>_path(:format => :csv), :class => "btn" %>
-          <%%= link_to '<i class="icon-download"></i> XML'.html_safe,  <%= namespace_for_route %><%= plural_table_name %>_path(:format => :xml), :class => "btn" %>
-          <%%= link_to '<i class="icon-download"></i> JSON'.html_safe, <%= namespace_for_route %><%= plural_table_name %>_path(:format => :json), :class => "btn" %>
-          <%%= link_to '<i class="icon-download"></i> PDF'.html_safe,  <%= namespace_for_route %><%= plural_table_name %>_path(:format => :pdf), :class => "btn" %>
+          <%%= link_to '<i class="fa fa-download"></i> CSV'.html_safe,  <%= namespace_for_route %><%= plural_table_name %>_path(:format => :csv), :class => "btn btn-default" %>
+          <%%= link_to '<i class="fa fa-download"></i> XML'.html_safe,  <%= namespace_for_route %><%= plural_table_name %>_path(:format => :xml), :class => "btn btn-default" %>
+          <%%= link_to '<i class="fa fa-download"></i> JSON'.html_safe, <%= namespace_for_route %><%= plural_table_name %>_path(:format => :json), :class => "btn btn-default" %>
+          <%%= link_to '<i class="fa fa-download"></i> PDF'.html_safe,  <%= namespace_for_route %><%= plural_table_name %>_path(:format => :pdf), :class => "btn btn-default" %>
         </div>
       </div>
     <%% end %>
   </div>
-  <div class="span3">
+  <div class="col-md-3">
     <%%= search_form_for @q, :url => <%= namespace_for_route + 'search_' + model_pluralize + '_path' %>, :html => { :class => "well well-small search-and-filter" }, :method => :post do |f| %>
 
       <h3><%%= t("search_and_filter", :default => "Search & filter") %></h3>
 
-      <%= render_partial 'app/views/partials/_index_search.html.erb' %>
+<%= render_partial 'app/views/partials/_index_search.html.erb' %>
 
-      <div class="accordion">
-        <div class="accordion-group">
-          <div class="accordion-heading">
+      <!-- Beautiful_scaffold - AddField - Search - Do not remove -->
+
+      <div class="panel-group">
+        <div class="panel panel-default">
+          <div class="panel-heading">
             <a class="accordion-toggle" data-toggle="collapse-next">
               <%%= t(:more_options, :default => "More options...") %>
             </a>
           </div>
-          <div class="accordion-body collapse">
-            <div class="accordion-inner">
-              <%= render_partial 'app/views/partials/_index_search_default_fields.html.erb' %>
+          <div class="panel-collapse collapse">
+            <div class="panel-body">
+<%= render_partial 'app/views/partials/_index_search_default_fields.html.erb' %>
             </div>
           </div>
         </div>
       </div>
 
-      <!-- Beautiful_scaffold - AddField - Search - Do not remove -->
+
       <%%= f.submit t(:filter, :default => "Filter"), :class => "btn btn-primary" %>
-      <%%= link_to  t(:cancel, :default => "Cancel"), <%= namespace_for_route %><%= model_pluralize %>_path(:nosearch => "ok"), :class => "btn" %>
+      <%%= link_to  t(:cancel, :default => "Cancel"), <%= namespace_for_route %><%= model_pluralize %>_path(:nosearch => "ok"), :class => "btn btn-default" %>
     <%% end %>
   </div>
 </div>

data/lib/generators/templates/app/views/layout.html.erb

@@ -15,47 +15,38 @@
     <%%= yield :head %>
   </head>
   <body style="display:none;">
-    <div class="navbar navbar-fixed-top">
-      <div class="navbar-inner">
-        <div class="container">
-          <a class="brand" href="#">
+    <div class="navbar navbar-default navbar-fixed-top">
+      <div class="container">
+        <div class="navbar-header">
+          <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+            <span class="sr-only">Toggle navigation</span>
+            <i class="fa fa-bars"></i>
+          </button>
+          <a class="navbar-brand" href="#">
             Beautiful-Scaffold
           </a>
-          <ul class="nav">
-            <li class="active">
-              <a href="/">Home</a>
-            </li>
-            <li class="hidden-desktop">
-              <!-- Mobile navbar -->
-              <a href="#" data-toggle="collapse" data-target=".nav-collapse">
-                <i class="icon-th-list"></i>
-              </a>
-            </li>
+        </div>
+        <div class="navbar-collapse collapse">
+          <ul class="nav navbar-nav">
+            <li class="active"><a href="/">Home</a></li>
+            <%%= render :partial => "layouts/beautiful_menu" %>
           </ul>
-          <ul class="nav pull-right">
+          <ul class="nav navbar-nav pull-right">
             <li>
               <!-- Beautiful_scaffold - Signin - Do not remove -->
             </li>
           </ul>
-          <div class="nav-collapse collapse">
-            <ul class="nav hidden-desktop">
-              <%%= render :partial => "layouts/beautiful_menu" %>
-            </ul>
-          </div>
         </div>
       </div>
     </div>
     <div class="container-fluid">
-      <div class="row-fluid">
-        <div class="span2">
-          <ul class="nav nav-list well">
-            <li class="nav-header">
-              Menu
-            </li>
+      <div class="row">
+        <div class="col-md-2">
+          <ul class="nav nav-pills nav-stacked">
             <%%= render :partial => "layouts/beautiful_menu" %>
           </ul>
         </div>
-        <div class="span10">
+        <div class="col-md-10">
           <%% if not flash[:notice].blank? then %>
             <div class="alert alert-info">
               <a class="close" data-dismiss="alert" href="#">×</a>
@@ -64,7 +55,7 @@
             </div>
           <%% end %>
           <%% if not flash[:error].blank? then %>
-            <div class="alert alert-error">
+            <div class="alert alert-danger">
               <a class="close" data-dismiss="alert" href="#">×</a>
               <h4 class="alert-heading">Error : </h4>
               <%%= flash[:error] %>

data/lib/generators/templates/app/views/new.html.erb

@@ -2,4 +2,4 @@
 
 <%%= render 'form' %>
 
-<%%= link_to t(:back, :default => "Back"), <%= namespace_for_route %><%= plural_table_name %>_path, :class => "btn" %>
+<%%= link_to t(:back, :default => "Back"), <%= namespace_for_route %><%= plural_table_name %>_path, :class => "btn btn-default" %>

data/lib/generators/templates/app/views/partials/_forget_password.html.erb

@@ -1,21 +1,25 @@
-<div class="modal hide" id="modal-forget-password">
-  <div class="modal-header">
-    <button type="button" class="close" data-dismiss="modal">×</button>
-    <h3><%%= t(:forgot_password, :default => "Forgot password") %></h3>
-  </div>
-  <div class="modal-body">
-    <%%= form_for('<%= model %>', :as => '<%= model %>', :url => password_path('<%= model %>'), :html => { :method => :post, :class => "form-horizontal" }) do |f| %>
-      <div class="control-group">
-        <%%= f.label :email, t(:email, :default => "Email"), :class => "control-label" %>
-        <div class="controls">
-          <%%= f.email_field :email %>
-        </div>
+<div class="modal fade" id="modal-forget-password">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal">×</button>
+        <h3><%%= t(:forgot_password, :default => "Forgot password") %></h3>
       </div>
-      <div class="control-group">
-        <div class="controls">
-          <%%= f.submit t(:send_me_reset_password_instructions, :default => "Send me reset password instructions"), :class => 'btn' %>
-        </div>
+      <div class="modal-body">
+        <%%= form_for('<%= model %>', :as => '<%= model %>', :url => password_path('<%= model %>'), :html => { :method => :post, :class => "form-horizontal" }) do |f| %>
+          <div class="form-group">
+            <%%= f.label :email, t(:email, :default => "Email"), :class => "control-label" %>
+            <div>
+              <%%= f.email_field :email %>
+            </div>
+          </div>
+          <div class="form-group">
+            <div>
+              <%%= f.submit t(:send_me_reset_password_instructions, :default => "Send me reset password instructions"), :class => 'btn btn-default' %>
+            </div>
+          </div>
+        <%% end %>
       </div>
-    <%% end %>
+    </div>
   </div>
 </div>

data/lib/generators/templates/app/views/partials/_form_field.html.erb

@@ -1,23 +1,19 @@
 <%- attributes.each do |attribute| -%>
   <%- if @beautiful_attributes.include?(attribute.name + ':richtext') then -%>
-    <div class="control-group">
+    <div class="form-group">
       <%%= f.label :<%= attribute.name %>, <%= i18n_t_a(singular_table_name, attribute.name) %>.capitalize, :class => "control-label" %>
-      <div class="controls">
-        <%%= f.text_area :<%= attribute.name %>, :class => "richtext-editor" %>
-      </div>
+      <%%= f.text_area :<%= attribute.name %>, :class => "richtext-editor" %>
     </div>
-    <div class="control-group">
+    <div class="form-group">
       <label class="control-label" for="inlineCheckboxes"></label>
-      <div class="controls">
-        <% for type in richtext_type %>
-          <%% hashradio = {:id => "<%= attribute.name %>-<%= type %>", :class => "select-richtext", 'data-editor' => 'markItUp<%= singular_table_name.capitalize %>_<%= attribute.name.downcase %>', 'data-spleditor' => '<%= singular_table_name %>_<%= attribute.name %>' } %>
-          <%% hashradio[:checked] = "checked" if @<%= singular_table_name %>.<%= attribute.name %>_typetext == "<%= type %>" %>
-          <label for="<%= attribute.name %>-<%= type %>" class="label-richtext-type checkbox inline">
-            <%%= f.radio_button :<%= attribute.name %>_typetext, "<%= type %>", hashradio  %>
-            <%= type.capitalize %>
-          </label>
-        <% end %>
-      </div>
+      <% for type in richtext_type %>
+        <%% hashradio = {:id => "<%= attribute.name %>-<%= type %>", :class => "select-richtext", 'data-editor' => 'markItUp<%= singular_table_name.capitalize %>_<%= attribute.name.downcase %>', 'data-spleditor' => '<%= singular_table_name %>_<%= attribute.name %>' } %>
+        <%% hashradio[:checked] = "checked" if @<%= singular_table_name %>.<%= attribute.name %>_typetext == "<%= type %>" %>
+        <label for="<%= attribute.name %>-<%= type %>" class="label-richtext-type checkbox inline">
+          <%%= f.radio_button :<%= attribute.name %>_typetext, "<%= type %>", hashradio  %>
+          <%= type.capitalize %>
+        </label>
+      <% end %>
     </div>
 
     <%% rttype = @<%= singular_table_name %>.<%= attribute.name %>_typetext.to_s %>
@@ -30,73 +26,59 @@
     </script>
     <%% end %>
   <%- elsif @beautiful_attributes.include?(attribute.name + ':wysiwyg') then -%>
-    <div class="control-group">
+    <div class="form-group">
       <%%= f.label :<%= attribute.name %>, <%= i18n_t_a(singular_table_name, attribute.name) %>.capitalize, :class => "control-label" %>
-      <div class="controls">
-        <%%= f.text_area :<%= attribute.name %>, :class => "wysiwyg-editor" %>
-      </div>
+      <%%= f.text_area :<%= attribute.name %>, :class => "wysiwyg-editor form-control" %>
     </div>
     <%%= f.hidden_field :<%= attribute.name %>_typetext, :value => "html"  %>
   <%- elsif @beautiful_attributes.include?(attribute.name + ':references') then -%>
-    <div class="control-group">
+    <div class="form-group">
       <%%= f.label :<%= attribute.name %>, <%= i18n_t_a(singular_table_name, attribute.name) %>.capitalize, :class => "control-label" %>
-      <div class="controls">
-        <%%= f.collection_select :<%= attribute.name %>_id, <%= attribute.name.camelcase %>.all, :id, :caption, :include_blank => true %>
-      </div>
+      <%%= f.collection_select :<%= attribute.name %>_id, <%= attribute.name.camelcase %>.all, :id, :caption, { :include_blank => true }, { :class => "form-control" } %>
     </div>
   <%- elsif @beautiful_attributes.include?(attribute.name + ':price') then -%>
-    <div class="control-group">
+    <div class="form-group">
       <%%= f.label :<%= attribute.name %>, <%= i18n_t_a(singular_table_name, attribute.name) %>.capitalize, :class => "control-label" %>
-      <div class="controls">
-        <div class="input-prepend">
-          <span class="add-on">$</span><%%= f.<%= attribute.field_type %> :<%= attribute.name %> %>
-        </div>
+      <div class="input-group">
+        <span class="input-group-addon">$</span><%%= f.<%= attribute.field_type %> :<%= attribute.name %>, :class => "form-control" %>
       </div>
     </div>
   <%- elsif @beautiful_attributes.include?(attribute.name + ':date') then -%>
-    <div class="control-group">
+    <div class="form-group">
       <%%= f.label :<%= attribute.name %>, <%= i18n_t_a(singular_table_name, attribute.name) %>.capitalize, :class => "control-label" %>
-      <div class="controls">
-        <div class="input-append">
-          <input type="hidden" name="<%= singular_table_name %>[<%= attribute.name %>(3i)]" id="<%= singular_table_name %>_<%= attribute.name %>_3i" value="<%%= begin @<%= singular_table_name %>.<%= attribute.name %>.day rescue "" end %>" />
-          <input type="hidden" name="<%= singular_table_name %>[<%= attribute.name %>(2i)]" id="<%= singular_table_name %>_<%= attribute.name %>_2i" value="<%%= begin @<%= singular_table_name %>.<%= attribute.name %>.mon rescue "" end %>" />
-          <input type="hidden" name="<%= singular_table_name %>[<%= attribute.name %>(1i)]" id="<%= singular_table_name %>_<%= attribute.name %>_1i" value="<%%= begin @<%= singular_table_name %>.<%= attribute.name %>.year rescue "" end %>" />
-          <%%= f.text_field :<%= attribute.name %>, :class => "dpicker" %><span class="add-on"><i class="icon-calendar"></i></span>
-        </div>
+      <input type="hidden" name="<%= singular_table_name %>[<%= attribute.name %>(3i)]" id="<%= singular_table_name %>_<%= attribute.name %>_3i" value="<%%= begin @<%= singular_table_name %>.<%= attribute.name %>.day rescue "" end %>" />
+      <input type="hidden" name="<%= singular_table_name %>[<%= attribute.name %>(2i)]" id="<%= singular_table_name %>_<%= attribute.name %>_2i" value="<%%= begin @<%= singular_table_name %>.<%= attribute.name %>.mon rescue "" end %>" />
+      <input type="hidden" name="<%= singular_table_name %>[<%= attribute.name %>(1i)]" id="<%= singular_table_name %>_<%= attribute.name %>_1i" value="<%%= begin @<%= singular_table_name %>.<%= attribute.name %>.year rescue "" end %>" />
+      <div class="input-group">
+        <%%= f.text_field :<%= attribute.name %>, :value => (begin @<%= singular_table_name %>.<%= attribute.name %>.strftime("%d/%m/%Y") rescue "" end), :class => "dpicker form-control" %><span class="input-group-addon"><i class="fa fa-calendar"></i></span>
       </div>
     </div>
   <%- elsif @beautiful_attributes.include?(attribute.name + ':datetime') then -%>
-    <div class="control-group">
+    <div class="form-group">
       <%%= f.label :<%= attribute.name %>, <%= i18n_t_a(singular_table_name, attribute.name) %>.capitalize, :class => "control-label" %>
-      <div class="controls">
-        <div class="input-append">
-          <input type="hidden" name="<%= singular_table_name %>[<%= attribute.name %>(3i)]" id="<%= singular_table_name %>_<%= attribute.name %>_3i" value="<%%= begin @<%= singular_table_name %>.<%= attribute.name %>.day rescue "" end %>" />
-          <input type="hidden" name="<%= singular_table_name %>[<%= attribute.name %>(2i)]" id="<%= singular_table_name %>_<%= attribute.name %>_2i" value="<%%= begin @<%= singular_table_name %>.<%= attribute.name %>.mon rescue "" end %>" />
-          <input type="hidden" name="<%= singular_table_name %>[<%= attribute.name %>(1i)]" id="<%= singular_table_name %>_<%= attribute.name %>_1i" value="<%%= begin @<%= singular_table_name %>.<%= attribute.name %>.year rescue "" end %>" />
-          <%%= f.text_field :<%= attribute.name %>, :class => "dpicker" %><span class="add-on"><i class="icon-calendar"></i></span>
-        </div>
-        <div class="input-append">
-          <input type="hidden" name="<%= singular_table_name %>[<%= attribute.name %>(4i)]" id="<%= singular_table_name %>_<%= attribute.name %>_4i" value="<%%= begin @<%= singular_table_name %>.<%= attribute.name %>.min rescue "" end %>" />
-          <input type="hidden" name="<%= singular_table_name %>[<%= attribute.name %>(5i)]" id="<%= singular_table_name %>_<%= attribute.name %>_5i" value="<%%= begin @<%= singular_table_name %>.<%= attribute.name %>.hour rescue "" end %>" />
-          <%%= f.text_field :<%= attribute.name %>, :class => "tpicker" %><span class="add-on"><i class="icon-time"></i></span>
-        </div>
+      <input type="hidden" name="<%= singular_table_name %>[<%= attribute.name %>(3i)]" id="<%= singular_table_name %>_<%= attribute.name %>_3i" value="<%%= begin @<%= singular_table_name %>.<%= attribute.name %>.day rescue "" end %>" />
+      <input type="hidden" name="<%= singular_table_name %>[<%= attribute.name %>(2i)]" id="<%= singular_table_name %>_<%= attribute.name %>_2i" value="<%%= begin @<%= singular_table_name %>.<%= attribute.name %>.mon rescue "" end %>" />
+      <input type="hidden" name="<%= singular_table_name %>[<%= attribute.name %>(1i)]" id="<%= singular_table_name %>_<%= attribute.name %>_1i" value="<%%= begin @<%= singular_table_name %>.<%= attribute.name %>.year rescue "" end %>" />
+      <div class="input-group">
+        <%%= f.text_field :<%= attribute.name %>, :value => (begin @<%= singular_table_name %>.<%= attribute.name %>.strftime("%d/%m/%Y") rescue "" end), :class => "dpicker form-control" %><span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+      </div>
+      <input type="hidden" name="<%= singular_table_name %>[<%= attribute.name %>(4i)]" id="<%= singular_table_name %>_<%= attribute.name %>_4i" value="<%%= begin @<%= singular_table_name %>.<%= attribute.name %>.min rescue "" end %>" />
+      <input type="hidden" name="<%= singular_table_name %>[<%= attribute.name %>(5i)]" id="<%= singular_table_name %>_<%= attribute.name %>_5i" value="<%%= begin @<%= singular_table_name %>.<%= attribute.name %>.hour rescue "" end %>" />
+      <div class="input-group">
+        <%%= f.text_field :<%= attribute.name %>, :value => (begin @<%= singular_table_name %>.<%= attribute.name %>.strftime("%H:%M") rescue "" end), :class => "tpicker form-control" %><span class="input-group-addon"><i class="fa fa-clock-o"></i></span>
       </div>
     </div>
   <%- elsif @beautiful_attributes.include?(attribute.name + ':color') then -%>
-    <div class="control-group">
+    <div class="form-group">
       <%%= f.label :<%= attribute.name %>, <%= i18n_t_a(singular_table_name, attribute.name) %>.capitalize, :class => "control-label" %>
-      <div class="controls">
-        <div class="input-append color" data-color="<%%= (@<%= model %>.<%= attribute.name %> || "rgba(0, 0, 0)") %>" data-color-format="rgba">
-          <%%= f.<%= attribute.field_type %> :<%= attribute.name %> %><span class="add-on"><i style="background-color: rgb(0, 0, 0)"></i></span>
-        </div>
+      <div class="input-group color" data-color="<%%= (@<%= model %>.<%= attribute.name %> || "rgba(0, 0, 0)") %>" data-color-format="rgba">
+        <%%= f.<%= attribute.field_type %> :<%= attribute.name %>, :class => "form-control" %><span class="input-group-addon"><i style="background-color: rgb(0, 0, 0)"></i></span>
       </div>
     </div>
   <%- else -%>
-    <div class="control-group">
+    <div class="form-group">
       <%%= f.label :<%= attribute.name %>, <%= i18n_t_a(singular_table_name, attribute.name) %>.capitalize, :class => "control-label" %>
-      <div class="controls">
-        <%%= f.<%= attribute.field_type %> :<%= attribute.name %><%= ', :rows => 5' if attribute.field_type == :text_area %> %>
-      </div>
+      <%%= f.<%= attribute.field_type %> :<%= attribute.name %><%= ', :rows => 5' if attribute.field_type == :text_area %>, :class => "form-control" %>
     </div>
   <%- end -%>
 <%- end -%>