beautiful_scaffold 0.3.5 → 2.0.0.pre

data/lib/generators/templates/app/helpers/model_helper.rb

@@ -1,4 +1,15 @@
 # encoding : utf-8
-require "beautiful_helper"
-module <%= namespace_for_class %><%= model_pluralize.camelize %>Helper
-end
+require "<%= engine_name %>beautiful_helper"
+<%
+  if engine_name.blank?
+    b_module = e_module = space_indent = ""
+  else
+    b_module = "module #{engine_camel}"
+    e_module = "end"
+    space_indent = "  "
+  end
+%>
+<%= b_module %>
+<%= space_indent %>module <%= namespace_for_class %><%= model_pluralize.camelize %>Helper
+<%= space_indent %>end
+<%= e_module %>

data/lib/generators/templates/app/initializers/link_renderer.rb

@@ -1,37 +1,44 @@
+require 'will_paginate/view_helpers/action_view'
+
 module WillPaginate
-  module ViewHelpers
-    # This class does the heavy lifting of actually building the pagination
-    # links. It is used by +will_paginate+ helper internally.
-    class LinkRenderer < LinkRendererBase
+  module ActionView
+    class BootstrapLinkRenderer < LinkRenderer
+
+      protected
 
-    protected
-    
       def page_number(page)
-        unless page == current_page
-          link(page, page, :rel => rel_value(page), :class => "btn btn-default")
+        is_current_page = (page == current_page)
+        temphtml = '<li class="page-item ' + (is_current_page ? 'active' : '') + '">'
+        unless is_current_page
+          temphtml += link(page, page, :rel => rel_value(page), :class => 'page-link')
         else
-          tag(:a, page, :class => 'current active btn btn-default')
+          temphtml += tag(:a, page, :class => 'current active page-link')
         end
+        temphtml += '</li>'
+        temphtml
       end
-      
+
       def gap
         text = @template.will_paginate_translate(:page_gap) { '&hellip;' }
         %(<a class="gap btn btn-default disabled">#{text}</a>)
       end
-      
+
       def previous_or_next_page(page, text, classname)
+        temphtml = '<li class="page-item">'
         if page
-          link(text, page, :class => classname + ' btn btn-default')
+          temphtml += link(text, page, :class => classname + ' page-link')
         else
-          tag(:a, text, :class => classname + ' disabled btn btn-default')
+          temphtml += tag(:a, text, :class => classname + ' page-link')
         end
+        temphtml += '</li>'
+        temphtml
       end
-      
+
       def html_container(html)
-        html
+        '<ul class="pagination pagination-sm justify-content-end mb-0">' + html + '</ul>'
       end
-      
-    private
+
+      private
 
       def param_name
         @options[:param_name].to_s

data/lib/generators/templates/app/initializers/ransack.rb

@@ -0,0 +1,16 @@
+Ransack.configure do |config|
+
+  # Change default search parameter key name.
+  # Default key name is :q
+  config.search_key = :q
+
+  # Raise errors if a query contains an unknown predicate or attribute.
+  # Default is true (do not raise error on unknown conditions).
+  config.ignore_unknown_conditions = false
+
+  # Globally display sort links without the order indicator arrow.
+  # Default is false (sort order indicators are displayed).
+  # This can also be configured individually in each sort link (see the README).
+  config.hide_sort_order_indicators = true
+
+end

data/lib/generators/templates/app/locales/beautiful_scaffold.ja.yml

@@ -0,0 +1,50 @@
+# encoding : utf-8
+ja:
+  edit: "更新"
+  editing: "更新："
+  update: "更新"
+  show: "表示"
+  showing: "表示：" 
+  delete: "削除"
+  destroy: "削除"
+  are_you_sure: "続行していいですか？"
+  new: "新規作成"
+  create: "新規作成"
+  listing: "一覧："
+  filter: "検索"
+  cancel: "キャンセル"
+  export: "エクスポート"
+  search: "検索"
+  sort: "Sort"
+  download: "ダウンロード"
+  "yes": "はい"
+  "no": "いいえ"
+  all: "すべて"
+  back: "戻る"
+  manage: "管理"
+  settrueforattr: "%{attr} を「はい」にする"
+  setfalseforattr: "%{attr} を「いいえ」にする"
+  processing: "実行中"
+  process: "実行"
+  batch: "一括処理"
+  create_success: "%{model} を作成しました。"
+  update_success: "%{model} を更新しました。"
+  greater_than: "以上"
+  smaller_than: "以下"
+  select_columns: "項目選択"
+  treeview: "ツリー表示"
+  profile: "プロファイル"
+  sign_out: "サイン・アウト"
+  sign_in: "サインイン"
+  sign_up: "サイン・アップ"
+  login: "ログイン"
+  remember_me: "ログインを維持する"
+  email: "メールアドレス"
+  password: "パスワード"
+  password_confirmation: "パスワード (確認)"
+  forgot_your_password: "パスワードを忘れましたか？"
+  send_me_reset_password_instructions: "パスワードのリセット方法を送る"
+  register: "登録"
+  search_and_filter: "検索条件"
+  more_options: "追加オプション..."
+

data/lib/generators/templates/app/models/concerns/fulltext_concern.rb

@@ -30,18 +30,18 @@ module FulltextConcern
 
   def htmlize(text, type)
     case type
-      when 'bbcode' then
-        require 'bb-ruby'
-        html = text.bbcode_to_html
+      #when 'bbcode' then
+      #  require 'bb-ruby'
+      #  html = text.bbcode_to_html
       when 'html' then
         html = text
-      when 'textile' then
-        html = RedCloth.new(text).to_html
-      when 'markdown' then
-        require 'rdiscount'
-        html = RDiscount.new(text).to_html
-      when 'wiki' then
-        html = WikiCloth::Parser.new({:data => text}).to_html
+      #when 'textile' then
+      #  html = RedCloth.new(text).to_html
+      #when 'markdown' then
+      #  require 'rdiscount'
+      #  html = RDiscount.new(text).to_html
+      #when 'wiki' then
+      #  html = WikiCloth::Parser.new({:data => text}).to_html
       else
         html
     end

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

@@ -1,6 +1,6 @@
 <%-
 strformfor = "@#{singular_table_name}"
-if not namespace_alone.blank? then
+if !namespace_alone.blank?
   strformfor = "[:#{namespace_alone}, @#{singular_table_name} ]"
 end
 -%>
@@ -17,7 +17,10 @@ end
   <%% end %>
   <%= render_partial 'app/views/partials/_form_field.html.erb' %><!-- Beautiful_scaffold - AddField - Do not remove -->
   <div>
-    <%%= f.submit :class => "btn btn-primary" %>
+    <%%= link_to <%= namespace_for_route %><%= plural_table_name %>_path, :class => "btn btn-light" do %>
+      <i class="fa fa-chevron-left"></i> <%%= t(:back, :default => "Back") %>
+    <%% end %>
+    <%%= f.submit :class => "btn btn-primary", :data => { :disable_with => t(:saving, :default => "Saving...") } %>
   </div>
 <%% end %>
 

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

@@ -6,17 +6,21 @@
     :linked_model_name => "tag",
     :plural_linked_model_name => "tags",
     :namespace_bs => "admin",
+    :engine_bs => "YOUR_ENGINE_OR_EMPTY_STRING",
     :field_to_search_for_linked_model => "name",
+    :attr_to_show => "caption",
     :f => f
   }
   # Example to put in a _form.html.erb
 %>
-<% path_namespace = '/' + namespace_bs if not namespace_bs.blank? %>
+<% path_namespace = "/" %>
+<% path_namespace += "#{engine_bs}/" if engine_bs.present? %>
+<% path_namespace += "/#{namespace_bs}/" if namespace_bs.present? %>
 
 <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>
-        <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">
+        <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="<%= attr_to_show %>">
           <% begin %>
             <% for elt in model_class.send(plural_linked_model_name) %>
             <li data-value="<%= elt.id %>"><%= elt.caption %></li>

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

@@ -1,36 +1,45 @@
+<% model = ("#{(engine.blank? ? '' : "#{engine.camelize}::")}#{model_name.camelize}").constantize %>
 <% formparams = [] %>
-<% if not namespace.blank? then %>
+<% if !namespace.blank? %>
   <% formparams << namespace %>
 <% end %>
-<% formparams << model_name.camelize.constantize.new %>
-<%= 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 %>">
-      <%=
-        ar = model_name.camelize.constantize.columns_hash[col]
-        if not ar.nil? then
-          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 => "form-control"})
-            else
-              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, :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 => "form-control"})
-        end
-      %>
+<% formparams << model.new %>
+<div class="container-fluid mb-3">
+  <div class="row">
+    <div class="col-md">
+      <div class="card card-body bg-light">
+        <%= form_for formparams, :method => :post, :html => { :class => "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="form-group mr-sm-2 col-<%= col %>">
+              <%=
+                ar = model.columns_hash[col]
+                if !ar.nil?
+                  case ar.type
+                  when :integer then
+                    if col =~ /.*_id/
+                      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, :placeholder => t(i18n_translate_path(model_name, col), default: "#{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), default: "#{model_name}.#{col}").capitalize}</label>".html_safe
+                    )
+                  else
+                    f.text_field(col.to_sym, :placeholder => t(i18n_translate_path(model_name, col), default: "#{model_name}.#{col}").capitalize, :class => "form-control")
+                  end
+                else
+                  f.collection_select(("#{false ? "#{engine}_" : ''}#{col}_id").to_sym, ("#{(engine.blank? ? '' : "#{engine.camelize}::")}#{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 class="form-group">
+            <%= f.submit t(:create, :default => "Create"), :class => "btn btn-outline-secondary", :data => { :disable_with => t(:saving, :default => "Saving...") } %>
+          </div>
+        <% end %>
+      </div>
     </div>
-  <% end %>
-  <div style="display:inline;">
-    <%= f.submit t(:create, :default => "Create"), :class => "btn btn-default" %>
   </div>
-<% end %>
+</div>

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

@@ -2,19 +2,19 @@
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
+        <h5 class="modal-title"><%= t(:select_columns, :default => "Select Columns") %></h5>
         <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) %>
+            <input type="checkbox" name="field[]" value="<%= field %>" <%= "checked" if session['fields'][model_name.to_s].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>
+        <button type="button" class="btn btn-primary" id="filter-columns" data-url="<%= select_fields_url(model_name) %>">Ok</button>
+        <button type="button" class="btn btn-light" id="cancel-filter-columns"><%= t(:cancel, :default => "Cancel") %></button>
       </div>
     </div>
   </div>

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

@@ -1,5 +1,3 @@
 <h2><%%= t(:editing, :default => 'Editing') %> <%%= <%= i18n_t_m(singular_table_name) %> %></h2>
 
-<%%= render 'form' %>
-
-<%%= link_to t(:back, :default => "Back"), <%= namespace_for_route %><%= plural_table_name %>_path, :class => "btn btn-default" %>
+<%%= render 'form' %>

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

@@ -1,50 +1,75 @@
-<h2><%%= t(:listing, :default => "Listing") %> <%%= <%= i18n_t_m_p(singular_table_name) %> %></h2>
-
-<p>
-  <%%= 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="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>
+<div class="container-fluid">
+  <div class="row">
+    <div class="col-md">
+      <h2 class="title-index"><%%= t(:listing, :default => "Listing") %> <%%= <%= i18n_t_m_p(singular_table_name) %> %></h2>
+      <p>
+        <%%= 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-outline-secondary" %>
+        <%% if <%= model_with_engine_camelize %>.columns.map(&:name).include?("<%= model %>_id") %>
+          <%%= 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-outline-secondary" %>
+        <%% end %>
+      </p>
+    </div>
+  </div>
+</div>
 
-<%%= render :partial => "layouts/mass_inserting", :locals => { :namespace => '<%= namespace_alone %>', :model_name => '<%= model %>', :model_columns => [<%= attributes.map{ |e| "'#{e.name}'" }.join(',') %>] } %>
+<%%= render :partial => "layouts/mass_inserting", :locals => { :engine => '<%= engine_opt %>', :namespace => '<%= namespace_alone %>', :model_name => '<%= model %>', :model_columns => [<%= attributes.map{ |e| "'#{e.name}'" }.join(',') %>] } %>
 
 <%%# Set your scopes below (string in array) %>
 <%% scopes = [] %>
-<%% 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 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 btn-default #{((session[:scope][:<%= model %>].to_s == scope) ? 'active' : '')}" %>
-    <%% end %>
+<%% if !scopes.blank? %>
+<div class="container-fluid mb-3" id="scopes-div" data-present-title="<%%= t(:help_scope, :default => "Filter by scope") %>" data-present-description="<%%= t(:help_scope_description, :default => "Filter by scope") %>" data-present-order="1">
+  <div class="row">
+    <div class="col-md btn-toolbar">
+      <div class="btn-group">
+        <%%= link_to "All (#{@<%= model %>_scope_for_scope.count})", <%= namespace_for_route %><%= plural_table_name %>_path(:scope => ""), :class => "btn btn-outline-secondary #{((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 btn-outline-secondary #{((session[:scope][:<%= model %>].to_s == scope) ? 'active' : '')}" %>
+        <%% end %>
+      </div>
+    </div>
   </div>
 </div>
 <%% end %>
 
+<div class="container-fluid">
 <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>
+    <%%= form_tag  batch_<%= namespace_for_route %><%= plural_table_name %>_path do %>
+      <div class="card card-body bg-light mb-3">
+        <div class="row">
+          <div class="form-inline col-md" id="batch-div" data-present-title="<%%= t(:help_batch, :default => "Batch processing") %>" data-present-description="<%%= t(:help_batch_description, :default => "Batch processing description") %>" data-present-order="2">
+            <label class="control-label mb-2 mr-sm-2" for="select01"><%%= t(:batch, :default => "Batch") %></label>
 
-        <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' %>
-          <!-- Beautiful_scaffold - AddField - Batch - Do not remove -->
-        </select>
-        <button class="btn btn-default" type="submit"><i class="fa fa-ok"></i> <%%= t(:process, :default => "Process") %></button>
+            <select id="select01" name="actionprocess" class="custom-select mb-2 mr-sm-2">
+              <option value="destroy"><%%= t(:destroy, :default => "Destroy") %></option>
+              <option value="touch"><%%= t(:touch, :default => "Touch") %></option>
+              <%= render_partial 'app/views/partials/_index_batch.html.erb' %>
+              <!-- Beautiful_scaffold - AddField - Batch - Do not remove -->
+            </select>
+            <button class="btn btn-outline-secondary mb-2 mr-sm-2" type="submit"><i class="fa fa-ok"></i> <%%= t(:process, :default => "Process") %></button>
+          </div>
+          <div class="col-md">
+            <a class="btn btn-xs btn-light float-right" id="hide-search-btn">
+              <i class="fa fa-caret-right"></i>
+              <i class="fa fa-caret-right"></i>
+            </a>
+            <a class="btn btn-xs btn-light float-right" id="show-search-btn">
+              <i class="fa fa-caret-left"></i>
+              <i class="fa fa-caret-left"></i>
+            </a>
+          </div>
+        </div>
       </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(',') %>] } %>
+      <%%= render :partial => "layouts/modal_columns", :locals => { :engine_name => '<%= engine_opt %>', :model_name => "<%= singular_table_name %>", :model_columns => [<%= (attributes.map{ |e| "'#{e.name}'" }.to_a + ["'created_at'", "'updated_at'"]).join(',') %>] } %>
 
-      <table class="table table-striped table-bordered table-condensed">
+      <table class="table table-striped table-bordered table-sm">
         <thead>
           <tr>
             <th class="ac">
               <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>
+            <th id="checkall-div" data-present-title="<%%= t(:help_checkall, :default => "Check all elements") %>" data-present-description="<%%= t(:help_checkall_description, :default => "Check all elements visible on the page") %>" data-present-order="3">
               <%%= check_box_tag :checkall, '' %>
             </th>
 <%= render_partial 'app/views/partials/_index_header.html.erb' %>
@@ -56,7 +81,7 @@
               <%%= sorting_header("<%= singular_table_name %>", "updated_at", "<%= namespace_alone %>") %>
             </th>
             <th colspan="3">
-              <label class="checkbox">
+              <label class="checkbox mb-0" id="checkallall-div" data-present-title="<%%= t(:help_checkallall, :default => "Check all elements") %>" data-present-description="<%%= t(:help_checkallall_description, :default => "Check all elements, that match current filter even if they are not visible on the page") %>" data-present-order="4">
                 <%%= check_box_tag :checkallelt, 'all' %>
                 <%%= pluralize(@<%= singular_table_name %>_scope.count, <%= i18n_t_m(singular_table_name) %>, <%= i18n_t_m_p(singular_table_name) %>) %>
               </label>
@@ -76,7 +101,7 @@
               <%%= l(<%= singular_table_name %>.updated_at, :format => :long) %>
             </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-edit"></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 %>
@@ -90,45 +115,46 @@
                   :inner_window => 0,
                   :outer_window => 0,
                   :previous_label => t(:prev, :default => "Previous"),
-                  :next_label => t(:next, :default => "Next") %>
+                  :next_label => t(:next, :default => "Next"),
+                  :renderer => WillPaginate::ActionView::BootstrapLinkRenderer
+          %>
 
         </div>
-        <div class="btn-group pull-right">
-          <%%= 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 class="btn-group btn-group-sm float-right">
+          <%%= link_to '<i class="fa fa-download"></i> CSV'.html_safe,  <%= namespace_for_route %><%= plural_table_name %>_path(:format => :csv), :class => "btn btn-outline-secondary" %>
+          <%%= link_to '<i class="fa fa-download"></i> XML'.html_safe,  <%= namespace_for_route %><%= plural_table_name %>_path(:format => :xml), :class => "btn btn-outline-secondary" %>
+          <%%= link_to '<i class="fa fa-download"></i> JSON'.html_safe, <%= namespace_for_route %><%= plural_table_name %>_path(:format => :json), :class => "btn btn-outline-secondary" %>
+          <%%= link_to '<i class="fa fa-download"></i> PDF'.html_safe,  <%= namespace_for_route %><%= plural_table_name %>_path(:format => :pdf), :class => "btn btn-outline-secondary" %>
         </div>
       </div>
     <%% end %>
   </div>
   <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' %>
-
-      <!-- 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="panel-collapse collapse">
-            <div class="panel-body">
-<%= render_partial 'app/views/partials/_index_search_default_fields.html.erb' %>
+    <%%= search_form_for @q, :url => <%= namespace_for_route + 'search_' + model_pluralize + '_path' %>, :html => { :class => "card bg-light mb-3 search-and-filter" }, :method => :post do |f| %>
+      <div class="card-header"><%%= t("search_and_filter", :default => "Search & filter") %></div>
+      <div class="card-body">
+        <div class="card-text">
+          <%= render_partial 'app/views/partials/_index_search.html.erb' %>
+          <!-- Beautiful_scaffold - AddField - Search - Do not remove -->
+          <div class="panel-group">
+            <div class="panel panel-default">
+              <div class="panel-heading">
+                <a class="badge badge-light accordion-toggle" data-toggle="collapse-next">
+                  <%%= t(:more_options, :default => "More options...") %>
+                </a>
+              </div>
+              <div class="panel-collapse collapse">
+                <div class="panel-body">
+                  <%= render_partial 'app/views/partials/_index_search_default_fields.html.erb' %>
+                </div>
+              </div>
             </div>
           </div>
+          <%%= f.submit t(:filter, :default => "Filter"), :class => "btn btn-primary btn-sm btn-block" %>
+          <%%= link_to  t(:cancel, :default => "Cancel"), <%= namespace_for_route %><%= model_pluralize %>_path(:nosearch => "ok"), :class => "btn btn-light btn-sm btn-block" %>
         </div>
       </div>
-
-
-      <%%= 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 btn-default" %>
     <%% end %>
   </div>
 </div>
+</div>