camaleon_cms 2.3.7.2 → 2.4.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of camaleon_cms might be problematic. Click here for more details.

Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/app/views/camaleon_cms/admin/settings/custom_fields/fields/_image.html.erb +14 -3
  3. data/app/views/camaleon_cms/admin/settings/custom_fields/fields/_private_file.html.erb +1 -1
  4. data/lib/camaleon_cms/version.rb +1 -1
  5. data/spec/features/pages_spec.rb +5 -3
  6. data/spec/features/posts_spec.rb +0 -2
  7. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 3483c89c73c13138983fa6355ba481ac61daf5ec
4
- data.tar.gz: e2efd330151d314cf6981daa752dcd661b3d9eee
3
+ metadata.gz: ad03c95897c5dc811f43a791b267f508f4d76bc1
4
+ data.tar.gz: bb710c9fc0d1033051fe5401d49d4036b54361ec
5
5
  SHA512:
6
- metadata.gz: f4c9a0e7f7b2f446280f474c2e4fe23547e0d2170e83b72fee0485b3642e46e7a6bd5d98359f478a048f31568e45313bb23bc3dfc374a288f0471f2c18b21ff1
7
- data.tar.gz: 903beafb1fedfe15f338e0380d8f46b6e565a025527f8fb10c727535c8df87d5eef5c65a17d3900622e83116697697fcfb19a49409e68c74978d9984993d9abe
6
+ metadata.gz: e0757b58839198c2dd2bb7685f6d4e58b1cc3562d1fa2ee2845208ff060f368cc4f56f12861558b9bd9a8f63efec0f8b5157bf34c8be359727e6bb3537a43b8d
7
+ data.tar.gz: 930b9358e5d68a396348120f85a39c1b9a101025799ad57a0e6210d1b6f7e7bdff40877390af7ae5ac63508ce3e9b5d0f48173cbabe9648fa40fee2fd28680b3
data/app/views/camaleon_cms/admin/settings/custom_fields/fields/_image.html.erb CHANGED
@@ -1,4 +1,15 @@
1
1
  <div class="group-input-fields-content input-group">
2
- <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 %>" />
3
- <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>
4
- </div>
2
+ <input
3
+ onfocus="<%= '$(this).blur().next(\'.btn_upload\').click();' if field.options[:dimension].present? || field.options[:versions].present? || field.options[:thumb_size].present? %>"
4
+ onchange="cama_custom_field_image_changed($(this))"
5
+ data-dimension="<%= field.options[:dimension] %>"
6
+ data-versions="<%= field.options[:versions] %>"
7
+ data-thumb_size="<%= field.options[:thumb_size] %>"
8
+ type="url"
9
+ name="<%= field_name %>[<%= field.slug %>][values][]"
10
+ class="data-error-place-parent form-control input-value <%= "required" if field.options[:required].to_s.to_bool %>" />
11
+ <span class="input-group-addon btn_upload" onclick="load_upload_image_field($(this).prev());">
12
+ <i class="fa fa-upload"></i>
13
+ <%= t('camaleon_cms.admin.button.upload_image')%> <%= "(#{field.get_option('dimension')})" if field.get_option('dimension').present? %>
14
+ </span>
15
+ </div>
data/app/views/camaleon_cms/admin/settings/custom_fields/fields/_private_file.html.erb CHANGED
@@ -1,4 +1,4 @@
1
1
  <div class="group-input-fields-content input-group">
2
- <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 %>" />
2
+ <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 %>" />
3
3
  <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>
4
4
  </div>
data/lib/camaleon_cms/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module CamaleonCms
2
- VERSION = '2.3.7.2'
2
+ VERSION = '2.4.0'
3
3
  end
data/spec/features/pages_spec.rb CHANGED
@@ -11,8 +11,11 @@ describe "the signin process", js: true do
11
11
  fill_in 'post_title', :with => 'Test Title'
12
12
  page.execute_script('$("#form-post .required").val("test required value")')
13
13
  page.execute_script('$("#form-post .tinymce_textarea").tinymce().setContent("Pants are pretty sweet.")')
14
-
15
- fill_in 'post_keywords', :with => 'test keywords'
14
+ page.execute_script('$("#form-post #options_keywords").closest(".panel").find("a.panel-collapse").click()')
15
+ fill_in 'options[seo_title]', :with => 'SEO Title'
16
+ fill_in 'options[keywords]', :with => 'Test keywords changed'
17
+ fill_in 'options[seo_description]', :with => 'Test SEO Description'
18
+ fill_in 'options[seo_author]', :with => 'Test SEO Author'
16
19
  end
17
20
  click_button 'Create'
18
21
  expect(page).to have_css('.alert-success')
@@ -24,7 +27,6 @@ describe "the signin process", js: true do
24
27
  within("#form-post") do
25
28
  fill_in 'post_title', :with => 'Test Title changed'
26
29
  page.execute_script('$("#form-post .tinymce_textarea").tinymce().setContent("Pants are pretty sweet. chaged")')
27
- fill_in 'post_keywords', :with => 'test keywords changed'
28
30
  end
29
31
  click_button 'Update'
30
32
  expect(page).to have_css('.alert-success')
data/spec/features/posts_spec.rb CHANGED
@@ -11,7 +11,6 @@ describe "the signin process", js: true do
11
11
  page.execute_script('$("#form-post input[name=\'categories[]\']:first").prop("checked", true)')
12
12
  wait(2)
13
13
  fill_in 'post_summary', :with => 'test summary'
14
- fill_in 'post_keywords', :with => 'test keywords'
15
14
  page.execute_script("$('#form-post input[name=\"tags\"]').val('owen,dota')")
16
15
  end
17
16
  click_button 'Create'
@@ -25,7 +24,6 @@ describe "the signin process", js: true do
25
24
  fill_in 'post_title', :with => 'Test Title changed'
26
25
  page.execute_script('$("#form-post .tinymce_textarea").tinymce().setContent("Pants are pretty sweet. chaged")')
27
26
  fill_in 'post_summary', :with => 'test summary changed'
28
- fill_in 'post_keywords', :with => 'test keywords changed'
29
27
  end
30
28
  click_button 'Update'
31
29
  expect(page).to have_css('.alert-success')
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: camaleon_cms
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.3.7.2
4
+ version: 2.4.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Owen Peredo Diaz
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-12-14 00:00:00.000000000 Z
11
+ date: 2016-12-15 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bcrypt