flexa_lib 0.3.3 → 0.3.4

data/flexa_lib.gemspec

@@ -7,7 +7,7 @@ require 'flexa_lib/version'
 Gem::Specification.new do |s|
   s.name        = 'flexa_lib'
 #  s.version     = FlexaLib::VERSION
-  s.version     = '0.3.3'
+  s.version     = '0.3.4'
   s.platform    = Gem::Platform::RUBY
 
   s.authors     = ['Allan Freitas','Marcio Sfalsin']

data/lib/flexa_lib/inputs/date_picker_input.rb

@@ -1,34 +1,22 @@
-module FlexaLib
+module FlexaFormtasticBootstrap
   module Inputs
-    class DatePickerInput < Formtastic::Inputs::StringInput
+    class DatePickerInput < Formtastic::Inputs::DatetimeInput
+      include Base
+      include Base::Stringish
+      include Base::Timeish
     
       def to_html
-        input_wrapping do
-          options[:lookup].inspect if options[:lookup].present?
-          label_html << 
-          builder.text_field(options[:lookup][:display], input_html_options) <<
-          template.link_to(options[:lookup][:display],options[:lookup][:path],{:target=>"_blank",:class=>"btn"})<<
-          builder.hidden_field(method, {})
+        generic_input_wrapping do
+          builder.text_field(method, input_html_options)
         end
       end
     
-      def label_html_options
-        {}.tap do |opts|
-          opts[:for] ||= input_html_options[:id]
-          opts[:class] = [opts[:class]]
-        end
-      end
-    
-      #def input_html_options
-      #  super.reject { |k, v| [:min, :max, :step].include?(k) }
-      #end
-    
       def wrapper_html_options
-        super.merge(:class => "#{super[:class]} datePicker" )
+        #super.merge(:class => "#{super[:class]} datePicker" )
       end
         
       def input_html_options
-        super.merge(:class => "datePicker")
+        super.merge(:class => "datepicker_flexa")
       end
     
     end

data/lib/flexa_lib/inputs.rb

@@ -1,5 +1,5 @@
 require 'flexa_lib/inputs/lookup_input'
 require 'flexa_lib/inputs/boolean_input'
 require 'flexa_lib/inputs/radio_input'
-#require 'flexa_lib/inputs/date_picker_input'
+require 'flexa_lib/inputs/date_picker_input'
 

data/lib/generators/flexa_lib/lookup/templates/lookup_view.erb

@@ -1,4 +1,4 @@
-  <%%= flexa_table_for @<%=class_name.pluralize.downcase%>, :actions=>[:select] do -%>
+  <%%= flexa_table_for @<%=class_name.underscore.pluralize.downcase%>, :actions=>[:select] do -%>
     <% if colunas.count>0 %><% colunas.each do |coluna| %><%% column :<%=coluna%>, :title=>"<%=coluna.humanize%>" %><% end %><% end %>
   <%% end -%>
   

data/vendor/assets/javascripts/flexa-themejs.js

@@ -9,6 +9,7 @@
 //= require bootstrap
 //= require populate
 //= require 'jquery.cookie'
+//= require 'jquery-ui-1.8.18.custom.min'
 
 $(document).ready(function(){
   
@@ -63,10 +64,22 @@ $(document).ready(function(){
 
     try {
       $('input.ui-datepicker').datepicker();
-      $('.datePicker').datepicker();
+      //$('.datePicker').datepicker();
+      
+		$(".datepicker_flexa").datepicker({
+		    //mostrar select com mes e com ano(de 10 em 10)
+		    changeMonth: true,
+		    changeYear: true,
+		    //mostra a data em outros meses
+		    showOtherMonths: true,
+		    selectOtherMonths: true,
+		    //formato da data
+		    dateFormat: 'dd/mm/yy'
+		});
+		
     } catch(err) {
       null;    
     }
     
 });
-
+//fim do arquivo flexa-themejs.js