cama_contact_form 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd3e0592f3058294a4f58e0e82fd68b4f0b91b8f
-  data.tar.gz: 54085dd7769b51d2c4b729b34ad802567bcf448c
+  metadata.gz: c091f18c0753b22c78f86f66d5888b6b660a8e6f
+  data.tar.gz: 3523620fe4a1a7d0a97d9d62da76d415343c0099
 SHA512:
-  metadata.gz: 00826667de8e6d526887a804d7010d7beedcfa597aa3aa01e75b481f10e2f7c07f36b44a53bcdd4c93973986d1f2a33ebefa34e671cd7039ad60e34e24b161ae
-  data.tar.gz: 495b5cdd8a30898106bad1f670f7c93774e0712ad74ec738f61886a5aaea894ecca4e889fd4f37ead5b0e442b690bd80827987d534cf060001aa62e9ea80fe69
+  metadata.gz: e74bc0f6309a53890a883561fc7ba80297c17611c2b630a5eeafc3dd85b2f4efaf86c221bc46ba92053a817182efacdf9cb22760464fc1abef0aad1afdd4d016
+  data.tar.gz: ae0183e54ee79e26403456c5f3ff55cae31c77580c68b0acc7d90ece403079f0e87801e06d05b6eff9a25a6678ace8e903fb8ef55b147e2731df43330198e64c

data/app/helpers/plugins/cama_contact_form/main_helper.rb

@@ -77,7 +77,7 @@ module Plugins::CamaContactForm::MainHelper
     object.each do |ob|
       ob[:label] = ob[:label].to_s.translate
       ob[:description] = ob[:description].to_s.translate
-      r = {field: ob, form: form, template: (ob[:field_options][:template].present? ? ob[:field_options][:template] :  Plugins::CamaContactForm::CamaContactForm::field_template), custom_class: "#{'form-control' unless ['submit', 'checkboxes', 'radio', 'file'].include?(ob[:field_type].to_s)} #{ob[:field_options][:field_class]}", custom_attrs: {id: ob[:cid] }.merge((JSON.parse(ob[:field_options][:field_attributes]) rescue {})) }
+      r = {field: ob, form: form, template: (ob[:field_options][:template].present? ? ob[:field_options][:template] :  Plugins::CamaContactForm::CamaContactForm::field_template), custom_class: (ob[:field_options][:field_class] rescue nil), custom_attrs: {id: ob[:cid] }.merge((JSON.parse(ob[:field_options][:field_attributes]) rescue {})) }
       hooks_run("contact_form_item_render", r)
       ob = r[:field]
       ob[:custom_class] = r[:custom_class]
@@ -91,27 +91,26 @@ module Plugins::CamaContactForm::MainHelper
 
       case ob[:field_type].to_s
         when 'paragraph','textarea'
-          temp2 = "<textarea #{ob[:custom_attrs].to_attr_format} name=\"#{f_name}\" maxlength=\"#{field_options[:maxlength] || 500 }\"  class=\"#{ob[:custom_class]}  \">#{values[cid] || ob[:default_value].to_s.translate}</textarea>"
+          temp2 = "<textarea #{ob[:custom_attrs].to_attr_format} name=\"#{f_name}\" maxlength=\"#{field_options[:maxlength] || 500 }\"  class=\"#{ob[:custom_class].presence || 'form-control'}  \">#{values[cid] || ob[:default_value].to_s.translate}</textarea>"
         when 'radio'
           temp2=  cama_form_select_multiple_bootstrap(ob, ob[:label], ob[:field_type],values)
         when 'checkboxes'
           temp2=  cama_form_select_multiple_bootstrap(ob, ob[:label], "checkbox",values)
         when 'submit'
-          temp2 = "<button #{ob[:custom_attrs].to_attr_format} type=\"#{ob[:field_type]}\" name=\"#{f_name}\"  class=\"#{ob[:custom_class].present? ? ob[:custom_class] : 'btn btn-default'}\">#{ob[:label]}</button>"
+          temp2 = "<button #{ob[:custom_attrs].to_attr_format} type=\"#{ob[:field_type]}\" name=\"#{f_name}\"  class=\"#{ob[:custom_class].presence || 'btn btn-default'}\">#{ob[:label]}</button>"
         when 'button'
-          temp2 = "<button #{ob[:custom_attrs].to_attr_format} type='button' name=\"#{f_name}\" class=\"#{ob[:custom_class].present? ? ob[:custom_class] : 'btn btn-default'}\">#{ob[:label]}</button>"
+          temp2 = "<button #{ob[:custom_attrs].to_attr_format} type='button' name=\"#{f_name}\" class=\"#{ob[:custom_class].presence || 'btn btn-default'}\">#{ob[:label]}</button>"
         when 'reset_button'
-          temp2 = "<button #{ob[:custom_attrs].to_attr_format} type='reset' name=\"#{f_name}\" class=\"#{ob[:custom_class].present? ? ob[:custom_class] : 'btn btn-default'}\">#{ob[:label]}</button>"
+          temp2 = "<button #{ob[:custom_attrs].to_attr_format} type='reset' name=\"#{f_name}\" class=\"#{ob[:custom_class].presence || 'btn btn-default'}\">#{ob[:label]}</button>"
         when 'text', 'website', 'email'
           class_type = ""
           class_type = "railscf-field-#{ob[:field_type]}" if ob[:field_type]=="website"
           class_type = "railscf-field-#{ob[:field_type]}" if ob[:field_type]=="email"
-          temp2 = "<input #{ob[:custom_attrs].to_attr_format} type=\"#{ob[:field_type]}\" value=\"#{values[cid] || ob[:default_value].to_s.translate}\" name=\"#{f_name}\"  class=\"#{ob[:custom_class]} #{class_type}\">"
+          temp2 = "<input #{ob[:custom_attrs].to_attr_format} type=\"#{ob[:field_type]}\" value=\"#{values[cid] || ob[:default_value].to_s.translate}\" name=\"#{f_name}\"  class=\"#{ob[:custom_class].presence || 'form-control'} #{class_type}\">"
         when 'captcha'
-          temp2 = cama_captcha_tag(5, {}, {class: "#{ob[:custom_class]} field-captcha required"}.merge(ob[:custom_attrs]))
+          temp2 = cama_captcha_tag(5, {}, {class: "#{ob[:custom_class].presence || 'form-control'} field-captcha required"}.merge(ob[:custom_attrs]))
         when 'file'
-          class_type = "railscf-field-#{ob[:field_type]}" if ob[:field_type]=="website"
-          temp2 = "<input multiple=\"multiple\" type=\"file\" value=\"\" name=\"#{f_name}\" #{ob[:custom_attrs].to_attr_format} class=\"#{class_type} #{ob[:custom_class]}\">"
+          temp2 = "<input multiple=\"multiple\" type=\"file\" value=\"\" name=\"#{f_name}\" #{ob[:custom_attrs].to_attr_format} class=\"#{ob[:custom_class].presence || 'form-control'}\">"
         when 'dropdown'
           temp2 = cama_form_select_multiple_bootstrap(ob, ob[:label], "select",values)
         else

data/app/views/plugins/cama_contact_form/admin_forms/_item_field.html.erb

@@ -19,11 +19,13 @@
             <label for=""><%= t('.label') %></label><br>
             <%= text_field_tag "fields[#{cid}][label]", field[:label], class: 'form-control translatable' %>
         </div>
-        <div class="form-group ">
-            <label for=""><%= t('.is_required', default: 'Is Required?') %></label><br>
-            <%= hidden_field_tag "fields[#{cid}][required]", false %>
-            <%= check_box_tag "fields[#{cid}][required]", true, field[:required].to_s.cama_true? %>
-        </div>
+        <% unless ['button' 'submit', 'reset_button'].include?(field[:field_type]) %>
+            <div class="form-group ">
+                <label for=""><%= t('.is_required', default: 'Is Required?') %></label><br>
+                <%= hidden_field_tag "fields[#{cid}][required]", false %>
+                <%= check_box_tag "fields[#{cid}][required]", true, field[:required].to_s.cama_true? %>
+            </div>
+        <% end %>
         <div class="form-group ">
             <label><%= t('.descr', default: 'Description') %></label><br>
             <%= text_area_tag "fields[#{cid}][field_options][description]", field[:field_options][:description], class: 'form-control translatable' %>

data/lib/cama_contact_form/version.rb

@@ -1,3 +1,3 @@
 module CamaContactForm
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cama_contact_form
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Owen Peredo