comfortable_mexican_sofa 1.4.11 → 1.4.12

data/VERSION

@@ -1 +1 @@
-1.4.11
+1.4.12

data/app/assets/javascripts/comfortable_mexican_sofa/application.js

@@ -91,7 +91,7 @@ $.CMS = function(){
     },
 
     enable_date_picker: function(){
-      $('input[type=datetime], input[type=text].datetime').datepicker();
+      $('input[type=text].date').datepicker({ dateFormat: 'yy-mm-dd' });
     },
 
     tree_methods: function(){

data/app/assets/stylesheets/comfortable_mexican_sofa/form.css

@@ -67,13 +67,13 @@
 #cms_body #form_blocks .no_tags code {
   color: #B85042;
 }
-#cms_body .form_element.field_datetime .label,
+#cms_body .form_element.field_date_time .label,
 #cms_body .form_element.field_integer .label,
 #cms_body .form_element.field_string .label,
 #cms_body .form_element.field_text .label {
   border-color: #48699C;
 }
-#cms_body .form_element.page_datetime .label,
+#cms_body .form_element.page_date_time .label,
 #cms_body .form_element.page_integer .label,
 #cms_body .form_element.page_string .label,
 #cms_body .form_element.page_text .label,

data/comfortable_mexican_sofa.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{comfortable_mexican_sofa}
-  s.version = "1.4.11"
+  s.version = "1.4.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Oleg Khabarov", "The Working Group Inc"]

data/lib/comfortable_mexican_sofa/form_builder.rb

@@ -60,16 +60,24 @@ class ComfortableMexicanSofa::FormBuilder < ActionView::Helpers::FormBuilder
     css_class = options[:css_class] || tag.class.to_s.demodulize.underscore
     
     field_css_class = case tag
-    when ComfortableMexicanSofa::Tag::PageRichText
-      'rich_text'
+    when ComfortableMexicanSofa::Tag::PageDateTime, ComfortableMexicanSofa::Tag::FieldDateTime
+      'date'
     when ComfortableMexicanSofa::Tag::PageText, ComfortableMexicanSofa::Tag::FieldText
       'code'
+    when ComfortableMexicanSofa::Tag::PageRichText
+      'rich_text'
     end
     
     options[:content_field_method] ||= :text_field_tag
     field = 
       options[:field] || 
-      @template.send(options[:content_field_method], 'page[blocks_attributes][][content]', tag.content, :id => nil, :class => field_css_class)
+      @template.send(
+        options[:content_field_method],
+        'page[blocks_attributes][][content]',
+        tag.content,
+        :id     => nil, 
+        :class  => field_css_class
+      )
     
     %(
       <div class='form_element #{css_class}'>
@@ -83,7 +91,7 @@ class ComfortableMexicanSofa::FormBuilder < ActionView::Helpers::FormBuilder
   end
   
   def field_date_time(tag)
-    default_tag_field(tag, :content_field_method => :datetime_field_tag)
+    default_tag_field(tag)
   end
   
   def field_integer(tag)
@@ -99,7 +107,7 @@ class ComfortableMexicanSofa::FormBuilder < ActionView::Helpers::FormBuilder
   end
   
   def page_date_time(tag)
-    default_tag_field(tag, :content_field_method => :datetime_field_tag)
+    default_tag_field(tag)
   end
   
   def page_integer(tag)

data/lib/comfortable_mexican_sofa/view_methods.rb

@@ -10,11 +10,6 @@ module ComfortableMexicanSofa::ViewMethods
     content_tag(:span, *args)
   end
   
-  # Rails 3.0 doesn't have this helper defined
-  def datetime_field_tag(name, value = nil, options = {})
-    text_field_tag(name, value, options.stringify_keys.update('type' => 'datetime'))
-  end
-  
   # Injects some content somewhere inside cms admin area
   def cms_hook(name, options = {})
     ComfortableMexicanSofa::ViewHooks.render(name, self, options)

data/test/functional/cms_admin/pages_controller_test.rb

@@ -48,7 +48,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
   def test_get_new_with_field_datetime
     cms_layouts(:default).update_attribute(:content, '{{cms:field:test_label:datetime}}')
     get :new, :site_id => cms_sites(:default)
-    assert_select "input[type='datetime'][name='page[blocks_attributes][][content]']"
+    assert_select "input[type='text'][name='page[blocks_attributes][][content]'][class='date']"
     assert_select "input[type='hidden'][name='page[blocks_attributes][][label]'][value='test_label']"
   end
 
@@ -69,14 +69,14 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
   def test_get_new_with_field_text
     cms_layouts(:default).update_attribute(:content, '{{cms:field:test_label:text}}')
     get :new, :site_id => cms_sites(:default)
-    assert_select "textarea[name='page[blocks_attributes][][content]']"
+    assert_select "textarea[name='page[blocks_attributes][][content]'][class='code']"
     assert_select "input[type='hidden'][name='page[blocks_attributes][][label]'][value='test_label']"
   end
 
   def test_get_new_with_page_datetime
     cms_layouts(:default).update_attribute(:content, '{{cms:page:test_label:datetime}}')
     get :new, :site_id => cms_sites(:default)
-    assert_select "input[type='datetime'][name='page[blocks_attributes][][content]']"
+    assert_select "input[type='text'][name='page[blocks_attributes][][content]'][class='date']"
     assert_select "input[type='hidden'][name='page[blocks_attributes][][label]'][value='test_label']"
   end
 
@@ -97,14 +97,14 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
   def test_get_new_with_page_text
     cms_layouts(:default).update_attribute(:content, '{{cms:page:test_label}}')
     get :new, :site_id => cms_sites(:default)
-    assert_select "textarea[name='page[blocks_attributes][][content]']"
+    assert_select "textarea[name='page[blocks_attributes][][content]'][class='code']"
     assert_select "input[type='hidden'][name='page[blocks_attributes][][label]'][value='test_label']"
   end
 
   def test_get_new_with_rich_page_text
     cms_layouts(:default).update_attribute(:content, '{{cms:page:test_label:rich_text}}')
     get :new, :site_id => cms_sites(:default)
-    assert_select "textarea[name='page[blocks_attributes][][content]']"
+    assert_select "textarea[name='page[blocks_attributes][][content]'][class='rich_text']"
     assert_select "input[type='hidden'][name='page[blocks_attributes][][label]'][value='test_label']"
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version
-  version: 1.4.11
+  version: 1.4.12
   prerelease: 
 platform: ruby
 authors:
@@ -15,7 +15,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70254947803580 !ruby/object:Gem::Requirement
+  requirement: &70106784163860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70254947803580
+  version_requirements: *70106784163860
 - !ruby/object:Gem::Dependency
   name: active_link_to
-  requirement: &70254947803000 !ruby/object:Gem::Requirement
+  requirement: &70106784163220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70254947803000
+  version_requirements: *70106784163220
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &70254947802440 !ruby/object:Gem::Requirement
+  requirement: &70106784162660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,7 +45,7 @@ dependencies:
         version: 2.3.14
   type: :runtime
   prerelease: false
-  version_requirements: *70254947802440
+  version_requirements: *70106784162660
 description: ''
 email: oleg@theworkinggroup.ca
 executables: []
@@ -347,7 +347,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3773802276572835291
+      hash: -4032257811876113166
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: