beautiful_scaffold 0.3.0.rc1 → 0.3.0.rc2

data/CHANGELOG

@@ -1,4 +1,17 @@
-== 0.3.0
+== 0.3.0.rc2
+
+* enhancement
+  * Barcode support (set README for usage)
+  * Chardinjs for overlay instruction (set README for usage)
+
+* Bugfix
+  * i18n some bugfix i18n
+  * i18n download willpaginate i18n file
+  * Body hidden in firefox
+  * Add space after icon for some button
+  * Bug treeview double quote in attribute (data-opened=""")
+
+== 0.3.0.rc1
 
 * enhancement
   * Refactoring i18n (avoid reserved words) :

data/README.rdoc

@@ -15,7 +15,7 @@ gem 'beautiful_scaffold', '0.2.7'
 === RubyOnRails 4.X
 
 Add this in your Gemfile :
-gem 'beautiful_scaffold', '0.3.0.rc1'
+gem 'beautiful_scaffold', '0.3.0.rc2'
 
 === Next
 
@@ -50,6 +50,8 @@ rails g beautiful_migration AddFieldToModels field:type
 
 === Locale (i18n) (Example)
 
+Run rake db:migrate before rail g beautiful_locale (to get lastest attribute translation)
+
 rails g beautiful_locale all
 rails g beautiful_locale fr
 rails g beautiful_locale de
@@ -60,4 +62,37 @@ rails g beautiful_jointable model1 model2
 
 === Install et Configure Devise (authentification) and Cancan (authorization)
 
-rails g beautiful_devisecancan model
+rails g beautiful_devisecancan model
+
+=== In views
+
+==== Barcodes
+
+Set code like this :
+<span class="barcode" data-barcode="1234567890128" data-type-barcode="ean13"></span>
+
+data-type-barcode can be :
+
+codabar
+code11 (code 11)
+code39 (code 39)
+code93 (code 93)
+code128 (code 128)
+ean8 (ean 8)
+ean13 (ean 13)
+std25 (standard 2 of 5 - industrial 2 of 5)
+int25 (interleaved 2 of 5)
+msi
+datamatrix (ASCII + extended)
+
+==== Chardinjs (overlay instructions)
+
+Example : This button triggers chardinjs on element with 'menu' id.
+<a href="#" class="bs-chardinjs" data-selector="#menu">Help Menu</a>
+
+If you want display all chardinjs :
+<a href="#" class="bs-chardinjs" data-selector="body">Help</a>
+
+Just add class="bs-chardinjs" in a button / link for trigger chardinjs. Beautiful-Scaffold does the job !
+
+For add instruction to element, read official documentation : https://github.com/heelhook/chardin.js#adding-data-for-the-instructions

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

data/lib/generators/beautiful_locale_generator.rb

@@ -37,6 +37,15 @@ class BeautifulLocaleGenerator < Rails::Generators::Base
       rescue
         say_status("Error", "Error to download locale, verify if locale exist at : #{download_path}", :red)
       end
+
+      willpaginate_locale_file = "will_paginate.#{temp_locale}.yml"
+      download_path = "https://raw.github.com/mislav/will_paginate/master/lib/will_paginate/locale/en.yml"
+      begin
+        get download_path, "config/locales/#{willpaginate_locale_file}"
+        say_status("Warning", "You must modify Will_paginate locale at : Rails.root/config/locale/#{willpaginate_locale_file}", :red)
+      rescue
+        say_status("Error", "Error to download locale, verify if locale exist at : #{download_path}", :red)
+      end
     }
 
     say_status("Warning", "/!\\ Remember to update your application.rb file !", :yellow)
@@ -72,12 +81,12 @@ class BeautifulLocaleGenerator < Rails::Generators::Base
 
       hi18n[name.downcase]['app']['models'][model] ||= {
           'bs_caption'            => model,
-          'bs_caption_pluralize'  => model.pluralize,
+          'bs_caption_plural'     => model.pluralize,
           'bs_attributes'         => {},
       }
 
       hi18n[name.downcase]['app']['models'][model]['bs_caption']              = translate_string(name.downcase, model)
-      hi18n[name.downcase]['app']['models'][model]['bs_caption_pluralize']    = translate_string(name.downcase, model.pluralize)
+      hi18n[name.downcase]['app']['models'][model]['bs_caption_plural']    = translate_string(name.downcase, model.pluralize)
       hi18n[name.downcase]['app']['models'][model]['bs_attributes']         ||= {}
 
       sorted_attr.each { |k|

data/lib/generators/beautiful_scaffold_common_methods.rb

@@ -75,7 +75,7 @@ module BeautifulScaffoldCommonMethods
   end
 
   def model_p_path_i18n(model)
-    "app.models.#{model}.bs_caption_pluralize"
+    "app.models.#{model}.bs_caption_plural"
   end
 
   def i18n_t_a(model, attribute)
@@ -167,6 +167,7 @@ module BeautifulScaffoldCommonMethods
     gem('rdiscount')
     gem('sanitize')
     gem('twitter-bootstrap-rails')
+    gem('chardinjs-rails')
   end
 
 end

data/lib/generators/beautiful_scaffold_generator.rb

@@ -20,7 +20,8 @@ class BeautifulScaffoldGenerator < Rails::Generators::Base
 
   def install_gems
     require_gems
-    inside Rails.root do
+    #inside Rails.root do # Bug ?!
+    Bundler.with_clean_env do
       run "bundle install"
     end
   end
@@ -71,6 +72,7 @@ class BeautifulScaffoldGenerator < Rails::Generators::Base
                         "#{javascriptspath}bootstrap-timepicker.js",
                         "#{javascriptspath}jquery.livequery.js",
                         "#{javascriptspath}jquery.jstree.js",
+                        "#{javascriptspath}jquery-barcode.js",
                         "#{javascriptspath}tagit.js",
                         "#{javascriptspath}bootstrap-colorpicker.js",
                         "#{javascriptspath}a-wysihtml5-0.3.0.min.js",

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

@@ -1,6 +1,13 @@
 //= require jquery
 //= require jquery-ui
 //= require jquery_ujs
+//= require twitter/bootstrap/bootstrap-transition
+//= require twitter/bootstrap/bootstrap-alert
+//= require twitter/bootstrap/bootstrap-modal
+//= require twitter/bootstrap/bootstrap-button
+//= require twitter/bootstrap/bootstrap-collapse
+//= require twitter/bootstrap/bootstrap-dropdown
+//= require twitter/bootstrap/bootstrap-tooltip
 //= require jquery.livequery
 //= require turbolinks
 //= require a-wysihtml5-0.3.0.min
@@ -18,6 +25,7 @@
 //= require markitup/sets/textile/set
 //= require markitup/sets/wiki/set
 //= require tagit.js
+//= require chardinjs
 //= require beautiful_scaffold
 //= require fixed_menu
 
@@ -31,4 +39,4 @@ $(function() {
 });
 $(window).bind('page:change', function() {
     initPage();
-})
+});

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

@@ -142,6 +142,17 @@ function bs_init(){
             });
         });
 
+    // Barcode
+    $('.barcode').each(function(index){
+        $(this).barcode($(this).attr('data-barcode'), $(this).attr('data-type-barcode'));
+    });
+
+    // Chardinjs (overlay instructions)
+    $(".bs-chardinjs").on("click", function(){
+        var selector = $(this).attr("data-selector");
+        $(selector).chardinJs('toggle');
+    });
+
     // Mass inserting set focus
     elt = $('form.mass-inserting div[style*="inline"][class*="col"] .input-small').first();
     if($('form.mass-inserting').hasClass('setfocus')){

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

@@ -16,4 +16,5 @@ function modify_dom_init(){
     $("body>div.row-fluid").replaceWith(cnt);
 
     $('body').show();
+    $('body').css('display','block'); /* Hack Firefox previous line dosen't work with firefox */
 }