beautiful_scaffold 0.3.2 → 0.3.3

data/CHANGELOG

@@ -1,3 +1,19 @@
+== 0.3.3
+
+* enhancement
+  * Icons aligned to center, id aligned to right in table
+  * Accordion for option
+  * Add vertical-align on icon
+  * Add title for search-and-filter box
+
+* bugfix
+  * Mass inserting set focus for first input
+  * I18n for caption in index table
+  * Rails 4 all -> to_a
+  * Improve sorting with treeview
+  * Responsive for Tablet / Mobile / Desktop
+  * Foreignkey in mass-insert and filter-columns error
+
 == 0.3.2
 
 * bugfix

data/beautiful_scaffold.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "beautiful_scaffold"
-  s.version     = "0.3.2"
+  s.version     = "0.3.3"
   s.platform    = Gem::Platform::RUBY  
   s.summary     = "Beautiful Scaffold generate fully customizable scaffold"
   s.email       = "claudel.sylvain@gmail.com"

data/lib/generators/beautiful_migration_generator.rb

@@ -7,8 +7,8 @@ class BeautifulMigrationGenerator < Rails::Generators::Base
 
   source_root File.expand_path('../templates', __FILE__)
 
-  argument :name, :type => :string, :desc => "Name of the migration CamelCase AddXXXToYYY"
-  argument :myattributes, :type => :array, :default => [], :banner => "field:type field:type"
+  argument :name, :type => :string, :desc => "Name of the migration CamelCase AddXxxToYyy (Yyy must be plural)"
+  argument :myattributes, :type => :array, :default => [], :banner => "field:type field:type (for bt relation model:references)"
   class_option :namespace, :default => nil
 
   def install_gems
@@ -56,7 +56,7 @@ class BeautifulMigrationGenerator < Rails::Generators::Base
     inject_into_file("#{commonpath}index.html.erb", render_partial("app/views/partials/_index_header.html.erb"), :before => "<!-- Beautiful_scaffold - AddField - Header - Do not remove -->\n" )
     inject_into_file("#{commonpath}index.html.erb", render_partial("app/views/partials/_index_column.html.erb"), :before => "<!-- Beautiful_scaffold - AddField - Column - Do not remove -->\n" )
     inject_into_file("#{commonpath}index.html.erb", render_partial("app/views/partials/_index_search.html.erb"), :before => "<!-- Beautiful_scaffold - AddField - Search - Do not remove -->\n" )
-    inject_into_file("#{commonpath}index.html.erb", myattributes.map{ |attr| a,t = attr.split(':');(['references', 'reference'].include?(t) ? "'#{a}_id'" : "'#{a}'") }.join(',') + ',', :after => ":model_columns => [" )
+    inject_into_file("#{commonpath}index.html.erb", myattributes.map{ |attr| a,t = attr.split(':');"'#{a}'" }.join(',') + ',', :after => ":model_columns => [" )
     # Show
     inject_into_file("#{commonpath}show.html.erb", render_partial("app/views/partials/_show_field.html.erb"), :before => "<!-- Beautiful_scaffold - AddField - Field - Do not remove -->\n" )    
   end

data/lib/generators/templates/app/assets/javascripts/application-bs.js

@@ -31,6 +31,9 @@
 //= require fixed_menu
 
 function initPage(){
+
+    <!-- Insert your javascript here -->
+
     datetimepicker_init();
     bs_init();
     modify_dom_init();

data/lib/generators/templates/app/assets/javascripts/beautiful_scaffold.js

@@ -158,11 +158,20 @@ function bs_init(){
     $("div.control-group>div.field_with_errors").parent().addClass("error");
     $("#error_explanation").addClass("text-error");
 
+    // Collapse without IDS (next)
+    $('body').on('click.collapse-next.data-api', '[data-toggle=collapse-next]', function() {
+        var $target = $(this).parent().next();
+        $target.data('collapse') ? $target.collapse('toggle') : $target.collapse()
+        return false;
+    });
+
     // Mass inserting set focus
-    elt = $('form.mass-inserting div[style*="inline"][class*="col"] .input-small').first();
-    if($('form.mass-inserting').hasClass('setfocus')){
-        $(elt).focus();
-    }
+    $(function() {
+        var elt = $('form.mass-inserting div[style*="inline"][class*="col"] .input-small').first();
+        if($('form.mass-inserting').hasClass('setfocus')){
+            elt.focus();
+        }
+    });
 
     // Menu dropdown
     try{

data/lib/generators/templates/app/assets/stylesheets/beautiful-scaffold.css.scss

@@ -2,10 +2,19 @@
   text-align:right;
 }
 .al, table td.al, table th.al{
-    text-align:left;
+  text-align:left;
 }
 .ac, table td.ac, table th.ac{
-    text-align:center;
+  text-align:center;
+}
+.ab, table td.ab, table th.ab{
+  vertical-align:bottom;
+}
+.am, table td.am, table th.am{
+  vertical-align:middle;
+}
+.at, table td.at, table th.at{
+  vertical-align:top;
 }
 
 $border-spinner:#0088CC;
@@ -139,4 +148,22 @@ html, body {
   z-index: -1;
 }
 
-#jstree-marker-line {pointer-events: none;}
+#jstree-marker-line {pointer-events: none;}
+
+/* Search & filter  */
+.search-and-filter div.accordion{
+  margin-bottom:0;
+}
+.search-and-filter div.accordion .accordion-toggle{
+  padding-left:0;
+}
+.search-and-filter div.accordion .accordion-group{
+  border:0;
+}
+.search-and-filter div.accordion .accordion-inner{
+  padding:0;
+  margin-top:0;
+}
+.search-and-filter h3{
+  margin-top:0;
+}

data/lib/generators/templates/app/controllers/master_base.rb

@@ -70,11 +70,11 @@ class BeautifulController < ApplicationController
       modelclass.transaction do
         all_elt = modelclass.where(foreignkey => parent_id).order("position ASC").to_a
 
-        begin
-          if index == all_elt.length then
-            new_pos = all_elt.last.position + 1
-          elsif index == 0 then
-            new_pos = all_elt.first.position - 1
+        #begin
+          if index == 0 then
+            new_pos = (begin (all_elt.first.position - 1) rescue 1 end)
+          elsif index == all_elt.length then
+            new_pos = (begin (all_elt.last.position + 1) rescue 1 end)
           else
             new_pos = all_elt[index].position
 
@@ -82,18 +82,18 @@ class BeautifulController < ApplicationController
             end_of_array.each{ |g|
               next if g == elt
               g.position = g.position.to_i + 1
-              g.save
+              g.save!
 
               next_elt = end_of_array[end_of_array.index(g) + 1]
               break if not next_elt.nil? and next_elt.position > g.position
             }
           end
-        rescue
-          new_pos = 0
-        end
+        #rescue
+        #  new_pos = 0
+        #end
       end
       elt.position = new_pos
     end
-    return elt.save
+    return elt.save!
   end
 end

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

@@ -253,7 +253,7 @@ module BeautifulHelper
         <ul>'
     ar = obj.send(child_relation.to_sym)
     ar = ar.order('position') if obj.class.column_names.include?("position")
-    for o in ar.all
+    for o in ar.to_a
       out += build_treeview(o, child_relation, caption_method)
     end
     out += '

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

@@ -45,3 +45,5 @@ en:
   forgot_your_password: "Forgot your password?"
   send_me_reset_password_instructions: "Send me reset password instructions"
   register: "Register"
+  search_and_filter: "Search and filter"
+  more_options: "More options..."

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

@@ -44,4 +44,6 @@ fr:
   password_confirmation: "Mot de passe (Confirmation)"
   forgot_your_password: "Mot de passe oublié ?"
   send_me_reset_password_instructions: "Me ré-envoyer les instructions de réinitialisation du mot de passe"
-  register: "Inscription"
+  register: "Inscription"
+  search_and_filter: "Option de filtre"
+  more_options: "Plus d'options..."

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

@@ -41,7 +41,7 @@
       <table class="table table-striped table-bordered table-condensed">
         <thead>
           <tr>
-            <th>
+            <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>
             </th>
             <th>
@@ -58,7 +58,7 @@
             <th colspan="3">
               <label class="checkbox">
                 <%%= check_box_tag :checkallelt, 'all' %>
-                <%%= pluralize(@<%= singular_table_name %>_scope.count, "<%= 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>
@@ -66,7 +66,7 @@
         <tbody>
           <%% @<%= plural_table_name %>.each do |<%= singular_table_name %>| %>
           <tr class="line-<%%= cycle("1","2") %>">
-            <td><%%= <%= singular_table_name %>.id %></td>
+            <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") %>">
@@ -75,9 +75,9 @@
             <td <%%= visible_column("<%= singular_table_name %>", "updated_at") %> class="col-updated_at <%%= align_attribute("datetime") %>">
               <%%= l(<%= singular_table_name %>.updated_at, :format => :long) %>
             </td>
-            <td><%%= 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><%%= 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><%%= 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="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>
           </tr>
           <%% end %>
         </tbody>
@@ -103,9 +103,27 @@
     <%% end %>
   </div>
   <div class="span3">
-    <%%= search_form_for @q, :url => <%= namespace_for_route + 'search_' + model_pluralize + '_path' %>, :html => { :class => "well well-small" }, :method => :post do |f| %>
+    <%%= 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_default_fields.html.erb' %>
+
+      <div class="accordion">
+        <div class="accordion-group">
+          <div class="accordion-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>
+          </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" %>

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

@@ -6,6 +6,7 @@
 
     <meta name="description" content="Beautiful Scaffold">
     <meta name="author" content="You or me Sylvain Claudel (http://blog.escarworld.com)">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
     <%%= stylesheet_link_tag "application-bs" %>
     <%%= javascript_include_tag "application-bs" %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beautiful_scaffold
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-17 00:00:00.000000000 Z
+date: 2014-01-31 00:00:00.000000000 Z
 dependencies: []
 description: Beautiful Scaffold generate a complete scaffold (sort, export, paginate
   and filter data) http://www.beautiful-scaffold.com