kadmin 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ae7ab81f575c8f1b81ea683971e2d1c1eb674f71ee0f7434ac2295394763363
-  data.tar.gz: 2e9dbf8da6871530fd4bb86a6c7213fdc4c2c6bdfabdf4fad71dff8f5095e27e
+  metadata.gz: f006debe357b9b00018578ed59b5f70abd7062c47aa69ec3fbfb488d6b74bc98
+  data.tar.gz: 8ccabc5103f421e655c5d38a3b4cb8fe8975a515d14d3849c4799ddffe329934
 SHA512:
-  metadata.gz: 0ceaa06561d11a4a467af85d8e979b96c5f4378fda459f78d0a0bef941f94866c254a856c9c7341a2ad444288d2531c68d7cdd019bf2b6cddb644ea213a67f42
-  data.tar.gz: 1938dc5c81a833f9dadb3780cc5d5d1ef1757a6a9b8fdd3eb70a02fdac9617d837d52e61a52792a5b5caa7cf28162bef60b961e593f36a967626c1d7b5dea09b
+  metadata.gz: 3f16f761cc7292f9206ed15cc3277b9ceda44a733f67fff832f5d06333f90d34af257e569856acb6d7b804092c2d7c55aaff05c209f946671fe1f4ff41a30c9a
+  data.tar.gz: cfa6a82c8999d89b3056a818a55977afd970f4a1e609041f1abbe28cbd86ae849b458408d9dc6b4260b4119458b3be330c4cc5168a32e5f786c3d4a6adfba4bf

data/app/helpers/kadmin/bootstrap_helper.rb

@@ -44,33 +44,40 @@ module Kadmin
     end
 
     # Custom label generator using bootstrap i.e. * for mendatory feilds, help icon and popover for help
-    # @param [String] label text for the view
-    # @param [String] label_for is ID of the html element for which we are displaying label.
-    # @param [Boolean] Display the red asteric to indicate mendatory field.
-    # @param [Boolean] to decide weither we need to display the help iocn or not
-    # @param [String] Title of the popover
-    # @param [String] Body text of popover
-    # @param [String] classname for the label.
-    def create_custom_label(label, label_for = '', required = false, display_help = true, title = '', message = '', label_class = 'control-label')
-      label = t(label)
+    # @param [String] key identifier for the help label / input field
+    # @param [Hash] options options for the help label
+    def create_custom_label(key, options = {})
+      defaults = {
+        label_for: "#{key}",
+        required: false,
+        display_help: true,
+        title: ".#{key}.title",
+        message: ".#{key}.message",
+        label_class: 'control-label',
+        data_placement: 'top'
+      }
+      options = defaults.merge(options)
+
+      label = t(".#{key}.label")
       label = label.html_safe
 
-      require_html = required ? '<span class="required-field"><span>' : ''
+      require_html = options[:required] ? '<span class="required-field"><span>' : ''
       icon_html = "<i class='fa fa-question-circle' style='color:green'></i>"
 
       display_message = ''
-      if display_help
-        message = t(message)
+      if options[:display_help]
+        message = t(options[:message])
         message = message.gsub('"', '\"')
         message = message.gsub("'", "\'")
         html_message = message.html_safe
 
-        title = t(title)
+        title = t(options[:title])
         title = title.html_safe
-        display_message = "<span data-toggle='popover' title='#{title}' data-placement='top' data-trigger='hover' data-content='#{html_message}'>#{icon_html}</span>"
+
+        display_message = "<span data-toggle='popover' title='#{title}' data-placement='#{options[:data_placement]}' data-trigger='hover' data-content='#{html_message}'>#{icon_html}</span>"
       end
 
-      return "<label for='#{label_for}' class='#{label_class}'' >#{require_html}#{label} #{display_message}</label>".html_safe
+      return "<label for='#{options[:label_for]}' class='#{options[:label_class]}'>#{require_html}#{label} #{display_message}</label>".html_safe
     end
   end
 end

data/lib/kadmin/version.rb

@@ -1,3 +1,3 @@
 module Kadmin
-  VERSION = '1.2.1'.freeze
+  VERSION = '1.3.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kadmin
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Nicolas Pepin-Perreault
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-29 00:00:00.000000000 Z
+date: 2020-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails