camaleon_cms 2.3.7.2 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3483c89c73c13138983fa6355ba481ac61daf5ec
-  data.tar.gz: e2efd330151d314cf6981daa752dcd661b3d9eee
+  metadata.gz: ad03c95897c5dc811f43a791b267f508f4d76bc1
+  data.tar.gz: bb710c9fc0d1033051fe5401d49d4036b54361ec
 SHA512:
-  metadata.gz: f4c9a0e7f7b2f446280f474c2e4fe23547e0d2170e83b72fee0485b3642e46e7a6bd5d98359f478a048f31568e45313bb23bc3dfc374a288f0471f2c18b21ff1
-  data.tar.gz: 903beafb1fedfe15f338e0380d8f46b6e565a025527f8fb10c727535c8df87d5eef5c65a17d3900622e83116697697fcfb19a49409e68c74978d9984993d9abe
+  metadata.gz: e0757b58839198c2dd2bb7685f6d4e58b1cc3562d1fa2ee2845208ff060f368cc4f56f12861558b9bd9a8f63efec0f8b5157bf34c8be359727e6bb3537a43b8d
+  data.tar.gz: 930b9358e5d68a396348120f85a39c1b9a101025799ad57a0e6210d1b6f7e7bdff40877390af7ae5ac63508ce3e9b5d0f48173cbabe9648fa40fee2fd28680b3

data/app/views/camaleon_cms/admin/settings/custom_fields/fields/_image.html.erb

@@ -1,4 +1,15 @@
 <div class="group-input-fields-content input-group">
-  <input onchange="cama_custom_field_image_changed($(this))" data-dimension="<%= field.options[:dimension] %>" data-versions="<%= field.options[:versions] %>" data-thumb_size="<%= field.options[:thumb_size] %>" type="url" name="<%= field_name %>[<%= field.slug %>][values][]" class="data-error-place-parent form-control input-value <%= "required" if field.options[:required].to_s.to_bool %>" />
-  <span class="input-group-addon btn_upload" onclick="load_upload_image_field($(this).prev());"><i class="fa fa-upload"></i> <%= t('camaleon_cms.admin.button.upload_image')%> <%= "(#{field.get_option('dimension')})" if field.get_option('dimension').present? %></span>
-</div>
+    <input
+        onfocus="<%= '$(this).blur().next(\'.btn_upload\').click();' if field.options[:dimension].present? || field.options[:versions].present? || field.options[:thumb_size].present? %>"
+        onchange="cama_custom_field_image_changed($(this))"
+        data-dimension="<%= field.options[:dimension] %>"
+        data-versions="<%= field.options[:versions] %>"
+        data-thumb_size="<%= field.options[:thumb_size] %>"
+        type="url"
+        name="<%= field_name %>[<%= field.slug %>][values][]"
+        class="data-error-place-parent form-control input-value <%= "required" if field.options[:required].to_s.to_bool %>" />
+    <span class="input-group-addon btn_upload" onclick="load_upload_image_field($(this).prev());">
+      <i class="fa fa-upload"></i>
+      <%= t('camaleon_cms.admin.button.upload_image')%> <%= "(#{field.get_option('dimension')})" if field.get_option('dimension').present? %>
+    </span>
+</div>

data/app/views/camaleon_cms/admin/settings/custom_fields/fields/_private_file.html.erb

@@ -1,4 +1,4 @@
 <div class="group-input-fields-content input-group">
-  <input onfocus="$(this).blur();" type="text" data-formats="<%= field.options[:formats] || "" %>" name="<%= field_name %>[<%= field.slug %>][values][]" class="disabled form-control input-value data-error-place-parent file_format <%= "required" if field.options[:required].to_s.to_bool %>"  />
+  <input onfocus="$(this).blur().next('.btn_upload').click();" type="text" data-formats="<%= field.options[:formats] || "" %>" name="<%= field_name %>[<%= field.slug %>][values][]" class="disabled form-control input-value data-error-place-parent file_format <%= "required" if field.options[:required].to_s.to_bool %>"  />
   <span class="input-group-addon btn_upload" onclick="load_upload_private_file_field(this);return false;"><i class="fa fa-upload"></i> <%= t('camaleon_cms.admin.button.upload_file') %></span>
 </div>

data/lib/camaleon_cms/version.rb

@@ -1,3 +1,3 @@
 module CamaleonCms
-  VERSION = '2.3.7.2'
+  VERSION = '2.4.0'
 end

data/spec/features/pages_spec.rb

@@ -11,8 +11,11 @@ describe "the signin process", js: true do
       fill_in 'post_title', :with => 'Test Title'
       page.execute_script('$("#form-post .required").val("test required value")')
       page.execute_script('$("#form-post .tinymce_textarea").tinymce().setContent("Pants are pretty sweet.")')
-
-      fill_in 'post_keywords', :with => 'test keywords'
+      page.execute_script('$("#form-post #options_keywords").closest(".panel").find("a.panel-collapse").click()')
+      fill_in 'options[seo_title]', :with => 'SEO Title'
+      fill_in 'options[keywords]', :with => 'Test keywords changed'
+      fill_in 'options[seo_description]', :with => 'Test SEO Description'
+      fill_in 'options[seo_author]', :with => 'Test SEO Author'
     end
     click_button 'Create'
     expect(page).to have_css('.alert-success')
@@ -24,7 +27,6 @@ describe "the signin process", js: true do
     within("#form-post") do
       fill_in 'post_title', :with => 'Test Title changed'
       page.execute_script('$("#form-post .tinymce_textarea").tinymce().setContent("Pants are pretty sweet. chaged")')
-      fill_in 'post_keywords', :with => 'test keywords changed'
     end
     click_button 'Update'
     expect(page).to have_css('.alert-success')

data/spec/features/posts_spec.rb

@@ -11,7 +11,6 @@ describe "the signin process", js: true do
       page.execute_script('$("#form-post input[name=\'categories[]\']:first").prop("checked", true)')
       wait(2)
       fill_in 'post_summary', :with => 'test summary'
-      fill_in 'post_keywords', :with => 'test keywords'
       page.execute_script("$('#form-post input[name=\"tags\"]').val('owen,dota')")
     end
     click_button 'Create'
@@ -25,7 +24,6 @@ describe "the signin process", js: true do
       fill_in 'post_title', :with => 'Test Title changed'
       page.execute_script('$("#form-post .tinymce_textarea").tinymce().setContent("Pants are pretty sweet. chaged")')
       fill_in 'post_summary', :with => 'test summary changed'
-      fill_in 'post_keywords', :with => 'test keywords changed'
     end
     click_button 'Update'
     expect(page).to have_css('.alert-success')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: camaleon_cms
 version: !ruby/object:Gem::Version
-  version: 2.3.7.2
+  version: 2.4.0
 platform: ruby
 authors:
 - Owen Peredo Diaz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-14 00:00:00.000000000 Z
+date: 2016-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt