beautiful_scaffold 0.3.0.rc1 → 0.3.0.rc2

data/lib/generators/templates/app/assets/stylesheets/application-bs.css

@@ -23,4 +23,5 @@
  *= require markitup/sets/markdown/style.css
  *= require markitup/sets/html/style.css
  *= require markitup/sets/textile/style.css
+ *= require chardinjs
  */

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

@@ -41,10 +41,9 @@ module BeautifulHelper
       default_caption = get_belongs_to_model(default_caption)
     end
 
-    cap = attribute_name
-    cap = "number-attr" if attribute_name == "number"
+    cap = i18n_translate_path(model_name, attribute_name)
 
-    caption =   t(cap, :default => default_caption).capitalize
+    caption = t(cap, :default => default_caption).capitalize
     strpath = model_name.pluralize + "_url"
     strpath = namespace + '_' + strpath if not namespace.blank?
 
@@ -81,9 +80,7 @@ module BeautifulHelper
 
     name_field = model_name_for_ransack + "_" + name_field unless model_name_for_ransack.blank?
 
-
-    cap = label_field
-    cap = "number-attr" if label_field == "number"
+    cap = i18n_translate_path(model_name, attribute_name)
 
     infostr   = ''
     response  = '' # See at end
@@ -269,4 +266,16 @@ module BeautifulHelper
     params.delete :q
     params.delete :fields
   end
+
+  def i18n_translate_path(model, attr)
+    "app.models.#{model}.bs_attributes.#{attr}"
+  end
+
+  def i18n_translate_path_model(model)
+    "app.models.#{model}.bs_caption"
+  end
+
+  def i18n_translate_path_model_plural(model)
+    "app.models.#{model}.bs_caption_plural"
+  end
 end

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

@@ -15,14 +15,14 @@
             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" })
             else
-              f.text_field(col.to_sym, :class => "input-small", :placeholder => t(col.to_sym, :default => col).capitalize)
+              f.text_field(col.to_sym, :class => "input-small", :placeholder => t(i18n_translate_path(model_name, col)).capitalize)
             end
           when :boolean then
             (
-            "<label class='bs-label-ib'>#{f.check_box(col.to_sym, {}, true, false)}#{t(col.to_sym, :default => col).capitalize}</label>".html_safe
+            "<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(col.to_sym, :default => col).capitalize)
+            f.text_field(col.to_sym, :class => "input-small", :placeholder => t(i18n_translate_path(model_name, col)).capitalize)
           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" })

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="icon-plus"></i> '.html_safe + t(:new, :default => "New") + ' ' + <%= i18n_t_m(model) %>, new_<%= namespace_for_route %><%= singular_table_name %>_path, :class => "btn" %>
   <%% 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="icon-folder-close"></i> '.html_safe + t(:treeview, :default => "Treeview") + ' ' + <%= i18n_t_m(model) %>, treeview_<%= namespace_for_route %><%= model_pluralize %>_path, :class => "btn" %>
   <%% end %>
 </p>
 

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

@@ -4,7 +4,7 @@
 namespace_for_url = "<%= namespace_for_url %>"
 plural_model_name = "<%= model_pluralize %>"
 model_name        = "<%= singular_table_name %>"
-opened_node       = <%= model_camelize %>.select(:id).all.map{ |g| '"treeelt_' + g.id.to_s + '"' }.join(',').html_safe
+opened_node       = <%= model_camelize %>.select(:id).all.map{ |g| "'treeelt_" + g.id.to_s + "'" }.join(',').html_safe
 %>
 
 <div id="treeview" data-model="<%%= model_name %>" data-url="/<%%= namespace_for_url %><%%= plural_model_name %>/" data-opened="[<%%= opened_node %>]">

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beautiful_scaffold
 version: !ruby/object:Gem::Version
-  version: 0.3.0.rc1
+  version: 0.3.0.rc2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-09 00:00:00.000000000 Z
+date: 2013-07-10 00:00:00.000000000 Z
 dependencies: []
 description: Beautiful Scaffold generate a complete scaffold (sort, export, paginate
   and filter data) http://www.beautiful-scaffold.com
@@ -44,6 +44,7 @@ files:
 - lib/generators/templates/app/assets/javascripts/bootstrap-timepicker.js
 - lib/generators/templates/app/assets/javascripts/bootstrap-wysihtml5.js
 - lib/generators/templates/app/assets/javascripts/fixed_menu.js
+- lib/generators/templates/app/assets/javascripts/jquery-barcode.js
 - lib/generators/templates/app/assets/javascripts/jquery.jstree.js
 - lib/generators/templates/app/assets/javascripts/jquery.livequery.js
 - lib/generators/templates/app/assets/javascripts/jquery.pjax.js