inline_forms 3.1.0 → 3.1.1

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.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/bin/inline_forms_installer_core.rb +11 -2
  3. data/lib/app/helpers/form_elements/ckeditor.rb +19 -12
  4. data/lib/generators/assets/javascripts/application.js +1 -1
  5. data/lib/inline_forms/version.rb +1 -1
  6. metadata +23 -24
  7. data/lib/generators/locales/inline_forms_local.en.yml +0 -7
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 1c4f6d923bfa32074172ff389d8f0848f9ed1ee8
4
- data.tar.gz: d6bf74e276699736e11b3d3b329db908bcc2d4bf
3
+ metadata.gz: 684d01de18df89b7283e23e72762195033976045
4
+ data.tar.gz: beef6a381522ea1240220cfce1c06038a7fc5829
5
5
  SHA512:
6
- metadata.gz: b891092ab4fe9c38bf0f9eee4b87c0f3468db86ee1a91c934e4af2e2320db4188fdfaf2398c965522f8a5d680b2fb71e536a9d316951f06f32d8b10b8f270456
7
- data.tar.gz: 70dc9d72c157dac1faf5fc9e951927e6ef156401d7eda096b92c2016315a89bbca55bdaa69cb3c3fd767bf5a9c65b4a04e8aee48c22e05491f46de15e788de1a
6
+ metadata.gz: cba698b279ce5fa35e130d782b52079035e1e8e412258fbb14148de92ca9fbe82cb0059505c522c283251c6b220373bc514e8872cec961d01622b584ff0e93e9
7
+ data.tar.gz: 5b0a287ede720761d9f08d24966abe3b8e9a2c75dcdaf411adb2d1f55abd2c0513f4f6030a609f19484f8bbc19456365cba987d4a7c68626c41c1d01dfb27735
data/bin/inline_forms_installer_core.rb CHANGED
@@ -11,7 +11,7 @@ gem 'jquery-ui-sass-rails'
11
11
  gem 'capistrano'
12
12
  gem 'will_paginate', :git => 'git://github.com/acesuares/will_paginate.git'
13
13
  gem 'tabs_on_rails', :git => 'git://github.com/acesuares/tabs_on_rails.git', :branch => 'update_remote'
14
- gem 'ckeditor_rails'
14
+ gem 'ckeditor'
15
15
  gem 'cancan', :git => 'git://github.com/acesuares/cancan.git', :branch => '2.0'
16
16
  gem 'carrierwave'
17
17
  gem 'remotipart', '~> 1.0'
@@ -288,13 +288,22 @@ remove_file 'app/assets/javascripts/application.js'
288
288
  copy_file File.join(GENERATOR_PATH, 'lib/generators/assets/javascripts' , javascript), File.join('app/assets/javascripts' , javascript)
289
289
  end
290
290
 
291
+ say "- Install ckeditor..."
292
+ generate "ckeditor:install --orm=active_record --backend=carrierwave"
293
+
294
+ say "- Add ckeditor autoload_paths to application.rb..."
295
+ application "config.autoload_paths += %W(\#{config.root}/app/models/ckeditor)"
296
+
297
+ # see https://github.com/galetahub/ckeditor/issues/579
298
+ say "- Set languages for ckeditor to ['en', 'nl'] in config/initializers/ckeditor.rb..."
299
+ insert_into_file "config/initializers/ckeditor.rb", " config.assets_languages = ['en', 'nl']", :after => "config.assets_languages = ['en', 'uk']\n"
300
+
291
301
  say "- Create ckeditor config.js"
292
302
  copy_file File.join(GENERATOR_PATH, 'lib/generators/assets/javascripts/ckeditor/config.js'), "app/assets/javascripts/ckeditor/config.js"
293
303
 
294
304
  say "- Paper_trail install..."
295
305
  generate "paper_trail:install" # TODO One day, we need some management tools so we can actually SEE the versions, restore them etc.
296
306
 
297
-
298
307
  # Create Translations
299
308
  say "- Generate models and tables and views for translations..." # TODO Translations need to be done in inline_forms, and then generate a yml file, perhaps
300
309
  generate "inline_forms", "InlineFormsLocale name:string inline_forms_translations:belongs_to _enabled:yes _presentation:\#{name}"
data/lib/app/helpers/form_elements/ckeditor.rb CHANGED
@@ -2,30 +2,37 @@
2
2
  InlineForms::SPECIAL_COLUMN_TYPES[:ckeditor]=:text
3
3
 
4
4
  def ckeditor_show(object, attribute)
5
- # "</div><script>$('#".html_safe +
6
- # "textarea_#{object.class.name.underscore}_#{object.id}_#{attribute.to_s}" + "').ckeditor();</script>".html_safe
7
-
8
5
  link_to_inline_edit object,
9
6
  attribute,
10
7
  '<div class="ckeditor_area">'.html_safe +
11
- text_area_tag( attribute,
12
- object[attribute],
13
- :id => "textarea_#{object.class.name.underscore}_#{object.id}_#{attribute.to_s}",
14
- ) +
8
+ cktext_area_tag(
9
+ attribute,
10
+ object[attribute],
11
+ :id => "textarea_#{object.class.name.underscore}_#{object.id}_#{attribute.to_s}",
12
+ :ckeditor => { :width => '100%',
13
+ :height => '200px',
14
+ :toolbar => "None",
15
+ :readOnly => "true",
16
+ :resize_enabled => "false",
17
+ :toolbarCanCollapse => "false"
18
+ }
19
+ ) +
15
20
  image_tag( 'glass_plate.gif',
16
21
  :class => "glass_plate",
17
22
  :title => '' ) +
18
- "</div><script>$('#".html_safe +
19
- "textarea_#{object.class.name.underscore}_#{object.id}_#{attribute.to_s}" + "').ckeditor();</script>".html_safe
23
+ "<script>delete CKEDITOR.instances['textarea_#{object.class.name.underscore}_#{object.id}_#{attribute.to_s}']</script>".html_safe +
24
+ '</div>'.html_safe
20
25
  end
21
26
 
22
27
  def ckeditor_edit(object, attribute)
23
- text_area_tag( attribute,
28
+ cktext_area_tag( attribute,
24
29
  object[attribute],
25
30
  :id => "textarea_#{object.class.name.underscore}_#{object.id}_#{attribute.to_s}",
31
+ :ckeditor => { :width => '100%',
32
+ :height => '200px'
33
+ }
26
34
  ) +
27
- "<script>$('#".html_safe +
28
- "textarea_#{object.class.name.underscore}_#{object.id}_#{attribute.to_s}" + "').ckeditor();</script>".html_safe
35
+ "<script>delete CKEDITOR.instances['textarea_#{object.class.name.underscore}_#{object.id}_#{attribute.to_s}']</script>".html_safe
29
36
  end
30
37
 
31
38
  def ckeditor_update(object, attribute)
data/lib/generators/assets/javascripts/application.js CHANGED
@@ -12,8 +12,8 @@
12
12
  //
13
13
  //= require jquery
14
14
  //= require jquery_ujs
15
- //= require ckeditor-jquery
16
15
  //= require jquery.ui.all
16
+ //= require ckeditor/init
17
17
  //= require foundation
18
18
  //= require jquery.remotipart
19
19
  //= require inline_forms
data/lib/inline_forms/version.rb CHANGED
@@ -1,4 +1,4 @@
1
1
  # -*- encoding : utf-8 -*-
2
2
  module InlineForms
3
- VERSION = "3.1.0"
3
+ VERSION = "3.1.1"
4
4
  end
metadata CHANGED
@@ -1,55 +1,55 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: inline_forms
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.1.0
4
+ version: 3.1.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ace Suares
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-07-12 00:00:00.000000000 Z
11
+ date: 2015-07-13 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rvm
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - ">="
17
+ - - '>='
18
18
  - !ruby/object:Gem::Version
19
19
  version: '0'
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - ">="
24
+ - - '>='
25
25
  - !ruby/object:Gem::Version
26
26
  version: '0'
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: thor
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - ">="
31
+ - - '>='
32
32
  - !ruby/object:Gem::Version
33
33
  version: '0'
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
- - - ">="
38
+ - - '>='
39
39
  - !ruby/object:Gem::Version
40
40
  version: '0'
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: validation_hints
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
- - - ">="
45
+ - - '>='
46
46
  - !ruby/object:Gem::Version
47
47
  version: '0'
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
- - - ">="
52
+ - - '>='
53
53
  - !ruby/object:Gem::Version
54
54
  version: '0'
55
55
  - !ruby/object:Gem::Dependency
@@ -70,70 +70,70 @@ dependencies:
70
70
  name: rails-i18n
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
- - - ">="
73
+ - - '>='
74
74
  - !ruby/object:Gem::Version
75
75
  version: '0'
76
76
  type: :runtime
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
- - - ">="
80
+ - - '>='
81
81
  - !ruby/object:Gem::Version
82
82
  version: '0'
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: rspec-rails
85
85
  requirement: !ruby/object:Gem::Requirement
86
86
  requirements:
87
- - - ">="
87
+ - - '>='
88
88
  - !ruby/object:Gem::Version
89
89
  version: '0'
90
90
  type: :development
91
91
  prerelease: false
92
92
  version_requirements: !ruby/object:Gem::Requirement
93
93
  requirements:
94
- - - ">="
94
+ - - '>='
95
95
  - !ruby/object:Gem::Version
96
96
  version: '0'
97
97
  - !ruby/object:Gem::Dependency
98
98
  name: shoulda
99
99
  requirement: !ruby/object:Gem::Requirement
100
100
  requirements:
101
- - - ">="
101
+ - - '>='
102
102
  - !ruby/object:Gem::Version
103
103
  version: '0'
104
104
  type: :development
105
105
  prerelease: false
106
106
  version_requirements: !ruby/object:Gem::Requirement
107
107
  requirements:
108
- - - ">="
108
+ - - '>='
109
109
  - !ruby/object:Gem::Version
110
110
  version: '0'
111
111
  - !ruby/object:Gem::Dependency
112
112
  name: bundler
113
113
  requirement: !ruby/object:Gem::Requirement
114
114
  requirements:
115
- - - ">="
115
+ - - '>='
116
116
  - !ruby/object:Gem::Version
117
117
  version: '0'
118
118
  type: :development
119
119
  prerelease: false
120
120
  version_requirements: !ruby/object:Gem::Requirement
121
121
  requirements:
122
- - - ">="
122
+ - - '>='
123
123
  - !ruby/object:Gem::Version
124
124
  version: '0'
125
125
  - !ruby/object:Gem::Dependency
126
126
  name: jeweler
127
127
  requirement: !ruby/object:Gem::Requirement
128
128
  requirements:
129
- - - ">="
129
+ - - '>='
130
130
  - !ruby/object:Gem::Version
131
131
  version: '0'
132
132
  type: :development
133
133
  prerelease: false
134
134
  version_requirements: !ruby/object:Gem::Requirement
135
135
  requirements:
136
- - - ">="
136
+ - - '>='
137
137
  - !ruby/object:Gem::Version
138
138
  version: '0'
139
139
  description: Inline Forms aims to ease the setup of forms that provide inline editing.
@@ -147,8 +147,8 @@ executables:
147
147
  extensions: []
148
148
  extra_rdoc_files: []
149
149
  files:
150
- - ".document"
151
- - ".gitignore"
150
+ - .document
151
+ - .gitignore
152
152
  - Gemfile
153
153
  - LICENSE.txt
154
154
  - README.rdoc
@@ -249,7 +249,6 @@ files:
249
249
  - lib/generators/assets/stylesheets/foundation_and_overrides.scss
250
250
  - lib/generators/assets/stylesheets/inline_forms.scss
251
251
  - lib/generators/inline_forms_generator.rb
252
- - lib/generators/locales/inline_forms_local.en.yml
253
252
  - lib/generators/templates/_inline_forms_tabs.html.erb
254
253
  - lib/generators/templates/controller.erb
255
254
  - lib/generators/templates/deploy.rb
@@ -280,17 +279,17 @@ require_paths:
280
279
  - lib
281
280
  required_ruby_version: !ruby/object:Gem::Requirement
282
281
  requirements:
283
- - - ">="
282
+ - - '>='
284
283
  - !ruby/object:Gem::Version
285
284
  version: '0'
286
285
  required_rubygems_version: !ruby/object:Gem::Requirement
287
286
  requirements:
288
- - - ">="
287
+ - - '>='
289
288
  - !ruby/object:Gem::Version
290
289
  version: '0'
291
290
  requirements: []
292
291
  rubyforge_project: inline_forms
293
- rubygems_version: 2.4.5
292
+ rubygems_version: 2.4.8
294
293
  signing_key:
295
294
  specification_version: 4
296
295
  summary: Inline editing of forms.
data/lib/generators/locales/inline_forms_local.en.yml DELETED
@@ -1,7 +0,0 @@
1
- en:
2
- inline_forms:
3
- general:
4
- application_title: MyApp
5
- devise:
6
- title_for_devise: MyApp
7
- welcome: Welcome to MyApp!