comfortable_mexican_sofa 2.0.16 → 2.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: d18190d86d823194b3c4c84b09f645dcccb84dc7a4c8dd6737152de40531347d
-  data.tar.gz: ee193e477d81df17bd0304d3b016b9356ffb45361e4c8e52cc7fe7a550f5b5aa
+SHA1:
+  metadata.gz: 1de2082d0f04ab3482b9ca303ce5cb2a0742c931
+  data.tar.gz: 353bdb2b41ec035eb182d8fd96eaba92c2cf1e29
 SHA512:
-  metadata.gz: 5f39c1b3c7166059c5c3396bae3511dd61ccf33a00d71b9cbf71bbb9b63d6bb1d416637967c1f8df1cb97e13c0f2d6a2b280ff75a532c3f42f8cd6c654326b16
-  data.tar.gz: 9f0c76f95bb28f54195720e519c7815da4380678115f654fd3af52f01c35f77b014f456647865e334be5a3717c38b6454867569af589bc3dd3e6b306a638fbc4
+  metadata.gz: d1a02dc6c122018580e2653b062ab52c2d1c3085652f60477a47ec0c8706ffe1a65bd9d698fd25a36cca4592fc581ec0460551250bca66b44c60b7b2c4171428
+  data.tar.gz: e668efc2fb6e753fe786bf73f33ee5a4ce7a5562a2ef70f93fec110328b3696dacde1652e39914f8cbf4a7599bb297e93058733e4c15fae2fb4cc92c0b0b492c

data/app/views/comfy/admin/cms/layouts/_form.html.haml

@@ -4,10 +4,10 @@
 = form.text_field :identifier, data: {slug: true}
 
 - if (options = Comfy::Cms::Layout.options_for_select(@site, @layout)).present?
-  = form.select :parent_id, [["---- #{t('.select_parent_layout')} ----", nil]] + options
+  = form.select :parent_id, [["---- #{t('.select_parent_layout')} ----", nil]] + options, bootstrap: {custom_control: true}
 
 - if (options = Comfy::Cms::Layout.app_layouts_for_select(lookup_context.view_paths)).present?
-  = form.select :app_layout, [["---- #{t('.select_app_layout')} ----", nil]] + options
+  = form.select :app_layout, [["---- #{t('.select_app_layout')} ----", nil]] + options, bootstrap: {custom_control: true}
 
 = form.text_area :content, data: {'cms-cm-mode' => 'text/html'}
 = form.text_area :css, data: {'cms-cm-mode' => 'css'}

data/app/views/comfy/admin/cms/pages/_form.html.haml

@@ -6,10 +6,10 @@
   = form.text_field :slug, data: { slug: true }, prepend: @page.parent.full_path
 
 - if (options = ::Comfy::Cms::Page.options_for_select(site: @site, page: @page, exclude_self: true)).present?
-  = form.select :parent_id, options
+  = form.select :parent_id, options, bootstrap: {custom_control: true}
 
 - if (options = ::Comfy::Cms::Layout.options_for_select(@site)).present?
-  = form.select :layout_id, options, {}, {data: {url: form_fragments_comfy_admin_cms_site_page_path(@site, @page.id.to_i)}, id: "fragments-toggle"}
+  = form.select :layout_id, options, {bootstrap: {custom_control: true}}, {data: {url: form_fragments_comfy_admin_cms_site_page_path(@site, @page.id.to_i)}, id: "fragments-toggle"}
 
 = comfy_admin_partial "comfy/admin/cms/partials/page_form_inner", form: form
 
@@ -19,7 +19,7 @@
 = render "comfy/admin/cms/categories/form", form: form
 
 - if (options = ::Comfy::Cms::Page.options_for_select(site: @site, page: @page)).present?
-  = form.select :target_page_id, [["---- #{t('.select_target_page')} ----", nil]] + options
+  = form.select :target_page_id, [["---- #{t('.select_target_page')} ----", nil]] + options, bootstrap: {custom_control: true}
 
 = form.check_box :is_published
 

data/app/views/comfy/admin/cms/sites/_form.html.haml

@@ -4,7 +4,9 @@
 = form.text_field :identifier, data: {slug: true}
 = form.text_field :hostname
 = form.text_field :path
-= form.select :locale, ComfortableMexicanSofa.config.locales.to_a.collect{|l| ["#{l[1]} (#{l[0]})", l[0]]}
+
+- locales = ComfortableMexicanSofa.config.locales.to_a.collect{|l| ["#{l[1]} (#{l[0]})", l[0]]}
+= form.select :locale, locales, bootstrap: {custom_control: true}
 
 = comfy_admin_partial "comfy/admin/cms/partials/site_form_after", form: form
 

data/lib/comfortable_mexican_sofa/content/tags/datetime.rb

@@ -19,6 +19,8 @@ class ComfortableMexicanSofa::Content::Tag::Datetime < ComfortableMexicanSofa::C
   end
 
   def render
+    return "" unless renderable
+
     if strftime.present?
       content.strftime(strftime)
     else

data/lib/comfortable_mexican_sofa/engine.rb

@@ -3,7 +3,7 @@
 require "comfortable_mexican_sofa"
 require "rails"
 require "rails-i18n"
-require "bootstrap_form"
+require "comfy_bootstrap_form"
 require "active_link_to"
 require "kramdown"
 require "jquery-rails"

data/lib/comfortable_mexican_sofa/form_builder.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class ComfortableMexicanSofa::FormBuilder < BootstrapForm::FormBuilder
+class ComfortableMexicanSofa::FormBuilder < ComfyBootstrapForm::FormBuilder
 
   # Renders form input for a fragment
   #

data/lib/comfortable_mexican_sofa/version.rb

@@ -2,6 +2,6 @@
 
 module ComfortableMexicanSofa
 
-  VERSION = "2.0.16"
+  VERSION = "2.0.17"
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version
-  version: 2.0.16
+  version: 2.0.17
 platform: ruby
 authors:
 - Oleg Khabarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-23 00:00:00.000000000 Z
+date: 2018-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_link_to
@@ -634,7 +634,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Rails 5.2+ CMS Engine