lotus_admin 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 165fbfa584f3bb0cd71ea555855d2ffc49ab22129aabfde4b067cec175f73a56
-  data.tar.gz: 94c075db3474838e53dd8ee488ca9f5f3e1cd453c9ebea1ee9f7290b7aed0b25
+  metadata.gz: 7da3c2c63c60b091d7fe7fccaf1b1ef3282d152aaa191b141c0192b7bb8045d8
+  data.tar.gz: a4c88154204fbf234e7ee29ae03866db5fed7b3a3ade921624fbe6a234a7214e
 SHA512:
-  metadata.gz: ffd7b457deb21e99211232f9f5f3368c6456af9969b3d4f6263f30df73690a23259dcd2313b318934b41d0d2fe39b01472782c355deb3152e1cd7082097e0175
-  data.tar.gz: '0110559a144589ca4413b57751c68742dc31838f3bb7aa59e75269fe375cb0d359181b87ebca1f7ab8edb9433b4ac16aae081ff5feb19d1b428dcd5e421099d1'
+  metadata.gz: 0d73ca1d470aab9dda188eeaa1352cd00e7cf079cd4d52bdc35e78543575c5ee78071210fb7af4e8f106788679e945226e7238cebb002ea98ae02bcd74dcbbea
+  data.tar.gz: febc6e4b7f3438873edc38507589a32539edf33bcbeee2268b2b2f192517bb38fad084cfe8ae8bb9d778e12d8aeca4855cf6db88b599de5513251dfd42cb3013

data/app/assets/stylesheets/lotus_admin/components/_forms.scss

@@ -9,3 +9,7 @@
 .input-group-addon {
   border-bottom: 1px solid $input-border;
 }
+
+label.form-control {
+  border-bottom: 0px;
+}

data/app/helpers/lotus_admin/form_helpers.rb

@@ -1,6 +1,7 @@
 module LotusAdmin
   module FormHelpers
     def material_form_for(resource, options = {}, &block)
+      options[:builder] ||= LotusAdmin::FormBuilder
       options[:wrapper] = :material_form
       options[:wrapper_mappings] = {
         boolean: :material_boolean_horizontal

data/config/initializers/simple_form_material.rb

@@ -11,7 +11,7 @@ SimpleForm.setup do |config|
     b.optional :min_max
     b.optional :readonly
 
-    b.use :input, class: 'form-control', wrap_with: { tag: 'div', class: 'fg-line' }
+    b.use :label_input, class: 'form-control', wrap_with: { tag: 'div', class: 'fg-line' }
     b.use :error, wrap_with: { tag: 'span', class: 'help-block' }
     b.use :hint,  wrap_with: { tag: 'p', class: 'help-block' }
   end

data/lib/lotus_admin/form_builder.rb

@@ -0,0 +1,27 @@
+class LotusAdmin::FormBuilder < SimpleForm::FormBuilder
+  def input(attribute_name, options = {}, &block)
+    type = options.fetch(:as, nil) || default_input_type(
+        attribute_name,
+        find_attribute_column(attribute_name),
+        options
+    )
+
+    if type != :boolean
+      if options[:placeholder].nil?
+        options[:placeholder] ||= if object.class.respond_to?(:human_attribute_name)
+                                    object.class.human_attribute_name(attribute_name.to_s)
+                                  else
+                                    attribute_name.to_s.humanize
+                                  end
+      end
+      options[:label] = false if options[:label].nil?
+    end
+
+    case type
+    when :grouped_select, :select, :date
+      options[:label] = options[:placeholder]
+    end
+
+    super
+  end
+end

data/lib/lotus_admin/version.rb

@@ -1,3 +1,3 @@
 module LotusAdmin
-  VERSION = '1.2.1'
+  VERSION = '1.2.2'
 end

data/lib/lotus_admin.rb

@@ -19,6 +19,7 @@ require 'kaminari'
 require 'ransack'
 
 require 'lotus_admin/configuration'
+require 'lotus_admin/form_builder'
 require 'lotus_admin/router'
 
 module LotusAdmin

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lotus_admin
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Matt Millsaps-Brewer
@@ -442,6 +442,7 @@ files:
 - lib/lotus_admin.rb
 - lib/lotus_admin/configuration.rb
 - lib/lotus_admin/engine.rb
+- lib/lotus_admin/form_builder.rb
 - lib/lotus_admin/router.rb
 - lib/lotus_admin/version.rb
 - lib/tasks/lotus_admin_tasks.rake