effective_bootstrap 1.26.3 → 1.27.0

data/app/models/effective/form_inputs/rich_text_area.rb

@@ -3,11 +3,9 @@
 module Effective
   module FormInputs
     class RichTextArea < Effective::FormInput
-
       def input_html_options
         { class: 'form-control effective_rich_text_area trix-content', id: tag_id }
       end
-
     end
   end
 end

data/app/models/effective/form_inputs/save.rb

@@ -3,7 +3,6 @@
 module Effective
   module FormInputs
     class Save < Effective::FormInput
-
       def to_html(&block)
         content_tag(:button, options[:input]) do
           icon_name.present? ? (icon(icon_name) + name) : name
@@ -18,7 +17,6 @@ module Effective
         return @icon unless @icon.nil?
         @icon = options[:input].delete(:icon) || ''.html_safe
       end
-
     end
   end
 end

data/app/models/effective/form_inputs/search_field.rb

@@ -3,7 +3,6 @@
 module Effective
   module FormInputs
     class SearchField < Effective::FormInput
-
       def input_html_options
         { class: 'form-control', placeholder: 'Search...' }
       end
@@ -11,7 +10,6 @@ module Effective
       def input_group_options
         { input_group: { class: 'input-group' }, prepend: content_tag(:span, icon('search'), class: 'input-group-text') }
       end
-
     end
   end
 end

data/app/models/effective/form_inputs/select.rb

@@ -53,10 +53,10 @@ module Effective
           'form-control',
           ('freeform' if freeform?),
           ('polymorphic' if polymorphic?),
-          ('grouped' if (grouped? || polymorphic?)),
+          ('grouped' if grouped? || polymorphic?),
           ('hide-disabled' if hide_disabled?),
           ('tags-input' if tags?),
-          ('disable-open-on-focus' if disable_open_on_focus?),
+          ('disable-open-on-focus' if disable_open_on_focus?)
         ].compact.join(' ')
 
         { class: classes, multiple: (true if multiple?), include_blank: (true if include_blank?), id: tag_id }.compact
@@ -178,7 +178,6 @@ module Effective
       def ajax_url
         @ajax_url ||= (options.delete(:ajax_url) || options.delete(:ajax) || options.delete(:url))
       end
-
     end
   end
 end

data/app/models/effective/form_inputs/select_or_text.rb

@@ -17,16 +17,16 @@ module Effective
 
         @shared_options = (options[:input_html] || {})
 
-        @select_options = { 
-          placeholder: '', 
+        @select_options = {
+          placeholder: '',
           hint: "Can't find your #{(options[:name] || name).to_s.chomp('_id')}? <a class='effective-select-or-text-switch' title='Switch to enter freeform' data-effective-select-or-text='true' href='#'>Click here</a> to add one",
-          required: false,
+          required: false
         }.merge(options[:select] || options.presence || {}).merge(@shared_options)
 
-        @text_options = { 
-          placeholder: '', 
+        @text_options = {
+          placeholder: '',
           hint: "Looking for an existing #{(options[:name] || name).to_s.chomp('_id')}? <a class='effective-select-or-text-switch' title='Switch to search for existing' data-effective-select-or-text='true' href='#'>Click here</a> to search",
-          required: false 
+          required: false
         }.merge(options[:text] || options[:text_field] || options.presence || {}).merge(@shared_options)
 
         @email_field = options.fetch(:email, name_text.to_s.include?('email'))
@@ -54,10 +54,10 @@ module Effective
 
         value = object.send(name)
 
-        return true if (value.present? && select_collection.include?(value))
-        return true if (value.to_i > 0 && select_collection.find { |obj| obj.respond_to?(:id) && obj.id == value.to_i })
+        return true if value.present? && select_collection.include?(value)
+        return true if value.to_i > 0 && select_collection.find { |obj| obj.respond_to?(:id) && obj.id == value.to_i }
 
-        return true if value.blank? && object.send(name_text).blank?
+        true if value.blank? && object.send(name_text).blank?
       end
 
       def text?
@@ -75,7 +75,6 @@ module Effective
       def text_options
         @text_options.merge(text? ? VISIBLE : HIDDEN)
       end
-
     end
   end
 end

data/app/models/effective/form_inputs/static_field.rb

@@ -3,7 +3,6 @@
 module Effective
   module FormInputs
     class StaticField < Effective::FormInput
-
       def input_html_options
         { class: 'form-control-plaintext', readonly: false, id: tag_id }
       end
@@ -21,10 +20,12 @@ module Effective
           value
         end
 
-        content_tag(:p, content, options[:input].except(:readonly, :required).merge(id: tag_id))
+        content_tag(:p, content, options[:input].except(:readonly, :required, :link).merge(id: tag_id))
       end
 
       def resource_path
+        return false if options[:input][:link] == false
+
         # I don't want to hardcode effective_resources as a dependency of this gem. But it's so useful...
         return false unless defined?(EffectiveResources)
 
@@ -37,7 +38,6 @@ module Effective
           Effective::Resource.new(@template.controller_path).action_path(:show, value)
         )
       end
-
     end
   end
 end

data/app/models/effective/form_inputs/submit.rb

@@ -3,7 +3,6 @@
 module Effective
   module FormInputs
     class Submit < Effective::FormInput
-
       def to_html(&block)
         return nil if form_readonly?
         super()
@@ -29,7 +28,7 @@ module Effective
       end
 
       def wrapper_options
-        @right = true unless (left? || center? || right?)
+        @right = true unless left? || center? || right?
 
         classes = [
           ('row' if layout == :horizontal),
@@ -106,7 +105,6 @@ module Effective
         # end
         false
       end
-
     end
   end
 end

data/app/models/effective/form_inputs/text_area.rb

@@ -3,11 +3,9 @@
 module Effective
   module FormInputs
     class TextArea < Effective::FormInput
-
       def input_html_options
         { class: 'form-control', rows: 3, id: tag_id }
       end
-
     end
   end
 end

data/app/models/effective/form_inputs/text_field.rb

@@ -3,11 +3,9 @@
 module Effective
   module FormInputs
     class TextField < Effective::FormInput
-
       def input_html_options
         { class: 'form-control', maxlength: 250, size: nil, id: tag_id }
       end
-
     end
   end
 end

data/app/models/effective/form_inputs/time_field.rb

@@ -3,7 +3,6 @@
 module Effective
   module FormInputs
     class TimeField < DatetimeField
-
       def input_html_options
         {
           class: ['form-control', 'effective_date_time_picker', 'effective_time', ('not-date-linked' if not_date_linked?)].compact.join(' '),
@@ -31,7 +30,6 @@ module Effective
       def format # moment.js
         am_pm? ? 'LT' : 'HH:mm'
       end
-
     end
   end
 end

data/app/models/effective/form_inputs/time_zone_select.rb

@@ -3,7 +3,6 @@
 module Effective
   module FormInputs
     class TimeZoneSelect < Select
-
       def self.time_zone_collection
         date = Time.zone.now
 
@@ -11,7 +10,6 @@ module Effective
           ["(UTC #{date.in_time_zone(tz).strftime('%:z')}) #{tz.name}", tz.name]
         end
       end
-
     end
   end
 end

data/app/models/effective/form_inputs/url_field.rb

@@ -3,7 +3,6 @@
 module Effective
   module FormInputs
     class UrlField < Effective::FormInput
-
       def input_html_options
         {
           class: 'form-control effective_url',
@@ -22,7 +21,6 @@ module Effective
       def validated?(name)
         true
       end
-
     end
   end
 end

data/app/models/effective/form_logic.rb

@@ -36,12 +36,11 @@ module Effective
     end
 
     def input_js_options
-      { 'data-input-js-options' => JSON.generate({method_name: input_js_options_method_name}.merge!(logic_options)) }
+      { 'data-input-js-options' => JSON.generate({ method_name: input_js_options_method_name }.merge!(logic_options)) }
     end
 
     def input_js_options_method_name
       "effective_#{self.class.name.split('::').last.underscore}"
     end
-
   end
 end

data/app/models/effective/form_logics/hide_if.rb

@@ -3,7 +3,6 @@
 module Effective
   module FormLogics
     class HideIf < Effective::FormLogic
-
       def to_html(&block)
         disabled_was = @builder.disabled
 
@@ -39,7 +38,6 @@ module Effective
 
         first == second || first.to_s == second.to_s || Array(first) == Array(second) || Array(first.to_s) == Array(second.to_s)
       end
-
     end
   end
 end

data/app/models/effective/form_logics/show_if.rb

@@ -3,7 +3,6 @@
 module Effective
   module FormLogics
     class ShowIf < Effective::FormLogic
-
       def to_html(&block)
         disabled_was = @builder.disabled
 
@@ -43,7 +42,6 @@ module Effective
           Array(first.to_s) == Array(second.to_s) ||
           Array(first).any? { |value| value.to_s == second.to_s }
       end
-
     end
   end
 end

data/app/models/effective/form_logics/show_if_any.rb

@@ -3,7 +3,6 @@
 module Effective
   module FormLogics
     class ShowIfAny < Effective::FormLogic
-
       def to_html(&block)
         disabled_was = @builder.disabled
 
@@ -39,7 +38,6 @@ module Effective
           selected == value || selected.to_s == value.to_s || selected == Array(value) || selected.to_s == Array(value.to_s) || (Array(selected) & Array(value)).present?
         end
       end
-
     end
   end
 end

data/app/models/effective/table_builder.rb

@@ -212,6 +212,8 @@ module Effective
     end
 
     def static_field(name, options = {}, &block)
+      return rows[name] = TableRows::ContentFor.new(name, options, builder: self).to_html(&block) if block_given?
+
       rows[name] = (value(name).is_a?(ActiveRecord::Base)) ? belongs_to(name, options) : default_row(name, options)
     end
 
@@ -257,7 +259,7 @@ module Effective
         end
       end
 
-      #rows[name] = "" if value(name).blank?
+      # rows[name] = "" if value(name).blank?
 
       nil
     end
@@ -280,6 +282,5 @@ module Effective
       end
     end
     alias_method :effective_fields_for, :fields_for
-
   end
 end

data/app/models/effective/table_row.rb

@@ -63,6 +63,5 @@ module Effective
     def value
       options[:value] || builder.value(name)
     end
-
   end
 end

data/app/models/effective/table_rows/article_editor.rb

@@ -3,7 +3,6 @@
 module Effective
   module TableRows
     class ArticleEditor < Effective::TableRow
-
       def content
         return unless value.present?
 
@@ -23,7 +22,6 @@ module Effective
 
         [*prefix, text].join(': ')
       end
-
     end
   end
 end

data/app/models/effective/table_rows/belongs_to.rb

@@ -3,9 +3,10 @@
 module Effective
   module TableRows
     class BelongsTo < Effective::TableRow
-
       def content
         if value.present?
+          return value.to_s if options[:link] == false
+
           content_tag(:div) { link_to_edit || link_to_show || value.to_s }
         end
       end
@@ -33,7 +34,6 @@ module Effective
 
         link_to(value.to_s, path, title: value.to_s, target: '_blank')
       end
-
     end
   end
 end

data/app/models/effective/table_rows/boolean.rb

@@ -3,7 +3,6 @@
 module Effective
   module TableRows
     class Boolean < Effective::TableRow
-
       def to_html(&block)
         content_tag(:tr, class: tr_class) do
           content_tag(:td, colspan: 2) do
@@ -19,7 +18,6 @@ module Effective
           template.badge('No', class: 'badge badge-danger mr-2')
         end
       end
-
     end
   end
 end

data/app/models/effective/table_rows/collection.rb

@@ -3,7 +3,6 @@
 module Effective
   module TableRows
     class Collection < Effective::TableRow
-
       def initialize(name, collection, options, builder:)
         @collection = collection
         super(name, options, builder: builder)
@@ -24,7 +23,6 @@ module Effective
         item = item.first if item.kind_of?(Array)
         (item || value).to_s
       end
-
     end
   end
 end

data/app/models/effective/table_rows/content_for.rb

@@ -3,13 +3,11 @@
 module Effective
   module TableRows
     class ContentFor < Effective::TableRow
-
       def to_html(&block)
         content_tag(:tr, class: tr_class) do
           content_tag(:th, label_content) + content_tag(:td, template.capture(&block))
         end
       end
-
     end
   end
 end

data/app/models/effective/table_rows/date_field.rb

@@ -3,7 +3,6 @@
 module Effective
   module TableRows
     class DateField < Effective::TableRow
-
       def content
         nice_date(value)
       end
@@ -16,7 +15,7 @@ module Effective
 
         now = Time.zone.now
 
-        distance = if (now > value)
+        distance = if now > value
           template.distance_of_time_in_words(now, value) + ' ago'
         else
           template.distance_of_time_in_words(value, now) + ' from now'
@@ -24,7 +23,6 @@ module Effective
 
         content_tag(:span, label, title: full + ' (' + distance + ')')
       end
-
     end
   end
 end

data/app/models/effective/table_rows/datetime_field.rb

@@ -3,7 +3,6 @@
 module Effective
   module TableRows
     class DatetimeField < Effective::TableRow
-
       def content
         nice_date_time(value)
       end
@@ -16,7 +15,7 @@ module Effective
 
         now = Time.zone.now
 
-        distance = if (now > value)
+        distance = if now > value
           template.distance_of_time_in_words(now, value) + ' ago'
         else
           template.distance_of_time_in_words(value, now) + ' from now'
@@ -24,7 +23,6 @@ module Effective
 
         content_tag(:span, label, title: full + ' (' + distance + ')')
       end
-
     end
   end
 end

data/app/models/effective/table_rows/effective_address.rb

@@ -3,11 +3,9 @@
 module Effective
   module TableRows
     class EffectiveAddress < Effective::TableRow
-
       def content
         value.to_html if value.present?
       end
-
     end
   end
 end

data/app/models/effective/table_rows/email_field.rb

@@ -3,11 +3,9 @@
 module Effective
   module TableRows
     class EmailField < Effective::TableRow
-
       def content
         value.to_s.include?('@') ? template.mail_to(value) : value.presence
       end
-
     end
   end
 end

data/app/models/effective/table_rows/file_field.rb

@@ -3,7 +3,6 @@
 module Effective
   module TableRows
     class FileField < Effective::TableRow
-
       def content
         values = Array(value) - [nil, '']
 
@@ -17,7 +16,6 @@ module Effective
       def link_to_file(file)
         link_to(file.filename, template.url_for(file), target: '_blank')
       end
-
     end
   end
 end

data/app/models/effective/table_rows/has_many_card.rb

@@ -3,7 +3,6 @@
 module Effective
   module TableRows
     class HasManyCard < Effective::TableRow
-
       def to_html(&block)
         table = builder.render(&block)
 

data/app/models/effective/table_rows/percent_field.rb

@@ -3,7 +3,6 @@
 module Effective
   module TableRows
     class PercentField < Effective::TableRow
-
       def content
         return unless value.present?
         str = value.kind_of?(Integer) ? ('%.3f' % (value / 1000.0)) : value.to_s

data/app/models/effective/table_rows/phone_field.rb

@@ -3,14 +3,12 @@
 module Effective
   module TableRows
     class PhoneField < Effective::TableRow
-
       def content
         return unless value.present?
 
         digits = value.split('x').first.delete('^0-9')
         link_to(value, "tel:+1#{digits}")
       end
-
     end
   end
 end

data/app/models/effective/table_rows/price_field.rb

@@ -3,11 +3,9 @@
 module Effective
   module TableRows
     class PriceField < Effective::TableRow
-
       def content
         template.price_to_currency(value) if value.present?
       end
-
     end
   end
 end

data/app/models/effective/table_rows/text_area.rb

@@ -3,7 +3,6 @@
 module Effective
   module TableRows
     class TextArea < Effective::TableRow
-
       def content
         return unless value.present?
 
@@ -16,7 +15,6 @@ module Effective
           template.simple_format(value)
         end
       end
-
     end
   end
 end

data/app/models/effective/table_rows/url_field.rb

@@ -3,11 +3,9 @@
 module Effective
   module TableRows
     class UrlField < Effective::TableRow
-
       def content
         template.link_to(value, value, target: '_blank') if value.present?
       end
-
     end
   end
 end

data/lib/effective_bootstrap/engine.rb

@@ -35,6 +35,5 @@ module EffectiveBootstrap
         ActionMailer::Base.send(:helper, EffectiveArticleEditorHelper)
       end
     end
-
   end
 end

data/lib/effective_bootstrap/version.rb

@@ -1,3 +1,3 @@
 module EffectiveBootstrap
-  VERSION = '1.26.3'.freeze
+  VERSION = '1.27.0'.freeze
 end

data/lib/effective_bootstrap.rb

@@ -4,7 +4,6 @@ require 'effective_bootstrap/engine'
 require 'effective_bootstrap/version'
 
 module EffectiveBootstrap
-
   def self.config_keys
     [:use_custom_data_confirm, :save_tabs, :benchmarks]
   end
@@ -14,5 +13,4 @@ module EffectiveBootstrap
   def self.boolean_collection
     [['Yes', true], ['No', false]]
   end
-
 end

data/lib/generators/effective_bootstrap/install_generator.rb

@@ -8,7 +8,6 @@ module EffectiveBootstrap
       def copy_initializer
         template ('../' * 3) + 'config/effective_bootstrap.rb', 'config/initializers/effective_bootstrap.rb'
       end
-
     end
   end
 end