inline_forms 3.0.57 → 3.0.58

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,15 +1,7 @@
1
1
  ---
2
- !binary "U0hBMQ==":
3
- metadata.gz: !binary |-
4
- MjdjNDhmZmZmZWE0N2E1N2RkMTViMTFiN2Q1Yzc4NjhiNWVmMGI3Mw==
5
- data.tar.gz: !binary |-
6
- MjQwZWM0YjA0ZWI1MDcyNDk3MzFlZjVmZGQyN2E1YWJjOGI1MTA1Yg==
2
+ SHA1:
3
+ metadata.gz: e9256e8b4797628e248afb1fba03cb36ed1c7a90
4
+ data.tar.gz: 83ab89d58e0c9e7851abe68024bba6e58a4d490f
7
5
  SHA512:
8
- metadata.gz: !binary |-
9
- ODAyNDlkMjVkZTU0MjcyMTNjYzJhYzZiOGI5OGU2MjdkMzM0YjU1ZmY0ODA4
10
- ZGI4NzNkOWRmMzdlOGJlMGYyZTcxMTM0ZTY3YTA3MzY2ZjhiYTk5YjcwYTlm
11
- YjA1MmFkYjkzNjk5ZmQzYjlhMjkwY2E5MjE0MDE3MWYzODUyNTI=
12
- data.tar.gz: !binary |-
13
- OTFiYWRlMTgyNzE5OTBlNDE3ZTQ4ZjJlZWQzYzMzMGU5ODcwYjI4M2VlYTA0
14
- MjI4ZTg5NDEzYTE3NGJjZDc1YTAxOGUyZGU3ZjkwYzI3ZjcwYWFkY2RkNmJh
15
- NjVlZDZlYTBjYzRlYzM3NmQ4ZDMxZjRjYWFkNGFlM2MwOWNhYTc=
6
+ metadata.gz: 3fa535ddea6a3e26a498bd1b57fd721db7881625a08a0b42cc7f7f988e39df9072dfd51ff0baa63a63ed076320b0190d3f788990971a630561fa367a2a47d075
7
+ data.tar.gz: a1f2f2ae829465216e5636516bb69731dfc5b304d89a02af509e5ff14a954fc37dc79beeb0e6a643692945a8cb9bfd13afb7b3ee0aeddf24e16f1471f27c8152
@@ -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'
14
+ gem 'ckeditor_rails'
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,15 +288,6 @@ 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 "- Mount Ckeditor::Engine to routes..."
295
- route "mount Ckeditor::Engine => '/ckeditor'"
296
-
297
- say "- Add ckeditor autoload_paths to application.rb..."
298
- application "config.autoload_paths += %W(\#{config.root}/app/models/ckeditor)"
299
-
300
291
  say "- Create ckeditor config.js"
301
292
  copy_file File.join(GENERATOR_PATH, 'lib/generators/assets/javascripts/ckeditor/config.js'), "app/assets/javascripts/ckeditor/config.js"
302
293
 
@@ -2,37 +2,30 @@
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
+
5
8
  link_to_inline_edit object,
6
9
  attribute,
7
10
  '<div class="ckeditor_area">'.html_safe +
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
- ) +
11
+ text_area_tag( attribute,
12
+ object[attribute],
13
+ :id => "textarea_#{object.class.name.underscore}_#{object.id}_#{attribute.to_s}",
14
+ ) +
20
15
  image_tag( 'glass_plate.gif',
21
16
  :class => "glass_plate",
22
17
  :title => '' ) +
23
- "<script>delete CKEDITOR.instances['textarea_#{object.class.name.underscore}_#{object.id}_#{attribute.to_s}']</script>".html_safe +
24
- '</div>'.html_safe
18
+ "</div><script>$('#".html_safe +
19
+ "textarea_#{object.class.name.underscore}_#{object.id}_#{attribute.to_s}" + "').ckeditor();</script>".html_safe
25
20
  end
26
21
 
27
22
  def ckeditor_edit(object, attribute)
28
- cktext_area_tag( attribute,
23
+ text_area_tag( attribute,
29
24
  object[attribute],
30
25
  :id => "textarea_#{object.class.name.underscore}_#{object.id}_#{attribute.to_s}",
31
- :ckeditor => { :width => '100%',
32
- :height => '200px'
33
- }
34
26
  ) +
35
- "<script>delete CKEDITOR.instances['textarea_#{object.class.name.underscore}_#{object.id}_#{attribute.to_s}']</script>".html_safe
27
+ "<script>$('#".html_safe +
28
+ "textarea_#{object.class.name.underscore}_#{object.id}_#{attribute.to_s}" + "').ckeditor();</script>".html_safe
36
29
  end
37
30
 
38
31
  def ckeditor_update(object, attribute)
@@ -12,6 +12,7 @@
12
12
  //
13
13
  //= require jquery
14
14
  //= require jquery_ujs
15
+ //= require ckeditor-jquery
15
16
  //= require jquery.ui.all
16
17
  //= require foundation
17
18
  //= require jquery.remotipart
@@ -0,0 +1,7 @@
1
+ en:
2
+ inline_forms:
3
+ general:
4
+ application_title: MyApp
5
+ devise:
6
+ title_for_devise: MyApp
7
+ welcome: Welcome to MyApp!
@@ -1,4 +1,4 @@
1
1
  # -*- encoding : utf-8 -*-
2
2
  module InlineForms
3
- VERSION = "3.0.57"
3
+ VERSION = "3.0.58"
4
4
  end
@@ -2,14 +2,9 @@ en:
2
2
  inline_forms:
3
3
  general:
4
4
  application_title: Application Title
5
- title_for_devise: Title for Devise
6
- welcome_for_devise: Welcome for Devise
7
- view:
8
- close: close
9
- add_new: make a new %{model}
10
- undo: undo
11
- trash: trash
12
5
  devise:
6
+ title_for_devise: Title for Devise
7
+ welcome: Welcome for Devise
13
8
  passwords:
14
9
  forgot_your_password: Forgot Your Password?
15
10
  change_your_password: Change your password, if you want!
@@ -28,6 +23,11 @@ en:
28
23
  no_instructions: did you not receive instructions?
29
24
  signup_with_email_name_and_password: sign up with email name and password
30
25
  provide_email_and_we_send_instructions: provide your email and we will send instructions
26
+ view:
27
+ close: close
28
+ add_new: make a new %{model}
29
+ undo: undo
30
+ trash: trash
31
31
  succes: success.
32
32
  activerecord:
33
33
  models:
@@ -2,14 +2,14 @@ nl:
2
2
  inline_forms:
3
3
  general:
4
4
  application_title: Application Title
5
- title_for_devise: Title for Devise
6
- welcome_for_devise: Welcome for Devise
7
- view:
8
- close: sluiten
9
- add_new: Maak een nieuw %{model}
10
- undo: terughalen
11
- trash: weggooien
12
5
  devise:
6
+ title_for_devise: Title for Devise
7
+ welcome: Welcome for Devise
8
+ passwords:
9
+ forgot_your_password: Wachtwoord Vergeten?
10
+ change_your_password: Verander wachtwoord, als u wilt!
11
+ send_me_instructions: stuur instructies
12
+ change_my_password: verander wachtwoord
13
13
  send_instructions: stuur instructies
14
14
  sign_up: inschrijven
15
15
  login_with_email_and_password: aanmelden door email-adres en wachtwoord in te voeren.
@@ -23,6 +23,11 @@ nl:
23
23
  no_instructions: geen instructies ontvangen?
24
24
  signup_with_email_name_and_password: inschrijven door naam, email adres en wachtwoord (twee keer) in te voeren.
25
25
  provide_email_and_we_send_instructions: geef ons uw email adres, dan sturen wij u instructies
26
+ view:
27
+ close: sluiten
28
+ add_new: Maak een nieuw %{model}
29
+ undo: terughalen
30
+ trash: weggooien
26
31
  succes: het ding is aangemaakt.
27
32
  activerecord:
28
33
  models:
@@ -32,3 +37,5 @@ nl:
32
37
  first_name: voornaam
33
38
  last_name: achternaam
34
39
  application_name: naam van de applicatie
40
+
41
+
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.0.57
4
+ version: 3.0.58
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-09 00:00:00.000000000 Z
11
+ date: 2015-07-12 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,6 +249,7 @@ 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
252
253
  - lib/generators/templates/_inline_forms_tabs.html.erb
253
254
  - lib/generators/templates/controller.erb
254
255
  - lib/generators/templates/deploy.rb
@@ -279,17 +280,17 @@ require_paths:
279
280
  - lib
280
281
  required_ruby_version: !ruby/object:Gem::Requirement
281
282
  requirements:
282
- - - ! '>='
283
+ - - ">="
283
284
  - !ruby/object:Gem::Version
284
285
  version: '0'
285
286
  required_rubygems_version: !ruby/object:Gem::Requirement
286
287
  requirements:
287
- - - ! '>='
288
+ - - ">="
288
289
  - !ruby/object:Gem::Version
289
290
  version: '0'
290
291
  requirements: []
291
292
  rubyforge_project: inline_forms
292
- rubygems_version: 2.1.9
293
+ rubygems_version: 2.4.5
293
294
  signing_key:
294
295
  specification_version: 4
295
296
  summary: Inline editing of forms.