beautiful_scaffold 0.2.4 → 0.2.5

data/CHANGELOG

@@ -1,3 +1,13 @@
+== 0.2.5
+
+* enhancement
+  * Capitalize label (forms)
+  * Capitalize placeholder (massinserting)
+
+* Bugfix
+  * Massinserting with boolean
+  * Treeview with namespace works
+
 == 0.2.4
 
 * Bugfix

data/README.rdoc

@@ -8,7 +8,7 @@ Demo : http://demo.beautiful-scaffold.com/
 == Install
 
 Add this in your Gemfile :
-gem 'beautiful_scaffold', '0.2.3'
+gem 'beautiful_scaffold', '0.2.5'
 And run
 bundle install
 

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.2.4"
+  s.version     = "0.2.5"
   s.platform    = Gem::Platform::RUBY  
   s.summary     = "Beautiful Scaffold generate fully customizable scaffold"
   s.email       = "claudel.sylvain@gmail.com"

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

@@ -85,4 +85,13 @@ $shadow-spinner:#0060CC;
 @-webkit-keyframes spinoffPulse {
   0% { -webkit-transform:rotate(0deg); }
   100% { -webkit-transform:rotate(360deg); }
+}
+label.bs-label-ib{
+  display:inline-block;
+  padding-left:4px;
+  padding-right:4px;
+}
+label.bs-label-ib input{
+  margin-right:3px;
+  margin-top:0;
 }

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

@@ -5,7 +5,11 @@ class RegistrationsController < Devise::RegistrationsController
     if resource.id.nil? then
       self.instance_variable_set(:@_response_body, nil)
       @opened_modal = "#modal-register-form"
-      render "beautiful/dashboard", :layout => "beautiful_layout", :location => root_path
+      if params[:path_to_redirect] then
+        redirect_to params[:path_to_redirect]
+      else
+        render "beautiful/dashboard", :layout => "beautiful_layout", :location => root_path
+      end
     end
   end
 end

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

@@ -41,7 +41,10 @@ module BeautifulHelper
       default_caption = get_belongs_to_model(default_caption)
     end
 
-    caption =   t(attribute_name, :default => default_caption).capitalize
+    cap = attribute_name
+    cap = "number-attr" if attribute_name == "number"
+
+    caption =   t(cap, :default => default_caption).capitalize
     strpath = model_name.pluralize + "_url"
     strpath = namespace + '_' + strpath if not namespace.blank?
 
@@ -78,8 +81,12 @@ 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"
+
     response   = '<div class="control-group">'
-    response += f.label name_field, t(label_field, :default => default_caption).capitalize, :class => "control-label"
+    response += f.label name_field, t(cap, :default => default_caption).capitalize, :class => "control-label"
     response += '<div class="controls">'
 
     type_of_column = ar_model.columns_hash[attribute_name].type unless ar_model.columns_hash[attribute_name].nil?

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

@@ -11,21 +11,18 @@
         ar = model_name.classify.constantize.columns_hash[col]
         if not ar.nil? then
           case ar.type
-          when 'integer' then
+          when :integer then
             if col =~ /.*_id/ then
               f.collection_select((col).to_sym, col.classify.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(col.to_sym, :default => col).capitalize)
             end
-          when 'boolean' then
+          when :boolean then
             (
-            f.radio_button_tag(col.to_sym, true)
-            f.label((col + "_true").to_sym, t(:yes))
-            f.radio_button_tag(col.to_sym, false)
-            f.label((col + "_false").to_sym, t(:no))
+            "<label class='bs-label-ib'>#{f.check_box(col.to_sym, {}, true, false)}#{t(col.to_sym, :default => 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(col.to_sym, :default => col).capitalize)
           end
         else
           f.collection_select((col + '_id').to_sym, col.classify.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/_treeview_js.html.erb

@@ -14,7 +14,7 @@
         $.ajax({
           async : false,
           type: 'POST',
-          url: "/admin/<%= plural_model_name %>/" + $(this).data("id") + "/treeview_update",
+          url: "/<%= namespace_for_url %><%= plural_model_name %>/" + $(this).data("id") + "/treeview_update",
             data : {
               "operation" : "move_node",
               "<%= model_name %>_id" : data.rslt.cr === -1 ? "" : data.rslt.np.data("id"),

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

@@ -1,7 +1,7 @@
 <%- attributes.each do |attribute| -%>
   <%- if @beautiful_attributes.include?(attribute.name + ':richtext') then -%>
     <div class="control-group">
-      <%%= f.label :<%= attribute.name %>, t(:<%= attribute.name %>, :default => "<%= attribute.name.capitalize %>"), :class => "control-label" %>
+      <%%= f.label :<%= attribute.name %>, t(:<%= attribute.name %>, :default => "<%= attribute.name %>").capitalize, :class => "control-label" %>
       <div class="controls">
         <%%= f.text_area :<%= attribute.name %>, :class => "richtext-editor" %>
       </div>
@@ -31,7 +31,7 @@
     <%% end %>
   <%- elsif @beautiful_attributes.include?(attribute.name + ':wysiwyg') then -%>
     <div class="control-group">
-      <%%= f.label :<%= attribute.name %>, t(:<%= attribute.name %>, :default => "<%= attribute.name.capitalize %>"), :class => "control-label" %>
+      <%%= f.label :<%= attribute.name %>, t(:<%= attribute.name %>, :default => "<%= attribute.name %>").capitalize, :class => "control-label" %>
       <div class="controls">
         <%%= f.text_area :<%= attribute.name %>, :class => "wysiwyg-editor" %>
       </div>
@@ -42,14 +42,14 @@
     </script>
   <%- elsif @beautiful_attributes.include?(attribute.name + ':references') then -%>
     <div class="control-group">
-      <%%= f.label :<%= attribute.name %>, t(:<%= attribute.name %>, :default => "<%= attribute.name.capitalize %>"), :class => "control-label" %>
+      <%%= f.label :<%= attribute.name %>, t(:<%= attribute.name %>, :default => "<%= 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>
     </div>
   <%- elsif @beautiful_attributes.include?(attribute.name + ':price') then -%>
     <div class="control-group">
-      <%%= f.label :<%= attribute.name %>, t(:<%= attribute.name %>, :default => "<%= attribute.name.capitalize %>"), :class => "control-label" %>
+      <%%= f.label :<%= attribute.name %>, t(:<%= attribute.name %>, :default => "<%= attribute.name %>").capitalize, :class => "control-label" %>
       <div class="controls">
         <div class="input-prepend">
           <span class="add-on">$</span><%%= f.<%= attribute.field_type %> :<%= attribute.name %> %>
@@ -58,7 +58,7 @@
     </div>
   <%- elsif @beautiful_attributes.include?(attribute.name + ':date') then -%>
     <div class="control-group">
-      <%%= f.label :<%= attribute.name %>, t(:<%= attribute.name %>, :default => "<%= attribute.name.capitalize %>"), :class => "control-label" %>
+      <%%= f.label :<%= attribute.name %>, t(:<%= attribute.name %>, :default => "<%= 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 %>" />
@@ -70,7 +70,7 @@
     </div>
   <%- elsif @beautiful_attributes.include?(attribute.name + ':datetime') then -%>
     <div class="control-group">
-      <%%= f.label :<%= attribute.name %>, t(:<%= attribute.name %>, :default => "<%= attribute.name.capitalize %>"), :class => "control-label" %>
+      <%%= f.label :<%= attribute.name %>, t(:<%= attribute.name %>, :default => "<%= 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 %>" />
@@ -87,7 +87,7 @@
     </div>
   <%- elsif @beautiful_attributes.include?(attribute.name + ':color') then -%>
     <div class="control-group">
-      <%%= f.label :<%= attribute.name %>, t(:<%= attribute.name %>, :default => "<%= attribute.name.capitalize %>"), :class => "control-label" %>
+      <%%= f.label :<%= attribute.name %>, t(:<%= attribute.name %>, :default => "<%= 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>
@@ -99,7 +99,7 @@
     </script>
   <%- else -%>
     <div class="control-group">
-      <%%= f.label :<%= attribute.name %>, t(:<%= attribute.name %>, :default => "<%= attribute.name.capitalize %>"), :class => "control-label" %>
+      <%%= f.label :<%= attribute.name %>, t(:<%= attribute.name %>, :default => "<%= attribute.name %>").capitalize, :class => "control-label" %>
       <div class="controls">
         <%%= f.<%= attribute.field_type %> :<%= attribute.name %><%= ', :rows => 5' if attribute.field_type == :text_area %> %>
       </div>

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

@@ -13,10 +13,11 @@
 </div>
 
 <%%
+ 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
 %>
 
-<%%= render :partial => "layouts/treeview_js", :locals => { :model_name => model_name, :plural_model_name => plural_model_name, :opened_node => opened_node } %>
+<%%= render :partial => "layouts/treeview_js", :locals => { :model_name => model_name, :plural_model_name => plural_model_name, :opened_node => opened_node, :namespace_for_url => namespace_for_url } %>
 

metadata

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