flexa_lib 0.3.2 → 0.3.3

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.2'
+  s.version     = '0.3.3'
   s.platform    = Gem::Platform::RUBY
 
   s.authors     = ['Allan Freitas','Marcio Sfalsin']

data/lib/flexa_formtastic_bootstrap/inputs/boolean_input.rb

@@ -4,29 +4,29 @@ module FlexaFormtasticBootstrap
     class BooleanInput < Formtastic::Inputs::BooleanInput
       include Base
 
-      def to_html
-        clearfix_div_wrapping do
-          empty_label <<
-          hidden_field_html <<
-          input_div_wrapping(:block) do
-            template.content_tag(:ul, :class => "inputs-list") do
-              template.content_tag(:li) do
-                label_with_nested_checkbox
-              end
-            end
-          end
-        end
-      end
+#      def to_html
+##        clearfix_div_wrapping do
+#          empty_label <<
+#          hidden_field_html <<
+#          input_div_wrapping(:block) do
+#            template.content_tag(:ul, :class => "inputs-list") do
+#              template.content_tag(:li) do
+#                label_with_nested_checkbox
+#              end
+#            end
+#          end
+#        end
+#      end
 
-      def label_text_with_embedded_checkbox
-        # That newline matters!  Why, I do no not know.
-        check_box_html << "\n" << template.content_tag(:span) do label_text end
-      end
+#      def label_text_with_embedded_checkbox
+#        # That newline matters!  Why, I do no not know.
+#        check_box_html << "\n" << template.content_tag(:span) do label_text end
+#     end
 
       # Need this for formatting to work.
-      def empty_label
-        template.content_tag(:label) do end
-      end
+#      def empty_label
+#        template.content_tag(:label) do end
+#      end
 
     end
   end

data/lib/flexa_lib/inputs/boolean_input.rb

@@ -13,14 +13,16 @@ module FlexaFormtasticBootstrap
           #empty_label <<
           hidden_field_html <<
           input_div_wrapping(:block) do
-            #template.content_tag(:ul, :class => "inputs-list") do
-              #template.content_tag(:li) do
+
                 label_with_nested_checkbox
-              #end
-            #end
           end
         end
       end
+      
+      def wrapper_html_options
+        new_class = [super[:class], "checkbox"].compact.join(" ")
+        super.merge(:class => new_class)
+      end
 
       def label_text_with_embedded_checkbox
         # That newline matters!  Why, I do no not know.

data/lib/flexa_lib/inputs/radio_input.rb

@@ -0,0 +1,40 @@
+module FlexaFormtasticBootstrap
+  module Inputs
+    class RadioInput < Formtastic::Inputs::RadioInput
+      include Base
+      include Base::Choices
+
+      def to_html
+        clearfix_div_wrapping do
+          legend_html <<
+          input_div_wrapping do
+            #choices_group_wrapping do
+              collection.map { |choice| 
+                #choice_wrapping(choice_wrapping_html_options(choice)) do
+                  choice_html(choice)
+                #end
+              }.join("\n").html_safe
+            #end
+          end
+        end
+      end
+
+      def choice_html(choice)        
+        template.content_tag(:label, label_html_options.merge(:for => choice_input_dom_id(choice), :class => nil)) do
+          builder.radio_button(input_name, choice_value(choice), input_html_options.merge(choice_html_options(choice)).merge(:required => false)) << 
+
+          choice_label(choice)
+        end
+      end
+      
+      def legend_html
+        if render_label?
+            template.content_tag(:label, label_text,:class => "label_radio")
+        else
+          "".html_safe
+        end
+      end
+
+    end
+  end
+end

data/lib/flexa_lib/inputs.rb

@@ -1,4 +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'
 

data/lib/flexa_lib/model_extensions.rb

@@ -32,26 +32,7 @@ module FlexaLib
           paginate(options)
         end
       end
-      
-
-      def flexa_search_by_sql(options)
-        options  = options.dup
-        
-        search_options = options.fetch(:search)        { raise ArgumentError, ":search is required" }
-        likes_search   = search_options.fetch(:fields) { raise ArgumentError, ":fields is required" }
-        text_search   = search_options.fetch(:text)   { raise ArgumentError, ":text is required" }
-        
-        options.delete(:search)
-        
-        if text_search.length > 0 and likes_search.count > 0
-          
-          likes_search.collect! {|x| "(UPPER("+x+") LIKE UPPER(:search))"}
-          paginate(options).where(likes_search.join(' OR '), :search => "%"+text_search.to_s+"%")
-        else
-          paginate(options)
-        end
-      end
-      
+            
     end #fim do modulo PesquisaWrapper
     
       # adicionar ao ActiveRecord

data/vendor/assets/stylesheets/flexa-theme.css.scss

@@ -42,4 +42,8 @@
 }
 .icon-white {
   background-image: url("glyphicons-halflings-white.png");
-}
+}
+
+.label_radio{
+  margin-left:-18px
+}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: flexa_lib
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Allan Freitas
@@ -149,6 +149,8 @@ files:
 - vendor/assets/javascripts/bootstrap-tooltip.js
 - vendor/assets/images/glyphicons-halflings.png
 - vendor/assets/images/glyphicons-halflings-white.png
+- vendor/assets/images/icon_error.gif
+- vendor/assets/images/icon_sucess.gif
 - lib/action_view/helpers/text_field_date_helper.rb
 - lib/flexa_lib/inputs.rb
 - lib/flexa_lib/model_extensions.rb
@@ -172,6 +174,7 @@ files:
 - lib/flexa_lib/helpers/link_helpers.rb
 - lib/flexa_lib/inputs/date_picker_input.rb
 - lib/flexa_lib/inputs/lookup_input.rb
+- lib/flexa_lib/inputs/radio_input.rb
 - lib/flexa_lib/inputs/boolean_input.rb
 - lib/flexa_lib/helpers.rb
 - lib/generators/flexa_lib/crud/crud_generator.rb