beautiful_scaffold 0.1.3 → 0.1.4

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

@@ -28,6 +28,10 @@
           $.each(return_json, function(index, value) {
             $('table.table th.col-' + value + ', table.table td.col-' + value).css('display', 'table-cell');
           });
+          $('div[class^="col"]').css('display', 'none');
+          $.each(return_json, function(index, value) {
+            $('div.col-' + value).css('display', 'inline');
+          });
           $('#modal-columns').modal('hide');
         }
       });

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

@@ -4,6 +4,8 @@
   <%%= link_to '<i class="icon-plus"></i>'.html_safe + t(:new, :default => "New") + ' <%= model %>', new_<%= namespace_for_route %><%= singular_table_name %>_path, :class => "btn" %>
 </p>
 
+<%%= render :partial => "layouts/mass_inserting", :locals => { :namespace => 'admin', :model_name => '<%= model %>', :model_columns => [<%= attributes.map{ |e| "'#{e.name}'" }.join(',') %>] } %>
+
 <%%# Set your scopes below (string in array) %>
 <%% scopes = [] %>
 <%% if not scopes.blank? then %>
@@ -31,7 +33,7 @@
         <button class="btn" type="submit"><i class="icon-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}'" }.join(',') %>] } %>
+      <%%= 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(',') %>] } %>
 
       <table class="table table-striped table-bordered table-condensed">
         <thead>
@@ -49,6 +51,12 @@
             </th>
             <%= 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">
+              <%%= sorting_header("<%= singular_table_name %>", "created_at", "<%= namespace_alone %>") %>
+            </th>
+            <th <%%= visible_column("<%= singular_table_name %>", "updated_at") %> class="col-updated_at">
+              <%%= sorting_header("<%= singular_table_name %>", "updated_at", "<%= namespace_alone %>") %>
+            </th>
             <th colspan="3">
               <label class="checkbox">
                 <%%= check_box_tag :checkallelt, 'all' %>
@@ -63,6 +71,12 @@
             <td><%%= <%= 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") %>">
+              <%%= l(<%= singular_table_name %>.created_at, :format => :long) %>
+            </td>
+            <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 %>) %></td>
             <td><%%= link_to '<i class="icon-pencil"></i>'.html_safe, edit_<%= namespace_for_route %><%= singular_table_name %>_path(<%= singular_table_name %>) %></td>
             <td><%%= link_to '<i class="icon-remove"></i>'.html_safe, <%= namespace_for_route %><%= singular_table_name %>_path(<%= singular_table_name %>), :confirm => t(:are_you_sure, :default => "Are you sure?"), :method => :delete %></td>
@@ -91,7 +105,7 @@
     <%% end %>
   </div>
   <div class="span3">
-    <%%= search_form_for @q, :url => { :controller => "<%= namespace_for_url %><%= model_pluralize %>" }, :html => { :class => "well" } do |f| %>
+    <%%= search_form_for @q, :url => <%= namespace_for_route + 'search_' + model_pluralize + '_path' %>, :html => { :class => "well" }, :method => :post do |f| %>
       <%= render_partial 'app/views/partials/_index_search.html.erb' %>
       <!-- Beautiful_scaffold - AddField - Search - Do not remove -->
       <%%= f.submit t(:filter, :default => "Filter"), :class => "btn btn-primary" %>

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

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="<%%= I18n.default_locale %>">
+<html lang="<%%= (I18n.locale || I18n.default_locale) %>">
   <head>
     <meta charset="utf-8">
     <title>Beautiful Scaffold</title>
@@ -7,7 +7,7 @@
     <meta name="description" content="Beautiful Scaffold">
     <meta name="author" content="You or me Sylvain Claudel (http://blog.escarworld.com)">
 
-    <%%= stylesheet_link_tag "reset", "bootstrap.min", "bootstrap-responsive.min", "beautiful-scaffold" %>
+    <%%= stylesheet_link_tag "reset", "bootstrap.min", "bootstrap-responsive.min", "datepicker", "timepicker", "beautiful-scaffold" %>
     <style>
         body {
             padding-top: 60px; /* 60px to make the container go all the way to the bottom of the topbar */
@@ -97,10 +97,18 @@
       <div class="circle1"></div>
     </div>
 
-    <%%= javascript_include_tag "bootstrap.min", "bootstrap-alert", "bootstrap-dropdown", "bootstrap-modal", "bootstrap-tooltip" %>
+    <%%= javascript_include_tag "bootstrap.min", "bootstrap-alert", "bootstrap-datepicker" ,"bootstrap-timepicker", "bootstrap-dropdown", "bootstrap-modal", "bootstrap-tooltip" %>
     <script type="text/javascript">
-        $('.dropdown-toggle').dropdown();
+      ;(function($){
+        $.fn.datepicker.dates['<%= I18n.locale.to_s %>'] = {
+          days:        <%= (I18n.t("date.day_names") + [I18n.t("date.day_names").first]).map(&:capitalize).to_s.html_safe %>,
+          daysShort:   <%= (I18n.t("date.abbr_day_names") + [I18n.t("date.abbr_day_names").first]).map(&:capitalize).to_s.html_safe %>,
+          daysMin:     <%= (I18n.t("date.abbr_day_names") + [I18n.t("date.abbr_day_names").first]).map{ |d| d.capitalize[0..2] }.to_s.html_safe %>,
+          months:      <%= I18n.t("date.month_names")[1..12].map(&:capitalize).to_s.html_safe %>,
+          monthsShort: <%= I18n.t("date.abbr_month_names")[1..12].map(&:capitalize).to_s.html_safe %>
+        };
+      }(jQuery));
     </script>
-
+    <%%= javascript_include_tag "bootstrap-datetimepicker-for-beautiful-scaffold" %>
   </body>
 </html>

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

@@ -46,6 +46,35 @@
         </div>
       </div>
     </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" %>
+      <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>
+    </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" %>
+      <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>
+      </div>
+    </div>
   <%- else -%>
     <div class="control-group">
       <%%= f.label :<%= attribute.name %>, t(:<%= attribute.name %>, :default => "<%= attribute.name.capitalize %>"), :class => "control-label" %>

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

@@ -1,19 +1,19 @@
 <%- attributes.each do |attribute| -%>
   <td <%%= visible_column("<%= singular_table_name %>", "<%= attribute.name %>") %> class="col-<%= attribute.name %> <%%= align_attribute("<%= attribute.type %>") %>">
-    <% if @beautiful_attributes.include?(attribute.name + ':price') then %>
+    <%- if @beautiful_attributes.include?(attribute.name + ':price') then -%>
       <%%= number_to_currency(<%= singular_table_name %>.<%= attribute.name %>) %>
-    <% elsif @beautiful_attributes.include?(attribute.name + ':richtext') then %>
+    <%- elsif @beautiful_attributes.include?(attribute.name + ':richtext') then -%>
       <%%= truncate(<%= singular_table_name %>.<%= attribute.name + "_fulltext" %>, :length => 30) %>
-    <% elsif @beautiful_attributes.include?(attribute.name + ':boolean') then %>
+    <%- elsif @beautiful_attributes.include?(attribute.name + ':boolean') then -%>
       <%%= t((<%= singular_table_name %>.<%= attribute.name %> ? "yes" : "no").to_sym) %>
-    <% elsif @beautiful_attributes.include?(attribute.name + ':references') then %>
+    <%- elsif @beautiful_attributes.include?(attribute.name + ':references') then -%>
       <%% if not <%= singular_table_name %>.<%= attribute.name %>_id.nil? then %>
         <%%= link_to "#" + <%= singular_table_name %>.<%= attribute.name %>_id.to_s, <%= namespace_for_route %><%= attribute.name %>_path(<%= singular_table_name %>.<%= attribute.name %>_id) %>
       <%% else %>
         <%%= t(:any, :default => "Any") %>
       <%% end %>
-    <% else %>
+    <%- else -%>
       <%%= <%= singular_table_name %>.<%= attribute.name %> %>
-    <% end %>
+    <%- end -%>
   </td>
 <%- end -%>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beautiful_scaffold
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-01 00:00:00.000000000Z
+date: 2012-08-06 00:00:00.000000000Z
 dependencies: []
 description: Beautiful Scaffold generate a complete scaffold (sort, export, paginate
   and filter data)
@@ -31,11 +31,15 @@ files:
 - lib/generators/templates/app/assets/images/glyphicons-halflings.png
 - lib/generators/templates/app/assets/javascripts/beautiful_scaffold.js
 - lib/generators/templates/app/assets/javascripts/bootstrap-alert.js
+- lib/generators/templates/app/assets/javascripts/bootstrap-datepicker.js
+- lib/generators/templates/app/assets/javascripts/bootstrap-datetimepicker-for-beautiful-scaffold.js
 - lib/generators/templates/app/assets/javascripts/bootstrap-dropdown.js
 - lib/generators/templates/app/assets/javascripts/bootstrap-modal.js
+- lib/generators/templates/app/assets/javascripts/bootstrap-timepicker.js
 - lib/generators/templates/app/assets/javascripts/bootstrap-tooltip.js
 - lib/generators/templates/app/assets/javascripts/bootstrap.js
 - lib/generators/templates/app/assets/javascripts/bootstrap.min.js
+- lib/generators/templates/app/assets/javascripts/jquery.livequery.js
 - lib/generators/templates/app/assets/javascripts/jquery.pjax.js
 - lib/generators/templates/app/assets/javascripts/modernizr.custom.js
 - lib/generators/templates/app/assets/stylesheets/beautiful-scaffold.css.scss
@@ -43,7 +47,9 @@ files:
 - lib/generators/templates/app/assets/stylesheets/bootstrap-responsive.min.css
 - lib/generators/templates/app/assets/stylesheets/bootstrap.css
 - lib/generators/templates/app/assets/stylesheets/bootstrap.min.css
+- lib/generators/templates/app/assets/stylesheets/datepicker.css
 - lib/generators/templates/app/assets/stylesheets/reset.css
+- lib/generators/templates/app/assets/stylesheets/timepicker.css
 - lib/generators/templates/app/controllers/base.rb
 - lib/generators/templates/app/controllers/master_base.rb
 - lib/generators/templates/app/helpers/beautiful_helper.rb
@@ -54,6 +60,7 @@ files:
 - lib/generators/templates/app/models/pdf_report.rb
 - lib/generators/templates/app/views/_beautiful_menu.html.erb
 - lib/generators/templates/app/views/_form.html.erb
+- lib/generators/templates/app/views/_mass_inserting.html.erb
 - lib/generators/templates/app/views/_modal_columns.html.erb
 - lib/generators/templates/app/views/dashboard.html.erb
 - lib/generators/templates/app/views/edit.html.erb